This is an automated email from the ASF dual-hosted git repository.
morningman pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-doris.git
The following commit(s) were added to refs/heads/master by this push:
new 5cc8cb1 [improvement](txn) Add PreCommitTime for the result of `SHOW
TRANSACTION` stmt (#8124)
5cc8cb1 is described below
commit 5cc8cb1b93fe493c5de0aa99d689181b171a6d31
Author: weizuo93 <[email protected]>
AuthorDate: Sat Feb 19 12:02:07 2022 +0800
[improvement](txn) Add PreCommitTime for the result of `SHOW TRANSACTION`
stmt (#8124)
Add `PreCommitTime` for the result of ` SHOW TRANSACTION;` and `SHOW PROC
'/transactions/{DbId}/{state}';`.
---
.../src/main/java/org/apache/doris/common/proc/TransProcDir.java | 1 +
.../org/apache/doris/transaction/DatabaseTransactionMgr.java | 1 +
.../org/apache/doris/transaction/DatabaseTransactionMgrTest.java | 9 +++++----
3 files changed, 7 insertions(+), 4 deletions(-)
diff --git
a/fe/fe-core/src/main/java/org/apache/doris/common/proc/TransProcDir.java
b/fe/fe-core/src/main/java/org/apache/doris/common/proc/TransProcDir.java
index 118cc85..90a9fe5 100644
--- a/fe/fe-core/src/main/java/org/apache/doris/common/proc/TransProcDir.java
+++ b/fe/fe-core/src/main/java/org/apache/doris/common/proc/TransProcDir.java
@@ -34,6 +34,7 @@ public class TransProcDir implements ProcDirInterface {
.add("TransactionStatus")
.add("LoadJobSourceType")
.add("PrepareTime")
+ .add("PreCommitTime")
.add("CommitTime")
.add("PublishTime")
.add("FinishTime")
diff --git
a/fe/fe-core/src/main/java/org/apache/doris/transaction/DatabaseTransactionMgr.java
b/fe/fe-core/src/main/java/org/apache/doris/transaction/DatabaseTransactionMgr.java
index 0876965..6b106e1 100644
---
a/fe/fe-core/src/main/java/org/apache/doris/transaction/DatabaseTransactionMgr.java
+++
b/fe/fe-core/src/main/java/org/apache/doris/transaction/DatabaseTransactionMgr.java
@@ -243,6 +243,7 @@ public class DatabaseTransactionMgr {
info.add(txnState.getTransactionStatus().name());
info.add(txnState.getSourceType().name());
info.add(TimeUtils.longToTimeString(txnState.getPrepareTime()));
+ info.add(TimeUtils.longToTimeString(txnState.getPreCommitTime()));
info.add(TimeUtils.longToTimeString(txnState.getCommitTime()));
info.add(TimeUtils.longToTimeString(txnState.getPublishVersionTime()));
info.add(TimeUtils.longToTimeString(txnState.getFinishTime()));
diff --git
a/fe/fe-core/src/test/java/org/apache/doris/transaction/DatabaseTransactionMgrTest.java
b/fe/fe-core/src/test/java/org/apache/doris/transaction/DatabaseTransactionMgrTest.java
index 42f2e1b..90af8f9 100644
---
a/fe/fe-core/src/test/java/org/apache/doris/transaction/DatabaseTransactionMgrTest.java
+++
b/fe/fe-core/src/test/java/org/apache/doris/transaction/DatabaseTransactionMgrTest.java
@@ -218,10 +218,11 @@ public class DatabaseTransactionMgrTest {
assertTrue(currentTime > TimeUtils.timeStringToLong(txnInfo.get(6)));
assertTrue(currentTime > TimeUtils.timeStringToLong(txnInfo.get(7)));
assertTrue(currentTime > TimeUtils.timeStringToLong(txnInfo.get(8)));
- assertEquals("", txnInfo.get(9));
- assertEquals("0", txnInfo.get(10));
- assertEquals("-1", txnInfo.get(11));
- assertEquals(String.valueOf(Config.stream_load_default_timeout_second
* 1000), txnInfo.get(12));
+ assertTrue(currentTime > TimeUtils.timeStringToLong(txnInfo.get(9)));
+ assertEquals("", txnInfo.get(10));
+ assertEquals("0", txnInfo.get(11));
+ assertEquals("-1", txnInfo.get(12));
+ assertEquals(String.valueOf(Config.stream_load_default_timeout_second
* 1000), txnInfo.get(13));
}
@Test
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
