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-266 Human readable ChornicleMap header

Browse Source
This commit is contained in:
leventov
2014-12-29 06:35:04 +07:00
parent 8a29c3583a
commit 433765f0f0
3 changed files with 13 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/java/net/openhft/chronicle/map/ChronicleMapBuilder.java
+7 -5
View File
@@ -18,6 +18,8 @@
package net.openhft.chronicle.map;
import com.thoughtworks.xstream.XStream;
import com.thoughtworks.xstream.converters.reflection.SunLimitedUnsafeReflectionProvider;
import net.openhft.chronicle.hash.*;
import net.openhft.chronicle.hash.replication.*;
import net.openhft.chronicle.hash.serialization.*;
@@ -412,7 +414,7 @@ public final class ChronicleMapBuilder<K, V> implements Cloneable,
return this;
}
public List jsonConverters() {
List jsonConverters() {
return this.jsonConverters;
}
@@ -1330,13 +1332,12 @@ public final class ChronicleMapBuilder<K, V> implements Cloneable,
if (file.exists() && file.length() > 0) {
try (FileInputStream fis = new FileInputStream(file);
ObjectInputStream ois = new ObjectInputStream(fis)) {
XStream xStream = new XStream(new SunLimitedUnsafeReflectionProvider());
VanillaChronicleMap<K, ?, ?, V, ?, ?> map =
(VanillaChronicleMap<K, ?, ?, V, ?, ?>) ois.readObject();
(VanillaChronicleMap<K, ?, ?, V, ?, ?>) xStream.fromXML(ois);
map.headerSize = roundUpMapHeaderSize(fis.getChannel().position());
map.createMappedStoreAndSegments(file);
return establishReplication(map, singleHashReplication, channel);
} catch (ClassNotFoundException e) {
throw new IOException(e);
}
}
if (file.createNewFile() || file.length() == 0) {
@@ -1356,7 +1357,8 @@ public final class ChronicleMapBuilder<K, V> implements Cloneable,
try (FileOutputStream fos = new FileOutputStream(file);
ObjectOutputStream oos = new ObjectOutputStream(fos)) {
oos.writeObject(map);
XStream xStream = new XStream(new SunLimitedUnsafeReflectionProvider());
xStream.toXML(map, oos);
oos.flush();
map.headerSize = roundUpMapHeaderSize(fos.getChannel().position());
map.createMappedStoreAndSegments(file);
src/main/java/net/openhft/xstreem/converters/AbstractChronicleMapConverter.java
+4 -2
View File
@@ -77,7 +77,9 @@ public class AbstractChronicleMapConverter<K, V> implements Converter {
@Override
public Object unmarshal(HierarchicalStreamReader reader,
UnmarshallingContext context) {
reader.moveDown();
if (!"cmap".equals(reader.getNodeName()))
throw new ConversionException("root node should be cmap, was " + reader.getNodeName());
while (reader.hasMoreChildren()) {
reader.moveDown();
@@ -102,7 +104,7 @@ public class AbstractChronicleMapConverter<K, V> implements Converter {
reader.moveUp();
}
reader.moveUp();
return null;
}