Merge pull request #1039 from kuzudb/change-bm-size

change default bm size for testing to 64MB
kuzudb · Nov 17, 2022 · 3aff141 · 3aff141
2 parents ef41751 + 9b58b84
commit 3aff141
Show file tree

Hide file tree

Showing 18 changed files with 40 additions and 21 deletions.
diff --git a/src/common/include/configs.h b/src/common/include/configs.h
@@ -44,7 +44,8 @@ const std::string INTERNAL_ID_SUFFIX = "_id";
 
 struct StorageConfig {
     // The default amount of memory pre-allocated to both the default and large pages buffer pool.
-    static constexpr uint64_t DEFAULT_BUFFER_POOL_SIZE = 1ull << 30; // (1GB)
+    static constexpr uint64_t DEFAULT_BUFFER_POOL_SIZE = 1ull << 30;             // (1GB)
+    static constexpr uint64_t DEFAULT_BUFFER_POOL_SIZE_FOR_TESTING = 1ull << 26; // (64MB)
     // The default ratio of buffer allocated to large pages.
     static constexpr double DEFAULT_PAGES_BUFFER_RATIO = 0.75;
     static constexpr double LARGE_PAGES_BUFFER_RATIO = 1.0 - DEFAULT_PAGES_BUFFER_RATIO;

diff --git a/test/common/include/vector/operations/vector_operations_test_helper.h b/test/common/include/vector/operations/vector_operations_test_helper.h
@@ -16,7 +16,8 @@ class TwoOperands {
     virtual DataTypeID getDataTypeOfResultVector() = 0;
 
     void initVectors() {
-        bufferManager = make_unique<BufferManager>();
+        bufferManager =
+            make_unique<BufferManager>(StorageConfig::DEFAULT_BUFFER_POOL_SIZE_FOR_TESTING);
         memoryManager = make_unique<MemoryManager>(bufferManager.get());
         vector1 = make_shared<ValueVector>(getDataTypeOfOperands(), memoryManager.get());
         vector2 = make_shared<ValueVector>(getDataTypeOfOperands(), memoryManager.get());

diff --git a/test/common/vector/operations/vector_comparison_operations_test.cpp b/test/common/vector/operations/vector_comparison_operations_test.cpp
@@ -208,7 +208,8 @@ TEST(VectorCmpTests, cmpTwoShortStrings) {
     auto dataChunk = make_shared<DataChunk>(3);
     dataChunk->state->selVector->selectedSize = numTuples;
     dataChunk->state->currIdx = 0;
-    auto bufferManager = make_unique<BufferManager>();
+    auto bufferManager =
+        make_unique<BufferManager>(StorageConfig::DEFAULT_BUFFER_POOL_SIZE_FOR_TESTING);
     auto memoryManager = make_unique<MemoryManager>(bufferManager.get());
 
     auto lVector = make_shared<ValueVector>(STRING, memoryManager.get());
@@ -286,7 +287,8 @@ TEST(VectorCmpTests, cmpTwoLongStrings) {
     auto dataChunk = make_shared<DataChunk>(3);
     dataChunk->state->selVector->selectedSize = VECTOR_SIZE;
     dataChunk->state->currIdx = 0;
-    auto bufferManager = make_unique<BufferManager>();
+    auto bufferManager =
+        make_unique<BufferManager>(StorageConfig::DEFAULT_BUFFER_POOL_SIZE_FOR_TESTING);
     auto memoryManager = make_unique<MemoryManager>(bufferManager.get());
 
     auto lVector = make_shared<ValueVector>(STRING, memoryManager.get());

diff --git a/test/common/vector/operations/vector_hash_nodeid_operations_test.cpp b/test/common/vector/operations/vector_hash_nodeid_operations_test.cpp
@@ -11,7 +11,8 @@ using namespace std;
 TEST(VectorHashNodeIDTests, nonSequenceNodeIDTest) {
     auto dataChunk = make_shared<DataChunk>(2);
     dataChunk->state->selVector->selectedSize = 1000;
-    auto bufferManager = make_unique<BufferManager>();
+    auto bufferManager =
+        make_unique<BufferManager>(StorageConfig::DEFAULT_BUFFER_POOL_SIZE_FOR_TESTING);
     auto memoryManager = make_unique<MemoryManager>(bufferManager.get());
 
     auto nodeVector = make_shared<ValueVector>(NODE_ID, memoryManager.get());
@@ -45,7 +46,8 @@ TEST(VectorHashNodeIDTests, nonSequenceNodeIDTest) {
 TEST(VectorHashNodeIDTests, sequenceNodeIDTest) {
     auto dataChunk = make_shared<DataChunk>(2);
     dataChunk->state->selVector->selectedSize = 1000;
-    auto bufferManager = make_unique<BufferManager>();
+    auto bufferManager =
+        make_unique<BufferManager>(StorageConfig::DEFAULT_BUFFER_POOL_SIZE_FOR_TESTING);
     auto memoryManager = make_unique<MemoryManager>(bufferManager.get());
 
     auto nodeVector = make_shared<ValueVector>(NODE_ID, memoryManager.get());

diff --git a/test/common/vector/value_vector_test.cpp b/test/common/vector/value_vector_test.cpp
@@ -8,7 +8,8 @@ using namespace kuzu::common;
 using namespace std;
 
 TEST(ValueVectorTests, TestDefaultHasNull) {
-    auto bufferManager = make_unique<BufferManager>();
+    auto bufferManager =
+        make_unique<BufferManager>(StorageConfig::DEFAULT_BUFFER_POOL_SIZE_FOR_TESTING);
     auto memoryManager = make_unique<MemoryManager>(bufferManager.get());
     ValueVector valueVector(DataTypeID::INT64, memoryManager.get());
     shared_ptr<DataChunkState> dataChunkState =

diff --git a/test/expression_evaluator/aggregate_expression_evaluation_test.cpp b/test/expression_evaluator/aggregate_expression_evaluation_test.cpp
@@ -17,7 +17,8 @@ class AggrExpressionEvaluatorTest : public Test {
 
 public:
     void SetUp() override {
-        bufferManager = make_unique<BufferManager>();
+        bufferManager =
+            make_unique<BufferManager>(StorageConfig::DEFAULT_BUFFER_POOL_SIZE_FOR_TESTING);
         memoryManager = make_unique<MemoryManager>(bufferManager.get());
         int64ValueVector = make_shared<ValueVector>(INT64, memoryManager.get());
         doubleValueVector = make_shared<ValueVector>(DOUBLE, memoryManager.get());

diff --git a/test/expression_evaluator/operation_executor_test.cpp b/test/expression_evaluator/operation_executor_test.cpp
@@ -17,7 +17,8 @@ class OperationExecutorTest : public Test {
 
 public:
     void SetUp() override {
-        bufferManager = make_unique<BufferManager>();
+        bufferManager =
+            make_unique<BufferManager>(StorageConfig::DEFAULT_BUFFER_POOL_SIZE_FOR_TESTING);
         memoryManager = make_unique<MemoryManager>(bufferManager.get());
         flatDataChunk = make_shared<DataChunk>(5);
         unFlatDataChunk = make_shared<DataChunk>(5);

diff --git a/test/processor/physical_plan/hash_table/aggregate_hash_table_test.cpp b/test/processor/physical_plan/hash_table/aggregate_hash_table_test.cpp
@@ -14,7 +14,8 @@ class AggregateHashTableTest : public Test {
 
 public:
     void SetUp() override {
-        bufferManager = make_unique<BufferManager>();
+        bufferManager =
+            make_unique<BufferManager>(StorageConfig::DEFAULT_BUFFER_POOL_SIZE_FOR_TESTING);
         memoryManager = make_unique<MemoryManager>(bufferManager.get());
         group1Vector = make_shared<ValueVector>(INT64, memoryManager.get());
         group2Vector = make_shared<ValueVector>(INT64, memoryManager.get());

diff --git a/test/processor/physical_plan/operator/orderBy/key_block_merger_test.cpp b/test/processor/physical_plan/operator/orderBy/key_block_merger_test.cpp
@@ -18,7 +18,8 @@ class KeyBlockMergerTest : public Test {
 
 public:
     void SetUp() override {
-        bufferManager = make_unique<BufferManager>();
+        bufferManager =
+            make_unique<BufferManager>(StorageConfig::DEFAULT_BUFFER_POOL_SIZE_FOR_TESTING);
         memoryManager = make_unique<MemoryManager>(bufferManager.get());
     }
 

diff --git a/test/processor/physical_plan/operator/orderBy/order_by_key_encoder_test.cpp b/test/processor/physical_plan/operator/orderBy/order_by_key_encoder_test.cpp
@@ -15,7 +15,8 @@ class OrderByKeyEncoderTest : public Test {
 
 public:
     void SetUp() override {
-        bufferManager = make_unique<BufferManager>();
+        bufferManager =
+            make_unique<BufferManager>(StorageConfig::DEFAULT_BUFFER_POOL_SIZE_FOR_TESTING);
         memoryManager = make_unique<MemoryManager>(bufferManager.get());
     }
 

diff --git a/test/processor/physical_plan/operator/orderBy/radix_sort_test.cpp b/test/processor/physical_plan/operator/orderBy/radix_sort_test.cpp
@@ -19,7 +19,8 @@ class RadixSortTest : public Test {
 
 public:
     void SetUp() override {
-        bufferManager = make_unique<BufferManager>();
+        bufferManager =
+            make_unique<BufferManager>(StorageConfig::DEFAULT_BUFFER_POOL_SIZE_FOR_TESTING);
         memoryManager = make_unique<MemoryManager>(bufferManager.get());
     }
 

diff --git a/test/processor/physical_plan/result/factorized_table_test.cpp b/test/processor/physical_plan/result/factorized_table_test.cpp
@@ -27,7 +27,8 @@ class FactorizedTableTest : public ::testing::Test {
     }
 
     void SetUp() override {
-        bufferManager = make_unique<BufferManager>();
+        bufferManager =
+            make_unique<BufferManager>(StorageConfig::DEFAULT_BUFFER_POOL_SIZE_FOR_TESTING);
         memoryManager = make_unique<MemoryManager>(bufferManager.get());
         resultSet = initResultSet();
         auto vectorA1 = resultSet->dataChunks[0]->valueVectors[0];

diff --git a/test/storage/buffer_manager_test.cpp b/test/storage/buffer_manager_test.cpp
@@ -19,7 +19,8 @@ TEST_F(BufferManagerTests, RemoveFilePagesFromFramesTest) {
     for (int pageIdx = 0; pageIdx < numPagesToAdd; ++pageIdx) {
         fileHandle.addNewPage();
     }
-    BufferManager* bufferManager = new BufferManager();
+    BufferManager* bufferManager =
+        new BufferManager(StorageConfig::DEFAULT_BUFFER_POOL_SIZE_FOR_TESTING);
     // Pin and unpin some pages
     bufferManager->pinWithoutReadingFromFile(fileHandle, 10);
     bufferManager->pinWithoutReadingFromFile(fileHandle, 999);

diff --git a/test/storage/rel_insertion_test.cpp b/test/storage/rel_insertion_test.cpp
@@ -10,7 +10,8 @@ class RelInsertionTest : public DBTest {
 
 public:
     void SetUp() override {
-        bufferManager = make_unique<BufferManager>();
+        bufferManager =
+            make_unique<BufferManager>(StorageConfig::DEFAULT_BUFFER_POOL_SIZE_FOR_TESTING);
         memoryManager = make_unique<MemoryManager>(bufferManager.get());
         DBTest::SetUp();
         // Set tableIDs

diff --git a/test/storage/wal/wal_test.cpp b/test/storage/wal/wal_test.cpp
@@ -8,7 +8,8 @@ class WALTests : public Test {
 protected:
     void SetUp() override {
         FileUtils::createDir(TestHelper::TEMP_TEST_DIR);
-        bufferManager = make_unique<BufferManager>();
+        bufferManager =
+            make_unique<BufferManager>(StorageConfig::DEFAULT_BUFFER_POOL_SIZE_FOR_TESTING);
         wal = make_unique<WAL>(TestHelper::TEMP_TEST_DIR, *bufferManager);
     }
 

diff --git a/test/test_utility/include/test_helper.h b/test/test_utility/include/test_helper.h
@@ -53,7 +53,8 @@ class TestHelper {
 class BaseGraphTest : public Test {
 public:
     void SetUp() override {
-        systemConfig = make_unique<SystemConfig>();
+        systemConfig =
+            make_unique<SystemConfig>(StorageConfig::DEFAULT_BUFFER_POOL_SIZE_FOR_TESTING);
         databaseConfig = make_unique<DatabaseConfig>(TestHelper::TEMP_TEST_DIR);
     }
 
@@ -173,7 +174,6 @@ class DBTest : public BaseGraphTest {
 public:
     void SetUp() override {
         BaseGraphTest::SetUp();
-        systemConfig->largePageBufferPoolSize = (1ull << 23);
         createDBAndConn();
         initGraph();
     }

diff --git a/test/transaction/transaction_manager_test.cpp b/test/transaction/transaction_manager_test.cpp
@@ -14,7 +14,8 @@ class TransactionManagerTest : public Test {
 protected:
     void SetUp() override {
         FileUtils::createDir(TestHelper::TEMP_TEST_DIR);
-        bufferManager = make_unique<BufferManager>();
+        bufferManager =
+            make_unique<BufferManager>(StorageConfig::DEFAULT_BUFFER_POOL_SIZE_FOR_TESTING);
         wal = make_unique<WAL>(TestHelper::TEMP_TEST_DIR, *bufferManager);
         transactionManager = make_unique<TransactionManager>(*wal);
     }

diff --git a/tools/join_order_pick/test/test.cpp b/tools/join_order_pick/test/test.cpp
@@ -8,7 +8,8 @@ using ::testing::Test;
 class JoinOrderPickTest : public Test {
 public:
     void SetUp() override {
-        auto systemConfig = make_unique<SystemConfig>();
+        auto systemConfig =
+            make_unique<SystemConfig>(StorageConfig::DEFAULT_BUFFER_POOL_SIZE_FOR_TESTING);
         auto databaseConfig = make_unique<DatabaseConfig>(TEMP_DIR);
         database = make_unique<Database>(*databaseConfig, *systemConfig);
         conn = make_unique<JOConnection>(database.get());