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

Fix ut bugs (#1046)

Browse Source 
Also fix a metrics collection bug
This commit is contained in:
Mingyu Chen
2019-04-26 18:05:33 +08:00
committed by ZHAO Chun
parent 4e5197ba52
commit 0adb150da7
3 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
fe/src/main/java/org/apache/doris/load/routineload/RoutineLoadJob.java
View File

@ -68,7 +68,6 @@ import java.io.DataOutput;
import java.io.IOException;
import java.io.StringReader;
import java.util.ArrayList;
import java.util.Collections;
import java.util.List;
import java.util.Map;
import java.util.Optional;
@ -481,7 +480,7 @@ public abstract class RoutineLoadJob implements TxnStateChangeCallback, Writable
this.receivedBytes += receivedBytes;
this.totalTaskExcutionTimeMs += taskExecutionTime;
if (MetricRepo.isInit.get()) {
if (MetricRepo.isInit.get() && !isReplay) {
MetricRepo.COUNTER_ROUTINE_LOAD_ROWS.increase(numOfTotalRows);
MetricRepo.COUNTER_ROUTINE_LOAD_ERROR_ROWS.increase(numOfErrorRows);
MetricRepo.COUNTER_ROUTINE_LOAD_RECEIVED_BYTES.increase(receivedBytes);

2
fe/src/test/java/org/apache/doris/load/routineload/RoutineLoadJobTest.java
View File

@ -109,7 +109,7 @@ public class RoutineLoadJobTest {
routineLoadTaskInfo.getTxnId();
result = txnId;
transactionState.getTxnCommitAttachment();
result = null;
result = new RLTaskTxnCommitAttachment();
routineLoadTaskInfo.getPartitions();
result = Lists.newArrayList();
}

3
fe/src/test/java/org/apache/doris/load/routineload/RoutineLoadSchedulerTest.java
View File

@ -97,10 +97,13 @@ public class RoutineLoadSchedulerTest {
result = beIds;
routineLoadManager.getSizeOfIdToRoutineLoadTask();
result = 1;
minTimes = 0;
routineLoadManager.getTotalMaxConcurrentTaskNum();
result = 10;
minTimes = 0;
catalog.getRoutineLoadTaskScheduler();
result = routineLoadTaskScheduler;
minTimes = 0;
}
};