morningman closed pull request #412: Fix compile failure in
GlobalTransactionMgrTest
URL: https://github.com/apache/incubator-doris/pull/412
This is a PR merged from a forked repository.
As GitHub hides the original diff on merge, it is displayed below for
the sake of provenance:
As this is a foreign pull request (from a fork), the diff is supplied
below (as it won't show otherwise due to GitHub magic):
diff --git a/fe/src/main/java/org/apache/doris/common/FeMetaVersion.java
b/fe/src/main/java/org/apache/doris/common/FeMetaVersion.java
index 144ea8e6..2579ab3b 100644
--- a/fe/src/main/java/org/apache/doris/common/FeMetaVersion.java
+++ b/fe/src/main/java/org/apache/doris/common/FeMetaVersion.java
@@ -98,5 +98,8 @@
// streaming load
public static final int VERSION_45 = 45;
+ // colocate join
+ public static final int VERSION_46 = 46;
+
// TODO(ml):VERSION_ROUTINE_LOAD add extra in transaction state for
routine load
}
diff --git a/fe/src/main/java/org/apache/doris/load/LoadChecker.java
b/fe/src/main/java/org/apache/doris/load/LoadChecker.java
index 789086f2..0b812bd8 100644
--- a/fe/src/main/java/org/apache/doris/load/LoadChecker.java
+++ b/fe/src/main/java/org/apache/doris/load/LoadChecker.java
@@ -25,6 +25,7 @@
import org.apache.doris.transaction.GlobalTransactionMgr;
import org.apache.doris.transaction.TabletCommitInfo;
import org.apache.doris.transaction.TransactionCommitFailedException;
+import org.apache.doris.transaction.TransactionException;
import org.apache.doris.transaction.TransactionState;
import org.apache.doris.transaction.TransactionStatus;
import org.apache.doris.catalog.MaterializedIndex.IndexState;
@@ -329,7 +330,7 @@ private void tryCommitJob(LoadJob job, Database db) {
tabletCommitInfos.add(new TabletCommitInfo(tabletId,
replica.getBackendId()));
}
globalTransactionMgr.commitTransaction(job.getDbId(),
job.getTransactionId(), tabletCommitInfos);
- } catch (MetaNotFoundException | TransactionCommitFailedException e) {
+ } catch (MetaNotFoundException | TransactionException e) {
LOG.warn("errors while commit transaction [{}], cancel the job {},
reason is {}",
transactionState.getTransactionId(), job, e);
load.cancelLoadJob(job, CancelType.UNKNOWN,
transactionState.getReason());
diff --git
a/fe/src/test/java/org/apache/doris/transaction/GlobalTransactionMgrTest.java
b/fe/src/test/java/org/apache/doris/transaction/GlobalTransactionMgrTest.java
index 9177d5e9..481cdc50 100644
---
a/fe/src/test/java/org/apache/doris/transaction/GlobalTransactionMgrTest.java
+++
b/fe/src/test/java/org/apache/doris/transaction/GlobalTransactionMgrTest.java
@@ -126,7 +126,7 @@ public void testBeginTransactionWithSameLabel() throws
LabelAlreadyExistsExcepti
// all replica committed success
@Test
public void testCommitTransaction1() throws MetaNotFoundException,
- TransactionCommitFailedException,
+ TransactionException,
IllegalTransactionParameterException, LabelAlreadyExistsException,
AnalysisException, BeginTransactionException {
FakeCatalog.setCatalog(masterCatalog);
@@ -169,7 +169,7 @@ public void testCommitTransaction1() throws
MetaNotFoundException,
// commit with only two replicas
@Test
public void testCommitTransactionWithOneFailed() throws
MetaNotFoundException,
- TransactionCommitFailedException,
+ TransactionException,
IllegalTransactionParameterException, LabelAlreadyExistsException,
AnalysisException, BeginTransactionException {
TransactionState transactionState = null;
@@ -271,7 +271,7 @@ public void testCommitTransactionWithOneFailed() throws
MetaNotFoundException,
assertTrue(CatalogTestUtil.compareCatalog(masterCatalog,
slaveCatalog));
}
- public void testFinishTransaction() throws MetaNotFoundException,
TransactionCommitFailedException,
+ public void testFinishTransaction() throws MetaNotFoundException,
TransactionException,
IllegalTransactionParameterException, LabelAlreadyExistsException,
AnalysisException, BeginTransactionException {
long transactionId =
masterTransMgr.beginTransaction(CatalogTestUtil.testDbId1,
@@ -315,7 +315,7 @@ public void testFinishTransaction() throws
MetaNotFoundException, TransactionCom
@Test
public void testFinishTransactionWithOneFailed() throws
MetaNotFoundException,
- TransactionCommitFailedException,
+ TransactionException,
IllegalTransactionParameterException, LabelAlreadyExistsException,
AnalysisException, BeginTransactionException {
TransactionState transactionState = null;
----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
[email protected]
With regards,
Apache Git Services
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
