Merge remote-tracking branch 'origin/dev' into dev

Author: chengyitian

test/com/xxdb/route/AutoFitTableAppenderTest.java

@@ -2028,8 +2028,11 @@ public void Test_AutoFitTableAppender_streamTable_allDateType() throws IOExcepti
         script += "share t as st;";
         conn.run(script);
         BasicTable bt = (BasicTable)conn.run("table(true as cbool,'d' as cchar,86h as cshort,10 as cint,726l as clong,2021.09.23 as cdate,2021.10M as cmonth,14:55:26.903 as ctime,15:27m as cminute,14:27:35 as csecond,2018.11.11 11:11:11 as cdatetime,2010.09.29 11:35:47.295 as ctimestamp,12:25:45.284729843 as cnanotime,2018.09.15 15:32:32.734728902 as cnanotimestamp,5.7f as cfloat,0.86 as cdouble,\"single\" as cstring,datehour(2022.08.23 17:33:54.324) as cdatehour,blob(\"dolphindb\")as cblob,decimal32(19,2) as cdecimal32,decimal64(27,4) as cdecimal64,decimal128(27,10) as cdecimal128)");
+        long start = System.nanoTime();
         AutoFitTableAppender aftu = new AutoFitTableAppender("", "st", conn);
         aftu.append(bt);
+        long end = System.nanoTime();
+        System.out.println((end - start) / 1000000);
         BasicTable ua = (BasicTable)conn.run("select * from st;");
         Assert.assertEquals(4, ua.rows());
         BasicTable act = (BasicTable)conn.run("select * from st where cint = 10;");
@@ -2038,8 +2041,8 @@ public void Test_AutoFitTableAppender_streamTable_allDateType() throws IOExcepti
     }
     @Test
     public void Test_AutoFitTableAppender_streamTable_allDateType_1() throws IOException {
-        String script = "n=100;\n";
-        script += "intv = 1..100;\n";
+        String script = "n=5000000;\n";
+        script += "intv = 1..5000000;\n";
         script += "uuidv = rand(rand(uuid(), 10) join take(uuid(), 4), n);\n";
         script += "ippaddrv = rand(rand(ipaddr(), 1000) join take(ipaddr(), 4), n)\n";
         script += "int128v = rand(rand(int128(), 1000) join take(int128(), 4), n);\n";
@@ -2049,12 +2052,25 @@ public void Test_AutoFitTableAppender_streamTable_allDateType_1() throws IOExcep
         script += "t1 = table(100:0,`intv`uuidv`ippaddrv`int128v`complexv`pointv,[INT,UUID,IPADDR,INT128,COMPLEX,POINT])\n";
         conn.run(script);
         BasicTable bt = (BasicTable)conn.run("select * from t");
+        BasicTable bt1 = (BasicTable)conn.run("select top 10 * from t");
         AutoFitTableAppender aftu = new AutoFitTableAppender("", "t1", conn);
-        aftu.append(bt);
+        long start = System.nanoTime();
+        Entity re = aftu.append(bt);
+        assertEquals("5000000",re.getString());
+        long end = System.nanoTime();
+        System.out.println((end - start) / 1000000);
+        assertEquals(true,((end - start) / 1000000)<5000);
+        for(int i=0;i<10;i++){
+            Entity re1 = aftu.append(bt1);
+            assertEquals("10",re1.getString());
+        }
+        long end1 = System.nanoTime();
+        System.out.println((end1 - end)/ 10000000);
+        assertEquals(true,((end1 - end)/ 10000000)<2);
         BasicTable ua = (BasicTable)conn.run("select * from t1;");
-        Assert.assertEquals(100, ua.rows());
-        BasicTable act = (BasicTable)conn.run("select * from t");
-        compareBasicTable(bt, act);
+        assertEquals(5000100, ua.rows());
+        BasicTable ua1 = (BasicTable)conn.run("select * from t1 limit 5000000;");
+        compareBasicTable(bt, ua1);
     }
     @Test
     public void Test_AutoFitTableAppender_DfsTable_allDateType() throws IOException {
@@ -2444,7 +2460,6 @@ public void Test_AutoFitTableAppender_dateType_not_match() throws IOException {
         aftu.append(bt);
         BasicTable bt10 = (BasicTable) conn.run("select * from pt;");
         assertEquals(0, bt10.rows());
-
     }
 
 }

test/com/xxdb/route/AutoFitTableUpsertTest.java

@@ -1691,4 +1691,39 @@ public void test_AutoFitTableUpsert_allDataType_array_null() throws Exception {
         assertEquals(0, bt.rows());
         conn.close();
     }
+    @Test
+    public void Test_AutoFitTableAppender_streamTable_allDateType_11() throws Exception {
+        String script = "n=5000000;\n";
+        script += "intv = 1..5000000;\n";
+        script += "uuidv = rand(rand(uuid(), 10) join take(uuid(), 4), n);\n";
+        script += "ippaddrv = rand(rand(ipaddr(), 1000) join take(ipaddr(), 4), n)\n";
+        script += "int128v = rand(rand(int128(), 1000) join take(int128(), 4), n);\n";
+        script += "complexv = rand(complex(rand(100, 1000), rand(100, 1000)) join NULL, n);\n";
+        script += "pointv = rand(point(rand(100, 1000), rand(100, 1000)) join NULL, n);\n";
+        script += " share table(intv,uuidv,ippaddrv,int128v,complexv,pointv) as tt\n";
+        script += "t1=keyedTable(`intv,100:0,`intv`uuidv`ippaddrv`int128v`complexv`pointv,[INT,UUID,IPADDR,INT128,COMPLEX,POINT])\n";
+
+        conn.run(script);
+        BasicTable bt = (BasicTable)conn.run("select * from tt");
+        BasicTable bt1 = (BasicTable)conn.run("select top 10 *  from tt");
+        AutoFitTableUpsert aftu = new AutoFitTableUpsert("","t1",conn,true,null,null);
+
+        long start = System.nanoTime();
+        int re = aftu.upsert(bt);
+        assertEquals(0,re);
+        long end = System.nanoTime();
+        System.out.println((end - start) / 1000000);
+        assertEquals(true,((end - start) / 1000000)<5000);
+        for(int i=0;i<10;i++) {
+            int re1 = aftu.upsert(bt1);
+            assertEquals( 0,re1);
+        }
+        aftu.upsert(bt1);
+        long end1 = System.nanoTime();
+        System.out.println((end1 - end));
+        assertEquals(true,((end1 - end)/ 10000000)<2);
+
+        BasicTable ua = (BasicTable)conn.run("select * from t1;");
+        assertEquals(5000000, ua.rows());
+    }
 }

test/com/xxdb/streaming/client/cep/EventSenderTest.java

@@ -1000,7 +1000,7 @@ public  void test_EventSender_connect_not_connect() throws IOException, Interrup
         }catch(Exception ex){
             re = ex.getMessage();
         }
-        Assert.assertEquals("The connection to dolphindb has not been established.",re);
+        Assert.assertEquals("Couldn't send script/function to the remote host because the connection has been closed",re);
     }
     @Test
     public  void test_EventSender_connect_duplicated() throws IOException, InterruptedException {

test/com/xxdb/streaming/reverse/PollingClientReverseTest.java

@@ -1865,7 +1865,7 @@ public void test_PollingClient_subscribe_backupSites_not_true()throws IOExceptio
         }catch(Exception ex){
             re = ex.getMessage();
         }
-        Assert.assertEquals("The format of backupSite 192.168.0.69,18921 is incorrect, should be host:port, e.g. 192.168.1.1:8848", re);
+        Assert.assertEquals("The format of backupSite "+HOST+","+PORT+" is incorrect, should be host:port, e.g. 192.168.1.1:8848", re);
     }
 
     @Test(timeout = 120000)

test/com/xxdb/streaming/reverse/ThreadPooledClientReverseTest.java

@@ -1703,7 +1703,7 @@ public void Test_ThreadPooledClient_subscribe_backupSites_not_true()throws IOExc
         }catch(Exception ex){
             re = ex.getMessage();
         }
-        Assert.assertEquals("The format of backupSite 192.168.0.69,18921 is incorrect, should be host:port, e.g. 192.168.1.1:8848", re);
+        Assert.assertEquals("The format of backupSite "+HOST+","+PORT+" is incorrect, should be host:port, e.g. 192.168.1.1:8848", re);
     }
 
     @Test(timeout = 120000)

test/com/xxdb/streaming/reverse/ThreadedClientsubscribeReverseTest.java

@@ -3241,7 +3241,7 @@ public void test_ThreadClient_subscribe_backupSites_not_true()throws IOException
         }catch(Exception ex){
             re = ex.getMessage();
         }
-        Assert.assertEquals("The format of backupSite 192.168.0.69,18921 is incorrect, should be host:port, e.g. 192.168.1.1:8848", re);
+        Assert.assertEquals("The format of backupSite "+HOST+","+PORT+" is incorrect, should be host:port, e.g. 192.168.1.1:8848", re);
     }
 
     @Test(timeout = 120000)