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

Update lang to 6.6.0

Browse Source
This commit is contained in:
Peter Lawrey
2015-02-26 17:00:20 +00:00
parent d7d554279f
commit 1e6ab61223
4 changed files with 25 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pom.xml
+1 -1
View File
@@ -46,7 +46,7 @@
<dependency>
<groupId>net.openhft</groupId>
<artifactId>lang</artifactId>
<version>6.5.1</version>
<version>6.6.0</version>
</dependency>
<dependency>
src/main/java/net/openhft/chronicle/map/MultiMapFactory.java
+5 -5
View File
@@ -20,8 +20,8 @@ package net.openhft.chronicle.map;
import net.openhft.lang.Maths;
import net.openhft.lang.collection.ATSDirectBitSet;
import net.openhft.lang.io.Bytes;
import net.openhft.lang.io.DirectStore;
import net.openhft.lang.io.NativeBytesI;
import static net.openhft.lang.Maths.isPowerOf2;
import static net.openhft.lang.MemoryUnit.*;
@@ -39,7 +39,7 @@ enum MultiMapFactory {
}
@Override
public MultiMap create(NativeBytesI bytes, NativeBytesI bitSetBytes) {
public MultiMap create(Bytes bytes, Bytes bitSetBytes) {
return new ShortShortMultiMap(bytes, bitSetBytes);
}
},
@@ -50,7 +50,7 @@ enum MultiMapFactory {
}
@Override
public MultiMap create(NativeBytesI bytes, NativeBytesI bitSetBytes) {
public MultiMap create(Bytes bytes, Bytes bitSetBytes) {
return new Int24Int24MultiMap(bytes, bitSetBytes);
}
},
@@ -61,7 +61,7 @@ enum MultiMapFactory {
}
@Override
public MultiMap create(NativeBytesI bytes, NativeBytesI bitSetBytes) {
public MultiMap create(Bytes bytes, Bytes bitSetBytes) {
return new IntIntMultiMap(bytes, bitSetBytes);
}
};
@@ -104,5 +104,5 @@ enum MultiMapFactory {
public abstract long sizeInBytes(long minCapacity);
public abstract MultiMap create(NativeBytesI bytes, NativeBytesI bitSetBytes);
public abstract MultiMap create(Bytes bytes, Bytes bitSetBytes);
}
src/main/java/net/openhft/chronicle/map/ReplicatedChronicleMap.java
+7 -7
View File
@@ -31,7 +31,7 @@ import net.openhft.lang.collection.ATSDirectBitSet;
import net.openhft.lang.io.Bytes;
import net.openhft.lang.io.CheckedBytes;
import net.openhft.lang.io.MultiStoreBytes;
import net.openhft.lang.io.NativeBytesI;
import net.openhft.lang.io.NativeBytes;
import net.openhft.lang.threadlocal.ThreadLocalCopies;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
@@ -127,7 +127,7 @@ final class ReplicatedChronicleMap<K, KI, MKI extends MetaBytesInterop<K, ? supe
@Override
VanillaChronicleMap<K, KI, MKI, V, VI, MVI>.Segment createSegment(
NativeBytesI segmentHeader, NativeBytesI bytes, int index) {
Bytes segmentHeader, NativeBytes bytes, int index) {
return new Segment(segmentHeader, bytes, index);
}
@@ -679,7 +679,7 @@ final class ReplicatedChronicleMap<K, KI, MKI extends MetaBytesInterop<K, ? supe
class Segment extends VanillaChronicleMap<K, KI, MKI, V, VI, MVI>.Segment {
Segment(NativeBytesI segmentHeader, NativeBytesI bytes, int index) {
Segment(Bytes segmentHeader, NativeBytes bytes, int index) {
super(segmentHeader, bytes, index);
}
@@ -994,7 +994,7 @@ final class ReplicatedChronicleMap<K, KI, MKI extends MetaBytesInterop<K, ? supe
* @param identifier the unique identifier relating to this map
* @return true if the entry should not be processed
*/
private boolean shouldIgnore(@NotNull final NativeBytesI entry, final long timestamp,
private boolean shouldIgnore(@NotNull final Bytes entry, final long timestamp,
final byte identifier) {
final long lastModifiedTimeStamp = entry.readLong();
@@ -1263,7 +1263,7 @@ final class ReplicatedChronicleMap<K, KI, MKI extends MetaBytesInterop<K, ? supe
hashLookup().forEach(new MultiMap.EntryConsumer() {
@Override
public void accept(long hash, long pos) {
final NativeBytesI entry = reuse(tmpBytes, offsetFromPos(pos));
final Bytes entry = reuse(tmpBytes, offsetFromPos(pos));
long keySize = keySizeMarshaller.readSize(entry);
entry.skip(keySize);
@@ -1336,7 +1336,7 @@ final class ReplicatedChronicleMap<K, KI, MKI extends MetaBytesInterop<K, ? supe
Segment segment = (Segment) seg;
final long offset = segment.offsetFromPos(pos);
final NativeBytesI entry = segment.reuse(this.entry, offset);
final NativeBytes entry = segment.reuse(this.entry, offset);
final long keySize = keySizeMarshaller.readSize(entry);
long keyPosition = entry.position();
@@ -1491,7 +1491,7 @@ final class ReplicatedChronicleMap<K, KI, MKI extends MetaBytesInterop<K, ? supe
entryCallback.onBeforeEntry();
final long segmentPos = position & posMask;
final NativeBytesI entry =
final Bytes entry =
segment.reuse(tmpBytes, segment.offsetFromPos(segmentPos));
// if the entry should be ignored, we'll move the next entry
src/main/java/net/openhft/chronicle/map/VanillaChronicleMap.java
+12 -12
View File
@@ -242,9 +242,9 @@ class VanillaChronicleMap<K, KI, MKI extends MetaBytesInterop<K, ? super KI>,
long segmentSize = segmentSize();
long headerOffset = 0;
for (int i = 0; i < this.segments.length; i++) {
NativeBytesI segmentHeader =
(NativeBytesI) segmentHeaders.bytes(headerOffset, segmentHeaderSize);
NativeBytesI segmentData = (NativeBytesI) ms.bytes(offset, segmentSize);
Bytes segmentHeader =
segmentHeaders.bytes(headerOffset, segmentHeaderSize);
NativeBytes segmentData = (NativeBytes) ms.bytes(offset, segmentSize);
this.segments[i] = createSegment(segmentHeader, segmentData, i);
headerOffset += segmentHeaderSize;
offset += segmentSize;
@@ -306,7 +306,7 @@ class VanillaChronicleMap<K, KI, MKI extends MetaBytesInterop<K, ? super KI>,
return segmentHeaderSize;
}
Segment createSegment(NativeBytesI segmentHeader, NativeBytesI bytes, int index) {
Segment createSegment(Bytes segmentHeader, NativeBytes bytes, int index) {
return new Segment(segmentHeader, bytes, index);
}
@@ -1450,8 +1450,8 @@ class VanillaChronicleMap<K, KI, MKI extends MetaBytesInterop<K, ? super KI>,
*/
static final long LOCK_OFFSET = 0L; // 64-bit
static final long SIZE_OFFSET = LOCK_OFFSET + 8L; // 32-bit
final NativeBytesI segmentHeader;
final NativeBytesI bytes;
final Bytes segmentHeader;
final Bytes bytes;
final long entriesOffset;
private final int index;
private final SingleThreadedDirectBitSet freeList;
@@ -1465,7 +1465,7 @@ class VanillaChronicleMap<K, KI, MKI extends MetaBytesInterop<K, ? super KI>,
/**
* @param index the index of this segment held by the map
*/
Segment(NativeBytesI segmentHeader, NativeBytesI bytes, int index) {
Segment(Bytes segmentHeader, NativeBytes bytes, int index) {
this.segmentHeader = segmentHeader;
this.bytes = bytes;
this.index = index;
@@ -1474,7 +1474,7 @@ class VanillaChronicleMap<K, KI, MKI extends MetaBytesInterop<K, ? super KI>,
hashLookup = createMultiMap(start);
start += CACHE_LINES.align(sizeOfMultiMap() + sizeOfMultiMapBitSet(), BYTES)
* multiMapsPerSegment();
final NativeBytesI bsBytes = new NativeBytes(ms.objectSerializer(),
final NativeBytes bsBytes = new NativeBytes(ms.objectSerializer(),
start,
start + MultiMapFactory.sizeOfBitSetInBytes(actualChunksPerSegment),
null);
@@ -1492,11 +1492,11 @@ class VanillaChronicleMap<K, KI, MKI extends MetaBytesInterop<K, ? super KI>,
}
private MultiMap createMultiMap(long start) {
final NativeBytesI multiMapBytes =
final Bytes multiMapBytes =
new NativeBytes((ObjectSerializer) null, start,
start = start + sizeOfMultiMap(), null);
final NativeBytesI sizeOfMultiMapBitSetBytes =
final Bytes sizeOfMultiMapBitSetBytes =
new NativeBytes((ObjectSerializer) null, start,
start + sizeOfMultiMapBitSet(), null);
// multiMapBytes.load();
@@ -2615,7 +2615,7 @@ class VanillaChronicleMap<K, KI, MKI extends MetaBytesInterop<K, ? super KI>,
// of returnedEntry.getKey(), but it seems rather wasteful to workaround so rare
// case.
final long offset = segment.offsetFromPos(pos);
final NativeBytesI entry = segment.reuse(this.entry, offset);
final NativeBytes entry = segment.reuse(this.entry, offset);
final long keySize = keySizeMarshaller.readSize(entry);
long position = entry.position();
@@ -2624,7 +2624,7 @@ class VanillaChronicleMap<K, KI, MKI extends MetaBytesInterop<K, ? super KI>,
removePresent(segment, pos, entry, keySize, segmentHash, true);
}
final void removePresent(Segment segment, long pos, NativeBytesI entry, long keySize,
final void removePresent(Segment segment, long pos, NativeBytes entry, long keySize,
long segmentHash, boolean removeFromMultiMap) {
entry.skip(keySize);
segment.manageReplicationBytes(entry, true, true);