diff options
author | Henning Baldersheim <balder@yahoo-inc.com> | 2017-02-02 18:50:59 +0100 |
---|---|---|
committer | Henning Baldersheim <balder@yahoo-inc.com> | 2017-02-02 18:50:59 +0100 |
commit | 36eadb5844aafc2e2f572a6c25d76730d2bed909 (patch) | |
tree | d324ecfef6099986e429807f1e2fa36f5d96637e /searchcore | |
parent | 5c0e13b0bd89d403b0a603dd4fe6f676a8bc08b8 (diff) |
Ignore maxentries per chunk.
Diffstat (limited to 'searchcore')
-rw-r--r-- | searchcore/src/vespa/searchcore/proton/docsummary/summarymanager.cpp | 14 |
1 files changed, 8 insertions, 6 deletions
diff --git a/searchcore/src/vespa/searchcore/proton/docsummary/summarymanager.cpp b/searchcore/src/vespa/searchcore/proton/docsummary/summarymanager.cpp index 399811cc4b3..318ffcc040e 100644 --- a/searchcore/src/vespa/searchcore/proton/docsummary/summarymanager.cpp +++ b/searchcore/src/vespa/searchcore/proton/docsummary/summarymanager.cpp @@ -23,6 +23,8 @@ using vespalib::make_string; using vespalib::IllegalArgumentException; using search::DocumentStore; using search::LogDocumentStore; +using search::LogDataStore; +using search::WriteableFileChunk; using search::TuneFileSummary; using search::common::FileHeaderContext; @@ -143,13 +145,13 @@ SummaryManager::SummaryManager(vespalib::ThreadExecutor & executor, const ProtonConfig::Summary::Log & log(summary.log); const ProtonConfig::Summary::Log::Chunk & chunk(log.chunk); - search::WriteableFileChunk::Config fileConfig(deriveCompression(chunk.compression), chunk.maxbytes, chunk.maxentries); - search::LogDataStore::Config logConfig(log.maxfilesize, log.maxdiskbloatfactor, log.maxbucketspread, - log.minfilesizefactor, log.numthreads, log.compact2activefile, - deriveCompression(log.compact.compression), fileConfig); + WriteableFileChunk::Config fileConfig(deriveCompression(chunk.compression), chunk.maxbytes); + LogDataStore::Config logConfig(log.maxfilesize, log.maxdiskbloatfactor, log.maxbucketspread, + log.minfilesizefactor, log.numthreads, log.compact2activefile, + deriveCompression(log.compact.compression), fileConfig); logConfig.disableCrcOnRead(chunk.skipcrconread); _docStore.reset(new LogDocumentStore(executor, baseDir, - search::LogDocumentStore::Config(config, logConfig), + LogDocumentStore::Config(config, logConfig), growStrategy, tuneFileSummary, fileHeaderContext, tlSyncer, summary.compact2buckets ? bucketizer : search::IBucketizer::SP())); } @@ -172,7 +174,7 @@ IFlushTarget::List SummaryManager::getFlushTargets() { IFlushTarget::List ret; ret.push_back(IFlushTarget::SP(new SummaryFlushTarget(getBackingStore()))); - if (dynamic_cast<search::LogDocumentStore *>(_docStore.get()) != NULL) { + if (dynamic_cast<LogDocumentStore *>(_docStore.get()) != NULL) { ret.push_back(IFlushTarget::SP(new SummaryCompactTarget(getBackingStore()))); } return ret; |