This is an automated email from the ASF dual-hosted git repository.
dataroaring pushed a commit to branch branch-2.1
in repository https://gitbox.apache.org/repos/asf/doris.git
The following commit(s) were added to refs/heads/branch-2.1 by this push:
new 514d419c197 branch-2.1: [fix](binlog) Binlog ts not initialized #47174
(#48067)
514d419c197 is described below
commit 514d419c1975b612bca8360866f8cb4472b070d1
Author: Uniqueyou <wangyix...@selectdb.com>
AuthorDate: Fri Feb 21 20:23:16 2025 +0800
branch-2.1: [fix](binlog) Binlog ts not initialized #47174 (#48067)
pick: https://github.com/apache/doris/pull/47174
---
.../org/apache/doris/binlog/BinlogManager.java | 26 +++++++++++-----------
1 file changed, 13 insertions(+), 13 deletions(-)
diff --git
a/fe/fe-core/src/main/java/org/apache/doris/binlog/BinlogManager.java
b/fe/fe-core/src/main/java/org/apache/doris/binlog/BinlogManager.java
index d4bf72a1e9c..d6d0e568dee 100644
--- a/fe/fe-core/src/main/java/org/apache/doris/binlog/BinlogManager.java
+++ b/fe/fe-core/src/main/java/org/apache/doris/binlog/BinlogManager.java
@@ -188,7 +188,7 @@ public class BinlogManager {
List<Long> tableIds = Lists.newArrayList();
tableIds.add(addPartitionRecord.getTableId());
long commitSeq = addPartitionRecord.getCommitSeq();
- long timestamp = -1;
+ long timestamp = System.currentTimeMillis();
TBinlogType type = TBinlogType.ADD_PARTITION;
String data = addPartitionRecord.toJson();
@@ -200,7 +200,7 @@ public class BinlogManager {
List<Long> tableIds = Lists.newArrayList();
tableIds.add(createTableRecord.getTableId());
long commitSeq = createTableRecord.getCommitSeq();
- long timestamp = -1;
+ long timestamp = System.currentTimeMillis();
TBinlogType type = TBinlogType.CREATE_TABLE;
String data = createTableRecord.toJson();
@@ -211,7 +211,7 @@ public class BinlogManager {
long dbId = dropPartitionInfo.getDbId();
List<Long> tableIds = Lists.newArrayList();
tableIds.add(dropPartitionInfo.getTableId());
- long timestamp = -1;
+ long timestamp = System.currentTimeMillis();
TBinlogType type = TBinlogType.DROP_PARTITION;
String data = dropPartitionInfo.toJson();
@@ -223,7 +223,7 @@ public class BinlogManager {
List<Long> tableIds = Lists.newArrayList();
tableIds.add(record.getTableId());
long commitSeq = record.getCommitSeq();
- long timestamp = -1;
+ long timestamp = System.currentTimeMillis();
TBinlogType type = TBinlogType.DROP_TABLE;
String data = record.toJson();
@@ -234,7 +234,7 @@ public class BinlogManager {
long dbId = alterJob.getDbId();
List<Long> tableIds = Lists.newArrayList();
tableIds.add(alterJob.getTableId());
- long timestamp = -1;
+ long timestamp = System.currentTimeMillis();
TBinlogType type = TBinlogType.ALTER_JOB;
AlterJobRecord alterJobRecord = new AlterJobRecord(alterJob);
String data = alterJobRecord.toJson();
@@ -246,7 +246,7 @@ public class BinlogManager {
long dbId = info.getDbId();
List<Long> tableIds = Lists.newArrayList();
tableIds.add(info.getTableId());
- long timestamp = -1;
+ long timestamp = System.currentTimeMillis();
TBinlogType type = TBinlogType.MODIFY_TABLE_ADD_OR_DROP_COLUMNS;
String data = info.toJson();
@@ -257,7 +257,7 @@ public class BinlogManager {
long dbId = info.getDbId();
List<Long> tableIds = Lists.newArrayList();
- long timestamp = -1;
+ long timestamp = System.currentTimeMillis();
TBinlogType type = TBinlogType.ALTER_DATABASE_PROPERTY;
String data = info.toJson();
@@ -268,7 +268,7 @@ public class BinlogManager {
long dbId = info.getDbId();
List<Long> tableIds = Lists.newArrayList();
tableIds.add(info.getTableId());
- long timestamp = -1;
+ long timestamp = System.currentTimeMillis();
TBinlogType type = TBinlogType.MODIFY_TABLE_PROPERTY;
String data = info.toJson();
@@ -289,7 +289,7 @@ public class BinlogManager {
List<Long> tableIds = Lists.newArrayList();
tableIds.add(tableId);
- long timestamp = -1;
+ long timestamp = System.currentTimeMillis();
TBinlogType type = TBinlogType.BARRIER;
String data = barrierLog.toJson();
@@ -301,7 +301,7 @@ public class BinlogManager {
long dbId = info.getDbId();
List<Long> tableIds = Lists.newArrayList();
tableIds.add(info.getTableId());
- long timestamp = -1;
+ long timestamp = System.currentTimeMillis();
TBinlogType type = TBinlogType.MODIFY_PARTITIONS;
String data = info.toJson();
@@ -313,7 +313,7 @@ public class BinlogManager {
long dbId = info.getDbId();
List<Long> tableIds = Lists.newArrayList();
tableIds.add(info.getTblId());
- long timestamp = -1;
+ long timestamp = System.currentTimeMillis();
TBinlogType type = TBinlogType.REPLACE_PARTITIONS;
String data = info.toJson();
@@ -325,7 +325,7 @@ public class BinlogManager {
long dbId = info.getDbId();
List<Long> tableIds = Lists.newArrayList();
tableIds.add(info.getTblId());
- long timestamp = -1;
+ long timestamp = System.currentTimeMillis();
TBinlogType type = TBinlogType.TRUNCATE_TABLE;
TruncateTableRecord record = new TruncateTableRecord(info);
String data = record.toJson();
@@ -454,7 +454,7 @@ public class BinlogManager {
long dbId = info.getDbId();
List<Long> tableIds = Lists.newArrayList();
tableIds.add(info.getTableId());
- long timestamp = -1;
+ long timestamp = System.currentTimeMillis();
TBinlogType type = TBinlogType.RECOVER_INFO;
String data = info.toJson();
addBinlog(dbId, tableIds, commitSeq, timestamp, type, data, false,
info);
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscr...@doris.apache.org
For additional commands, e-mail: commits-h...@doris.apache.org
