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
The following commit(s) were added to refs/heads/branch-2.1 by this push:
new 2504b8c3a9e branch-2.1: [fix](binlog) Set dummy timestamp correctly
#48706 (#48755)
2504b8c3a9e is described below
commit 2504b8c3a9e26121f725dd3317ccb5d09def2b35
Author: github-actions[bot]
<41898282+github-actions[bot]@users.noreply.github.com>
AuthorDate: Sun Mar 9 00:23:16 2025 +0800
branch-2.1: [fix](binlog) Set dummy timestamp correctly #48706 (#48755)
Cherry-picked from #48706
Co-authored-by: walter <maoch...@selectdb.com>
---
fe/fe-core/src/main/java/org/apache/doris/binlog/BinlogUtils.java | 3 ++-
fe/fe-core/src/main/java/org/apache/doris/binlog/DBBinlog.java | 1 +
fe/fe-core/src/main/java/org/apache/doris/binlog/TableBinlog.java | 1 +
3 files changed, 4 insertions(+), 1 deletion(-)
diff --git a/fe/fe-core/src/main/java/org/apache/doris/binlog/BinlogUtils.java
b/fe/fe-core/src/main/java/org/apache/doris/binlog/BinlogUtils.java
index 1fa930cd4d7..66350cec0d3 100644
--- a/fe/fe-core/src/main/java/org/apache/doris/binlog/BinlogUtils.java
+++ b/fe/fe-core/src/main/java/org/apache/doris/binlog/BinlogUtils.java
@@ -68,7 +68,7 @@ public class BinlogUtils {
if (firstBinlog.getCommitSeq() > prevCommitSeq) {
BinlogLagInfo lagInfo = new BinlogLagInfo(binlogs.size(),
firstBinlog.getCommitSeq(),
- firstBinlog.getTimestamp(), lastBinlog.getCommitSeq(),
lastBinlog.getTimestamp());
+ lastBinlog.getCommitSeq(), firstBinlog.getTimestamp(),
lastBinlog.getTimestamp());
return Pair.of(status, lagInfo);
}
@@ -101,6 +101,7 @@ public class BinlogUtils {
dummy.setType(TBinlogType.DUMMY);
dummy.setDbId(dbId);
dummy.setBelong(tableId);
+ dummy.setTimestamp(System.currentTimeMillis());
return dummy;
}
diff --git a/fe/fe-core/src/main/java/org/apache/doris/binlog/DBBinlog.java
b/fe/fe-core/src/main/java/org/apache/doris/binlog/DBBinlog.java
index bd7fd184426..8e2c7bbde96 100644
--- a/fe/fe-core/src/main/java/org/apache/doris/binlog/DBBinlog.java
+++ b/fe/fe-core/src/main/java/org/apache/doris/binlog/DBBinlog.java
@@ -459,6 +459,7 @@ public class DBBinlog {
if (lastExpiredBinlog != null) {
final long expiredCommitSeq = lastExpiredBinlog.getCommitSeq();
dummy.setCommitSeq(expiredCommitSeq);
+ dummy.setTimestamp(lastExpiredBinlog.getTimestamp());
// release expired timestamps by commit seq.
Iterator<Pair<Long, Long>> timeIter = timestamps.iterator();
diff --git a/fe/fe-core/src/main/java/org/apache/doris/binlog/TableBinlog.java
b/fe/fe-core/src/main/java/org/apache/doris/binlog/TableBinlog.java
index cef60c85ac4..8eb27de8092 100644
--- a/fe/fe-core/src/main/java/org/apache/doris/binlog/TableBinlog.java
+++ b/fe/fe-core/src/main/java/org/apache/doris/binlog/TableBinlog.java
@@ -211,6 +211,7 @@ public class TableBinlog {
final long expiredCommitSeq = lastExpiredBinlog.getCommitSeq();
dummyBinlog.setCommitSeq(expiredCommitSeq);
+ dummyBinlog.setTimestamp(lastExpiredBinlog.getTimestamp());
Iterator<Pair<Long, Long>> timeIterator = timestamps.iterator();
while (timeIterator.hasNext() && timeIterator.next().first <=
expiredCommitSeq) {
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscr...@doris.apache.org
For additional commands, e-mail: commits-h...@doris.apache.org
