resolve conflicts

StarRocks · Jul 18, 2022 · 0079329 · 0079329
1 parent 67a6567
commit 0079329
Show file tree

Hide file tree

Showing 8 changed files with 58 additions and 3 deletions.
diff --git a/fe/fe-core/src/main/java/com/starrocks/analysis/RecoverPartitionStmt.java b/fe/fe-core/src/main/java/com/starrocks/analysis/RecoverPartitionStmt.java
@@ -32,6 +32,7 @@
 import com.starrocks.mysql.privilege.Privilege;
 import com.starrocks.qe.ConnectContext;
 import com.starrocks.server.GlobalStateMgr;
+import com.starrocks.sql.ast.AstVisitor;
 
 public class RecoverPartitionStmt extends DdlStmt {
     private TableName dbTblName;
@@ -50,6 +51,10 @@ public String getTableName() {
         return dbTblName.getTbl();
     }
 
+    public TableName getDbTblName() {
+        return dbTblName;
+    }
+
     public String getPartitionName() {
         return partitionName;
     }
@@ -80,4 +85,14 @@ public String toSql() {
         sb.append(getTableName());
         return sb.toString();
     }
+
+    @Override
+    public boolean isSupportNewPlanner() {
+        return true;
+    }
+
+    @Override
+    public <R, C> R accept(AstVisitor<R, C> visitor, C context) {
+        return visitor.visitRecoverPartitionStmt(this, context);
+    }
 }
diff --git a/fe/fe-core/src/main/java/com/starrocks/sql/analyzer/Analyzer.java b/fe/fe-core/src/main/java/com/starrocks/sql/analyzer/Analyzer.java
@@ -24,6 +24,7 @@
 import com.starrocks.analysis.InsertStmt;
 import com.starrocks.analysis.LimitElement;
 import com.starrocks.analysis.RecoverDbStmt;
+import com.starrocks.analysis.RecoverPartitionStmt;
 import com.starrocks.analysis.RecoverTableStmt;
 import com.starrocks.analysis.SetStmt;
 import com.starrocks.analysis.SetUserPropertyStmt;
@@ -349,6 +350,12 @@ public Void visitTruncateTableStatement(TruncateTableStmt statement, ConnectCont
             return null;
         }
 
+        @Override
+        public Void visitRecoverPartitionStmt(RecoverPartitionStmt statement, ConnectContext context) {
+            RecoverPartitionAnalyzer.analyze(statement, context);
+            return null;
+        }
+
         // ------------------------------------------- Analyze Statement ---------------------------------------------------
 
         @Override

diff --git a/fe/fe-core/src/main/java/com/starrocks/sql/analyzer/RecoverPartitionAnalyzer.java b/fe/fe-core/src/main/java/com/starrocks/sql/analyzer/RecoverPartitionAnalyzer.java
@@ -0,0 +1,14 @@
+// This file is licensed under the Elastic License 2.0. Copyright 2021-present, StarRocks Limited.
+package com.starrocks.sql.analyzer;
+
+import com.starrocks.analysis.RecoverPartitionStmt;
+import com.starrocks.analysis.TableName;
+import com.starrocks.qe.ConnectContext;
+import com.starrocks.sql.common.MetaUtils;
+
+public class RecoverPartitionAnalyzer {
+    public static void analyze(RecoverPartitionStmt statement, ConnectContext context) {
+        TableName tbl = statement.getDbTblName();
+        MetaUtils.normalizationTableName(context, tbl);
+    }
+}
diff --git a/fe/fe-core/src/main/java/com/starrocks/sql/ast/AstVisitor.java b/fe/fe-core/src/main/java/com/starrocks/sql/ast/AstVisitor.java
@@ -65,6 +65,7 @@
 import com.starrocks.analysis.OrderByElement;
 import com.starrocks.analysis.ParseNode;
 import com.starrocks.analysis.RecoverDbStmt;
+import com.starrocks.analysis.RecoverPartitionStmt;
 import com.starrocks.analysis.RecoverTableStmt;
 import com.starrocks.analysis.SetStmt;
 import com.starrocks.analysis.SetUserPropertyStmt;
@@ -364,6 +365,10 @@ public R visitKillStatement(KillStmt statement, C context) {
         return visitStatement(statement, context);
     }
 
+    public R visitRecoverPartitionStmt(RecoverPartitionStmt statement, C context) {
+        return visitStatement(statement, context);
+    }
+
     public R visitShowPartitionsStmt(ShowPartitionsStmt statement, C context) {
         return visitShowStatement(statement, context);
     }

diff --git a/fe/fe-core/src/main/java/com/starrocks/sql/parser/AstBuilder.java b/fe/fe-core/src/main/java/com/starrocks/sql/parser/AstBuilder.java
@@ -102,6 +102,7 @@
 import com.starrocks.analysis.Predicate;
 import com.starrocks.analysis.RangePartitionDesc;
 import com.starrocks.analysis.RecoverDbStmt;
+import com.starrocks.analysis.RecoverPartitionStmt;
 import com.starrocks.analysis.RecoverTableStmt;
 import com.starrocks.analysis.SelectList;
 import com.starrocks.analysis.SelectListItem;
@@ -3384,4 +3385,12 @@ public ParseNode visitShowProcStatement(StarRocksParser.ShowProcStatementContext
         StringLiteral stringLiteral = (StringLiteral) visit(context.path);
         return new ShowProcStmt(stringLiteral.getValue());
     }
+
+    @Override
+    public ParseNode visitRecoverPartitionStatement(StarRocksParser.RecoverPartitionStatementContext context) {
+        QualifiedName qualifiedName = getQualifiedName(context.qualifiedName());
+        TableName tableName = qualifiedNameToTableName(qualifiedName);
+        String partitionName = ((Identifier) visit(context.identifier())).getValue();
+        return new RecoverPartitionStmt(tableName, partitionName);
+    }
 }
diff --git a/fe/fe-core/src/main/java/com/starrocks/sql/parser/StarRocks.g4 b/fe/fe-core/src/main/java/com/starrocks/sql/parser/StarRocks.g4
@@ -46,6 +46,7 @@ statement
     | showTabletStatement                                                                   #showTablet
     | cancelAlterTableStatement                                                             #cancelAlterTable
     | showPartitionsStatement                                                               #showPartitions
+    | recoverPartitionStatement                                                             #recoverPartition
 
     // View Statement
     | createViewStatement                                                                   #createView
@@ -330,6 +331,10 @@ showPartitionsStatement
     (ORDER BY sortItem (',' sortItem)*)? limitElement?
     ;
 
+recoverPartitionStatement
+    : RECOVER PARTITION identifier FROM table=qualifiedName
+    ;
+
 // ------------------------------------------- View Statement ----------------------------------------------------------
 
 createViewStatement

diff --git a/fe/fe-core/src/test/java/com/starrocks/catalog/DropPartitionTest.java b/fe/fe-core/src/test/java/com/starrocks/catalog/DropPartitionTest.java
@@ -86,7 +86,7 @@ public void testNormalDropPartition() throws Exception {
         Assert.assertNull(partition);
         String recoverPartitionSql = "recover partition p20210201 from test.tbl1";
         RecoverPartitionStmt recoverPartitionStmt =
-                (RecoverPartitionStmt) UtFrameUtils.parseAndAnalyzeStmt(recoverPartitionSql, connectContext);
+                (RecoverPartitionStmt) UtFrameUtils.parseStmtWithNewParser(recoverPartitionSql, connectContext);
         GlobalStateMgr.getCurrentState().recoverPartition(recoverPartitionStmt);
         partition = table.getPartition("p20210201");
         Assert.assertNotNull(partition);
@@ -108,7 +108,7 @@ public void testForceDropPartition() throws Exception {
         Assert.assertNull(partition);
         String recoverPartitionSql = "recover partition p20210202 from test.tbl1";
         RecoverPartitionStmt recoverPartitionStmt =
-                (RecoverPartitionStmt) UtFrameUtils.parseAndAnalyzeStmt(recoverPartitionSql, connectContext);
+                (RecoverPartitionStmt) UtFrameUtils.parseStmtWithNewParser(recoverPartitionSql, connectContext);
         ExceptionChecker.expectThrowsWithMsg(DdlException.class,
                 "No partition named p20210202 in table tbl1",
                 () -> GlobalStateMgr.getCurrentState().recoverPartition(recoverPartitionStmt));

diff --git a/fe/fe-core/src/test/java/com/starrocks/catalog/TempPartitionTest.java b/fe/fe-core/src/test/java/com/starrocks/catalog/TempPartitionTest.java
@@ -307,7 +307,7 @@ public void testForMultiPartitionTable() throws Exception {
         Assert.assertTrue(!originPartitionTabletIds2.containsKey("p1"));
 
         String recoverStr = "recover partition p1 from db2.tbl2;";
-        RecoverPartitionStmt recoverStmt = (RecoverPartitionStmt) UtFrameUtils.parseAndAnalyzeStmt(recoverStr, ctx);
+        RecoverPartitionStmt recoverStmt = (RecoverPartitionStmt) UtFrameUtils.parseStmtWithNewParser(recoverStr, ctx);
         GlobalStateMgr.getCurrentState().recoverPartition(recoverStmt);
         checkShowPartitionsResultNum("db2.tbl2", true, 3);
         checkShowPartitionsResultNum("db2.tbl2", false, 3);