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-155 removed acquireUsingReadLocked and acquireUsingWriteLocked to WriteContext<K,V> acquireUsingLocked(@NotNull K key, @NotNull V usingValue); and ReadContext<K,V> getUsingLocked(@NotNull K key, @NotNull V usingValue);

Browse Source
This commit is contained in:
Rob Austin
2014-11-02 18:35:26 +00:00
parent 55e50d40a3
commit ef0cd0f96f
10 changed files with 297 additions and 152 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/java/net/openhft/chronicle/map/ChronicleMap.java
+5 -3
View File
@@ -103,6 +103,9 @@ public interface ChronicleMap<K, V> extends ConcurrentMap<K, V>, ChronicleHash {
*/
V getUsing(K key, V usingValue);
// todo document
ReadContext<K,V> getUsingLocked(@NotNull K key, @NotNull V usingValue);
/**
* Acquire a value for a key, creating if absent.
*
@@ -142,9 +145,8 @@ public interface ChronicleMap<K, V> extends ConcurrentMap<K, V>, ChronicleHash {
// todo document
LockedEntry<K,V> acquireUsingReadLocked(@NotNull K key, @NotNull V usingValue);
WriteContext<K,V> acquireUsingLocked(@NotNull K key, @NotNull V usingValue);
// todo document
LockedEntry<K,V> acquireUsingWriteLocked(@NotNull K key, @NotNull V usingValue);
}
src/main/java/net/openhft/chronicle/map/LockedEntry.java → src/main/java/net/openhft/chronicle/map/Context.java
+1 -1
View File
@@ -21,7 +21,7 @@ package net.openhft.chronicle.map;
/**
* @author Rob Austin.
*/
public interface LockedEntry<K, V> extends AutoCloseable {
interface Context<K, V> extends AutoCloseable {
/**
* call this to unlock the maps segment
src/main/java/net/openhft/chronicle/map/ReadContext.java
+10
View File
@@ -0,0 +1,10 @@
package net.openhft.chronicle.map;
/**
* @author Rob Austin.
*/
public interface ReadContext<K,V> extends Context<K,V> {
boolean present();
}
src/main/java/net/openhft/chronicle/map/ReplicatedChronicleMap.java
+4 -2
View File
@@ -255,7 +255,7 @@ class ReplicatedChronicleMap<K, KI, MKI extends MetaBytesInterop<K, KI>,
return (Segment) segments[segmentNum];
}
LockedEntry<K, V> acquireUsing(K key, V value, LockType lockTypeType) {
<T extends Context> T lookupUsing(K key, V value, LockType lockTypeType) {
checkKey(key);
ThreadLocalCopies copies = keyInteropProvider.getCopies(null);
KI keyInterop = keyInteropProvider.get(copies, originalKeyInterop);
@@ -285,10 +285,12 @@ class ReplicatedChronicleMap<K, KI, MKI extends MetaBytesInterop<K, KI>,
v = value;
}
//todo set dirty when using replication on
lock.value(v);
lock.key(key);
return lock;
return (T) lock;
}
src/main/java/net/openhft/chronicle/map/StatelessChronicleMap.java
+2 -2
View File
@@ -401,12 +401,12 @@ class StatelessChronicleMap<K, V> implements ChronicleMap<K, V>, Closeable {
}
@Override
public LockedEntry acquireUsingReadLocked(K key, V usingValue) {
public WriteContext<K,V> acquireUsingLocked(K key, V usingValue) {
throw new UnsupportedOperationException();
}
@Override
public LockedEntry acquireUsingWriteLocked(K key, V usingValue) {
public ReadContext<K,V> getUsingLocked(K key, V usingValue) {
throw new UnsupportedOperationException();
}
src/main/java/net/openhft/chronicle/map/VanillaChronicleMap.java
+113 -77
View File
@@ -353,52 +353,47 @@ class VanillaChronicleMap<K, KI, MKI extends MetaBytesInterop<K, KI>,
replaceIfPresent);
}
private enum LockType {READ_LOCK, WRITE_LOCK}
@Override
public V get(Object key) {
try (LockedEntry<K, V> kvLockedEntry = acquireUsing((K) key, null,
LockType.READ_LOCK)) {
return kvLockedEntry.value();
try (Context<K, V> entry = lookupUsing((K) key, null,
LockType.READ_LOCK)) {
return entry.value();
}
}
@Override
public V getUsing(K key, V usingValue) {
try (LockedEntry<K, V> kvLockedEntry = acquireUsing(key, usingValue,
try (Context<K, V> entry = lookupUsing(key, usingValue,
LockType.READ_LOCK)) {
return kvLockedEntry.value();
return entry.value();
}
}
@Override
public LockedEntry<K, V> acquireUsingReadLocked(K key, V usingValue) {
return this.acquireUsing(key, usingValue, LockType.READ_LOCK);
public WriteContext<K, V> acquireUsingLocked(K key, V usingValue) {
return this.lookupUsing(key, usingValue, LockType.WRITE_LOCK);
}
@Override
public LockedEntry<K, V> acquireUsingWriteLocked(K key, V usingValue) {
return this.acquireUsing(key, usingValue, LockType.WRITE_LOCK);
//todo call put() on close of a on-heap value
//todo set dirty when using replication on
public ReadContext<K, V> getUsingLocked(K key, V usingValue) {
return this.lookupUsing(key, usingValue, LockType.READ_LOCK);
}
// todo remove
@Override
public V acquireUsing(K key, V usingValue) {
try (LockedEntry<K, V> kvLockedEntry = acquireUsing(key, usingValue, LockType.WRITE_LOCK)) {
return kvLockedEntry.value();
try (Context<K, V> kvContext = lookupUsing(key, usingValue, LockType.WRITE_LOCK)) {
return kvContext.value();
}
}
enum LockType {READ_LOCK, WRITE_LOCK}
LockedEntry<K, V> acquireUsing(K key, V value, LockType lockTypeType) {
<T extends Context> T lookupUsing(K key, V value, LockType lockTypeType) {
checkKey(key);
ThreadLocalCopies copies = keyInteropProvider.getCopies(null);
KI keyInterop = keyInteropProvider.get(copies, originalKeyInterop);
@@ -418,41 +413,22 @@ class VanillaChronicleMap<K, KI, MKI extends MetaBytesInterop<K, KI>,
segmentHash, lockTypeType == LockType.WRITE_LOCK);
// we want to call put on heap objects that don't currently exist in the map
if (v == null && !isNativeValueClass && lockTypeType == LockType.WRITE_LOCK) {
lock.copies = copies;
lock.metaKeyInterop = metaKeyInterop;
lock.keyInterop = keyInterop;
lock.segmentHash = segmentHash;
lock.copies = copies;
lock.metaKeyInterop = metaKeyInterop;
lock.keyInterop = keyInterop;
lock.segmentHash = segmentHash;
if (v == null && lockTypeType == LockType.WRITE_LOCK) {
v = value;
}
lock.value(v);
lock.key(key);
return lock;
return (T) lock;
}
/*
checkKey(key);
ThreadLocalCopies copies = keyInteropProvider.getCopies(null);
KI keyInterop = keyInteropProvider.get(copies, originalKeyInterop);
copies = metaKeyInteropProvider.getCopies(copies);
MKI metaKeyInterop =
metaKeyInteropProvider.get(copies, originalMetaKeyInterop, keyInterop, key);
long hash = metaKeyInterop.hash(keyInterop, key);
int segmentNum = getSegment(hash);
long segmentHash = segmentHash(hash);
Segment segment = segments[segmentNum];
try (LockedEntry lock = create ? segment.writeLock() : segment.readLock()) {
return segment.acquireWithoutLock(copies, metaKeyInterop, keyInterop, key, value,
segmentHash, create);
}*/
// }
@Override
public boolean containsKey(final Object k) {
checkKey(k);
@@ -692,7 +668,7 @@ class VanillaChronicleMap<K, KI, MKI extends MetaBytesInterop<K, KI>,
private MultiMap hashLookup;
private long nextPosToSearchFrom = 0L;
final MutableLockedEntry<K, V, MKI, KI> readUnlock = new MutableLockedEntry<K, V, MKI, KI>() {
final ReadLocked<K, V, MKI, KI> readUnlock = new ReadLocked<K, V, MKI, KI>() {
@Override
public void close() {
Segment.this.readUnlock();
@@ -702,29 +678,60 @@ class VanillaChronicleMap<K, KI, MKI extends MetaBytesInterop<K, KI>,
/**
* close for native values does not call put on close
*/
final MutableLockedEntry<K, V, MKI, KI> nativeWriteUnlock = new MutableLockedEntry<K, V,
MKI, KI>() {
final MutableLockedEntry<K, V, MKI, KI> nativeWriteUnlock = new WriteLocked<K, V, MKI, KI>() {
@Override
public void close() {
Segment.this.writeUnlock();
}
@Override
public void dontPutOnClose() {
throw new IllegalStateException("This method is not supported for native value " +
"classes");
}
@Override
public void removeEntry() {
if (copies != null)
removeWithoutLock(copies, metaKeyInterop, keyInterop, key(), null, segmentHash);
}
};
/**
* close for heap values calls put on close
*/
final MutableLockedEntry<K, V, MKI, KI>
heapWriteUnlock = new MutableLockedEntry<K, V, MKI, KI>() {
heapWriteUnlock = new WriteLocked<K, V, MKI, KI>() {
boolean dontPutOnClose;
@Override
public void close() {
if (copies != null)
if (copies != null && !dontPutOnClose)
putWithoutLock(copies, metaKeyInterop, keyInterop, key(), value(),
segmentHash, true);
copies = null;
dontPutOnClose = false;
Segment.this.writeUnlock();
}
@Override
public void dontPutOnClose() {
dontPutOnClose = true;
}
@Override
public void removeEntry() {
dontPutOnClose = true;
if (copies != null)
removeWithoutLock(copies, metaKeyInterop, keyInterop, key(), null, segmentHash);
}
};
@@ -1146,34 +1153,38 @@ class VanillaChronicleMap<K, KI, MKI extends MetaBytesInterop<K, KI>,
V expectedValue, long hash2) {
writeLock();
try {
long keySize = metaKeyInterop.size(keyInterop, key);
hashLookup.startSearch(hash2);
for (long pos; (pos = hashLookup.nextPos()) >= 0L; ) {
long offset = offsetFromPos(pos);
MultiStoreBytes entry = entry(offset);
if (!keyEquals(keyInterop, metaKeyInterop, key, keySize, entry))
continue;
// key is found
entry.skip(keySize);
long valueSize = readValueSize(entry);
long entryEndAddr = entry.positionAddr() + valueSize;
V valueRemoved = expectedValue != null || !removeReturnsNull
? readValue(copies, entry, null, valueSize) : null;
if (expectedValue != null && !expectedValue.equals(valueRemoved))
return null;
hashLookup.removePrevPos();
decrementSize();
free(pos, inBlocks(entryEndAddr - entryStartAddr(offset)));
notifyRemoved(offset, key, valueRemoved, pos);
return valueRemoved;
}
// key is not found
return null;
return removeWithoutLock(copies, metaKeyInterop, keyInterop, key, expectedValue, hash2);
} finally {
writeUnlock();
}
}
private V removeWithoutLock(ThreadLocalCopies copies, MKI metaKeyInterop, KI keyInterop, K key, V expectedValue, long hash2) {
long keySize = metaKeyInterop.size(keyInterop, key);
hashLookup.startSearch(hash2);
for (long pos; (pos = hashLookup.nextPos()) >= 0L; ) {
long offset = offsetFromPos(pos);
MultiStoreBytes entry = entry(offset);
if (!keyEquals(keyInterop, metaKeyInterop, key, keySize, entry))
continue;
// key is found
entry.skip(keySize);
long valueSize = readValueSize(entry);
long entryEndAddr = entry.positionAddr() + valueSize;
V valueRemoved = expectedValue != null || !removeReturnsNull
? readValue(copies, entry, null, valueSize) : null;
if (expectedValue != null && !expectedValue.equals(valueRemoved))
return null;
hashLookup.removePrevPos();
decrementSize();
free(pos, inBlocks(entryEndAddr - entryStartAddr(offset)));
notifyRemoved(offset, key, valueRemoved, pos);
return valueRemoved;
}
// key is not found
return null;
}
boolean containsKey(KI keyInterop, MKI metaKeyInterop, K key, long hash2) {
readLock();
try {
@@ -1617,7 +1628,7 @@ class VanillaChronicleMap<K, KI, MKI extends MetaBytesInterop<K, KI>,
}
}
static abstract class MutableLockedEntry<K, V, MKI, KI> implements LockedEntry<K, V> {
static abstract class MutableLockedEntry<K, V, MKI, KI> implements Context<K, V> {
ThreadLocalCopies copies;
MKI metaKeyInterop;
KI keyInterop;
@@ -1630,7 +1641,7 @@ class VanillaChronicleMap<K, KI, MKI extends MetaBytesInterop<K, KI>,
return key;
}
public void key(K key) {
void key(K key) {
this.key = key;
}
@@ -1638,10 +1649,35 @@ class VanillaChronicleMap<K, KI, MKI extends MetaBytesInterop<K, KI>,
return value;
}
public void value(V value) {
void value(V value) {
this.value = value;
}
}
private static abstract class ReadLocked<K, V, MKI, KI> extends MutableLockedEntry<K, V, MKI,
KI> implements ReadContext<K, V> {
boolean present;
void value(V value) {
this.present = value != null;
super.value(value);
}
/**
* @return if the value is not null
*/
@Override
public boolean present() {
return present;
}
}
private static abstract class WriteLocked<K, V, MKI, KI> extends MutableLockedEntry<K, V, MKI,
KI> implements WriteContext<K, V> {
}
}
src/main/java/net/openhft/chronicle/map/WriteContext.java
+13
View File
@@ -0,0 +1,13 @@
package net.openhft.chronicle.map;
/**
* @author Rob Austin.
*/
public interface WriteContext<K, V> extends Context<K, V> {
void dontPutOnClose();
void removeEntry();
// todo I have no idea why we have this, as this will aways be done on when calling close()
// void update();
}