hcq/oceanbase
1
0
Fork 0
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity

[security]remove ip

Browse Source
This commit is contained in:
hnwyllmm
2024-01-11 13:14:35 +00:00
committed by ob-robot
parent aef68a1235
commit 3f9ef31b72
17 changed files with 42 additions and 42 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
unittest/share/test_inner_config_root_addr.cpp
View File

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

8
unittest/share/test_web_service_root_addr2.cpp
View File

@ -92,12 +92,12 @@ TEST_F(TestWebServiceRootAddr, fetch_version2)
ObSEArray<ObRootAddr, 16> 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);

6
unittest/sql/code_generator/test_code_generator.result
View File

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

2
unittest/sql/code_generator/test_code_generator.test
View File

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

2
unittest/sql/optimizer/test_optimizer_dml.sql
View File

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