Skip to content

Commit 951a625

Browse files
author
lucaijun
committed
Merge remote-tracking branch 'origin/dev' into dev
2 parents 0ff06c5 + 16fe6d4 commit 951a625

5 files changed

Lines changed: 58 additions & 7 deletions

File tree

‎test/com/xxdb/DBConnectionTest.java‎

Lines changed: 50 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4280,4 +4280,54 @@ public void test_DBConnection_upload_illegal_string() throws IOException {
42804280
assertEquals("", table2.getColumn(3).get(1).getString());
42814281
assertEquals("blob1AMZN", table2.getColumn(3).get(2).getString());
42824282
}
4283+
@Test
4284+
public void test_connection_enableSeqNo_true() throws Exception {
4285+
DBConnection connection = new DBConnection(false, false, false);
4286+
connection.connect(HOST, PORT, "admin", "123456",
4287+
"", true, ipports);
4288+
connection.run("\n" +
4289+
"dbPath = \"dfs://tableUpsert_test\"\n" +
4290+
"if(existsDatabase(dbPath)){\n" +
4291+
"\tdropDatabase(dbPath)\n" +
4292+
"}\n" +
4293+
"t = table(100:1, `id`id2`value, `INT`INT`INT)\n" +
4294+
"db = database(dbPath, RANGE,1 50 10000)\n" +
4295+
"pt1 = db.createPartitionedTable(t,`pt1,`id).append!(t)\n" +
4296+
"pt = db.createPartitionedTable(t,`pt,`id).append!(t)");
4297+
BasicTable ex = (BasicTable)connection.run("t=table( take(1..3000,3000) as id, 1..3000 as id2, 1..3000 as value);t;",null,4, 4, 0, false,"", true);
4298+
for(int i = 0; i < 10; i++){
4299+
connection.run("pt = loadTable(\"dfs://tableUpsert_test\",\"pt\"); pt.append!(t) ; pt1 = loadTable(\"dfs://tableUpsert_test\",\"pt1\"); pt1.append!(t) ;",null,4, 4, 0, false,"", true);
4300+
}
4301+
BasicTable res1 = (BasicTable) connection.run("select * from loadTable(\"dfs://tableUpsert_test\",\"pt\")");
4302+
BasicTable res2 = (BasicTable) connection.run("select * from loadTable(\"dfs://tableUpsert_test\",\"pt1\")");
4303+
assertEquals(30000, res1.rows());
4304+
assertEquals(30000, res1.rows());
4305+
connection.close();
4306+
}
4307+
4308+
@Test
4309+
public void test_connection_enableSeqNo_false() throws Exception {
4310+
DBConnection connection = new DBConnection(false, false, false);
4311+
connection.connect(HOST, PORT, "admin", "123456",
4312+
"", true, ipports);
4313+
connection.run("\n" +
4314+
"dbPath = \"dfs://tableUpsert_test\"\n" +
4315+
"if(existsDatabase(dbPath)){\n" +
4316+
"\tdropDatabase(dbPath)\n" +
4317+
"}\n" +
4318+
"t = table(100:1, `id`id2`value, `INT`INT`INT)\n" +
4319+
"db = database(dbPath, RANGE,1 50 10000)\n" +
4320+
"pt1 = db.createPartitionedTable(t,`pt1,`id).append!(t)\n" +
4321+
"pt = db.createPartitionedTable(t,`pt,`id).append!(t)");
4322+
BasicTable ex = (BasicTable)connection.run("t=table( take(1..3000,3000) as id, 1..3000 as id2, 1..3000 as value);t;",null,4, 4, 0, false,"", false);
4323+
for(int i = 0; i < 10; i++){
4324+
connection.run("pt = loadTable(\"dfs://tableUpsert_test\",\"pt\"); pt.append!(t) ; pt1 = loadTable(\"dfs://tableUpsert_test\",\"pt1\"); pt1.append!(t) ;",null,4, 4, 0, false,"", false);
4325+
}
4326+
BasicTable res1 = (BasicTable) connection.run("select * from loadTable(\"dfs://tableUpsert_test\",\"pt\")");
4327+
BasicTable res2 = (BasicTable) connection.run("select * from loadTable(\"dfs://tableUpsert_test\",\"pt1\")");
4328+
assertEquals(30000, res1.rows());
4329+
assertEquals(30000, res1.rows());
4330+
connection.close();
4331+
}
4332+
42834333
}

‎test/com/xxdb/LoadBalanceTest.java‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -313,7 +313,7 @@ public void Test_getConnection_enableHighAvailability_false_1() throws SQLExcept
313313
list.add(conn);
314314
}
315315
DBConnection connection1 = new DBConnection();
316-
connection1.connect(HOST, PORT, "admin", "123456",true);
316+
connection1.connect(HOST, controller_port, "admin", "123456",true);
317317
BasicTable re = (BasicTable)connection1.run("select port ,connectionNum from rpc(getControllerAlias(),getClusterPerf) where mode= 0");
318318
for (int i = 0; i < re.rows(); i++) {
319319
System.out.println("port:"+ re.getColumn(0).get(i)+" connectionNum:"+re.getColumn(1).get(i));
@@ -341,7 +341,7 @@ public void Test_getConnection_enableHighAvailability_true_site_null_all_note_lo
341341
System.out.println("port:"+ re.getColumn(0).get(i)+" connectionNum:"+re.getColumn(1).get(i));
342342
String port = re.getColumn(0).get(i).toString();
343343
String connectionNum = re.getColumn(1).get(i).toString();
344-
assertEquals(true,Integer.valueOf(connectionNum)>25);
344+
assertEquals(true,Integer.valueOf(connectionNum)>=20);
345345
assertEquals(true,Integer.valueOf(connectionNum)<50);
346346
}
347347
}
@@ -429,7 +429,7 @@ public void Test_getConnection_enableHighAvailability_true_enableLoadBalance_fal
429429
System.out.println("port:" + re.getColumn(0).get(i) + " connectionNum:" + re.getColumn(1).get(i));
430430
String port = re.getColumn(0).get(i).toString();
431431
String connectionNum = re.getColumn(1).get(i).toString();
432-
if(Integer.valueOf(port)!=port1) {
432+
if(Integer.valueOf(port)==port1) {
433433
assertEquals(true, Integer.valueOf(connectionNum) >= 100);
434434
}
435435
}
@@ -449,7 +449,7 @@ public void Test_getConnection_enableHighAvailability_true_enableLoadBalance_tru
449449
System.out.println("port:" + re.getColumn(0).get(i) + " connectionNum:" + re.getColumn(1).get(i));
450450
String port = re.getColumn(0).get(i).toString();
451451
String connectionNum = re.getColumn(1).get(i).toString();
452-
assertEquals(true, Integer.valueOf(connectionNum) > 25);
452+
assertEquals(true, Integer.valueOf(connectionNum) >= 20);
453453
assertEquals(true, Integer.valueOf(connectionNum) < 50);
454454
}
455455
}

‎test/com/xxdb/compatibility_testing/release130/MultithreadedTableWriterTest.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4140,7 +4140,7 @@ public void test_mtw_concurrentWrite_hash_Symbol_partition_table() throws Except
41404140
// assertEquals(1000000,result.getLong());
41414141
// }
41424142

4143-
@Test(timeout = 120000)
4143+
@Test(timeout = 200000)
41444144
public void test_mtw_concurrentWrite_getFailedData() throws Exception {
41454145
conn.run("login(`admin,`123456)\n" +
41464146
"dbName = \"dfs://test_mtw_concurrentWrite_getFailedData1\"\n" +

‎test/com/xxdb/compatibility_testing/release130/data/UtilsTest.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -134,7 +134,7 @@ public void test_getCategory(){
134134
assertEquals(Entity.DATA_CATEGORY.BINARY,Utils.getCategory(Entity.DATA_TYPE.DT_IPADDR));
135135
assertEquals(Entity.DATA_CATEGORY.MIXED,Utils.getCategory(Entity.DATA_TYPE.DT_ANY));
136136
assertEquals(Entity.DATA_CATEGORY.NOTHING,Utils.getCategory(Entity.DATA_TYPE.DT_VOID));
137-
assertEquals(Entity.DATA_CATEGORY.SYSTEM,Utils.getCategory(Entity.DATA_TYPE.DT_BLOB));
137+
assertEquals(Entity.DATA_CATEGORY.LITERAL,Utils.getCategory(Entity.DATA_TYPE.DT_BLOB));
138138
assertEquals(Entity.DATA_CATEGORY.INTEGRAL,Utils.getCategory(Entity.DATA_TYPE.DT_INT));
139139
}
140140

‎test/com/xxdb/data/UtilsTest.java‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@
88
import java.io.IOException;
99
import java.nio.ByteBuffer;
1010

11+
import java.sql.Timestamp;
1112
import java.text.SimpleDateFormat;
1213
import java.time.LocalDate;
1314
import java.time.LocalTime;
@@ -135,7 +136,7 @@ public void test_getCategory(){
135136
assertEquals(Entity.DATA_CATEGORY.BINARY,Utils.getCategory(Entity.DATA_TYPE.DT_IPADDR));
136137
assertEquals(Entity.DATA_CATEGORY.MIXED,Utils.getCategory(Entity.DATA_TYPE.DT_ANY));
137138
assertEquals(Entity.DATA_CATEGORY.NOTHING,Utils.getCategory(Entity.DATA_TYPE.DT_VOID));
138-
assertEquals(Entity.DATA_CATEGORY.SYSTEM,Utils.getCategory(Entity.DATA_TYPE.DT_BLOB));
139+
assertEquals(Entity.DATA_CATEGORY.LITERAL,Utils.getCategory(Entity.DATA_TYPE.DT_BLOB));
139140
assertEquals(Entity.DATA_CATEGORY.INTEGRAL,Utils.getCategory(Entity.DATA_TYPE.DT_INT));
140141
}
141142

0 commit comments

Comments
 (0)