diff options
| author | Arne Juul <arnej@verizonmedia.com> | 2021-02-15 13:59:41 +0000 |
|---|---|---|
| committer | Arne Juul <arnej@verizonmedia.com> | 2021-02-15 14:16:23 +0000 |
| commit | 6a8f923c6367e951b3b7931a8b80f2a24bbd4eb4 (patch) | |
| tree | 6cb264b7b8e16fa8b18a30b7c6f8eeb544980be1 /vdslib | |
| parent | f46944aba83038800348381f5964dd29d9711f8b (diff) | |
use size literals in streaming
Diffstat (limited to 'vdslib')
| -rw-r--r-- | vdslib/src/tests/distribution/distributiontest.cpp | 7 | ||||
| -rw-r--r-- | vdslib/src/vespa/vdslib/container/documentsummary.cpp | 3 | ||||
| -rw-r--r-- | vdslib/src/vespa/vdslib/container/searchresult.cpp | 3 |
3 files changed, 8 insertions, 5 deletions
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) : |