use size literals in searchlib

19 files changed, 80 insertions, 61 deletions

diff --git a/searchlib/src/tests/alignment/alignment.cpp b/searchlib/src/tests/alignment/alignment.cpp
index bc903cabde5..62d19839b41 100644
--- a/searchlib/src/tests/alignment/alignment.cpp
+++ b/searchlib/src/tests/alignment/alignment.cpp
@@ -5,6 +5,7 @@ LOG_SETUP("alignment_test");
 #include <sys/resource.h>
 #include <sys/time.h>
 #include <vespa/vespalib/testkit/testapp.h>
+#include <vespa/vespalib/util/size_literals.h>
 
 struct Timer {
     rusage usage;
@@ -30,7 +31,7 @@ timeAccess(void *bufp, uint32_t len, double &sum)
     double *buf = (double *)bufp;
     Timer timer;
     timer.start();
-    for(uint32_t i = 0; i < 512 * 1024; ++i) {
+    for(uint32_t i = 0; i < 512_Ki; ++i) {
         for (uint32_t j = 0; j < len; ++j) {
             sum += buf[j];
         }
diff --git a/searchlib/src/tests/attribute/enumeratedsave/enumeratedsave_test.cpp b/searchlib/src/tests/attribute/enumeratedsave/enumeratedsave_test.cpp
index e65684d0ea5..079195a3a9a 100644
--- a/searchlib/src/tests/attribute/enumeratedsave/enumeratedsave_test.cpp
+++ b/searchlib/src/tests/attribute/enumeratedsave/enumeratedsave_test.cpp
@@ -20,6 +20,7 @@
 #include <vespa/vespalib/testkit/testapp.h>
 #include <vespa/searchlib/util/bufferwriter.h>
 #include <vespa/vespalib/util/compress.h>
+#include <vespa/vespalib/util/size_literals.h>
 #include <vespa/vespalib/data/databuffer.h>
 
 #include <limits>
@@ -58,7 +59,7 @@ public:
     }
 
     virtual Buffer allocBuf(size_t size) override {
-        return std::make_unique<BufferBuf>(size, 4096);
+        return std::make_unique<BufferBuf>(size, 4_Ki);
     }
 
     virtual void writeBuf(Buffer buf_in) override {
diff --git a/searchlib/src/tests/attribute/multi_value_mapping/multi_value_mapping_test.cpp b/searchlib/src/tests/attribute/multi_value_mapping/multi_value_mapping_test.cpp
index c622ccae679..c41c8524a37 100644
--- a/searchlib/src/tests/attribute/multi_value_mapping/multi_value_mapping_test.cpp
+++ b/searchlib/src/tests/attribute/multi_value_mapping/multi_value_mapping_test.cpp
@@ -3,11 +3,12 @@
 #include <vespa/searchlib/attribute/multi_value_mapping.h>
 #include <vespa/searchlib/attribute/multi_value_mapping.hpp>
 #include <vespa/searchlib/attribute/not_implemented_attribute.h>
-#include <vespa/vespalib/util/rand48.h>
 #include <vespa/vespalib/gtest/gtest.h>
 #include <vespa/vespalib/stllike/hash_set.h>
 #include <vespa/vespalib/test/insertion_operators.h>
 #include <vespa/vespalib/util/generationhandler.h>
+#include <vespa/vespalib/util/rand48.h>
+#include <vespa/vespalib/util/size_literals.h>
 
 #include <vespa/log/log.h>
 LOG_SETUP("multivaluemapping_test");
@@ -82,7 +83,7 @@ public:
     }
     void setup(uint32_t maxSmallArraySize, bool enable_free_lists = true) {
         ArrayStoreConfig config(maxSmallArraySize,
-                                ArrayStoreConfig::AllocSpec(0, RefType::offsetSize(), 8 * 1024, ALLOC_GROW_FACTOR));
+                                ArrayStoreConfig::AllocSpec(0, RefType::offsetSize(), 8_Ki, ALLOC_GROW_FACTOR));
         config.enable_free_lists(enable_free_lists);
         _mvMapping = std::make_unique<MvMapping>(config);
         _attr = std::make_unique<AttributeType>(*_mvMapping);
diff --git a/searchlib/src/tests/attribute/posting_list_merger/posting_list_merger_test.cpp b/searchlib/src/tests/attribute/posting_list_merger/posting_list_merger_test.cpp
index 5976b02c5cf..e2ae0a387ed 100644
--- a/searchlib/src/tests/attribute/posting_list_merger/posting_list_merger_test.cpp
+++ b/searchlib/src/tests/attribute/posting_list_merger/posting_list_merger_test.cpp
@@ -3,6 +3,7 @@
 #include <vespa/vespalib/testkit/testapp.h>
 #include <vespa/searchlib/attribute/posting_list_merger.h>
 #include <vespa/vespalib/test/insertion_operators.h>
+#include <vespa/vespalib/util/size_literals.h>
 #include <algorithm>
 
 using vespalib::btree::BTreeNoLeafData;
@@ -56,7 +57,7 @@ public:
     }
 };
 
-constexpr uint32_t docIdLimit = 16384;
+constexpr uint32_t docIdLimit = 16_Ki;
 
 struct WeightedFixture
 {
diff --git a/searchlib/src/tests/attribute/sourceselector/sourceselector_test.cpp b/searchlib/src/tests/attribute/sourceselector/sourceselector_test.cpp
index 54fb7ffd387..03584b0dde9 100644
--- a/searchlib/src/tests/attribute/sourceselector/sourceselector_test.cpp
+++ b/searchlib/src/tests/attribute/sourceselector/sourceselector_test.cpp
@@ -5,6 +5,7 @@
 #include <vespa/searchlib/index/dummyfileheadercontext.h>
 #include <vespa/searchcommon/common/undefinedvalues.h>
 #include <vespa/vespalib/testkit/testapp.h>
+#include <vespa/vespalib/util/size_literals.h>
 #include <vespa/fastos/file.h>
 
 #include <vespa/log/log.h>
@@ -20,7 +21,7 @@ using search::index::DummyFileHeaderContext;
 namespace {
 template <typename T, size_t N> size_t arraysize(const T (&)[N]) { return N; }
 
-const uint32_t maxDocId = 4096;
+const uint32_t maxDocId = 4_Ki;
 struct DocSource { uint32_t docId; uint8_t source; };
 const DocSource docs[] = { {0,1}, {1, 0}, {2, 2}, {4, 3}, {8, 9}, {16, 178},
                            {32, 1}, {64, 2}, {128, 3}, {256,4}, {512, 2},
diff --git a/searchlib/src/tests/bitcompression/expgolomb/expgolomb_test.cpp b/searchlib/src/tests/bitcompression/expgolomb/expgolomb_test.cpp
index ce36bc3503a..fd3c677f328 100644
--- a/searchlib/src/tests/bitcompression/expgolomb/expgolomb_test.cpp
+++ b/searchlib/src/tests/bitcompression/expgolomb/expgolomb_test.cpp
@@ -2,6 +2,7 @@
 
 #include <vespa/searchlib/bitcompression/compression.h>
 #include <vespa/vespalib/testkit/testapp.h>
+#include <vespa/vespalib/util/size_literals.h>
 #include <vector>
 #include <algorithm>
 
@@ -498,7 +499,7 @@ TestFixture<bigEndian>::testBoundaries(int kValue, bool small, std::vector<uint6
 {
     EC e;
     search::ComprFileWriteContext wc(e);
-    wc.allocComprBuf(32768, 32768);
+    wc.allocComprBuf(32_Ki, 32_Ki);
     e.setupWrite(wc);
     for (auto num : v) {
         e.encodeExpGolomb(num, kValue);
@@ -554,7 +555,7 @@ TestFixture<bigEndian>::testRandNums(int kValue)
 {
     EC e;
     search::ComprFileWriteContext wc(e);
-    wc.allocComprBuf(32768, 32768);
+    wc.allocComprBuf(32_Ki, 32_Ki);
     e.setupWrite(wc);
     for (auto num : _randNums) {
         e.encodeExpGolomb(num, kValue);
diff --git a/searchlib/src/tests/diskindex/fieldwriter/fieldwriter_test.cpp b/searchlib/src/tests/diskindex/fieldwriter/fieldwriter_test.cpp
index 15a53497db9..8755af9a133 100644
--- a/searchlib/src/tests/diskindex/fieldwriter/fieldwriter_test.cpp
+++ b/searchlib/src/tests/diskindex/fieldwriter/fieldwriter_test.cpp
@@ -1,21 +1,22 @@
 // Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
 
 #include <vespa/searchlib/common/bitvector.h>
-#include <vespa/vespalib/util/rand48.h>
-#include <vespa/searchlib/test/fakedata/fakeword.h>
-#include <vespa/searchlib/test/fakedata/fakewordset.h>
+#include <vespa/searchlib/diskindex/fieldreader.h>
+#include <vespa/searchlib/diskindex/fieldwriter.h>
+#include <vespa/searchlib/diskindex/pagedict4file.h>
+#include <vespa/searchlib/diskindex/pagedict4randread.h>
+#include <vespa/searchlib/diskindex/zcposoccrandread.h>
 #include <vespa/searchlib/index/docidandfeatures.h>
+#include <vespa/searchlib/index/dummyfileheadercontext.h>
 #include <vespa/searchlib/index/field_length_info.h>
 #include <vespa/searchlib/index/postinglisthandle.h>
-#include <vespa/searchlib/diskindex/zcposoccrandread.h>
-#include <vespa/searchlib/index/dummyfileheadercontext.h>
 #include <vespa/searchlib/index/schemautil.h>
-#include <vespa/searchlib/diskindex/fieldwriter.h>
-#include <vespa/searchlib/diskindex/fieldreader.h>
+#include <vespa/searchlib/test/fakedata/fakeword.h>
+#include <vespa/searchlib/test/fakedata/fakewordset.h>
 #include <vespa/vespalib/io/fileutil.h>
-#include <vespa/searchlib/diskindex/pagedict4file.h>
-#include <vespa/searchlib/diskindex/pagedict4randread.h>
 #include <vespa/vespalib/stllike/asciistream.h>
+#include <vespa/vespalib/util/rand48.h>
+#include <vespa/vespalib/util/size_literals.h>
 #include <vespa/vespalib/util/time.h>
 #include <openssl/sha.h>
 #include <vespa/fastos/app.h>
@@ -55,7 +56,7 @@ void FastS_block_usr2() { }
 namespace fieldwriter {
 
 uint32_t minSkipDocs = 64;
-uint32_t minChunkDocs = 262144;
+uint32_t minChunkDocs = 256_Ki;
 
 vespalib::string dirprefix = "index/";
 
@@ -296,7 +297,7 @@ FileChecksum::FileChecksum(const vespalib::string &file_name)
 {
     SHA256_CTX c; 
     FastOS_File f;
-    Alloc buf = Alloc::alloc(65536);
+    Alloc buf = Alloc::alloc(64_Ki);
     vespalib::string full_file_name(dirprefix + file_name);
     bool openres = f.OpenReadOnly(full_file_name.c_str());
     if (!openres) {
@@ -706,7 +707,7 @@ main(int argc, char **argv)
 {
     fieldwriter::FieldWriterTest app;
 
-    setvbuf(stdout, nullptr, _IOLBF, 32768);
+    setvbuf(stdout, nullptr, _IOLBF, 32_Ki);
     app._rnd.srand48(32);
     return app.Entry(argc, argv);
 }
diff --git a/searchlib/src/tests/diskindex/pagedict4/pagedict4_hugeword_cornercase_test.cpp b/searchlib/src/tests/diskindex/pagedict4/pagedict4_hugeword_cornercase_test.cpp
index 8fb0e48663c..dd0bb9c8c40 100644
--- a/searchlib/src/tests/diskindex/pagedict4/pagedict4_hugeword_cornercase_test.cpp
+++ b/searchlib/src/tests/diskindex/pagedict4/pagedict4_hugeword_cornercase_test.cpp
@@ -1,6 +1,7 @@
 // Copyright 2018 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
 
 #include <vespa/vespalib/testkit/testapp.h>
+#include <vespa/vespalib/util/size_literals.h>
 #include <vespa/searchlib/bitcompression/compression.h>
 #include <vespa/searchlib/bitcompression/countcompression.h>
 #include <vespa/searchlib/bitcompression/pagedict4.h>
@@ -15,8 +16,8 @@ LOG_SETUP("pagedict4_hugeword_cornercase_test");
 using search::index::PostingListCounts;
 using search::ComprFileWriteContext;
 
-constexpr uint32_t minChunkDocs = 262144;
-constexpr uint32_t numWordIds = 65536;
+constexpr uint32_t minChunkDocs = 256_Ki;
+constexpr uint32_t numWordIds = 64_Ki;
 
 struct BitBuffer
 {
@@ -141,7 +142,7 @@ using SeqReader = search::diskindex::test::PageDict4MemSeqReader;
  */
 void testPageSizedCounts()
 {
-    uint32_t pageBitSize = 32768;
+    uint32_t pageBitSize = 32_Ki;
     uint32_t startBits = 15 * 3 + 12;
 
     uint32_t ssPad = 64;
diff --git a/searchlib/src/tests/docstore/document_store_visitor/document_store_visitor_test.cpp b/searchlib/src/tests/docstore/document_store_visitor/document_store_visitor_test.cpp
index cc31fcec4d4..22eae75b23b 100644
--- a/searchlib/src/tests/docstore/document_store_visitor/document_store_visitor_test.cpp
+++ b/searchlib/src/tests/docstore/document_store_visitor/document_store_visitor_test.cpp
@@ -12,6 +12,7 @@
 #include <vespa/document/fieldvalue/document.h>
 #include <vespa/vespalib/io/fileutil.h>
 #include <vespa/vespalib/stllike/asciistream.h>
+#include <vespa/vespalib/util/size_literals.h>
 #include <vespa/vespalib/util/threadstackexecutor.h>
 
 #include <vespa/log/log.h>
@@ -236,8 +237,8 @@ Fixture::Fixture()
       _repo(makeDocTypeRepoConfig()),
       _storeConfig(DocumentStore::Config(CompressionConfig::NONE, 0, 0),
                    LogDataStore::Config().setMaxFileSize(50000).setMaxBucketSpread(3.0)
-                           .setFileConfig(WriteableFileChunk::Config(CompressionConfig(), 16384))),
-      _executor(1, 128 * 1024),
+                           .setFileConfig(WriteableFileChunk::Config(CompressionConfig(), 16_Ki))),
+      _executor(1, 128_Ki),
       _fileHeaderContext(),
       _tlSyncer(),
       _store(),
diff --git a/searchlib/src/tests/docstore/logdatastore/logdatastore_test.cpp b/searchlib/src/tests/docstore/logdatastore/logdatastore_test.cpp
index 9e8203f352e..174feb14fdf 100644
--- a/searchlib/src/tests/docstore/logdatastore/logdatastore_test.cpp
+++ b/searchlib/src/tests/docstore/logdatastore/logdatastore_test.cpp
@@ -15,6 +15,7 @@
 #include <vespa/vespalib/test/insertion_operators.h>
 #include <vespa/vespalib/util/exceptions.h>
 #include <vespa/vespalib/util/threadstackexecutor.h>
+#include <vespa/vespalib/util/size_literals.h>
 #include <iomanip>
 
 using document::BucketId;
@@ -134,33 +135,33 @@ checkStats(IDataStore &store,
 
 #ifdef __linux__
 TEST("test that DirectIOPadding works accordng to spec") {
-    constexpr ssize_t FILE_SIZE = 4096*3;
+    constexpr ssize_t FILE_SIZE = 4_Ki*3;
     FastOS_File file("directio.test");
     file.EnableDirectIO();
     EXPECT_TRUE(file.OpenReadWrite());
-    Alloc buf(Alloc::alloc_aligned(FILE_SIZE, 4096));
+    Alloc buf(Alloc::alloc_aligned(FILE_SIZE, 4_Ki));
     memset(buf.get(), 'a', buf.size());
     EXPECT_EQUAL(FILE_SIZE, file.Write2(buf.get(), FILE_SIZE));
     size_t padBefore(0);
     size_t padAfter(0);
 
-    EXPECT_TRUE(file.DirectIOPadding(4096, 4096, padBefore, padAfter));
+    EXPECT_TRUE(file.DirectIOPadding(4_Ki, 4096, padBefore, padAfter));
     EXPECT_EQUAL(0u, padBefore);
     EXPECT_EQUAL(0u, padAfter);
 
-    EXPECT_TRUE(file.DirectIOPadding(4095, 4096, padBefore, padAfter));
+    EXPECT_TRUE(file.DirectIOPadding(4095, 4_Ki, padBefore, padAfter));
     EXPECT_EQUAL(4095u, padBefore);
     EXPECT_EQUAL(1u, padAfter);
 
-    EXPECT_TRUE(file.DirectIOPadding(4097, 4096, padBefore, padAfter));
+    EXPECT_TRUE(file.DirectIOPadding(4097, 4_Ki, padBefore, padAfter));
     EXPECT_EQUAL(1u, padBefore);
     EXPECT_EQUAL(4095u, padAfter);
 
-    EXPECT_TRUE(file.DirectIOPadding(4096, 4097, padBefore, padAfter));
+    EXPECT_TRUE(file.DirectIOPadding(4_Ki, 4097, padBefore, padAfter));
     EXPECT_EQUAL(0u, padBefore);
     EXPECT_EQUAL(4095u, padAfter);
 
-    EXPECT_TRUE(file.DirectIOPadding(4096, 4095, padBefore, padAfter));
+    EXPECT_TRUE(file.DirectIOPadding(4_Ki, 4095, padBefore, padAfter));
     EXPECT_EQUAL(0u, padBefore);
     EXPECT_EQUAL(1u, padAfter);
 
@@ -168,15 +169,15 @@ TEST("test that DirectIOPadding works accordng to spec") {
     EXPECT_EQUAL(1u, padBefore);
     EXPECT_EQUAL(0u, padAfter);
 
-    EXPECT_TRUE(file.DirectIOPadding(4097, 4096, padBefore, padAfter));
+    EXPECT_TRUE(file.DirectIOPadding(4097, 4_Ki, padBefore, padAfter));
     EXPECT_EQUAL(1u, padBefore);
     EXPECT_EQUAL(4095u, padAfter);
 
-    EXPECT_TRUE(file.DirectIOPadding(4097, 4096, padBefore, padAfter));
+    EXPECT_TRUE(file.DirectIOPadding(4097, 4_Ki, padBefore, padAfter));
     EXPECT_EQUAL(1u, padBefore);
     EXPECT_EQUAL(4095u, padAfter);
 
-    EXPECT_FALSE(file.DirectIOPadding(FILE_SIZE-1, 4096, padBefore, padAfter));
+    EXPECT_FALSE(file.DirectIOPadding(FILE_SIZE-1, 4_Ki, padBefore, padAfter));
     EXPECT_EQUAL(0u, padBefore);
     EXPECT_EQUAL(0u, padAfter);
     EXPECT_EQUAL(FILE_SIZE, file.GetSize());
@@ -190,11 +191,11 @@ TEST("test that DirectIOPadding works accordng to spec") {
     EXPECT_EQUAL(FILE_SIZE*2, file2.GetSize());
     EXPECT_TRUE(file2.Close());
 
-    EXPECT_TRUE(file.DirectIOPadding(4097, 4096, padBefore, padAfter));
+    EXPECT_TRUE(file.DirectIOPadding(4097, 4_Ki, padBefore, padAfter));
     EXPECT_EQUAL(1u, padBefore);
     EXPECT_EQUAL(4095u, padAfter);
 
-    EXPECT_TRUE(file.DirectIOPadding(FILE_SIZE-1, 4096, padBefore, padAfter));
+    EXPECT_TRUE(file.DirectIOPadding(FILE_SIZE-1, 4_Ki, padBefore, padAfter));
     EXPECT_EQUAL(4095u, padBefore);
     EXPECT_EQUAL(1u, padAfter);
 
@@ -205,7 +206,7 @@ TEST("test that DirectIOPadding works accordng to spec") {
 
 void verifyGrowing(const LogDataStore::Config & config, uint32_t minFiles, uint32_t maxFiles) {
     DirectoryHandler tmpDir("growing");
-    vespalib::ThreadStackExecutor executor(4, 128*1024);
+    vespalib::ThreadStackExecutor executor(4, 128_Ki);
     DummyFileHeaderContext fileHeaderContext;
     MyTlSyncer tlSyncer;
     {
@@ -276,7 +277,7 @@ void fetchAndTest(IDataStore & datastore, uint32_t lid, const void *a, size_t sz
 TEST("testTruncatedIdxFile"){
     LogDataStore::Config config;
     DummyFileHeaderContext fileHeaderContext;
-    vespalib::ThreadStackExecutor executor(1, 128*1024);
+    vespalib::ThreadStackExecutor executor(1, 128_Ki);
     MyTlSyncer tlSyncer;
     {
         // Files comes from the 'growing test'.
@@ -305,7 +306,7 @@ TEST("testTruncatedIdxFile"){
 TEST("testThatEmptyIdxFilesAndDanglingDatFilesAreRemoved") {
     LogDataStore::Config config;
     DummyFileHeaderContext fileHeaderContext;
-    vespalib::ThreadStackExecutor executor(1, 128*1024);
+    vespalib::ThreadStackExecutor executor(1, 128_Ki);
     MyTlSyncer tlSyncer;
     LogDataStore datastore(executor, "dangling-test", config,
                            GrowStrategy(), TuneFileSummary(),
@@ -318,7 +319,7 @@ TEST("testThatEmptyIdxFilesAndDanglingDatFilesAreRemoved") {
 TEST("testThatIncompleteCompactedFilesAreRemoved") {
     LogDataStore::Config config;
     DummyFileHeaderContext fileHeaderContext;
-    vespalib::ThreadStackExecutor executor(1, 128*1024);
+    vespalib::ThreadStackExecutor executor(1, 128_Ki);
     MyTlSyncer tlSyncer;
     LogDataStore datastore(executor, "incompletecompact-test", config,
                            GrowStrategy(), TuneFileSummary(),
@@ -338,7 +339,7 @@ public:
         _myDir("visitcache"),
         _config(),
         _fileHeaderContext(),
-        _executor(1, 128*1024),
+        _executor(1, 128_Ki),
         _tlSyncer(),
         _datastore(_executor, _myDir.getDir(), _config, GrowStrategy(),
                    TuneFileSummary(), _fileHeaderContext, _tlSyncer, nullptr)
@@ -525,9 +526,9 @@ VisitCacheStore::VisitCacheStore(UpdateStrategy strategy) :
     _config(DocumentStore::Config(CompressionConfig::LZ4, 1000000, 0)
                     .allowVisitCaching(true).updateStrategy(strategy),
             LogDataStore::Config().setMaxFileSize(50000).setMaxBucketSpread(3.0)
-                    .setFileConfig(WriteableFileChunk::Config(CompressionConfig(), 16384))),
+                    .setFileConfig(WriteableFileChunk::Config(CompressionConfig(), 16_Ki))),
     _fileHeaderContext(),
-    _executor(1, 128*1024),
+    _executor(1, 128_Ki),
     _tlSyncer(),
     _datastore(std::make_unique<LogDocumentStore>(_executor, _myDir.getDir(), _config, GrowStrategy(),
                                                   TuneFileSummary(), _fileHeaderContext, _tlSyncer, nullptr)),
@@ -669,7 +670,7 @@ TEST("testWriteRead") {
     {
         EXPECT_TRUE(FastOS_File::MakeDirectory("empty"));
         DummyFileHeaderContext fileHeaderContext;
-        vespalib::ThreadStackExecutor executor(1, 128*1024);
+        vespalib::ThreadStackExecutor executor(1, 128_Ki);
         MyTlSyncer tlSyncer;
         LogDataStore datastore(executor, "empty", config, GrowStrategy(),
                                TuneFileSummary(), fileHeaderContext, tlSyncer, nullptr);
@@ -705,7 +706,7 @@ TEST("testWriteRead") {
     }
     {
         DummyFileHeaderContext fileHeaderContext;
-        vespalib::ThreadStackExecutor executor(1, 128*1024);
+        vespalib::ThreadStackExecutor executor(1, 128_Ki);
         MyTlSyncer tlSyncer;
         LogDataStore datastore(executor, "empty", config,
                                GrowStrategy(), TuneFileSummary(),
@@ -756,7 +757,7 @@ TEST("requireThatFlushTimeIsAvailableAfterFlush") {
     vespalib::system_time before(vespalib::system_clock::now());
     DummyFileHeaderContext fileHeaderContext;
     LogDataStore::Config config;
-    vespalib::ThreadStackExecutor executor(1, 128*1024);
+    vespalib::ThreadStackExecutor executor(1, 128_Ki);
     MyTlSyncer tlSyncer;
     LogDataStore store(executor, testDir.getDir(), config, GrowStrategy(),
                        TuneFileSummary(), fileHeaderContext, tlSyncer, nullptr);
@@ -842,7 +843,7 @@ struct Fixture {
 
     Fixture(const vespalib::string &dirName = "tmp",
             bool dirCleanup = true,
-            size_t maxFileSize = 4096 * 2)
+            size_t maxFileSize = 4_Ki * 2)
         : executor(1, 0x20000),
           dir(dirName),
           serialNum(0),
diff --git a/searchlib/src/tests/docstore/store_by_bucket/store_by_bucket_test.cpp b/searchlib/src/tests/docstore/store_by_bucket/store_by_bucket_test.cpp
index e9514c1d385..1fcb5ffcf5b 100644
--- a/searchlib/src/tests/docstore/store_by_bucket/store_by_bucket_test.cpp
+++ b/searchlib/src/tests/docstore/store_by_bucket/store_by_bucket_test.cpp
@@ -7,6 +7,7 @@
 #include <vespa/searchlib/docstore/storebybucket.h>
 #include <vespa/vespalib/stllike/asciistream.h>
 #include <vespa/vespalib/stllike/hash_set.h>
+#include <vespa/vespalib/util/size_literals.h>
 #include <vespa/vespalib/util/threadstackexecutor.h>
 
 #include <vespa/log/log.h>
@@ -66,7 +67,7 @@ private:
 TEST("require that StoreByBucket gives bucket by bucket and ordered within")
 {
     vespalib::MemoryDataStore backing;
-    vespalib::ThreadStackExecutor executor(8, 128*1024);
+    vespalib::ThreadStackExecutor executor(8, 128_Ki);
     StoreByBucket sbb(backing, executor, CompressionConfig::LZ4);
     for (size_t i(1); i <=500; i++) {
         add(sbb, i);
diff --git a/searchlib/src/tests/fef/featurenameparser/featurenameparser_test.cpp b/searchlib/src/tests/fef/featurenameparser/featurenameparser_test.cpp
index ff91a27623d..47405f11028 100644
--- a/searchlib/src/tests/fef/featurenameparser/featurenameparser_test.cpp
+++ b/searchlib/src/tests/fef/featurenameparser/featurenameparser_test.cpp
@@ -3,6 +3,7 @@
 LOG_SETUP("featurenameparser_test");
 #include <vespa/vespalib/testkit/test_kit.h>
 #include <vespa/vespalib/testkit/testapp.h>
+#include <vespa/vespalib/util/size_literals.h>
 #include <vespa/searchlib/fef/featurenameparser.h>
 #include <vector>
 #include <string>
@@ -61,7 +62,7 @@ Test::testParse(const vespalib::string &input, bool valid,
 void
 Test::testFile(const vespalib::string &name)
 {
-    char buf[4096];
+    char buf[4_Ki];
     uint32_t lineN = 0;
     FILE *f = fopen(name.c_str(), "r");
     ASSERT_TRUE(f != 0);
diff --git a/searchlib/src/tests/memoryindex/memory_index/memory_index_test.cpp b/searchlib/src/tests/memoryindex/memory_index/memory_index_test.cpp
index 6bbaf16380d..8dbca39b692 100644
--- a/searchlib/src/tests/memoryindex/memory_index/memory_index_test.cpp
+++ b/searchlib/src/tests/memoryindex/memory_index/memory_index_test.cpp
@@ -13,9 +13,10 @@
 #include <vespa/searchlib/queryeval/fake_search.h>
 #include <vespa/searchlib/queryeval/fake_searchable.h>
 #include <vespa/searchlib/queryeval/searchiterator.h>
+#include <vespa/vespalib/util/sequencedtaskexecutor.h>
+#include <vespa/vespalib/util/size_literals.h>
 #include <vespa/vespalib/util/stringfmt.h>
 #include <vespa/vespalib/util/threadstackexecutor.h>
-#include <vespa/vespalib/util/sequencedtaskexecutor.h>
 #include <vespa/vespalib/gtest/gtest.h>
 
 #include <vespa/log/log.h>
@@ -126,7 +127,7 @@ VESPA_THREAD_STACK_TAG(push_executor)
 
 Index::Index(const MySetup &setup)
     : schema(setup.schema),
-      _executor(1, 128 * 1024),
+      _executor(1, 128_Ki),
       _invertThreads(SequencedTaskExecutor::create(invert_executor, 2)),
       _pushThreads(SequencedTaskExecutor::create(push_executor, 2)),
       index(schema, setup, *_invertThreads, *_pushThreads),
diff --git a/searchlib/src/tests/postinglistbm/postinglistbm.cpp b/searchlib/src/tests/postinglistbm/postinglistbm.cpp
index 0ac3f15e015..695710873c4 100644
--- a/searchlib/src/tests/postinglistbm/postinglistbm.cpp
+++ b/searchlib/src/tests/postinglistbm/postinglistbm.cpp
@@ -11,6 +11,7 @@
 #include <vespa/searchlib/test/fakedata/fakewordset.h>
 #include <vespa/searchlib/test/fakedata/fpfactory.h>
 #include <vespa/vespalib/util/rand48.h>
+#include <vespa/vespalib/util/size_literals.h>
 
 #include <vespa/log/log.h>
 
@@ -232,7 +233,7 @@ main(int argc, char **argv)
 {
     postinglistbm::PostingListBM app;
 
-    setvbuf(stdout, nullptr, _IOLBF, 32768);
+    setvbuf(stdout, nullptr, _IOLBF, 32_Ki);
     app._rnd.srand48(32);
     return app.Entry(argc, argv);
 }
diff --git a/searchlib/src/tests/postinglistbm/stress_runner.cpp b/searchlib/src/tests/postinglistbm/stress_runner.cpp
index fd12e9b5aa9..b3ae7664614 100644
--- a/searchlib/src/tests/postinglistbm/stress_runner.cpp
+++ b/searchlib/src/tests/postinglistbm/stress_runner.cpp
@@ -8,6 +8,7 @@
 #include <vespa/searchlib/test/fakedata/fakeword.h>
 #include <vespa/searchlib/test/fakedata/fakewordset.h>
 #include <vespa/searchlib/test/fakedata/fpfactory.h>
+#include <vespa/vespalib/util/size_literals.h>
 #include <vespa/vespalib/util/time.h>
 #include <condition_variable>
 #include <mutex>
@@ -159,7 +160,7 @@ StressMaster::StressMaster(vespalib::Rand48 &rnd,
 {
     LOG(info, "StressMaster::StressMaster()");
 
-    _threadPool = new FastOS_ThreadPool(128 * 1024, 400);
+    _threadPool = new FastOS_ThreadPool(128_Ki, 400);
 }
 
 StressMaster::~StressMaster()
diff --git a/searchlib/src/tests/query/streaming_query_large_test.cpp b/searchlib/src/tests/query/streaming_query_large_test.cpp
index 28401e9d685..5eaa3cf0422 100644
--- a/searchlib/src/tests/query/streaming_query_large_test.cpp
+++ b/searchlib/src/tests/query/streaming_query_large_test.cpp
@@ -4,6 +4,7 @@
 #include <vespa/searchlib/query/tree/simplequery.h>
 #include <vespa/searchlib/query/tree/stackdumpcreator.h>
 #include <vespa/vespalib/testkit/test_kit.h>
+#include <vespa/vespalib/util/size_literals.h>
 #include <sys/resource.h>
 
 using namespace search;
@@ -36,9 +37,9 @@ void setMaxStackSize(rlim_t maxStackSize)
 TEST("testveryLongQueryResultingInBug6850778") {
     const uint32_t NUMITEMS=20000;
 #ifdef __SANITIZE_ADDRESS__
-    setMaxStackSize(12 * 1024 * 1024);
+    setMaxStackSize(12_Mi);
 #else
-    setMaxStackSize(4 * 1024 * 1024);
+    setMaxStackSize(4_Mi);
 #endif
     QueryBuilder<SimpleQueryNodeTypes> builder;
     for (uint32_t i=0; i <= NUMITEMS; i++) {
diff --git a/searchlib/src/tests/tensor/hnsw_index/stress_hnsw_mt.cpp b/searchlib/src/tests/tensor/hnsw_index/stress_hnsw_mt.cpp
index 8790df5a140..8e3bb95a776 100644
--- a/searchlib/src/tests/tensor/hnsw_index/stress_hnsw_mt.cpp
+++ b/searchlib/src/tests/tensor/hnsw_index/stress_hnsw_mt.cpp
@@ -22,6 +22,7 @@
 #include <vespa/vespalib/util/blockingthreadstackexecutor.h>
 #include <vespa/vespalib/util/generationhandler.h>
 #include <vespa/vespalib/util/lambdatask.h>
+#include <vespa/vespalib/util/size_literals.h>
 #include <vespa/vespalib/data/simple_buffer.h>
 
 #include <vespa/log/log.h>
@@ -59,7 +60,7 @@ struct MallocPointVector {
 };
 static MallocPointVector *aligned_alloc_pv(size_t num) {
     size_t num_bytes = num * sizeof(MallocPointVector);
-    double mega_bytes = num_bytes / (1024.0*1024.0);
+    double mega_bytes = num_bytes / double(1_Mi);
     fprintf(stderr, "allocate %.2f MB of vectors\n", mega_bytes);
     char *mem = (char *)malloc(num_bytes + 512);
     mem += 512;
@@ -221,8 +222,8 @@ public:
           vectors(),
           gen_handler(),
           index(),
-          multi_prepare_workers(10, 128*1024, 50),
-          write_thread(1, 128*1024, 500)
+          multi_prepare_workers(10, 128_Ki, 50),
+          write_thread(1, 128_Ki, 500)
     {
         loaded_vectors.load();
     }
diff --git a/searchlib/src/tests/util/slime_output_raw_buf_adapter/slime_output_raw_buf_adapter_test.cpp b/searchlib/src/tests/util/slime_output_raw_buf_adapter/slime_output_raw_buf_adapter_test.cpp
index bb597537663..c8231ac4b29 100644
--- a/searchlib/src/tests/util/slime_output_raw_buf_adapter/slime_output_raw_buf_adapter_test.cpp
+++ b/searchlib/src/tests/util/slime_output_raw_buf_adapter/slime_output_raw_buf_adapter_test.cpp
@@ -2,12 +2,13 @@
 #include <vespa/vespalib/testkit/test_kit.h>
 #include <vespa/searchlib/util/slime_output_raw_buf_adapter.h>
 #include <vespa/vespalib/data/slime/slime.h>
+#include <vespa/vespalib/util/size_literals.h>
 
 using namespace search;
 using namespace vespalib::slime::convenience;
 
 TEST("use slime with rawbuf") {
-    RawBuf buffer(4096);
+    RawBuf buffer(4_Ki);
     Slime src;
     Slime dst;
     {
diff --git a/searchlib/src/tests/vespa-fileheader-inspect/vespa-fileheader-inspect_test.cpp b/searchlib/src/tests/vespa-fileheader-inspect/vespa-fileheader-inspect_test.cpp
index 5a3f1a685ad..f9306bc5fbf 100644
--- a/searchlib/src/tests/vespa-fileheader-inspect/vespa-fileheader-inspect_test.cpp
+++ b/searchlib/src/tests/vespa-fileheader-inspect/vespa-fileheader-inspect_test.cpp
@@ -3,6 +3,7 @@
 #include <vespa/vespalib/testkit/test_kit.h>
 #include <vespa/searchlib/util/fileheadertk.h>
 #include <vespa/vespalib/stllike/asciistream.h>
+#include <vespa/vespalib/util/size_literals.h>
 #include <vespa/fastos/file.h>
 
 using namespace search;
@@ -24,7 +25,7 @@ vespalib::string readFile(const vespalib::string &fileName) {
     FastOS_File file;
     ASSERT_TRUE(file.OpenReadOnly(fileName.c_str()));
 
-    char buf[4096];
+    char buf[4_Ki];
     uint32_t len = file.Read(buf, sizeof(buf));
     EXPECT_LESS(len, sizeof(buf)); // make sure we got everything