Added table metric & Improved the database / view metric & Added "count databases" for table model

integration-test/src/test/java/org/apache/iotdb/relational/it/schema/IoTDBDatabaseIT.java

@@ -138,6 +138,9 @@ public void testManageDatabase() {
         assertEquals(databaseNames.length, cnt);
       }
 
+      TestUtils.assertResultSetEqual(
+          statement.executeQuery("count databases"), "count,", Collections.singleton("2,"));
+
       final int[] schemaRegionGroupNum = new int[] {0};
       final int[] dataRegionGroupNum = new int[] {0};
       // show

iotdb-core/confignode/src/main/java/org/apache/iotdb/confignode/manager/partition/PartitionMetrics.java

@@ -22,14 +22,18 @@
 import org.apache.iotdb.common.rpc.thrift.TConsensusGroupType;
 import org.apache.iotdb.common.rpc.thrift.TDataNodeConfiguration;
 import org.apache.iotdb.commons.cluster.RegionStatus;
+import org.apache.iotdb.commons.schema.table.InformationSchema;
+import org.apache.iotdb.commons.schema.table.TableType;
 import org.apache.iotdb.commons.service.metric.enums.Metric;
 import org.apache.iotdb.commons.service.metric.enums.Tag;
 import org.apache.iotdb.commons.utils.NodeUrlUtils;
+import org.apache.iotdb.commons.utils.PathUtils;
 import org.apache.iotdb.confignode.exception.DatabaseNotExistsException;
 import org.apache.iotdb.confignode.manager.IManager;
 import org.apache.iotdb.confignode.manager.load.LoadManager;
 import org.apache.iotdb.confignode.manager.node.NodeManager;
 import org.apache.iotdb.confignode.manager.schema.ClusterSchemaManager;
+import org.apache.iotdb.confignode.persistence.schema.ConfigSchemaStatistics;
 import org.apache.iotdb.metrics.AbstractMetricService;
 import org.apache.iotdb.metrics.metricsets.IMetricSet;
 import org.apache.iotdb.metrics.utils.MetricLevel;
@@ -267,18 +271,34 @@ private void unbindRegionPartitionMetrics(AbstractMetricService metricService) {
 
   // region Database Partition Metrics
 
-  private void bindDatabaseRelatedMetrics(AbstractMetricService metricService) {
-    ClusterSchemaManager clusterSchemaManager = getClusterSchemaManager();
+  private void bindDatabaseRelatedMetrics(final AbstractMetricService metricService) {
+    final ClusterSchemaManager clusterSchemaManager = getClusterSchemaManager();
+    final ConfigSchemaStatistics statistics = clusterSchemaManager.getConfigSchemaStatistics();
     // Count the number of Databases
     metricService.createAutoGauge(
         Metric.DATABASE_NUM.toString(),
         MetricLevel.CORE,
-        clusterSchemaManager,
-        // Add 1 for information schema
-        c -> c.getDatabaseNames(null).size() + 1);
+        statistics,
+        s -> s.getTableDatabaseNum() + s.getTreeDatabaseNum());
+    metricService.createAutoGauge(
+        Metric.TABLE_DATABASE_NUM.toString(),
+        MetricLevel.CORE,
+        statistics,
+        ConfigSchemaStatistics::getTableDatabaseNum);
 
-    List<String> databases = clusterSchemaManager.getDatabaseNames(null);
-    for (String database : databases) {
+    // Enable table num gauge for information_schema
+    metricService
+        .getOrCreateGauge(
+            Metric.TABLE_NUM.toString(),
+            MetricLevel.CORE,
+            Tag.TYPE.toString(),
+            TableType.SYSTEM_VIEW.getName(),
+            Tag.DATABASE.toString(),
+            InformationSchema.INFORMATION_DATABASE)
+        .set(InformationSchema.getSchemaTables().size());
+
+    final List<String> databases = clusterSchemaManager.getDatabaseNames(null);
+    for (final String database : databases) {
       int dataReplicationFactor = 1;
       int schemaReplicationFactor = 1;
       try {
@@ -291,16 +311,28 @@ private void bindDatabaseRelatedMetrics(AbstractMetricService metricService) {
       }
       bindDatabaseRelatedMetricsWhenUpdate(
           metricService, configManager, database, dataReplicationFactor, schemaReplicationFactor);
+      bindDatabaseTableMetrics(metricService, statistics, database);
     }
   }
 
   private void unbindDatabaseRelatedMetrics(AbstractMetricService metricService) {
     // Remove the number of Databases
     metricService.remove(MetricType.AUTO_GAUGE, Metric.DATABASE_NUM.toString());
+    metricService.remove(MetricType.AUTO_GAUGE, Metric.TABLE_DATABASE_NUM.toString());
+
+    // Remove gauge for information_schema
+    metricService.remove(
+        MetricType.GAUGE,
+        Metric.TABLE_NUM.toString(),
+        Tag.TYPE.toString(),
+        TableType.SYSTEM_VIEW.getName(),
+        Tag.DATABASE.toString(),
+        InformationSchema.INFORMATION_DATABASE);
 
     List<String> databases = getClusterSchemaManager().getDatabaseNames(null);
     for (String database : databases) {
       unbindDatabaseRelatedMetricsWhenUpdate(metricService, database);
+      unbindDatabaseTableMetrics(metricService, database);
     }
   }
 
@@ -446,6 +478,54 @@ public static void bindDatabaseReplicationFactorMetricsWhenUpdate(
         .set(schemaReplicationFactor);
   }
 
+  public static void bindDatabaseTableMetrics(
+      final AbstractMetricService metricService,
+      final ConfigSchemaStatistics statistics,
+      final String database) {
+    if (!PathUtils.isTableModelDatabase(database)) {
+      return;
+    }
+    metricService.createAutoGauge(
+        Metric.TABLE_NUM.toString(),
+        MetricLevel.CORE,
+        statistics,
+        s -> s.getTreeViewTableNum(database),
+        Tag.TYPE.toString(),
+        TableType.VIEW_FROM_TREE.getName(),
+        Tag.DATABASE.toString(),
+        database);
+    metricService.createAutoGauge(
+        Metric.TABLE_NUM.toString(),
+        MetricLevel.CORE,
+        statistics,
+        s -> s.getBaseTableNum(database),
+        Tag.TYPE.toString(),
+        TableType.BASE_TABLE.getName(),
+        Tag.DATABASE.toString(),
+        database);
+  }
+
+  public static void unbindDatabaseTableMetrics(
+      final AbstractMetricService metricService, final String database) {
+    if (!PathUtils.isTableModelDatabase(database)) {
+      return;
+    }
+    metricService.remove(
+        MetricType.AUTO_GAUGE,
+        Metric.TABLE_NUM.toString(),
+        Tag.TYPE.toString(),
+        TableType.VIEW_FROM_TREE.getName(),
+        Tag.DATABASE.toString(),
+        database);
+    metricService.remove(
+        MetricType.AUTO_GAUGE,
+        Metric.TABLE_NUM.toString(),
+        Tag.TYPE.toString(),
+        TableType.BASE_TABLE.getName(),
+        Tag.DATABASE.toString(),
+        database);
+  }
+
   // endregion
 
   private NodeManager getNodeManager() {

iotdb-core/confignode/src/main/java/org/apache/iotdb/confignode/manager/schema/ClusterSchemaManager.java

@@ -89,6 +89,7 @@
 import org.apache.iotdb.confignode.manager.partition.PartitionManager;
 import org.apache.iotdb.confignode.manager.partition.PartitionMetrics;
 import org.apache.iotdb.confignode.persistence.schema.ClusterSchemaInfo;
+import org.apache.iotdb.confignode.persistence.schema.ConfigSchemaStatistics;
 import org.apache.iotdb.confignode.rpc.thrift.TDatabaseInfo;
 import org.apache.iotdb.confignode.rpc.thrift.TDatabaseSchema;
 import org.apache.iotdb.confignode.rpc.thrift.TDescTable4InformationSchemaResp;
@@ -198,6 +199,10 @@ public TSStatus setDatabase(
           schema.getName(),
           schema.getDataReplicationFactor(),
           schema.getSchemaReplicationFactor());
+      PartitionMetrics.bindDatabaseTableMetrics(
+          MetricService.getInstance(),
+          clusterSchemaInfo.getConfigSchemaStatistics(),
+          schema.getName());
       // Adjust the maximum RegionGroup number of each Database
       adjustMaxRegionGroupNum();
     } catch (final ConsensusException e) {
@@ -615,6 +620,10 @@ public List<String> getDatabaseNames(final Boolean isTableModel) {
         .collect(Collectors.toList());
   }
 
+  public ConfigSchemaStatistics getConfigSchemaStatistics() {
+    return clusterSchemaInfo.getConfigSchemaStatistics();
+  }
+
   /**
    * Only leader use this interface. Get the specified Database's schemaengine
    *

iotdb-core/confignode/src/main/java/org/apache/iotdb/confignode/persistence/schema/CNPhysicalPlanGenerator.java

@@ -475,7 +475,7 @@ private void generateDatabasePhysicalPlan() {
             name = internalMNode.getName();
             break;
           case DATABASE_MNODE_TYPE:
-            databaseMNode = deserializeDatabaseMNode(bufferedInputStream).getAsMNode();
+            databaseMNode = deserializeDatabaseMNode(bufferedInputStream);
             while (!stack.isEmpty() && !stack.peek().right) {
               databaseMNode.addChild(stack.pop().left);
             }

iotdb-core/confignode/src/main/java/org/apache/iotdb/confignode/persistence/schema/ClusterSchemaInfo.java

@@ -37,6 +37,7 @@
 import org.apache.iotdb.commons.utils.PathUtils;
 import org.apache.iotdb.commons.utils.StatusUtils;
 import org.apache.iotdb.commons.utils.TestOnly;
+import org.apache.iotdb.confignode.consensus.request.ConfigPhysicalPlanType;
 import org.apache.iotdb.confignode.consensus.request.read.database.CountDatabasePlan;
 import org.apache.iotdb.confignode.consensus.request.read.database.GetDatabasePlan;
 import org.apache.iotdb.confignode.consensus.request.read.table.DescTablePlan;
@@ -151,6 +152,7 @@ public class ClusterSchemaInfo implements SnapshotProcessor {
   private final ReentrantReadWriteLock databaseReadWriteLock;
   private final ConfigMTree treeModelMTree;
   private final ConfigMTree tableModelMTree;
+  private final ConfigSchemaStatistics configSchemaStatistics;
 
   private static final String TREE_SNAPSHOT_FILENAME = "cluster_schema.bin";
   private static final String TABLE_SNAPSHOT_FILENAME = "table_cluster_schema.bin";
@@ -166,6 +168,7 @@ public ClusterSchemaInfo() throws IOException {
     try {
       treeModelMTree = new ConfigMTree(false);
       tableModelMTree = new ConfigMTree(true);
+      configSchemaStatistics = new ConfigSchemaStatistics();
       templateTable = new TemplateTable();
       templatePreSetTable = new TemplatePreSetTable();
     } catch (final MetadataException e) {
@@ -201,6 +204,12 @@ public TSStatus createDatabase(final DatabaseSchemaPlan plan) {
           .getAsMNode()
           .setDatabaseSchema(databaseSchema);
 
+      if (databaseSchema.isIsTableModel()) {
+        configSchemaStatistics.increaseTableDatabaseNum();
+      } else {
+        configSchemaStatistics.increaseTreeDatabaseNum();
+      }
+
       result.setCode(TSStatusCode.SUCCESS_STATUS.getStatusCode());
     } catch (final MetadataException e) {
       LOGGER.error(ERROR_NAME, e);
@@ -301,6 +310,12 @@ public TSStatus deleteDatabase(final DeleteDatabasePlan plan) {
       (isTableModel ? tableModelMTree : treeModelMTree)
           .deleteDatabase(getQualifiedDatabasePartialPath(plan.getName()));
 
+      if (isTableModel) {
+        configSchemaStatistics.decreaseTableDatabaseNum();
+      } else {
+        configSchemaStatistics.decreaseTreeDatabaseNum();
+      }
+
       result.setCode(TSStatusCode.SUCCESS_STATUS.getStatusCode());
     } catch (final MetadataException e) {
       LOGGER.warn("Database not exist", e);
@@ -785,14 +800,14 @@ public void processLoadSnapshot(final File snapshotDir) throws IOException {
         TREE_SNAPSHOT_FILENAME,
         stream -> {
           treeModelMTree.clear();
-          treeModelMTree.deserialize(stream);
+          treeModelMTree.deserialize(stream, configSchemaStatistics);
         });
     processMTreeLoadSnapshot(
         snapshotDir,
         TABLE_SNAPSHOT_FILENAME,
         stream -> {
           tableModelMTree.clear();
-          tableModelMTree.deserialize(stream);
+          tableModelMTree.deserialize(stream, configSchemaStatistics);
         });
     templateTable.processLoadSnapshot(snapshotDir);
     templatePreSetTable.processLoadSnapshot(snapshotDir);
@@ -1168,25 +1183,42 @@ public TSStatus extendSchemaTemplate(ExtendSchemaTemplatePlan extendSchemaTempla
 
   public TSStatus preCreateTable(final PreCreateTablePlan plan) {
     return executeWithLock(
-        () ->
-            tableModelMTree.preCreateTable(
-                getQualifiedDatabasePartialPath(plan.getDatabase()), plan.getTable()));
+        () -> {
+          tableModelMTree.preCreateTable(
+              getQualifiedDatabasePartialPath(plan.getDatabase()), plan.getTable());
+          configSchemaStatistics.increaseBaseTableNum(plan.getDatabase());
+        });
   }
 
   public TSStatus preCreateTableView(final PreCreateTableViewPlan plan) {
     return executeWithLock(
-        () ->
-            tableModelMTree.preCreateTableView(
-                getQualifiedDatabasePartialPath(plan.getDatabase()),
-                plan.getTable(),
-                plan.getStatus()));
+        () -> {
+          tableModelMTree.preCreateTableView(
+              getQualifiedDatabasePartialPath(plan.getDatabase()),
+              plan.getTable(),
+              plan.getStatus());
+          configSchemaStatistics.increaseTreeViewTableNum(plan.getDatabase());
+        });
   }
 
   public TSStatus rollbackCreateTable(final RollbackCreateTablePlan plan) {
     return executeWithLock(
-        () ->
-            tableModelMTree.rollbackCreateTable(
-                getQualifiedDatabasePartialPath(plan.getDatabase()), plan.getTableName()));
+        () -> {
+          final PartialPath database = getQualifiedDatabasePartialPath(plan.getDatabase());
+          final String tableName = plan.getTableName();
+          tableModelMTree
+              .getTableAndStatusIfExists(database, tableName)
+              .map(Pair::getLeft)
+              .ifPresent(
+                  table -> {
+                    if (TreeViewSchema.isTreeViewTable(table)) {
+                      configSchemaStatistics.decreaseTreeViewTableNum(tableName);
+                    } else {
+                      configSchemaStatistics.decreaseBaseTableNum(tableName);
+                    }
+                  });
+          tableModelMTree.rollbackCreateTable(database, tableName);
+        });
   }
 
   public TSStatus commitCreateTable(final CommitCreateTablePlan plan) {
@@ -1207,9 +1239,15 @@ public TSStatus preDeleteTable(final PreDeleteTablePlan plan) {
 
   public TSStatus dropTable(final CommitDeleteTablePlan plan) {
     return executeWithLock(
-        () ->
-            tableModelMTree.dropTable(
-                getQualifiedDatabasePartialPath(plan.getDatabase()), plan.getTableName()));
+        () -> {
+          tableModelMTree.dropTable(
+              getQualifiedDatabasePartialPath(plan.getDatabase()), plan.getTableName());
+          if (plan.getType() == ConfigPhysicalPlanType.CommitDeleteView) {
+            configSchemaStatistics.decreaseTreeViewTableNum(plan.getDatabase());
+          } else {
+            configSchemaStatistics.decreaseBaseTableNum(plan.getDatabase());
+          }
+        });
   }
 
   public TSStatus renameTable(final RenameTablePlan plan) {
@@ -1530,6 +1568,10 @@ public TSStatus commitDeleteColumn(final CommitDeleteColumnPlan plan) {
                 plan.getColumnName()));
   }
 
+  public ConfigSchemaStatistics getConfigSchemaStatistics() {
+    return configSchemaStatistics;
+  }
+
   // endregion
 
   @TestOnly