diff options
| -rw-r--r-- | configdefinitions/src/vespa/proton.def | 2 | ||||
| -rw-r--r-- | searchlib/src/vespa/searchlib/docstore/ibucketizer.h | 4 | ||||
| -rw-r--r-- | searchlib/src/vespa/searchlib/docstore/logdatastore.cpp | 8 |
3 files changed, 7 insertions, 7 deletions
diff --git a/configdefinitions/src/vespa/proton.def b/configdefinitions/src/vespa/proton.def index e85e6c58e11..01d591f713f 100644 --- a/configdefinitions/src/vespa/proton.def +++ b/configdefinitions/src/vespa/proton.def @@ -238,7 +238,7 @@ summary.log.maxfilesize long default=1000000000 ## Max number of lid entries per file ## TODO Decide based on memory on node. -summary.log.maxnumlids int default=40000000 +summary.log.maxnumlids int default=8388608 ## Max disk bloat factor. This will trigger compacting. summary.log.maxdiskbloatfactor double default=0.1 diff --git a/searchlib/src/vespa/searchlib/docstore/ibucketizer.h b/searchlib/src/vespa/searchlib/docstore/ibucketizer.h index b7b55974978..c7a510cffeb 100644 --- a/searchlib/src/vespa/searchlib/docstore/ibucketizer.h +++ b/searchlib/src/vespa/searchlib/docstore/ibucketizer.h @@ -12,14 +12,14 @@ class IBucketizer { public: using SP = std::shared_ptr<IBucketizer>; - virtual ~IBucketizer() { } + virtual ~IBucketizer() = default; virtual document::BucketId getBucketOf(const vespalib::GenerationHandler::Guard & guard, uint32_t lid) const = 0; virtual vespalib::GenerationHandler::Guard getGuard() const = 0; }; class IBufferVisitor { public: - virtual ~IBufferVisitor() { } + virtual ~IBufferVisitor() = default; virtual void visit(uint32_t lid, vespalib::ConstBufferRef buffer) = 0; }; diff --git a/searchlib/src/vespa/searchlib/docstore/logdatastore.cpp b/searchlib/src/vespa/searchlib/docstore/logdatastore.cpp index a187e690158..ab9d032700d 100644 --- a/searchlib/src/vespa/searchlib/docstore/logdatastore.cpp +++ b/searchlib/src/vespa/searchlib/docstore/logdatastore.cpp @@ -22,8 +22,8 @@ namespace fs = std::filesystem; namespace search { namespace { - constexpr size_t DEFAULT_MAX_FILESIZE = 1000000000ul; - constexpr uint32_t DEFAULT_MAX_LIDS_PER_FILE = 32_Mi; + constexpr size_t DEFAULT_MAX_FILESIZE = 256_Mi; + constexpr uint32_t DEFAULT_MAX_LIDS_PER_FILE = 1_Mi; } using common::FileHeaderContext; @@ -462,8 +462,8 @@ void LogDataStore::compactFile(FileId fileId) setNewFileChunk(guard, createWritableFile(destinationFileId, fc->getLastPersistedSerialNum(), fc->getNameId().next())); } size_t numSignificantBucketBits = computeNumberOfSignificantBucketIdBits(*_bucketizer, fc->getFileId()); - compacter = std::make_unique<BucketCompacter>(numSignificantBucketBits, _config.compactCompression(), *this, _executor, - *_bucketizer, fc->getFileId(), destinationFileId); + compacter = std::make_unique<BucketCompacter>(numSignificantBucketBits, _config.compactCompression(), *this, + _executor, *_bucketizer, fc->getFileId(), destinationFileId); } else { compacter = std::make_unique<docstore::Compacter>(*this); } |