From ed865f50332efd9ea81533c6c18add55f1c73e23 Mon Sep 17 00:00:00 2001
From: walter <w41ter.l@gmail.com>
Date: Thu, 31 Oct 2024 21:05:11 +0800
Subject: [PATCH] [feature](binlog) Allow BarrierLog to wrap another binlog
 (#42993)

to make it work in the old Doris version without breaking compatibility
---
 .../org/apache/doris/persist/BarrierLog.java  | 28 +++++++++++++++++++
 1 file changed, 28 insertions(+)

diff --git a/fe/fe-core/src/main/java/org/apache/doris/persist/BarrierLog.java b/fe/fe-core/src/main/java/org/apache/doris/persist/BarrierLog.java
index ea849d217d740c..2b4245b290c850 100644
--- a/fe/fe-core/src/main/java/org/apache/doris/persist/BarrierLog.java
+++ b/fe/fe-core/src/main/java/org/apache/doris/persist/BarrierLog.java
@@ -20,6 +20,7 @@
 import org.apache.doris.common.io.Text;
 import org.apache.doris.common.io.Writable;
 import org.apache.doris.persist.gson.GsonUtils;
+import org.apache.doris.thrift.TBinlogType;
 
 import com.google.gson.annotations.SerializedName;
 
@@ -37,6 +38,11 @@ public class BarrierLog implements Writable {
     @SerializedName(value = "tableName")
     String tableName;
 
+    @SerializedName(value = "binlogType")
+    int binlogType;
+    @SerializedName(value = "binlog")
+    String binlog;
+
     public BarrierLog() {
     }
 
@@ -47,6 +53,28 @@ public BarrierLog(long dbId, String dbName, long tableId, String tableName) {
         this.tableName = tableName;
     }
 
+    // A trick: Wrap the binlog as part of the BarrierLog so that it can work in
+    // the old Doris version without breaking the compatibility.
+    public BarrierLog(long dbId, long tableId, TBinlogType binlogType, String binlog) {
+        this.dbId = dbId;
+        this.tableId = tableId;
+        this.binlogType = binlogType.getValue();
+        this.binlog = binlog;
+    }
+
+    public boolean hasBinlog() {
+        return binlog != null;
+    }
+
+    public String getBinlog() {
+        return binlog;
+    }
+
+    // null is returned if binlog is not set or binlogType is not recognized.
+    public TBinlogType getBinlogType() {
+        return binlog == null ? null : TBinlogType.findByValue(binlogType);
+    }
+
     public long getDbId() {
         return dbId;
     }