kuzudb · Riolku · Sep 14, 2023 · Sep 7, 2023
diff --git a/src/binder/bind/bind_copy.cpp b/src/binder/bind/bind_copy.cpp
@@ -2,6 +2,9 @@
 #include "binder/copy/bound_copy_from.h"
 #include "binder/copy/bound_copy_to.h"
 #include "binder/expression/literal_expression.h"
+#include "common/exception/binder.h"
+#include "common/exception/copy.h"
+#include "common/exception/message.h"
 #include "common/string_utils.h"
 #include "common/table_type.h"
 #include "parser/copy.h"

diff --git a/src/binder/bind/bind_create_macro.cpp b/src/binder/bind/bind_create_macro.cpp
@@ -1,5 +1,6 @@
 #include "binder/binder.h"
 #include "binder/bound_create_macro.h"
+#include "common/exception/binder.h"
 #include "common/string_utils.h"
 #include "parser/create_macro.h"
 

diff --git a/src/binder/bind/bind_ddl.cpp b/src/binder/bind/bind_ddl.cpp
@@ -7,6 +7,7 @@
 #include "binder/ddl/bound_rename_table.h"
 #include "catalog/node_table_schema.h"
 #include "catalog/rel_table_schema.h"
+#include "common/exception/binder.h"
 #include "common/string_utils.h"
 #include "parser/ddl/add_property.h"
 #include "parser/ddl/create_table.h"

diff --git a/src/binder/bind/bind_graph_pattern.cpp b/src/binder/bind/bind_graph_pattern.cpp
@@ -6,6 +6,7 @@
 #include "catalog/node_table_schema.h"
 #include "catalog/rel_table_group_schema.h"
 #include "catalog/rel_table_schema.h"
+#include "common/exception/binder.h"
 
 using namespace kuzu::common;
 using namespace kuzu::parser;

diff --git a/src/binder/bind/bind_projection_clause.cpp b/src/binder/bind/bind_projection_clause.cpp
@@ -4,6 +4,7 @@
 #include "binder/expression_visitor.h"
 #include "binder/query/return_with_clause/bound_return_clause.h"
 #include "binder/query/return_with_clause/bound_with_clause.h"
+#include "common/exception/binder.h"
 #include "parser/expression/parsed_property_expression.h"
 
 using namespace kuzu::common;

diff --git a/src/binder/bind/bind_standalone_call.cpp b/src/binder/bind/bind_standalone_call.cpp
@@ -1,5 +1,6 @@
 #include "binder/binder.h"
 #include "binder/bound_standalone_call.h"
+#include "common/exception/binder.h"
 #include "parser/standalone_call.h"
 
 using namespace kuzu::common;

diff --git a/src/binder/bind/bind_updating_clause.cpp b/src/binder/bind/bind_updating_clause.cpp
@@ -5,6 +5,7 @@
 #include "binder/query/updating_clause/bound_merge_clause.h"
 #include "binder/query/updating_clause/bound_set_clause.h"
 #include "catalog/node_table_schema.h"
+#include "common/exception/binder.h"
 #include "parser/query/updating_clause/create_clause.h"
 #include "parser/query/updating_clause/delete_clause.h"
 #include "parser/query/updating_clause/merge_clause.h"

diff --git a/src/binder/bind_expression/bind_function_expression.cpp b/src/binder/bind_expression/bind_function_expression.cpp
@@ -3,6 +3,8 @@
 #include "binder/expression/function_expression.h"
 #include "binder/expression/literal_expression.h"
 #include "binder/expression_binder.h"
+#include "common/exception/binder.h"
+#include "common/exception/not_implemented.h"
 #include "common/string_utils.h"
 #include "function/schema/vector_label_functions.h"
 #include "parser/expression/parsed_function_expression.h"

diff --git a/src/binder/bind_expression/bind_property_expression.cpp b/src/binder/bind_expression/bind_property_expression.cpp
@@ -1,6 +1,7 @@
 #include "binder/expression/expression_util.h"
 #include "binder/expression/rel_expression.h"
 #include "binder/expression_binder.h"
+#include "common/exception/binder.h"
 #include "common/string_utils.h"
 #include "parser/expression/parsed_property_expression.h"
 

diff --git a/src/binder/bind_expression/bind_variable_expression.cpp b/src/binder/bind_expression/bind_variable_expression.cpp
@@ -1,6 +1,7 @@
 #include "binder/binder.h"
 #include "binder/expression/variable_expression.h"
 #include "binder/expression_binder.h"
+#include "common/exception/binder.h"
 #include "parser/expression/parsed_variable_expression.h"
 
 using namespace kuzu::common;

diff --git a/src/binder/binder.cpp b/src/binder/binder.cpp
@@ -3,6 +3,8 @@
 #include "binder/bound_statement_rewriter.h"
 #include "binder/expression/variable_expression.h"
 #include "catalog/rel_table_schema.h"
+#include "common/exception/binder.h"
+#include "common/exception/not_implemented.h"
 #include "common/string_utils.h"
 
 using namespace kuzu::common;

diff --git a/src/binder/bound_statement_visitor.cpp b/src/binder/bound_statement_visitor.cpp
@@ -1,6 +1,7 @@
 #include "binder/bound_statement_visitor.h"
 
 #include "binder/bound_explain.h"
+#include "common/exception/not_implemented.h"
 
 using namespace kuzu::common;
 

diff --git a/src/binder/expression_binder.cpp b/src/binder/expression_binder.cpp
@@ -5,6 +5,8 @@
 #include "binder/expression/literal_expression.h"
 #include "binder/expression/parameter_expression.h"
 #include "binder/expression_visitor.h"
+#include "common/exception/binder.h"
+#include "common/exception/not_implemented.h"
 #include "expression_evaluator/expression_evaluator_utils.h"
 #include "function/cast/vector_cast_functions.h"
 

diff --git a/src/c_api/connection.cpp b/src/c_api/connection.cpp
@@ -1,6 +1,6 @@
 #include "binder/bound_statement_result.h"
 #include "c_api/kuzu.h"
-#include "common/exception.h"
+#include "common/exception/exception.h"
 #include "common/types/value.h"
 #include "main/kuzu.h"
 #include "planner/logical_plan/logical_plan.h"

diff --git a/src/c_api/database.cpp b/src/c_api/database.cpp
@@ -1,5 +1,5 @@
 #include "c_api/kuzu.h"
-#include "common/exception.h"
+#include "common/exception/exception.h"
 #include "main/kuzu.h"
 
 using namespace kuzu::main;

diff --git a/src/catalog/catalog_content.cpp b/src/catalog/catalog_content.cpp
@@ -4,6 +4,8 @@
 #include "catalog/rdf_graph_schema.h"
 #include "catalog/rel_table_group_schema.h"
 #include "catalog/rel_table_schema.h"
+#include "common/exception/catalog.h"
+#include "common/exception/runtime.h"
 #include "common/ser_deser.h"
 #include "common/string_utils.h"
 #include "storage/storage_utils.h"

diff --git a/src/catalog/rel_table_schema.cpp b/src/catalog/rel_table_schema.cpp
@@ -1,6 +1,6 @@
 #include "catalog/rel_table_schema.h"
 
-#include "common/exception.h"
+#include "common/exception/catalog.h"
 #include "common/ser_deser.h"
 
 using namespace kuzu::common;

diff --git a/src/catalog/table_schema.cpp b/src/catalog/table_schema.cpp
@@ -5,7 +5,10 @@
 #include "catalog/rel_table_group_schema.h"
 #include "catalog/rel_table_schema.h"
 #include "common/constants.h"
-#include "common/exception.h"
+#include "common/exception/catalog.h"
+#include "common/exception/internal.h"
+#include "common/exception/not_implemented.h"
+#include "common/exception/runtime.h"
 #include "common/ser_deser.h"
 #include "common/string_utils.h"
 

diff --git a/src/common/CMakeLists.txt b/src/common/CMakeLists.txt
@@ -1,14 +1,14 @@
 add_subdirectory(arrow)
 add_subdirectory(copier_config)
 add_subdirectory(data_chunk)
+add_subdirectory(exception)
 add_subdirectory(task_system)
 add_subdirectory(types)
 add_subdirectory(vector)
 
 add_library(kuzu_common
         OBJECT
         assert.cpp
-        exception.cpp
         rel_direction.cpp
         expression_type.cpp
         file_utils.cpp

diff --git a/src/common/arrow/arrow_converter.cpp b/src/common/arrow/arrow_converter.cpp
@@ -1,6 +1,7 @@
 #include "common/arrow/arrow_converter.h"
 
 #include "common/arrow/arrow_row_batch.h"
+#include "common/exception/internal.h"
 
 namespace kuzu {
 namespace common {

diff --git a/src/common/assert.cpp b/src/common/assert.cpp
@@ -1,6 +1,6 @@
 #include "common/assert.h"
 
-#include "common/exception.h"
+#include "common/exception/internal.h"
 #include "common/string_utils.h"
 #include "common/utils.h"
 

diff --git a/src/common/copier_config/copier_config.cpp b/src/common/copier_config/copier_config.cpp
@@ -1,5 +1,7 @@
 #include "common/copier_config/copier_config.h"
 
+#include "common/exception/copy.h"
+#include "common/exception/internal.h"
 #include "common/type_utils.h"
 #include "utf8proc_wrapper.h"
 

diff --git a/src/common/exception/CMakeLists.txt b/src/common/exception/CMakeLists.txt
@@ -0,0 +1,7 @@
+add_library(kuzu_common_exception
+        OBJECT
+        message.cpp)
+
+set(ALL_OBJECT_FILES
+        ${ALL_OBJECT_FILES} $<TARGET_OBJECTS:kuzu_common_exception>
+        PARENT_SCOPE)
diff --git a/src/common/exception.cpp → src/common/exception/message.cpp b/src/common/exception.cpp → src/common/exception/message.cpp
@@ -1,4 +1,4 @@
-#include "common/exception.h"
+#include "common/exception/message.h"
 
 #include "common/string_utils.h"
 

diff --git a/src/common/expression_type.cpp b/src/common/expression_type.cpp
@@ -1,6 +1,6 @@
 #include "common/expression_type.h"
 
-#include "common/exception.h"
+#include "common/exception/not_implemented.h"
 
 namespace kuzu {
 namespace common {

diff --git a/src/common/file_utils.cpp b/src/common/file_utils.cpp
@@ -1,6 +1,6 @@
 #include "common/file_utils.h"
 
-#include "common/exception.h"
+#include "common/exception/storage.h"
 #include "common/string_utils.h"
 #include "glob/glob.hpp"
 

diff --git a/src/common/logging_level_utils.cpp b/src/common/logging_level_utils.cpp
@@ -1,5 +1,6 @@
 #include "common/logging_level_utils.h"
 
+#include "common/exception/conversion.h"
 #include "common/string_utils.h"
 #include "common/utils.h"
 

diff --git a/src/common/rel_direction.cpp b/src/common/rel_direction.cpp
@@ -1,6 +1,6 @@
 #include "common/rel_direction.h"
 
-#include "common/exception.h"
+#include "common/exception/not_implemented.h"
 
 namespace kuzu {
 namespace common {

diff --git a/src/common/type_utils.cpp b/src/common/type_utils.cpp
@@ -1,6 +1,7 @@
 #include "common/type_utils.h"
 
-#include "common/exception.h"
+#include "common/exception/conversion.h"
+#include "common/exception/runtime.h"
 #include "common/string_utils.h"
 #include "common/vector/value_vector.h"
 

diff --git a/src/common/types/blob.cpp b/src/common/types/blob.cpp
@@ -1,6 +1,6 @@
 #include "common/types/blob.h"
 
-#include "common/exception.h"
+#include "common/exception/conversion.h"
 #include "common/string_utils.h"
 
 namespace kuzu {

diff --git a/src/common/types/date_t.cpp b/src/common/types/date_t.cpp
@@ -1,7 +1,7 @@
 #include "common/types/date_t.h"
 
 #include "common/assert.h"
-#include "common/exception.h"
+#include "common/exception/conversion.h"
 #include "common/string_utils.h"
 #include "common/types/cast_helpers.h"
 #include "common/types/timestamp_t.h"

diff --git a/src/common/types/dtime_t.cpp b/src/common/types/dtime_t.cpp
@@ -1,6 +1,6 @@
 #include "common/types/dtime_t.h"
 
-#include "common/exception.h"
+#include "common/exception/conversion.h"
 #include "common/string_utils.h"
 #include "common/types/cast_helpers.h"
 #include "common/types/date_t.h"

diff --git a/src/common/types/interval_t.cpp b/src/common/types/interval_t.cpp
@@ -1,6 +1,6 @@
 #include "common/types/interval_t.h"
 
-#include "common/exception.h"
+#include "common/exception/conversion.h"
 #include "common/string_utils.h"
 #include "common/types/cast_helpers.h"
 #include "common/types/timestamp_t.h"

diff --git a/src/common/types/timestamp_t.cpp b/src/common/types/timestamp_t.cpp
@@ -1,6 +1,6 @@
 #include "common/types/timestamp_t.h"
 
-#include "common/exception.h"
+#include "common/exception/conversion.h"
 #include "common/string_utils.h"
 
 namespace kuzu {

diff --git a/src/common/types/types.cpp b/src/common/types/types.cpp
@@ -3,7 +3,8 @@
 #include <stdexcept>
 
 #include "common/constants.h"
-#include "common/exception.h"
+#include "common/exception/binder.h"
+#include "common/exception/not_implemented.h"
 #include "common/null_buffer.h"
 #include "common/ser_deser.h"
 #include "common/string_utils.h"

diff --git a/src/common/utils.cpp b/src/common/utils.cpp
@@ -1,5 +1,6 @@
 #include "common/utils.h"
 
+#include "common/exception/not_implemented.h"
 #include "spdlog/sinks/stdout_sinks.h"
 #include "spdlog/spdlog.h"
 

diff --git a/src/function/built_in_aggregate_functions.cpp b/src/function/built_in_aggregate_functions.cpp
@@ -1,5 +1,6 @@
 #include "function/aggregate/built_in_aggregate_functions.h"
 
+#include "common/exception/binder.h"
 #include "function/aggregate/collect.h"
 #include "function/aggregate/count.h"
 

diff --git a/src/function/built_in_table_functions.cpp b/src/function/built_in_table_functions.cpp
@@ -1,5 +1,6 @@
 #include "function/built_in_table_functions.h"
 
+#include "common/exception/binder.h"
 #include "common/expression_type.h"
 #include "common/string_utils.h"
 

diff --git a/src/function/built_in_vector_functions.cpp b/src/function/built_in_vector_functions.cpp
@@ -1,5 +1,7 @@
 #include "function/built_in_vector_functions.h"
 
+#include "common/exception/binder.h"
+#include "common/exception/catalog.h"
 #include "common/string_utils.h"
 #include "function/arithmetic/vector_arithmetic_functions.h"
 #include "function/blob/vector_blob_functions.h"

diff --git a/src/function/vector_list_functions.cpp b/src/function/vector_list_functions.cpp
@@ -2,6 +2,9 @@
 
 #include "binder/expression/literal_expression.h"
 #include "binder/expression_binder.h"
+#include "common/exception/binder.h"
+#include "common/exception/not_implemented.h"
+#include "common/exception/runtime.h"
 #include "common/types/ku_list.h"
 #include "function/list/functions/list_any_value_function.h"
 #include "function/list/functions/list_append_function.h"

diff --git a/src/function/vector_path_functions.cpp b/src/function/vector_path_functions.cpp
@@ -1,6 +1,7 @@
 #include "function/path/vector_path_functions.h"
 
 #include "binder/expression/literal_expression.h"
+#include "common/exception/binder.h"
 #include "common/string_utils.h"
 #include "function/path/path_function_executor.h"
 #include "function/struct/vector_struct_functions.h"

diff --git a/src/function/vector_struct_functions.cpp b/src/function/vector_struct_functions.cpp
@@ -2,6 +2,7 @@
 
 #include "binder/expression/literal_expression.h"
 #include "binder/expression_binder.h"
+#include "common/exception/binder.h"
 #include "common/string_utils.h"
 #include "function/function_definition.h"
 

diff --git a/src/include/binder/expression/expression.h b/src/include/binder/expression/expression.h
@@ -6,7 +6,7 @@
 #include <unordered_map>
 #include <unordered_set>
 
-#include "common/exception.h"
+#include "common/exception/internal.h"
 #include "common/expression_type.h"
 #include "common/types/types_include.h"
 

diff --git a/src/include/binder/expression/rel_expression.h b/src/include/binder/expression/rel_expression.h
@@ -1,6 +1,5 @@
 #pragma once
 
-#include "common/exception.h"
 #include "common/query_rel_type.h"
 #include "node_expression.h"