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

add place holder for table column

Browse Source
This commit is contained in:
hanr881 2023-11-13 10:39:09 +00:00 committed by ob-robot
parent a6117944b9
commit f966aaa116
7 changed files with 183 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/observer/virtual_table/ob_gv_sql.cpp
View File

@ -889,6 +889,11 @@ int ObGVSql::fill_cells(const ObILibCacheObject *cache_obj, const ObPlanCache &p
cells[i].set_timestamp(cache_obj->get_logical_del_time());
break;
}
case share::ALL_VIRTUAL_PLAN_STAT_CDE::COMPILE_TIME: {
uint64_t compile_time = 0;
cells[i].set_null();
break;
}
default: {
ret = OB_ERR_UNEXPECTED;
SERVER_LOG(WARN,

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

@ -1046,6 +1046,12 @@ int ObGvSqlAudit::fill_cells(obmysql::ObMySQLRequestRecord &record)
ObCharset::get_default_charset()));
} break;
case PL_TRACE_ID: {
cells[cell_idx].set_null();
} break;
case PLSQL_EXEC_TIME: {
cells[cell_idx].set_null();
} break;
default: {
ret = OB_ERR_UNEXPECTED;
SERVER_LOG(WARN, "invalid column id", K(ret), K(cell_idx), K(col_id));

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

@ -167,6 +167,9 @@ private:
PARTITION_HIT,
TX_INTERNAL_ROUTE_VERSION,
FLT_TRACE_ID,
PL_TRACE_ID,
PLSQL_EXEC_TIME,
};
const static int64_t PRI_KEY_IP_IDX = 0;

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

@ -3131,6 +3131,21 @@ int ObInnerTableSchema::all_virtual_plan_stat_schema(ObTableSchema &table_schema
false, //is_autoincrement
false); //is_on_update_for_timestamp
}
if (OB_SUCC(ret)) {
ADD_COLUMN_SCHEMA("compile_time", //column_name
++column_id, //column_id
0, //rowkey_id
0, //index_id
0, //part_key_pos
ObUInt64Type, //column_type
CS_TYPE_INVALID, //column_collation_type
sizeof(uint64_t), //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);
@ -10939,6 +10954,36 @@ int ObInnerTableSchema::all_virtual_sql_audit_schema(ObTableSchema &table_schema
false, //is_nullable
false); //is_autoincrement
}
if (OB_SUCC(ret)) {
ADD_COLUMN_SCHEMA("pl_trace_id", //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
OB_MAX_HOST_NAME_LENGTH, //column_length
-1, //column_precision
-1, //column_scale
true, //is_nullable
false); //is_autoincrement
}
if (OB_SUCC(ret)) {
ADD_COLUMN_SCHEMA("plsql_exec_time", //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)) {
table_schema.get_part_option().set_part_num(1);
table_schema.set_part_level(PARTITION_LEVEL_ONE);
@ -12671,7 +12716,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 + 98);
if (OB_SUCC(ret)) {
ADD_COLUMN_SCHEMA_WITH_COLUMN_FLAGS("pl_trace_id", //column_name
column_id + 99, //column_id
0, //rowkey_id
0, //index_id
0, //part_key_pos
ObVarcharType, //column_type
CS_TYPE_INVALID, //column_collation_type
OB_MAX_HOST_NAME_LENGTH, //column_length
-1, //column_precision
-1, //column_scale
true,//is_nullable
false,//is_autoincrement
false,//is_hidden
true);//is_storing_column
}
if (OB_SUCC(ret)) {
ADD_COLUMN_SCHEMA_WITH_COLUMN_FLAGS("plsql_exec_time", //column_name
column_id + 100, //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
}
table_schema.set_max_used_column_id(column_id + 100);
return ret;
}

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

@ -1528,6 +1528,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("PL_TRACE_ID", //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
OB_MAX_HOST_NAME_LENGTH, //column_length
2, //column_precision
-1, //column_scale
true, //is_nullable
false); //is_autoincrement
}
if (OB_SUCC(ret)) {
ADD_COLUMN_SCHEMA("PLSQL_EXEC_TIME", //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)) {
table_schema.get_part_option().set_part_num(1);
table_schema.set_part_level(PARTITION_LEVEL_ONE);
@ -3260,7 +3290,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 + 98);
if (OB_SUCC(ret)) {
ADD_COLUMN_SCHEMA_WITH_COLUMN_FLAGS("PL_TRACE_ID", //column_name
column_id + 99, //column_id
0, //rowkey_id
0, //index_id
0, //part_key_pos
ObVarcharType, //column_type
CS_TYPE_UTF8MB4_BIN, //column_collation_type
OB_MAX_HOST_NAME_LENGTH, //column_length
2, //column_precision
-1, //column_scale
true,//is_nullable
false,//is_autoincrement
false,//is_hidden
true);//is_storing_column
}
if (OB_SUCC(ret)) {
ADD_COLUMN_SCHEMA_WITH_COLUMN_FLAGS("PLSQL_EXEC_TIME", //column_name
column_id + 100, //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
}
table_schema.set_max_used_column_id(column_id + 100);
return ret;
}
@ -4332,6 +4396,21 @@ int ObInnerTableSchema::all_virtual_plan_stat_ora_schema(ObTableSchema &table_sc
false, //is_nullable
false); //is_autoincrement
}
if (OB_SUCC(ret)) {
ADD_COLUMN_SCHEMA("COMPILE_TIME", //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)) {
table_schema.get_part_option().set_part_num(1);
table_schema.set_part_level(PARTITION_LEVEL_ONE);

6
src/share/inner_table/ob_inner_table_schema.h
View File

@ -100,7 +100,8 @@ struct ALL_VIRTUAL_PLAN_STAT_CDE {
OBJECT_STATUS,
RULE_NAME,
IS_IN_PC,
ERASE_TIME
ERASE_TIME,
COMPILE_TIME
};
};
@ -228,7 +229,8 @@ struct ALL_VIRTUAL_PLAN_STAT_ORA_CDE {
OBJECT_STATUS,
RULE_NAME,
IS_IN_PC,
ERASE_TIME
ERASE_TIME,
COMPILE_TIME
};
};

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

@ -6955,7 +6955,8 @@ def_table_schema(
('object_status', 'int'),
('rule_name', 'varchar:256'),
('is_in_pc', 'bool'),
('erase_time', 'timestamp')
('erase_time', 'timestamp'),
('compile_time', 'uint'),
],
vtable_route_policy = 'distributed',
partition_columns = ['svr_ip', 'svr_port'],
@ -7633,7 +7634,9 @@ def_table_schema(
('partition_hit', 'bool'),
('tx_internal_route_version', 'uint'),
('flt_trace_id', 'varchar:OB_MAX_SPAN_LENGTH')
('flt_trace_id', 'varchar:OB_MAX_SPAN_LENGTH'),
('pl_trace_id', 'varchar:OB_MAX_HOST_NAME_LENGTH', 'true'),
('plsql_exec_time', 'int')
],
partition_columns = ['svr_ip', 'svr_port'],
vtable_route_policy = 'distributed',