database/doris
2
0
Fork 0
Code Issues Pull Requests Actions 3 Packages Projects Releases Wiki Activity

Fix some bugs (#979)

Browse Source 
1. Add Config.max_routine_load_concurrent_task_num instead of the old one
2. Fix a bug that SHOW ALTER TABLE COLUMN may throw Nullpointer exception
3. Fix some misspelling of docs
This commit is contained in:
Mingyu Chen
2019-04-21 08:53:49 +08:00
committed by ZHAO Chun
parent 56bec6f22a
commit 1b5643c6fb
16 changed files with 112 additions and 83 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
fe/src/test/java/org/apache/doris/transaction/GlobalTransactionMgrTest.java
View File

@ -108,7 +108,7 @@ public class GlobalTransactionMgrTest {
long transactionId = masterTransMgr.beginTransaction(CatalogTestUtil.testDbId1,
CatalogTestUtil.testTxnLable1,
transactionSource,
LoadJobSourceType.FRONTEND, Config.stream_load_default_timeout_second * 1000);
LoadJobSourceType.FRONTEND, Config.stream_load_default_timeout_second);
TransactionState transactionState = masterTransMgr.getTransactionState(transactionId);
assertNotNull(transactionState);
assertEquals(transactionId, transactionState.getTransactionId());
@ -126,7 +126,7 @@ public class GlobalTransactionMgrTest {
transactionId = masterTransMgr.beginTransaction(CatalogTestUtil.testDbId1,
CatalogTestUtil.testTxnLable1,
transactionSource,
LoadJobSourceType.FRONTEND, Config.stream_load_default_timeout_second * 1000);
LoadJobSourceType.FRONTEND, Config.stream_load_default_timeout_second);
} catch (AnalysisException e) {
e.printStackTrace();
} catch (LabelAlreadyUsedException e) {
@ -143,7 +143,7 @@ public class GlobalTransactionMgrTest {
transactionId = masterTransMgr.beginTransaction(CatalogTestUtil.testDbId1,
CatalogTestUtil.testTxnLable1,
transactionSource,
LoadJobSourceType.FRONTEND, Config.stream_load_default_timeout_second * 1000);
LoadJobSourceType.FRONTEND, Config.stream_load_default_timeout_second);
} catch (Exception e) {
// TODO: handle exception
}
@ -156,7 +156,7 @@ public class GlobalTransactionMgrTest {
long transactionId = masterTransMgr.beginTransaction(CatalogTestUtil.testDbId1,
CatalogTestUtil.testTxnLable1,
transactionSource,
LoadJobSourceType.FRONTEND, Config.stream_load_default_timeout_second * 1000);
LoadJobSourceType.FRONTEND, Config.stream_load_default_timeout_second);
// commit a transaction
TabletCommitInfo tabletCommitInfo1 = new TabletCommitInfo(CatalogTestUtil.testTabletId1,
CatalogTestUtil.testBackendId1);
@ -197,7 +197,7 @@ public class GlobalTransactionMgrTest {
long transactionId = masterTransMgr.beginTransaction(CatalogTestUtil.testDbId1,
CatalogTestUtil.testTxnLable1,
transactionSource,
LoadJobSourceType.FRONTEND, Config.stream_load_default_timeout_second * 1000);
LoadJobSourceType.FRONTEND, Config.stream_load_default_timeout_second);
// commit a transaction with 1,2 success
TabletCommitInfo tabletCommitInfo1 = new TabletCommitInfo(CatalogTestUtil.testTabletId1,
CatalogTestUtil.testBackendId1);
@ -219,7 +219,7 @@ public class GlobalTransactionMgrTest {
long transactionId2 = masterTransMgr.beginTransaction(CatalogTestUtil.testDbId1,
CatalogTestUtil.testTxnLable2,
transactionSource,
LoadJobSourceType.FRONTEND, Config.stream_load_default_timeout_second * 1000);
LoadJobSourceType.FRONTEND, Config.stream_load_default_timeout_second);
tabletCommitInfo1 = new TabletCommitInfo(CatalogTestUtil.testTabletId1, CatalogTestUtil.testBackendId1);
TabletCommitInfo tabletCommitInfo3 = new TabletCommitInfo(CatalogTestUtil.testTabletId1,
CatalogTestUtil.testBackendId3);
@ -315,7 +315,7 @@ public class GlobalTransactionMgrTest {
routineLoadTaskInfoList.add(routineLoadTaskInfo);
TransactionState transactionState = new TransactionState(1L, 1L, "label", 1L,
LoadJobSourceType.ROUTINE_LOAD_TASK, "be1", routineLoadJob.getId(),
Config.stream_load_default_timeout_second * 1000);
Config.stream_load_default_timeout_second);
transactionState.setTransactionStatus(TransactionStatus.PREPARE);
masterTransMgr.getListenerRegistry().register(routineLoadJob);
// Deencapsulation.setField(transactionState, "txnStateChangeListener", routineLoadJob);
@ -381,7 +381,7 @@ public class GlobalTransactionMgrTest {
routineLoadTaskInfoList.add(routineLoadTaskInfo);
TransactionState transactionState = new TransactionState(1L, 1L, "label", 1L,
LoadJobSourceType.ROUTINE_LOAD_TASK, "be1", routineLoadJob.getId(),
Config.stream_load_default_timeout_second * 1000);
Config.stream_load_default_timeout_second);
transactionState.setTransactionStatus(TransactionStatus.PREPARE);
masterTransMgr.getListenerRegistry().register(routineLoadJob);
Map<Long, TransactionState> idToTransactionState = Maps.newHashMap();
@ -426,7 +426,7 @@ public class GlobalTransactionMgrTest {
long transactionId = masterTransMgr.beginTransaction(CatalogTestUtil.testDbId1,
CatalogTestUtil.testTxnLable1,
transactionSource,
LoadJobSourceType.FRONTEND, Config.stream_load_default_timeout_second * 1000);
LoadJobSourceType.FRONTEND, Config.stream_load_default_timeout_second);
// commit a transaction
TabletCommitInfo tabletCommitInfo1 = new TabletCommitInfo(CatalogTestUtil.testTabletId1,
CatalogTestUtil.testBackendId1);
@ -472,7 +472,7 @@ public class GlobalTransactionMgrTest {
long transactionId = masterTransMgr.beginTransaction(CatalogTestUtil.testDbId1,
CatalogTestUtil.testTxnLable1,
transactionSource,
LoadJobSourceType.FRONTEND, Config.stream_load_default_timeout_second * 1000);
LoadJobSourceType.FRONTEND, Config.stream_load_default_timeout_second);
// commit a transaction with 1,2 success
TabletCommitInfo tabletCommitInfo1 = new TabletCommitInfo(CatalogTestUtil.testTabletId1,
CatalogTestUtil.testBackendId1);
@ -526,7 +526,7 @@ public class GlobalTransactionMgrTest {
long transactionId2 = masterTransMgr.beginTransaction(CatalogTestUtil.testDbId1,
CatalogTestUtil.testTxnLable2,
transactionSource,
LoadJobSourceType.FRONTEND, Config.stream_load_default_timeout_second * 1000);
LoadJobSourceType.FRONTEND, Config.stream_load_default_timeout_second);
tabletCommitInfo1 = new TabletCommitInfo(CatalogTestUtil.testTabletId1, CatalogTestUtil.testBackendId1);
TabletCommitInfo tabletCommitInfo3 = new TabletCommitInfo(CatalogTestUtil.testTabletId1,
CatalogTestUtil.testBackendId3);
@ -594,7 +594,7 @@ public class GlobalTransactionMgrTest {
long transactionId = masterTransMgr.beginTransaction(CatalogTestUtil.testDbId1,
CatalogTestUtil.testTxnLable1,
transactionSource,
LoadJobSourceType.FRONTEND, Config.stream_load_default_timeout_second * 1000);
LoadJobSourceType.FRONTEND, Config.stream_load_default_timeout_second);
TransactionState transactionState = masterTransMgr.getTransactionState(transactionId);
assertNotNull(transactionState);
assertEquals(transactionId, transactionState.getTransactionId());