Skip to content

Commit 236c6dd

Browse files
weisun123weisun123
committed
fix broken case
1 parent 85f45e1 commit 236c6dd

File tree

7 files changed

+23
-19
lines changed

7 files changed

+23
-19
lines changed

‎test/com/xxdb/ConnectionPoolTest.java

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -555,13 +555,13 @@ public void testHashRangeDateTime() throws Exception {
555555
for (int i =0 ;i<10000;i++)
556556
sym.setString(i, "dss");
557557
cols.add(sym);
558-
for (int i =0 ;i<1000;i++) {
558+
for (int i =0 ;i<10;i++) {
559559
int m = appender.append(new BasicTable(colNames, cols));
560560
assertEquals(10000,m);
561561
}
562562
BasicLong re = (BasicLong) conn.run("pt= loadTable(\"dfs://demohash\",`pt)\n" +
563563
"exec count(*) from pt");
564-
assertEquals(10000000,re.getLong());
564+
assertEquals(100000,re.getLong());
565565

566566
BasicTable table = (BasicTable)conn.run("select * from loadTable(\"dfs://demohash\",`pt)");
567567
assertEquals(date.getString(),table.getColumn("date").getString());
@@ -1944,10 +1944,10 @@ public void test_pool_execute_timeout_10000() throws Exception {
19441944
"admin", "123456", 3, false, true,
19451945
ipports,"", false, false, false);
19461946
long start = System.nanoTime();
1947-
connectionPool.execute(new BasicDBTask("sleep(10000);"), 10000);
1947+
connectionPool.execute(new BasicDBTask("sleep(10000);sleep(10000);"), 10000);
19481948
long end = System.nanoTime();
19491949
System.out.println((end - start) / 1000000);
1950-
assertEquals(true,(end - start) / 1000000>10000);
1950+
assertEquals(true,(end - start) / 1000000>=10000);
19511951
connectionPool.waitForThreadCompletion();
19521952
connectionPool.shutdown();
19531953
}

‎test/com/xxdb/MultithreadedTableWriterTest.java

Lines changed: 12 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -675,7 +675,7 @@ public void test_insert_type_diffwith_table() throws Exception {
675675
"", "t1", false, false, null, 1, 1,
676676
1, "date");
677677
ErrorCodeInfo pErrorInfo = mutithreadTableWriter_.insert( 1, "2012.01.02");
678-
assertEquals("Invalid object error java.lang.RuntimeException: Failed to insert data. Cannot convert String to DT_DATE.",pErrorInfo.getErrorInfo());
678+
assertEquals("Invalid object error when create scalar for column 'date': Failed to insert data. Cannot convert String to DT_DATE.",pErrorInfo.getErrorInfo());
679679
assertEquals("A1",pErrorInfo.getErrorCode());
680680
assertEquals(true,pErrorInfo.hasError());
681681
assertEquals(false,pErrorInfo.succeed());
@@ -1605,7 +1605,7 @@ public void test_insert_time_date_to_nanotime() throws Exception {
16051605
1, "date");
16061606
for (int i = 0; i < 8; i++) {
16071607
ErrorCodeInfo pErrorInfo = mutithreadTableWriter_.insert( DT, DT);
1608-
assertEquals("code=A1 info=Invalid object error java.lang.RuntimeException: Failed to insert data. Cannot convert Calendar to DT_NANOTIME.",pErrorInfo.toString());
1608+
assertEquals("code=A1 info=Invalid object error when create scalar for column 'nanotime': Failed to insert data. Cannot convert Calendar to DT_NANOTIME.",pErrorInfo.toString());
16091609
}
16101610
mutithreadTableWriter_.waitForThreadCompletion();
16111611
conn.run("undef(`t1,SHARED)");
@@ -1626,7 +1626,7 @@ public void test_insert_time_date_to_nanotimestamp() throws Exception {
16261626
1, "date");
16271627
for (int i = 0; i < 8; i++) {
16281628
ErrorCodeInfo pErrorInfo = mutithreadTableWriter_.insert( DT, DT);
1629-
assertEquals("code=A1 info=Invalid object error java.lang.RuntimeException: Failed to insert data. Cannot convert Calendar to DT_NANOTIMESTAMP.",pErrorInfo.toString());
1629+
assertEquals("code=A1 info=Invalid object error when create scalar for column 'nanotimestamp': Failed to insert data. Cannot convert Calendar to DT_NANOTIMESTAMP.",pErrorInfo.toString());
16301630
}
16311631
mutithreadTableWriter_.waitForThreadCompletion();
16321632
conn.run("undef(`t1,SHARED)");
@@ -6494,13 +6494,14 @@ public void writeCompletion(Table callbackTable) {
64946494
}
64956495
System.out.println(mtw.getStatus().toString());
64966496
mtw.waitForThreadCompletion();
6497+
conn1.run("sleep(5000)");
64976498
try{conn1.run("startDataNode([\""+HOST+":"+PORT+"\"])");
64986499

64996500
}
65006501
catch(IOException ex) {
65016502
System.out.println(ex.getMessage());
65026503
}
6503-
conn1.run("sleep(1000)");
6504+
conn1.run("sleep(8000)");
65046505
DBConnection conn2= new DBConnection(false, false, false, false);
65056506
conn2.connect(HOST, PORT, "admin", "123456");
65066507
conn1.run("sleep(1000)");
@@ -6654,12 +6655,13 @@ public void writeCompletion(Table callbackTable) {
66546655
Assert.assertEquals(true,mtw.getStatus().sendFailedRows>0);
66556656
//Assert.assertEquals(true,mtw.getStatus().unsentRows==0);
66566657
mtw.waitForThreadCompletion();
6658+
conn1.run("sleep(5000)");
66576659
try{conn1.run("startDataNode([\""+HOST+":"+PORT+"\"])");
66586660
}
66596661
catch(IOException ex) {
66606662
System.out.println(ex.getMessage());
66616663
}
6662-
conn1.run("sleep(5000)");
6664+
conn1.run("sleep(8000)");
66636665
DBConnection conn2= new DBConnection(false, false, false, false);
66646666
conn2.connect(HOST, PORT, "admin", "123456");
66656667
conn1.run("sleep(1000)");
@@ -6814,13 +6816,14 @@ public void writeCompletion(Table callbackTable) {
68146816
}
68156817
}
68166818
mtw.waitForThreadCompletion();
6819+
conn1.run("sleep(5000)");
68176820
try{conn1.run("startDataNode([\""+HOST+":"+PORT+"\"])");
68186821

68196822
}
68206823
catch(IOException ex) {
68216824
System.out.println(ex.getMessage());
68226825
}
6823-
conn1.run("sleep(2000)");
6826+
conn1.run("sleep(8000)");
68246827
DBConnection conn2= new DBConnection(false, false, false, false);
68256828
conn2.connect(HOST, PORT, "admin", "123456");
68266829
conn1.run("sleep(2000)");
@@ -6836,7 +6839,7 @@ public void writeCompletion(Table callbackTable) {
68366839

68376840
for (int i = 0; i < ex.rows(); i++){
68386841
assertEquals(ex.getColumn(0).get(i).getString(), act.getColumn(0).get(i).getString());
6839-
System.out.println(ex.getColumn(0).get(i).getString());
6842+
//System.out.println(ex.getColumn(0).get(i).getString());
68406843
//System.out.println("callback rows"+callback.rows());
68416844
}
68426845
conn.close();
@@ -6905,13 +6908,14 @@ public void writeCompletion(Table callbackTable) {
69056908
}
69066909
}
69076910
mtw.waitForThreadCompletion();
6911+
conn1.run("sleep(5000)");
69086912
try{conn1.run("startDataNode([\""+HOST+":"+PORT+"\"])");
69096913

69106914
}
69116915
catch(IOException ex) {
69126916
System.out.println(ex.getMessage());
69136917
}
6914-
conn1.run("sleep(1000)");
6918+
conn1.run("sleep(8000)");
69156919
DBConnection conn2= new DBConnection(false, false, false, false);
69166920
conn2.connect(HOST, PORT, "admin", "123456");
69176921
conn1.run("sleep(1000)");

‎test/com/xxdb/SimpleDBConnectionPoolTest.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -547,7 +547,7 @@ public void test_SimpleDBConnectionPool_config_HighAvailability_true_LoadBalance
547547
DBConnection controller_conn = new DBConnection();
548548
controller_conn.connect(controller_host, controller_port, "admin", "123456");
549549
controller_conn.run("try{stopDataNode('"+HOST+":"+PORT+"')}catch(ex){}");
550-
controller_conn.run("5000");
550+
controller_conn.run("8000");
551551
SimpleDBConnectionPoolConfig config1 = new SimpleDBConnectionPoolConfig();
552552
config1.setHostName(HOST);
553553
config1.setPort(PORT);
@@ -563,7 +563,7 @@ public void test_SimpleDBConnectionPool_config_HighAvailability_true_LoadBalance
563563
DBConnection poolEntity = pool.getConnection();
564564
controller_conn.run("try{startDataNode('"+HOST+":"+PORT+"')}catch(ex){}");
565565
int port1 = port_list[1];
566-
poolEntity.run("sleep(2000)");
566+
poolEntity.run("sleep(8000)");
567567
BasicTable re = (BasicTable) poolEntity.run("select port ,connectionNum from rpc(getControllerAlias(),getClusterPerf) where mode= 0");
568568
for (int i = 0; i < re.rows(); i++) {
569569
System.out.println("port:" + re.getColumn(0).get(i) + " connectionNum:" + re.getColumn(1).get(i));

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -113,7 +113,7 @@ public void test_BasicDateHourVector_Append() throws Exception {
113113
System.out.println(bdhv.get(2));
114114
bdhv.Append(bdhv);
115115
assertEquals(size+4,bdhv.size);
116-
assertEquals(7,bdhv.capaticy);
116+
assertEquals(6,bdhv.capaticy);
117117
}
118118
@Test
119119
public void test_BasicDateHour_toJSONString() throws Exception {

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -89,7 +89,7 @@ public void test_BasicSecondVector_Append() throws Exception {
8989
assertEquals(capacity*2,bsv.capaticy);
9090
bsv.Append(bsv);
9191
assertEquals(size+5,bsv.size);
92-
assertEquals(capacity*2+4,bsv.capaticy);
92+
assertEquals(9,bsv.capaticy);
9393
}
9494
@Test
9595
public void test_BasicSecond_toJSONString() throws Exception {

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -92,7 +92,7 @@ public void test_BasicTimeVector_Append() throws Exception {
9292
assertEquals(capacity*2,btv.capaticy);
9393
btv.Append(new BasicTimeVector(new int[]{618,755,907}));
9494
assertEquals(size+4,btv.size);
95-
assertEquals(capacity*2+3,btv.capaticy);
95+
assertEquals(capacity*2+2,btv.capaticy);
9696
}
9797
@Test
9898
public void test_BasicTime(){

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -625,9 +625,9 @@ public void test_subscribe_tableName_actionName_reconnect() throws IOException {
625625
}
626626

627627
}
628-
client.unsubscribe(HOST, PORT, "Trades1","subTrades1");
629-
client.unsubscribe(HOST, PORT, "Trades1","subTrades2");
630628
}
629+
client.unsubscribe(HOST, PORT, "Trades1","subTrades1");
630+
client.unsubscribe(HOST, PORT, "Trades1","subTrades2");
631631
}
632632

633633
@Test(timeout = 60000)

0 commit comments

Comments
 (0)