t# This is a combination of 2 commits.

1 2
morningman · Sep 10, 2024 · c80f9c1 · c80f9c1
1 parent 1d0690b
commit c80f9c1
Show file tree

Hide file tree

Showing 8 changed files with 25 additions and 24 deletions.
diff --git a/be/src/exec/schema_scanner/schema_active_queries_scanner.cpp b/be/src/exec/schema_scanner/schema_active_queries_scanner.cpp
@@ -136,4 +136,4 @@ Status SchemaActiveQueriesScanner::get_next_block_internal(vectorized::Block* bl
     return Status::OK();
 }
 
-} // namespace doris
+} // namespace doris
diff --git a/be/src/exec/schema_scanner/schema_scanner_helper.cpp b/be/src/exec/schema_scanner/schema_scanner_helper.cpp
@@ -50,8 +50,8 @@ void SchemaScannerHelper::insert_datetime_value(int col_index, const std::vector
     nullable_column->get_null_map_data().emplace_back(0);
 }
 
-void SchemaScannerHelper::insert_int_value(int col_index, int64_t int_val,
-                                           vectorized::Block* block) {
+void SchemaScannerHelper::insert_int64_value(int col_index, int64_t int_val,
+                                             vectorized::Block* block) {
     vectorized::MutableColumnPtr mutable_col_ptr;
     mutable_col_ptr = std::move(*block->get_by_position(col_index).column).assume_mutable();
     auto* nullable_column = reinterpret_cast<vectorized::ColumnNullable*>(mutable_col_ptr.get());

diff --git a/be/src/exec/schema_scanner/schema_scanner_helper.h b/be/src/exec/schema_scanner/schema_scanner_helper.h
@@ -35,7 +35,7 @@ class SchemaScannerHelper {
     static void insert_datetime_value(int col_index, const std::vector<void*>& datas,
                                       vectorized::Block* block);
 
-    static void insert_int_value(int col_index, int64_t int_val, vectorized::Block* block);
+    static void insert_int64_value(int col_index, int64_t int_val, vectorized::Block* block);
     static void insert_double_value(int col_index, double double_val, vectorized::Block* block);
 };
 

diff --git a/be/src/runtime/runtime_query_statistics_mgr.cpp b/be/src/runtime/runtime_query_statistics_mgr.cpp
@@ -521,26 +521,26 @@ void RuntimeQueryStatisticsMgr::get_active_be_tasks_block(vectorized::Block* blo
     for (auto& [query_id, qs_ctx_ptr] : _query_statistics_ctx_map) {
         TQueryStatistics tqs;
         qs_ctx_ptr->collect_query_statistics(&tqs);
-        SchemaScannerHelper::insert_int_value(0, be_id, block);
+        SchemaScannerHelper::insert_int64_value(0, be_id, block);
         SchemaScannerHelper::insert_string_value(1, qs_ctx_ptr->_fe_addr.hostname, block);
         SchemaScannerHelper::insert_string_value(2, query_id, block);
 
         int64_t task_time = qs_ctx_ptr->_is_query_finished
                                     ? qs_ctx_ptr->_query_finish_time - qs_ctx_ptr->_query_start_time
                                     : MonotonicMillis() - qs_ctx_ptr->_query_start_time;
-        SchemaScannerHelper::insert_int_value(3, task_time, block);
-        SchemaScannerHelper::insert_int_value(4, tqs.cpu_ms, block);
-        SchemaScannerHelper::insert_int_value(5, tqs.scan_rows, block);
-        SchemaScannerHelper::insert_int_value(6, tqs.scan_bytes, block);
-        SchemaScannerHelper::insert_int_value(7, tqs.max_peak_memory_bytes, block);
-        SchemaScannerHelper::insert_int_value(8, tqs.current_used_memory_bytes, block);
-        SchemaScannerHelper::insert_int_value(9, tqs.shuffle_send_bytes, block);
-        SchemaScannerHelper::insert_int_value(10, tqs.shuffle_send_rows, block);
+        SchemaScannerHelper::insert_int64_value(3, task_time, block);
+        SchemaScannerHelper::insert_int64_value(4, tqs.cpu_ms, block);
+        SchemaScannerHelper::insert_int64_value(5, tqs.scan_rows, block);
+        SchemaScannerHelper::insert_int64_value(6, tqs.scan_bytes, block);
+        SchemaScannerHelper::insert_int64_value(7, tqs.max_peak_memory_bytes, block);
+        SchemaScannerHelper::insert_int64_value(8, tqs.current_used_memory_bytes, block);
+        SchemaScannerHelper::insert_int64_value(9, tqs.shuffle_send_bytes, block);
+        SchemaScannerHelper::insert_int64_value(10, tqs.shuffle_send_rows, block);
 
         std::stringstream ss;
         ss << qs_ctx_ptr->_query_type;
         SchemaScannerHelper::insert_string_value(11, ss.str(), block);
     }
 }
 
-} // namespace doris
+} // namespace doris
diff --git a/be/src/runtime/workload_group/workload_group_manager.cpp b/be/src/runtime/workload_group/workload_group_manager.cpp
@@ -255,18 +255,18 @@ void WorkloadGroupMgr::get_wg_resource_usage(vectorized::Block* block) {
     std::shared_lock<std::shared_mutex> r_lock(_group_mutex);
     block->reserve(_workload_groups.size());
     for (const auto& [id, wg] : _workload_groups) {
-        SchemaScannerHelper::insert_int_value(0, be_id, block);
-        SchemaScannerHelper::insert_int_value(1, wg->id(), block);
-        SchemaScannerHelper::insert_int_value(2, wg->get_mem_used(), block);
+        SchemaScannerHelper::insert_int64_value(0, be_id, block);
+        SchemaScannerHelper::insert_int64_value(1, wg->id(), block);
+        SchemaScannerHelper::insert_int64_value(2, wg->get_mem_used(), block);
 
         double cpu_usage_p =
                 (double)wg->get_cpu_usage() / (double)total_cpu_time_ns_per_second * 100;
         cpu_usage_p = std::round(cpu_usage_p * 100.0) / 100.0;
 
         SchemaScannerHelper::insert_double_value(3, cpu_usage_p, block);
 
-        SchemaScannerHelper::insert_int_value(4, wg->get_local_scan_bytes_per_second(), block);
-        SchemaScannerHelper::insert_int_value(5, wg->get_remote_scan_bytes_per_second(), block);
+        SchemaScannerHelper::insert_int64_value(4, wg->get_local_scan_bytes_per_second(), block);
+        SchemaScannerHelper::insert_int64_value(5, wg->get_remote_scan_bytes_per_second(), block);
     }
 }
 

diff --git a/fe/fe-core/src/main/java/org/apache/doris/catalog/SchemaTable.java b/fe/fe-core/src/main/java/org/apache/doris/catalog/SchemaTable.java
@@ -302,8 +302,9 @@ public class SchemaTable extends Table {
                                     .column("TABLE_NAME", ScalarType.createVarchar(64))
                                     .column("PARTITION_NAME", ScalarType.createVarchar(64))
                                     .column("SUBPARTITION_NAME", ScalarType.createVarchar(64))
-                                    .column("PARTITION_ORDINAL_POSITION", ScalarType.createType(PrimitiveType.INT))
-                                    .column("SUBPARTITION_ORDINAL_POSITION", ScalarType.createType(PrimitiveType.INT))
+                                    .column("PARTITION_ORDINAL_POSITION", ScalarType.createType(PrimitiveType.BIGINT))
+                                    .column("SUBPARTITION_ORDINAL_POSITION",
+                                            ScalarType.createType(PrimitiveType.BIGINT))
                                     .column("PARTITION_METHOD", ScalarType.createVarchar(13))
                                     .column("SUBPARTITION_METHOD", ScalarType.createVarchar(13))
                                     .column("PARTITION_EXPRESSION", ScalarType.createVarchar(2048))

diff --git a/regression-test/data/query_p0/system/test_partitions_schema.out b/regression-test/data/query_p0/system/test_partitions_schema.out
@@ -42,7 +42,7 @@ internal	test_partitions_schema_db	test_row_column_page_size1	test_row_column_pa
 -- !select_check_3 --
 
 -- !select_check_4 --
-internal	test_partitions_schema_db	duplicate_table	duplicate_table	NULL	0	0	UNPARTITIONED	NULL	NULL	NULL	NULL	-1	0	0	0	0	0	0			
+internal	test_partitions_schema_db	duplicate_table	duplicate_table
 
 -- !select_check_5 --
 
diff --git a/regression-test/suites/query_p0/system/test_partitions_schema.groovy b/regression-test/suites/query_p0/system/test_partitions_schema.groovy
@@ -184,12 +184,12 @@ suite("test_partitions_schema") {
 
     sql "GRANT SELECT_PRIV ON ${dbName}.duplicate_table  TO ${user}"
     connect(user=user, password='123abc!@#', url=url) {
-        qt_select_check_4 """select  $listOfColum from information_schema.partitions where table_schema=\"${dbName}\" order by $listOfColum"""
+        order_qt_select_check_4 """select TABLE_CATALOG,TABLE_SCHEMA,TABLE_NAME,PARTITION_NAME from information_schema.partitions where table_schema=\"${dbName}\""""
     }
 
     sql "REVOKE SELECT_PRIV ON ${dbName}.duplicate_table  FROM ${user}"
     connect(user=user, password='123abc!@#', url=url) {
-        qt_select_check_5 """select  $listOfColum from information_schema.partitions where table_schema=\"${dbName}\" order by $listOfColum"""
+        order_qt_select_check_5 """select TABLE_CATALOG,TABLE_SCHEMA,TABLE_NAME,PARTITION_NAME from information_schema.partitions where table_schema=\"${dbName}\""""
     }
 
 }