[MDS/DeadLock] remove uniittest file included in src dir

This commit is contained in:
fengdeyiji
2023-08-30 08:10:49 +00:00
committed by ob-robot
parent b9d0639eb7
commit 0528277691
22 changed files with 7 additions and 27 deletions

View File

@ -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"

View File

@ -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

View File

@ -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

View File

@ -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

View File

@ -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

View File

@ -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"

View File

@ -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 {

View File

@ -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 <string>
#include <iostream>
#include <thread>

View File

@ -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 <gtest/gtest.h>
#include <gmock/gmock.h>

View File

@ -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 <string>
#include <iostream>
#include <thread>

View File

@ -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 <thread>
#include <iostream>
@ -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 {

View File

@ -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 {

View File

@ -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 {

View File

@ -16,7 +16,6 @@
#include <exception>
#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 <thread>

View File

@ -14,7 +14,6 @@
#include <gtest/gtest.h>
#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 <thread>
@ -22,7 +21,6 @@
#include <vector>
#include <chrono>
#include <exception>
#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 <algorithm>
#include <numeric>

View File

@ -15,7 +15,6 @@
#include <gtest/gtest.h>
#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 <thread>
@ -23,7 +22,6 @@
#include <vector>
#include <chrono>
#include <exception>
#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 <algorithm>
#include <numeric>

View File

@ -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 <gtest/gtest.h>

View File

@ -15,7 +15,6 @@
#include "lib/utility/utility.h"
#include "share/ob_errno.h"
#include <exception>
#include "common_define.h"
#include "lib/allocator/ob_malloc.h"
#include "storage/multi_data_source/mds_node.h"
#include <thread>