aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorHenning Baldersheim <balder@yahoo-inc.com>2018-11-19 17:26:35 +0100
committerGitHub <noreply@github.com>2018-11-19 17:26:35 +0100
commit9261b2c75520788fd90092bdd1a67c426fc0dbb5 (patch)
tree7fc921170f50c46ec8ea9bac277de7da536f3d97
parent0062686ea757a8434ad256ed875ee56c4ed9293a (diff)
parent4b1cb1cfd520c64fa0db1b549d08526430cc1a3b (diff)
Merge pull request #7699 from vespa-engine/toregge/thaw-dictionary-in-unique-store-when-changing-reference-during-compaction
Thaw dictionary in unique store when changing reference during compaction.
-rw-r--r--searchlib/src/vespa/searchlib/datastore/unique_store.hpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/searchlib/src/vespa/searchlib/datastore/unique_store.hpp b/searchlib/src/vespa/searchlib/datastore/unique_store.hpp
index ab526ccbfc2..928dbea89ed 100644
--- a/searchlib/src/vespa/searchlib/datastore/unique_store.hpp
+++ b/searchlib/src/vespa/searchlib/datastore/unique_store.hpp
@@ -134,8 +134,8 @@ private:
EntryRef &mappedRef = _mapping[iRef.bufferId()][iRef.offset()];
assert(!mappedRef.valid());
EntryRef newRef = _store.move(itr.getKey());
- std::atomic_thread_fence(std::memory_order_release);
mappedRef = newRef;
+ _dict.thaw(itr);
itr.writeKey(newRef);
}
++itr;