From b2c83e1a23fda7df8a6b468bb47767b28cd84d8d Mon Sep 17 00:00:00 2001 From: Revendell <2312237896@qq.com> Date: Tue, 18 Mar 2025 08:50:06 +0000 Subject: [PATCH] modify __all_virtual_server column name --- deps/oblib/src/lib/statistic_event/ob_stat_event.h | 1 + .../virtual_table/ob_all_virtual_res_mgr_sys_stat.cpp | 6 ++++++ src/observer/virtual_table/ob_all_virtual_server.cpp | 4 ++-- src/observer/virtual_table/ob_all_virtual_server.h | 4 ++-- src/observer/virtual_table/ob_all_virtual_sys_stat.cpp | 6 ++++++ src/share/inner_table/ob_inner_table_schema.12251_12300.cpp | 4 ++-- src/share/inner_table/ob_inner_table_schema_def.py | 4 ++-- .../inner_table/r/mysql/desc_virtual_table_in_sys.result | 4 ++-- 8 files changed, 23 insertions(+), 10 deletions(-) diff --git a/deps/oblib/src/lib/statistic_event/ob_stat_event.h b/deps/oblib/src/lib/statistic_event/ob_stat_event.h index bfddb0e5a6..287665a23a 100644 --- a/deps/oblib/src/lib/statistic_event/ob_stat_event.h +++ b/deps/oblib/src/lib/statistic_event/ob_stat_event.h @@ -869,6 +869,7 @@ STAT_EVENT_SET_DEF(HIDDEN_SYS_MEMORY, "effective hidden sys memory", ObStatClass STAT_EVENT_SET_DEF(MAX_SESSION_NUM, "max session num", ObStatClassIds::RESOURCE, 140017, false, true, true) STAT_EVENT_SET_DEF(KV_CACHE_HOLD, "kvcache hold", ObStatClassIds::RESOURCE, 140018, false, true, true) STAT_EVENT_SET_DEF(UNMANAGED_MEMORY_SIZE, "unmanaged memory size", ObStatClassIds::RESOURCE, 140019, false, true, true) // FARM COMPAT WHITELIST +STAT_EVENT_SET_DEF(HIDDEN_SYS_DATA_DISK_SIZE, "hidden sys data disk size", ObStatClassIds::RESOURCE, 140020, false, true, true) //CLOG diff --git a/src/observer/virtual_table/ob_all_virtual_res_mgr_sys_stat.cpp b/src/observer/virtual_table/ob_all_virtual_res_mgr_sys_stat.cpp index cc316273d8..58f3346967 100644 --- a/src/observer/virtual_table/ob_all_virtual_res_mgr_sys_stat.cpp +++ b/src/observer/virtual_table/ob_all_virtual_res_mgr_sys_stat.cpp @@ -205,6 +205,12 @@ int ObAllVirtualResMgrSysStat::update_all_stats_(const int64_t tenant_id, ObStat (OB_SYS_TENANT_ID == tenant_id) ? GMEMCONF.get_reserved_server_memory() : 0; stat_events.get(ObStatEventIds::HIDDEN_SYS_MEMORY - ObStatEventIds::STAT_EVENT_ADD_END -1)->stat_value_ = (OB_SYS_TENANT_ID == tenant_id) ? GMEMCONF.get_hidden_sys_memory() : 0; +#ifdef OB_BUILD_SHARED_STORAGE + if (GCTX.is_shared_storage_mode()) { + stat_events.get(ObStatEventIds::HIDDEN_SYS_DATA_DISK_SIZE - ObStatEventIds::STAT_EVENT_ADD_END -1)->stat_value_ = + (OB_SYS_TENANT_ID == tenant_id) ? OB_SERVER_DISK_SPACE_MGR.get_hidden_sys_data_disk_config_size() : 0; + } +#endif int ret_bk = ret; if (NULL != GCTX.omt_) { diff --git a/src/observer/virtual_table/ob_all_virtual_server.cpp b/src/observer/virtual_table/ob_all_virtual_server.cpp index dbf8a1b519..a7b7f929d8 100644 --- a/src/observer/virtual_table/ob_all_virtual_server.cpp +++ b/src/observer/virtual_table/ob_all_virtual_server.cpp @@ -155,14 +155,14 @@ int ObAllVirtualServer::inner_get_next_row(ObNewRow *&row) case MEMORY_LIMIT: cur_row_.cells_[i].set_int(GMEMCONF.get_server_memory_limit()); break; - case DATA_DISK_SUGGESTED_OPERATION: + case SS_DATA_DISK_OPERATION_SUGGESTED: if (GCTX.is_shared_storage_mode()) { cur_row_.cells_[i].set_varchar(share::DataDiskSuggestedOperationType::get_str(resource_info.report_data_disk_suggested_operation_)); } else { cur_row_.cells_[i].set_null(); } break; - case DATA_DISK_SUGGESTED_SIZE: + case SS_DATA_DISK_SIZE_SUGGESTED: if (GCTX.is_shared_storage_mode()) { cur_row_.cells_[i].set_int(resource_info.report_data_disk_suggested_size_); } else { diff --git a/src/observer/virtual_table/ob_all_virtual_server.h b/src/observer/virtual_table/ob_all_virtual_server.h index b2ff211364..e5dafeb54b 100644 --- a/src/observer/virtual_table/ob_all_virtual_server.h +++ b/src/observer/virtual_table/ob_all_virtual_server.h @@ -44,8 +44,8 @@ class ObAllVirtualServer : public common::ObVirtualTableScannerIterator MEMORY_LIMIT, DATA_DISK_ALLOCATED, DATA_DISK_ASSIGNED, - DATA_DISK_SUGGESTED_OPERATION, - DATA_DISK_SUGGESTED_SIZE + SS_DATA_DISK_OPERATION_SUGGESTED, // FARM COMPAT WHITELIST + SS_DATA_DISK_SIZE_SUGGESTED // FARM COMPAT WHITELIST }; public: diff --git a/src/observer/virtual_table/ob_all_virtual_sys_stat.cpp b/src/observer/virtual_table/ob_all_virtual_sys_stat.cpp index 0341de4ad4..ad5668634b 100644 --- a/src/observer/virtual_table/ob_all_virtual_sys_stat.cpp +++ b/src/observer/virtual_table/ob_all_virtual_sys_stat.cpp @@ -197,6 +197,12 @@ int ObAllVirtualSysStat::update_all_stats_(const int64_t tenant_id, common::ObDi (OB_SYS_TENANT_ID == tenant_id) ? GMEMCONF.get_reserved_server_memory() : 0; stat_events.get(ObStatEventIds::HIDDEN_SYS_MEMORY - ObStatEventIds::STAT_EVENT_ADD_END -1)->stat_value_ = (OB_SYS_TENANT_ID == tenant_id) ? GMEMCONF.get_hidden_sys_memory() : 0; +#ifdef OB_BUILD_SHARED_STORAGE + if (GCTX.is_shared_storage_mode()) { + stat_events.get(ObStatEventIds::HIDDEN_SYS_DATA_DISK_SIZE - ObStatEventIds::STAT_EVENT_ADD_END -1)->stat_value_ = + (OB_SYS_TENANT_ID == tenant_id) ? OB_SERVER_DISK_SPACE_MGR.get_hidden_sys_data_disk_config_size() : 0; + } +#endif stat_events.get(ObStatEventIds::UNMANAGED_MEMORY_SIZE - ObStatEventIds::STAT_EVENT_ADD_END -1)->stat_value_ = (OB_SYS_TENANT_ID == tenant_id) ? get_unmanaged_memory_size() : 0; diff --git a/src/share/inner_table/ob_inner_table_schema.12251_12300.cpp b/src/share/inner_table/ob_inner_table_schema.12251_12300.cpp index e13fd01be2..210b73938c 100644 --- a/src/share/inner_table/ob_inner_table_schema.12251_12300.cpp +++ b/src/share/inner_table/ob_inner_table_schema.12251_12300.cpp @@ -6456,7 +6456,7 @@ int ObInnerTableSchema::all_virtual_server_schema(ObTableSchema &table_schema) } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("data_disk_suggested_operation", //column_name + ADD_COLUMN_SCHEMA("ss_data_disk_operation_suggested", //column_name ++column_id, //column_id 0, //rowkey_id 0, //index_id @@ -6471,7 +6471,7 @@ int ObInnerTableSchema::all_virtual_server_schema(ObTableSchema &table_schema) } if (OB_SUCC(ret)) { - ADD_COLUMN_SCHEMA("data_disk_suggested_size", //column_name + ADD_COLUMN_SCHEMA("ss_data_disk_size_suggested", //column_name ++column_id, //column_id 0, //rowkey_id 0, //index_id diff --git a/src/share/inner_table/ob_inner_table_schema_def.py b/src/share/inner_table/ob_inner_table_schema_def.py index b8acf73ca0..ff31a6df34 100755 --- a/src/share/inner_table/ob_inner_table_schema_def.py +++ b/src/share/inner_table/ob_inner_table_schema_def.py @@ -12821,8 +12821,8 @@ def_table_schema( ('memory_limit', 'int'), ('data_disk_allocated', 'int'), ('data_disk_assigned', 'int', 'true'), - ('data_disk_suggested_operation', 'varchar:MAX_OPERATOR_NAME_LENGTH', 'true'), - ('data_disk_suggested_size', 'int', 'true'), + ('ss_data_disk_operation_suggested', 'varchar:MAX_OPERATOR_NAME_LENGTH', 'true'), + ('ss_data_disk_size_suggested', 'int', 'true'), ], partition_columns = ['svr_ip', 'svr_port'], vtable_route_policy = 'distributed', diff --git a/tools/deploy/mysql_test/test_suite/inner_table/r/mysql/desc_virtual_table_in_sys.result b/tools/deploy/mysql_test/test_suite/inner_table/r/mysql/desc_virtual_table_in_sys.result index 36e17fb145..91adf5094b 100644 --- a/tools/deploy/mysql_test/test_suite/inner_table/r/mysql/desc_virtual_table_in_sys.result +++ b/tools/deploy/mysql_test/test_suite/inner_table/r/mysql/desc_virtual_table_in_sys.result @@ -6541,8 +6541,8 @@ ssl_cert_expired_time bigint(20) NO NULL memory_limit bigint(20) NO NULL data_disk_allocated bigint(20) NO NULL data_disk_assigned bigint(20) YES NULL -data_disk_suggested_operation varchar(32) YES NULL -data_disk_suggested_size bigint(20) YES NULL +ss_data_disk_operation_suggested varchar(32) YES NULL +ss_data_disk_size_suggested bigint(20) YES NULL select /*+QUERY_TIMEOUT(60000000)*/ IF(count(*) >= 0, 1, 0) from oceanbase.__all_virtual_server; IF(count(*) >= 0, 1, 0) 1