Add docIdLimit to DataStoreStorageStats.

6 files changed, 14 insertions, 8 deletions

diff --git a/searchlib/src/tests/docstore/document_store/document_store_test.cpp b/searchlib/src/tests/docstore/document_store/document_store_test.cpp
index 45637828ab1..8cb4cd8168e 100644
--- a/searchlib/src/tests/docstore/document_store/document_store_test.cpp
+++ b/searchlib/src/tests/docstore/document_store/document_store_test.cpp
@@ -28,7 +28,7 @@ struct NullDataStore : IDataStore {
     void accept(IDataStoreVisitor &, IDataStoreVisitorProgress &, bool) override { }
     double getVisitCost() const override { return 1.0; }
     virtual DataStoreStorageStats getStorageStats() const override {
-        return DataStoreStorageStats(0, 0, 0.0, 0, 0);
+        return DataStoreStorageStats(0, 0, 0.0, 0, 0, 0);
     }
     virtual MemoryUsage getMemoryUsage() const override { return MemoryUsage(); }
     virtual std::vector<DataStoreFileChunkStats>
diff --git a/searchlib/src/vespa/searchlib/docstore/data_store_file_chunk_stats.h b/searchlib/src/vespa/searchlib/docstore/data_store_file_chunk_stats.h
index 48a99c0762c..b7eb6797f7f 100644
--- a/searchlib/src/vespa/searchlib/docstore/data_store_file_chunk_stats.h
+++ b/searchlib/src/vespa/searchlib/docstore/data_store_file_chunk_stats.h
@@ -18,10 +18,11 @@ public:
                             double maxBucketSpread_in,
                             uint64_t lastSerialNum_in,
                             uint64_t lastFlushedSerialNum_in,
+                            uint32_t docIdLimit_in,
                             uint64_t nameId_in)
         : DataStoreStorageStats(diskUsage_in, diskBloat_in,
-                                maxBucketSpread_in,
-                                lastSerialNum_in, lastFlushedSerialNum_in),
+                                maxBucketSpread_in, lastSerialNum_in,
+                                lastFlushedSerialNum_in, docIdLimit_in),
           DataStoreFileChunkId(nameId_in)
     {
     }
diff --git a/searchlib/src/vespa/searchlib/docstore/data_store_storage_stats.h b/searchlib/src/vespa/searchlib/docstore/data_store_storage_stats.h
index db984564775..19390d51ed8 100644
--- a/searchlib/src/vespa/searchlib/docstore/data_store_storage_stats.h
+++ b/searchlib/src/vespa/searchlib/docstore/data_store_storage_stats.h
@@ -16,20 +16,23 @@ class DataStoreStorageStats
     double   _maxBucketSpread;
     uint64_t _lastSerialNum;
     uint64_t _lastFlushedSerialNum;
+    uint32_t _docIdLimit;
 public:
     DataStoreStorageStats(uint64_t diskUsage_in, uint64_t diskBloat_in, double maxBucketSpread_in,
-                          uint64_t lastSerialNum_in, uint64_t lastFlushedSerialNum_in)
+                          uint64_t lastSerialNum_in, uint64_t lastFlushedSerialNum_in, uint32_t docIdLimit_in)
         : _diskUsage(diskUsage_in),
           _diskBloat(diskBloat_in),
           _maxBucketSpread(maxBucketSpread_in),
           _lastSerialNum(lastSerialNum_in),
-          _lastFlushedSerialNum(lastFlushedSerialNum_in)
+          _lastFlushedSerialNum(lastFlushedSerialNum_in),
+          _docIdLimit(docIdLimit_in)
     { }
     uint64_t diskUsage() const            { return _diskUsage; }
     uint64_t diskBloat() const            { return _diskBloat; }
     double   maxBucketSpread() const      { return _maxBucketSpread; }
     uint64_t lastSerialNum() const        { return _lastSerialNum; }
     uint64_t lastFlushedSerialNum() const { return _lastFlushedSerialNum; }
+    uint32_t docIdLimit() const           { return _docIdLimit; }
 };
 
 } // namespace search
diff --git a/searchlib/src/vespa/searchlib/docstore/filechunk.cpp b/searchlib/src/vespa/searchlib/docstore/filechunk.cpp
index 3259d098a45..746ec875781 100644
--- a/searchlib/src/vespa/searchlib/docstore/filechunk.cpp
+++ b/searchlib/src/vespa/searchlib/docstore/filechunk.cpp
@@ -539,9 +539,10 @@ FileChunk::getStats() const
     uint64_t diskBloat = getDiskBloat();
     double bucketSpread = getBucketSpread();
     uint64_t serialNum = getLastPersistedSerialNum();
+    uint32_t docIdLimit = getDocIdLimit();
     uint64_t nameId = getNameId().getId();
     return DataStoreFileChunkStats(diskFootprint, diskBloat, bucketSpread,
-                                   serialNum, serialNum, nameId);
+                                   serialNum, serialNum, docIdLimit, nameId);
 }
 
 } // namespace search
diff --git a/searchlib/src/vespa/searchlib/docstore/logdatastore.cpp b/searchlib/src/vespa/searchlib/docstore/logdatastore.cpp
index 0312bd2557f..a000489189d 100644
--- a/searchlib/src/vespa/searchlib/docstore/logdatastore.cpp
+++ b/searchlib/src/vespa/searchlib/docstore/logdatastore.cpp
@@ -1066,8 +1066,9 @@ LogDataStore::getStorageStats() const
     // Note: Naming consistency issue
     SerialNum lastSerialNum = tentativeLastSyncToken();
     SerialNum lastFlushedSerialNum = lastSyncToken();
+    uint32_t docIdLimit = getDocIdLimit();
     return DataStoreStorageStats(diskFootprint, diskBloat, maxBucketSpread,
-                                 lastSerialNum, lastFlushedSerialNum);
+                                 lastSerialNum, lastFlushedSerialNum, docIdLimit);
 }
 
 MemoryUsage
diff --git a/searchlib/src/vespa/searchlib/docstore/writeablefilechunk.cpp b/searchlib/src/vespa/searchlib/docstore/writeablefilechunk.cpp
index 58f73774f97..aa62c2bba9c 100644
--- a/searchlib/src/vespa/searchlib/docstore/writeablefilechunk.cpp
+++ b/searchlib/src/vespa/searchlib/docstore/writeablefilechunk.cpp
@@ -907,7 +907,7 @@ WriteableFileChunk::getStats() const
     DataStoreFileChunkStats stats = FileChunk::getStats();
     uint64_t serialNum = getSerialNum();
     return DataStoreFileChunkStats(stats.diskUsage(), stats.diskBloat(), stats.maxBucketSpread(),
-                                   serialNum, stats.lastFlushedSerialNum(), stats.nameId());
+                                   serialNum, stats.lastFlushedSerialNum(), stats.docIdLimit(), stats.nameId());
 };
 
 PendingChunk::PendingChunk(uint64_t lastSerial, uint64_t dataOffset, uint32_t dataLen)