rename (#505)

Co-authored-by: Yuqing Zhu <yuqing.zhu@139.com>

antlr/src/main/antlr4/cn/edu/tsinghua/iginx/sql/Sql.g4

@@ -48,7 +48,7 @@ statement
    | SHOW TRANSFORM JOB STATUS jobId = INT # showJobStatusStatement
    | CANCEL TRANSFORM JOB jobId = INT # cancelJobStatement
    | SHOW jobStatus TRANSFORM JOB # showEligibleJobStatement
-   | REMOVE HISTORYDATASOURCE removedStorageEngine (COMMA removedStorageEngine)* # removeHistoryDataSourceStatement
+   | REMOVE STORAGEENGINE removedStorageEngine (COMMA removedStorageEngine)* # removeStorageEngineStatement
    | SET CONFIG configName = stringLiteral configValue = stringLiteral # setConfigStatement
    | SHOW CONFIG (configName = stringLiteral)? # showConfigStatement
    | SHOW SESSIONID # showSessionIDStatement
@@ -561,7 +561,6 @@ keyWords
    | RANGE
    | STEP
    | REMOVE
-   | HISTORYDATASOURCE
    | COMPACT
    | EXPLAIN
    | LOGICAL
@@ -997,10 +996,6 @@ REMOVE
    : R E M O V E
    ;
 
-HISTORYDATASOURCE
-   : H I S T O R Y D A T A S O U R C E
-   ;
-
 COMPACT
    : C O M P A C T
    ;

client/src/main/java/cn/edu/tsinghua/iginx/client/IginxClient.java

@@ -680,7 +680,7 @@ private static Completer buildIginxCompleter() {
             Arrays.asList("show", "functions"),
             Arrays.asList("show", "sessionid"),
             Arrays.asList("show", "rules"),
-            Arrays.asList("remove", "historydatasource"));
+            Arrays.asList("remove", "storageengine"));
     addArgumentCompleters(iginxCompleters, withoutNullCompleters, false);
 
     List<String> singleCompleters = Arrays.asList("quit", "exit");

core/src/main/java/cn/edu/tsinghua/iginx/IginxWorker.java

@@ -242,7 +242,7 @@ public QueryDataResp queryData(QueryDataReq req) {
   }
 
   @Override
-  public Status removeHistoryDataSource(RemoveHistoryDataSourceReq req) {
+  public Status removeStorageEngine(RemoveStorageEngineReq req) {
     if (!sessionManager.checkSession(req.getSessionId(), AuthType.Cluster)) {
       return RpcUtils.ACCESS_DENY;
     }

core/src/main/java/cn/edu/tsinghua/iginx/engine/StatementBuilder.java

@@ -47,7 +47,7 @@ public class StatementBuilder {
     typeMap.put(StatementType.EXPORT_STREAM_FROM_SELECT, SqlType.ExportStream);
     typeMap.put(StatementType.ADD_STORAGE_ENGINE, SqlType.AddStorageEngines);
     typeMap.put(StatementType.ALTER_STORAGE_ENGINE, SqlType.AlterStorageEngine);
-    typeMap.put(StatementType.REMOVE_HISTORY_DATA_SOURCE, SqlType.RemoveHistoryDataSource);
+    typeMap.put(StatementType.REMOVE_HISTORY_DATA_SOURCE, SqlType.RemoveStorageEngine);
     typeMap.put(StatementType.SHOW_REPLICATION, SqlType.GetReplicaNum);
     typeMap.put(StatementType.COUNT_POINTS, SqlType.CountPoints);
     typeMap.put(StatementType.CLEAR_DATA, SqlType.ClearData);

core/src/main/java/cn/edu/tsinghua/iginx/sql/IginXSqlVisitor.java

@@ -113,7 +113,6 @@
 import cn.edu.tsinghua.iginx.sql.SqlParser.PredicateWithSubqueryContext;
 import cn.edu.tsinghua.iginx.sql.SqlParser.QueryClauseContext;
 import cn.edu.tsinghua.iginx.sql.SqlParser.RegisterTaskStatementContext;
-import cn.edu.tsinghua.iginx.sql.SqlParser.RemoveHistoryDataSourceStatementContext;
 import cn.edu.tsinghua.iginx.sql.SqlParser.SearchedCaseContext;
 import cn.edu.tsinghua.iginx.sql.SqlParser.SearchedWhenClauseContext;
 import cn.edu.tsinghua.iginx.sql.SqlParser.SelectClauseContext;
@@ -653,9 +652,9 @@ private AuthType parseAuthType(String authType) {
   }
 
   @Override
-  public Statement visitRemoveHistoryDataSourceStatement(
-      RemoveHistoryDataSourceStatementContext ctx) {
-    RemoveHistoryDataSourceStatement statement = new RemoveHistoryDataSourceStatement();
+  public Statement visitRemoveStorageEngineStatement(
+      SqlParser.RemoveStorageEngineStatementContext ctx) {
+    RemoveStorageEngineStatement statement = new RemoveStorageEngineStatement();
     ctx.removedStorageEngine()
         .forEach(
             storageEngine -> {

core/src/main/java/cn/edu/tsinghua/iginx/sql/statement/RemoveHistoryDataSourceStatement.java → core/src/main/java/cn/edu/tsinghua/iginx/sql/statement/RemoveStorageEngineStatement.java

@@ -23,12 +23,12 @@
 import cn.edu.tsinghua.iginx.engine.shared.RequestContext;
 import cn.edu.tsinghua.iginx.engine.shared.Result;
 import cn.edu.tsinghua.iginx.engine.shared.exception.StatementExecutionException;
-import cn.edu.tsinghua.iginx.thrift.RemoveHistoryDataSourceReq;
+import cn.edu.tsinghua.iginx.thrift.RemoveStorageEngineReq;
 import cn.edu.tsinghua.iginx.thrift.RemovedStorageEngineInfo;
 import java.util.ArrayList;
 import java.util.List;
 
-public class RemoveHistoryDataSourceStatement extends SystemStatement {
+public class RemoveStorageEngineStatement extends SystemStatement {
 
   private List<RemovedStorageEngineInfo> storageEngineList;
 
@@ -44,16 +44,15 @@ public void addStorageEngine(RemovedStorageEngineInfo storageEngine) {
     this.storageEngineList.add(storageEngine);
   }
 
-  public RemoveHistoryDataSourceStatement() {
+  public RemoveStorageEngineStatement() {
     storageEngineList = new ArrayList<>();
     this.statementType = StatementType.REMOVE_HISTORY_DATA_SOURCE;
   }
 
   @Override
   public void execute(RequestContext ctx) throws StatementExecutionException {
     IginxWorker worker = IginxWorker.getInstance();
-    RemoveHistoryDataSourceReq req =
-        new RemoveHistoryDataSourceReq(ctx.getSessionId(), storageEngineList);
-    ctx.setResult(new Result(worker.removeHistoryDataSource(req)));
+    RemoveStorageEngineReq req = new RemoveStorageEngineReq(ctx.getSessionId(), storageEngineList);
+    ctx.setResult(new Result(worker.removeStorageEngine(req)));
   }
 }

session/src/main/java/cn/edu/tsinghua/iginx/pool/SessionPool.java

@@ -484,17 +484,17 @@ public void addStorageEngines(List<StorageEngine> storageEngines) throws Session
     }
   }
 
-  public void removeHistoryDataSource(List<RemovedStorageEngineInfo> removedStorageEngineList)
+  public void removeStorageEngine(List<RemovedStorageEngineInfo> removedStorageEngineList)
       throws SessionException {
     for (int i = 0; i < RETRY; i++) {
       Session session = getSession();
       try {
-        session.removeHistoryDataSource(removedStorageEngineList);
+        session.removeStorageEngine(removedStorageEngineList);
         putBack(session);
         return;
       } catch (SessionException e) {
         // TException means the connection is broken, remove it and get a new one.
-        LOGGER.warn("removeHistoryDataSource failed", e);
+        LOGGER.warn("remove storage engine failed", e);
         cleanSessionAndMayThrowConnectionException(session, i, e);
       } catch (RuntimeException e) {
         putBack(session);

session/src/main/java/cn/edu/tsinghua/iginx/session/Session.java

@@ -1172,11 +1172,10 @@ public CurveMatchResult curveMatch(
     return new CurveMatchResult(ref.resp.getMatchedKey(), ref.resp.getMatchedPath());
   }
 
-  public void removeHistoryDataSource(List<RemovedStorageEngineInfo> removedStorageEngineList)
+  public void removeStorageEngine(List<RemovedStorageEngineInfo> removedStorageEngineList)
       throws SessionException {
-    RemoveHistoryDataSourceReq req =
-        new RemoveHistoryDataSourceReq(sessionId, removedStorageEngineList);
-    executeWithCheck(() -> client.removeHistoryDataSource(req));
+    RemoveStorageEngineReq req = new RemoveStorageEngineReq(sessionId, removedStorageEngineList);
+    executeWithCheck(() -> client.removeStorageEngine(req));
   }
 
   public String getUsername() {

test/src/test/java/cn/edu/tsinghua/iginx/integration/expansion/BaseCapacityExpansionIT.java

@@ -405,7 +405,7 @@ protected void testUpdateEngineParams() throws SessionException {
     SQLTestTools.executeAndCompare(session, statement, pathList, valuesList);
 
     // 删除，不影响后续测试
-    session.removeHistoryDataSource(
+    session.removeStorageEngine(
         Collections.singletonList(
             new RemovedStorageEngineInfo("127.0.0.1", readOnlyPort, prefix, "")));
 
@@ -689,7 +689,7 @@ private void testAddAndRemoveStorageEngineWithPrefix() {
     removedStorageEngineList.add(
         new RemovedStorageEngineInfo("127.0.0.1", expPort, "p3" + schemaPrefixSuffix, dataPrefix1));
     try {
-      session.removeHistoryDataSource(removedStorageEngineList);
+      session.removeStorageEngine(removedStorageEngineList);
       testShowClusterInfo(4);
     } catch (SessionException e) {
       LOGGER.error("remove history data source through session api error: ", e);
@@ -709,7 +709,7 @@ private void testAddAndRemoveStorageEngineWithPrefix() {
     SQLTestTools.executeAndCompare(session, statement, pathListAns, EXP_VALUES_LIST2);
 
     // 通过 sql 语句测试移除节点
-    String removeStatement = "remove historydatasource (\"127.0.0.1\", %d, \"%s\", \"%s\");";
+    String removeStatement = "remove storageengine (\"127.0.0.1\", %d, \"%s\", \"%s\");";
     try {
       session.executeSql(
           String.format(removeStatement, expPort, "p1" + schemaPrefixSuffix, dataPrefix1));

test/src/test/java/cn/edu/tsinghua/iginx/integration/func/udf/TransformIT.java

@@ -733,7 +733,7 @@ public void commitPythonExportBinaryToIginxTest() {
         LOGGER.error("Remove test resource dir failed:", e);
       }
       try {
-        session.removeHistoryDataSource(
+        session.removeStorageEngine(
             Collections.singletonList(new RemovedStorageEngineInfo("127.0.0.1", 6660, "", "")));
       } catch (SessionException e) {
         LOGGER.error("Remove read-only dummy engine failed:", e);

test/src/test/java/cn/edu/tsinghua/iginx/integration/tool/TempDummyDataSource.java

@@ -103,6 +103,6 @@ private void init() throws SessionException {
   public void close() throws SessionException {
     RemovedStorageEngineInfo info =
         new RemovedStorageEngineInfo(ip, port, schemaPrefix, dataPrefix);
-    session.removeHistoryDataSource(Collections.singletonList(info));
+    session.removeStorageEngine(Collections.singletonList(info));
   }
 }

test/src/test/resources/pySessionIT/tests.py

@@ -70,7 +70,7 @@ def addStorageEngine(self):
             cluster_info = self.session.get_cluster_info()
             retStr += str(cluster_info) + "\n"
             # 删除加入的存储引擎
-            self.session.execute_sql('REMOVE HISTORYDATASOURCE  ("127.0.0.1", 6670, "", "");')
+            self.session.execute_sql('REMOVE STORAGEENGINE  ("127.0.0.1", 6670, "", "");')
             # 删除后输出所有存储引擎
             cluster_info = self.session.get_cluster_info()
             retStr += str(cluster_info) + "\n"
@@ -102,8 +102,8 @@ def addStorageEngine(self):
             cluster_info = self.session.get_cluster_info()
             retStr += str(cluster_info) + "\n"
             # 删除加入的存储引擎
-            self.session.execute_sql('REMOVE HISTORYDATASOURCE  ("127.0.0.1", 6670, "", "");')
-            self.session.execute_sql('REMOVE HISTORYDATASOURCE  ("127.0.0.1", 6671, "", "");')
+            self.session.execute_sql('REMOVE STORAGEENGINE  ("127.0.0.1", 6670, "", "");')
+            self.session.execute_sql('REMOVE STORAGEENGINE  ("127.0.0.1", 6671, "", "");')
             # 删除新建的parquet文件
             os.remove('pq/dummy/example.parquet')
             # 删除新建的文件夹

thrift/src/main/thrift/rpc.thrift

@@ -71,7 +71,7 @@ enum SqlType {
     ShowJobStatus,
     CancelJob,
     ShowEligibleJob,
-    RemoveHistoryDataSource,
+    RemoveStorageEngine,
     SetConfig,
     ShowConfig,
     Compact,
@@ -699,7 +699,7 @@ struct RemovedStorageEngineInfo {
     4: required string dataPrefix
 }
 
-struct RemoveHistoryDataSourceReq {
+struct RemoveStorageEngineReq {
     1: required i64 sessionId
     2: required list<RemovedStorageEngineInfo> removedStorageEngineInfoList
 }
@@ -751,7 +751,7 @@ service IService {
 
     Status alterStorageEngine(1: AlterStorageEngineReq req);
 
-    Status removeHistoryDataSource(1: RemoveHistoryDataSourceReq req);
+    Status removeStorageEngine(1: RemoveStorageEngineReq req);
 
     AggregateQueryResp aggregateQuery(1: AggregateQueryReq req);