Alawn/Chronicle-Map
1
0
Fork 0
mirror of https://github.com/OpenHFT/Chronicle-Map.git synced 2021-09-13 01:26:12 +00:00
Code Releases Activity

HCOLL-219 removed import/export support for Native classes as its too hard to cover all the edge cases at the moment and its not currently a priority

Browse Source
This commit is contained in:
Rob Austin
2014-11-28 12:07:30 +00:00
parent e69d204c90
commit 9457126b91
3 changed files with 21 additions and 84 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/java/net/openhft/chronicle/map/ChronicleMap.java
+6
View File
@@ -282,6 +282,9 @@ public interface ChronicleMap<K, V> extends ConcurrentMap<K, V>, ChronicleHash {
* differ. This method is not performant and as such we recommend it is not used in performance
* sensitive code.
*
* MAPS CONTAINING KEYS/VALUES GENERATED WITH OFF-HEAP INTERFACES ARE NOT CURRENTLY
* SUPPORTED, CURRENTLY ONLY KEYS/VALUES THAT IMPLEMENT SERIALIZABLE ARE SUPPORTED
*
* @param toFile the file to store all the entries to, the entries will be stored in JSON
* format
* @throws IOException its not possible store the data to {@code toFile}
@@ -296,6 +299,9 @@ public interface ChronicleMap<K, V> extends ConcurrentMap<K, V>, ChronicleHash {
* entries are overwritten. A write lock is only held while each individual entry is inserted
* into the map, not over all the entries in the {@link java.io.File}
*
* MAPS CONTAINING KEYS/VALUES GENERATED WITH OFF-HEAP INTERFACES ARE NOT CURRENTLY
* SUPPORTED, CURRENTLY ONLY KEYS/VALUES THAT IMPLEMENT SERIALIZABLE ARE SUPPORTED
*
* @param fromFile the file containing entries ( in JSON format ) which will be deserialized and
* {@link java.util.Map#put(java.lang.Object, java.lang.Object)} into the map
* @throws IOException its not possible read the {@code fromFile}
src/main/java/net/openhft/chronicle/map/VanillaChronicleMap.java
+5 -73
View File
@@ -47,8 +47,6 @@ import org.slf4j.LoggerFactory;
import java.io.*;
import java.lang.reflect.Array;
import java.nio.BufferOverflowException;
import java.nio.ByteBuffer;
import java.nio.ByteOrder;
import java.nio.channels.FileChannel;
import java.util.*;
@@ -388,6 +386,7 @@ class VanillaChronicleMap<K, KI, MKI extends MetaBytesInterop<K, ? super KI>,
static abstract class ReadValueToBytes implements ReadValue<Bytes> {
private SizeMarshaller valueSizeMarshaller;
abstract Bytes bytes(long valueSize);
void valueSizeMarshaller(SizeMarshaller valueSizeMarshaller) {
@@ -427,6 +426,7 @@ class VanillaChronicleMap<K, KI, MKI extends MetaBytesInterop<K, ? super KI>,
private static class ReadValueToLazyBytes extends ReadValueToBytes {
DirectBytes lazyBytes;
@Override
Bytes bytes(long valueSize) {
if (lazyBytes != null) {
@@ -701,7 +701,7 @@ class VanillaChronicleMap<K, KI, MKI extends MetaBytesInterop<K, ? super KI>,
* @return a lazily created XStreamConverter
*/
private synchronized XStreamConverter lazyXStreamConverter() {
if (xStreamConverter == null)
if (xStreamConverter != null)
return xStreamConverter;
final KeyValueSerializer<K, V> serializers = new KeyValueSerializer<K, V>(keyBuilder,
@@ -731,53 +731,6 @@ class VanillaChronicleMap<K, KI, MKI extends MetaBytesInterop<K, ? super KI>,
this.keyValueSerializer = keyValueSerializer;
}
private synchronized Bytes toKeyBytes(K key) {
for (; ; ) {
try {
keyValueSerializer.writeKey(key, buffer, threadLocalCopies);
return buffer;
} catch (BufferOverflowException e) {
ByteBuffer b = allocateDirect((int) buffer.capacity() + (int) entrySize)
.order(ByteOrder.nativeOrder());
buffer = new ByteBufferBytes(allocateDirect((int) buffer.capacity() + (int) entrySize)
.order(ByteOrder.nativeOrder()));
}
}
}
private synchronized Bytes toValueBytes(V value) {
for (; ; ) {
try {
keyValueSerializer.writeValue(value, buffer, threadLocalCopies);
return buffer;
} catch (BufferOverflowException e) {
ByteBuffer b = allocateDirect((int) buffer.capacity() + (int) entrySize)
.order(ByteOrder.nativeOrder());
buffer = new ByteBufferBytes(b);
}
}
}
private synchronized Bytes append(CharSequence value) {
for (; ; ) {
try {
buffer.clear();
buffer.append(value);
buffer.flip();
return buffer;
} catch (BufferOverflowException e) {
ByteBuffer b = allocateDirect((int) buffer.capacity() + (int) entrySize)
.order(ByteOrder.nativeOrder());
buffer = new ByteBufferBytes(b);
}
}
}
private void registerConverter(XStream xstream) {
final Converter converter = new Converter() {
@@ -807,25 +760,7 @@ class VanillaChronicleMap<K, KI, MKI extends MetaBytesInterop<K, ? super KI>,
buffer.clear();
if (kClass.isAssignableFrom(o.getClass())) {
Bytes bytes = (ByteBufferBytes) toKeyBytes((K) o);
String hex = AbstractBytes.toHex(bytes);
hex.toString();
String text = bytes.asString().toString();
System.out.println("key=" + text);
// writer.setValue(text);
// writer.startNode("key");
writer.setValue(o.toString());
// writer.endNode();
} else if (vClass.isAssignableFrom(o.getClass())) {
writer.setValue(o.toString());
} else if (WriteThroughEntry.class.isAssignableFrom
(o.getClass())) {
if (WriteThroughEntry.class.isAssignableFrom(o.getClass())) {
final SimpleEntry e = (SimpleEntry) o;
@@ -860,10 +795,7 @@ class VanillaChronicleMap<K, KI, MKI extends MetaBytesInterop<K, ? super KI>,
@Override
public Object unmarshal(HierarchicalStreamReader reader,
UnmarshallingContext unmarshallingContext) {
String value = reader.getValue();
buffer.clear();
append(value);
buffer.flip();
final String nodeName = reader.getNodeName();