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-167 more refactoring...

Browse Source
This commit is contained in:
Rob Austin
2014-10-22 20:31:18 +01:00
parent 6caebd3f2f
commit c226883924
2 changed files with 6 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/java/net/openhft/chronicle/map/StatelessChronicleMap.java
+6 -33
View File
@@ -349,7 +349,7 @@ class StatelessChronicleMap<K, V> implements ChronicleMap<K, V>, Closeable {
}
private void writeEntries(Map<? extends K, ? extends V> map) {
/* private void writeEntries(Map<? extends K, ? extends V> map) {
final HashMap<K, V> safeCopy = new HashMap<K, V>(map);
out.writeStopBit(safeCopy.size());
@@ -360,7 +360,7 @@ class StatelessChronicleMap<K, V> implements ChronicleMap<K, V>, Closeable {
writeKey(e.getKey());
writeValue(e.getValue());
}
}
}*/
public synchronized void clear() {
@@ -456,9 +456,7 @@ class StatelessChronicleMap<K, V> implements ChronicleMap<K, V>, Closeable {
public final V setValue(V newValue) {
V oldValue = value;
StatelessChronicleMap.this.put((K) getKey(), (V) newValue);
return oldValue;
}
@@ -501,14 +499,6 @@ class StatelessChronicleMap<K, V> implements ChronicleMap<K, V>, Closeable {
}
private void clearBuffers() {
out.clear();
outBuffer.clear();
in.clear();
in.buffer().clear();
}
private Bytes blockingFetchThrowable(long sizeLocation, long timeOutMs) throws IOException {
long startTime = System.currentTimeMillis();
@@ -517,8 +507,6 @@ class StatelessChronicleMap<K, V> implements ChronicleMap<K, V>, Closeable {
for (; ; ) {
assert out.position() != 0;
if (clientChannel == null)
clientChannel = lazyConnect(builder.timeoutMs(), builder.remoteAddress());
@@ -527,9 +515,7 @@ class StatelessChronicleMap<K, V> implements ChronicleMap<K, V>, Closeable {
if (LOG.isDebugEnabled())
LOG.debug("sending data with transactionId=" + transactionId);
write(transactionId);
System.out.println("out.position()=" + out.position());
writeSizeAt(sizeLocation);
// send out all the bytes
@@ -541,8 +527,6 @@ class StatelessChronicleMap<K, V> implements ChronicleMap<K, V>, Closeable {
// the number of bytes in the response
int size = receive(2, timeoutTime).readUnsignedShort();
LOG.info("size=" + size);
receive(size, timeoutTime);
boolean isException = in.readBoolean();
@@ -557,10 +541,10 @@ class StatelessChronicleMap<K, V> implements ChronicleMap<K, V>, Closeable {
return in;
} catch (java.nio.channels.ClosedChannelException e) {
checkTimeout((long) timeoutTime);
checkTimeout(timeoutTime);
clientChannel = lazyConnect(builder.timeoutMs(), builder.remoteAddress());
} catch (ClosedConnectionException e) {
checkTimeout((long) timeoutTime);
checkTimeout(timeoutTime);
clientChannel = lazyConnect(builder.timeoutMs(), builder.remoteAddress());
}
}
@@ -574,7 +558,7 @@ class StatelessChronicleMap<K, V> implements ChronicleMap<K, V>, Closeable {
while (in.buffer().position() < requiredNumberOfBytes) {
clientChannel.read(in.buffer());
checkTimeout((long) timeoutTime);
checkTimeout(timeoutTime);
}
in.limit(in.buffer().position());
@@ -589,22 +573,11 @@ class StatelessChronicleMap<K, V> implements ChronicleMap<K, V>, Closeable {
clientChannel.write(outBuffer);
checkTimeout(timeoutTime);
}
out.clear();
outBuffer.clear();
}
public String toString(ByteBuffer b) {
StringBuilder builder1 = new StringBuilder();
int i = 0;
int position = b.position();
for (int j = b.position(); j < b.limit(); j++) {
byte b1 = b.get();
builder1.append((char) b1 + "[" + (int) b1 + "],");
}
b.position(position);
return builder1.toString();
}
private void checkTimeout(long timeoutTime) {
if (timeoutTime < System.currentTimeMillis())
src/main/java/net/openhft/chronicle/map/TcpReplicator.java
-2
View File
@@ -1210,8 +1210,6 @@ class StatelessServerConnector<K, V> {
final StatelessChronicleMap.EventId event = StatelessChronicleMap.EventId.values()[eventId];
System.out.println("got remote event to StatelessChronicleMap");
switch (event) {
case LONG_SIZE: