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

fixed https://github.com/OpenHFT/Chronicle-Map/issues/166 void relocation(Data<V> newValue, long newEntrySize) to void relocation(newValue, newSizeOfEverythingBeforeValue);`

Browse Source
This commit is contained in:
Rob Austin
2018-11-16 17:05:09 +00:00
parent 075083455e
commit 79c7701a52
2 changed files with 5 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/java/net/openhft/chronicle/map/impl/stage/entry/MapEntryStages.java
+3 -4
View File
@@ -145,7 +145,7 @@ public abstract class MapEntryStages<K, V> extends HashEntryStages<K>
if (s.realloc(pos, entrySizeInChunks, newSizeInChunks)) {
break newValueDoesNotFit;
}
relocation(newValue, newSizeOfEverythingBeforeValue);
relocation(newValue, newEntrySize);
return;
} else if (newSizeInChunks < entrySizeInChunks) {
s.freeExtra(pos + 1, entrySizeInChunks, newSizeInChunks);
@@ -186,15 +186,14 @@ public abstract class MapEntryStages<K, V> extends HashEntryStages<K>
newValueOffset + newValue.size() - entryStartOffset;
}
protected void relocation(Data<V> newValue, long newSizeOfEverythingBeforeValue) {
long entrySize = innerEntrySize(newSizeOfEverythingBeforeValue, newValue.size());
protected void relocation(Data<V> newValue, long newEntrySize) {
// need to copy, because in initEntryAndKeyCopying(), in alloc(), nextTier() called ->
// hashLookupPos cleared, as a dependant
long oldHashLookupPos = hlp.hashLookupPos;
long oldHashLookupAddr = s.tierBaseAddr;
boolean tierHasChanged = allocatedChunks.initEntryAndKeyCopying(
entrySize, valueSizeOffset - keySizeOffset, pos, entrySizeInChunks);
newEntrySize, valueSizeOffset - keySizeOffset, pos, entrySizeInChunks);
if (tierHasChanged) {
// implicitly inits key search, locating hashLookupPos on the empty slot
src/main/java/net/openhft/chronicle/map/impl/stage/entry/ReplicatedMapEntryStages.java
+2 -2
View File
@@ -167,10 +167,10 @@ public abstract class ReplicatedMapEntryStages<K, V> extends MapEntryStages<K, V
}
@Override
protected void relocation(Data<V> newValue, long newSizeOfEverythingBeforeValue) {
protected void relocation(Data<V> newValue, long newEntrySize) {
long oldPos = pos;
long oldTierIndex = s.tierIndex;
super.relocation(newValue, newSizeOfEverythingBeforeValue);
super.relocation(newValue, newEntrySize);
ru.moveChange(oldTierIndex, oldPos, pos);
}