diff options
6 files changed, 15 insertions, 9 deletions
diff --git a/streamingvisitors/src/vespa/searchvisitor/searchvisitor.cpp b/streamingvisitors/src/vespa/searchvisitor/searchvisitor.cpp index cc28c76acce..6f4c17f179b 100644 --- a/streamingvisitors/src/vespa/searchvisitor/searchvisitor.cpp +++ b/streamingvisitors/src/vespa/searchvisitor/searchvisitor.cpp @@ -14,6 +14,7 @@ #include <vespa/vespalib/geo/zcurve.h> #include <vespa/vespalib/objects/nbostream.h> #include <vespa/vespalib/util/exceptions.h> +#include <vespa/vespalib/util/size_literals.h> #include <vespa/fnet/databuffer.h> #include "matching_elements_filler.h" @@ -113,7 +114,7 @@ SearchVisitor::SummaryGenerator::SummaryGenerator() : _docsumState(_callback), _docsumFilter(), _docsumWriter(nullptr), - _rawBuf(4096) + _rawBuf(4_Ki) { } diff --git a/vdslib/src/tests/distribution/distributiontest.cpp b/vdslib/src/tests/distribution/distributiontest.cpp index 5e77181ee6b..a1c5e541f3b 100644 --- a/vdslib/src/tests/distribution/distributiontest.cpp +++ b/vdslib/src/tests/distribution/distributiontest.cpp @@ -14,6 +14,7 @@ #include <vespa/vespalib/stllike/lexical_cast.h> #include <vespa/vespalib/text/stringtokenizer.h> #include <vespa/vespalib/util/benchmark_timer.h> +#include <vespa/vespalib/util/size_literals.h> #include <gmock/gmock.h> #include <chrono> #include <thread> @@ -221,7 +222,7 @@ TEST(DistributionTest, test_unchanged_distribution) Distribution distr(Distribution::getDefaultDistributionConfig(3, 10)); std::ifstream in("distribution/testdata/41-distributordistribution"); - for (unsigned i = 0; i < 65536; i++) { + for (unsigned i = 0; i < 64_Ki; i++) { uint16_t node = distr.getIdealDistributorNode( state, document::BucketId(16, i), "u"); @@ -403,8 +404,8 @@ TEST(DistributionTest, testHighSplitBit) TEST(DistributionTest, test_distribution) { - const int min_buckets = 1024*64; - const int max_buckets = 1024*64; + const int min_buckets = 64_Ki; + const int max_buckets = 64_Ki; const int min_nodes = 2; const int max_nodes = 50; diff --git a/vdslib/src/vespa/vdslib/container/documentsummary.cpp b/vdslib/src/vespa/vdslib/container/documentsummary.cpp index f948bd64687..c7b8fc84026 100644 --- a/vdslib/src/vespa/vdslib/container/documentsummary.cpp +++ b/vdslib/src/vespa/vdslib/container/documentsummary.cpp @@ -3,6 +3,7 @@ #include "documentsummary.h" #include <vespa/vespalib/util/growablebytebuffer.h> #include <vespa/document/util/bytebuffer.h> +#include <vespa/vespalib/util/size_literals.h> #include <algorithm> namespace vdslib { @@ -12,7 +13,7 @@ DocumentSummary::DocumentSummary() : _summary(), _summarySize(0) { - _summaryBuffer.reset(new vespalib::MallocPtr(4096)); + _summaryBuffer.reset(new vespalib::MallocPtr(4_Ki)); } DocumentSummary::DocumentSummary(document::ByteBuffer& buf) : diff --git a/vdslib/src/vespa/vdslib/container/searchresult.cpp b/vdslib/src/vespa/vdslib/container/searchresult.cpp index 20cc53e2de9..67790f42ea8 100644 --- a/vdslib/src/vespa/vdslib/container/searchresult.cpp +++ b/vdslib/src/vespa/vdslib/container/searchresult.cpp @@ -3,6 +3,7 @@ #include "searchresult.h" #include <vespa/document/util/bytebuffer.h> #include <vespa/vespalib/util/growablebytebuffer.h> +#include <vespa/vespalib/util/size_literals.h> #include <algorithm> namespace vdslib { @@ -102,7 +103,7 @@ SearchResult::SearchResult() : _docIdBuffer(), _numDocIdBytes(0) { - _docIdBuffer.reset(new vespalib::MallocPtr(4096)); + _docIdBuffer.reset(new vespalib::MallocPtr(4_Ki)); } SearchResult::SearchResult(document::ByteBuffer & buf) : diff --git a/vsm/src/vespa/vsm/searcher/futf8strchrfieldsearcher.cpp b/vsm/src/vespa/vsm/searcher/futf8strchrfieldsearcher.cpp index de67272946b..e58fab40070 100644 --- a/vsm/src/vespa/vsm/searcher/futf8strchrfieldsearcher.cpp +++ b/vsm/src/vespa/vsm/searcher/futf8strchrfieldsearcher.cpp @@ -2,6 +2,7 @@ #include "futf8strchrfieldsearcher.h" #include "fold.h" +#include <vespa/vespalib/util/size_literals.h> using search::byte; using search::streaming::QueryTerm; @@ -18,11 +19,11 @@ FUTF8StrChrFieldSearcher::duplicate() const FUTF8StrChrFieldSearcher::FUTF8StrChrFieldSearcher() : UTF8StrChrFieldSearcher(), - _folded(4096) + _folded(4_Ki) { } FUTF8StrChrFieldSearcher::FUTF8StrChrFieldSearcher(FieldIdT fId) : UTF8StrChrFieldSearcher(fId), - _folded(4096) + _folded(4_Ki) { } FUTF8StrChrFieldSearcher::~FUTF8StrChrFieldSearcher() {} diff --git a/vsm/src/vespa/vsm/vsm/slimefieldwriter.cpp b/vsm/src/vespa/vsm/vsm/slimefieldwriter.cpp index 0ecfcb1b462..22f6925dab3 100644 --- a/vsm/src/vespa/vsm/vsm/slimefieldwriter.cpp +++ b/vsm/src/vespa/vsm/vsm/slimefieldwriter.cpp @@ -3,6 +3,7 @@ #include "slimefieldwriter.h" #include <vespa/searchlib/util/slime_output_raw_buf_adapter.h> #include <vespa/vespalib/stllike/asciistream.h> +#include <vespa/vespalib/util/size_literals.h> #include <vespa/log/log.h> LOG_SETUP(".vsm.slimefieldwriter"); @@ -160,7 +161,7 @@ SlimeFieldWriter::explorePath(vespalib::stringref candidate) } SlimeFieldWriter::SlimeFieldWriter() : - _rbuf(4096), + _rbuf(4_Ki), _slime(), _inputFields(nullptr), _currPath() |