From 0adb150da72e111a28f9cc9e3c17b104f4597d1c Mon Sep 17 00:00:00 2001
From: Mingyu Chen <morningman@163.com>
Date: Fri, 26 Apr 2019 18:05:33 +0800
Subject: [PATCH] Fix ut bugs (#1046)

Also fix a metrics collection bug
---
 .../java/org/apache/doris/load/routineload/RoutineLoadJob.java | 3 +--
 .../org/apache/doris/load/routineload/RoutineLoadJobTest.java  | 2 +-
 .../doris/load/routineload/RoutineLoadSchedulerTest.java       | 3 +++
 3 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/fe/src/main/java/org/apache/doris/load/routineload/RoutineLoadJob.java b/fe/src/main/java/org/apache/doris/load/routineload/RoutineLoadJob.java
index c932304dec..04a7850603 100644
--- a/fe/src/main/java/org/apache/doris/load/routineload/RoutineLoadJob.java
+++ b/fe/src/main/java/org/apache/doris/load/routineload/RoutineLoadJob.java
@@ -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);
diff --git a/fe/src/test/java/org/apache/doris/load/routineload/RoutineLoadJobTest.java b/fe/src/test/java/org/apache/doris/load/routineload/RoutineLoadJobTest.java
index 86b96e8e18..c86ca50689 100644
--- a/fe/src/test/java/org/apache/doris/load/routineload/RoutineLoadJobTest.java
+++ b/fe/src/test/java/org/apache/doris/load/routineload/RoutineLoadJobTest.java
@@ -109,7 +109,7 @@ public class RoutineLoadJobTest {
                 routineLoadTaskInfo.getTxnId();
                 result = txnId;
                 transactionState.getTxnCommitAttachment();
-                result = null;
+                result = new RLTaskTxnCommitAttachment();
                 routineLoadTaskInfo.getPartitions();
                 result = Lists.newArrayList();
             }
diff --git a/fe/src/test/java/org/apache/doris/load/routineload/RoutineLoadSchedulerTest.java b/fe/src/test/java/org/apache/doris/load/routineload/RoutineLoadSchedulerTest.java
index 5dd03ab319..e14f238359 100644
--- a/fe/src/test/java/org/apache/doris/load/routineload/RoutineLoadSchedulerTest.java
+++ b/fe/src/test/java/org/apache/doris/load/routineload/RoutineLoadSchedulerTest.java
@@ -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;
             }
         };