Merge pull request #2632 from taosdata/jdbcfixes

Fix build failure

src/connector/jdbc/src/main/java/com/taosdata/jdbc/utils/TDNode.java

@@ -77,7 +77,7 @@ public class TDNode {
             e.printStackTrace();
         }
 
-        if(binPath.equals("")) {
+        if(binPath.isEmpty()) {
             System.out.println("taosd not found");
             return;
         } else {
@@ -106,14 +106,10 @@ public class TDNode {
         String toBeKilled = "taosd";
 
         if (this.running != 0) {
-            String psCmd = "ps -ef|grep -w %s| grep -v grep | awk '{print " + toBeKilled + "}'";
+            String killCmd = "pkill -kill -x " + toBeKilled;
+            String[] killCmds = {"sh", "-c", killCmd};
             try {                                
-                Process ps = Runtime.getRuntime().exec(psCmd);
-                ps.waitFor();
-                long pid = ps.pid();
-
-                String killCmd = "kill -9 " + pid;
-                Runtime.getRuntime().exec(killCmd).waitFor();
+                Runtime.getRuntime().exec(killCmds).waitFor();
 
                 for(int port = 6030; port < 6041; port ++) {
                     String fuserCmd = "fuser -k -n tcp " + port;
@@ -124,7 +120,7 @@ public class TDNode {
             }
 
             this.running = 0;
-            System.out.println("dnode:" + this.index + "is stopped by kill -9");
+            System.out.println("dnode:" + this.index + " is stopped by pkill");
         }
     }
 
@@ -137,7 +133,6 @@ public class TDNode {
         }
     }
 
-
     public void stopIP() {
         try{
             String cmd = "sudo ifconfig lo:" + index + "192.168.0." + index + " down";            

src/connector/jdbc/src/main/java/com/taosdata/jdbc/utils/TDNodes.java

@@ -16,11 +16,9 @@ public class TDNodes {
 
     public void setPath(String path) {
         try {
-            String psCmd = "ps -ef|grep -w taosd| grep -v grep | awk '{print $2}'" ;
-            Process ps = Runtime.getRuntime().exec(psCmd);
-            ps.waitFor();
-            String killCmd = "kill -9 " + ps.pid();
-            Runtime.getRuntime().exec(killCmd).waitFor();        
+            String killCmd = "pkill -kill -x taosd";
+            String[] killCmds = {"sh", "-c", killCmd};
+            Runtime.getRuntime().exec(killCmds).waitFor();        
 
             String binPath = System.getProperty("user.dir");
             binPath += "/../../../debug";