diff options
Diffstat (limited to 'searchcore')
3 files changed, 6 insertions, 2 deletions
diff --git a/searchcore/src/vespa/searchcore/config/proton.def b/searchcore/src/vespa/searchcore/config/proton.def index a210698d5b6..111ee7d1272 100644 --- a/searchcore/src/vespa/searchcore/config/proton.def +++ b/searchcore/src/vespa/searchcore/config/proton.def @@ -250,6 +250,9 @@ summary.log.chunk.skipcrconread bool default=false ## Max size per summary file. summary.log.maxfilesize long default=1000000000 +## Max number of lid entries per file +summary.log.maxnumlids int default=40000000 + ## Max disk bloat factor. This will trigger compacting. summary.log.maxdiskbloatfactor double default=0.1 diff --git a/searchcore/src/vespa/searchcore/proton/matching/query.cpp b/searchcore/src/vespa/searchcore/proton/matching/query.cpp index 26d35998dd3..dd93a0eceed 100644 --- a/searchcore/src/vespa/searchcore/proton/matching/query.cpp +++ b/searchcore/src/vespa/searchcore/proton/matching/query.cpp @@ -191,8 +191,8 @@ Query::optimize() _blueprint = Blueprint::optimize(std::move(_blueprint)); if (_blueprint->getState().want_global_filter()) { // XXX we need to somehow compute a real global filter - std::shared_ptr<search::BitVector> empty_global_filter; - _blueprint->set_global_filter(empty_global_filter); + auto empty_global_filter = search::queryeval::GlobalFilter::create(); + _blueprint->set_global_filter(*empty_global_filter); // optimized order may change after accounting for global filter: _blueprint = Blueprint::optimize(std::move(_blueprint)); } diff --git a/searchcore/src/vespa/searchcore/proton/server/documentdbconfigmanager.cpp b/searchcore/src/vespa/searchcore/proton/server/documentdbconfigmanager.cpp index d1d88434bd6..68e65acb87d 100644 --- a/searchcore/src/vespa/searchcore/proton/server/documentdbconfigmanager.cpp +++ b/searchcore/src/vespa/searchcore/proton/server/documentdbconfigmanager.cpp @@ -192,6 +192,7 @@ deriveConfig(const ProtonConfig::Summary & summary, const ProtonConfig::Flush::M WriteableFileChunk::Config fileConfig(deriveCompression(chunk.compression), chunk.maxbytes); LogDataStore::Config logConfig; logConfig.setMaxFileSize(log.maxfilesize) + .setMaxNumLids(log.maxnumlids) .setMaxDiskBloatFactor(std::min(flush.diskbloatfactor, flush.each.diskbloatfactor)) .setMaxBucketSpread(log.maxbucketspread).setMinFileSizeFactor(log.minfilesizefactor) .compactCompression(deriveCompression(log.compact.compression)) |