diff --git a/deps/oblib/unittest/common/test_ob_object.cpp b/deps/oblib/unittest/common/test_ob_object.cpp index f7c1dfe16..6cc5ccb17 100644 --- a/deps/oblib/unittest/common/test_ob_object.cpp +++ b/deps/oblib/unittest/common/test_ob_object.cpp @@ -791,7 +791,7 @@ TEST_F(TestObObj, test_serialize) const char * cases[] = { "", - "10.244.4.30:55412;10.244.4.31:55412" + "127.0.0.1:55412;127.0.0.2:55412" }; for (int64_t i = 0; i < ARRAYSIZEOF(cases); ++i) { obj1.set_varchar(cases[i]); diff --git a/script/import/ob_import.py b/script/import/ob_import.py index c78bcc67c..8e1a4c580 100755 --- a/script/import/ob_import.py +++ b/script/import/ob_import.py @@ -17,7 +17,7 @@ param['null'] = '\3' param['table_name'] = 't1' param['column_count'] = 4 -param['host'] = "10.232.38.8" +param['host'] = "127.0.0.1" param['port'] = 35999 param['user'] = "admin" param['passwd'] = "admin" diff --git a/src/libtable/test/ob_batch_execute_test.cpp b/src/libtable/test/ob_batch_execute_test.cpp index 68509fdd5..6a1bda890 100644 --- a/src/libtable/test/ob_batch_execute_test.cpp +++ b/src/libtable/test/ob_batch_execute_test.cpp @@ -30,10 +30,10 @@ using namespace oceanbase::common; using namespace oceanbase::table; -// const char* host = "100.88.11.91"; +// const char* host = "127.0.0.1"; // int32_t sql_port = 60809; // int32_t rpc_port = 60808; -const char* host = "11.158.97.240"; +const char* host = "127.0.0.1"; int32_t sql_port = 41101; int32_t rpc_port = 41100; const char* tenant = "sys"; diff --git a/src/libtable/test/run_test_table_api.sh b/src/libtable/test/run_test_table_api.sh index d3d5b5bea..7a50f5995 100755 --- a/src/libtable/test/run_test_table_api.sh +++ b/src/libtable/test/run_test_table_api.sh @@ -1,10 +1,10 @@ #!/bin/bash -x -HOST=${1:-11.166.82.163} +HOST=${1:-127.0.0.1} PORT=${2:-46905} RPCPORT=${3:-46904} -# HOST=${1:-11.158.97.240} +# HOST=${1:-127.0.0.1} # PORT=${2:-41101} # RPCPORT=${3:-41100} @@ -18,7 +18,7 @@ table_name=batch_execute_test passwd='' user="$user_name@$tenant_name" db=test -# ~/myWorkspace/dooba/dooba -d -h 100.88.11.96 -P 50803 -u root@sys --table-api=1 +# ~/myWorkspace/dooba/dooba -d -h 127.0.0.1 -P 50803 -u root@sys --table-api=1 echo run test... rm -f libobtable.log # table api diff --git a/src/share/ob_web_service_root_addr.cpp b/src/share/ob_web_service_root_addr.cpp index d41a83588..d2cb8b57d 100644 --- a/src/share/ob_web_service_root_addr.cpp +++ b/src/share/ob_web_service_root_addr.cpp @@ -888,11 +888,11 @@ int64_t ObWebServiceRootAddr::curl_write_data( // "ObRegion": "ob2.rongxuan.lc", // "ObRegionId": 2, // "RsList": [{ -// "address": "10.101.67.165:16825", +// "address": "127.0.0.1:16825", // "role": "LEADER", // "sql_port": 16860 // }, { -// "address": "10.218.78.76:16827", +// "address": "127.0.0.2:16827", // "role": "FOLLOWER", // "sql_port": 16862 // }], diff --git a/src/sql/monitor/ob_security_audit.h b/src/sql/monitor/ob_security_audit.h index cdc6567ec..00009a405 100644 --- a/src/sql/monitor/ob_security_audit.h +++ b/src/sql/monitor/ob_security_audit.h @@ -49,7 +49,7 @@ namespace sql //DBID:[10] '1492669708' //SESSIONID:[10] '4294967295' //USERHOST:[23] 'OceanBase224012.sqa.bja' -//CLIENT ADDRESS:[56] '(ADDRESS=(PROTOCOL=tcp)(HOST=10.125.224.12)(PORT=53119))' +//CLIENT ADDRESS:[56] '(ADDRESS=(PROTOCOL=tcp)(HOST=127.0.0.1)(PORT=53119))' //ACTION NUMBER:[3] '100' class ObSecurityAuditData : public common::ObBasebLogPrint { diff --git a/tools/deploy/mysql_test/t/non_reserved_keyword.test b/tools/deploy/mysql_test/t/non_reserved_keyword.test index 7c346c563..0abdadd23 100644 --- a/tools/deploy/mysql_test/t/non_reserved_keyword.test +++ b/tools/deploy/mysql_test/t/non_reserved_keyword.test @@ -8,7 +8,7 @@ set @@session.explicit_defaults_for_timestamp=off; # #alter system set balance_worker_idle_sleep_seconds=33 COMMENT 'new all balance_worker_idle_sleep_seconds' SERVer_TYPE = ROOTSERVER cluster = 0; -#alter system set balance_worker_idle_sleep_seconds=39 COMMENT 'new1 root balance_worker_idle_sleep_seconds' SERVer_TYPE = ROOTSERVER server_ip = '10.235.162.3' server_port = 47051; +#alter system set balance_worker_idle_sleep_seconds=39 COMMENT 'new1 root balance_worker_idle_sleep_seconds' SERVer_TYPE = ROOTSERVER server_ip = '127.0.0.1' server_port = 47051; create table t_status(id int primary key, chunkserver char(90), mergesrver char(90), rootserver char(90), updateserver char(90), tablet_max_size int, status int); diff --git a/tools/deploy/mysql_test/test_suite/pl/r/mysql/pl_dbt2_mysql.result b/tools/deploy/mysql_test/test_suite/pl/r/mysql/pl_dbt2_mysql.result index ada97d6e9..abcc389c9 100644 --- a/tools/deploy/mysql_test/test_suite/pl/r/mysql/pl_dbt2_mysql.result +++ b/tools/deploy/mysql_test/test_suite/pl/r/mysql/pl_dbt2_mysql.result @@ -1183,9 +1183,9 @@ END// ## LOAD DATA ## ./src/datagen -w 1 -m 1 -c 1 -i 1 -o 1 -n 1 -d /home/linlin.xll/work/dbt2-0.37.50.15/data/ --mysql -## sh mysql_load_db.sh --mysql-path /usr/bin/mysql --host 10.244.4.65 --local --path /home/linlin.xll/data/ -## sh mysql_load_sp.sh --client-path /usr/bin/ --host 10.244.4.65 -## sh run_mysql.sh --connections 1 --time 10 --warehouses 1 --host 10.244.4.65 --lib-client-path /usr/bin/mysql --verbose --terminals 1 +## sh mysql_load_db.sh --mysql-path /usr/bin/mysql --host 127.0.0.1 --local --path /home/linlin.xll/data/ +## sh mysql_load_sp.sh --client-path /usr/bin/ --host 127.0.0.1 +## sh run_mysql.sh --connections 1 --time 10 --warehouses 1 --host 127.0.0.1 --lib-client-path /usr/bin/mysql --verbose --terminals 1 insert into customer values(1,1,1,"4W+?M?/aG","OE","BARBARBAR","?VJ;t+P??m5v2?.=?T","%N#RO?|??;[_??~!Y?HP","?[S!JV58?#;+$cP?=d","tw",547411111,3078688431492068,"2018-09-13 15:23:42","GC",50000.00,0.0012,-10.00,10.00,1,0,"?&s?Jf4\\>?oCj'n?HR`i]c?uDH&-w?4??}{39?mL?2mC712Tao??1?oJ)kLvP^_:91BO??qs?F*t#[???m?7sX7|p*Nne?d|\\X}T'?tC?t??-???Ox'?&4zt4?9v?rQ?'#q.?CF??1???x?@G?5K???&?*sk{??x?N{~f?_P%7]z?G?O:0EM<+??*X[W??Y)???V2pfk??Dm=??L/4v@=X?=?[rpD(w??eM?+?\\??}O?|GB?P??kC??%FMs_SAV4??$?fVoB1?8?8WXfCC&c6?_Q-'?]FBg??a?\\?Vt!H?z"); insert into customer values(1,3,1,"?0?WH??\\|L??", "OE", "BARBARBAR", "n9m?}j|H@TZ??gFp\\kFAi(7?]W?(?_<`o]SE?fk???}?_?]?ax/?v;?1ol0a?A?n{G?^?QOxA?e}??lOmpMA?6HNxM?wk?CD%(w?P$Un#?B???>HQ`_0s?\\I&F?o$6??5]?b_7.Y$EH?%c$U?aZi;???8??2?q0?-?aa?d???5m?up5k/e3HV?dcqFsV?xU?X?VMNC;*V???T?b`Xr}?`@E&c?[Mc?:?wmD??T!18?'aug?*/r?l?/pH?(kZ??IaEbY'?Q/?14Y|pN?|?fF?j??Y?i?tI03kpaiZ?mY?v?oD3J?/?9?N????MkSkq[5??sv~>$r???3?^%?B4?m!_G???*RWd\\k[-70H9?/??7?H:?gC_)D?N??+?)`]\\??f5??D"); diff --git a/tools/deploy/mysql_test/test_suite/pl/t/pl_dbt2_mysql.test b/tools/deploy/mysql_test/test_suite/pl/t/pl_dbt2_mysql.test index 2162bdc2c..ac922e6d4 100644 --- a/tools/deploy/mysql_test/test_suite/pl/t/pl_dbt2_mysql.test +++ b/tools/deploy/mysql_test/test_suite/pl/t/pl_dbt2_mysql.test @@ -1204,9 +1204,9 @@ delimiter ;// ## LOAD DATA ## ./src/datagen -w 1 -m 1 -c 1 -i 1 -o 1 -n 1 -d /home/linlin.xll/work/dbt2-0.37.50.15/data/ --mysql -## sh mysql_load_db.sh --mysql-path /usr/bin/mysql --host 10.244.4.65 --local --path /home/linlin.xll/data/ -## sh mysql_load_sp.sh --client-path /usr/bin/ --host 10.244.4.65 -## sh run_mysql.sh --connections 1 --time 10 --warehouses 1 --host 10.244.4.65 --lib-client-path /usr/bin/mysql --verbose --terminals 1 +## sh mysql_load_db.sh --mysql-path /usr/bin/mysql --host 127.0.0.1 --local --path /home/linlin.xll/data/ +## sh mysql_load_sp.sh --client-path /usr/bin/ --host 127.0.0.1 +## sh run_mysql.sh --connections 1 --time 10 --warehouses 1 --host 127.0.0.1 --lib-client-path /usr/bin/mysql --verbose --terminals 1 insert into customer values(1,1,1,"4W+?M?/aG","OE","BARBARBAR","?VJ;t+P??m5v2?.=?T","%N#RO?|??;[_??~!Y?HP","?[S!JV58?#;+$cP?=d","tw",547411111,3078688431492068,"2018-09-13 15:23:42","GC",50000.00,0.0012,-10.00,10.00,1,0,"?&s?Jf4\\>?oCj'n?HR`i]c?uDH&-w?4??}{39?mL?2mC712Tao??1?oJ)kLvP^_:91BO??qs?F*t#[???m?7sX7|p*Nne?d|\\X}T'?tC?t??-???Ox'?&4zt4?9v?rQ?'#q.?CF??1???x?@G?5K???&?*sk{??x?N{~f?_P%7]z?G?O:0EM<+??*X[W??Y)???V2pfk??Dm=??L/4v@=X?=?[rpD(w??eM?+?\\??}O?|GB?P??kC??%FMs_SAV4??$?fVoB1?8?8WXfCC&c6?_Q-'?]FBg??a?\\?Vt!H?z"); diff --git a/tools/deploy/mysql_test/test_suite/subquery/t/rqg_subquery_materialization_oop.test b/tools/deploy/mysql_test/test_suite/subquery/t/rqg_subquery_materialization_oop.test index 970c131a6..faffb1492 100644 --- a/tools/deploy/mysql_test/test_suite/subquery/t/rqg_subquery_materialization_oop.test +++ b/tools/deploy/mysql_test/test_suite/subquery/t/rqg_subquery_materialization_oop.test @@ -6,8 +6,8 @@ --disable_abort_on_error # 15:10:53 Starting # 15:10:53 gentest.pl \ -# 15:10:53 --dsn1=dbi:mysql:host=10.244.4.66:port=44503:user=admin:password=admin:database=test \ -# 15:10:53 --dsn2=dbi:mysql:host=10.244.4.65:port=3308:user=root:password=:database=test_obrqg_10 \ +# 15:10:53 --dsn1=dbi:mysql:host=127.0.0.2:port=44503:user=admin:password=admin:database=test \ +# 15:10:53 --dsn2=dbi:mysql:host=127.0.0.1:port=3308:user=root:password=:database=test_obrqg_10 \ # 15:10:53 --gendata=conf/ob_subquery_materialization.mysql.zz \ # 15:10:53 --grammar=conf/ob_subquery_materialization.mysql.yy \ # 15:10:53 --threads=1 \ @@ -16,7 +16,7 @@ # 15:10:53 --myprint # 15:10:53 ------------------------------- # 15:10:53 Configuration -# 15:10:53 dsn => ['dbi:mysql:host=10.244.4.66:port=44503:user=admin:password=admin:database=test', 'dbi:mysql:host=10.244.4.65:port=3308:user=root:password=:database=test_obrqg_10'] +# 15:10:53 dsn => ['dbi:mysql:host=127.0.0.2:port=44503:user=admin:password=admin:database=test', 'dbi:mysql:host=127.0.0.1:port=3308:user=root:password=:database=test_obrqg_10'] # 15:10:53 duration => 3600 # 15:10:53 gendata => conf/ob_subquery_materialization.mysql.zz # 15:10:53 grammar => conf/ob_subquery_materialization.mysql.yy @@ -105,9 +105,9 @@ COMMIT; # 15:10:59 Starting 1 processes, 8000 queries each, duration 3600 seconds. # 15:10:59 GenTest::ErrorFilter(114237) started # 15:10:59 Default schema: test -# 15:10:59 Caching metadata for dbi:mysql:host=10.244.4.66:port=44503:user=admin:password=admin:database=test +# 15:10:59 Caching metadata for dbi:mysql:host=127.0.0.2:port=44503:user=admin:password=admin:database=test # 15:10:59 Default schema: test -# 15:10:59 Caching metadata for dbi:mysql:host=10.244.4.65:port=3308:user=root:password=:database=test_obrqg_10 +# 15:10:59 Caching metadata for dbi:mysql:host=127.0.0.1:port=3308:user=root:password=:database=test_obrqg_10 # 15:10:59 Started periodic reporting process... #SELECT DISTINCT MIN(DISTINCT OUTR . `col_varchar_20` ) AS X FROM B AS OUTR2 LEFT JOIN B AS OUTR ON ( OUTR2 . `col_varchar_10` >= OUTR . `col_varchar_10` ) WHERE OUTR . `pk` IN ( #SELECT DISTINCT INNR . `col_int` AS Y FROM CC AS INNR WHERE INNR . `col_int_key` > INNR . `pk` AND OUTR . `col_datetime` BETWEEN '2003-01-15' AND '2005-04-19' ) OR ( OUTR . `col_date` <= '2000-08-04' AND NOT OUTR . `pk` IS NOT NULL ) ORDER BY OUTR . `col_datetime` , OUTR . `pk`; #SELECT DISTINCT MAX(DISTINCT OUTR . `pk` ) AS X FROM B AS OUTR WHERE ( OUTR . `pk` , OUTR . `col_int_key` ) IN ( #SELECT INNR . `pk` AS X , INNR . `pk` AS Y FROM BB AS INNR WHERE INNR . `col_datetime` < INNR . `col_date` AND INNR . `col_datetime_key` BETWEEN '2007-12-03' AND '2002-10-12' ORDER BY INNR . `col_date` ) AND ( OUTR . `col_date_key` BETWEEN '2002-04-08' AND '2002-09-07' AND OUTR . `col_int_key` < 2 ) HAVING X > NULL ORDER BY OUTR . `col_varchar_20` , OUTR . `pk`; diff --git a/tools/deploy/mysql_test/test_suite/subquery/t/rqg_subquery_semijoin_mismatch.test b/tools/deploy/mysql_test/test_suite/subquery/t/rqg_subquery_semijoin_mismatch.test index 612ed5d94..59776e6da 100644 --- a/tools/deploy/mysql_test/test_suite/subquery/t/rqg_subquery_semijoin_mismatch.test +++ b/tools/deploy/mysql_test/test_suite/subquery/t/rqg_subquery_semijoin_mismatch.test @@ -8,7 +8,7 @@ # 03:54:00 Starting # 03:54:00 gentest.pl \ # 03:54:00 --dsn1=dbi:mysql:host=10.244.4.66:port=44503:user=admin:password=admin:database=test \ -# 03:54:00 --dsn2=dbi:mysql:host=10.244.4.65:port=3308:user=root:password=:database=test_obrqg_10 \ +# 03:54:00 --dsn2=dbi:mysql:host=127.0.0.1:port=3308:user=root:password=:database=test_obrqg_10 \ # 03:54:00 --gendata=conf/ob_subquery_semijoin_nested.mysql.zz \ # 03:54:00 --grammar=conf/ob_subquery_semijoin_nested.mysql.yy \ # 03:54:00 --threads=1 \ @@ -17,7 +17,7 @@ # 03:54:00 --myprint # 03:54:00 ------------------------------- # 03:54:00 Configuration -# 03:54:00 dsn => ['dbi:mysql:host=10.244.4.66:port=44503:user=admin:password=admin:database=test', 'dbi:mysql:host=10.244.4.65:port=3308:user=root:password=:database=test_obrqg_10'] +# 03:54:00 dsn => ['dbi:mysql:host=10.244.4.66:port=44503:user=admin:password=admin:database=test', 'dbi:mysql:host=127.0.0.1:port=3308:user=root:password=:database=test_obrqg_10'] # 03:54:00 duration => 3600 # 03:54:00 gendata => conf/ob_subquery_semijoin_nested.mysql.zz # 03:54:00 grammar => conf/ob_subquery_semijoin_nested.mysql.yy @@ -1968,7 +1968,7 @@ COMMIT; # 03:54:07 Default schema: test # 03:54:07 Caching metadata for dbi:mysql:host=10.244.4.66:port=44503:user=admin:password=admin:database=test # 03:54:07 Default schema: test -# 03:54:07 Caching metadata for dbi:mysql:host=10.244.4.65:port=3308:user=root:password=:database=test_obrqg_10 +# 03:54:07 Caching metadata for dbi:mysql:host=127.0.0.1:port=3308:user=root:password=:database=test_obrqg_10 # 03:54:07 Started periodic reporting process... #SELECT DISTINCT GRANDPARENT1 . col_date AS G1 FROM A AS GRANDPARENT1 LEFT JOIN P AS GRANDPARENT2 USING ( col_date ) WHERE ( GRANDPARENT1 . `col_varchar_10` , GRANDPARENT1 . `col_varchar_20_key` ) IN ( #SELECT DISTINCT PARENT1 . `col_varchar_20` AS P1 , PARENT1 . `col_varchar_20` AS P2 FROM G AS PARENT1 LEFT JOIN H AS PARENT2 ON ( PARENT1 . `col_int` >= PARENT2 . `col_int_key` ) ) AND GRANDPARENT1 . col_date IS NULL ORDER BY GRANDPARENT1 . col_date LIMIT 9; #SELECT GRANDPARENT1 . col_date AS G1 FROM AA AS GRANDPARENT1 WHERE ( GRANDPARENT1 . `col_varchar_10_key` , GRANDPARENT1 . `col_varchar_10` ) IN ( #SELECT PARENT1 . `col_varchar_20_key` AS P1 , PARENT1 . `col_varchar_20_key` AS P2 FROM G AS PARENT1 ) AND ( ( ( ( GRANDPARENT1 . `col_datetime_key` BETWEEN '2005-02-25' AND '2005-02-04' OR NOT GRANDPARENT1 . `col_int_key` = 4 ) OR NOT GRANDPARENT1 . `col_varchar_10` <= 'w' ) OR GRANDPARENT1 . `col_varchar_10_key` <= 'u' ) AND GRANDPARENT1 . `col_datetime` BETWEEN '2007-03-27' AND '2003-06-17' ) ORDER BY GRANDPARENT1 . col_date ; diff --git a/tools/deploy/mysql_test/test_suite/subquery/t/rqg_subquery_semijoin_nested_timeout.test b/tools/deploy/mysql_test/test_suite/subquery/t/rqg_subquery_semijoin_nested_timeout.test index 9906b502c..ce54cdc15 100644 --- a/tools/deploy/mysql_test/test_suite/subquery/t/rqg_subquery_semijoin_nested_timeout.test +++ b/tools/deploy/mysql_test/test_suite/subquery/t/rqg_subquery_semijoin_nested_timeout.test @@ -5,8 +5,8 @@ --disable_warnings # 15:11:56 Starting # 15:11:56 gentest.pl \ -# 15:11:56 --dsn1=dbi:mysql:host=10.244.4.66:port=44503:user=admin:password=admin:database=test \ -# 15:11:56 --dsn2=dbi:mysql:host=10.244.4.65:port=3308:user=root:password=:database=test_obrqg_10 \ +# 15:11:56 --dsn1=dbi:mysql:host=127.0.0.2:port=44503:user=admin:password=admin:database=test \ +# 15:11:56 --dsn2=dbi:mysql:host=127.0.0.1:port=3308:user=root:password=:database=test_obrqg_10 \ # 15:11:56 --gendata=conf/ob_subquery_semijoin_nested.mysql.zz \ # 15:11:56 --grammar=conf/ob_subquery_semijoin_nested.mysql.yy \ # 15:11:56 --threads=1 \ @@ -15,7 +15,7 @@ # 15:11:56 --myprint # 15:11:56 ------------------------------- # 15:11:56 Configuration -# 15:11:56 dsn => ['dbi:mysql:host=10.244.4.66:port=44503:user=admin:password=admin:database=test', 'dbi:mysql:host=10.244.4.65:port=3308:user=root:password=:database=test_obrqg_10'] +# 15:11:56 dsn => ['dbi:mysql:host=127.0.0.2:port=44503:user=admin:password=admin:database=test', 'dbi:mysql:host=127.0.0.1:port=3308:user=root:password=:database=test_obrqg_10'] # 15:11:56 duration => 3600 # 15:11:56 gendata => conf/ob_subquery_semijoin_nested.mysql.zz # 15:11:56 grammar => conf/ob_subquery_semijoin_nested.mysql.yy @@ -145,9 +145,9 @@ iNSERT INTO KK VALUES ('2001-05-23 15:49:48', 1, 'ssotnefics', 'cssotnefi', NUL # 15:12:02 Starting 1 processes, 8000 queries each, duration 3600 seconds. # 15:12:02 GenTest::ErrorFilter(114401) started # 15:12:02 Default schema: test -# 15:12:02 Caching metadata for dbi:mysql:host=10.244.4.66:port=44503:user=admin:password=admin:database=test +# 15:12:02 Caching metadata for dbi:mysql:host=127.0.0.2:port=44503:user=admin:password=admin:database=test # 15:12:02 Default schema: test -# 15:12:02 Caching metadata for dbi:mysql:host=10.244.4.65:port=3308:user=root:password=:database=test_obrqg_10 +# 15:12:02 Caching metadata for dbi:mysql:host=127.0.0.1:port=3308:user=root:password=:database=test_obrqg_10 # 15:12:02 Started periodic reporting process... #SELECT DISTINCT GRANDPARENT1 . pk AS G1 FROM C AS GRANDPARENT1 WHERE GRANDPARENT1 . `col_varchar_20` IN ( #SELECT DISTINCT PARENT1 . `col_varchar_10_key` AS P1 FROM W AS PARENT1 LEFT JOIN GG AS PARENT2 ON ( PARENT1 . `pk` = PARENT2 . `pk` ) WHERE GRANDPARENT1 . `pk` IN ( #SELECT DISTINCT CHILD1 . `col_int_key` AS C1 FROM CC AS CHILD1 LEFT JOIN M AS CHILD2 ON ( CHILD1 . `col_varchar_20_key` > CHILD2 . `col_varchar_10_key` ) WHERE ( ( CHILD1 . pk IS NOT NULL ) OR NOT ( GRANDPARENT1 . `col_int` <> 6 ) ) ORDER BY CHILD1 . pk ) AND ( GRANDPARENT1 . pk IS UNKNOWN ) ORDER BY PARENT1 . pk ) AND GRANDPARENT1 . pk IS NOT NULL GROUP BY GRANDPARENT1 . pk HAVING G1 <= NULL ORDER BY GRANDPARENT1 . pk LIMIT 9; #SELECT GRANDPARENT1 . col_date_key AS G1 FROM D AS GRANDPARENT1 WHERE GRANDPARENT1 . `col_varchar_10` IN ( #SELECT PARENT1 . `col_varchar_20` AS P1 FROM KK AS PARENT1 ) AND ( GRANDPARENT1 . `col_varchar_10_key` > 'v' OR NOT GRANDPARENT1 . col_date_key IS NULL ) ; diff --git a/unittest/share/test_inner_config_root_addr.cpp b/unittest/share/test_inner_config_root_addr.cpp index 3f134fca7..509678451 100644 --- a/unittest/share/test_inner_config_root_addr.cpp +++ b/unittest/share/test_inner_config_root_addr.cpp @@ -58,11 +58,11 @@ TEST_F(TestInnerConfigRootAddr, fetch) config_.rootservice_list.set_value("0.0.0.0"); ASSERT_NE(OB_SUCCESS, ic_.fetch(rs_list, readonly_rs_list)); - config_.rootservice_list.set_value("10.125.224.12:888"); + config_.rootservice_list.set_value("127.127.0.12:888"); ASSERT_EQ(OB_SUCCESS, ic_.fetch(rs_list, readonly_rs_list)); - config_.rootservice_list.set_value("10.125.224.12:888:"); + config_.rootservice_list.set_value("127.127.0.12:888:"); ASSERT_EQ(OB_SUCCESS, ic_.fetch(rs_list, readonly_rs_list)); - config_.rootservice_list.set_value("10.125.224.12:888:999"); + config_.rootservice_list.set_value("127.127.0.12:888:999"); ASSERT_EQ(OB_SUCCESS, ic_.fetch(rs_list, readonly_rs_list)); config_.rootservice_list.set_value("127.0.0.1:555:666;127.0.0.2:777:888"); diff --git a/unittest/share/test_web_service_root_addr2.cpp b/unittest/share/test_web_service_root_addr2.cpp index 3642a332d..8e66ba365 100644 --- a/unittest/share/test_web_service_root_addr2.cpp +++ b/unittest/share/test_web_service_root_addr2.cpp @@ -92,12 +92,12 @@ TEST_F(TestWebServiceRootAddr, fetch_version2) ObSEArray readonly_rs_list; //No master - set_response_json("[{\"ObRegion\":\"ob2.rongxuan.lc\",\"ObRegionId\":2,\"Type\":\"SLAVE\",\"RsList\":[{\"address\":\"10.101.67.165:16825\",\"role\":\"LEADER\",\"sql_port\":16860},{\"address\":\"10.218.253.100:16826\",\"role\":\"FOLLOWER\",\"sql_port\":16861}],\"ReadonlyRsList\":[]}]"); + set_response_json("[{\"ObRegion\":\"ob2.rongxuan.lc\",\"ObRegionId\":2,\"Type\":\"SLAVE\",\"RsList\":[{\"address\":\"127.0.0.1:16825\",\"role\":\"LEADER\",\"sql_port\":16860},{\"address\":\"127.0.0.2:16826\",\"role\":\"FOLLOWER\",\"sql_port\":16861}],\"ReadonlyRsList\":[]}]"); int ret = ws_.fetch_master_cluster_info(&(initer_.get_config()), rs_list, readonly_rs_list); ASSERT_EQ(OB_ENTRY_NOT_EXIST, ret); //Have master - set_response_json("[{\"ObRegion\":\"ob2.rongxuan.lc\",\"ObRegionId\":2,\"Type\":\"MASTER\",\"RsList\":[{\"address\":\"10.101.67.165:16825\",\"role\":\"LEADER\",\"sql_port\":16860}],\"ReadonlyRsList\":[]}]"); + set_response_json("[{\"ObRegion\":\"ob2.rongxuan.lc\",\"ObRegionId\":2,\"Type\":\"MASTER\",\"RsList\":[{\"address\":\"127.0.0.1:16825\",\"role\":\"LEADER\",\"sql_port\":16860}],\"ReadonlyRsList\":[]}]"); ret = ws_.fetch_master_cluster_info(&(initer_.get_config()), rs_list, readonly_rs_list); ASSERT_EQ(OB_SUCCESS, ret); ASSERT_EQ(rs_list.count(), 1); @@ -105,9 +105,9 @@ TEST_F(TestWebServiceRootAddr, fetch_version2) ASSERT_EQ(16860, rs_list.at(0).sql_port_); //Active and standby two clusters - set_response_json("[{\"ObRegion\":\"ob2.rongxuan.lc\",\"ObRegionId\":2,\"Type\":\"SLAVE\",\"RsList\":[{\"address\":\"10.101.67.165:16825\",\"role\":\"LEADER\",\"sql_port\":16860},{\"address\":\"10.218.253.100:16826\",\"role\":\"FOLLOWER\",\"sql_port\":16861}],\"ReadonlyRsList\":[]}" + set_response_json("[{\"ObRegion\":\"ob2.rongxuan.lc\",\"ObRegionId\":2,\"Type\":\"SLAVE\",\"RsList\":[{\"address\":\"127.0.0.1:16825\",\"role\":\"LEADER\",\"sql_port\":16860},{\"address\":\"127.0.0.2:16826\",\"role\":\"FOLLOWER\",\"sql_port\":16861}],\"ReadonlyRsList\":[]}" ",{\"ObRegion\":\"ob2.rongxuan.lc\",\"ObRegionId\":3,\"Type\":\"MASTER\",\"RsList\":[{\"address\":\"10.101.67.160:16820\",\"role\":\"LEADER\",\"sql_port\":16870}," - "{\"address\":\"10.218.253.170:16825\",\"role\":\"FOLLOWER\",\"sql_port\":16865}],\"ReadonlyRsList\":[]}]"); + "{\"address\":\"127.0.0.3:16825\",\"role\":\"FOLLOWER\",\"sql_port\":16865}],\"ReadonlyRsList\":[]}]"); ret = ws_.fetch_master_cluster_info(&(initer_.get_config()), rs_list, readonly_rs_list); ASSERT_EQ(OB_SUCCESS, ret); ASSERT_EQ(rs_list.count(), 2); diff --git a/unittest/sql/code_generator/test_code_generator.result b/unittest/sql/code_generator/test_code_generator.result index 725f80f99..b1e732cae 100644 --- a/unittest/sql/code_generator/test_code_generator.result +++ b/unittest/sql/code_generator/test_code_generator.result @@ -3153,7 +3153,7 @@ ] } } -[9] UPDATE oceanbase.__all_root_table SET sql_port = 51997, zone = 'test', partition_cnt = 1, role = 0, row_count = 0, data_size = 0, data_version = 1, data_checksum = 0, row_checksum = 0, column_checksum = '' WHERE tenant_id = 1 AND table_id = 2 AND partition_id = 0 AND svr_ip = '10.232.36.175' AND svr_port = 51951; +[9] UPDATE oceanbase.__all_root_table SET sql_port = 51997, zone = 'test', partition_cnt = 1, role = 0, row_count = 0, data_size = 0, data_version = 1, data_checksum = 0, row_checksum = 0, column_checksum = '' WHERE tenant_id = 1 AND table_id = 2 AND partition_id = 0 AND svr_ip = '127.0.0.1' AND svr_port = 51951; { "param_num":11, "table_schema_version": [ @@ -3668,11 +3668,11 @@ "key_type":0, "null_safe":false, "start_value": { - "VARCHAR":"10.232.36.175", + "VARCHAR":"127.0.0.1", "collation":"utf8mb4_general_ci" }, "end_value": { - "VARCHAR":"10.232.36.175", + "VARCHAR":"127.0.0.1", "collation":"utf8mb4_general_ci" }, "include_start":true, diff --git a/unittest/sql/code_generator/test_code_generator.test b/unittest/sql/code_generator/test_code_generator.test index 5f84adc33..b0f3b0987 100644 --- a/unittest/sql/code_generator/test_code_generator.test +++ b/unittest/sql/code_generator/test_code_generator.test @@ -6,7 +6,7 @@ delete from t1 where c1 > 5 select * from t1,t2 where t1.c1+1= t2.c1 select t1.c1, t2.c2, t2.c3 from t1,t2 where t1.c1 > t2.c1 + t2.c2 update t1 vt1 set c2=c1+1 where c1 > 1 order by c1 desc limit 0, 10 -UPDATE oceanbase.__all_root_table SET sql_port = 51997, zone = 'test', partition_cnt = 1, role = 0, row_count = 0, data_size = 0, data_version = 1, data_checksum = 0, row_checksum = 0, column_checksum = '' WHERE tenant_id = 1 AND table_id = 2 AND partition_id = 0 AND svr_ip = '10.232.36.175' AND svr_port = 51951; +UPDATE oceanbase.__all_root_table SET sql_port = 51997, zone = 'test', partition_cnt = 1, role = 0, row_count = 0, data_size = 0, data_version = 1, data_checksum = 0, row_checksum = 0, column_checksum = '' WHERE tenant_id = 1 AND table_id = 2 AND partition_id = 0 AND svr_ip = '127.0.0.1' AND svr_port = 51951; select distinct c2, c1+c2 from t1; select * from t1 union select * from t2; select * from t1 union all select * from t2; diff --git a/unittest/sql/optimizer/test_optimizer_dml.sql b/unittest/sql/optimizer/test_optimizer_dml.sql index e40d0ab54..ced1d1240 100644 --- a/unittest/sql/optimizer/test_optimizer_dml.sql +++ b/unittest/sql/optimizer/test_optimizer_dml.sql @@ -64,7 +64,7 @@ update t1 set c1 = 1 + 1 where c1 = 2; #case 17 partition by key #update t5 set c1 = 1 where c2 = 3 and c3 = 4; -#UPDATE __all_root_table SET sql_port = 51997, zone = 'test', partition_cnt = 1, role = 0, row_count = 0, data_size = 0, data_version = 1, data_checksum = 0, row_checksum = 0, column_checksum = '' WHERE tenant_id = 1 AND table_id = 2 AND partition_id = 0 AND ip = '10.232.36.175' AND port = 51951; +#UPDATE __all_root_table SET sql_port = 51997, zone = 'test', partition_cnt = 1, role = 0, row_count = 0, data_size = 0, data_version = 1, data_checksum = 0, row_checksum = 0, column_checksum = '' WHERE tenant_id = 1 AND table_id = 2 AND partition_id = 0 AND ip = '127.0.0.1' AND port = 51951; #test for partition selection in dml_stmt insert into t1 partition (p3, p0) values(3, 2);