Merge branch 'dev' of dolphindb.net:dolphindb/api-java

Author: chengyitian

pom.xml

@@ -2,11 +2,11 @@
     <modelVersion>4.0.0</modelVersion>
     <groupId>com.dolphindb</groupId>
     <artifactId>dolphindb-javaapi</artifactId>
-    <version>3.00.1.1</version>
+    <version>3.00.1.2</version>
     <packaging>jar</packaging>
 
     <properties>
-        <dolphindb.version>3.00.1.1</dolphindb.version>
+        <dolphindb.version>3.00.1.2</dolphindb.version>
     </properties>
     <name>DolphinDB Java API</name>
     <description>The messaging and data conversion protocol between Java and DolphinDB server</description>
@@ -31,7 +31,7 @@
         <connection>scm:git:git@github.com:dolphindb/api-java.git</connection>
         <developerConnection>scm:git:git@github.com:dolphindb/api-java.git</developerConnection>
         <url>git@github.com:dolphindb/api-java.git</url>
-        <tag>api-java-3.00.1.1</tag>
+        <tag>api-java-3.00.1.2</tag>
     </scm>
     <dependencies>
         <dependency>

src/com/xxdb/DBConnection.java

@@ -39,7 +39,7 @@ public class DBConnection {
     private static final int MAX_FORM_VALUE = Entity.DATA_FORM.values().length - 1;
     private static final int MAX_TYPE_VALUE = Entity.DATA_TYPE.DT_DECIMAL128_ARRAY.getValue();
     private static final int DEFAULT_PRIORITY = 4;
-    private static final int DEFAULT_PARALLELISM = 2;
+    private static final int DEFAULT_PARALLELISM = 64;
 
     private ReentrantLock mutex_;
     private DBConnectionImpl conn_;

src/com/xxdb/data/Utils.java

@@ -15,7 +15,7 @@
 
 public class Utils {
 
-	public static final String JAVA_API_VERSION = "3.00.1.1";
+	public static final String JAVA_API_VERSION = "3.00.1.2";
 
 	public static final int DISPLAY_ROWS = 20;
 	public static final int DISPLAY_COLS = 100;

test/com/xxdb/DBConnectionTest.java

@@ -28,6 +28,7 @@
 
 import static com.xxdb.Prepare.*;
 import static com.xxdb.comm.SqlStdEnum.*;
+import static java.lang.Thread.sleep;
 import static org.junit.Assert.*;
 
 public class DBConnectionTest {
@@ -2544,7 +2545,7 @@ public void TestPartitionTable() throws IOException, InterruptedException {
         sb.append("pt.append!(t1);");
         conn.run(sb.toString());
         conn.run("pnodeRun(purgeCacheEngine)");
-        Thread.sleep(5000);
+        sleep(5000);
         BasicLong res_x = (BasicLong) conn.run("exec count(*) from pt where x=1");
         assertEquals(true, res_x.getLong() > 0);
         //PartitionTableJoin
@@ -2636,10 +2637,10 @@ public void TestCloseOnce() throws IOException, InterruptedException {
         DBConnection connClose = new DBConnection();
         //连接一次
         connClose.connect(HOST, PORT, "admin", "123456");
-        Thread.sleep(5000);
+        sleep(5000);
         int connCount = getConnCount();
         connClose.close();
-        Thread.sleep(5000);
+        sleep(5000);
         int connCount1 = getConnCount();
         assertEquals(connCount - 1, connCount1);
     }
@@ -2658,10 +2659,10 @@ public void TestClose() throws IOException, InterruptedException {
             }
 
         }
-        Thread.sleep(2000);
+        sleep(2000);
         int connCount = getConnCount();
         connNew.close();
-        Thread.sleep(2000);
+        sleep(2000);
         int connCount1 = getConnCount();
         assertEquals(connCount - 1, connCount1);
     }
@@ -3457,7 +3458,7 @@ public void run() {
         Timer timer = new Timer("Timer");
         TimerTask rec = new reconnect();
         timer.scheduleAtFixedRate(rec, 0L, 500L);
-        Thread.sleep(500L);
+        sleep(500L);
         timer.cancel();
     }
 
@@ -3553,7 +3554,7 @@ public void test_TryRun_fetchSize() throws IOException, InterruptedException {
         conn.tryRun("x;",1,1,8192,true);
         long afterDT = System.currentTimeMillis();
         System.out.println(afterDT-beforeDT);
-        Thread.sleep(5000);
+        sleep(5000);
         conn.run("y=1..10000000");
         long startDT = System.currentTimeMillis();
         conn.tryRun("y;",1,1,1000000,true);
@@ -3686,7 +3687,7 @@ public void test_TryRun_args_fetchSize() throws IOException, InterruptedExceptio
         conn.tryRun("sum",argus1,1,1,8192);
         long afterDT = System.currentTimeMillis();
         System.out.println(afterDT-beforeDT);
-        Thread.sleep(10000);
+        sleep(10000);
         List<Entity> argus2 = new ArrayList<>();
         conn.run("y=1..10000000");
         argus2.add(conn.run("y;"));
@@ -4289,7 +4290,7 @@ public void test_insert_into_decimal128_arrayvector() throws Exception {
     public void TestConnectWithoutUserid() throws IOException, InterruptedException {
         DBConnection conn = new DBConnection();
         conn.connect(HOST,PORT);
-        Thread.sleep(500);
+        sleep(500);
         assertEquals(true, conn.isConnected());
     }
     @Test
@@ -4308,7 +4309,7 @@ public void Test_connect_EnableHighAvailability_false() throws IOException, Inte
         }
         //DBConnection conn1 = new DBConnection();
         conn1.connect(HOST,PORT,"admin","123456",null,false);
-        Thread.sleep(500);
+        sleep(500);
         String e = null;
         try{
             conn1.run("a=1;\n a");
@@ -4318,14 +4319,14 @@ public void Test_connect_EnableHighAvailability_false() throws IOException, Inte
             System.out.println(ex);
         }
         assertNotNull(e);
-        Thread.sleep(1000);
+        sleep(1000);
         try{
             conn.run("startDataNode(\""+nodeAlias+"\")");
         }catch(Exception ex)
         {
             System.out.println(ex);
         }
-        Thread.sleep(1000);
+        sleep(1000);
         conn1.connect(HOST,PORT,"admin","123456",null,false);
         conn1.run("a=1;\n a");
         assertEquals(true, conn1.isConnected());
@@ -4345,7 +4346,7 @@ public void Test_connect_EnableHighAvailability_true() throws IOException, Inter
         {
             System.out.println(ex);
         }
-        Thread.sleep(1000);
+        sleep(1000);
         conn1.run("a=1;\n a");
         //The connection switches to a different node to execute the code
         try{
@@ -4354,7 +4355,7 @@ public void Test_connect_EnableHighAvailability_true() throws IOException, Inter
         {
             System.out.println(ex);
         }
-        Thread.sleep(1000);
+        sleep(1000);
         assertEquals(true, conn1.isConnected());
     }
     //@Test //AJ-287
@@ -4393,7 +4394,7 @@ public void Test_connect_EnableHighAvailability_true_1() throws IOException, Int
         {
             System.out.println(ex);
         }
-        Thread.sleep(1000);
+        sleep(1000);
         conn1.run("a=1;\n a");
         //The connection switches to a different node to execute the code
         try{
@@ -4402,7 +4403,7 @@ public void Test_connect_EnableHighAvailability_true_1() throws IOException, Int
         {
             System.out.println(ex);
         }
-        Thread.sleep(1000);
+        sleep(1000);
         assertEquals(true, conn1.isConnected());
     }
     @Test
@@ -4417,7 +4418,7 @@ public void Test_reConnect__true() throws IOException, InterruptedException {
         {
             System.out.println(ex);
         }
-        Thread.sleep(1000);
+        sleep(1000);
         conn1.run("a=1;\n a");
         //The connection switches to a different node to execute the code
         try{
@@ -4426,7 +4427,7 @@ public void Test_reConnect__true() throws IOException, InterruptedException {
         {
             System.out.println(ex);
         }
-        Thread.sleep(1000);
+        sleep(1000);
         assertEquals(true, conn1.isConnected());
     }
     @Test //reConnect is not valid
@@ -4441,7 +4442,7 @@ public void Test_reConnect__false() throws IOException, InterruptedException {
         {
             System.out.println(ex);
         }
-        Thread.sleep(1000);
+        sleep(1000);
         conn1.run("a=1;\n a");
         //The connection switches to a different node to execute the code
         try{
@@ -4450,7 +4451,7 @@ public void Test_reConnect__false() throws IOException, InterruptedException {
         {
             System.out.println(ex);
         }
-        Thread.sleep(1000);
+        sleep(1000);
         assertEquals(true, conn1.isConnected());
     }
     //@Test
@@ -4492,7 +4493,7 @@ public void test_BasicDBTask1223()throws Exception{
     public void Test_Connect_SqlStdEnum_DolphinDB() throws IOException, InterruptedException {
         DBConnection conn = new DBConnection(DolphinDB);
         conn.connect(HOST,PORT);
-        Thread.sleep(500);
+        sleep(500);
         assertEquals(true, conn.isConnected());
         BasicDoubleVector ba = (BasicDoubleVector)conn.run("cumavg(1 2 3);");
         System.out.println(ba.getString());
@@ -4510,7 +4511,7 @@ public void Test_Connect_SqlStdEnum_DolphinDB() throws IOException, InterruptedE
     public void Test_Connect_SqlStdEnum_DolphinDB_1() throws IOException, InterruptedException {
         DBConnection conn = new DBConnection();
         conn.connect(HOST,PORT);
-        Thread.sleep(500);
+        sleep(500);
         assertEquals(true, conn.isConnected());
         BasicDoubleVector ba = (BasicDoubleVector)conn.run("runSQL(\"cumavg(1 2 3)\", 'ddb')");
         System.out.println(ba.getString());
@@ -4528,7 +4529,7 @@ public void Test_Connect_SqlStdEnum_DolphinDB_1() throws IOException, Interrupte
     public void Test_Connect_SqlStdEnum_DolphinDB_2() throws IOException, InterruptedException {
         DBConnection conn = new DBConnection(DolphinDB);
         conn.connect(HOST,PORT);
-        Thread.sleep(500);
+        sleep(500);
         assertEquals(true, conn.isConnected());
         BasicDoubleVector ba = (BasicDoubleVector)conn.run("runSQL(\"cumavg(1 2 3)\", 'ddb')");
         System.out.println(ba.getString());
@@ -4567,7 +4568,7 @@ public void Test_Connect_SqlStdEnum_Oracle() throws IOException, InterruptedExce
         DBConnection conn = new DBConnection(Oracle);
         conn.connect(HOST,PORT);
         conn.connect(HOST,PORT);
-        Thread.sleep(500);
+        sleep(500);
         assertEquals(true, conn.isConnected());
         BasicDoubleVector ba = (BasicDoubleVector)conn.run("cumavg(1 2 3);");
         System.out.println(ba.getString());
@@ -4589,7 +4590,7 @@ public void Test_Connect_SqlStdEnum_Oracle_1() throws IOException, InterruptedEx
         DBConnection conn = new DBConnection();
         conn.connect(HOST,PORT);
         conn.connect(HOST,PORT);
-        Thread.sleep(500);
+        sleep(500);
         assertEquals(true, conn.isConnected());
         BasicDoubleVector ba = (BasicDoubleVector)conn.run("runSQL(\"cumavg(1 2 3)\", 'oracle');");
         System.out.println(ba.getString());
@@ -4611,7 +4612,7 @@ public void Test_Connect_SqlStdEnum_Oracle_2() throws IOException, InterruptedEx
         DBConnection conn = new DBConnection(Oracle);
         conn.connect(HOST,PORT);
         conn.connect(HOST,PORT);
-        Thread.sleep(500);
+        sleep(500);
         assertEquals(true, conn.isConnected());
         BasicDoubleVector ba = (BasicDoubleVector)conn.run("runSQL(\"cumavg(1 2 3)\", 'ddb');");
         System.out.println(ba.getString());
@@ -4632,7 +4633,7 @@ public void Test_Connect_SqlStdEnum_Oracle_2() throws IOException, InterruptedEx
     public void Test_Connect_SqlStdEnum_MySQL() throws IOException, InterruptedException {
         DBConnection conn = new DBConnection(MySQL);
         conn.connect(HOST,PORT);
-        Thread.sleep(500);
+        sleep(500);
         assertEquals(true, conn.isConnected());
         BasicDoubleVector ba = (BasicDoubleVector)conn.run("cumavg(1 2 3);");
         System.out.println(ba.getString());
@@ -4658,7 +4659,7 @@ public void Test_Connect_SqlStdEnum_MySQL() throws IOException, InterruptedExcep
     public void Test_Connect_SqlStdEnum_MySQL_1() throws IOException, InterruptedException {
         DBConnection conn = new DBConnection();
         conn.connect(HOST,PORT);
-        Thread.sleep(500);
+        sleep(500);
         assertEquals(true, conn.isConnected());
         BasicDoubleVector ba = (BasicDoubleVector)conn.run("runSQL(\"cumavg(1 2 3)\", 'mysql');");
         System.out.println(ba.getString());
@@ -4685,7 +4686,7 @@ public void Test_Connect_SqlStdEnum_MySQL_2() throws IOException, InterruptedExc
         DBConnection conn = new DBConnection(MySQL);
         conn.connect(HOST,PORT);
         conn.connect(HOST,PORT);
-        Thread.sleep(500);
+        sleep(500);
         assertEquals(true, conn.isConnected());
         BasicDoubleVector ba = (BasicDoubleVector)conn.run("runSQL(\"cumavg(1 2 3)\", 'ddb');");
         System.out.println(ba.getString());
@@ -4717,7 +4718,7 @@ public void Test_Connect_SqlStdEnum_getByName() throws IOException, InterruptedE
         DBConnection conn = new DBConnection( getByName("MySQL"));
         conn.connect(HOST,PORT);
         conn.connect(HOST,PORT);
-        Thread.sleep(500);
+        sleep(500);
         assertEquals(true, conn.isConnected());
         BasicDoubleVector ba = (BasicDoubleVector)conn.run("runSQL(\"cumavg(1 2 3)\", 'ddb');");
         System.out.println(ba.getString());
@@ -5092,4 +5093,45 @@ public void test_allDateType_array_combine() throws IOException {
 //        thread1.start();
 //        thread.join();
 //    }
+
+    @Test//api设置的parallelism小于server的setMaxJobParallelism
+    public void test_DBConnection_run_parallelism_1() throws IOException {
+        PrepareUser("parallelism_test","123456");
+        conn = new DBConnection();
+        conn.connect(HOST,PORT,"parallelism_test","123456");
+        conn.run("setMaxJobParallelism(\"parallelism_test\",22);",4,5,false);
+
+        DBConnection conn1 = new DBConnection();
+        conn1.connect(HOST,PORT,"parallelism_test","123456");
+        BasicTable re1 = (BasicTable)conn.run("getConsoleJobs();",4,5,false);
+        Assert.assertEquals("5",re1.getColumn(6).get(0).getString());
+    }
+    @Test//api设置的parallelism大于server的setMaxJobParallelism
+    public void test_DBConnection_run_parallelism_2() throws IOException {
+        PrepareUser("parallelism_test","123456");
+        conn = new DBConnection();
+        conn.connect(HOST,PORT,"parallelism_test","123456");
+        conn.run("setMaxJobParallelism(\"parallelism_test\",22);",4,30,false);
+
+        DBConnection conn1 = new DBConnection();
+        conn1.connect(HOST,PORT,"parallelism_test","123456");
+        BasicTable re1 = (BasicTable)conn1.run("getConsoleJobs();",5,30,false);
+        Assert.assertEquals("22",re1.getColumn(6).get(0).getString());
+    }
+
+    @Test//api没有设置parallelism，取默认值64，大于server的setMaxJobParallelism
+    public void test_DBConnection_run_parallelism_3() throws IOException, InterruptedException {
+        DBConnection conn = new DBConnection();
+        PrepareUser("parallelism_test","123456");
+        conn.connect(HOST,PORT,"parallelism_test","123456");
+        conn.run("setMaxJobParallelism(\"parallelism_test\",22);");
+        BasicTable re = (BasicTable)conn.run("getConsoleJobs();");
+        System.out.println(re.getString());
+
+        DBConnection conn1 = new DBConnection();
+        conn1.connect(HOST,PORT,"parallelism_test","123456");
+        BasicTable re1 = (BasicTable)conn1.run("getConsoleJobs();");
+        System.out.println(re1.getString());
+        Assert.assertEquals("22",re1.getColumn(6).get(0).getString());
+    }
 }

test/com/xxdb/Prepare.java

@@ -272,7 +272,7 @@ public static void PrepareStreamTableDecimal_array(String dataType, int scale) t
     public static void PrepareUser(String userName,String password) throws IOException {
         DBConnection conn = new DBConnection();
         conn.connect(HOST,PORT,"admin","123456");
-        conn.run("def create_user(){try{deleteUser(`"+userName+")}catch(ex){};createUser(`"+userName+", '"+password+"');};"+
+        conn.run("def create_user(){try{deleteUser(`"+userName+")}catch(ex){};createUser(`"+userName+", '"+password+"',,true);};"+
                 "rpc(getControllerAlias(),create_user);" );
     }