diff options
author | Arne Juul <arnej@verizonmedia.com> | 2021-02-15 14:00:48 +0000 |
---|---|---|
committer | Arne Juul <arnej@verizonmedia.com> | 2021-02-15 14:16:25 +0000 |
commit | 4216cd1c625a6cb497bd4c6423b3729cf224c6b8 (patch) | |
tree | ced68efb885025daf6062b5ceb0474cd1fabd2e0 /searchsummary | |
parent | 2250af06ba0524f0777944d96e1e328abc2dfe18 (diff) |
use size literals in searchsummary
Diffstat (limited to 'searchsummary')
6 files changed, 14 insertions, 8 deletions
diff --git a/searchsummary/src/tests/docsumformat/docsum-pack.cpp b/searchsummary/src/tests/docsumformat/docsum-pack.cpp index c88513920ca..b0fc13c8a3d 100644 --- a/searchsummary/src/tests/docsumformat/docsum-pack.cpp +++ b/searchsummary/src/tests/docsumformat/docsum-pack.cpp @@ -4,6 +4,7 @@ #include <vespa/searchsummary/docsummary/general_result.h> #include <vespa/searchsummary/docsummary/resultconfig.h> #include <vespa/searchsummary/docsummary/resultpacker.h> +#include <vespa/vespalib/util/size_literals.h> #include <vespa/fastos/app.h> #include <vespa/log/log.h> LOG_SETUP("docsum-pack"); @@ -343,8 +344,8 @@ MyApp::TestCompressInplace() const char *buf; uint32_t buflen; - search::RawBuf field1(32768); - search::RawBuf field2(32768); + search::RawBuf field1(32_Ki); + search::RawBuf field2(32_Ki); const ResultClass *resClass; GeneralResult *gres; diff --git a/searchsummary/src/tests/docsummary/slime_summary/slime_summary_test.cpp b/searchsummary/src/tests/docsummary/slime_summary/slime_summary_test.cpp index 69249056c17..c1880dca4a3 100644 --- a/searchsummary/src/tests/docsummary/slime_summary/slime_summary_test.cpp +++ b/searchsummary/src/tests/docsummary/slime_summary/slime_summary_test.cpp @@ -6,6 +6,7 @@ #include <vespa/searchsummary/docsummary/docsumstate.h> #include <vespa/vespalib/data/slime/slime.h> #include <vespa/searchlib/util/slime_output_raw_buf_adapter.h> +#include <vespa/vespalib/util/size_literals.h> using namespace vespalib::slime::convenience; using namespace search::docsummary; @@ -37,7 +38,7 @@ struct DocsumFixture : IDocsumStore, GetDocsumsStateCallback { ~DocsumFixture(); void getDocsum(Slime &slime) { uint32_t classId; - search::RawBuf buf(4096); + search::RawBuf buf(4_Ki); writer->WriteDocsum(1u, &state, this, &buf); ASSERT_GREATER(buf.GetUsedLen(), sizeof(classId)); memcpy(&classId, buf.GetDrainPos(), sizeof(classId)); diff --git a/searchsummary/src/tests/extractkeywords/extractkeywordstest.cpp b/searchsummary/src/tests/extractkeywords/extractkeywordstest.cpp index cd695984e03..3a2c5f979ab 100644 --- a/searchsummary/src/tests/extractkeywords/extractkeywordstest.cpp +++ b/searchsummary/src/tests/extractkeywords/extractkeywordstest.cpp @@ -3,6 +3,7 @@ #include "extractkeywordstest.h" #include <vespa/searchsummary/docsummary/keywordextractor.h> #include "simplequerystack.h" +#include <vespa/vespalib/util/size_literals.h> #include <vespa/vespalib/util/time.h> #define NUMTESTS 5 @@ -157,7 +158,7 @@ bool ExtractKeywordsTest::RunTest(int testno, bool verify) { search::SimpleQueryStack stack; - search::RawBuf buf(32768); + search::RawBuf buf(32_Ki); const char *correct = nullptr; const char *keywords = nullptr; diff --git a/searchsummary/src/vespa/searchsummary/docsummary/keywordextractor.cpp b/searchsummary/src/vespa/searchsummary/docsummary/keywordextractor.cpp index 79266d34585..403bf3968bf 100644 --- a/searchsummary/src/vespa/searchsummary/docsummary/keywordextractor.cpp +++ b/searchsummary/src/vespa/searchsummary/docsummary/keywordextractor.cpp @@ -5,6 +5,7 @@ #include "idocsumenvironment.h" #include <vespa/searchlib/parsequery/stackdumpiterator.h> #include <vespa/vespalib/stllike/hashtable.hpp> +#include <vespa/vespalib/util/size_literals.h> /** Tell us what parts of the query we are interested in */ @@ -153,7 +154,7 @@ char * KeywordExtractor::ExtractKeywords(vespalib::stringref buf) const { search::SimpleQueryStackDumpIterator si(buf); - char keywordstore[4096]; // Initial storage for keywords buffer + char keywordstore[4_Ki]; // Initial storage for keywords buffer search::RawBuf keywords(keywordstore, sizeof(keywordstore)); while (si.next()) { diff --git a/searchsummary/src/vespa/searchsummary/docsummary/resultpacker.cpp b/searchsummary/src/vespa/searchsummary/docsummary/resultpacker.cpp index c9642b80e56..1887ca69c4f 100644 --- a/searchsummary/src/vespa/searchsummary/docsummary/resultpacker.cpp +++ b/searchsummary/src/vespa/searchsummary/docsummary/resultpacker.cpp @@ -2,6 +2,7 @@ #include "resultpacker.h" #include <vespa/searchcommon/common/undefinedvalues.h> +#include <vespa/vespalib/util/size_literals.h> #include <vespa/log/log.h> LOG_SETUP(".searchlib.docsummary.resultpacker"); @@ -57,8 +58,8 @@ ResultPacker::SetFormatError(ResType type) ResultPacker::ResultPacker(const ResultConfig *resConfig) - : _buf(32768), - _cbuf(32768), + : _buf(32_Ki), + _cbuf(32_Ki), _resConfig(resConfig), _resClass(nullptr), _entryIdx(0), diff --git a/searchsummary/src/vespa/searchsummary/docsummary/summaryfieldconverter.cpp b/searchsummary/src/vespa/searchsummary/docsummary/summaryfieldconverter.cpp index 9df6328d4fe..d494173a613 100644 --- a/searchsummary/src/vespa/searchsummary/docsummary/summaryfieldconverter.cpp +++ b/searchsummary/src/vespa/searchsummary/docsummary/summaryfieldconverter.cpp @@ -30,6 +30,7 @@ #include <vespa/vespalib/encoding/base64.h> #include <vespa/vespalib/geo/zcurve.h> #include <vespa/vespalib/stllike/asciistream.h> +#include <vespa/vespalib/util/size_literals.h> #include <vespa/vespalib/util/stringfmt.h> #include <vespa/vespalib/data/slime/slime.h> #include <vespa/vespalib/objects/nbostream.h> @@ -556,7 +557,7 @@ public: SlimeInserter inserter(slime); SlimeFiller visitor(inserter, _tokenize, _matching_elems); input.accept(visitor); - search::RawBuf rbuf(4096); + search::RawBuf rbuf(4_Ki); search::SlimeOutputRawBufAdapter adapter(rbuf); vespalib::slime::BinaryFormat::encode(slime, adapter); return std::make_unique<RawFieldValue>(rbuf.GetDrainPos(), rbuf.GetUsedLen()); |