From e52308603fda27ecd7b35acee4427ddb5beead86 Mon Sep 17 00:00:00 2001 From: obdev Date: Fri, 8 Dec 2023 07:47:33 +0000 Subject: [PATCH] change compat_mode default from MYSQL to INVALID --- deps/oblib/src/lib/worker.h | 2 +- deps/oblib/unittest/lib/test_worker.cpp | 2 +- mittest/mtlenv/storage/test_ls_migration_param.cpp | 1 + unittest/share/test_json_base.cpp | 1 + unittest/share/test_json_bin.cpp | 1 + unittest/share/test_json_path.cpp | 1 + unittest/share/test_json_tree.cpp | 1 + unittest/sql/resolver/expr/test_raw_expr_canonicalizer.cpp | 1 + unittest/sql/resolver/expr/test_raw_expr_resolver.cpp | 1 + unittest/sql/rewrite/test_query_range.cpp | 1 + 10 files changed, 10 insertions(+), 2 deletions(-) diff --git a/deps/oblib/src/lib/worker.h b/deps/oblib/src/lib/worker.h index 9fc0c3a172..114a9cde00 100644 --- a/deps/oblib/src/lib/worker.h +++ b/deps/oblib/src/lib/worker.h @@ -248,7 +248,7 @@ class ObRuntimeContext OB_UNIS_VERSION(1); public: ObRuntimeContext() - : compat_mode_(Worker::CompatMode::MYSQL) + : compat_mode_(Worker::CompatMode::INVALID) {} Worker::CompatMode compat_mode_; #ifdef ERRSIM diff --git a/deps/oblib/unittest/lib/test_worker.cpp b/deps/oblib/unittest/lib/test_worker.cpp index 9474fdd0dc..d1f0d163e9 100644 --- a/deps/oblib/unittest/lib/test_worker.cpp +++ b/deps/oblib/unittest/lib/test_worker.cpp @@ -17,7 +17,7 @@ TEST(TestWorker, CompatMode) { using oceanbase::lib::Worker; - + set_compat_mode(oceanbase::lib::Worker::CompatMode::MYSQL); // MySQL Mode as default. EXPECT_EQ(oceanbase::lib::Worker::CompatMode::MYSQL, THIS_WORKER.get_compatibility_mode()); EXPECT_TRUE(oceanbase::lib::is_mysql_mode()); diff --git a/mittest/mtlenv/storage/test_ls_migration_param.cpp b/mittest/mtlenv/storage/test_ls_migration_param.cpp index f695d19023..97c2da0326 100644 --- a/mittest/mtlenv/storage/test_ls_migration_param.cpp +++ b/mittest/mtlenv/storage/test_ls_migration_param.cpp @@ -345,6 +345,7 @@ TEST_F(TestLSMigrationParam, test_deleted_tablet_info) char buf[buf_len] = {}; share::ObLSID ls_id(1); ObTabletID tablet_id(200001); + set_compat_mode(Worker::CompatMode::MYSQL); ObMigrationTabletParam param; ret = param.build_deleted_tablet_info(ls_id, tablet_id); ASSERT_EQ(OB_SUCCESS, ret); diff --git a/unittest/share/test_json_base.cpp b/unittest/share/test_json_base.cpp index 9ec0878051..52bee9f6f1 100644 --- a/unittest/share/test_json_base.cpp +++ b/unittest/share/test_json_base.cpp @@ -886,6 +886,7 @@ TEST_F(TestJsonBase, test_get_allocator) TEST_F(TestJsonBase, test_seek) { + set_compat_mode(lib::Worker::CompatMode::MYSQL); ObArenaAllocator allocator(ObModIds::TEST); ObIJsonBase *j_tree = NULL; ObIJsonBase *j_bin = NULL; diff --git a/unittest/share/test_json_bin.cpp b/unittest/share/test_json_bin.cpp index ab59308624..6624292401 100644 --- a/unittest/share/test_json_bin.cpp +++ b/unittest/share/test_json_bin.cpp @@ -361,6 +361,7 @@ TEST_F(TestJsonBin, test_bin_lookup) TEST_F(TestJsonBin, test_wrapper_to_string_object) { + set_compat_mode(lib::Worker::CompatMode::MYSQL); // json text 转 json tree common::ObString json_text("{ \"greeting\" : \"Hello!\", \"farewell\" : \"bye-bye!\", \"json_text\" : \"test!\" }"); common::ObArenaAllocator allocator(ObModIds::TEST); diff --git a/unittest/share/test_json_path.cpp b/unittest/share/test_json_path.cpp index 71a8d8bed7..371a59a43a 100644 --- a/unittest/share/test_json_path.cpp +++ b/unittest/share/test_json_path.cpp @@ -685,6 +685,7 @@ TEST_F(TestJsonPath, test_member_node) TEST_F(TestJsonPath, test_ellipsis_node) { int ret = OB_SUCCESS; + set_compat_mode(oceanbase::lib::Worker::CompatMode::MYSQL); ObArenaAllocator allocator(ObModIds::TEST); ObJsonPath test_path("$**[10]", &allocator); ret = test_path.parse_path(); diff --git a/unittest/share/test_json_tree.cpp b/unittest/share/test_json_tree.cpp index cc06d55a38..487448c130 100644 --- a/unittest/share/test_json_tree.cpp +++ b/unittest/share/test_json_tree.cpp @@ -2234,6 +2234,7 @@ TEST_F(TestJsonTree, oracle_sub_type) TEST_F(TestJsonTree, test_sort) { + set_compat_mode(lib::Worker::CompatMode::MYSQL); // correct json text common::ObString json_text("{ \"a\" : \"value1\", \"a\" : \"value2\", \ \"b\" : \"value3\", \"b\" : \"value4\" }"); diff --git a/unittest/sql/resolver/expr/test_raw_expr_canonicalizer.cpp b/unittest/sql/resolver/expr/test_raw_expr_canonicalizer.cpp index 0895448caf..bba0e65aa4 100644 --- a/unittest/sql/resolver/expr/test_raw_expr_canonicalizer.cpp +++ b/unittest/sql/resolver/expr/test_raw_expr_canonicalizer.cpp @@ -96,6 +96,7 @@ void TestRawExprCanonicalizer::canon(const char* expr, const char *&canon_expr) TEST_F(TestRawExprCanonicalizer, basic_test) { + set_compat_mode(Worker::CompatMode::MYSQL); std::ifstream if_tests("./expr/test_raw_expr_canonicalizer.test"); ASSERT_TRUE(if_tests.is_open()); std::string line; diff --git a/unittest/sql/resolver/expr/test_raw_expr_resolver.cpp b/unittest/sql/resolver/expr/test_raw_expr_resolver.cpp index 7ddd8c6dd8..142edb686f 100644 --- a/unittest/sql/resolver/expr/test_raw_expr_resolver.cpp +++ b/unittest/sql/resolver/expr/test_raw_expr_resolver.cpp @@ -95,6 +95,7 @@ void TestRawExprResolver::resolve(const char* expr, const char *&json_expr) TEST_F(TestRawExprResolver, all) { + set_compat_mode(Worker::CompatMode::MYSQL); static const char* test_file = "./expr/test_raw_expr_resolver.test"; static const char* tmp_file = "./expr/test_raw_expr_resolver.tmp"; static const char* result_file = "./expr/test_raw_expr_resolver.result"; diff --git a/unittest/sql/rewrite/test_query_range.cpp b/unittest/sql/rewrite/test_query_range.cpp index 9b9426d5bc..8c8aaaf2bf 100644 --- a/unittest/sql/rewrite/test_query_range.cpp +++ b/unittest/sql/rewrite/test_query_range.cpp @@ -704,6 +704,7 @@ void ObQueryRangeTest::get_query_range_collation(const char *sql_expr, const cha TEST_F(ObQueryRangeTest, collation_test) { + set_compat_mode(lib::Worker::CompatMode::MYSQL); static const char* test_file = "./test_query_range_collation.test"; static const char* tmp_file = "./test_query_range_collation.tmp"; static const char* result_file = "./test_query_range_collation.result";