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

remove some io views

Browse Source
This commit is contained in:
obdev 2022-10-27 14:35:35 +00:00 committed by wangzelin.wzl
parent 2b5dd97740
commit 6960485aab
5 changed files with 5 additions and 154 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

100
src/share/inner_table/ob_inner_table_schema.21201_21250.cpp
View File

@ -2124,106 +2124,6 @@ int ObInnerTableSchema::v_ob_io_benchmark_schema(ObTableSchema &table_schema)
return ret;
}
int ObInnerTableSchema::gv_ob_io_quota_schema(ObTableSchema &table_schema)
{
int ret = OB_SUCCESS;
uint64_t column_id = OB_APP_MIN_COLUMN_ID - 1;
//generated fields:
table_schema.set_tenant_id(OB_SYS_TENANT_ID);
table_schema.set_tablegroup_id(OB_INVALID_ID);
table_schema.set_database_id(OB_SYS_DATABASE_ID);
table_schema.set_table_id(OB_GV_OB_IO_QUOTA_TID);
table_schema.set_rowkey_split_pos(0);
table_schema.set_is_use_bloomfilter(false);
table_schema.set_progressive_merge_num(0);
table_schema.set_rowkey_column_num(0);
table_schema.set_load_type(TABLE_LOAD_TYPE_IN_DISK);
table_schema.set_table_type(SYSTEM_VIEW);
table_schema.set_index_type(INDEX_TYPE_IS_NOT);
table_schema.set_def_type(TABLE_DEF_TYPE_INTERNAL);
if (OB_SUCC(ret)) {
if (OB_FAIL(table_schema.set_table_name(OB_GV_OB_IO_QUOTA_TNAME))) {
LOG_ERROR("fail to set table_name", K(ret));
}
}
if (OB_SUCC(ret)) {
if (OB_FAIL(table_schema.set_compress_func_name(OB_DEFAULT_COMPRESS_FUNC_NAME))) {
LOG_ERROR("fail to set compress_func_name", K(ret));
}
}
table_schema.set_part_level(PARTITION_LEVEL_ZERO);
table_schema.set_charset_type(ObCharset::get_default_charset());
table_schema.set_collation_type(ObCharset::get_default_collation(ObCharset::get_default_charset()));
if (OB_SUCC(ret)) {
if (OB_FAIL(table_schema.set_view_definition(R"__( SELECT SVR_IP, SVR_PORT, TENANT_ID, CATEGORY, MODE, SIZE, MIN_IOPS, MAX_IOPS, REAL_IOPS, MIN_MBPS, MAX_MBPS, REAL_MBPS FROM oceanbase.__all_virtual_io_quota )__"))) {
LOG_ERROR("fail to set view_definition", K(ret));
}
}
table_schema.set_index_using_type(USING_BTREE);
table_schema.set_row_store_type(ENCODING_ROW_STORE);
table_schema.set_store_format(OB_STORE_FORMAT_DYNAMIC_MYSQL);
table_schema.set_progressive_merge_round(1);
table_schema.set_storage_format_version(3);
table_schema.set_tablet_id(0);
table_schema.set_max_used_column_id(column_id);
return ret;
}
int ObInnerTableSchema::v_ob_io_quota_schema(ObTableSchema &table_schema)
{
int ret = OB_SUCCESS;
uint64_t column_id = OB_APP_MIN_COLUMN_ID - 1;
//generated fields:
table_schema.set_tenant_id(OB_SYS_TENANT_ID);
table_schema.set_tablegroup_id(OB_INVALID_ID);
table_schema.set_database_id(OB_SYS_DATABASE_ID);
table_schema.set_table_id(OB_V_OB_IO_QUOTA_TID);
table_schema.set_rowkey_split_pos(0);
table_schema.set_is_use_bloomfilter(false);
table_schema.set_progressive_merge_num(0);
table_schema.set_rowkey_column_num(0);
table_schema.set_load_type(TABLE_LOAD_TYPE_IN_DISK);
table_schema.set_table_type(SYSTEM_VIEW);
table_schema.set_index_type(INDEX_TYPE_IS_NOT);
table_schema.set_def_type(TABLE_DEF_TYPE_INTERNAL);
if (OB_SUCC(ret)) {
if (OB_FAIL(table_schema.set_table_name(OB_V_OB_IO_QUOTA_TNAME))) {
LOG_ERROR("fail to set table_name", K(ret));
}
}
if (OB_SUCC(ret)) {
if (OB_FAIL(table_schema.set_compress_func_name(OB_DEFAULT_COMPRESS_FUNC_NAME))) {
LOG_ERROR("fail to set compress_func_name", K(ret));
}
}
table_schema.set_part_level(PARTITION_LEVEL_ZERO);
table_schema.set_charset_type(ObCharset::get_default_charset());
table_schema.set_collation_type(ObCharset::get_default_collation(ObCharset::get_default_charset()));
if (OB_SUCC(ret)) {
if (OB_FAIL(table_schema.set_view_definition(R"__( SELECT * FROM oceanbase.GV$OB_IO_QUOTA WHERE svr_ip=HOST_IP() AND svr_port=RPC_PORT() )__"))) {
LOG_ERROR("fail to set view_definition", K(ret));
}
}
table_schema.set_index_using_type(USING_BTREE);
table_schema.set_row_store_type(ENCODING_ROW_STORE);
table_schema.set_store_format(OB_STORE_FORMAT_DYNAMIC_MYSQL);
table_schema.set_progressive_merge_round(1);
table_schema.set_storage_format_version(3);
table_schema.set_tablet_id(0);
table_schema.set_max_used_column_id(column_id);
return ret;
}
int ObInnerTableSchema::cdb_ob_backup_delete_jobs_schema(ObTableSchema &table_schema)
{
int ret = OB_SUCCESS;

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

@ -1210,8 +1210,6 @@ public:
static int v_ob_io_calibration_status_schema(share::schema::ObTableSchema &table_schema);
static int gv_ob_io_benchmark_schema(share::schema::ObTableSchema &table_schema);
static int v_ob_io_benchmark_schema(share::schema::ObTableSchema &table_schema);
static int gv_ob_io_quota_schema(share::schema::ObTableSchema &table_schema);
static int v_ob_io_quota_schema(share::schema::ObTableSchema &table_schema);
static int cdb_ob_backup_delete_jobs_schema(share::schema::ObTableSchema &table_schema);
static int cdb_ob_backup_delete_job_history_schema(share::schema::ObTableSchema &table_schema);
static int cdb_ob_backup_delete_tasks_schema(share::schema::ObTableSchema &table_schema);
@ -3050,8 +3048,6 @@ const schema_create_func sys_view_schema_creators [] = {
ObInnerTableSchema::v_ob_io_calibration_status_schema,
ObInnerTableSchema::gv_ob_io_benchmark_schema,
ObInnerTableSchema::v_ob_io_benchmark_schema,
ObInnerTableSchema::gv_ob_io_quota_schema,
ObInnerTableSchema::v_ob_io_quota_schema,
ObInnerTableSchema::cdb_ob_backup_delete_jobs_schema,
ObInnerTableSchema::cdb_ob_backup_delete_job_history_schema,
ObInnerTableSchema::cdb_ob_backup_delete_tasks_schema,
@ -8813,10 +8809,10 @@ static inline int get_sys_table_lob_aux_schema(const uint64_t tid,
const int64_t OB_CORE_TABLE_COUNT = 4;
const int64_t OB_SYS_TABLE_COUNT = 212;
const int64_t OB_VIRTUAL_TABLE_COUNT = 550;
const int64_t OB_SYS_VIEW_COUNT = 603;
const int64_t OB_SYS_TENANT_TABLE_COUNT = 1370;
const int64_t OB_SYS_VIEW_COUNT = 601;
const int64_t OB_SYS_TENANT_TABLE_COUNT = 1368;
const int64_t OB_CORE_SCHEMA_VERSION = 1;
const int64_t OB_BOOTSTRAP_SCHEMA_VERSION = 1373;
const int64_t OB_BOOTSTRAP_SCHEMA_VERSION = 1371;
} // end namespace share
} // end namespace oceanbase

4
src/share/inner_table/ob_inner_table_schema_constants.h
View File

@ -958,8 +958,6 @@ const uint64_t OB_GV_OB_IO_CALIBRATION_STATUS_TID = 21239; // "GV$OB_IO_CALIBRAT
const uint64_t OB_V_OB_IO_CALIBRATION_STATUS_TID = 21240; // "V$OB_IO_CALIBRATION_STATUS"
const uint64_t OB_GV_OB_IO_BENCHMARK_TID = 21241; // "GV$OB_IO_BENCHMARK"
const uint64_t OB_V_OB_IO_BENCHMARK_TID = 21242; // "V$OB_IO_BENCHMARK"
const uint64_t OB_GV_OB_IO_QUOTA_TID = 21243; // "GV$OB_IO_QUOTA"
const uint64_t OB_V_OB_IO_QUOTA_TID = 21244; // "V$OB_IO_QUOTA"
const uint64_t OB_CDB_OB_BACKUP_DELETE_JOBS_TID = 21245; // "CDB_OB_BACKUP_DELETE_JOBS"
const uint64_t OB_CDB_OB_BACKUP_DELETE_JOB_HISTORY_TID = 21246; // "CDB_OB_BACKUP_DELETE_JOB_HISTORY"
const uint64_t OB_CDB_OB_BACKUP_DELETE_TASKS_TID = 21247; // "CDB_OB_BACKUP_DELETE_TASKS"
@ -2762,8 +2760,6 @@ const char *const OB_GV_OB_IO_CALIBRATION_STATUS_TNAME = "GV$OB_IO_CALIBRATION_S
const char *const OB_V_OB_IO_CALIBRATION_STATUS_TNAME = "V$OB_IO_CALIBRATION_STATUS";
const char *const OB_GV_OB_IO_BENCHMARK_TNAME = "GV$OB_IO_BENCHMARK";
const char *const OB_V_OB_IO_BENCHMARK_TNAME = "V$OB_IO_BENCHMARK";
const char *const OB_GV_OB_IO_QUOTA_TNAME = "GV$OB_IO_QUOTA";
const char *const OB_V_OB_IO_QUOTA_TNAME = "V$OB_IO_QUOTA";
const char *const OB_CDB_OB_BACKUP_DELETE_JOBS_TNAME = "CDB_OB_BACKUP_DELETE_JOBS";
const char *const OB_CDB_OB_BACKUP_DELETE_JOB_HISTORY_TNAME = "CDB_OB_BACKUP_DELETE_JOB_HISTORY";
const char *const OB_CDB_OB_BACKUP_DELETE_TASKS_TNAME = "CDB_OB_BACKUP_DELETE_TASKS";

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

@ -19575,47 +19575,8 @@ def_table_schema(
""".replace("\n", " "),
)
def_table_schema(
owner = 'jianyun.sjy',
table_name = 'GV$OB_IO_QUOTA',
table_id = '21243',
table_type = 'SYSTEM_VIEW',
in_tenant_space = False,
gm_columns = [],
rowkey_columns = [],
normal_columns = [],
view_definition = """
SELECT
SVR_IP,
SVR_PORT,
TENANT_ID,
CATEGORY,
MODE,
SIZE,
MIN_IOPS,
MAX_IOPS,
REAL_IOPS,
MIN_MBPS,
MAX_MBPS,
REAL_MBPS
FROM oceanbase.__all_virtual_io_quota
""".replace("\n", " "),
)
def_table_schema(
owner = 'jianyun.sjy',
table_name = 'V$OB_IO_QUOTA',
table_id = '21244',
table_type = 'SYSTEM_VIEW',
in_tenant_space = False,
gm_columns = [],
rowkey_columns = [],
normal_columns = [],
view_definition = """
SELECT * FROM oceanbase.GV$OB_IO_QUOTA
WHERE svr_ip=HOST_IP() AND svr_port=RPC_PORT()
""".replace("\n", " "),
)
# reserve 21243 for GV$OB_IO_QUOTA
# reserve 21244 for V$OB_IO_QUOTA
# 4.0 backup clean view

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

@ -735,8 +735,6 @@ select 0xffffffffff & table_id, table_name, table_type, database_id, part_num fr
21240 V$OB_IO_CALIBRATION_STATUS 1 201001 1
21241 GV$OB_IO_BENCHMARK 1 201001 1
21242 V$OB_IO_BENCHMARK 1 201001 1
21243 GV$OB_IO_QUOTA 1 201001 1
21244 V$OB_IO_QUOTA 1 201001 1
21245 CDB_OB_BACKUP_DELETE_JOBS 1 201001 1
21246 CDB_OB_BACKUP_DELETE_JOB_HISTORY 1 201001 1
21247 CDB_OB_BACKUP_DELETE_TASKS 1 201001 1