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

master placeholder

Browse Source
This commit is contained in:
yaojing624 2024-10-31 07:13:51 +00:00 committed by ob-robot
parent a1aa69ed9f
commit 7894513f4b
7 changed files with 146 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/observer/virtual_table/ob_gv_sql_audit.cpp
View File

@ -637,6 +637,9 @@ int ObGvSqlAudit::fill_cells(obmysql::ObMySQLRequestRecord &record)
}
break;
}
case USER_CLIENT_PORT: {
cells[cell_idx].set_int(0);
} break;
case TENANT_ID: {
cells[cell_idx].set_int(record.data_.tenant_id_);
} break;
@ -704,6 +707,9 @@ int ObGvSqlAudit::fill_cells(obmysql::ObMySQLRequestRecord &record)
ObCharset::get_default_charset()));
}
} break;
case TRANS_STATUS: {
cells[cell_idx].set_null();
} break;
case PLAN_ID: {
cells[cell_idx].set_int(record.data_.plan_id_);
} break;

4
src/observer/virtual_table/ob_gv_sql_audit.h
View File

@ -177,7 +177,9 @@ private:
TOTAL_MEMSTORE_READ_ROW_COUNT,
TOTAL_SSSTORE_READ_ROW_COUNT,
PROXY_USER_NAME,
FORMAT_SQL_ID
FORMAT_SQL_ID,
USER_CLIENT_PORT,
TRANS_STATUS,
};
const static int64_t PRI_KEY_IP_IDX = 0;

66
src/share/inner_table/ob_inner_table_schema.11001_11050.cpp
View File

@ -11238,6 +11238,36 @@ int ObInnerTableSchema::all_virtual_sql_audit_schema(ObTableSchema &table_schema
false, //is_nullable
false); //is_autoincrement
}
if (OB_SUCC(ret)) {
ADD_COLUMN_SCHEMA("user_client_port", //column_name
++column_id, //column_id
0, //rowkey_id
0, //index_id
0, //part_key_pos
ObIntType, //column_type
CS_TYPE_INVALID, //column_collation_type
sizeof(int64_t), //column_length
-1, //column_precision
-1, //column_scale
false, //is_nullable
false); //is_autoincrement
}
if (OB_SUCC(ret)) {
ADD_COLUMN_SCHEMA("trans_status", //column_name
++column_id, //column_id
0, //rowkey_id
0, //index_id
0, //part_key_pos
ObVarcharType, //column_type
CS_TYPE_INVALID, //column_collation_type
256, //column_length
-1, //column_precision
-1, //column_scale
false, //is_nullable
false); //is_autoincrement
}
if (OB_SUCC(ret)) {
table_schema.get_part_option().set_part_num(1);
table_schema.set_part_level(PARTITION_LEVEL_ONE);
@ -13125,7 +13155,41 @@ int ObInnerTableSchema::all_virtual_sql_audit_all_virtual_sql_audit_i1_schema(Ob
true);//is_storing_column
}
table_schema.set_max_used_column_id(column_id + 107);
if (OB_SUCC(ret)) {
ADD_COLUMN_SCHEMA_WITH_COLUMN_FLAGS("user_client_port", //column_name
column_id + 108, //column_id
0, //rowkey_id
0, //index_id
0, //part_key_pos
ObIntType, //column_type
CS_TYPE_INVALID, //column_collation_type
sizeof(int64_t), //column_length
-1, //column_precision
-1, //column_scale
false,//is_nullable
false,//is_autoincrement
false,//is_hidden
true);//is_storing_column
}
if (OB_SUCC(ret)) {
ADD_COLUMN_SCHEMA_WITH_COLUMN_FLAGS("trans_status", //column_name
column_id + 109, //column_id
0, //rowkey_id
0, //index_id
0, //part_key_pos
ObVarcharType, //column_type
CS_TYPE_INVALID, //column_collation_type
256, //column_length
-1, //column_precision
-1, //column_scale
false,//is_nullable
false,//is_autoincrement
false,//is_hidden
true);//is_storing_column
}
table_schema.set_max_used_column_id(column_id + 109);
return ret;
}

66
src/share/inner_table/ob_inner_table_schema.15001_15050.cpp
View File

@ -1663,6 +1663,36 @@ int ObInnerTableSchema::all_virtual_sql_audit_ora_schema(ObTableSchema &table_sc
false, //is_nullable
false); //is_autoincrement
}
if (OB_SUCC(ret)) {
ADD_COLUMN_SCHEMA("USER_CLIENT_PORT", //column_name
++column_id, //column_id
0, //rowkey_id
0, //index_id
0, //part_key_pos
ObNumberType, //column_type
CS_TYPE_INVALID, //column_collation_type
38, //column_length
38, //column_precision
0, //column_scale
false, //is_nullable
false); //is_autoincrement
}
if (OB_SUCC(ret)) {
ADD_COLUMN_SCHEMA("TRANS_STATUS", //column_name
++column_id, //column_id
0, //rowkey_id
0, //index_id
0, //part_key_pos
ObVarcharType, //column_type
CS_TYPE_UTF8MB4_BIN, //column_collation_type
256, //column_length
2, //column_precision
-1, //column_scale
false, //is_nullable
false); //is_autoincrement
}
if (OB_SUCC(ret)) {
table_schema.get_part_option().set_part_num(1);
table_schema.set_part_level(PARTITION_LEVEL_ONE);
@ -3550,7 +3580,41 @@ int ObInnerTableSchema::all_virtual_sql_audit_ora_all_virtual_sql_audit_i1_schem
true);//is_storing_column
}
table_schema.set_max_used_column_id(column_id + 107);
if (OB_SUCC(ret)) {
ADD_COLUMN_SCHEMA_WITH_COLUMN_FLAGS("USER_CLIENT_PORT", //column_name
column_id + 108, //column_id
0, //rowkey_id
0, //index_id
0, //part_key_pos
ObNumberType, //column_type
CS_TYPE_INVALID, //column_collation_type
38, //column_length
38, //column_precision
0, //column_scale
false,//is_nullable
false,//is_autoincrement
false,//is_hidden
true);//is_storing_column
}
if (OB_SUCC(ret)) {
ADD_COLUMN_SCHEMA_WITH_COLUMN_FLAGS("TRANS_STATUS", //column_name
column_id + 109, //column_id
0, //rowkey_id
0, //index_id
0, //part_key_pos
ObVarcharType, //column_type
CS_TYPE_UTF8MB4_BIN, //column_collation_type
256, //column_length
2, //column_precision
-1, //column_scale
false,//is_nullable
false,//is_autoincrement
false,//is_hidden
true);//is_storing_column
}
table_schema.set_max_used_column_id(column_id + 109);
return ret;
}

4
src/share/inner_table/ob_inner_table_schema_def.py
View File

@ -8864,7 +8864,9 @@ def_table_schema(
('total_memstore_read_row_count', 'int'),
('total_ssstore_read_row_count', 'int'),
('proxy_user', 'varchar:OB_MAX_USER_NAME_LENGTH_STORE', 'true'),
('format_sql_id', 'varchar:OB_MAX_SQL_ID_LENGTH')
('format_sql_id', 'varchar:OB_MAX_SQL_ID_LENGTH'),
('user_client_port', 'int'),
('trans_status', 'varchar:256'),
],
partition_columns = ['svr_ip', 'svr_port'],
vtable_route_policy = 'distributed',

2
tools/deploy/mysql_test/test_suite/inner_table/r/mysql/desc_virtual_table_in_mysql.result
View File

@ -793,6 +793,8 @@ total_memstore_read_row_count bigint(20) NO NULL
total_ssstore_read_row_count bigint(20) NO NULL
proxy_user varchar(128) YES NULL
format_sql_id varchar(32) NO NULL
user_client_port bigint(20) NO NULL
trans_status varchar(256) NO NULL
select /*+QUERY_TIMEOUT(60000000)*/ IF(count(*) >= 0, 1, 0) from oceanbase.__all_virtual_sql_audit;
IF(count(*) >= 0, 1, 0)
1

2
tools/deploy/mysql_test/test_suite/inner_table/r/mysql/desc_virtual_table_in_sys.result
View File

@ -866,6 +866,8 @@ total_memstore_read_row_count bigint(20) NO NULL
total_ssstore_read_row_count bigint(20) NO NULL
proxy_user varchar(128) YES NULL
format_sql_id varchar(32) NO NULL
user_client_port bigint(20) NO NULL
trans_status varchar(256) NO NULL
select /*+QUERY_TIMEOUT(60000000)*/ IF(count(*) >= 0, 1, 0) from oceanbase.__all_virtual_sql_audit;
IF(count(*) >= 0, 1, 0)
1