Test

apache · Nov 17, 2024 · 8adc572 · 8adc572
1 parent 543b56c
commit 8adc572
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 7 deletions.
diff --git a/fe/fe-core/src/main/java/org/apache/doris/nereids/parser/LogicalPlanBuilder.java b/fe/fe-core/src/main/java/org/apache/doris/nereids/parser/LogicalPlanBuilder.java
@@ -447,15 +447,12 @@
 import org.apache.doris.nereids.trees.plans.commands.ShowLastInsertCommand;
 import org.apache.doris.nereids.trees.plans.commands.ShowProcCommand;
 import org.apache.doris.nereids.trees.plans.commands.ShowProcedureStatusCommand;
-<<<<<<< HEAD
 import org.apache.doris.nereids.trees.plans.commands.ShowRepositoriesCommand;
 import org.apache.doris.nereids.trees.plans.commands.ShowRolesCommand;
 import org.apache.doris.nereids.trees.plans.commands.ShowStorageEnginesCommand;
 import org.apache.doris.nereids.trees.plans.commands.ShowVariablesCommand;
 import org.apache.doris.nereids.trees.plans.commands.ShowViewCommand;
-=======
 import org.apache.doris.nereids.trees.plans.commands.ShowTabletStorageFormatCommand;
->>>>>>> 53323bec0c ([Feat](nereids) support ShowTabletStorageFormat command in nereids #43295)
 import org.apache.doris.nereids.trees.plans.commands.UnsetDefaultStorageVaultCommand;
 import org.apache.doris.nereids.trees.plans.commands.UnsetVariableCommand;
 import org.apache.doris.nereids.trees.plans.commands.UnsupportedCommand;

diff --git a/fe/fe-core/src/main/java/org/apache/doris/nereids/trees/plans/PlanType.java b/fe/fe-core/src/main/java/org/apache/doris/nereids/trees/plans/PlanType.java
@@ -190,7 +190,6 @@ public enum PlanType {
     RECOVER_DATABASE_COMMAND,
     RECOVER_TABLE_COMMAND,
     RECOVER_PARTITION_COMMAND,
-    REPLAY_COMMAND
     REPLAY_COMMAND,
     ADMIN_SHOW_TABLET_STORAGE_FORMAT_COMMAND
 }
diff --git a/fe/fe-core/src/main/java/org/apache/doris/nereids/trees/plans/visitor/CommandVisitor.java b/fe/fe-core/src/main/java/org/apache/doris/nereids/trees/plans/visitor/CommandVisitor.java
@@ -251,7 +251,6 @@ default R visitSetDefaultStorageVault(SetDefaultStorageVaultCommand setDefaultSt
         return visitCommand(setDefaultStorageVaultCommand, context);
     }
 
-<<<<<<< HEAD
     default R visitShowLastInsertCommand(ShowLastInsertCommand showLastInsertCommand, C context) {
         return visitCommand(showLastInsertCommand, context);
     }
@@ -299,10 +298,10 @@ default R visitRecoverDatabaseCommand(RecoverDatabaseCommand recoverDatabaseComm
 
     default R visitDropRoleCommand(DropRoleCommand dropRoleCommand, C context) {
         return visitCommand(dropRoleCommand, context);
-=======
+    }
+
     default R visitShowTabletStorageFormatCommand(ShowTabletStorageFormatCommand showTabletStorageFormatCommand,
                                                   C context) {
         return visitCommand(showTabletStorageFormatCommand, context);
->>>>>>> 53323bec0c ([Feat](nereids) support ShowTabletStorageFormat command in nereids #43295)
     }
 }