make testCase pass

pigming2020 · Aug 24, 2021 · ce80906 · ce80906
1 parent e94bf8f
commit ce80906
Show file tree

Hide file tree

Showing 102 changed files with 4,166 additions and 4,315 deletions.
diff --git a/create-ln.sh b/create-ln.sh
@@ -19,10 +19,10 @@ done ;
 
 #for tis-scala-compiler-dependencies
 rm -f /opt/data/tis/libs/tis-scala-compiler-dependencies/*
-cd /Users/mozhenghua/j2ee_solution/project/tis-saturn3/tis-scala-compiler-dependencies
+cd /Users/mozhenghua/j2ee_solution/project/tis-solr/tis-scala-compiler-dependencies
 mvn dependency:copy-dependencies
 mkdir -p /opt/data/tis/libs/tis-scala-compiler-dependencies
-ln -s /Users/mozhenghua/j2ee_solution/project/tis-saturn3/tis-scala-compiler-dependencies/target/dependency/* /opt/data/tis/libs/tis-scala-compiler-dependencies
+ln -s /Users/mozhenghua/j2ee_solution/project/tis-solr/tis-scala-compiler-dependencies/target/dependency/* /opt/data/tis/libs/tis-scala-compiler-dependencies
 
 
 #/Users/mozhenghua/Desktop/j2ee_solution/project/tis-ibatis/target/dependency

diff --git a/pom.xml b/pom.xml
@@ -51,11 +51,11 @@
         <module>tis-plugin</module>
         <module>tis-solrcore-extend</module>
         <module>tis-index-builder</module>
+        <module>tis-dag</module>
         <module>tis-realtime-base</module>
         <module>tis-sql-parser</module>
         <module>tis-common-dao</module>
         <module>tis-collection-info-collect</module>
-        <module>tis-dag</module>
         <module>tis-console</module>
         <module>solr-webapp</module>
         <module>tis-scala-compiler</module>
@@ -748,7 +748,7 @@
                 <version>2.8</version>
                 <configuration>
                     <!--
-                    <test>TestAll</test>
+                    <test>TestAll_bak</test>
 -->
                     <includes>
                         <include>**/TestAll.java</include>

diff --git a/test.txt b/test.txt
@@ -79,7 +79,7 @@
 -------------------------------------------------------
  T E S T S
 -------------------------------------------------------
-Running TestAll
+Running TestAll_bak
 Tests run: 1, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 0.175 sec
 
 Results :
@@ -156,7 +156,7 @@ Tests run: 0, Failures: 0, Errors: 0, Skipped: 0
 -------------------------------------------------------
  T E S T S
 -------------------------------------------------------
-Running TestAll
+Running TestAll_bak
 15:29:59.644 [main] INFO  c.q.tis.manage.common.CenterResource - notFetchFromCenterRepository:false
 15:29:59.651 [main] WARN  c.q.tis.manage.common.CenterResource - remote file not exist:http://192.168.28.200:8080/tjs/config/stream_script_repo.action?path=cfg_repo%2Ftis_plugin_config%2Fcom.qlangtech.tis.plugin.incr.IncrStreamFactory.xml,local:
 Tests run: 1, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 0.162 sec
@@ -197,7 +197,7 @@ Tests run: 1, Failures: 0, Errors: 0, Skipped: 0
 -------------------------------------------------------
  T E S T S
 -------------------------------------------------------
-Running TestAll
+Running TestAll_bak
 Tests run: 0, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 0.025 sec
 There are no tests to run.
 
@@ -253,14 +253,14 @@ Caused by: java.lang.reflect.InvocationTargetException
 	at java.lang.reflect.Method.invoke(Method.java:498)
 	at org.apache.maven.surefire.booter.ProviderFactory$ClassLoaderProxy.invoke(ProviderFactory.java:103)
 	... 4 more
-Caused by: org.apache.maven.surefire.util.NestedRuntimeException: When finding method run; nested exception is java.lang.NoSuchMethodException: TestAll.run(junit.framework.TestResult)
+Caused by: org.apache.maven.surefire.util.NestedRuntimeException: When finding method run; nested exception is java.lang.NoSuchMethodException: TestAll_bak.run(junit.framework.TestResult)
 	at org.apache.maven.surefire.common.junit3.JUnit3Reflector.getMethod(JUnit3Reflector.java:114)
 	at org.apache.maven.surefire.common.junit3.JUnit3Reflector.getRunMethod(JUnit3Reflector.java:210)
 	at org.apache.maven.surefire.junit.JUnitTestSet.<init>(JUnitTestSet.java:70)
 	at org.apache.maven.surefire.junit.JUnit3Provider.createTestSet(JUnit3Provider.java:94)
 	at org.apache.maven.surefire.junit.JUnit3Provider.invoke(JUnit3Provider.java:84)
 	... 9 more
-Caused by: java.lang.NoSuchMethodException: TestAll.run(junit.framework.TestResult)
+Caused by: java.lang.NoSuchMethodException: TestAll_bak.run(junit.framework.TestResult)
 	at java.lang.Class.getMethod(Class.java:1786)
 	at org.apache.maven.surefire.common.junit3.JUnit3Reflector.getMethod(JUnit3Reflector.java:110)
 	... 13 more

diff --git a/tis-assemble/src/main/java/com/qlangtech/tis/order/center/IndexSwapTaskflowLauncher.java b/tis-assemble/src/main/java/com/qlangtech/tis/order/center/IndexSwapTaskflowLauncher.java
@@ -16,22 +16,23 @@
 
 import com.qlangtech.tis.TisZkClient;
 import com.qlangtech.tis.assemble.FullbuildPhase;
-import com.qlangtech.tis.exec.*;
+import com.qlangtech.tis.exec.AbstractActionInvocation;
+import com.qlangtech.tis.exec.ActionInvocation;
+import com.qlangtech.tis.exec.ExecutePhaseRange;
+import com.qlangtech.tis.exec.ExecuteResult;
 import com.qlangtech.tis.exec.impl.DefaultChainContext;
-import com.qlangtech.tis.exec.impl.DummyIndexMetaData;
 import com.qlangtech.tis.extension.impl.XmlFile;
 import com.qlangtech.tis.flume.FlumeApplication;
 import com.qlangtech.tis.fullbuild.phasestatus.PhaseStatusCollection;
 import com.qlangtech.tis.fullbuild.phasestatus.impl.*;
-import com.qlangtech.tis.manage.common.*;
-import com.qlangtech.tis.pubhook.common.RunEnvironment;
+import com.qlangtech.tis.manage.common.Config;
+import com.qlangtech.tis.manage.common.SendSMSUtils;
 import com.qlangtech.tis.realtime.transfer.IOnsListenerStatus;
 import com.qlangtech.tis.realtime.utils.NetUtils;
 import com.qlangtech.tis.realtime.yarn.rpc.impl.MasterListenerStatus;
 import com.qlangtech.tis.rpc.server.FullBuildStatCollectorServer;
 import com.qlangtech.tis.rpc.server.IncrStatusServer;
 import com.qlangtech.tis.rpc.server.IncrStatusUmbilicalProtocolImpl;
-import com.qlangtech.tis.solrdao.SolrFieldsParser;
 import com.qlangtech.tis.solrj.extend.AbstractTisCloudSolrClient;
 import com.qlangtech.tis.solrj.util.ZkUtils;
 import com.qlangtech.tis.trigger.zk.AbstractWatcher;
@@ -59,8 +60,9 @@ public class IndexSwapTaskflowLauncher implements Daemon, ServletContextListener
 
     private static final Logger logger = LoggerFactory.getLogger(IndexSwapTaskflowLauncher.class);
 
-    // private static FileSystem fileSystem;
     public static final String KEY_INDEX_SWAP_TASK_FLOW_LAUNCHER = "IndexSwapTaskflowLauncher";
+    private TisZkClient zkClient;
+    private ZkStateReader zkStateReader;
 
 
     public static IndexSwapTaskflowLauncher getIndexSwapTaskflowLauncher(ServletContext context) {
@@ -75,13 +77,7 @@ public static IndexSwapTaskflowLauncher getIndexSwapTaskflowLauncher(ServletCont
     public void contextDestroyed(ServletContextEvent sce) {
     }
 
-    // private static final String indexName = "search4totalpay";
-    // private JettyTISRunner jetty;
-    // private HdfsRealTimeTerminatorBean totalpayBean;
-    // private IRemoteIncrControl remoteIncrControl;
-    private TisZkClient zkClient;
 
-    ZkStateReader zkStateReader;
 
     public void setZkClient(TisZkClient zkClient) {
         this.zkClient = zkClient;
@@ -102,13 +98,11 @@ public void contextInitialized(ServletContextEvent sce) {
         AbstractTisCloudSolrClient.initHashcodeRouter();
         // 构建各阶段持久化
         BasicPhaseStatus.statusWriter = new BasicPhaseStatus.IFlush2Local() {
-
             @Override
             public void write(File localFile, BasicPhaseStatus status) throws Exception {
                 XmlFile xmlFile = new XmlFile(localFile);
                 xmlFile.write(status, Collections.emptySet());
             }
-
             @Override
             public BasicPhaseStatus loadPhase(File localFile) throws Exception {
                 XmlFile xmlFile = new XmlFile(localFile);
@@ -269,8 +263,6 @@ public ExecuteResult startWork(DefaultChainContext chainContext) throws Exceptio
     }
 
 
-
-
     // ///daemon/////////////////===========================================
     @Override
     public void init(DaemonContext context) throws DaemonInitException, Exception {

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
@@ -247,7 +247,6 @@ public static String addListener(MonotorTarget mtarget, RealtimeLoggerCollectorA
         }
         String target = targetAppenderName.toString();
         RealtimeLoggerCollectorAppender.addListener(target, evtMeta, listener);
-        // RealtimeLoggerCollectorAppender.addListener(mtarget, listener);
         return target;
     }