Merge pull request #2047 from kuzudb/scan

Rename logical operator dir

src/c_api/connection.cpp

@@ -2,7 +2,7 @@
 #include "c_api/kuzu.h"
 #include "common/exception/exception.h"
 #include "main/kuzu.h"
-#include "planner/logical_plan/logical_plan.h"
+#include "planner/operator/logical_plan.h"
 
 namespace kuzu {
 namespace common {

src/c_api/prepared_statement.cpp

@@ -2,7 +2,7 @@
 #include "c_api/kuzu.h"
 #include "common/types/value/value.h"
 #include "main/kuzu.h"
-#include "planner/logical_plan/logical_plan.h"
+#include "planner/operator/logical_plan.h"
 
 using namespace kuzu::common;
 using namespace kuzu::main;

src/include/optimizer/acc_hash_join_optimizer.h

@@ -1,7 +1,7 @@
 #pragma once
 
 #include "logical_operator_visitor.h"
-#include "planner/logical_plan/logical_plan.h"
+#include "planner/operator/logical_plan.h"
 
 namespace kuzu {
 namespace optimizer {

src/include/optimizer/agg_key_dependency_optimizer.h

@@ -1,7 +1,7 @@
 #pragma once
 
 #include "logical_operator_visitor.h"
-#include "planner/logical_plan/logical_plan.h"
+#include "planner/operator/logical_plan.h"
 
 namespace kuzu {
 namespace optimizer {

src/include/optimizer/correlated_subquery_unnest_solver.h

@@ -1,7 +1,7 @@
 #pragma once
 
 #include "logical_operator_visitor.h"
-#include "planner/logical_plan/logical_plan.h"
+#include "planner/operator/logical_plan.h"
 
 namespace kuzu {
 namespace optimizer {

src/include/optimizer/factorization_rewriter.h

@@ -1,7 +1,7 @@
 #pragma once
 
 #include "logical_operator_visitor.h"
-#include "planner/logical_plan/logical_plan.h"
+#include "planner/operator/logical_plan.h"
 
 namespace kuzu {
 namespace optimizer {

src/include/optimizer/filter_push_down_optimizer.h

@@ -2,7 +2,7 @@
 
 #include "binder/expression/node_expression.h"
 #include "logical_operator_visitor.h"
-#include "planner/logical_plan/logical_plan.h"
+#include "planner/operator/logical_plan.h"
 
 namespace kuzu {
 namespace optimizer {

src/include/optimizer/logical_operator_visitor.h

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

src/include/optimizer/optimizer.h

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

src/include/optimizer/projection_push_down_optimizer.h

@@ -1,7 +1,7 @@
 #pragma once
 
 #include "logical_operator_visitor.h"
-#include "planner/logical_plan/logical_plan.h"
+#include "planner/operator/logical_plan.h"
 
 namespace kuzu {
 namespace optimizer {

src/include/optimizer/remove_factorization_rewriter.h

@@ -1,7 +1,7 @@
 #pragma once
 
 #include "logical_operator_visitor.h"
-#include "planner/logical_plan/logical_plan.h"
+#include "planner/operator/logical_plan.h"
 
 namespace kuzu {
 namespace optimizer {

src/include/optimizer/remove_unnecessary_join_optimizer.h

@@ -1,7 +1,7 @@
 #pragma once
 
 #include "logical_operator_visitor.h"
-#include "planner/logical_plan/logical_plan.h"
+#include "planner/operator/logical_plan.h"
 
 namespace kuzu {
 namespace optimizer {

src/include/optimizer/top_k_optimizer.h

@@ -1,7 +1,7 @@
 #pragma once
 
 #include "logical_operator_visitor.h"
-#include "planner/logical_plan/logical_plan.h"
+#include "planner/operator/logical_plan.h"
 
 namespace kuzu {
 namespace optimizer {

src/include/planner/join_order/cardinality_estimator.h

@@ -1,7 +1,7 @@
 #pragma once
 
 #include "binder/query/query_graph.h"
-#include "planner/logical_plan/logical_plan.h"
+#include "planner/operator/logical_plan.h"
 #include "storage/store/nodes_statistics_and_deleted_ids.h"
 #include "storage/store/rels_statistics.h"
 

src/include/planner/join_order/cost_model.h

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

src/include/planner/join_order/join_order_util.h

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

src/include/planner/join_order_enumerator_context.h

@@ -1,7 +1,7 @@
 #pragma once
 
 #include "binder/query/normalized_single_query.h"
-#include "planner/logical_plan/logical_plan.h"
+#include "planner/operator/logical_plan.h"
 #include "planner/subplans_table.h"
 
 namespace kuzu {

src/include/planner/logical_plan/ddl/logical_add_property.h → src/include/planner/operator/ddl/logical_add_property.h

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

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

@@ -2,7 +2,7 @@
 
 #include "binder/ddl/bound_create_table_info.h"
 #include "catalog/table_schema.h"
-#include "planner/logical_plan/ddl/logical_ddl.h"
+#include "planner/operator/ddl/logical_ddl.h"
 
 namespace kuzu {
 namespace planner {

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

@@ -1,8 +1,8 @@
 #pragma once
 
-#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 "planner/operator/extend/base_logical_extend.h"
+#include "planner/operator/extend/recursive_join_type.h"
+#include "planner/operator/sip/side_way_info_passing.h"
 
 namespace kuzu {
 namespace planner {

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

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

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

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

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

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

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

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

src/include/planner/logical_plan/logical_comment_on.h → src/include/planner/operator/logical_comment_on.h

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

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

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

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

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

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

@@ -1,7 +1,7 @@
 #pragma once
 
-#include "logical_operator.h"
-#include "schema.h"
+#include "planner/operator/logical_operator.h"
+#include "planner/operator/schema.h"
 
 namespace kuzu {
 namespace planner {

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

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

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

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

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

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

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

@@ -1,10 +1,8 @@
 #pragma once
 
-#include <utility>
-
 #include "common/join_type.h"
 #include "logical_operator.h"
-#include "planner/logical_plan/sip/side_way_info_passing.h"
+#include "planner/operator/sip/side_way_info_passing.h"
 
 namespace kuzu {
 namespace planner {

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

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

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

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

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

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

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

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

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

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

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

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