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

Merge branch 'master' of github.com:OpenHFT/Chronicle-Map

Browse Source
This commit is contained in:
leventov
2016-04-18 18:04:57 +01:00
parent 8dff07239f 35c721419c
commit 733b8eb29e
3 changed files with 20 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/java/net/openhft/chronicle/map/VanillaChronicleMap.java
-2
View File
@@ -28,8 +28,6 @@ import net.openhft.chronicle.hash.serialization.SizeMarshaller;
import net.openhft.chronicle.hash.serialization.SizedReader;
import net.openhft.chronicle.hash.serialization.impl.SerializationBuilder;
import net.openhft.chronicle.map.impl.*;
import net.openhft.chronicle.map.impl.CompiledMapIterationContext;
import net.openhft.chronicle.map.impl.CompiledMapQueryContext;
import net.openhft.chronicle.map.impl.ret.InstanceReturnValue;
import net.openhft.chronicle.set.ChronicleSet;
import net.openhft.chronicle.wire.WireIn;
src/main/java/net/openhft/chronicle/map/impl/stage/data/ZeroBytesStore.java
+12
View File
@@ -67,6 +67,11 @@ public enum ZeroBytesStore implements BytesStore<ZeroBytesStore, Void> {
return false;
}
@Override
public boolean sharedMemory() {
return false;
}
@Override
public ZeroBytesStore copy() {
throw new UnsupportedOperationException();
@@ -83,6 +88,13 @@ public enum ZeroBytesStore implements BytesStore<ZeroBytesStore, Void> {
throw new UnsupportedOperationException();
}
@Override
public void move(long from, long to, long length) {
if (length != 0)
throw new UnsupportedOperationException();
}
@Override
public long address(long offset) throws UnsupportedOperationException {
return offset;
src/test/java/net/openhft/chronicle/map/fromdocs/CharSequenceCustomEncodingBytesWriter.java
+8 -2
View File
@@ -96,7 +96,7 @@ public final class CharSequenceCustomEncodingBytesWriter
if (cr.isOverflow()) {
outputBuffer.flip();
out.write(outputBuffer);
writeOutputBuffer(out);
outputBuffer.clear();
continue;
}
@@ -108,11 +108,17 @@ public final class CharSequenceCustomEncodingBytesWriter
}
}
outputBuffer.flip();
out.write(outputBuffer);
writeOutputBuffer(out);
out.writeInt(encodedSizePos, (int) (out.writePosition() - encodedSizePos - 4));
}
private void writeOutputBuffer(Bytes out) {
int remaining = outputBuffer.remaining();
out.write(out.writePosition(), outputBuffer, 0, remaining);
out.writeSkip(remaining);
}
/**
* Need this method because {@link CharBuffer#append(CharSequence, int, int)} produces garbage
*/