From 217cadeb27cf8001dcd260bd2c2b3f7c2697824b Mon Sep 17 00:00:00 2001 From: Guodong Jin Date: Wed, 7 Aug 2024 00:43:26 -0400 Subject: [PATCH] fix clang tidy; skip force checkpoint test for in mem mode --- src/include/main/database.h | 7 ------- src/include/storage/buffer_manager/bm_file_handle.h | 1 + src/include/storage/storage_structure/overflow_file.h | 2 +- src/include/storage/wal/wal.h | 1 - src/main/database.cpp | 1 + src/storage/index/hash_index.cpp | 1 + src/storage/storage_manager.cpp | 1 + src/storage/storage_structure/db_file_utils.cpp | 1 - src/storage/storage_structure/disk_array_collection.cpp | 1 - src/storage/storage_structure/overflow_file.cpp | 1 + src/storage/store/column_chunk_data.cpp | 1 - src/storage/store/dictionary_column.cpp | 1 - test/test_files/transaction/basic.test | 1 + 13 files changed, 7 insertions(+), 13 deletions(-) diff --git a/src/include/main/database.h b/src/include/main/database.h index ebe50bd01ce..e3d76f912e2 100644 --- a/src/include/main/database.h +++ b/src/include/main/database.h @@ -101,13 +101,6 @@ class Database { */ KUZU_API ~Database(); - /** - * @brief Sets the logging level of the database instance. - * @param loggingLevel New logging level. (Supported logging levels are: "info", "debug", - * "err"). - */ - KUZU_API static void setLoggingLevel(std::string loggingLevel); - // TODO(Ziyi): Instead of exposing a dedicated API for adding a new function, we should consider // add function through the extension module. void addTableFunction(std::string name, diff --git a/src/include/storage/buffer_manager/bm_file_handle.h b/src/include/storage/buffer_manager/bm_file_handle.h index e3dfc4179d6..b5ebaf52e2c 100644 --- a/src/include/storage/buffer_manager/bm_file_handle.h +++ b/src/include/storage/buffer_manager/bm_file_handle.h @@ -3,6 +3,7 @@ #include #include #include +#include #include "common/concurrent_vector.h" #include "common/constants.h" diff --git a/src/include/storage/storage_structure/overflow_file.h b/src/include/storage/storage_structure/overflow_file.h index 50e1dabf348..af64670bdab 100644 --- a/src/include/storage/storage_structure/overflow_file.h +++ b/src/include/storage/storage_structure/overflow_file.h @@ -3,6 +3,7 @@ #include #include +#include #include #include #include @@ -10,7 +11,6 @@ #include "common/constants.h" #include "common/types/types.h" #include "storage/buffer_manager/bm_file_handle.h" -#include "storage/buffer_manager/buffer_manager.h" #include "storage/file_handle.h" #include "storage/index/hash_index_utils.h" #include "storage/storage_structure/in_mem_page.h" diff --git a/src/include/storage/wal/wal.h b/src/include/storage/wal/wal.h index 7b679cc6839..1f41850a9b8 100644 --- a/src/include/storage/wal/wal.h +++ b/src/include/storage/wal/wal.h @@ -5,7 +5,6 @@ #include "common/enums/rel_direction.h" #include "common/serializer/buffered_file.h" -#include "storage/buffer_manager/buffer_manager.h" #include "storage/wal/wal_record.h" namespace kuzu { diff --git a/src/main/database.cpp b/src/main/database.cpp index b06013db1e4..5f359953989 100644 --- a/src/main/database.cpp +++ b/src/main/database.cpp @@ -1,6 +1,7 @@ #include "main/database.h" #include "main/database_manager.h" +#include "storage/buffer_manager/buffer_manager.h" #if defined(_WIN32) #include diff --git a/src/storage/index/hash_index.cpp b/src/storage/index/hash_index.cpp index 166b7607db8..8dd7b2832af 100644 --- a/src/storage/index/hash_index.cpp +++ b/src/storage/index/hash_index.cpp @@ -10,6 +10,7 @@ #include "common/types/ku_string.h" #include "common/types/types.h" #include "storage/buffer_manager/bm_file_handle.h" +#include "storage/buffer_manager/buffer_manager.h" #include "storage/file_handle.h" #include "storage/index/hash_index_header.h" #include "storage/index/hash_index_slot.h" diff --git a/src/storage/storage_manager.cpp b/src/storage/storage_manager.cpp index 2340db2cf4d..b049b4ec42a 100644 --- a/src/storage/storage_manager.cpp +++ b/src/storage/storage_manager.cpp @@ -6,6 +6,7 @@ #include "common/file_system/virtual_file_system.h" #include "main/client_context.h" #include "main/database.h" +#include "storage/buffer_manager/buffer_manager.h" #include "storage/buffer_manager/memory_manager.h" #include "storage/store/node_table.h" #include "storage/store/rel_table.h" diff --git a/src/storage/storage_structure/db_file_utils.cpp b/src/storage/storage_structure/db_file_utils.cpp index c644cb1f889..1ff408daad1 100644 --- a/src/storage/storage_structure/db_file_utils.cpp +++ b/src/storage/storage_structure/db_file_utils.cpp @@ -1,7 +1,6 @@ #include "storage/storage_structure/db_file_utils.h" #include "storage/buffer_manager/bm_file_handle.h" -#include "storage/buffer_manager/buffer_manager.h" #include "storage/wal/shadow_file.h" #include "transaction/transaction.h" diff --git a/src/storage/storage_structure/disk_array_collection.cpp b/src/storage/storage_structure/disk_array_collection.cpp index 8398cb06caf..e0a29aeeb86 100644 --- a/src/storage/storage_structure/disk_array_collection.cpp +++ b/src/storage/storage_structure/disk_array_collection.cpp @@ -3,7 +3,6 @@ #include "common/constants.h" #include "common/types/types.h" #include "storage/buffer_manager/bm_file_handle.h" -#include "storage/buffer_manager/buffer_manager.h" #include "storage/storage_structure/db_file_utils.h" using namespace kuzu::common; diff --git a/src/storage/storage_structure/overflow_file.cpp b/src/storage/storage_structure/overflow_file.cpp index 16d93265772..0496bb633b0 100644 --- a/src/storage/storage_structure/overflow_file.cpp +++ b/src/storage/storage_structure/overflow_file.cpp @@ -6,6 +6,7 @@ #include "common/type_utils.h" #include "common/types/types.h" #include "storage/buffer_manager/bm_file_handle.h" +#include "storage/buffer_manager/buffer_manager.h" #include "storage/file_handle.h" #include "storage/storage_structure/db_file_utils.h" #include "storage/storage_structure/in_mem_page.h" diff --git a/src/storage/store/column_chunk_data.cpp b/src/storage/store/column_chunk_data.cpp index 3a72250b398..2bb7c4478fe 100644 --- a/src/storage/store/column_chunk_data.cpp +++ b/src/storage/store/column_chunk_data.cpp @@ -13,7 +13,6 @@ #include "common/vector/value_vector.h" #include "expression_evaluator/expression_evaluator.h" #include "storage/buffer_manager/bm_file_handle.h" -#include "storage/buffer_manager/buffer_manager.h" #include "storage/compression/compression.h" #include "storage/store/list_chunk_data.h" #include "storage/store/string_chunk_data.h" diff --git a/src/storage/store/dictionary_column.cpp b/src/storage/store/dictionary_column.cpp index 9df4868610a..32653a409b5 100644 --- a/src/storage/store/dictionary_column.cpp +++ b/src/storage/store/dictionary_column.cpp @@ -1,7 +1,6 @@ #include "storage/store/dictionary_column.h" #include "storage/storage_structure/disk_array_collection.h" -#include "storage/store/string_chunk_data.h" #include "storage/store/string_column.h" #include diff --git a/test/test_files/transaction/basic.test b/test/test_files/transaction/basic.test index 303e9b83891..78ff92f9663 100644 --- a/test/test_files/transaction/basic.test +++ b/test/test_files/transaction/basic.test @@ -65,6 +65,7 @@ Timeout waiting for active transactions to leave the system before checkpointing ---- 0 -CASE ForceCheckpointWhenClosingDB +-SKIP_IN_MEM -STATEMENT CALL auto_checkpoint=false ---- ok -STATEMENT CREATE NODE TABLE person(ID INT64, age INT64, PRIMARY KEY(ID));