Remove types_include.h

kuzudb · Sep 11, 2023 · c081c94 · c081c94
1 parent 898ca25
commit c081c94
Show file tree

Hide file tree

Showing 26 changed files with 32 additions and 27 deletions.
diff --git a/src/common/types/types.cpp b/src/common/types/types.cpp
@@ -8,7 +8,9 @@
 #include "common/null_buffer.h"
 #include "common/ser_deser.h"
 #include "common/string_utils.h"
-#include "common/types/types_include.h"
+#include "common/types/interval_t.h"
+#include "common/types/ku_list.h"
+#include "common/types/ku_string.h"
 
 namespace kuzu {
 namespace common {

diff --git a/src/common/types/value.cpp b/src/common/types/value.cpp
@@ -3,6 +3,7 @@
 #include "common/null_buffer.h"
 #include "common/ser_deser.h"
 #include "common/string_utils.h"
+#include "common/types/blob.h"
 #include "storage/storage_utils.h"
 
 namespace kuzu {

diff --git a/src/include/binder/expression/expression.h b/src/include/binder/expression/expression.h
@@ -8,7 +8,7 @@
 
 #include "common/exception/internal.h"
 #include "common/expression_type.h"
-#include "common/types/types_include.h"
+#include "common/types/types.h"
 
 namespace kuzu {
 namespace binder {

diff --git a/src/include/common/copier_config/copier_config.h b/src/include/common/copier_config/copier_config.h
@@ -3,7 +3,6 @@
 #include <fstream>
 
 #include "common/constants.h"
-#include "common/types/types_include.h"
 #include "common/types/value.h"
 
 namespace kuzu {

diff --git a/src/include/common/type_utils.h b/src/include/common/type_utils.h
@@ -3,7 +3,11 @@
 #include <sstream>
 
 #include "common/exception/conversion.h"
-#include "common/types/types_include.h"
+#include "common/types/date_t.h"
+#include "common/types/interval_t.h"
+#include "common/types/ku_string.h"
+#include "common/types/timestamp_t.h"
+#include "common/types/types.h"
 
 namespace kuzu {
 namespace common {

diff --git a/src/include/common/types/types_include.h b/src/include/common/types/types_include.h
diff --git a/src/include/common/types/value.h b/src/include/common/types/value.h
@@ -5,6 +5,11 @@
 
 #include "common/api.h"
 #include "common/type_utils.h"
+#include "common/types/date_t.h"
+#include "common/types/internal_id_t.h"
+#include "common/types/interval_t.h"
+#include "common/types/ku_list.h"
+#include "common/types/timestamp_t.h"
 #include "common/utils.h"
 
 namespace kuzu {

diff --git a/src/include/function/cast/cast_functions.h b/src/include/function/cast/cast_functions.h
@@ -4,6 +4,8 @@
 
 #include "common/exception/runtime.h"
 #include "common/type_utils.h"
+#include "common/types/blob.h"
+#include "common/types/ku_string.h"
 #include "common/vector/value_vector.h"
 
 namespace kuzu {

diff --git a/src/include/function/hash/hash_functions.h b/src/include/function/hash/hash_functions.h
@@ -5,6 +5,7 @@
 
 #include "common/exception/runtime.h"
 #include "common/type_utils.h"
+#include "common/types/ku_list.h"
 #include "common/utils.h"
 
 namespace kuzu {

diff --git a/src/include/function/udf_function.h b/src/include/function/udf_function.h
@@ -3,6 +3,8 @@
 #include "common/exception/binder.h"
 #include "common/exception/catalog.h"
 #include "common/exception/not_implemented.h"
+#include "common/types/blob.h"
+#include "common/types/ku_string.h"
 #include "function/vector_functions.h"
 
 namespace kuzu {

diff --git a/src/include/main/storage_driver.h b/src/include/main/storage_driver.h
@@ -2,7 +2,7 @@
 
 #include <queue>
 
-#include "common/types/types_include.h"
+#include "common/types/internal_id_t.h"
 #include "database.h"
 
 namespace kuzu {

diff --git a/src/include/processor/operator/order_by/order_by_data_info.h b/src/include/processor/operator/order_by/order_by_data_info.h
@@ -1,6 +1,5 @@
 #pragma once
 
-#include "common/types/types_include.h"
 #include "processor/data_pos.h"
 #include "processor/result/factorized_table.h"
 

diff --git a/src/include/processor/operator/recursive_extend/frontier.h b/src/include/processor/operator/recursive_extend/frontier.h
@@ -2,7 +2,6 @@
 
 #include <unordered_map>
 
-#include "common/types/types_include.h"
 #include "function/hash/hash_functions.h"
 
 namespace kuzu {

diff --git a/src/include/storage/copier/string_column_chunk.h b/src/include/storage/copier/string_column_chunk.h
@@ -1,5 +1,6 @@
 #pragma once
 
+#include "common/types/blob.h"
 #include "storage/copier/column_chunk.h"
 #include "storage/storage_structure/in_mem_file.h"
 

diff --git a/src/include/storage/storage_structure/lists/list_headers.h b/src/include/storage/storage_structure/lists/list_headers.h
@@ -2,7 +2,6 @@
 
 #include <memory>
 
-#include "common/types/types_include.h"
 #include "storage/storage_structure/disk_array.h"
 
 namespace kuzu {

diff --git a/src/include/storage/storage_utils.h b/src/include/storage/storage_utils.h
@@ -7,7 +7,6 @@
 #include "common/constants.h"
 #include "common/file_utils.h"
 #include "common/null_mask.h"
-#include "common/types/types_include.h"
 #include "common/utils.h"
 #include "storage/wal/wal_record.h"
 

diff --git a/src/include/storage/wal/wal.h b/src/include/storage/wal/wal.h
@@ -2,7 +2,6 @@
 
 #include <unordered_set>
 
-#include "common/types/types_include.h"
 #include "storage/buffer_manager/buffer_manager.h"
 #include "storage/wal/wal_record.h"
 

diff --git a/src/include/storage/wal/wal_record.h b/src/include/storage/wal/wal_record.h
@@ -3,7 +3,8 @@
 #include "common/exception/not_implemented.h"
 #include "common/exception/runtime.h"
 #include "common/rel_direction.h"
-#include "common/types/types_include.h"
+#include "common/types/internal_id_t.h"
+#include "common/types/types.h"
 #include "common/utils.h"
 
 namespace kuzu {

diff --git a/src/processor/operator/persistent/csv_reader.cpp b/src/processor/operator/persistent/csv_reader.cpp
@@ -7,6 +7,7 @@
 #include "common/exception/not_implemented.h"
 #include "common/exception/parser.h"
 #include "common/string_utils.h"
+#include "common/types/blob.h"
 #include "processor/operator/persistent/csv_reader.h"
 #include "storage/copier/table_copy_utils.h"
 

diff --git a/src/storage/in_mem_storage_structure/in_mem_column_chunk.cpp b/src/storage/in_mem_storage_structure/in_mem_column_chunk.cpp
@@ -4,6 +4,7 @@
 #include "common/exception/message.h"
 #include "common/exception/not_implemented.h"
 #include "common/string_utils.h"
+#include "common/types/blob.h"
 #include "common/types/types.h"
 
 using namespace kuzu::common;

diff --git a/src/storage/in_mem_storage_structure/in_mem_lists.cpp b/src/storage/in_mem_storage_structure/in_mem_lists.cpp
@@ -2,6 +2,7 @@
 
 #include "common/exception/copy.h"
 #include "common/exception/message.h"
+#include "common/types/blob.h"
 #include "storage/copier/table_copy_utils.h"
 #include "storage/in_mem_storage_structure/in_mem_column_chunk.h"
 

diff --git a/test/common/date_test.cpp b/test/common/date_test.cpp
@@ -1,6 +1,6 @@
 #include <string>
 
-#include "common/types/types_include.h"
+#include "common/types/date_t.h"
 #include "gtest/gtest.h"
 
 using namespace kuzu::common;

diff --git a/test/common/interval_test.cpp b/test/common/interval_test.cpp
@@ -1,6 +1,6 @@
 #include <string>
 
-#include "common/types/types_include.h"
+#include "common/types/interval_t.h"
 #include "gtest/gtest.h"
 
 using namespace kuzu::common;

diff --git a/test/common/string_test.cpp b/test/common/string_test.cpp
@@ -1,7 +1,6 @@
 #include <string>
 
 #include "common/string_utils.h"
-#include "common/types/types_include.h"
 #include "gtest/gtest.h"
 
 using namespace kuzu::common;

diff --git a/test/common/time_test.cpp b/test/common/time_test.cpp
@@ -2,7 +2,7 @@
 
 #include "common/exception/conversion.h"
 #include "common/exception/test.h"
-#include "common/types/types_include.h"
+#include "common/types/timestamp_t.h"
 #include "gtest/gtest.h"
 
 using namespace kuzu::common;

diff --git a/test/common/timestamp_test.cpp b/test/common/timestamp_test.cpp
@@ -1,7 +1,8 @@
 #include <string>
 
 #include "common/exception/conversion.h"
-#include "common/types/types_include.h"
+#include "common/types/date_t.h"
+#include "common/types/timestamp_t.h"
 #include "gtest/gtest.h"
 
 using namespace kuzu::common;