Swap offset and bufferid for better and more compact hashing.

1 files changed, 4 insertions, 4 deletions

diff --git a/searchlib/src/vespa/searchlib/datastore/entryref.h b/searchlib/src/vespa/searchlib/datastore/entryref.h
index dc23349caad..976c39e71f8 100644
--- a/searchlib/src/vespa/searchlib/datastore/entryref.h
+++ b/searchlib/src/vespa/searchlib/datastore/entryref.h
@@ -29,10 +29,10 @@ class EntryRefT : public EntryRef {
 public:
     EntryRefT() : EntryRef() {}
     EntryRefT(uint64_t offset_, uint32_t bufferId_) :
-        EntryRef((offset_ << BufferBits) + bufferId_) {}
+        EntryRef((bufferId_ << OffsetBits) + offset_) {}
     EntryRefT(const EntryRef & ref_) : EntryRef(ref_.ref()) {}
-    uint64_t offset() const { return _ref >> BufferBits; }
-    uint32_t bufferId() const { return _ref & (numBuffers() - 1); }
+    uint64_t offset() const { return _ref & (offsetSize()-1); }
+    uint32_t bufferId() const { return _ref >> OffsetBits; }
     static uint64_t offsetSize() { return 1ul << OffsetBits; }
     static uint32_t numBuffers() { return 1 << BufferBits; } 
     static uint64_t align(uint64_t val) { return val; }
@@ -46,7 +46,7 @@ public:
 template <uint32_t OffsetBits, uint32_t OffsetAlign>
 class AlignedEntryRefT : public EntryRefT<OffsetBits> {
 private:
-    typedef EntryRefT<OffsetBits> ParentType;
+    using ParentType = EntryRefT<OffsetBits>;
     static const uint32_t PadConstant = ((1 << OffsetAlign) - 1);
 public:
     AlignedEntryRefT() : ParentType() {}