Add table type to table disk usage

Author: shuwenwei

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

@@ -80,6 +80,7 @@ public void test1() {
       Map<String, Long> tableSizes = new HashMap<>();
       while (iterator.next()) {
         String table = iterator.getString("table_name");
+        Assert.assertEquals("BASE TABLE", iterator.getString("table_type"));
         long timePartition = iterator.getLong("time_partition");
         long size = iterator.getLong("size_in_bytes");
         timePartitionSizes.compute(timePartition, (k, v) -> v == null ? size : v + size);

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

@@ -578,6 +578,7 @@ public void testInformationSchema() throws SQLException {
               Arrays.asList(
                   "database,STRING,FIELD,",
                   "table_name,STRING,FIELD,",
+                  "table_type,STRING,FIELD,",
                   "datanode_id,INT32,FIELD,",
                   "region_id,INT32,FIELD,",
                   "time_partition,INT64,FIELD,",

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

@@ -1271,6 +1271,7 @@ private static class TableDiskUsageSupplier implements IInformationSchemaContent
     private final Filter pushDownFilter;
     private final PaginationController paginationController;
     private final OperatorContext operatorContext;
+    private final Map<String, String> currentTableTypeMap = new HashMap<>();
 
     private DataRegion currentDataRegion;
     private boolean currentDatabaseOnlyHasOneTable;
@@ -1347,6 +1348,7 @@ private boolean hasNextInternal() {
       try {
         while (dataRegionIterator.nextDataRegion()) {
           currentDataRegion = dataRegionIterator.currentDataRegion();
+          currentTableTypeMap.clear();
           for (Long timePartition : currentDataRegion.getTsFileManager().getTimePartitions()) {
             Map<String, Long> tablesToScan = getTablesToScan(currentDataRegion, timePartition);
             if (!tablesToScan.isEmpty()) {
@@ -1420,12 +1422,13 @@ private Map<String, Long> getTablesToScan(DataRegion dataRegion, long timePartit
         }
         totalValidTableCount++;
         if (pushDownFilter != null) {
-          Object[] row = new Object[5];
+          Object[] row = new Object[6];
           row[0] = new Binary(dataRegion.getDatabaseName(), TSFileConfig.STRING_CHARSET);
           row[1] = new Binary(tTableInfo.getTableName(), TSFileConfig.STRING_CHARSET);
-          row[2] = IoTDBDescriptor.getInstance().getConfig().getDataNodeId();
-          row[3] = dataRegion.getDataRegionId();
-          row[4] = timePartition;
+          row[2] = new Binary(getTableTypeName(tTableInfo), TSFileConfig.STRING_CHARSET);
+          row[3] = IoTDBDescriptor.getInstance().getConfig().getDataNodeId();
+          row[4] = dataRegion.getDataRegionId();
+          row[5] = timePartition;
           if (!pushDownFilter.satisfyRow(0, row)) {
             continue;
           }
@@ -1439,11 +1442,19 @@ private Map<String, Long> getTablesToScan(DataRegion dataRegion, long timePartit
         }
         paginationController.consumeLimit();
         tablesToScan.put(tTableInfo.getTableName(), 0L);
+        currentTableTypeMap.put(tTableInfo.getTableName(), getTableTypeName(tTableInfo));
       }
       currentDatabaseOnlyHasOneTable = totalValidTableCount == 1;
       return tablesToScan;
     }
 
+    private String getTableTypeName(final TTableInfo tableInfo) {
+      if (tableInfo.isSetType()) {
+        return TableType.values()[tableInfo.getType()].getName();
+      }
+      return TableType.BASE_TABLE.getName();
+    }
+
     @Override
     public TsBlock next() {
       if (!hasNext()) {
@@ -1531,10 +1542,12 @@ private TsBlock buildTsBlock() {
           columns[0].writeBinary(
               new Binary(currentDataRegion.getDatabaseName(), TSFileConfig.STRING_CHARSET));
           columns[1].writeBinary(new Binary(tableName, TSFileConfig.STRING_CHARSET));
-          columns[2].writeInt(IoTDBDescriptor.getInstance().getConfig().getDataNodeId());
-          columns[3].writeInt(currentDataRegion.getDataRegionId());
-          columns[4].writeLong(timePartition);
-          columns[5].writeLong(size);
+          columns[2].writeBinary(
+              new Binary(currentTableTypeMap.get(tableName), TSFileConfig.STRING_CHARSET));
+          columns[3].writeInt(IoTDBDescriptor.getInstance().getConfig().getDataNodeId());
+          columns[4].writeInt(currentDataRegion.getDataRegionId());
+          columns[5].writeLong(timePartition);
+          columns[6].writeLong(size);
           builder.declarePosition();
         }
       }

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

@@ -356,6 +356,8 @@ public class InformationSchema {
             ColumnHeaderConstant.DATABASE.toLowerCase(Locale.ENGLISH), TSDataType.STRING));
     tableDiskUsageTable.addColumnSchema(
         new FieldColumnSchema(ColumnHeaderConstant.TABLE_NAME_TABLE_MODEL, TSDataType.STRING));
+    tableDiskUsageTable.addColumnSchema(
+        new FieldColumnSchema(ColumnHeaderConstant.TABLE_TYPE_TABLE_MODEL, TSDataType.STRING));
     tableDiskUsageTable.addColumnSchema(
         new FieldColumnSchema(ColumnHeaderConstant.DATA_NODE_ID_TABLE_MODEL, TSDataType.INT32));
     tableDiskUsageTable.addColumnSchema(
@@ -430,6 +432,7 @@ public class InformationSchema {
         ImmutableSet.of(
             ColumnHeaderConstant.DATABASE.toLowerCase(),
             ColumnHeaderConstant.TABLE_NAME_TABLE_MODEL,
+            ColumnHeaderConstant.TABLE_TYPE_TABLE_MODEL,
             ColumnHeaderConstant.DATA_NODE_ID_TABLE_MODEL,
             ColumnHeaderConstant.REGION_ID_TABLE_MODEL,
             ColumnHeaderConstant.TIME_PARTITION_TABLE_MODEL));