From 8acfdd4619b9637bc840ffbeb3b8f68ef26c67e7 Mon Sep 17 00:00:00 2001 From: "xiaolei.zl" Date: Wed, 6 May 2026 14:34:17 +0800 Subject: [PATCH] merge proto related target into one --- src/common/CMakeLists.txt | 2 +- src/compiler/binder/CMakeLists.txt | 2 +- src/compiler/binder/bind/CMakeLists.txt | 2 +- src/compiler/binder/bind/copy/CMakeLists.txt | 2 +- src/compiler/binder/bind/ddl/CMakeLists.txt | 2 +- src/compiler/binder/bind/read/CMakeLists.txt | 2 +- .../binder/bind_expression/CMakeLists.txt | 2 +- src/compiler/binder/ddl/CMakeLists.txt | 2 +- src/compiler/binder/expression/CMakeLists.txt | 2 +- src/compiler/binder/query/CMakeLists.txt | 2 +- src/compiler/binder/rewriter/CMakeLists.txt | 2 +- src/compiler/binder/visitor/CMakeLists.txt | 2 +- src/compiler/catalog/CMakeLists.txt | 2 +- .../catalog/catalog_entry/CMakeLists.txt | 2 +- src/compiler/common/CMakeLists.txt | 2 +- src/compiler/common/arrow/CMakeLists.txt | 2 +- .../common/copier_config/CMakeLists.txt | 2 +- src/compiler/common/data_chunk/CMakeLists.txt | 2 +- src/compiler/common/enums/CMakeLists.txt | 2 +- .../common/task_system/CMakeLists.txt | 2 +- src/compiler/extension/CMakeLists.txt | 2 +- src/compiler/function/CMakeLists.txt | 2 +- .../function/aggregate/CMakeLists.txt | 2 +- .../function/arithmetic/CMakeLists.txt | 2 +- src/compiler/function/cast/CMakeLists.txt | 2 +- src/compiler/function/gds/CMakeLists.txt | 2 +- src/compiler/function/list/CMakeLists.txt | 2 +- src/compiler/function/path/CMakeLists.txt | 2 +- src/compiler/function/pattern/CMakeLists.txt | 2 +- src/compiler/function/struct/CMakeLists.txt | 2 +- src/compiler/function/table/CMakeLists.txt | 2 +- src/compiler/gopt/CMakeLists.txt | 2 +- src/compiler/graph/CMakeLists.txt | 2 +- src/compiler/main/CMakeLists.txt | 2 +- src/compiler/optimizer/CMakeLists.txt | 2 +- src/compiler/parser/CMakeLists.txt | 2 +- .../parser/antlr_parser/CMakeLists.txt | 2 +- src/compiler/parser/expression/CMakeLists.txt | 2 +- src/compiler/parser/transform/CMakeLists.txt | 2 +- src/compiler/parser/visitor/CMakeLists.txt | 2 +- src/compiler/planner/CMakeLists.txt | 2 +- .../planner/join_order/CMakeLists.txt | 2 +- src/compiler/planner/operator/CMakeLists.txt | 2 +- .../planner/operator/extend/CMakeLists.txt | 2 +- .../operator/factorization/CMakeLists.txt | 2 +- .../operator/persistent/CMakeLists.txt | 2 +- .../planner/operator/scan/CMakeLists.txt | 2 +- .../planner/operator/simple/CMakeLists.txt | 2 +- src/compiler/planner/plan/CMakeLists.txt | 2 +- src/compiler/transaction/CMakeLists.txt | 2 +- src/execution/CMakeLists.txt | 2 +- src/main/CMakeLists.txt | 2 +- src/server/CMakeLists.txt | 2 +- src/storages/csr/CMakeLists.txt | 2 +- src/storages/graph/CMakeLists.txt | 2 +- src/storages/loader/CMakeLists.txt | 2 +- src/transaction/CMakeLists.txt | 2 +- src/utils/CMakeLists.txt | 91 ++++++++----------- tools/python_bind/CMakeLists.txt | 2 +- 59 files changed, 94 insertions(+), 113 deletions(-) diff --git a/src/common/CMakeLists.txt b/src/common/CMakeLists.txt index 4ddca1030..4efe47bc2 100644 --- a/src/common/CMakeLists.txt +++ b/src/common/CMakeLists.txt @@ -1,6 +1,6 @@ file(GLOB_RECURSE EXECUTION_SRC_FILES "${CMAKE_CURRENT_SOURCE_DIR}/*.cc") add_library(neug_common OBJECT ${EXECUTION_SRC_FILES}) -add_dependencies(neug_common neug_plan_proto) +add_dependencies(neug_common neug_proto) set(ALL_OBJECT_FILES ${ALL_OBJECT_FILES} $ diff --git a/src/compiler/binder/CMakeLists.txt b/src/compiler/binder/CMakeLists.txt index c766f9f21..0104f2945 100644 --- a/src/compiler/binder/CMakeLists.txt +++ b/src/compiler/binder/CMakeLists.txt @@ -21,7 +21,7 @@ add_library(neug_binder expression_mapper.cpp function_evaluator.cpp literal_evaluator.cpp) -add_dependencies(neug_binder neug_plan_proto) +add_dependencies(neug_binder neug_proto) set(ALL_OBJECT_FILES ${ALL_OBJECT_FILES} $ diff --git a/src/compiler/binder/bind/CMakeLists.txt b/src/compiler/binder/bind/CMakeLists.txt index 34e2ef01a..642bd0306 100644 --- a/src/compiler/binder/bind/CMakeLists.txt +++ b/src/compiler/binder/bind/CMakeLists.txt @@ -23,7 +23,7 @@ add_library( bind_use_database.cpp bind_standalone_call_function.cpp bind_table_function.cpp) -add_dependencies(neug_binder_bind neug_plan_proto) +add_dependencies(neug_binder_bind neug_proto) set(ALL_OBJECT_FILES ${ALL_OBJECT_FILES} $ diff --git a/src/compiler/binder/bind/copy/CMakeLists.txt b/src/compiler/binder/bind/copy/CMakeLists.txt index fbf173d38..86ca79a2a 100644 --- a/src/compiler/binder/bind/copy/CMakeLists.txt +++ b/src/compiler/binder/bind/copy/CMakeLists.txt @@ -2,7 +2,7 @@ add_library(neug_binder_bind_copy OBJECT bind_copy_to.cpp bind_copy_from.cpp) -add_dependencies(neug_binder_bind_copy neug_plan_proto) +add_dependencies(neug_binder_bind_copy neug_proto) set(ALL_OBJECT_FILES ${ALL_OBJECT_FILES} $ diff --git a/src/compiler/binder/bind/ddl/CMakeLists.txt b/src/compiler/binder/bind/ddl/CMakeLists.txt index b58a3d966..8a8f0f72d 100644 --- a/src/compiler/binder/bind/ddl/CMakeLists.txt +++ b/src/compiler/binder/bind/ddl/CMakeLists.txt @@ -1,7 +1,7 @@ add_library(neug_binder_bind_ddl OBJECT bound_create_table_info.cpp) -add_dependencies(neug_binder_bind_ddl neug_plan_proto) +add_dependencies(neug_binder_bind_ddl neug_proto) set(ALL_OBJECT_FILES ${ALL_OBJECT_FILES} $ diff --git a/src/compiler/binder/bind/read/CMakeLists.txt b/src/compiler/binder/bind/read/CMakeLists.txt index 7140b4891..6041aee04 100644 --- a/src/compiler/binder/bind/read/CMakeLists.txt +++ b/src/compiler/binder/bind/read/CMakeLists.txt @@ -4,7 +4,7 @@ add_library(neug_binder_bind_read bind_load_from.cpp bind_match.cpp bind_unwind.cpp) -add_dependencies(neug_binder_bind_read neug_plan_proto) +add_dependencies(neug_binder_bind_read neug_proto) set(ALL_OBJECT_FILES ${ALL_OBJECT_FILES} $ diff --git a/src/compiler/binder/bind_expression/CMakeLists.txt b/src/compiler/binder/bind_expression/CMakeLists.txt index f41d33247..b81958ef6 100644 --- a/src/compiler/binder/bind_expression/CMakeLists.txt +++ b/src/compiler/binder/bind_expression/CMakeLists.txt @@ -13,7 +13,7 @@ add_library( bind_variable_expression.cpp bind_lambda_expression.cpp) -add_dependencies(neug_binder_bind_expression neug_plan_proto) +add_dependencies(neug_binder_bind_expression neug_proto) set(ALL_OBJECT_FILES ${ALL_OBJECT_FILES} $ diff --git a/src/compiler/binder/ddl/CMakeLists.txt b/src/compiler/binder/ddl/CMakeLists.txt index 4e905ec31..e719a98ac 100644 --- a/src/compiler/binder/ddl/CMakeLists.txt +++ b/src/compiler/binder/ddl/CMakeLists.txt @@ -3,7 +3,7 @@ add_library( OBJECT bound_alter_info.cpp property_definition.cpp) -add_dependencies(neug_binder_ddl neug_plan_proto) +add_dependencies(neug_binder_ddl neug_proto) set(ALL_OBJECT_FILES ${ALL_OBJECT_FILES} $ diff --git a/src/compiler/binder/expression/CMakeLists.txt b/src/compiler/binder/expression/CMakeLists.txt index 7f707b106..56eb33d7d 100644 --- a/src/compiler/binder/expression/CMakeLists.txt +++ b/src/compiler/binder/expression/CMakeLists.txt @@ -14,7 +14,7 @@ add_library( scalar_function_expression.cpp variable_expression.cpp) -add_dependencies(neug_binder_expression neug_plan_proto) +add_dependencies(neug_binder_expression neug_proto) set(ALL_OBJECT_FILES ${ALL_OBJECT_FILES} $ diff --git a/src/compiler/binder/query/CMakeLists.txt b/src/compiler/binder/query/CMakeLists.txt index 2e5784c48..a51460e42 100644 --- a/src/compiler/binder/query/CMakeLists.txt +++ b/src/compiler/binder/query/CMakeLists.txt @@ -7,7 +7,7 @@ add_library( bound_set_clause.cpp query_graph.cpp query_graph_label_analyzer.cpp) -add_dependencies(neug_binder_query neug_plan_proto) +add_dependencies(neug_binder_query neug_proto) set(ALL_OBJECT_FILES ${ALL_OBJECT_FILES} $ diff --git a/src/compiler/binder/rewriter/CMakeLists.txt b/src/compiler/binder/rewriter/CMakeLists.txt index e39206083..b4778ae82 100644 --- a/src/compiler/binder/rewriter/CMakeLists.txt +++ b/src/compiler/binder/rewriter/CMakeLists.txt @@ -4,7 +4,7 @@ add_library( match_clause_pattern_label_rewriter.cpp normalized_query_part_match_rewriter.cpp with_clause_projection_rewriter.cpp) -add_dependencies(neug_binder_rewriter neug_plan_proto) +add_dependencies(neug_binder_rewriter neug_proto) set(ALL_OBJECT_FILES ${ALL_OBJECT_FILES} $ diff --git a/src/compiler/binder/visitor/CMakeLists.txt b/src/compiler/binder/visitor/CMakeLists.txt index 917f5c880..ded77b336 100644 --- a/src/compiler/binder/visitor/CMakeLists.txt +++ b/src/compiler/binder/visitor/CMakeLists.txt @@ -4,7 +4,7 @@ add_library( confidential_statement_analyzer.cpp default_type_solver.cpp property_collector.cpp) -add_dependencies(neug_binder_visitor neug_plan_proto) +add_dependencies(neug_binder_visitor neug_proto) set(ALL_OBJECT_FILES ${ALL_OBJECT_FILES} $ diff --git a/src/compiler/catalog/CMakeLists.txt b/src/compiler/catalog/CMakeLists.txt index fb3419363..2917f3244 100644 --- a/src/compiler/catalog/CMakeLists.txt +++ b/src/compiler/catalog/CMakeLists.txt @@ -6,7 +6,7 @@ add_library(neug_catalog catalog_set.cpp property_definition_collection.cpp) -add_dependencies(neug_catalog neug_plan_proto) +add_dependencies(neug_catalog neug_proto) set(ALL_OBJECT_FILES ${ALL_OBJECT_FILES} $ diff --git a/src/compiler/catalog/catalog_entry/CMakeLists.txt b/src/compiler/catalog/catalog_entry/CMakeLists.txt index e3939c038..670a24fd4 100644 --- a/src/compiler/catalog/catalog_entry/CMakeLists.txt +++ b/src/compiler/catalog/catalog_entry/CMakeLists.txt @@ -11,7 +11,7 @@ add_library(neug_catalog_entry type_catalog_entry.cpp sequence_catalog_entry.cpp index_catalog_entry.cpp) -add_dependencies(neug_catalog_entry neug_plan_proto) +add_dependencies(neug_catalog_entry neug_proto) set(ALL_OBJECT_FILES ${ALL_OBJECT_FILES} $ diff --git a/src/compiler/common/CMakeLists.txt b/src/compiler/common/CMakeLists.txt index a4702fe2a..787b8d8bb 100644 --- a/src/compiler/common/CMakeLists.txt +++ b/src/compiler/common/CMakeLists.txt @@ -24,7 +24,7 @@ add_library(compiler_common type_utils.cpp utils.cpp windows_utils.cpp) -add_dependencies(compiler_common neug_plan_proto) +add_dependencies(compiler_common neug_proto) set(ALL_OBJECT_FILES ${ALL_OBJECT_FILES} $ diff --git a/src/compiler/common/arrow/CMakeLists.txt b/src/compiler/common/arrow/CMakeLists.txt index 9cc2f3f6b..4c29d7184 100644 --- a/src/compiler/common/arrow/CMakeLists.txt +++ b/src/compiler/common/arrow/CMakeLists.txt @@ -5,7 +5,7 @@ add_library(neug_common_arrow arrow_null_mask_tree.cpp arrow_row_batch.cpp arrow_type.cpp) -add_dependencies(neug_common_arrow neug_plan_proto) +add_dependencies(neug_common_arrow neug_proto) set(ALL_OBJECT_FILES ${ALL_OBJECT_FILES} $ diff --git a/src/compiler/common/copier_config/CMakeLists.txt b/src/compiler/common/copier_config/CMakeLists.txt index 825717bfa..464fd2984 100644 --- a/src/compiler/common/copier_config/CMakeLists.txt +++ b/src/compiler/common/copier_config/CMakeLists.txt @@ -2,7 +2,7 @@ add_library(neug_common_copier_config OBJECT csv_reader_config.cpp reader_config.cpp) -add_dependencies(neug_common_copier_config neug_plan_proto) +add_dependencies(neug_common_copier_config neug_proto) set(ALL_OBJECT_FILES ${ALL_OBJECT_FILES} $ diff --git a/src/compiler/common/data_chunk/CMakeLists.txt b/src/compiler/common/data_chunk/CMakeLists.txt index 81d8e7235..a9d91b3be 100644 --- a/src/compiler/common/data_chunk/CMakeLists.txt +++ b/src/compiler/common/data_chunk/CMakeLists.txt @@ -4,7 +4,7 @@ add_library(neug_common_data_chunk data_chunk_collection.cpp data_chunk_state.cpp sel_vector.cpp) -add_dependencies(neug_common_data_chunk neug_plan_proto) +add_dependencies(neug_common_data_chunk neug_proto) set(ALL_OBJECT_FILES ${ALL_OBJECT_FILES} $ diff --git a/src/compiler/common/enums/CMakeLists.txt b/src/compiler/common/enums/CMakeLists.txt index f8fb1e92b..edd61852e 100644 --- a/src/compiler/common/enums/CMakeLists.txt +++ b/src/compiler/common/enums/CMakeLists.txt @@ -11,7 +11,7 @@ add_library(neug_common_enums drop_type.cpp extend_direction_util.cpp conflict_action.cpp) -add_dependencies(neug_common_enums neug_plan_proto) +add_dependencies(neug_common_enums neug_proto) set(ALL_OBJECT_FILES ${ALL_OBJECT_FILES} $ diff --git a/src/compiler/common/task_system/CMakeLists.txt b/src/compiler/common/task_system/CMakeLists.txt index 415bd53b2..15160644b 100644 --- a/src/compiler/common/task_system/CMakeLists.txt +++ b/src/compiler/common/task_system/CMakeLists.txt @@ -4,7 +4,7 @@ add_library(neug_common_task_system task_scheduler.cpp progress_bar.cpp terminal_progress_bar_display.cpp) -add_dependencies(neug_common_task_system neug_plan_proto) +add_dependencies(neug_common_task_system neug_proto) set(ALL_OBJECT_FILES ${ALL_OBJECT_FILES} $ PARENT_SCOPE) diff --git a/src/compiler/extension/CMakeLists.txt b/src/compiler/extension/CMakeLists.txt index 4f79591a7..f6298ee4a 100644 --- a/src/compiler/extension/CMakeLists.txt +++ b/src/compiler/extension/CMakeLists.txt @@ -58,7 +58,7 @@ add_library(neug_extension extension_api.cpp extension_entries.cpp extension_manager.cpp) -add_dependencies(neug_extension neug_plan_proto) +add_dependencies(neug_extension neug_proto) set(ALL_OBJECT_FILES ${ALL_OBJECT_FILES} $ diff --git a/src/compiler/function/CMakeLists.txt b/src/compiler/function/CMakeLists.txt index c38eeecd7..02e500acd 100644 --- a/src/compiler/function/CMakeLists.txt +++ b/src/compiler/function/CMakeLists.txt @@ -25,7 +25,7 @@ add_library(neug_function vector_date_functions.cpp vector_string_functions.cpp csv_export_function.cpp) -add_dependencies(neug_function neug_plan_proto neug_utils) +add_dependencies(neug_function neug_proto neug_utils) set(ALL_OBJECT_FILES ${ALL_OBJECT_FILES} $ diff --git a/src/compiler/function/aggregate/CMakeLists.txt b/src/compiler/function/aggregate/CMakeLists.txt index 9f2c3332c..423ce513a 100644 --- a/src/compiler/function/aggregate/CMakeLists.txt +++ b/src/compiler/function/aggregate/CMakeLists.txt @@ -6,7 +6,7 @@ add_library(neug_function_aggregate min_max.cpp sum.cpp avg.cpp) -add_dependencies(neug_function_aggregate neug_plan_proto) +add_dependencies(neug_function_aggregate neug_proto) set(ALL_OBJECT_FILES ${ALL_OBJECT_FILES} $ diff --git a/src/compiler/function/arithmetic/CMakeLists.txt b/src/compiler/function/arithmetic/CMakeLists.txt index 1ca20b9fa..15917185a 100644 --- a/src/compiler/function/arithmetic/CMakeLists.txt +++ b/src/compiler/function/arithmetic/CMakeLists.txt @@ -7,7 +7,7 @@ add_library(neug_function_arithmetic modulo.cpp negate.cpp abs.cpp) -add_dependencies(neug_function_arithmetic neug_plan_proto) +add_dependencies(neug_function_arithmetic neug_proto) set(ALL_OBJECT_FILES ${ALL_OBJECT_FILES} $ diff --git a/src/compiler/function/cast/CMakeLists.txt b/src/compiler/function/cast/CMakeLists.txt index 21745699c..b60d947cc 100644 --- a/src/compiler/function/cast/CMakeLists.txt +++ b/src/compiler/function/cast/CMakeLists.txt @@ -1,7 +1,7 @@ add_library(neug_function_cast OBJECT cast_array.cpp) -add_dependencies(neug_function_cast neug_plan_proto) +add_dependencies(neug_function_cast neug_proto) set(ALL_OBJECT_FILES ${ALL_OBJECT_FILES} $ diff --git a/src/compiler/function/gds/CMakeLists.txt b/src/compiler/function/gds/CMakeLists.txt index c889a902a..17ee9a3fc 100644 --- a/src/compiler/function/gds/CMakeLists.txt +++ b/src/compiler/function/gds/CMakeLists.txt @@ -1,7 +1,7 @@ add_library(gds_function STATIC rec_joins.cpp) -add_dependencies(gds_function neug_plan_proto) +add_dependencies(gds_function neug_proto) target_include_directories(gds_function PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}/../include) diff --git a/src/compiler/function/list/CMakeLists.txt b/src/compiler/function/list/CMakeLists.txt index e2dbd3112..206855402 100644 --- a/src/compiler/function/list/CMakeLists.txt +++ b/src/compiler/function/list/CMakeLists.txt @@ -5,7 +5,7 @@ add_library(neug_list_function list_creation.cpp list_extract_function.cpp list_unique_function.cpp) -add_dependencies(neug_list_function neug_plan_proto) +add_dependencies(neug_list_function neug_proto) set(ALL_OBJECT_FILES ${ALL_OBJECT_FILES} $ diff --git a/src/compiler/function/path/CMakeLists.txt b/src/compiler/function/path/CMakeLists.txt index 3320fdf41..58361edc2 100644 --- a/src/compiler/function/path/CMakeLists.txt +++ b/src/compiler/function/path/CMakeLists.txt @@ -5,7 +5,7 @@ add_library(neug_function_path properties_function.cpp rels_function.cpp semantic_function.cpp) -add_dependencies(neug_function_path neug_plan_proto) +add_dependencies(neug_function_path neug_proto) set(ALL_OBJECT_FILES ${ALL_OBJECT_FILES} $ diff --git a/src/compiler/function/pattern/CMakeLists.txt b/src/compiler/function/pattern/CMakeLists.txt index f0ec37a5e..1d89624f2 100644 --- a/src/compiler/function/pattern/CMakeLists.txt +++ b/src/compiler/function/pattern/CMakeLists.txt @@ -4,7 +4,7 @@ add_library(neug_function_pattern id_function.cpp label_function.cpp start_end_node_function.cpp) -add_dependencies(neug_function_pattern neug_plan_proto) +add_dependencies(neug_function_pattern neug_proto) set(ALL_OBJECT_FILES ${ALL_OBJECT_FILES} $ diff --git a/src/compiler/function/struct/CMakeLists.txt b/src/compiler/function/struct/CMakeLists.txt index 482582569..22b704ee8 100644 --- a/src/compiler/function/struct/CMakeLists.txt +++ b/src/compiler/function/struct/CMakeLists.txt @@ -1,7 +1,7 @@ add_library(neug_function_struct OBJECT struct_extract_function.cpp) -add_dependencies(neug_function_struct neug_plan_proto) +add_dependencies(neug_function_struct neug_proto) set(ALL_OBJECT_FILES ${ALL_OBJECT_FILES} $ diff --git a/src/compiler/function/table/CMakeLists.txt b/src/compiler/function/table/CMakeLists.txt index 16ee10f19..337db690f 100644 --- a/src/compiler/function/table/CMakeLists.txt +++ b/src/compiler/function/table/CMakeLists.txt @@ -3,7 +3,7 @@ add_library(neug_table_function bind_data.cpp bind_input.cpp table_function.cpp) -add_dependencies(neug_table_function neug_plan_proto) +add_dependencies(neug_table_function neug_proto) set(ALL_OBJECT_FILES ${ALL_OBJECT_FILES} $ diff --git a/src/compiler/gopt/CMakeLists.txt b/src/compiler/gopt/CMakeLists.txt index af79a01d3..2182a7dd7 100644 --- a/src/compiler/gopt/CMakeLists.txt +++ b/src/compiler/gopt/CMakeLists.txt @@ -9,7 +9,7 @@ add_library(neug_gopt g_query_converter.cpp g_precedence.cpp ) -add_dependencies(neug_gopt neug_plan_proto) +add_dependencies(neug_gopt neug_proto) set(ALL_OBJECT_FILES diff --git a/src/compiler/graph/CMakeLists.txt b/src/compiler/graph/CMakeLists.txt index b4b24e551..d23d077df 100644 --- a/src/compiler/graph/CMakeLists.txt +++ b/src/compiler/graph/CMakeLists.txt @@ -3,7 +3,7 @@ add_library(neug_graph graph.cpp graph_entry.cpp on_disk_graph.cpp) -add_dependencies(neug_graph neug_plan_proto) +add_dependencies(neug_graph neug_proto) set(ALL_OBJECT_FILES ${ALL_OBJECT_FILES} $ diff --git a/src/compiler/main/CMakeLists.txt b/src/compiler/main/CMakeLists.txt index 89c2f0f99..15986222c 100644 --- a/src/compiler/main/CMakeLists.txt +++ b/src/compiler/main/CMakeLists.txt @@ -8,7 +8,7 @@ add_library(neug_compiler_main query_summary.cpp storage_manager.cpp settings.cpp) -add_dependencies(neug_compiler_main neug_plan_proto) +add_dependencies(neug_compiler_main neug_proto) set(ALL_OBJECT_FILES ${ALL_OBJECT_FILES} $ diff --git a/src/compiler/optimizer/CMakeLists.txt b/src/compiler/optimizer/CMakeLists.txt index 842760d37..44ce26723 100644 --- a/src/compiler/optimizer/CMakeLists.txt +++ b/src/compiler/optimizer/CMakeLists.txt @@ -22,7 +22,7 @@ add_library(neug_optimizer remove_subquery_as_join.cpp common_pattern_reuse_optimizer.cpp project_join_condition_optimizer.cpp) -add_dependencies(neug_optimizer neug_plan_proto) +add_dependencies(neug_optimizer neug_proto) set(ALL_OBJECT_FILES ${ALL_OBJECT_FILES} $ diff --git a/src/compiler/parser/CMakeLists.txt b/src/compiler/parser/CMakeLists.txt index bf40b0057..4f0f2c15a 100644 --- a/src/compiler/parser/CMakeLists.txt +++ b/src/compiler/parser/CMakeLists.txt @@ -10,7 +10,7 @@ add_library(neug_parser parsed_statement_visitor.cpp transformer.cpp) -add_dependencies(neug_parser neug_plan_proto) +add_dependencies(neug_parser neug_proto) set(ALL_OBJECT_FILES ${ALL_OBJECT_FILES} $ diff --git a/src/compiler/parser/antlr_parser/CMakeLists.txt b/src/compiler/parser/antlr_parser/CMakeLists.txt index 708fcca0d..85b44c0c7 100644 --- a/src/compiler/parser/antlr_parser/CMakeLists.txt +++ b/src/compiler/parser/antlr_parser/CMakeLists.txt @@ -3,7 +3,7 @@ add_library(neug_parser_antlr_parser kuzu_cypher_parser.cpp parser_error_listener.cpp parser_error_strategy.cpp) -add_dependencies(neug_parser_antlr_parser neug_plan_proto) +add_dependencies(neug_parser_antlr_parser neug_proto) set(ALL_OBJECT_FILES ${ALL_OBJECT_FILES} $ diff --git a/src/compiler/parser/expression/CMakeLists.txt b/src/compiler/parser/expression/CMakeLists.txt index d93e76a37..7ed337d07 100644 --- a/src/compiler/parser/expression/CMakeLists.txt +++ b/src/compiler/parser/expression/CMakeLists.txt @@ -6,7 +6,7 @@ add_library(neug_parser_expression parsed_function_expression.cpp parsed_property_expression.cpp parsed_variable_expression.cpp) -add_dependencies(neug_parser_expression neug_plan_proto) +add_dependencies(neug_parser_expression neug_proto) set(ALL_OBJECT_FILES ${ALL_OBJECT_FILES} $ diff --git a/src/compiler/parser/transform/CMakeLists.txt b/src/compiler/parser/transform/CMakeLists.txt index 900471811..68a7abdf1 100644 --- a/src/compiler/parser/transform/CMakeLists.txt +++ b/src/compiler/parser/transform/CMakeLists.txt @@ -16,7 +16,7 @@ add_library(neug_parser_transform transform_attach_database.cpp transform_detach_database.cpp transform_use_database.cpp) -add_dependencies(neug_parser_transform neug_plan_proto) +add_dependencies(neug_parser_transform neug_proto) set(ALL_OBJECT_FILES ${ALL_OBJECT_FILES} $ diff --git a/src/compiler/parser/visitor/CMakeLists.txt b/src/compiler/parser/visitor/CMakeLists.txt index 2ef0083d7..d4bcf36ba 100644 --- a/src/compiler/parser/visitor/CMakeLists.txt +++ b/src/compiler/parser/visitor/CMakeLists.txt @@ -3,7 +3,7 @@ add_library( OBJECT standalone_call_rewriter.cpp statement_read_write_analyzer.cpp) -add_dependencies(neug_parser_visitor neug_plan_proto) +add_dependencies(neug_parser_visitor neug_proto) set(ALL_OBJECT_FILES ${ALL_OBJECT_FILES} $ diff --git a/src/compiler/planner/CMakeLists.txt b/src/compiler/planner/CMakeLists.txt index 02237690c..a47c36c0a 100644 --- a/src/compiler/planner/CMakeLists.txt +++ b/src/compiler/planner/CMakeLists.txt @@ -10,7 +10,7 @@ add_library(neug_compiler_planner subplans_table.cpp gopt_planner.cc ) -add_dependencies(neug_compiler_planner neug_plan_proto) +add_dependencies(neug_compiler_planner neug_proto) set(ALL_OBJECT_FILES ${ALL_OBJECT_FILES} $ diff --git a/src/compiler/planner/join_order/CMakeLists.txt b/src/compiler/planner/join_order/CMakeLists.txt index 23217d0ad..8de1f4f9f 100644 --- a/src/compiler/planner/join_order/CMakeLists.txt +++ b/src/compiler/planner/join_order/CMakeLists.txt @@ -6,7 +6,7 @@ add_library(neug_planner_join_order join_plan_solver.cpp join_tree.cpp join_tree_constructor.cpp) -add_dependencies(neug_planner_join_order neug_plan_proto) +add_dependencies(neug_planner_join_order neug_proto) set(ALL_OBJECT_FILES ${ALL_OBJECT_FILES} $ diff --git a/src/compiler/planner/operator/CMakeLists.txt b/src/compiler/planner/operator/CMakeLists.txt index d617fae02..f2f99ae76 100644 --- a/src/compiler/planner/operator/CMakeLists.txt +++ b/src/compiler/planner/operator/CMakeLists.txt @@ -31,7 +31,7 @@ add_library(neug_planner_operator logical_unwind.cpp schema.cpp logical_get_v.cpp) -add_dependencies(neug_planner_operator neug_plan_proto) +add_dependencies(neug_planner_operator neug_proto) set(ALL_OBJECT_FILES ${ALL_OBJECT_FILES} $ diff --git a/src/compiler/planner/operator/extend/CMakeLists.txt b/src/compiler/planner/operator/extend/CMakeLists.txt index cb8a44e79..73b945ba2 100644 --- a/src/compiler/planner/operator/extend/CMakeLists.txt +++ b/src/compiler/planner/operator/extend/CMakeLists.txt @@ -3,7 +3,7 @@ add_library(neug_planner_extend base_logical_extend.cpp logical_extend.cpp logical_recursive_extend.cpp) -add_dependencies(neug_planner_extend neug_plan_proto) +add_dependencies(neug_planner_extend neug_proto) set(ALL_OBJECT_FILES ${ALL_OBJECT_FILES} $ diff --git a/src/compiler/planner/operator/factorization/CMakeLists.txt b/src/compiler/planner/operator/factorization/CMakeLists.txt index fc349a2ac..5ff5b5419 100644 --- a/src/compiler/planner/operator/factorization/CMakeLists.txt +++ b/src/compiler/planner/operator/factorization/CMakeLists.txt @@ -2,7 +2,7 @@ add_library(neug_planner_factorization OBJECT flatten_resolver.cpp sink_util.cpp) -add_dependencies(neug_planner_factorization neug_plan_proto) +add_dependencies(neug_planner_factorization neug_proto) set(ALL_OBJECT_FILES ${ALL_OBJECT_FILES} $ diff --git a/src/compiler/planner/operator/persistent/CMakeLists.txt b/src/compiler/planner/operator/persistent/CMakeLists.txt index 8ba2eb465..f443294ff 100644 --- a/src/compiler/planner/operator/persistent/CMakeLists.txt +++ b/src/compiler/planner/operator/persistent/CMakeLists.txt @@ -7,7 +7,7 @@ add_library(neug_planner_persistent logical_merge.cpp logical_set.cpp ) -add_dependencies(neug_planner_persistent neug_plan_proto) +add_dependencies(neug_planner_persistent neug_proto) set(ALL_OBJECT_FILES ${ALL_OBJECT_FILES} $ diff --git a/src/compiler/planner/operator/scan/CMakeLists.txt b/src/compiler/planner/operator/scan/CMakeLists.txt index 039688692..488c47839 100644 --- a/src/compiler/planner/operator/scan/CMakeLists.txt +++ b/src/compiler/planner/operator/scan/CMakeLists.txt @@ -3,7 +3,7 @@ add_library(neug_planner_scan logical_expressions_scan.cpp logical_index_look_up.cpp logical_scan_node_table.cpp) -add_dependencies(neug_planner_scan neug_plan_proto) +add_dependencies(neug_planner_scan neug_proto) set(ALL_OBJECT_FILES ${ALL_OBJECT_FILES} $ diff --git a/src/compiler/planner/operator/simple/CMakeLists.txt b/src/compiler/planner/operator/simple/CMakeLists.txt index f3a2749bb..e964bb6e8 100644 --- a/src/compiler/planner/operator/simple/CMakeLists.txt +++ b/src/compiler/planner/operator/simple/CMakeLists.txt @@ -1,7 +1,7 @@ add_library(neug_planner_simple OBJECT logical_simple.cpp) -add_dependencies(neug_planner_simple neug_plan_proto) +add_dependencies(neug_planner_simple neug_proto) set(ALL_OBJECT_FILES ${ALL_OBJECT_FILES} $ diff --git a/src/compiler/planner/plan/CMakeLists.txt b/src/compiler/planner/plan/CMakeLists.txt index 8603e5403..158764791 100644 --- a/src/compiler/planner/plan/CMakeLists.txt +++ b/src/compiler/planner/plan/CMakeLists.txt @@ -31,7 +31,7 @@ add_library(neug_planner_plan_operator plan_single_query.cpp plan_subquery.cpp plan_update.cpp) -add_dependencies(neug_planner_plan_operator neug_plan_proto) +add_dependencies(neug_planner_plan_operator neug_proto) set(ALL_OBJECT_FILES ${ALL_OBJECT_FILES} $ diff --git a/src/compiler/transaction/CMakeLists.txt b/src/compiler/transaction/CMakeLists.txt index 0d50a0dca..5d8314804 100644 --- a/src/compiler/transaction/CMakeLists.txt +++ b/src/compiler/transaction/CMakeLists.txt @@ -1,7 +1,7 @@ add_library(neug_compiler_transaction OBJECT transaction.cpp) -add_dependencies(neug_compiler_transaction neug_plan_proto) +add_dependencies(neug_compiler_transaction neug_proto) set(ALL_OBJECT_FILES ${ALL_OBJECT_FILES} $ diff --git a/src/execution/CMakeLists.txt b/src/execution/CMakeLists.txt index 4612f8db2..d57f870e9 100644 --- a/src/execution/CMakeLists.txt +++ b/src/execution/CMakeLists.txt @@ -7,6 +7,6 @@ file(GLOB_RECURSE EXECUTION_SRC_FILES "${CMAKE_CURRENT_SOURCE_DIR}/common/*.cc" "${CMAKE_CURRENT_SOURCE_DIR}/expression/*.cc") add_library(neug_execution OBJECT ${EXECUTION_SRC_FILES}) -add_dependencies(neug_execution neug_plan_proto) +add_dependencies(neug_execution neug_proto) set(ALL_OBJECT_FILES ${ALL_OBJECT_FILES} $ PARENT_SCOPE) target_include_directories(neug_execution PUBLIC $) diff --git a/src/main/CMakeLists.txt b/src/main/CMakeLists.txt index db89b8735..a2216d5be 100644 --- a/src/main/CMakeLists.txt +++ b/src/main/CMakeLists.txt @@ -1,5 +1,5 @@ file(GLOB_RECURSE NEUG_MAIN_SRC_FILES "${CMAKE_CURRENT_SOURCE_DIR}/*.cc" "${CMAKE_CURRENT_SOURCE_DIR}/app/*.cc") add_library(neug_main OBJECT ${NEUG_MAIN_SRC_FILES}) -add_dependencies(neug_main neug_plan_proto) +add_dependencies(neug_main neug_proto) set(ALL_OBJECT_FILES ${ALL_OBJECT_FILES} $ PARENT_SCOPE) \ No newline at end of file diff --git a/src/server/CMakeLists.txt b/src/server/CMakeLists.txt index f7fd86553..7a7895899 100644 --- a/src/server/CMakeLists.txt +++ b/src/server/CMakeLists.txt @@ -1,7 +1,7 @@ if (BUILD_HTTP_SERVER) file(GLOB_RECURSE NEUG_SERVER_FILES "${CMAKE_CURRENT_SOURCE_DIR}/*.cc") add_library(neug_execution_service OBJECT ${NEUG_SERVER_FILES}) - add_dependencies(neug_execution_service neug_plan_proto neug_utils) + add_dependencies(neug_execution_service neug_proto neug_utils) target_include_directories(neug_execution_service PRIVATE "${CMAKE_CURRENT_BINARY_DIR}/../utils/neug/generated/proto/plan") set(ALL_OBJECT_FILES ${ALL_OBJECT_FILES} $ PARENT_SCOPE) endif() \ No newline at end of file diff --git a/src/storages/csr/CMakeLists.txt b/src/storages/csr/CMakeLists.txt index 85568d550..33709511a 100644 --- a/src/storages/csr/CMakeLists.txt +++ b/src/storages/csr/CMakeLists.txt @@ -3,4 +3,4 @@ add_library(neug_storages_csr OBJECT ${CSR_SOURCES}) set(ALL_OBJECT_FILES ${ALL_OBJECT_FILES} $ PARENT_SCOPE) -add_dependencies(neug_storages_csr neug_plan_proto) \ No newline at end of file +add_dependencies(neug_storages_csr neug_proto) \ No newline at end of file diff --git a/src/storages/graph/CMakeLists.txt b/src/storages/graph/CMakeLists.txt index 46d8ec327..a7984f80d 100644 --- a/src/storages/graph/CMakeLists.txt +++ b/src/storages/graph/CMakeLists.txt @@ -1,4 +1,4 @@ file(GLOB_RECURSE RT_MUTABLE_GRAPH_SRC_FILES "${CMAKE_CURRENT_SOURCE_DIR}/*.cc") add_library(neug_property_graph OBJECT ${RT_MUTABLE_GRAPH_SRC_FILES}) -add_dependencies(neug_property_graph neug_plan_proto) +add_dependencies(neug_property_graph neug_proto) diff --git a/src/storages/loader/CMakeLists.txt b/src/storages/loader/CMakeLists.txt index a9b7ed1dd..5acb4fa8a 100644 --- a/src/storages/loader/CMakeLists.txt +++ b/src/storages/loader/CMakeLists.txt @@ -1,6 +1,6 @@ file(GLOB_RECURSE STORAGES_LOADER_SRC_FILES "${CMAKE_CURRENT_SOURCE_DIR}/*.cc") add_library(neug_storages_loader OBJECT ${STORAGES_LOADER_SRC_FILES}) -add_dependencies(neug_storages_loader neug_plan_proto) +add_dependencies(neug_storages_loader neug_proto) set(ALL_OBJECT_FILES ${ALL_OBJECT_FILES} $ PARENT_SCOPE) \ No newline at end of file diff --git a/src/transaction/CMakeLists.txt b/src/transaction/CMakeLists.txt index 46f926584..a122e5c16 100644 --- a/src/transaction/CMakeLists.txt +++ b/src/transaction/CMakeLists.txt @@ -2,4 +2,4 @@ file(GLOB_RECURSE TRANSACTION_SOURCES "${CMAKE_CURRENT_SOURCE_DIR}/*.cc" "${CMAK add_library(neug_transaction OBJECT ${TRANSACTION_SOURCES}) set(ALL_OBJECT_FILES ${ALL_OBJECT_FILES} $ PARENT_SCOPE) -add_dependencies(neug_transaction neug_plan_proto) \ No newline at end of file +add_dependencies(neug_transaction neug_proto) \ No newline at end of file diff --git a/src/utils/CMakeLists.txt b/src/utils/CMakeLists.txt index 89253e19a..ec5540c56 100644 --- a/src/utils/CMakeLists.txt +++ b/src/utils/CMakeLists.txt @@ -1,12 +1,5 @@ -############################################ Generate Http service Proto ############################################ -set(HTTP_SERVICE_PROTO_DIR ${CMAKE_CURRENT_SOURCE_DIR}/../../proto) -set(HTTP_SERVICE_PROTO_FILES - ${HTTP_SERVICE_PROTO_DIR}/http_svc.proto) -set(QUERY_RESPONSE_PROTO_FILES - ${HTTP_SERVICE_PROTO_DIR}/response.proto -) -file(MAKE_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/neug/http_service) -file(MAKE_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/neug/response) +############################################ Proto Code Generation ############################################ +set(PROTO_DIR ${CMAKE_CURRENT_SOURCE_DIR}/../../proto) function(compile_proto OUT_HDRS OUT_SRCS DESTDIR HDR_OUTPUT_DIR PROTO_DIR PROTO_FILES) # Prefer the built protoc target; fall back to found executable @@ -68,51 +61,53 @@ function(compile_proto OUT_HDRS OUT_SRCS DESTDIR HDR_OUTPUT_DIR PROTO_DIR PROTO_ set(${OUT_SRCS} ${SRCS} PARENT_SCOPE) endfunction() -# proto gen for http service proto -# NOTICE: Currently, the auto generation of http service proto files is disabled to avoid introducing dependencies for protobuf-compiler. -# We generate the proto files in advance and use them as source files. -message(STATUS "Using system protobuf for http service proto generation") -file(MAKE_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/neug/generated/proto/http_service) -compile_proto(HTTP_SERVICE_PROTO_HDRS HTTP_SERVICE_PROTO_SRCS - ${CMAKE_CURRENT_BINARY_DIR}/neug/generated/proto/http_service - ${CMAKE_CURRENT_BINARY_DIR}/neug/generated/proto/http_service - ${HTTP_SERVICE_PROTO_DIR} - "${HTTP_SERVICE_PROTO_FILES}" -) - -message(STATUS "Using system protobuf for query response proto generation") +# --- Generate response proto --- +message(STATUS "Generating query response proto") file(MAKE_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/neug/generated/proto/response) compile_proto(QUERY_RESPONSE_PROTO_HDRS QUERY_RESPONSE_PROTO_SRCS ${CMAKE_CURRENT_BINARY_DIR}/neug/generated/proto/response ${CMAKE_CURRENT_BINARY_DIR}/neug/generated/proto/response - ${HTTP_SERVICE_PROTO_DIR} - "${QUERY_RESPONSE_PROTO_FILES}" + ${PROTO_DIR} + "${PROTO_DIR}/response.proto" ) -############################################ Generate Physical Plan Proto ############################################ -set(GIE_COMPILER_PROTO_DIR ${CMAKE_CURRENT_SOURCE_DIR}/../../proto/) -set(GIE_COMPILER_WRITE_PROTO_DIR ${CMAKE_CURRENT_SOURCE_DIR}/../../proto/) +# --- Generate http service proto (conditional) --- +if (BUILD_HTTP_SERVER) + message(STATUS "Generating http service proto") + file(MAKE_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/neug/generated/proto/http_service) + compile_proto(HTTP_SERVICE_PROTO_HDRS HTTP_SERVICE_PROTO_SRCS + ${CMAKE_CURRENT_BINARY_DIR}/neug/generated/proto/http_service + ${CMAKE_CURRENT_BINARY_DIR}/neug/generated/proto/http_service + ${PROTO_DIR} + "${PROTO_DIR}/http_svc.proto" + ) +endif() -# Remove the comments when you want to generate the proto files automatically. +# --- Generate physical plan protos (all remaining *.proto) --- +message(STATUS "Generating physical plan protos") file(MAKE_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/neug/generated/proto/plan) -file(GLOB CODE_GEN_PROTOBUF_FILES "${CMAKE_CURRENT_SOURCE_DIR}/../../proto/*.proto") -list(FILTER CODE_GEN_PROTOBUF_FILES EXCLUDE REGEX ".*http_svc\\.proto$") -list(FILTER CODE_GEN_PROTOBUF_FILES EXCLUDE REGEX ".*response\\.proto$") -compile_proto(PROTO_HDRS_GIE PROTO_SRCS_GIE +file(GLOB PLAN_PROTO_FILES "${PROTO_DIR}/*.proto") +list(FILTER PLAN_PROTO_FILES EXCLUDE REGEX ".*http_svc\\.proto$") +list(FILTER PLAN_PROTO_FILES EXCLUDE REGEX ".*response\\.proto$") +compile_proto(PLAN_PROTO_HDRS PLAN_PROTO_SRCS ${CMAKE_CURRENT_BINARY_DIR}/neug/generated/proto/plan ${CMAKE_CURRENT_BINARY_DIR}/neug/generated/proto/plan - ${GIE_COMPILER_PROTO_DIR} - "${CODE_GEN_PROTOBUF_FILES}" + ${PROTO_DIR} + "${PLAN_PROTO_FILES}" ) -add_library(neug_plan_proto OBJECT ${PROTO_SRCS_GIE}) +# --- Unified proto OBJECT library --- +set(ALL_PROTO_SRCS ${PLAN_PROTO_SRCS} ${QUERY_RESPONSE_PROTO_SRCS}) +if (BUILD_HTTP_SERVER) + list(APPEND ALL_PROTO_SRCS ${HTTP_SERVICE_PROTO_SRCS}) +endif() + +add_library(neug_proto OBJECT ${ALL_PROTO_SRCS}) -# Ensure protoc is built before generating the plan proto sources if (TARGET protobuf::protoc) - add_dependencies(neug_plan_proto protobuf::protoc) + add_dependencies(neug_proto protobuf::protoc) endif() - install(DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/neug DESTINATION include FILES_MATCHING @@ -123,23 +118,9 @@ install(DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/neug file(GLOB_RECURSE UTILS_SRC_FILES "${CMAKE_CURRENT_SOURCE_DIR}/*.cc") # exclude files end with .pb.cc list(FILTER UTILS_SRC_FILES EXCLUDE REGEX ".*\\.pb\\.cc$") -# Remove the files in proto directory message(STATUS "Utils source files: ${UTILS_SRC_FILES}") -set(ALL_UTILS_SRC_FILES ${UTILS_SRC_FILES}) -set(ALL_UTILS_SRC_FILES ${UTILS_SRC_FILES}) -if (BUILD_HTTP_SERVER) - list(APPEND ALL_UTILS_SRC_FILES ${HTTP_SERVICE_PROTO_SRCS}) -endif() -list(APPEND ALL_UTILS_SRC_FILES ${QUERY_RESPONSE_PROTO_SRCS}) - - -add_library(neug_utils OBJECT ${ALL_UTILS_SRC_FILES}) -set(ALL_OBJECT_FILES ${ALL_OBJECT_FILES} $ $ PARENT_SCOPE) - -add_dependencies(neug_utils neug_plan_proto) - -target_include_directories(neug_utils PRIVATE ${CMAKE_CURRENT_BINARY_DIR}/neug/generated/proto/plan) +add_library(neug_utils OBJECT ${UTILS_SRC_FILES}) +set(ALL_OBJECT_FILES ${ALL_OBJECT_FILES} $ $ PARENT_SCOPE) -# Make all future targets depend on neug_plan_proto -set_property(GLOBAL APPEND PROPERTY GLOBAL_DEPENDS_DEBUG_MODE neug_plan_proto) +add_dependencies(neug_utils neug_proto) \ No newline at end of file diff --git a/tools/python_bind/CMakeLists.txt b/tools/python_bind/CMakeLists.txt index 9774030b5..77b4fc89d 100644 --- a/tools/python_bind/CMakeLists.txt +++ b/tools/python_bind/CMakeLists.txt @@ -3,7 +3,7 @@ file(GLOB SOURCE_PY "neug/*") file(GLOB_RECURSE SOURCE_CPP "${CMAKE_CURRENT_SOURCE_DIR}/src/*.cc") pybind11_add_module(neug_py_bind MODULE ${SOURCE_CPP}) include_directories(${CMAKE_CURRENT_BINARY_DIR}/../../src/compiler) -add_dependencies(neug_py_bind neug_plan_proto) +add_dependencies(neug_py_bind neug_proto) set(NEUG_LIBRARIES neug) if (BUILD_HTTP_SERVER) set(NEUG_LIBRARIES ${NEUG_LIBRARIES})