Add load local path (#167)

* modify socketTimeout to 120s * add regular match * support rc + Pessimistic * revert Fix pessimistic commit wait error * revert revert * add mo_debug to builtindb items * add load local path
matrixorigin · May 28, 2024 · 6bb22a3 · 6bb22a3
1 parent 09ff9e7
commit 6bb22a3
Show file tree

Hide file tree

Showing 5 changed files with 7 additions and 1 deletion.
diff --git a/lib/mo-tester-1.0-SNAPSHOT.jar b/lib/mo-tester-1.0-SNAPSHOT.jar
diff --git a/src/main/java/io/mo/Tester.java b/src/main/java/io/mo/Tester.java
@@ -50,6 +50,7 @@ public static void main(String[] args){
                         srcPath = srcPath.substring(0,srcPath.indexOf(COMMON.RESOURCE_DIR)+COMMON.RESOURCE_DIR.length());
                     }
                     COMMON.RESOURCE_PATH = srcPath;
+                    COMMON.RESOURCE_LOCAL_PATH = srcPath;
                 }
 
                 //get method

diff --git a/src/main/java/io/mo/constant/COMMON.java b/src/main/java/io/mo/constant/COMMON.java
@@ -37,6 +37,7 @@ public class COMMON {
 
     public static String COLUMN_SEPARATOR_FLAG = "-- @separator:";
     public static String RESOURCE_PATH_FLAG = "\\$resources";
+    public static String RESOURCE_LOCAL_PATH_FLAG= "\\$resources_local";
 
     public static String WAIT_FLAG = "-- @wait:";
 
@@ -55,6 +56,7 @@ public class COMMON {
     public static String RESOURCE_DIR = "resources";
 
     public static String RESOURCE_PATH = "./resources";
+    public static String RESOURCE_LOCAL_PATH = "./resources";
     public static String UPDATE_RESULT_TEMPLATE = "Query OK, {num} row affected";
 
     public static int WAIT_TIMEOUT = 5000;

diff --git a/src/main/java/io/mo/db/Executor.java b/src/main/java/io/mo/db/Executor.java
@@ -137,7 +137,9 @@ public static void run(TestScript script){
                 //connection.setCatalog(command.getUseDB());
                 command.setUseDB(connection.getCatalog());
                 statement = connection.createStatement();
-                String sqlCmd = command.getCommand().replaceAll(COMMON.RESOURCE_PATH_FLAG,COMMON.RESOURCE_PATH);
+                String sqlCmd = command.getCommand()
+                        .replaceAll(COMMON.RESOURCE_LOCAL_PATH_FLAG,COMMON.RESOURCE_LOCAL_PATH)
+                        .replaceAll(COMMON.RESOURCE_PATH_FLAG,COMMON.RESOURCE_PATH);
                 if(command.isNeedWait()){
                     execWaitOperation(command);
                 }

diff --git a/src/main/java/io/mo/util/RunConfUtil.java b/src/main/java/io/mo/util/RunConfUtil.java
@@ -45,6 +45,7 @@ public static String getResourcePath(){
             srcPath = srcPath.replace(COMMON.CASES_DIR,COMMON.RESOURCE_DIR);
             srcPath = srcPath.substring(0,srcPath.indexOf(COMMON.RESOURCE_DIR)+COMMON.RESOURCE_DIR.length());
         }
+        COMMON.RESOURCE_LOCAL_PATH = srcPath;
         return srcPath == null?COMMON.RESOURCE_PATH:srcPath;
     }