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

Remove prevEntry parameter from CompactOffHeapLinearHashTable.clearEntry(), writeEntry() and writeEntryVolatile() methods, as unneeded

Browse Source
This commit is contained in:
leventov
2016-01-02 16:12:01 +03:00
parent 6061d68f35
commit 9b782c4ec2
5 changed files with 16 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/java/net/openhft/chronicle/hash/impl/CompactOffHeapLinearHashTable.java
+6 -9
View File
@@ -135,24 +135,22 @@ public abstract class CompactOffHeapLinearHashTable {
public abstract long readEntry(long addr, long pos);
public abstract void writeEntryVolatile(
long addr, long pos, long prevEntry, long key, long value);
public abstract void writeEntryVolatile(long addr, long pos, long key, long value);
public void putValueVolatile(long addr, long pos, long value) {
checkValueForPut(value);
long currentEntry = readEntry(addr, pos);
writeEntryVolatile(addr, pos, currentEntry, key(currentEntry), value);
writeEntryVolatile(addr, pos, key(currentEntry), value);
}
abstract void writeEntry(long addr, long pos, long prevEntry, long anotherEntry);
abstract void writeEntry(long addr, long pos, long newEntry);
abstract void clearEntry(long addr, long pos, long prevEntry);
abstract void clearEntry(long addr, long pos);
/**
* Returns "insert" position in terms of consequent putValue()
*/
public long remove(long addr, long posToRemove) {
long entryToRemove = readEntry(addr, posToRemove);
long posToShift = posToRemove;
while (true) {
posToShift = step(posToShift);
@@ -171,12 +169,11 @@ public abstract class CompactOffHeapLinearHashTable {
if ((cond1 && cond2) ||
// chain wrapped around capacity
(posToShift < insertPos && (cond1 || cond2))) {
writeEntry(addr, posToRemove, entryToRemove, entryToShift);
writeEntry(addr, posToRemove, entryToShift);
posToRemove = posToShift;
entryToRemove = entryToShift;
}
}
clearEntry(addr, posToRemove, entryToRemove);
clearEntry(addr, posToRemove);
return posToRemove;
}
}