Merge pull request #1900 from kuzudb/reorg-logical-operator

reorg logical operators

src/include/binder/query/normalized_query_part.h

@@ -1,6 +1,6 @@
 #pragma once
 
-#include "binder/query/reading_clause/bound_unwind_clause.h"
+#include "binder/query/reading_clause/bound_reading_clause.h"
 #include "binder/query/return_with_clause/bound_projection_body.h"
 #include "binder/query/updating_clause/bound_updating_clause.h"
 #include "query_graph.h"

src/include/optimizer/logical_operator_visitor.h

@@ -1,6 +1,6 @@
 #pragma once
 
-#include "planner/logical_plan/logical_operator/base_logical_operator.h"
+#include "planner/logical_plan/logical_operator.h"
 
 namespace kuzu {
 namespace optimizer {

src/include/planner/logical_plan/logical_operator/logical_copy_from.h → src/include/planner/logical_plan/copy/logical_copy_from.h

@@ -1,8 +1,8 @@
 #pragma once
 
-#include "base_logical_operator.h"
 #include "catalog/table_schema.h"
 #include "common/copier_config/copier_config.h"
+#include "planner/logical_plan/logical_operator.h"
 
 namespace kuzu {
 namespace planner {

src/include/planner/logical_plan/logical_operator/logical_copy_to.h → src/include/planner/logical_plan/copy/logical_copy_to.h

@@ -1,7 +1,7 @@
 #pragma once
 
-#include "base_logical_operator.h"
 #include "common/copier_config/copier_config.h"
+#include "planner/logical_plan/logical_operator.h"
 #include "planner/logical_plan/logical_plan.h"
 
 namespace kuzu {

src/include/planner/logical_plan/logical_operator/logical_create_rel_table.h → src/include/planner/logical_plan/ddl/logical_create_rel_table.h

@@ -1,7 +1,7 @@
 #pragma once
 
-#include "base_logical_operator.h"
 #include "logical_create_table.h"
+#include "planner/logical_plan/logical_operator.h"
 
 namespace kuzu {
 namespace planner {

src/include/planner/logical_plan/logical_operator/logical_create_table.h → src/include/planner/logical_plan/ddl/logical_create_table.h

@@ -1,7 +1,7 @@
 #pragma once
 
 #include "catalog/table_schema.h"
-#include "logical_ddl.h"
+#include "planner/logical_plan/ddl/logical_ddl.h"
 
 namespace kuzu {
 namespace planner {

src/include/planner/logical_plan/logical_operator/logical_ddl.h → src/include/planner/logical_plan/ddl/logical_ddl.h

@@ -1,6 +1,6 @@
 #pragma once
 
-#include "base_logical_operator.h"
+#include "planner/logical_plan/logical_operator.h"
 
 namespace kuzu {
 namespace planner {

src/include/planner/logical_plan/logical_operator/logical_drop_property.h → src/include/planner/logical_plan/ddl/logical_drop_property.h

@@ -1,6 +1,6 @@
 #pragma once
 
-#include "logical_ddl.h"
+#include "planner/logical_plan/ddl/logical_ddl.h"
 
 namespace kuzu {
 namespace planner {

src/include/planner/logical_plan/logical_operator/logical_drop_table.h → src/include/planner/logical_plan/ddl/logical_drop_table.h

@@ -1,6 +1,6 @@
 #pragma once
 
-#include "base_logical_operator.h"
+#include "planner/logical_plan/logical_operator.h"
 
 namespace kuzu {
 namespace planner {

src/include/planner/logical_plan/logical_operator/logical_rename_property.h → src/include/planner/logical_plan/ddl/logical_rename_property.h

@@ -1,6 +1,6 @@
 #pragma once
 
-#include "base_logical_operator.h"
+#include "planner/logical_plan/logical_operator.h"
 
 namespace kuzu {
 namespace planner {

src/include/planner/logical_plan/logical_operator/logical_rename_table.h → src/include/planner/logical_plan/ddl/logical_rename_table.h

@@ -1,6 +1,6 @@
 #pragma once
 
-#include "base_logical_operator.h"
+#include "planner/logical_plan/logical_operator.h"
 
 namespace kuzu {
 namespace planner {

src/include/planner/logical_plan/logical_operator/base_logical_extend.h → src/include/planner/logical_plan/extend/base_logical_extend.h

@@ -1,8 +1,8 @@
 #pragma once
 
-#include "base_logical_operator.h"
 #include "binder/expression/rel_expression.h"
 #include "extend_direction.h"
+#include "planner/logical_plan/logical_operator.h"
 
 namespace kuzu {
 namespace planner {

src/include/planner/logical_plan/logical_operator/logical_extend.h → src/include/planner/logical_plan/extend/logical_extend.h

@@ -1,6 +1,6 @@
 #pragma once
 
-#include "base_logical_extend.h"
+#include "planner/logical_plan/extend/base_logical_extend.h"
 
 namespace kuzu {
 namespace planner {

src/include/planner/logical_plan/logical_operator/logical_recursive_extend.h → src/include/planner/logical_plan/extend/logical_recursive_extend.h

@@ -1,8 +1,8 @@
 #pragma once
 
-#include "base_logical_extend.h"
+#include "planner/logical_plan/extend/base_logical_extend.h"
+#include "planner/logical_plan/sip/side_way_info_passing.h"
 #include "recursive_join_type.h"
-#include "side_way_info_passing.h"
 
 namespace kuzu {
 namespace planner {

src/include/planner/logical_plan/logical_operator/flatten_resolver.h → src/include/planner/logical_plan/factorization/flatten_resolver.h

@@ -1,6 +1,6 @@
 #pragma once
 
-#include "planner/logical_plan/logical_operator/base_logical_operator.h"
+#include "planner/logical_plan/logical_operator.h"
 
 namespace kuzu {
 namespace planner {

src/include/planner/logical_plan/logical_operator/sink_util.h → src/include/planner/logical_plan/factorization/sink_util.h

@@ -1,6 +1,6 @@
 #pragma once
 
-#include "schema.h"
+#include "planner/logical_plan/schema.h"
 
 namespace kuzu {
 namespace planner {

src/include/planner/logical_plan/logical_operator/logical_accumulate.h → src/include/planner/logical_plan/logical_accumulate.h

@@ -1,7 +1,7 @@
 #pragma once
 
-#include "base_logical_operator.h"
 #include "common/join_type.h"
+#include "logical_operator.h"
 
 namespace kuzu {
 namespace planner {

src/include/planner/logical_plan/logical_operator/logical_aggregate.h → src/include/planner/logical_plan/logical_aggregate.h

@@ -1,6 +1,6 @@
 #pragma once
 
-#include "base_logical_operator.h"
+#include "logical_operator.h"
 
 namespace kuzu {
 namespace planner {

src/include/planner/logical_plan/logical_operator/logical_create_macro.h → src/include/planner/logical_plan/logical_create_macro.h

@@ -1,7 +1,7 @@
 #pragma once
 
-#include "base_logical_operator.h"
 #include "function/scalar_macro_function.h"
+#include "logical_operator.h"
 
 namespace kuzu {
 namespace planner {

src/include/planner/logical_plan/logical_operator/logical_cross_product.h → src/include/planner/logical_plan/logical_cross_product.h

@@ -1,8 +1,8 @@
 #pragma once
 
-#include "base_logical_operator.h"
 #include "common/join_type.h"
-#include "sink_util.h"
+#include "logical_operator.h"
+#include "planner/logical_plan/factorization/sink_util.h"
 
 namespace kuzu {
 namespace planner {

src/include/planner/logical_plan/logical_operator/logical_distinct.h → src/include/planner/logical_plan/logical_distinct.h

@@ -1,6 +1,6 @@
 #pragma once
 
-#include "base_logical_operator.h"
+#include "logical_operator.h"
 #include "schema.h"
 
 namespace kuzu {

src/include/planner/logical_plan/logical_operator/logical_explain.h → src/include/planner/logical_plan/logical_explain.h

@@ -1,7 +1,7 @@
 #pragma once
 
-#include "base_logical_operator.h"
 #include "common/explain_type.h"
+#include "logical_operator.h"
 
 namespace kuzu {
 namespace planner {

src/include/planner/logical_plan/logical_operator/logical_filter.h → src/include/planner/logical_plan/logical_filter.h

@@ -1,7 +1,7 @@
 #pragma once
 
-#include "base_logical_operator.h"
 #include "binder/expression/expression.h"
+#include "logical_operator.h"
 
 namespace kuzu {
 namespace planner {

src/include/planner/logical_plan/logical_operator/logical_flatten.h → src/include/planner/logical_plan/logical_flatten.h

@@ -1,7 +1,7 @@
 #pragma once
 
-#include "base_logical_operator.h"
 #include "binder/expression/expression.h"
+#include "logical_operator.h"
 
 namespace kuzu {
 namespace planner {

src/include/planner/logical_plan/logical_operator/logical_hash_join.h → src/include/planner/logical_plan/logical_hash_join.h

@@ -2,9 +2,9 @@
 
 #include <utility>
 
-#include "base_logical_operator.h"
 #include "common/join_type.h"
-#include "side_way_info_passing.h"
+#include "logical_operator.h"
+#include "planner/logical_plan/sip/side_way_info_passing.h"
 
 namespace kuzu {
 namespace planner {

src/include/planner/logical_plan/logical_operator/logical_in_query_call.h → src/include/planner/logical_plan/logical_in_query_call.h

@@ -1,7 +1,7 @@
 #pragma once
 
-#include "base_logical_operator.h"
 #include "function/table_functions.h"
+#include "logical_operator.h"
 
 namespace kuzu {
 namespace planner {

src/include/planner/logical_plan/logical_operator/logical_intersect.h → src/include/planner/logical_plan/logical_intersect.h

@@ -1,7 +1,7 @@
 #pragma once
 
-#include "base_logical_operator.h"
-#include "side_way_info_passing.h"
+#include "logical_operator.h"
+#include "planner/logical_plan/sip/side_way_info_passing.h"
 
 namespace kuzu {
 namespace planner {

src/include/planner/logical_plan/logical_operator/logical_limit.h → src/include/planner/logical_plan/logical_limit.h

@@ -1,7 +1,7 @@
 #pragma once
 
-#include "base_logical_operator.h"
-#include "planner/logical_plan/logical_operator/flatten_resolver.h"
+#include "logical_operator.h"
+#include "planner/logical_plan/factorization/flatten_resolver.h"
 
 namespace kuzu {
 namespace planner {

src/include/planner/logical_plan/logical_operator/logical_multiplcity_reducer.h → src/include/planner/logical_plan/logical_multiplcity_reducer.h

@@ -1,6 +1,6 @@
 #pragma once
 
-#include "base_logical_operator.h"
+#include "logical_operator.h"
 
 namespace kuzu {
 namespace planner {

src/include/planner/logical_plan/logical_operator/logical_node_label_filter.h → src/include/planner/logical_plan/logical_node_label_filter.h

@@ -1,6 +1,6 @@
 #pragma once
 
-#include "base_logical_operator.h"
+#include "logical_operator.h"
 
 namespace kuzu {
 namespace planner {

src/include/planner/logical_plan/logical_operator/logical_order_by.h → src/include/planner/logical_plan/logical_order_by.h

@@ -1,6 +1,6 @@
 #pragma once
 
-#include "base_logical_operator.h"
+#include "logical_operator.h"
 
 namespace kuzu {
 namespace planner {

src/include/planner/logical_plan/logical_plan.h

@@ -1,7 +1,7 @@
 #pragma once
 
-#include "planner/logical_plan/logical_operator/base_logical_operator.h"
-#include "planner/logical_plan/logical_operator/logical_explain.h"
+#include "logical_explain.h"
+#include "logical_operator.h"
 
 namespace kuzu {
 namespace planner {

src/include/planner/logical_plan/logical_operator/logical_projection.h → src/include/planner/logical_plan/logical_projection.h

@@ -1,7 +1,7 @@
 #pragma once
 
-#include "base_logical_operator.h"
 #include "binder/expression/expression.h"
+#include "logical_operator.h"
 
 namespace kuzu {
 namespace planner {

src/include/planner/logical_plan/logical_operator/logical_skip.h → src/include/planner/logical_plan/logical_skip.h

@@ -1,7 +1,7 @@
 #pragma once
 
-#include "base_logical_operator.h"
-#include "planner/logical_plan/logical_operator/flatten_resolver.h"
+#include "logical_operator.h"
+#include "planner/logical_plan/factorization/flatten_resolver.h"
 
 namespace kuzu {
 namespace planner {

src/include/planner/logical_plan/logical_operator/logical_standalone_call.h → src/include/planner/logical_plan/logical_standalone_call.h

@@ -1,6 +1,6 @@
 #pragma once
 
-#include "base_logical_operator.h"
+#include "logical_operator.h"
 #include "main/db_config.h"
 
 namespace kuzu {

src/include/planner/logical_plan/logical_operator/logical_union.h → src/include/planner/logical_plan/logical_union.h

@@ -1,6 +1,6 @@
 #pragma once
 
-#include "base_logical_operator.h"
+#include "logical_operator.h"
 
 namespace kuzu {
 namespace planner {

src/include/planner/logical_plan/logical_operator/logical_unwind.h → src/include/planner/logical_plan/logical_unwind.h

@@ -1,6 +1,6 @@
 #pragma once
 
-#include "base_logical_operator.h"
+#include "logical_operator.h"
 
 namespace kuzu {
 namespace planner {

src/include/planner/logical_plan/logical_operator/logical_create.h → src/include/planner/logical_plan/persistent/logical_create.h

@@ -1,7 +1,7 @@
 #pragma once
 
-#include "base_logical_operator.h"
 #include "binder/expression/rel_expression.h"
+#include "planner/logical_plan/logical_operator.h"
 
 namespace kuzu {
 namespace planner {

src/include/planner/logical_plan/logical_operator/logical_delete.h → src/include/planner/logical_plan/persistent/logical_delete.h

@@ -1,7 +1,7 @@
 #pragma once
 
-#include "base_logical_operator.h"
 #include "binder/expression/rel_expression.h"
+#include "planner/logical_plan/logical_operator.h"
 
 namespace kuzu {
 namespace planner {

src/include/planner/logical_plan/logical_operator/logical_merge.h → src/include/planner/logical_plan/persistent/logical_merge.h

@@ -1,8 +1,8 @@
 #pragma once
 
-#include "base_logical_operator.h"
-#include "logical_create.h"
-#include "logical_set.h"
+#include "planner/logical_plan/logical_operator.h"
+#include "planner/logical_plan/persistent/logical_create.h"
+#include "planner/logical_plan/persistent/logical_set.h"
 
 namespace kuzu {
 namespace planner {

src/include/planner/logical_plan/logical_operator/logical_set.h → src/include/planner/logical_plan/persistent/logical_set.h

@@ -1,6 +1,6 @@
 #pragma once
 
-#include "base_logical_operator.h"
+#include "planner/logical_plan/logical_operator.h"
 
 namespace kuzu {
 namespace planner {

src/include/planner/logical_plan/logical_operator/logical_dummy_scan.h → src/include/planner/logical_plan/scan/logical_dummy_scan.h

@@ -1,7 +1,7 @@
 #pragma once
 
-#include "base_logical_operator.h"
 #include "binder/expression/literal_expression.h"
+#include "planner/logical_plan/logical_operator.h"
 
 namespace kuzu {
 namespace planner {

src/include/planner/logical_plan/logical_operator/logical_scan_node.h → src/include/planner/logical_plan/scan/logical_scan_node.h

@@ -1,7 +1,7 @@
 #pragma once
 
-#include "base_logical_operator.h"
 #include "binder/expression/node_expression.h"
+#include "planner/logical_plan/logical_operator.h"
 
 namespace kuzu {
 namespace planner {

src/include/planner/logical_plan/logical_operator/logical_scan_node_property.h → src/include/planner/logical_plan/scan/logical_scan_node_property.h

@@ -1,7 +1,7 @@
 #pragma once
 
-#include "base_logical_operator.h"
 #include "binder/expression/node_expression.h"
+#include "planner/logical_plan/logical_operator.h"
 
 namespace kuzu {
 namespace planner {