Fix issues related to review comments

Author: zerolbsony

integration-test/src/test/java/org/apache/iotdb/confignode/it/partition/DataPartitionTableIntegrityCheckProcedureIT.java

@@ -19,6 +19,7 @@
 
 package org.apache.iotdb.confignode.it.partition;
 
+import org.apache.iotdb.commons.enums.RepairDataPartitionTableProgressState;
 import org.apache.iotdb.it.env.EnvFactory;
 import org.apache.iotdb.it.framework.IoTDBTestRunner;
 import org.apache.iotdb.itbase.category.ClusterIT;
@@ -34,6 +35,7 @@
 import org.slf4j.LoggerFactory;
 
 import java.sql.Connection;
+import java.sql.ResultSet;
 import java.sql.SQLException;
 import java.sql.Statement;
 import java.util.ArrayList;
@@ -128,4 +130,38 @@ public void testConcurrentSubmitDataPartitionTableIntegrityCheckProcedure()
     Assert.assertEquals(
         "The other concurrent submissions should be rejected", threadCount - 1, failCount.get());
   }
+
+  @Test
+  public void testShowRepairDataPartitionTableProgress() throws Exception {
+    try (final Connection connection = EnvFactory.getEnv().getConnection();
+        final Statement statement = connection.createStatement()) {
+      assertRepairProgress(statement, RepairDataPartitionTableProgressState.IDLE.name(), 0.0, 0.0);
+
+      statement.execute("REPAIR DATA PARTITION TABLE");
+      assertRepairProgress(statement, null, 0.0, 100.0);
+    }
+  }
+
+  private static void assertRepairProgress(
+      final Statement statement,
+      final String expectedStatus,
+      final double minProgress,
+      final double maxProgress)
+      throws SQLException {
+    try (final ResultSet resultSet =
+        statement.executeQuery("SHOW REPAIR DATA PARTITION TABLE PROGRESS")) {
+      Assert.assertTrue(resultSet.next());
+      if (expectedStatus != null) {
+        Assert.assertEquals(expectedStatus, resultSet.getString("Status"));
+      } else {
+        Assert.assertNotEquals(
+            RepairDataPartitionTableProgressState.UNKNOWN.name(), resultSet.getString("Status"));
+      }
+      final double progress = resultSet.getDouble("Progress(%)");
+      Assert.assertTrue(progress >= minProgress);
+      Assert.assertTrue(progress <= maxProgress);
+      Assert.assertNotNull(resultSet.getString("Message"));
+      Assert.assertFalse(resultSet.next());
+    }
+  }
 }

iotdb-core/antlr/src/main/antlr4/org/apache/iotdb/db/qp/sql/IdentifierParser.g4

@@ -189,6 +189,7 @@ keyWords
     | PRIVILEGES
     | PRIVILEGE_VALUE
     | PROCESSLIST
+    | PROGRESS
     | PROCESSOR
     | PROPERTY
     | PRUNE
@@ -298,4 +299,4 @@ keyWords
     | OPTION
     | INF
     | CURRENT_TIMESTAMP
-    ;
+    ;

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

@@ -47,6 +47,7 @@
 import org.apache.iotdb.commons.conf.ConfigurationFileUtils;
 import org.apache.iotdb.commons.conf.IoTDBConstant;
 import org.apache.iotdb.commons.conf.TrimProperties;
+import org.apache.iotdb.commons.enums.RepairDataPartitionTableProgressState;
 import org.apache.iotdb.commons.exception.IllegalPathException;
 import org.apache.iotdb.commons.exception.MetadataException;
 import org.apache.iotdb.commons.path.MeasurementPath;
@@ -1185,7 +1186,8 @@ public TSStatus dataPartitionTableIntegrityCheck() {
   public TShowRepairDataPartitionTableProgressResp showRepairDataPartitionTableProgress() {
     TSStatus status = confirmLeader();
     if (status.getCode() != TSStatusCode.SUCCESS_STATUS.getStatusCode()) {
-      return new TShowRepairDataPartitionTableProgressResp(status, "UNKNOWN", 0.0)
+      return new TShowRepairDataPartitionTableProgressResp(
+              status, RepairDataPartitionTableProgressState.UNKNOWN.name(), 0.0)
           .setMessage(status.getMessage());
     }
 

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

@@ -32,6 +32,7 @@
 import org.apache.iotdb.commons.concurrent.threadpool.ScheduledExecutorUtil;
 import org.apache.iotdb.commons.conf.CommonConfig;
 import org.apache.iotdb.commons.conf.CommonDescriptor;
+import org.apache.iotdb.commons.enums.RepairDataPartitionTableProgressState;
 import org.apache.iotdb.commons.partition.DataPartitionTable;
 import org.apache.iotdb.commons.partition.SchemaPartitionTable;
 import org.apache.iotdb.commons.partition.executor.SeriesPartitionExecutor;
@@ -548,11 +549,13 @@ public TShowRepairDataPartitionTableProgressResp showRepairDataPartitionTablePro
     return configManager
         .getProcedureManager()
         .getUnfinishedDataPartitionTableIntegrityCheckProcedure()
-        .map(procedure -> procedure.getProgress(configManager.getProcedureManager().getEnv()))
+        .map(DataPartitionTableIntegrityCheckProcedure::getProgress)
         .orElseGet(
             () ->
                 new TShowRepairDataPartitionTableProgressResp(
-                        RpcUtils.getStatus(TSStatusCode.SUCCESS_STATUS), "IDLE", 100.0)
+                        RpcUtils.getStatus(TSStatusCode.SUCCESS_STATUS),
+                        RepairDataPartitionTableProgressState.IDLE.name(),
+                        0.0)
                     .setMessage("No running DataPartitionTable integrity check procedure"));
   }