Skip to content

Commit 7682e7a

Browse files
author
chengyitian
committed
Merge remote-tracking branch 'origin/dev' into dev
2 parents a054c80 + 43dc47e commit 7682e7a

File tree

3 files changed

+628
-192
lines changed

3 files changed

+628
-192
lines changed

‎test/com/xxdb/MultithreadedTableWriterTest.java

Lines changed: 24 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -6270,7 +6270,7 @@ public void test_insert_arrayVector_decimal128_to_memory_table()throws Exceptio
62706270
}
62716271
@Test(timeout = 120000)
62726272
public void test_MultithreadedTableWriter_Callback_memoryTable_single_thread_true()throws Exception {
6273-
DBConnection conn= new DBConnection(false, false, false, true);
6273+
DBConnection conn= new DBConnection(false, false, false, false);
62746274
conn.connect(HOST, PORT, "admin", "123456");
62756275
conn.run("share table(100:0, [`col0], [INT]) as table1");
62766276
Callback callbackHandler = new Callback(){
@@ -6305,18 +6305,10 @@ public void writeCompletion(Table callbackTable){
63056305

63066306
}
63076307
@Test(timeout = 120000)
6308-
public void test_run()throws Exception {
6309-
DBConnection conn= new DBConnection(false, false, false, true);
6310-
conn.connect(HOST, PORT, "admin", "123456");
6311-
DBConnection conn1= new DBConnection(false, false, false, true);
6312-
conn1.connect(CONTROLLER_HOST, CONTROLLER_PORT, "admin", "123456");
6313-
conn.run("share table(100:0, [`col0], [INT]) as table1");
6314-
}
6315-
@Test(timeout = 120000)
63166308
public void test_MultithreadedTableWriter_Callback_memoryTable_single_thread_false()throws Exception {
6317-
DBConnection conn= new DBConnection(false, false, false, true);
6309+
DBConnection conn= new DBConnection(false, false, false, false);
63186310
conn.connect(HOST, PORT, "admin", "123456");
6319-
DBConnection conn1= new DBConnection(false, false, false, true);
6311+
DBConnection conn1= new DBConnection(false, false, false, false);
63206312
conn1.connect(CONTROLLER_HOST, CONTROLLER_PORT, "admin", "123456");
63216313
conn.run("share table(100:0, [`col0], [INT]) as table1");
63226314
Callback callbackHandler = new Callback(){
@@ -6364,7 +6356,7 @@ public void writeCompletion(Table callbackTable){
63646356
}
63656357
@Test(timeout = 120000)
63666358
public void test_MultithreadedTableWriter_Callback_dfs_multiple_thread_true()throws Exception {
6367-
DBConnection conn= new DBConnection(false, false, false, true);
6359+
DBConnection conn= new DBConnection(false, false, false, false);
63686360
conn.connect(HOST, PORT, "admin", "123456");
63696361
StringBuilder sb = new StringBuilder();
63706362
sb.append("dbName = 'dfs://test_MultithreadedTableWriter';\n" +
@@ -6432,9 +6424,9 @@ public void writeCompletion(Table callbackTable) {
64326424
}
64336425
@Test(timeout = 120000)
64346426
public void test_MultithreadedTableWriter_Callback_dfs_multiple_thread_false()throws Exception {
6435-
DBConnection conn= new DBConnection(false, false, false, true);
6427+
DBConnection conn= new DBConnection(false, false, false, false);
64366428
conn.connect(HOST, PORT, "admin", "123456");
6437-
DBConnection conn1= new DBConnection(false, false, false, true);
6429+
DBConnection conn1= new DBConnection(false, false, false, false);
64386430
conn1.connect(CONTROLLER_HOST, CONTROLLER_PORT, "admin", "123456");
64396431
StringBuilder sb = new StringBuilder();
64406432
sb.append("dbName = \"dfs://test_MultithreadedTableWriter\";\n" +
@@ -6501,7 +6493,7 @@ public void writeCompletion(Table callbackTable) {
65016493
System.out.println(ex.getMessage());
65026494
}
65036495
conn1.run("sleep(1000)");
6504-
DBConnection conn2= new DBConnection(false, false, false, true);
6496+
DBConnection conn2= new DBConnection(false, false, false, false);
65056497
conn2.connect(HOST, PORT, "admin", "123456");
65066498
conn1.run("sleep(1000)");
65076499
System.out.println("callback rows"+callback.rows());
@@ -6523,7 +6515,7 @@ public void writeCompletion(Table callbackTable) {
65236515
}
65246516
@Test(timeout = 120000)
65256517
public void test_MultithreadedTableWriter_Callback_dfs_single_thread_true()throws Exception {
6526-
DBConnection conn= new DBConnection(false, false, false, true);
6518+
DBConnection conn= new DBConnection(false, false, false, false);
65276519
conn.connect(HOST, PORT, "admin", "123456");
65286520
StringBuilder sb = new StringBuilder();
65296521
sb.append("dbName = 'dfs://test_MultithreadedTableWriter';\n" +
@@ -6591,9 +6583,9 @@ public void writeCompletion(Table callbackTable) {
65916583
}
65926584
@Test(timeout = 200000)
65936585
public void test_MultithreadedTableWriter_Callback_dfs_single_thread_false()throws Exception {
6594-
DBConnection conn= new DBConnection(false, false, false, true);
6586+
DBConnection conn= new DBConnection(false, false, false, false);
65956587
conn.connect(HOST, PORT, "admin", "123456");
6596-
DBConnection conn1= new DBConnection(false, false, false, true);
6588+
DBConnection conn1= new DBConnection(false, false, false, false);
65976589
conn1.connect(CONTROLLER_HOST, CONTROLLER_PORT, "admin", "123456");
65986590
StringBuilder sb = new StringBuilder();
65996591
sb.append("dbName = 'dfs://test_MultithreadedTableWriter';\n" +
@@ -6661,7 +6653,7 @@ public void writeCompletion(Table callbackTable) {
66616653
System.out.println(ex.getMessage());
66626654
}
66636655
conn1.run("sleep(5000)");
6664-
DBConnection conn2= new DBConnection(false, false, false, true);
6656+
DBConnection conn2= new DBConnection(false, false, false, false);
66656657
conn2.connect(HOST, PORT, "admin", "123456");
66666658
conn1.run("sleep(1000)");
66676659
System.out.println("callback rows"+callback.rows());
@@ -6683,7 +6675,7 @@ public void writeCompletion(Table callbackTable) {
66836675

66846676
@Test(timeout = 120000)
66856677
public void test_MultithreadedTableWriter_Callback_dfs_multiple_thread_true_bigData()throws Exception {
6686-
DBConnection conn= new DBConnection(false, false, false, true);
6678+
DBConnection conn= new DBConnection(false, false, false, false);
66876679
conn.connect(HOST, PORT, "admin", "123456");
66886680
StringBuilder sb = new StringBuilder();
66896681
sb.append("dbName = 'dfs://test_MultithreadedTableWriter';\n" +
@@ -6753,9 +6745,9 @@ public void writeCompletion(Table callbackTable) {
67536745
}
67546746
@Test(timeout = 120000)
67556747
public void test_MultithreadedTableWriter_Callback_dfs_multiple_thread_false_bigData()throws Exception {
6756-
DBConnection conn= new DBConnection(false, false, false, true);
6748+
DBConnection conn= new DBConnection(false, false, false, false);
67576749
conn.connect(HOST, PORT, "admin", "123456");
6758-
DBConnection conn1= new DBConnection(false, false, false, true);
6750+
DBConnection conn1= new DBConnection(false, false, false, false);
67596751
conn1.connect(CONTROLLER_HOST, CONTROLLER_PORT, "admin", "123456");
67606752
StringBuilder sb = new StringBuilder();
67616753
sb.append("dbName = 'dfs://test_MultithreadedTableWriter';\n" +
@@ -6822,7 +6814,7 @@ public void writeCompletion(Table callbackTable) {
68226814
System.out.println(ex.getMessage());
68236815
}
68246816
conn1.run("sleep(2000)");
6825-
DBConnection conn2= new DBConnection(false, false, false, true);
6817+
DBConnection conn2= new DBConnection(false, false, false, false);
68266818
conn2.connect(HOST, PORT, "admin", "123456");
68276819
conn1.run("sleep(2000)");
68286820
System.out.println("callback rows"+callback.rows());
@@ -6846,9 +6838,9 @@ public void writeCompletion(Table callbackTable) {
68466838

68476839
@Test(timeout = 120000)
68486840
public void test_MultithreadedTableWriter_Callback_dfs_single_thread_false_insertUnwrittenData()throws Exception {
6849-
DBConnection conn= new DBConnection(false, false, false, true);
6841+
DBConnection conn= new DBConnection(false, false, false, false);
68506842
conn.connect(HOST, PORT, "admin", "123456");
6851-
DBConnection conn1= new DBConnection(false, false, false, true);
6843+
DBConnection conn1= new DBConnection(false, false, false, false);
68526844
conn1.connect(CONTROLLER_HOST, CONTROLLER_PORT, "admin", "123456");
68536845
StringBuilder sb = new StringBuilder();
68546846
sb.append("dbName = 'dfs://test_MultithreadedTableWriter';\n" +
@@ -6913,7 +6905,7 @@ public void writeCompletion(Table callbackTable) {
69136905
System.out.println(ex.getMessage());
69146906
}
69156907
conn1.run("sleep(1000)");
6916-
DBConnection conn2= new DBConnection(false, false, false, true);
6908+
DBConnection conn2= new DBConnection(false, false, false, false);
69176909
conn2.connect(HOST, PORT, "admin", "123456");
69186910
conn1.run("sleep(1000)");
69196911
System.out.println("callback rows"+callback.rows());
@@ -6945,9 +6937,9 @@ public void writeCompletion(Table callbackTable) {
69456937

69466938
// @Test
69476939
// public void test_MultithreadedTableWriter_Callback_dfs_multiple_thread_false_insertUnwrittenData()throws Exception {
6948-
// DBConnection conn= new DBConnection(false, false, false, true);
6940+
// DBConnection conn= new DBConnection(false, false, false, false);
69496941
// conn.connect(HOST, PORT, "admin", "123456");
6950-
// DBConnection conn1= new DBConnection(false, false, false, true);
6942+
// DBConnection conn1= new DBConnection(false, false, false, false);
69516943
// conn1.connect(CONTROLLER_HOST, CONTROLLER_PORT, "admin", "123456");
69526944
// StringBuilder sb = new StringBuilder();
69536945
// sb.append("dbName = 'dfs://test_MultithreadedTableWriter';\n" +
@@ -7014,7 +7006,7 @@ public void writeCompletion(Table callbackTable) {
70147006
// System.out.println(ex.getMessage());
70157007
// }
70167008
// conn1.run("sleep(1000)");
7017-
// DBConnection conn2= new DBConnection(false, false, false, true);
7009+
// DBConnection conn2= new DBConnection(false, false, false, false);
70187010
// conn2.connect(HOST, PORT, "admin", "123456");
70197011
// conn1.run("sleep(1000)");
70207012
// System.out.println("callback rows"+callback.rows());
@@ -7192,7 +7184,7 @@ public void test_MultithreadedTableWriter_illegal_string_1() throws Exception {
71927184
}
71937185
@Test(timeout = 200000)
71947186
public void test_MultithreadedTableWriter_write_block()throws Exception {
7195-
DBConnection conn= new DBConnection(false, false, false, true);
7187+
DBConnection conn= new DBConnection(false, false, false, false);
71967188
conn.connect(HOST, PORT, "admin", "123456");
71977189
StringBuilder sb = new StringBuilder();
71987190
sb.append("dbName = 'dfs://test_MultithreadedTableWriter';\n" +
@@ -7263,9 +7255,9 @@ public void writeCompletion(Table callbackTable) {
72637255

72647256
//@Test
72657257
public void test_MultithreadedTableWriter_write_block_1()throws Exception {
7266-
DBConnection conn= new DBConnection(false, false, false, true);
7258+
DBConnection conn= new DBConnection(false, false, false, false);
72677259
conn.connect(HOST, PORT, "admin", "123456");
7268-
DBConnection conn1= new DBConnection(false, false, false, true);
7260+
DBConnection conn1= new DBConnection(false, false, false, false);
72697261
conn1.connect(CONTROLLER_HOST, CONTROLLER_PORT, "admin", "123456");
72707262
StringBuilder sb = new StringBuilder();
72717263
sb.append("dbName = 'dfs://test_MultithreadedTableWriter';\n" +

0 commit comments

Comments
 (0)