fix

Signed-off-by: Weihao Li <[email protected]>

Author: Wei-hao-Li

integration-test/src/test/java/org/apache/iotdb/relational/it/query/recent/informationschema/IoTDBCurrentQueriesIT.java

@@ -76,6 +76,8 @@ public static void tearDown() throws Exception {
   @Test
   public void testCurrentQueries() {
     try {
+      Assert.assertEquals(3, QUERIES_COSTS_HISTOGRAM_COLUMN_NUM);
+
       Connection connection =
           EnvFactory.getEnv().getConnection(ADMIN_NAME, ADMIN_PWD, BaseEnv.TABLE_SQL_DIALECT);
       Statement statement = connection.createStatement();

iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/source/relational/InformationSchemaContentSupplierFactory.java

@@ -1332,6 +1332,7 @@ private QueriesCostsHistogramSupplier(
     protected void constructLine() {
       columnBuilders[0].writeBinary(BUCKETS[nextConsumedIndex]);
       columnBuilders[1].writeInt(currentQueriesCostHistogram[nextConsumedIndex]);
+      columnBuilders[2].writeInt(QueryId.getDataNodeId());
       resultBuilder.declarePosition();
       nextConsumedIndex++;
     }

iotdb-core/datanode/src/main/java/org/apache/iotdb/db/service/metrics/memory/QueryEngineMemoryMetrics.java

@@ -200,7 +200,17 @@ public void bindTo(AbstractMetricService metricService) {
         GlobalMemoryMetrics.ON_HEAP,
         Tag.LEVEL.toString(),
         GlobalMemoryMetrics.LEVELS[2]);
-    // TODO @spricoder: CoordinatorMemoryManager are not used
+    metricService.createAutoGauge(
+        Metric.MEMORY_ACTUAL_SIZE.toString(),
+        MetricLevel.IMPORTANT,
+        memoryConfig.getCoordinatorMemoryManager(),
+        MemoryManager::getUsedMemorySizeInBytes,
+        Tag.NAME.toString(),
+        QUERY_ENGINE_COORDINATOR,
+        Tag.TYPE.toString(),
+        GlobalMemoryMetrics.ON_HEAP,
+        Tag.LEVEL.toString(),
+        GlobalMemoryMetrics.LEVELS[2]);
   }
 
   @Override

iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/schema/table/InformationSchema.java

@@ -390,6 +390,8 @@ public class InformationSchema {
         new TagColumnSchema(ColumnHeaderConstant.BIN, TSDataType.STRING));
     queriesCostsHistogramTable.addColumnSchema(
         new AttributeColumnSchema(ColumnHeaderConstant.NUMS, TSDataType.INT32));
+    queriesCostsHistogramTable.addColumnSchema(
+        new AttributeColumnSchema(ColumnHeaderConstant.DATANODE_ID, TSDataType.INT32));
     queriesCostsHistogramTable.removeColumnSchema(TsTable.TIME_COLUMN_NAME);
     schemaTables.put(QUERIES_COSTS_HISTOGRAM, queriesCostsHistogramTable);
   }