diff --git a/src/observer/virtual_table/ob_all_virtual_proxy_partition_info.cpp b/src/observer/virtual_table/ob_all_virtual_proxy_partition_info.cpp index 9aaa2fe71..7eeee2e10 100644 --- a/src/observer/virtual_table/ob_all_virtual_proxy_partition_info.cpp +++ b/src/observer/virtual_table/ob_all_virtual_proxy_partition_info.cpp @@ -13,7 +13,7 @@ #define USING_LOG_PREFIX SERVER #include "ob_all_virtual_proxy_partition_info.h" -#include "sql/resolver/expr/ob_raw_expr_printer.h" +#include "sql/printer/ob_raw_expr_printer.h" #include "sql/resolver/expr/ob_raw_expr_util.h" #include "sql/parser/ob_parser_utils.h" #include "share/schema/ob_schema_getter_guard.h" diff --git a/src/pl/ob_pl_resolver.cpp b/src/pl/ob_pl_resolver.cpp index 2b0fafd7c..73b8857ec 100644 --- a/src/pl/ob_pl_resolver.cpp +++ b/src/pl/ob_pl_resolver.cpp @@ -24,7 +24,7 @@ #include "sql/parser/ob_parser.h" #include "sql/parser/parse_malloc.h" #include "sql/resolver/expr/ob_raw_expr_util.h" -#include "sql/resolver/expr/ob_raw_expr_printer.h" +#include "sql/printer/ob_raw_expr_printer.h" #include "sql/resolver/ob_resolver_utils.h" #include "sql/resolver/ddl/ob_ddl_resolver.h" #include "sql/resolver/expr/ob_raw_expr_resolver_impl.h" diff --git a/src/rootserver/ob_ddl_operator.cpp b/src/rootserver/ob_ddl_operator.cpp index d990b6804..fa4546f33 100644 --- a/src/rootserver/ob_ddl_operator.cpp +++ b/src/rootserver/ob_ddl_operator.cpp @@ -53,7 +53,7 @@ #include "sql/resolver/ob_resolver_utils.h" #include "sql/resolver/expr/ob_raw_expr_modify_column_name.h" #include "sql/resolver/expr/ob_raw_expr_util.h" -#include "sql/resolver/expr/ob_raw_expr_printer.h" +#include "sql/printer/ob_raw_expr_printer.h" #include "share/system_variable/ob_system_variable.h" #include "share/system_variable/ob_system_variable_factory.h" #include "share/resource_manager/ob_resource_plan_info.h" diff --git a/src/rootserver/ob_ddl_service.cpp b/src/rootserver/ob_ddl_service.cpp index cf6ecffa4..00b49f1a3 100755 --- a/src/rootserver/ob_ddl_service.cpp +++ b/src/rootserver/ob_ddl_service.cpp @@ -54,7 +54,7 @@ #include "sql/resolver/ob_stmt_type.h" #include "sql/resolver/ddl/ob_ddl_resolver.h" #include "sql/resolver/expr/ob_raw_expr_modify_column_name.h" -#include "sql/resolver/expr/ob_raw_expr_printer.h" +#include "sql/printer/ob_raw_expr_printer.h" #include "share/ob_all_server_tracer.h" #include "ob_zone_manager.h" #include "rootserver/ob_schema2ddl_sql.h" diff --git a/src/share/ob_index_builder_util.cpp b/src/share/ob_index_builder_util.cpp index 60b9d4cbe..7ebc4b641 100644 --- a/src/share/ob_index_builder_util.cpp +++ b/src/share/ob_index_builder_util.cpp @@ -22,7 +22,7 @@ #include "sql/resolver/ddl/ob_ddl_resolver.h" #include "sql/resolver/ob_resolver_utils.h" #include "sql/resolver/expr/ob_raw_expr_util.h" -#include "sql/resolver/expr/ob_raw_expr_printer.h" +#include "sql/printer/ob_raw_expr_printer.h" namespace oceanbase { using namespace common; diff --git a/src/share/schema/ob_schema_printer.cpp b/src/share/schema/ob_schema_printer.cpp index f236c9684..4ebd7bd26 100644 --- a/src/share/schema/ob_schema_printer.cpp +++ b/src/share/schema/ob_schema_printer.cpp @@ -28,7 +28,7 @@ #include "share/config/ob_server_config.h" #include "sql/resolver/cmd/ob_load_data_stmt.h" #include "sql/resolver/expr/ob_raw_expr_util.h" -#include "sql/resolver/expr/ob_raw_expr_printer.h" +#include "sql/printer/ob_raw_expr_printer.h" #include "sql/session/ob_sql_session_info.h" #include "sql/resolver/expr/ob_raw_expr.h" #include "sql/parser/ob_parser.h" diff --git a/src/sql/CMakeLists.txt b/src/sql/CMakeLists.txt index 42bb19121..cba4b560b 100644 --- a/src/sql/CMakeLists.txt +++ b/src/sql/CMakeLists.txt @@ -9,16 +9,10 @@ ob_set_subtarget(ob_sql code_generator ) ob_set_subtarget(ob_sql common - ob_delete_stmt_printer.cpp - ob_dml_stmt_printer.cpp ob_end_trans_callback.cpp ob_end_trans_cb_packet_param.cpp - ob_insert_all_stmt_printer.cpp - ob_insert_stmt_printer.cpp - ob_merge_stmt_printer.cpp ob_phy_table_location.cpp ob_result_set.cpp - ob_select_stmt_printer.cpp ob_spi.cpp ob_sql.cpp ob_sql_context.cpp @@ -28,7 +22,6 @@ ob_set_subtarget(ob_sql common ob_sql_temp_table.cpp ob_sql_trans_control.cpp ob_sql_utils.cpp - ob_update_stmt_printer.cpp ob_optimizer_trace_impl.cpp ) @@ -977,6 +970,17 @@ ob_set_subtarget(ob_sql plan_cache plan_cache/ob_values_table_compression.cpp ) +ob_set_subtarget(ob_sql printer + printer/ob_delete_stmt_printer.cpp + printer/ob_dml_stmt_printer.cpp + printer/ob_insert_all_stmt_printer.cpp + printer/ob_insert_stmt_printer.cpp + printer/ob_merge_stmt_printer.cpp + printer/ob_raw_expr_printer.cpp + printer/ob_select_stmt_printer.cpp + printer/ob_update_stmt_printer.cpp +) + ob_set_subtarget(ob_sql resolver resolver/ob_resolver.cpp resolver/ob_resolver_utils.cpp @@ -1185,7 +1189,6 @@ ob_set_subtarget(ob_sql resolver_expr resolver/expr/ob_raw_expr_part_expr_checker.cpp resolver/expr/ob_raw_expr_part_func_checker.cpp resolver/expr/ob_raw_expr_print_visitor.cpp - resolver/expr/ob_raw_expr_printer.cpp resolver/expr/ob_raw_expr_replacer.cpp resolver/expr/ob_raw_expr_resolver_impl.cpp resolver/expr/ob_raw_expr_util.cpp diff --git a/src/sql/engine/cmd/ob_load_data_impl.h b/src/sql/engine/cmd/ob_load_data_impl.h index b5bd96924..dce3bb808 100644 --- a/src/sql/engine/cmd/ob_load_data_impl.h +++ b/src/sql/engine/cmd/ob_load_data_impl.h @@ -26,7 +26,7 @@ #include "lib/container/ob_bit_set.h" #include "lib/utility/ob_utility.h" #include "sql/resolver/cmd/ob_load_data_stmt.h" -#include "sql/resolver/expr/ob_raw_expr_printer.h" +#include "sql/printer/ob_raw_expr_printer.h" #include "sql/optimizer/ob_table_location.h" #include "sql/engine/cmd/ob_load_data_rpc.h" #include "sql/engine/ob_des_exec_context.h" diff --git a/src/sql/engine/cmd/ob_table_executor.cpp b/src/sql/engine/cmd/ob_table_executor.cpp index 7da1f0043..4caf531b7 100644 --- a/src/sql/engine/cmd/ob_table_executor.cpp +++ b/src/sql/engine/cmd/ob_table_executor.cpp @@ -40,7 +40,7 @@ #include "sql/parser/ob_parser.h" #include "share/system_variable/ob_sys_var_class_type.h" -#include "sql/ob_select_stmt_printer.h" +#include "sql/printer/ob_select_stmt_printer.h" #include "observer/ob_server_struct.h" #include "observer/ob_server.h" #include "observer/ob_server_event_history_table_operator.h" diff --git a/src/sql/engine/cmd/ob_variable_set_executor.cpp b/src/sql/engine/cmd/ob_variable_set_executor.cpp index 7289e65bb..3656371ba 100644 --- a/src/sql/engine/cmd/ob_variable_set_executor.cpp +++ b/src/sql/engine/cmd/ob_variable_set_executor.cpp @@ -31,7 +31,7 @@ #include "sql/code_generator/ob_column_index_provider.h" #include "sql/ob_sql_trans_control.h" #include "sql/ob_end_trans_callback.h" -#include "sql/ob_select_stmt_printer.h" +#include "sql/printer/ob_select_stmt_printer.h" #include "lib/timezone/ob_oracle_format_models.h" #include "observer/ob_server.h" #include "sql/rewrite/ob_transform_pre_process.h" diff --git a/src/sql/ob_optimizer_trace_impl.h b/src/sql/ob_optimizer_trace_impl.h index cc1a438b4..510d81504 100644 --- a/src/sql/ob_optimizer_trace_impl.h +++ b/src/sql/ob_optimizer_trace_impl.h @@ -17,7 +17,7 @@ #include "lib/allocator/ob_allocator.h" #include "lib/hash_func/murmur_hash.h" #include "common/storage/ob_io_device.h" -#include "sql/resolver/expr/ob_raw_expr_printer.h" +#include "sql/printer/ob_raw_expr_printer.h" #include "common/ob_smart_call.h" #include "lib/container/ob_array.h" #include diff --git a/src/sql/ob_sql.cpp b/src/sql/ob_sql.cpp index 9e153f771..394702213 100644 --- a/src/sql/ob_sql.cpp +++ b/src/sql/ob_sql.cpp @@ -72,7 +72,7 @@ #include "observer/omt/ob_th_worker.h" #include "sql/resolver/dml/ob_del_upd_stmt.h" #include "sql/resolver/dml/ob_update_stmt.h" -#include "sql/resolver/expr/ob_raw_expr_printer.h" +#include "sql/printer/ob_raw_expr_printer.h" #include "sql/engine/px/ob_px_admission.h" #include "sql/code_generator/ob_code_generator.h" #include "observer/omt/ob_tenant_config_mgr.h" diff --git a/src/sql/ob_sql_utils.cpp b/src/sql/ob_sql_utils.cpp index 7255f90fd..08d8006b2 100644 --- a/src/sql/ob_sql_utils.cpp +++ b/src/sql/ob_sql_utils.cpp @@ -33,12 +33,12 @@ #include "sql/rewrite/ob_query_range.h" #include "sql/session/ob_basic_session_info.h" #include "sql/plan_cache/ob_sql_parameterization.h" -#include "sql/ob_select_stmt_printer.h" -#include "sql/ob_insert_all_stmt_printer.h" -#include "sql/ob_insert_stmt_printer.h" -#include "sql/ob_update_stmt_printer.h" -#include "sql/ob_delete_stmt_printer.h" -#include "sql/ob_merge_stmt_printer.h" +#include "sql/printer/ob_select_stmt_printer.h" +#include "sql/printer/ob_insert_all_stmt_printer.h" +#include "sql/printer/ob_insert_stmt_printer.h" +#include "sql/printer/ob_update_stmt_printer.h" +#include "sql/printer/ob_delete_stmt_printer.h" +#include "sql/printer/ob_merge_stmt_printer.h" #include "sql/executor/ob_task_executor_ctx.h" #include "sql/optimizer/ob_route_policy.h" #include "sql/rewrite/ob_transform_rule.h" diff --git a/src/sql/optimizer/ob_dynamic_sampling.h b/src/sql/optimizer/ob_dynamic_sampling.h index 3fc191fa1..0586f0775 100644 --- a/src/sql/optimizer/ob_dynamic_sampling.h +++ b/src/sql/optimizer/ob_dynamic_sampling.h @@ -13,7 +13,7 @@ #ifndef _OB_DYNAMIC_SAMPLING_H_ #define _OB_DYNAMIC_SAMPLING_H_ #include "sql/resolver/expr/ob_raw_expr.h" -#include "sql/resolver/expr/ob_raw_expr_printer.h" +#include "sql/printer/ob_raw_expr_printer.h" #include "sql/resolver/expr/ob_raw_expr_util.h" #include "sql/engine/ob_exec_context.h" #include "share/stat/ob_stat_define.h" diff --git a/src/sql/optimizer/ob_logical_operator.cpp b/src/sql/optimizer/ob_logical_operator.cpp index 68bc3d67a..d8cf982f4 100644 --- a/src/sql/optimizer/ob_logical_operator.cpp +++ b/src/sql/optimizer/ob_logical_operator.cpp @@ -50,7 +50,7 @@ #include "ob_log_json_table.h" #include "sql/rewrite/ob_transform_utils.h" #include "common/ob_smart_call.h" -#include "sql/resolver/expr/ob_raw_expr_printer.h" +#include "sql/printer/ob_raw_expr_printer.h" #include "ob_log_err_log.h" #include "ob_log_temp_table_transformation.h" #include "ob_log_expr_values.h" diff --git a/src/sql/optimizer/ob_table_location.cpp b/src/sql/optimizer/ob_table_location.cpp index 3b3ef2d67..54ef5ffd2 100644 --- a/src/sql/optimizer/ob_table_location.cpp +++ b/src/sql/optimizer/ob_table_location.cpp @@ -32,7 +32,7 @@ #include "sql/optimizer/ob_log_plan.h" #include "sql/engine/cmd/ob_table_executor.h" #include "sql/resolver/ddl/ob_alter_table_stmt.h" -#include "sql/resolver/expr/ob_raw_expr_printer.h" +#include "sql/printer/ob_raw_expr_printer.h" #include "observer/omt/ob_tenant_timezone_mgr.h" #include "sql/resolver/expr/ob_raw_expr.h" #include "sql/resolver/expr/ob_raw_expr_util.h" diff --git a/src/sql/ob_delete_stmt_printer.cpp b/src/sql/printer/ob_delete_stmt_printer.cpp similarity index 98% rename from src/sql/ob_delete_stmt_printer.cpp rename to src/sql/printer/ob_delete_stmt_printer.cpp index b4ac772c3..f96f678eb 100644 --- a/src/sql/ob_delete_stmt_printer.cpp +++ b/src/sql/printer/ob_delete_stmt_printer.cpp @@ -11,7 +11,7 @@ */ #define USING_LOG_PREFIX SQL -#include "sql/ob_delete_stmt_printer.h" +#include "sql/printer/ob_delete_stmt_printer.h" #include "sql/ob_sql_context.h" namespace oceanbase { diff --git a/src/sql/ob_delete_stmt_printer.h b/src/sql/printer/ob_delete_stmt_printer.h similarity index 96% rename from src/sql/ob_delete_stmt_printer.h rename to src/sql/printer/ob_delete_stmt_printer.h index 528f5c6cf..156e92989 100644 --- a/src/sql/ob_delete_stmt_printer.h +++ b/src/sql/printer/ob_delete_stmt_printer.h @@ -15,7 +15,7 @@ #include "ob_dml_stmt_printer.h" #include "sql/resolver/dml/ob_delete_stmt.h" -#include "sql/resolver/expr/ob_raw_expr_printer.h" +#include "sql/printer/ob_raw_expr_printer.h" namespace oceanbase { diff --git a/src/sql/ob_dml_stmt_printer.cpp b/src/sql/printer/ob_dml_stmt_printer.cpp similarity index 99% rename from src/sql/ob_dml_stmt_printer.cpp rename to src/sql/printer/ob_dml_stmt_printer.cpp index 91d77515b..b5891d51f 100644 --- a/src/sql/ob_dml_stmt_printer.cpp +++ b/src/sql/printer/ob_dml_stmt_printer.cpp @@ -11,8 +11,8 @@ */ #define USING_LOG_PREFIX SQL -#include "sql/ob_dml_stmt_printer.h" -#include "sql/ob_select_stmt_printer.h" +#include "sql/printer/ob_dml_stmt_printer.h" +#include "sql/printer/ob_select_stmt_printer.h" #include "sql/ob_sql_context.h" #include "sql/resolver/dml/ob_del_upd_stmt.h" #include "common/ob_smart_call.h" diff --git a/src/sql/ob_dml_stmt_printer.h b/src/sql/printer/ob_dml_stmt_printer.h similarity index 99% rename from src/sql/ob_dml_stmt_printer.h rename to src/sql/printer/ob_dml_stmt_printer.h index 3e1353336..2844f6b9b 100644 --- a/src/sql/ob_dml_stmt_printer.h +++ b/src/sql/printer/ob_dml_stmt_printer.h @@ -15,7 +15,7 @@ #include "sql/resolver/dml/ob_dml_stmt.h" #include "sql/resolver/dml/ob_dml_resolver.h" -#include "sql/resolver/expr/ob_raw_expr_printer.h" +#include "sql/printer/ob_raw_expr_printer.h" #include "share/schema/ob_schema_struct.h" namespace oceanbase diff --git a/src/sql/ob_insert_all_stmt_printer.cpp b/src/sql/printer/ob_insert_all_stmt_printer.cpp similarity index 98% rename from src/sql/ob_insert_all_stmt_printer.cpp rename to src/sql/printer/ob_insert_all_stmt_printer.cpp index 9ab0e8c98..655a6ec24 100644 --- a/src/sql/ob_insert_all_stmt_printer.cpp +++ b/src/sql/printer/ob_insert_all_stmt_printer.cpp @@ -11,9 +11,9 @@ */ #define USING_LOG_PREFIX SQL -#include "sql/ob_insert_all_stmt_printer.h" +#include "sql/printer/ob_insert_all_stmt_printer.h" #include "sql/ob_sql_context.h" -#include "sql/ob_select_stmt_printer.h" +#include "sql/printer/ob_select_stmt_printer.h" namespace oceanbase { diff --git a/src/sql/ob_insert_all_stmt_printer.h b/src/sql/printer/ob_insert_all_stmt_printer.h similarity index 97% rename from src/sql/ob_insert_all_stmt_printer.h rename to src/sql/printer/ob_insert_all_stmt_printer.h index 474e0af1d..22591b3cc 100644 --- a/src/sql/ob_insert_all_stmt_printer.h +++ b/src/sql/printer/ob_insert_all_stmt_printer.h @@ -15,7 +15,7 @@ #include "ob_dml_stmt_printer.h" #include "sql/resolver/dml/ob_insert_all_stmt.h" -#include "sql/resolver/expr/ob_raw_expr_printer.h" +#include "sql/printer/ob_raw_expr_printer.h" namespace oceanbase { diff --git a/src/sql/ob_insert_stmt_printer.cpp b/src/sql/printer/ob_insert_stmt_printer.cpp similarity index 99% rename from src/sql/ob_insert_stmt_printer.cpp rename to src/sql/printer/ob_insert_stmt_printer.cpp index 1631741a4..fb8bb4601 100644 --- a/src/sql/ob_insert_stmt_printer.cpp +++ b/src/sql/printer/ob_insert_stmt_printer.cpp @@ -11,7 +11,7 @@ */ #define USING_LOG_PREFIX SQL -#include "sql/ob_insert_stmt_printer.h" +#include "sql/printer/ob_insert_stmt_printer.h" #include "sql/ob_sql_context.h" namespace oceanbase diff --git a/src/sql/ob_insert_stmt_printer.h b/src/sql/printer/ob_insert_stmt_printer.h similarity index 96% rename from src/sql/ob_insert_stmt_printer.h rename to src/sql/printer/ob_insert_stmt_printer.h index 48f6e3619..5f203be64 100644 --- a/src/sql/ob_insert_stmt_printer.h +++ b/src/sql/printer/ob_insert_stmt_printer.h @@ -15,7 +15,7 @@ #include "ob_dml_stmt_printer.h" #include "sql/resolver/dml/ob_insert_stmt.h" -#include "sql/resolver/expr/ob_raw_expr_printer.h" +#include "sql/printer/ob_raw_expr_printer.h" namespace oceanbase { diff --git a/src/sql/ob_merge_stmt_printer.cpp b/src/sql/printer/ob_merge_stmt_printer.cpp similarity index 100% rename from src/sql/ob_merge_stmt_printer.cpp rename to src/sql/printer/ob_merge_stmt_printer.cpp diff --git a/src/sql/ob_merge_stmt_printer.h b/src/sql/printer/ob_merge_stmt_printer.h similarity index 96% rename from src/sql/ob_merge_stmt_printer.h rename to src/sql/printer/ob_merge_stmt_printer.h index 360fb75b3..26af877bc 100644 --- a/src/sql/ob_merge_stmt_printer.h +++ b/src/sql/printer/ob_merge_stmt_printer.h @@ -15,7 +15,7 @@ #include "ob_dml_stmt_printer.h" #include "sql/resolver/dml/ob_merge_stmt.h" -#include "sql/resolver/expr/ob_raw_expr_printer.h" +#include "sql/printer/ob_raw_expr_printer.h" namespace oceanbase { diff --git a/src/sql/resolver/expr/ob_raw_expr_printer.cpp b/src/sql/printer/ob_raw_expr_printer.cpp similarity index 99% rename from src/sql/resolver/expr/ob_raw_expr_printer.cpp rename to src/sql/printer/ob_raw_expr_printer.cpp index d2c8b627e..c500d4119 100644 --- a/src/sql/resolver/expr/ob_raw_expr_printer.cpp +++ b/src/sql/printer/ob_raw_expr_printer.cpp @@ -11,9 +11,9 @@ */ #define USING_LOG_PREFIX SQL -#include "sql/resolver/expr/ob_raw_expr_printer.h" +#include "sql/printer/ob_raw_expr_printer.h" #include "lib/oblog/ob_log_module.h" -#include "sql/ob_select_stmt_printer.h" +#include "sql/printer/ob_select_stmt_printer.h" #include "sql/engine/expr/ob_expr_column_conv.h" #include "sql/resolver/expr/ob_raw_expr_util.h" #include "lib/string/ob_sql_string.h" diff --git a/src/sql/resolver/expr/ob_raw_expr_printer.h b/src/sql/printer/ob_raw_expr_printer.h similarity index 100% rename from src/sql/resolver/expr/ob_raw_expr_printer.h rename to src/sql/printer/ob_raw_expr_printer.h diff --git a/src/sql/ob_select_stmt_printer.cpp b/src/sql/printer/ob_select_stmt_printer.cpp similarity index 99% rename from src/sql/ob_select_stmt_printer.cpp rename to src/sql/printer/ob_select_stmt_printer.cpp index baaad0edd..e43b9147f 100644 --- a/src/sql/ob_select_stmt_printer.cpp +++ b/src/sql/printer/ob_select_stmt_printer.cpp @@ -11,7 +11,7 @@ */ #define USING_LOG_PREFIX SQL -#include "sql/ob_select_stmt_printer.h" +#include "sql/printer/ob_select_stmt_printer.h" #include "sql/ob_sql_context.h" #include "sql/resolver/expr/ob_raw_expr_util.h" #include "sql/resolver/expr/ob_raw_expr.h" diff --git a/src/sql/ob_select_stmt_printer.h b/src/sql/printer/ob_select_stmt_printer.h similarity index 98% rename from src/sql/ob_select_stmt_printer.h rename to src/sql/printer/ob_select_stmt_printer.h index 9b907a1a2..5abd20531 100644 --- a/src/sql/ob_select_stmt_printer.h +++ b/src/sql/printer/ob_select_stmt_printer.h @@ -15,7 +15,7 @@ #include "ob_dml_stmt_printer.h" #include "sql/resolver/dml/ob_select_stmt.h" -#include "sql/resolver/expr/ob_raw_expr_printer.h" +#include "sql/printer/ob_raw_expr_printer.h" namespace oceanbase { diff --git a/src/sql/ob_update_stmt_printer.cpp b/src/sql/printer/ob_update_stmt_printer.cpp similarity index 99% rename from src/sql/ob_update_stmt_printer.cpp rename to src/sql/printer/ob_update_stmt_printer.cpp index be32df552..9421df9aa 100644 --- a/src/sql/ob_update_stmt_printer.cpp +++ b/src/sql/printer/ob_update_stmt_printer.cpp @@ -11,7 +11,7 @@ */ #define USING_LOG_PREFIX SQL -#include "sql/ob_update_stmt_printer.h" +#include "sql/printer/ob_update_stmt_printer.h" #include "sql/ob_sql_context.h" #include "sql/resolver/expr/ob_raw_expr_util.h" #include "sql/resolver/dml/ob_select_stmt.h" diff --git a/src/sql/ob_update_stmt_printer.h b/src/sql/printer/ob_update_stmt_printer.h similarity index 97% rename from src/sql/ob_update_stmt_printer.h rename to src/sql/printer/ob_update_stmt_printer.h index 24a1f6e0b..d6d506041 100644 --- a/src/sql/ob_update_stmt_printer.h +++ b/src/sql/printer/ob_update_stmt_printer.h @@ -15,7 +15,7 @@ #include "ob_dml_stmt_printer.h" #include "sql/resolver/dml/ob_update_stmt.h" -#include "sql/resolver/expr/ob_raw_expr_printer.h" +#include "sql/printer/ob_raw_expr_printer.h" namespace oceanbase { diff --git a/src/sql/resolver/cmd/ob_load_data_resolver.cpp b/src/sql/resolver/cmd/ob_load_data_resolver.cpp index 613f3adb0..72a744aa3 100644 --- a/src/sql/resolver/cmd/ob_load_data_resolver.cpp +++ b/src/sql/resolver/cmd/ob_load_data_resolver.cpp @@ -20,7 +20,7 @@ #include "sql/resolver/dml/ob_default_value_utils.h" #include "sql/resolver/dml/ob_select_resolver.h" #include "common/sql_mode/ob_sql_mode.h" -#include "sql/resolver/expr/ob_raw_expr_printer.h" +#include "sql/printer/ob_raw_expr_printer.h" #include "sql/resolver/ob_resolver.h" #include "sql/resolver/dml/ob_delete_resolver.h" #include "lib/json/ob_json.h" diff --git a/src/sql/resolver/ddl/ob_create_context_resolver.cpp b/src/sql/resolver/ddl/ob_create_context_resolver.cpp index a3ed39397..0ee09ce6b 100644 --- a/src/sql/resolver/ddl/ob_create_context_resolver.cpp +++ b/src/sql/resolver/ddl/ob_create_context_resolver.cpp @@ -16,7 +16,7 @@ #include "sql/resolver/ob_resolver_utils.h" #include "sql/resolver/ddl/ob_context_stmt.h" #include "sql/ob_sql_context.h" -#include "sql/ob_select_stmt_printer.h" +#include "sql/printer/ob_select_stmt_printer.h" #include "sql/session/ob_sql_session_info.h" #include "lib/json/ob_json_print_utils.h" // for SJ diff --git a/src/sql/resolver/ddl/ob_create_table_resolver.cpp b/src/sql/resolver/ddl/ob_create_table_resolver.cpp index 3d04777fa..069adbcd7 100644 --- a/src/sql/resolver/ddl/ob_create_table_resolver.cpp +++ b/src/sql/resolver/ddl/ob_create_table_resolver.cpp @@ -33,7 +33,7 @@ #include "share/ob_cluster_version.h" #include "share/schema/ob_part_mgr_util.h" #include "sql/resolver/dml/ob_select_resolver.h" -#include "sql/ob_select_stmt_printer.h" +#include "sql/printer/ob_select_stmt_printer.h" #include "observer/ob_server.h" #include "observer/omt/ob_tenant_config_mgr.h" #include "sql/resolver/cmd/ob_help_resolver.h" diff --git a/src/sql/resolver/ddl/ob_create_view_resolver.cpp b/src/sql/resolver/ddl/ob_create_view_resolver.cpp index 00c14bee7..851fc98bb 100644 --- a/src/sql/resolver/ddl/ob_create_view_resolver.cpp +++ b/src/sql/resolver/ddl/ob_create_view_resolver.cpp @@ -18,7 +18,7 @@ #include "sql/resolver/dml/ob_select_stmt.h" // resolve select clause #include "sql/resolver/dml/ob_dml_stmt.h" // PartExprItem #include "sql/ob_sql_context.h" -#include "sql/ob_select_stmt_printer.h" +#include "sql/printer/ob_select_stmt_printer.h" #include "sql/session/ob_sql_session_info.h" #include "sql/resolver/ddl/ob_create_table_resolver.h" #include "lib/json/ob_json_print_utils.h" // for SJ diff --git a/src/sql/resolver/ddl/ob_ddl_resolver.cpp b/src/sql/resolver/ddl/ob_ddl_resolver.cpp index c1e4a15d4..420de6b63 100644 --- a/src/sql/resolver/ddl/ob_ddl_resolver.cpp +++ b/src/sql/resolver/ddl/ob_ddl_resolver.cpp @@ -28,7 +28,7 @@ #include "sql/resolver/expr/ob_raw_expr_util.h" #include "sql/resolver/expr/ob_raw_expr_resolver_impl.h" #include "sql/resolver/ob_resolver_utils.h" -#include "sql/resolver/expr/ob_raw_expr_printer.h" +#include "sql/printer/ob_raw_expr_printer.h" #include "sql/resolver/expr/ob_raw_expr_part_func_checker.h" #include "share/ob_index_builder_util.h" #include "share/object/ob_obj_cast.h" diff --git a/src/sql/resolver/ddl/ob_drop_context_resolver.cpp b/src/sql/resolver/ddl/ob_drop_context_resolver.cpp index 1f7e6a70d..9a5bdc45e 100644 --- a/src/sql/resolver/ddl/ob_drop_context_resolver.cpp +++ b/src/sql/resolver/ddl/ob_drop_context_resolver.cpp @@ -16,7 +16,7 @@ #include "sql/resolver/ob_resolver_utils.h" #include "sql/resolver/ddl/ob_context_stmt.h" #include "sql/ob_sql_context.h" -#include "sql/ob_select_stmt_printer.h" +#include "sql/printer/ob_select_stmt_printer.h" #include "sql/session/ob_sql_session_info.h" #include "lib/json/ob_json_print_utils.h" // for SJ diff --git a/src/sql/resolver/dml/ob_dml_resolver.cpp b/src/sql/resolver/dml/ob_dml_resolver.cpp index 97e0e87ba..fffc71026 100755 --- a/src/sql/resolver/dml/ob_dml_resolver.cpp +++ b/src/sql/resolver/dml/ob_dml_resolver.cpp @@ -47,9 +47,9 @@ #include "sql/optimizer/ob_opt_est_utils.h" #include "objit/expr/ob_iraw_expr.h" #include "sql/rewrite/ob_transform_utils.h" -#include "sql/resolver/expr/ob_raw_expr_printer.h" +#include "sql/printer/ob_raw_expr_printer.h" #include "sql/parser/ob_item_type_str.h" -#include "sql/ob_select_stmt_printer.h" +#include "sql/printer/ob_select_stmt_printer.h" #include "lib/utility/ob_fast_convert.h" #include "sql/engine/expr/ob_expr_autoinc_nextval.h" #include "sql/engine/expr/ob_expr_column_conv.h" diff --git a/src/sql/resolver/ob_resolver_utils.cpp b/src/sql/resolver/ob_resolver_utils.cpp index 676d6ed59..ad4cbe4b8 100644 --- a/src/sql/resolver/ob_resolver_utils.cpp +++ b/src/sql/resolver/ob_resolver_utils.cpp @@ -28,7 +28,7 @@ #include "sql/resolver/expr/ob_raw_expr_util.h" #include "sql/resolver/expr/ob_raw_expr_part_func_checker.h" #include "sql/resolver/expr/ob_raw_expr_part_expr_checker.h" -#include "sql/resolver/expr/ob_raw_expr_printer.h" +#include "sql/printer/ob_raw_expr_printer.h" #include "sql/resolver/ddl/ob_ddl_resolver.h" #include "sql/ob_sql_utils.h" #include "pl/ob_pl_resolver.h" diff --git a/src/sql/rewrite/ob_transform_rule.cpp b/src/sql/rewrite/ob_transform_rule.cpp index 0c2c9528c..af0127cfd 100644 --- a/src/sql/rewrite/ob_transform_rule.cpp +++ b/src/sql/rewrite/ob_transform_rule.cpp @@ -27,7 +27,7 @@ #include "observer/ob_server_struct.h" #include "lib/json/ob_json_print_utils.h" #include "sql/optimizer/ob_optimizer_util.h" -#include "sql/ob_select_stmt_printer.h" +#include "sql/printer/ob_select_stmt_printer.h" namespace oceanbase { namespace sql diff --git a/src/sql/udr/ob_udr_sql_service.cpp b/src/sql/udr/ob_udr_sql_service.cpp index ff5677d6c..3e2ecca5f 100644 --- a/src/sql/udr/ob_udr_sql_service.cpp +++ b/src/sql/udr/ob_udr_sql_service.cpp @@ -25,7 +25,7 @@ #include "share/ob_dml_sql_splicer.h" #include "share/ob_max_id_fetcher.h" #include "observer/ob_sql_client_decorator.h" -#include "sql/resolver/expr/ob_raw_expr_printer.h" +#include "sql/printer/ob_raw_expr_printer.h" #include "sql/udr/ob_udr_sql_service.h" namespace oceanbase diff --git a/unittest/sql/resolver/test_resolver.cpp b/unittest/sql/resolver/test_resolver.cpp index a579ede10..69f4eab6b 100644 --- a/unittest/sql/resolver/test_resolver.cpp +++ b/unittest/sql/resolver/test_resolver.cpp @@ -13,7 +13,7 @@ #include #include "sql/resolver/expr/ob_raw_expr.h" #include "sql/ob_sql_init.h" -#include "sql/ob_select_stmt_printer.h" +#include "sql/printer/ob_select_stmt_printer.h" #include "sql/resolver/dml/ob_select_stmt.h" #include "sql/resolver/dml/ob_insert_stmt.h" #include "sql/resolver/dml/ob_update_stmt.h"