(doris) 03/37: [fix](Nereids): don't log edit log when replaying (#30578)

[yiguolei]

This is an automated email from the ASF dual-hosted git repository.

yiguolei pushed a commit to branch branch-2.1
in repository https://gitbox.apache.org/repos/asf/doris.git

commit 6376b243006356d92114cfd1d463e3959a2ab634
Author: 谢健 <jianx...@gmail.com>
AuthorDate: Tue Jan 30 17:18:48 2024 +0800

    [fix](Nereids): don't log edit log when replaying (#30578)
    
    * don't log edit log when replaying
---
 fe/fe-core/src/main/java/org/apache/doris/catalog/TableIf.java      | 6 ++++--
 .../doris/nereids/trees/plans/commands/DropConstraintCommand.java   | 2 +-
 fe/fe-core/src/main/java/org/apache/doris/persist/EditLog.java      | 2 +-
 3 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/fe/fe-core/src/main/java/org/apache/doris/catalog/TableIf.java 
b/fe/fe-core/src/main/java/org/apache/doris/catalog/TableIf.java
index c57d6cce7fb..612bfc65eab 100644
--- a/fe/fe-core/src/main/java/org/apache/doris/catalog/TableIf.java
+++ b/fe/fe-core/src/main/java/org/apache/doris/catalog/TableIf.java
@@ -327,7 +327,7 @@ public interface TableIf {
         }
     }
 
-    default void dropConstraint(String name) {
+    default void dropConstraint(String name, boolean replay) {
         writeLock();
         try {
             Map<String, Constraint> constraintMap = getConstraintsMapUnsafe();
@@ -341,7 +341,9 @@ public interface TableIf {
                 ((PrimaryKeyConstraint) constraint).getForeignTables()
                         .forEach(t -> t.dropFKReferringPK(this, 
(PrimaryKeyConstraint) constraint));
             }
-            Env.getCurrentEnv().getEditLog().logDropConstraint(new 
AlterConstraintLog(constraint, this));
+            if (!replay) {
+                Env.getCurrentEnv().getEditLog().logDropConstraint(new 
AlterConstraintLog(constraint, this));
+            }
         } finally {
             writeUnlock();
         }
diff --git 
a/fe/fe-core/src/main/java/org/apache/doris/nereids/trees/plans/commands/DropConstraintCommand.java
 
b/fe/fe-core/src/main/java/org/apache/doris/nereids/trees/plans/commands/DropConstraintCommand.java
index d13ca98ef90..9878b0e9263 100644
--- 
a/fe/fe-core/src/main/java/org/apache/doris/nereids/trees/plans/commands/DropConstraintCommand.java
+++ 
b/fe/fe-core/src/main/java/org/apache/doris/nereids/trees/plans/commands/DropConstraintCommand.java
@@ -56,7 +56,7 @@ public class DropConstraintCommand extends Command implements 
ForwardWithSync {
     @Override
     public void run(ConnectContext ctx, StmtExecutor executor) throws 
Exception {
         TableIf table = extractTable(ctx, plan);
-        table.dropConstraint(name);
+        table.dropConstraint(name, false);
     }
 
     private TableIf extractTable(ConnectContext ctx, LogicalPlan plan) {
diff --git a/fe/fe-core/src/main/java/org/apache/doris/persist/EditLog.java 
b/fe/fe-core/src/main/java/org/apache/doris/persist/EditLog.java
index 958277dd6b7..8400c0d6672 100644
--- a/fe/fe-core/src/main/java/org/apache/doris/persist/EditLog.java
+++ b/fe/fe-core/src/main/java/org/apache/doris/persist/EditLog.java
@@ -983,7 +983,7 @@ public class EditLog {
                 }
                 case OperationType.OP_DROP_CONSTRAINT: {
                     final AlterConstraintLog log = (AlterConstraintLog) 
journal.getData();
-                    
log.getTableIf().dropConstraint(log.getConstraint().getName());
+                    
log.getTableIf().dropConstraint(log.getConstraint().getName(), true);
                     break;
                 }
                 case OperationType.OP_ALTER_USER: {


---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscr...@doris.apache.org
For additional commands, e-mail: commits-h...@doris.apache.org