From 3ad6010b92e419d090bef755df43b0ee17e32bc1 Mon Sep 17 00:00:00 2001
From: mozhenghua <baisui@qlangtech.com>
Date: Mon, 15 Apr 2024 14:52:43 +0800
Subject: [PATCH]  support percent display show when dataX execution

---
 .../server/FullBuildStatCollectorServer.java  |  3 +-
 .../src/test/java/StartAssembleWeb.java       |  5 +--
 .../tis/rpc/server/IncrStatusClient.java      |  2 +-
 .../hadoop/rpc/StatusRpcClientFactory.java    |  6 +++
 .../rpc/TestStatusRpcClientFactory.java       | 39 +++++++++++++++++++
 5 files changed, 48 insertions(+), 7 deletions(-)
 create mode 100644 tis-hadoop-rpc/src/test/java/com/tis/hadoop/rpc/TestStatusRpcClientFactory.java

diff --git a/tis-assemble/src/main/java/com/qlangtech/tis/rpc/server/FullBuildStatCollectorServer.java b/tis-assemble/src/main/java/com/qlangtech/tis/rpc/server/FullBuildStatCollectorServer.java
index e635c849e..03324b4f4 100644
--- a/tis-assemble/src/main/java/com/qlangtech/tis/rpc/server/FullBuildStatCollectorServer.java
+++ b/tis-assemble/src/main/java/com/qlangtech/tis/rpc/server/FullBuildStatCollectorServer.java
@@ -98,7 +98,6 @@ public void run() {
 
     @Override
     public void loadPhaseStatusFromLatest(PSynResTarget request, StreamObserver<PPhaseStatusCollection> responseObserver) {
-        // super.loadPhaseStatusFromLatest(request, responseObserver);
         boolean pipeline = request.getPipeline();
         String targetResName = request.getName();
         if (!pipeline) {
@@ -107,7 +106,7 @@ public void loadPhaseStatusFromLatest(PSynResTarget request, StreamObserver<PPha
         }
 
         PhaseStatusCollection statusCollection = DefaultChainContext.loadPhaseStatusFromLatest(targetResName);
-        responseObserver.onNext(statusCollection != null ? LogCollectorClient.convertPP(statusCollection) : null);
+        responseObserver.onNext((statusCollection != null) ? LogCollectorClient.convertPP(statusCollection) : null);
         responseObserver.onCompleted();
     }
 
diff --git a/tis-assemble/src/test/java/StartAssembleWeb.java b/tis-assemble/src/test/java/StartAssembleWeb.java
index 1e5044ef0..16a06ad6c 100644
--- a/tis-assemble/src/test/java/StartAssembleWeb.java
+++ b/tis-assemble/src/test/java/StartAssembleWeb.java
@@ -16,9 +16,6 @@
  * limitations under the License.
  */
 
-import com.alibaba.fastjson.JSONArray;
-import com.alibaba.fastjson.JSONObject;
-import com.qlangtech.tis.common.utils.Assert;
 import com.qlangtech.tis.datax.TimeFormat;
 import com.qlangtech.tis.manage.common.CenterResource;
 import com.qlangtech.tis.manage.common.Config;
@@ -45,7 +42,7 @@ public class StartAssembleWeb extends TestCase {
 
     public void testStart() throws Exception {
 
-        System.out.println( this.getClass().getClassLoader().loadClass("com.alibaba.datax.common.statistics.PerfTrace"));
+        System.out.println(this.getClass().getClassLoader().loadClass("com.alibaba.datax.common.statistics.PerfTrace"));
 
         // System.setProperty(com.qlangtech.tis.fullbuild.indexbuild.IRemoteTaskTrigger.KEY_DELTA_STREM_DEBUG, "true");
         System.setProperty(DataxUtils.EXEC_TIMESTAMP, String.valueOf(TimeFormat.getCurrentTimeStamp()));
diff --git a/tis-hadoop-rpc/src/main/java/com/qlangtech/tis/rpc/server/IncrStatusClient.java b/tis-hadoop-rpc/src/main/java/com/qlangtech/tis/rpc/server/IncrStatusClient.java
index ea18a5fb0..011cbbf7d 100644
--- a/tis-hadoop-rpc/src/main/java/com/qlangtech/tis/rpc/server/IncrStatusClient.java
+++ b/tis-hadoop-rpc/src/main/java/com/qlangtech/tis/rpc/server/IncrStatusClient.java
@@ -175,7 +175,7 @@ public PhaseStatusCollection loadPhaseStatusFromLatest(SynResTarget resTarget) {
         builder.setPipeline(resTarget.isPipeline());
         builder.setName(resTarget.getName());
         PPhaseStatusCollection statusCollection = logCollectorBlockingStub.loadPhaseStatusFromLatest(builder.build());
-        if (statusCollection == null) {
+        if (statusCollection == null || statusCollection.getTaskId() < 1) {
             return null;
         }
         return LogCollectorClient.convert(statusCollection, ExecutePhaseRange.fullRange());
diff --git a/tis-hadoop-rpc/src/main/java/com/tis/hadoop/rpc/StatusRpcClientFactory.java b/tis-hadoop-rpc/src/main/java/com/tis/hadoop/rpc/StatusRpcClientFactory.java
index b57269015..3d3f5a58b 100644
--- a/tis-hadoop-rpc/src/main/java/com/tis/hadoop/rpc/StatusRpcClientFactory.java
+++ b/tis-hadoop-rpc/src/main/java/com/tis/hadoop/rpc/StatusRpcClientFactory.java
@@ -30,6 +30,7 @@
 import com.qlangtech.tis.realtime.yarn.rpc.LaunchReportInfo;
 import com.qlangtech.tis.realtime.yarn.rpc.MasterJob;
 import com.qlangtech.tis.realtime.yarn.rpc.PingResult;
+import com.qlangtech.tis.realtime.yarn.rpc.SynResTarget;
 import com.qlangtech.tis.realtime.yarn.rpc.UpdateCounterMap;
 import com.qlangtech.tis.rpc.grpc.log.DefaultLoggerAppenderClient;
 import com.qlangtech.tis.rpc.grpc.log.ILogReporter;
@@ -502,6 +503,11 @@ private static class MockIncrStatusUmbilicalProtocol implements IncrStatusUmbili
         public void nodeLaunchReport(LaunchReportInfo launchReportInfo) {
         }
 
+        @Override
+        public PhaseStatusCollection loadPhaseStatusFromLatest(SynResTarget resTarget) {
+            return null;
+        }
+
         @Override
         public void close() throws IOException {
         }
diff --git a/tis-hadoop-rpc/src/test/java/com/tis/hadoop/rpc/TestStatusRpcClientFactory.java b/tis-hadoop-rpc/src/test/java/com/tis/hadoop/rpc/TestStatusRpcClientFactory.java
new file mode 100644
index 000000000..f6ac6e0a0
--- /dev/null
+++ b/tis-hadoop-rpc/src/test/java/com/tis/hadoop/rpc/TestStatusRpcClientFactory.java
@@ -0,0 +1,39 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * <p>
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * <p>
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.tis.hadoop.rpc;
+
+import com.qlangtech.tis.cloud.ITISCoordinator;
+import com.qlangtech.tis.common.utils.Assert;
+import com.qlangtech.tis.fullbuild.phasestatus.PhaseStatusCollection;
+import com.qlangtech.tis.realtime.yarn.rpc.SynResTarget;
+import com.tis.hadoop.rpc.StatusRpcClientFactory.AssembleSvcCompsite;
+import junit.framework.TestCase;
+
+/**
+ * @author: 百岁（baisui@qlangtech.com）
+ * @create: 2024-04-15 14:08
+ **/
+public class TestStatusRpcClientFactory extends TestCase {
+    public void testLoadPhaseStatusFromLatest() throws Exception {
+        RpcServiceReference ref = StatusRpcClientFactory.getService(ITISCoordinator.create());
+        AssembleSvcCompsite svc = ref.get();
+        PhaseStatusCollection statusCollection = svc.statReceiveSvc.loadPhaseStatusFromLatest(SynResTarget.pipeline("mysql5"));
+       // Assert.assertNotNull("statusCollection can not be null", statusCollection);
+    }
+}