diff --git a/src/rootserver/CMakeLists.txt b/src/rootserver/CMakeLists.txt index 106a7b2101..ac55dbe13d 100644 --- a/src/rootserver/CMakeLists.txt +++ b/src/rootserver/CMakeLists.txt @@ -111,7 +111,6 @@ ob_set_subtarget(ob_rootserver balance ob_set_subtarget(ob_rootserver ddl_task ddl_task/ob_column_redefinition_task.cpp ddl_task/ob_constraint_task.cpp - ddl_task/ob_ddl_retry_task.cpp ddl_task/ob_ddl_scheduler.cpp ddl_task/ob_ddl_single_replica_executor.cpp diff --git a/src/share/CMakeLists.txt b/src/share/CMakeLists.txt index 6d4490a2d4..24722f23b5 100644 --- a/src/share/CMakeLists.txt +++ b/src/share/CMakeLists.txt @@ -4,6 +4,10 @@ ob_set_subtarget(ob_share ALONE datum/ob_datum_funcs.cpp schema/ob_schema_service_sql_impl.cpp parameter/ob_parameter_attr.cpp + vector/expr_cmp_func.cpp + aggregate/sum.cpp + aggregate/processor.cpp + aggregate/single_row.cpp ) file(GLOB SCHEMA_CPPS "inner_table/ob_inner_table_schema.*.cpp") @@ -63,19 +67,6 @@ ob_set_subtarget(ob_share cache cache/ob_kvcache_pre_warmer.cpp ) -ob_set_subtarget(ob_share scheduler - scheduler/ob_tenant_dag_scheduler.cpp - scheduler/ob_sys_task_stat.cpp - scheduler/ob_dag_warning_history_mgr.cpp -) - -ob_set_subtarget(ob_share compaction - compaction/ob_compaction_locality_cache.cpp - compaction/ob_table_ckm_items.cpp - compaction/ob_compaction_time_guard.cpp - compaction/ob_schedule_batch_size_mgr.cpp -) - ob_set_subtarget(ob_share common ob_alive_server_tracer.cpp ob_all_server_tracer.cpp @@ -278,6 +269,21 @@ ob_set_subtarget(ob_share common_mixed index_usage/ob_index_usage_info_mgr.cpp index_usage/ob_index_usage_report_task.cpp table/ob_table_util.cpp + scheduler/ob_tenant_dag_scheduler.cpp + scheduler/ob_sys_task_stat.cpp + scheduler/ob_dag_warning_history_mgr.cpp + compaction/ob_compaction_locality_cache.cpp + compaction/ob_table_ckm_items.cpp + compaction/ob_compaction_time_guard.cpp + compaction/ob_schedule_batch_size_mgr.cpp + partition_table/ob_partition_location.cpp + longops_mgr/ob_ddl_longops.cpp + longops_mgr/ob_i_longops.cpp + longops_mgr/ob_longops_mgr.cpp + ash/ob_active_sess_hist_list.cpp + ash/ob_active_sess_hist_task.cpp + throttle/ob_share_throttle_define.cpp + throttle/ob_throttle_common.cpp ) ob_set_subtarget(ob_share tablet @@ -315,16 +321,6 @@ ob_set_subtarget(ob_share deadlock deadlock/ob_lcl_scheme/ob_lcl_utils.cpp ) -ob_set_subtarget(ob_share partition_table - partition_table/ob_partition_location.cpp -) - -ob_set_subtarget(ob_share longops_mgr - longops_mgr/ob_ddl_longops.cpp - longops_mgr/ob_i_longops.cpp - longops_mgr/ob_longops_mgr.cpp -) - ob_set_subtarget(ob_share ls ls/ob_inmemory_ls_table.cpp ls/ob_ls_info.cpp @@ -343,11 +339,6 @@ ob_set_subtarget(ob_share ls ls/ob_ls_log_stat_info.cpp ) -ob_set_subtarget(ob_share ash - ash/ob_active_sess_hist_list.cpp - ash/ob_active_sess_hist_task.cpp -) - ob_set_subtarget(ob_share redolog redolog/ob_clog_switch_write_callback.cpp redolog/ob_log_file_group.cpp @@ -531,11 +522,6 @@ if (OB_ERRSIM) ) endif() -ob_set_subtarget(ob_share throttle - throttle/ob_share_throttle_define.cpp - throttle/ob_throttle_common.cpp -) - ob_set_subtarget(ob_share wr wr/ob_wr_service.cpp wr/ob_wr_task.cpp @@ -553,16 +539,13 @@ ob_set_subtarget(ob_share vector vector/ob_fixed_length_base.cpp vector/ob_discrete_base.cpp vector/ob_continuous_base.cpp - vector/expr_cmp_func.cpp ) ob_set_subtarget(ob_share aggregate aggregate/iaggregate.cpp aggregate/count.cpp aggregate/min_max.cpp - aggregate/sum.cpp - aggregate/processor.cpp - aggregate/single_row.cpp) +) ob_add_new_object_target(ob_share ob_share) diff --git a/src/sql/CMakeLists.txt b/src/sql/CMakeLists.txt index fb4f098917..9a9a6b522d 100644 --- a/src/sql/CMakeLists.txt +++ b/src/sql/CMakeLists.txt @@ -37,6 +37,9 @@ ob_set_subtarget(ob_sql common_mixed dblink/ob_tm_service.cpp privilege_check/ob_ora_priv_check.cpp privilege_check/ob_privilege_check.cpp + resolver/mv/ob_mv_checker.cpp + resolver/mv/ob_mv_provider.cpp + resolver/mv/ob_mv_printer.cpp ) ob_set_subtarget(ob_sql das @@ -252,7 +255,6 @@ ob_set_subtarget(ob_sql engine_cmd engine/cmd/ob_table_direct_insert_ctx.cpp engine/cmd/ob_table_direct_insert_service.cpp engine/cmd/ob_tenant_snapshot_executor.cpp - ) ob_set_subtarget(ob_sql engine_dml @@ -1170,12 +1172,6 @@ ob_set_subtarget(ob_sql resolver_dml resolver/dml/ob_view_table_resolver.cpp ) -ob_set_subtarget(ob_sql resolver_mv - resolver/mv/ob_mv_checker.cpp - resolver/mv/ob_mv_provider.cpp - resolver/mv/ob_mv_printer.cpp -) - ob_set_subtarget(ob_sql resolver_expr resolver/expr/ob_expr_relation_analyzer.cpp resolver/expr/ob_raw_expr.cpp diff --git a/src/storage/CMakeLists.txt b/src/storage/CMakeLists.txt index c0f389f660..d67cb158a7 100644 --- a/src/storage/CMakeLists.txt +++ b/src/storage/CMakeLists.txt @@ -139,10 +139,6 @@ ob_set_subtarget(ob_storage blocksstable_index_block blocksstable/index_block/ob_sstable_sec_meta_iterator.cpp ) -ob_set_subtarget(ob_storage blockstore - blockstore/ob_shared_block_reader_writer.cpp -) - ob_set_subtarget(ob_storage slog slog/ob_server_slog_writer.cpp slog/ob_storage_log_batch_header.cpp @@ -581,6 +577,10 @@ ob_set_subtarget(ob_storage common_mixed meta_mem/ob_tenant_meta_obj_pool.cpp meta_mem/ob_storage_meta_cache.cpp utl_file/ob_utl_file_handler.cpp + blockstore/ob_shared_block_reader_writer.cpp + concurrency_control/ob_multi_version_garbage_collector.cpp + concurrency_control/ob_trans_stat_row.cpp + concurrency_control/ob_data_validation_service.cpp ) ob_set_subtarget(ob_storage compaction @@ -625,12 +625,6 @@ ob_set_subtarget(ob_storage compaction compaction/ob_compaction_memory_context.cpp ) -ob_set_subtarget(ob_storage concurrency_control - concurrency_control/ob_multi_version_garbage_collector.cpp - concurrency_control/ob_trans_stat_row.cpp - concurrency_control/ob_data_validation_service.cpp -) - ob_set_subtarget(ob_storage memtable memtable/ob_lock_wait_mgr.cpp memtable/ob_memtable.cpp