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

CE-41 fixed binary wire test cases.

Browse Source
This commit is contained in:
Rob Austin
2015-05-26 18:27:13 +01:00
parent 8dab0ba7c0
commit 25e06bc318
2 changed files with 20 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/java/net/openhft/chronicle/map/ReplicatedChronicleMap.java
+18 -7
View File
@@ -103,7 +103,9 @@ final class ReplicatedChronicleMap<K, KI, MKI extends MetaBytesInterop<K, ? supe
private transient Bytes identifierUpdatedBytes;
private transient ATSDirectBitSet modIterSet;
private transient AtomicReferenceArray<ModificationIterator> modificationIterators;
private final AtomicReferenceArray<ModificationIterator> modificationIterators =
new AtomicReferenceArray<ModificationIterator>(127 + RESERVED_MOD_ITER);
private transient long startOfModificationIterators;
private boolean bootstrapOnlyLocalEntries;
@@ -138,8 +140,7 @@ final class ReplicatedChronicleMap<K, KI, MKI extends MetaBytesInterop<K, ? supe
@Override
void initTransients() {
super.initTransients();
modificationIterators =
new AtomicReferenceArray<ModificationIterator>(127 + RESERVED_MOD_ITER);
closeables = new CopyOnWriteArraySet<Closeable>();
}
@@ -213,7 +214,6 @@ final class ReplicatedChronicleMap<K, KI, MKI extends MetaBytesInterop<K, ? supe
BytesBytesInterop.INSTANCE, key, keySize, keyBytesToInstance,
getRemoteBytesValueInterops, value, valueBytesToInstance,
replaceIfPresent, readValue, false, localIdentifier, currentTime());
;
}
/**
@@ -371,6 +371,7 @@ final class ReplicatedChronicleMap<K, KI, MKI extends MetaBytesInterop<K, ? supe
bytes, modificationNotifier);
modificationIterators.set(remoteIdentifier, newModificationIterator);
System.out.println("Thread=" + Thread.currentThread() + " acquireModificationIterator id=" + remoteIdentifier);
modIterSet.set(remoteIdentifier);
return newModificationIterator;
}
@@ -381,7 +382,17 @@ final class ReplicatedChronicleMap<K, KI, MKI extends MetaBytesInterop<K, ? supe
for (long next = modIterSet.nextSetBit(0L); next > 0L;
next = modIterSet.nextSetBit(next + 1L)) {
try {
modificationIterators.get((int) next).onPut(pos, segment);
ModificationIterator modificationIterator;
modificationIterator = modificationIterators.get((int) next);
if (modificationIterator == null)
continue;
System.out.println("thread=" + Thread.currentThread() + " onPut() - acquireModificationIterator id=" + next);
modificationIterator.onPut(pos, segment);
} catch (Exception e) {
LOG.error("", e);
}
@@ -1269,8 +1280,8 @@ final class ReplicatedChronicleMap<K, KI, MKI extends MetaBytesInterop<K, ? supe
final long entryTimestamp = entry.readLong();
if (entryTimestamp >= timeStamp && (!bootstrapOnlyLocalEntries ||
entry.readByte() == ReplicatedChronicleMap.this.identifier()))
if (entryTimestamp >= timeStamp &&
(!bootstrapOnlyLocalEntries || entry.readByte() == ReplicatedChronicleMap.this.identifier()))
callback.set(index, pos);
}
});
src/main/java/net/openhft/chronicle/map/TcpReplicator.java
+2 -3
View File
@@ -597,8 +597,6 @@ final class TcpReplicator<K, V> extends AbstractChannelReplicator implements Clo
if (remoteIdentifier == STATELESS_CLIENT) {
attached.handShakingComplete = true;
attached.hasRemoteHeartbeatInterval = false;
return;
}
@@ -645,7 +643,8 @@ final class TcpReplicator<K, V> extends AbstractChannelReplicator implements Clo
attached.remoteModificationIterator =
replica.acquireModificationIterator(remoteIdentifier, attached);
writer.writeRemoteBootstrapTimestamp(replica.lastModificationTime(remoteIdentifier));
long timeStampOfLastMessage = replica.lastModificationTime(remoteIdentifier);
writer.writeRemoteBootstrapTimestamp(timeStampOfLastMessage);
writer.writeServerVersion();