diff --git a/mittest/mtlenv/storage/test_medium_info_reader.cpp b/mittest/mtlenv/storage/test_medium_info_reader.cpp index 47cf179e47..78f16b469b 100644 --- a/mittest/mtlenv/storage/test_medium_info_reader.cpp +++ b/mittest/mtlenv/storage/test_medium_info_reader.cpp @@ -25,7 +25,6 @@ #include "unittest/storage/test_tablet_helper.h" #include "unittest/storage/test_dml_common.h" #include "unittest/storage/init_basic_struct.h" -#include "unittest/storage/multi_data_source/common_define.h" #include "unittest/storage/schema_utils.h" #include "storage/tablet/ob_tablet_medium_info_reader.h" #include "storage/tablet/ob_tablet_persister.h" diff --git a/mittest/mtlenv/test_buffer_ctx_node.cpp b/mittest/mtlenv/test_buffer_ctx_node.cpp index e274e9ad74..f1c457e3cf 100644 --- a/mittest/mtlenv/test_buffer_ctx_node.cpp +++ b/mittest/mtlenv/test_buffer_ctx_node.cpp @@ -27,9 +27,6 @@ #include "storage/multi_data_source/runtime_utility/mds_factory.h" #include "common/ob_clock_generator.h" #include "storage/multi_data_source/mds_node.h" -#include "unittest/storage/multi_data_source/common_define.h" -#include "unittest/storage/multi_data_source/example_user_data_define.h" -#include "unittest/storage/multi_data_source/example_user_helper_define.h" #include "storage/multi_data_source/mds_table_handle.h" #include "storage/tablet/ob_tablet_meta.h" #define MIT_TESTCASE_LABEL diff --git a/mittest/simple_server/test_mds_transaction.cpp b/mittest/simple_server/test_mds_transaction.cpp index 09608578fe..8d1851d953 100644 --- a/mittest/simple_server/test_mds_transaction.cpp +++ b/mittest/simple_server/test_mds_transaction.cpp @@ -18,7 +18,6 @@ #define protected public #define private public #include "ob_tablet_id.h" -#include "storage/multi_data_source/common_define.h" #include "storage/tx_storage/ob_ls_service.h" #include "lib/utility/serialization.h" #include "share/cache/ob_kv_storecache.h" @@ -27,7 +26,6 @@ #include "storage/multi_data_source/mds_table_handle.h" #include "storage/tx_storage/ob_ls_handle.h" #include "storage/tablet/ob_tablet.h" -#include "unittest/storage/multi_data_source/example_user_helper_define.cpp" #include "storage/multi_data_source/runtime_utility/mds_tenant_service.h" namespace oceanbase diff --git a/src/share/deadlock/ob_deadlock_key_register.h b/src/share/deadlock/ob_deadlock_key_register.h index 7df265ba26..6173c768c7 100644 --- a/src/share/deadlock/ob_deadlock_key_register.h +++ b/src/share/deadlock/ob_deadlock_key_register.h @@ -11,7 +11,7 @@ */ #ifdef NEED_DEFINE -#include "../unittest/share/deadlock/test_key.h"// module unittest +#include "share/deadlock/test/test_key.h"// module unittest #include "storage/tx/ob_trans_define.h" #include "storage/tablelock/ob_table_lock_deadlock.h" #endif diff --git a/unittest/share/deadlock/test_key.h b/src/share/deadlock/test/test_key.h similarity index 100% rename from unittest/share/deadlock/test_key.h rename to src/share/deadlock/test/test_key.h diff --git a/src/storage/CMakeLists.txt b/src/storage/CMakeLists.txt index 44c52c21cc..f5e9b233df 100755 --- a/src/storage/CMakeLists.txt +++ b/src/storage/CMakeLists.txt @@ -568,6 +568,7 @@ ob_set_subtarget(ob_storage multi_data_source multi_data_source/ob_mds_table_merge_dag.cpp multi_data_source/ob_mds_table_merge_dag_param.cpp multi_data_source/ob_mds_table_merge_task.cpp + multi_data_source/test/example_user_helper_define.cpp ) ob_set_subtarget(ob_storage tablelock diff --git a/src/storage/multi_data_source/compile_utility/mds_register.h b/src/storage/multi_data_source/compile_utility/mds_register.h index 91f9218a1d..abe306a45e 100644 --- a/src/storage/multi_data_source/compile_utility/mds_register.h +++ b/src/storage/multi_data_source/compile_utility/mds_register.h @@ -9,8 +9,8 @@ #if defined (NEED_MDS_REGISTER_DEFINE) && !defined (NEED_GENERATE_MDS_FRAME_CODE_FOR_TRANSACTION) #include "src/storage/multi_data_source/compile_utility/mds_dummy_key.h" #include "src/storage/multi_data_source/mds_ctx.h" - #include "unittest/storage/multi_data_source/example_user_data_define.h" - #include "unittest/storage/multi_data_source/example_user_helper_define.h" + #include "src/storage/multi_data_source/test/example_user_data_define.h" + #include "src/storage/multi_data_source/test/example_user_helper_define.h" #include "src/storage/tablet/ob_tablet_create_delete_mds_user_data.h" #include "src/storage/tablet/ob_tablet_create_mds_helper.h" #include "src/storage/tablet/ob_tablet_delete_mds_helper.h" diff --git a/unittest/storage/multi_data_source/common_define.h b/src/storage/multi_data_source/test/common_define.h similarity index 88% rename from unittest/storage/multi_data_source/common_define.h rename to src/storage/multi_data_source/test/common_define.h index 93f026b5d2..6ca1ebc497 100644 --- a/unittest/storage/multi_data_source/common_define.h +++ b/src/storage/multi_data_source/test/common_define.h @@ -1,7 +1,6 @@ #ifndef UNITTEST_STORAGE_MULTI_DATA_SOURCE_COMMON_DEFINE_H #define UNITTEST_STORAGE_MULTI_DATA_SOURCE_COMMON_DEFINE_H #include "src/share/scn.h" -#include "example_user_data_define.h" namespace oceanbase { namespace unittest { diff --git a/unittest/storage/multi_data_source/example_user_data_define.h b/src/storage/multi_data_source/test/example_user_data_define.h similarity index 100% rename from unittest/storage/multi_data_source/example_user_data_define.h rename to src/storage/multi_data_source/test/example_user_data_define.h diff --git a/unittest/storage/multi_data_source/example_user_helper_define.cpp b/src/storage/multi_data_source/test/example_user_helper_define.cpp similarity index 100% rename from unittest/storage/multi_data_source/example_user_helper_define.cpp rename to src/storage/multi_data_source/test/example_user_helper_define.cpp diff --git a/unittest/storage/multi_data_source/example_user_helper_define.h b/src/storage/multi_data_source/test/example_user_helper_define.h similarity index 100% rename from unittest/storage/multi_data_source/example_user_helper_define.h rename to src/storage/multi_data_source/test/example_user_helper_define.h diff --git a/unittest/share/deadlock/test_deadlock.cpp b/unittest/share/deadlock/test_deadlock.cpp index dc46e19207..0823825b82 100644 --- a/unittest/share/deadlock/test_deadlock.cpp +++ b/unittest/share/deadlock/test_deadlock.cpp @@ -23,7 +23,7 @@ #include "share/deadlock/ob_lcl_scheme/ob_lcl_message.h" #include "lib/function/ob_function.h" #include "common/ob_clock_generator.h" -#include "share/deadlock/test_key.h" +#include "share/deadlock/test/test_key.h" #include #include #include diff --git a/unittest/share/deadlock/test_key_wrapper.cpp b/unittest/share/deadlock/test_key_wrapper.cpp index 9c682eb7b6..e2ca2dee41 100644 --- a/unittest/share/deadlock/test_key_wrapper.cpp +++ b/unittest/share/deadlock/test_key_wrapper.cpp @@ -12,7 +12,7 @@ #include "share/deadlock/ob_deadlock_key_wrapper.h" #include "share/deadlock/ob_deadlock_detector_mgr.h" -#include "test_key.h" +#include "share/deadlock/test/test_key.h" #include #include diff --git a/unittest/share/deadlock/test_lcl_message_drop.cpp b/unittest/share/deadlock/test_lcl_message_drop.cpp index 96d4d4f304..ba4f3b7def 100644 --- a/unittest/share/deadlock/test_lcl_message_drop.cpp +++ b/unittest/share/deadlock/test_lcl_message_drop.cpp @@ -16,7 +16,7 @@ #define protected public #include "share/deadlock/ob_deadlock_key_wrapper.h" #include "share/deadlock/ob_deadlock_detector_mgr.h" -#include "test_key.h" +#include "share/deadlock/test/test_key.h" #include #include #include diff --git a/unittest/storage/multi_data_source/test_mds_dump_kv.cpp b/unittest/storage/multi_data_source/test_mds_dump_kv.cpp index 5518f511ae..a885fc473b 100644 --- a/unittest/storage/multi_data_source/test_mds_dump_kv.cpp +++ b/unittest/storage/multi_data_source/test_mds_dump_kv.cpp @@ -18,7 +18,6 @@ #define protected public #include "storage/multi_data_source/compile_utility/mds_dummy_key.h" #include "storage/multi_data_source/compile_utility/map_type_index_in_tuple.h" -#include "common_define.h" #include "storage/multi_data_source/adapter_define/mds_dump_node.h" #include #include @@ -27,7 +26,6 @@ #include "storage/multi_data_source/runtime_utility/mds_factory.h" #include "common/ob_clock_generator.h" #include "storage/multi_data_source/mds_node.h" -#include "example_user_helper_define.cpp" #include "storage/multi_data_source/mds_table_handle.h" #include "storage/tablet/ob_tablet_meta.h" namespace oceanbase { diff --git a/unittest/storage/multi_data_source/test_mds_list.cpp b/unittest/storage/multi_data_source/test_mds_list.cpp index d2c961b2a9..bf2aeaeae4 100644 --- a/unittest/storage/multi_data_source/test_mds_list.cpp +++ b/unittest/storage/multi_data_source/test_mds_list.cpp @@ -25,7 +25,6 @@ #include "storage/multi_data_source/runtime_utility/mds_factory.h" #include "common/ob_clock_generator.h" #include "storage/multi_data_source/mds_node.h" -#include "example_user_helper_define.cpp" #include "common/meta_programming/ob_type_traits.h" #include "storage/multi_data_source/mds_row.h" namespace oceanbase { diff --git a/unittest/storage/multi_data_source/test_mds_node.cpp b/unittest/storage/multi_data_source/test_mds_node.cpp index 0f5041a09b..f51bf017b8 100644 --- a/unittest/storage/multi_data_source/test_mds_node.cpp +++ b/unittest/storage/multi_data_source/test_mds_node.cpp @@ -25,7 +25,6 @@ #include "storage/multi_data_source/runtime_utility/mds_factory.h" #include "common/ob_clock_generator.h" #include "storage/multi_data_source/mds_node.h" -#include "example_user_helper_define.cpp" #include "common/meta_programming/ob_type_traits.h" #include "storage/multi_data_source/mds_row.h" namespace oceanbase { diff --git a/unittest/storage/multi_data_source/test_mds_row.cpp b/unittest/storage/multi_data_source/test_mds_row.cpp index bc8610c346..7160585e4c 100644 --- a/unittest/storage/multi_data_source/test_mds_row.cpp +++ b/unittest/storage/multi_data_source/test_mds_row.cpp @@ -16,7 +16,6 @@ #include #define private public #define protected public -#include "common_define.h" #include "lib/allocator/ob_malloc.h" #include "storage/multi_data_source/mds_node.h" #include diff --git a/unittest/storage/multi_data_source/test_mds_table.cpp b/unittest/storage/multi_data_source/test_mds_table.cpp index 6b41a59cf7..603a36f1fa 100644 --- a/unittest/storage/multi_data_source/test_mds_table.cpp +++ b/unittest/storage/multi_data_source/test_mds_table.cpp @@ -14,7 +14,6 @@ #include #define private public #define protected public -#include "multi_data_source/example_user_data_define.h" #include "share/ob_ls_id.h" #include "storage/multi_data_source/mds_writer.h" #include @@ -22,7 +21,6 @@ #include #include #include -#include "common_define.h" #include "lib/ob_errno.h" #include "share/ob_errno.h" #include "storage/multi_data_source/adapter_define/mds_dump_node.h" @@ -33,7 +31,6 @@ #include "storage/multi_data_source/mds_unit.h" #include "storage/multi_data_source/mds_table_handle.h" #include "storage/multi_data_source/mds_table_handler.h" -#include "example_user_helper_define.cpp" #include "storage/tx/ob_trans_define.h" #include #include diff --git a/unittest/storage/multi_data_source/test_mds_table_flush.cpp b/unittest/storage/multi_data_source/test_mds_table_flush.cpp index 6a592f91f6..4d96967dd2 100644 --- a/unittest/storage/multi_data_source/test_mds_table_flush.cpp +++ b/unittest/storage/multi_data_source/test_mds_table_flush.cpp @@ -15,7 +15,6 @@ #include #define private public #define protected public -#include "multi_data_source/example_user_data_define.h" #include "share/ob_ls_id.h" #include "storage/multi_data_source/mds_writer.h" #include @@ -23,7 +22,6 @@ #include #include #include -#include "common_define.h" #include "lib/ob_errno.h" #include "share/ob_errno.h" #include "storage/multi_data_source/adapter_define/mds_dump_node.h" @@ -34,7 +32,6 @@ #include "storage/multi_data_source/mds_unit.h" #include "storage/multi_data_source/mds_table_handle.h" #include "storage/multi_data_source/mds_table_handler.h" -#include "example_user_helper_define.cpp" #include "storage/tx/ob_trans_define.h" #include #include diff --git a/unittest/storage/multi_data_source/test_mds_table_handle.cpp b/unittest/storage/multi_data_source/test_mds_table_handle.cpp index 3e75285a19..ce5793b96f 100644 --- a/unittest/storage/multi_data_source/test_mds_table_handle.cpp +++ b/unittest/storage/multi_data_source/test_mds_table_handle.cpp @@ -9,8 +9,6 @@ * MERCHANTABILITY OR FIT FOR A PARTICULAR PURPOSE. * See the Mulan PubL v2 for more details. */ - -#include "multi_data_source/example_user_data_define.h" #include "share/ob_errno.h" #include diff --git a/unittest/storage/multi_data_source/test_mds_unit.cpp b/unittest/storage/multi_data_source/test_mds_unit.cpp index 895158e94d..837d119a47 100644 --- a/unittest/storage/multi_data_source/test_mds_unit.cpp +++ b/unittest/storage/multi_data_source/test_mds_unit.cpp @@ -15,7 +15,6 @@ #include "lib/utility/utility.h" #include "share/ob_errno.h" #include -#include "common_define.h" #include "lib/allocator/ob_malloc.h" #include "storage/multi_data_source/mds_node.h" #include