Skip to content

Commit 9a85dab

Browse files
weisun123weisun123
committed
fix
1 parent 233ac22 commit 9a85dab

File tree

6 files changed

+76
-27
lines changed

6 files changed

+76
-27
lines changed

‎test/com/xxdb/DBConnectionTest.java‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -325,6 +325,7 @@ public void Test_Connect_connectTimeout_fail_1() throws IOException {
325325
System.out.println("Timeout after " + elapsedTime + " ms");
326326
Assert.assertEquals(true,elapsedTime>6000 && elapsedTime<8000);
327327
}
328+
328329
//@Test//没有设置重连次数，会一直重连
329330
public void Test_Connect_connectTimeout_fail_2() throws IOException {
330331
DBConnection conn = new DBConnection();
@@ -5931,7 +5932,7 @@ public void Test_DBConnection_ConnectConfig_reconnect_true_tryReconnectNums_5()
59315932
}catch(Exception ex){
59325933
re = ex.getMessage();
59335934
}
5934-
assertEquals("Connect to 192.168.0.69:8887 failed after 5 reconnect attempts.", re);
5935+
assertEquals("Connect to "+HOST+":8887 failed after 5 reconnect attempts.", re);
59355936
}
59365937

59375938
@Test

‎test/com/xxdb/MultithreadedTableWriterTest.java‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -706,13 +706,13 @@ public void test_MultithreadedTableWriter_partcolname_wrong() throws Exception {
706706
StringBuilder sb = new StringBuilder();
707707
String dbName = "dfs://test_MultithreadedTableWriter_pt";
708708

709-
sb.append("if(existsDatabase('" + dbName + "')){\n" +
709+
String script = "if(existsDatabase('" + dbName + "')){\n" +
710710
"\t\tdropDatabase('" + dbName + "')\n" +
711711
"\t}\n" +
712712
"\tdb=database('" + dbName + "', VALUE, 2012.01.01..2012.01.30)\n" +
713713
"t=table(1:0, `sym`tradeDate`tradeTime`tradePrice`vwap`volume`valueTrade, [SYMBOL, DATE, TIME, DOUBLE, DOUBLE, INT, DOUBLE])\n" +
714-
"\tcreatePartitionedTable(dbHandle=db, table=t, tableName=`pt, partitionColumns=[\"tradeDate\"])");
715-
conn.run(sb.toString());
714+
"\tcreatePartitionedTable(dbHandle=db, table=t, tableName=`pt, partitionColumns=[\"tradeDate\"])";
715+
conn.run(script);
716716
String re = null;
717717
try {
718718
mutithreadTableWriter_ = new MultithreadedTableWriter(HOST, PORT, "admin", "123456",

‎test/com/xxdb/restart/DBConnectionTest.java‎

Lines changed: 40 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@
77
import org.junit.Test;
88

99
import java.io.IOException;
10+
import java.sql.DriverManager;
1011
import java.sql.SQLException;
1112
import java.util.ResourceBundle;
1213

@@ -131,6 +132,7 @@ public void Test_getConnection_highAvailability_false() throws SQLException, Cla
131132
public void Test_connect_EnableHighAvailability_true_1() throws IOException, InterruptedException {
132133
DBConnection conn1 = new DBConnection();
133134
conn1.connect(HOST,PORT,"admin","123456",null,true);
135+
conn.connect(HOST, CONTROLLER_PORT, "admin", "123456");
134136
BasicString nodeAliasTmp = (BasicString)conn1.run("getNodeAlias()");
135137
String nodeAlias = nodeAliasTmp.getString();
136138
try{
@@ -139,7 +141,8 @@ public void Test_connect_EnableHighAvailability_true_1() throws IOException, Int
139141
{
140142
System.out.println(ex);
141143
}
142-
sleep(1000);
144+
sleep(8000);
145+
System.out.println("-----------------------------------");
143146
conn1.run("a=1;\n a");
144147
//The connection switches to a different node to execute the code
145148
try{
@@ -152,9 +155,10 @@ public void Test_connect_EnableHighAvailability_true_1() throws IOException, Int
152155
assertEquals(true, conn1.isConnected());
153156
}
154157
@Test
155-
public void Test_reConnect__true() throws IOException, InterruptedException {
158+
public void Test_reConnect_true() throws IOException, InterruptedException {
156159
DBConnection conn1 = new DBConnection();
157160
conn1.connect(HOST,PORT,"admin","123456",null,false,null,true);
161+
conn.connect(HOST, CONTROLLER_PORT, "admin", "123456");
158162
BasicString nodeAliasTmp = (BasicString)conn1.run("getNodeAlias()");
159163
String nodeAlias = nodeAliasTmp.getString();
160164
try{
@@ -163,16 +167,46 @@ public void Test_reConnect__true() throws IOException, InterruptedException {
163167
{
164168
System.out.println(ex);
165169
}
166-
sleep(1000);
167-
conn1.run("a=1;\n a");
170+
sleep(10000);
171+
//conn1.run("a=1;\n a");
168172
//The connection switches to a different node to execute the code
169173
try{
170-
conn.run("startDataNode(\""+nodeAlias+"\")");
174+
conn.run("stopDataNode(\""+HOST+":"+PORT+"\")");
171175
}catch(Exception ex)
172176
{
173177
System.out.println(ex);
174178
}
175-
sleep(1000);
179+
sleep(5000);
180+
181+
class MyThread extends Thread {
182+
@Override
183+
public void run() {
184+
try {
185+
conn1.connect(HOST,PORT,"admin","123456",null,false,null,true);
186+
} catch (Exception e) {
187+
// 捕获异常并打印错误信息
188+
System.err.println(e.getMessage());
189+
}
190+
}
191+
}
192+
class MyThread1 extends Thread {
193+
@Override
194+
public void run() {
195+
try {
196+
conn.run("startDataNode(\""+HOST+":"+PORT+"\")");
197+
} catch (IOException e) {
198+
throw new RuntimeException(e);
199+
}
200+
}
201+
}
202+
MyThread thread = new MyThread();
203+
thread.start();
204+
Thread.sleep(3000);
205+
MyThread1 thread1 = new MyThread1();
206+
thread1.start();
207+
thread1.join();
208+
Thread.sleep(8000);
209+
conn1.run("a=1;\n a");
176210
assertEquals(true, conn1.isConnected());
177211
}
178212
@Test //reConnect is not valid

‎test/com/xxdb/restart/PollingClientTest.java‎

Lines changed: 9 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -115,7 +115,8 @@ public void test_PollingClient_subscribe_backupSites_server_disconnect() throws
115115
controller_conn.connect(controller_host,controller_port,"admin","123456");
116116
controller_conn.run("try{startDataNode('"+HOST+":"+port_list[1]+"')}catch(ex){}");
117117
controller_conn.run("sleep(1000)");
118-
String script1 = "st1 = streamTable(1000000:0,`tag`ts`data,[INT,TIMESTAMP,DOUBLE])\n" +
118+
String script1 = "try{undef(`Trades,SHARED)}catch(ex){};\n" +
119+
"st1 = streamTable(1000000:0,`tag`ts`data,[INT,TIMESTAMP,DOUBLE])\n" +
119120
"share(st1,`Trades)\t\n"
120121
+ "setStreamTableFilterColumn(objByName(`Trades),`tag)";
121122
conn.run(script1);
@@ -217,7 +218,8 @@ public void test_PollingClient_subscribe_backupSites_server_disconnect_backupSit
217218
controller_conn.connect(controller_host,controller_port,"admin","123456");
218219
controller_conn.run("try{startDataNode('"+HOST+":"+port_list[1]+"')}catch(ex){}");
219220
controller_conn.run("sleep(1000)");
220-
String script1 = "st1 = streamTable(1000000:0,`tag`ts`data,[INT,TIMESTAMP,DOUBLE])\n" +
221+
String script1 = "try{undef(`Trades,SHARED)}catch(ex){};\n" +
222+
"st1 = streamTable(1000000:0,`tag`ts`data,[INT,TIMESTAMP,DOUBLE])\n" +
221223
"share(st1,`Trades)\t\n"
222224
+ "setStreamTableFilterColumn(objByName(`Trades),`tag)";
223225
conn.run(script1);
@@ -279,7 +281,8 @@ public void test_PollingClient_subscribe_backupSites_resubscribeInterval() throw
279281
controller_conn.connect(controller_host,controller_port,"admin","123456");
280282
controller_conn.run("try{startDataNode('"+HOST+":"+port_list[1]+"')}catch(ex){}");
281283
controller_conn.run("sleep(1000)");
282-
String script1 = "st1 = streamTable(1000000:0,`tag`ts`data,[INT,TIMESTAMP,DOUBLE])\n" +
284+
String script1 = "try{undef(`Trades,SHARED)}catch(ex){};\n" +
285+
"st1 = streamTable(1000000:0,`tag`ts`data,[INT,TIMESTAMP,DOUBLE])\n" +
283286
"share(st1,`Trades)\t\n"
284287
+ "setStreamTableFilterColumn(objByName(`Trades),`tag)";
285288
conn.run(script1);
@@ -375,7 +378,8 @@ public void test_PollingClient_subscribe_resubscribeInterval_subOnce_not_set() t
375378
controller_conn.connect(controller_host,controller_port,"admin","123456");
376379
controller_conn.run("try{startDataNode('"+HOST+":"+port_list[1]+"')}catch(ex){}");
377380
controller_conn.run("sleep(5000)");
378-
String script1 = "st1 = streamTable(1000000:0,`tag`ts`data,[INT,TIMESTAMP,DOUBLE])\n" +
381+
String script1 = "try{undef(`Trades,SHARED)}catch(ex){};\n" +
382+
"st1 = streamTable(1000000:0,`tag`ts`data,[INT,TIMESTAMP,DOUBLE])\n" +
379383
"share(st1,`Trades)\t\n"
380384
+ "setStreamTableFilterColumn(objByName(`Trades),`tag)";
381385
conn.run(script1);
@@ -418,7 +422,7 @@ public void test_PollingClient_subscribe_resubscribeInterval_subOnce_not_set() t
418422
Thread.sleep(8000);
419423
conn3.run("n=3000;t=table(1..n as tag,timestamp(1..n) as ts,take(100.0,n) as data);" + "Trades.append!(t)");
420424
Thread.sleep(5000);
421-
List<IMessage> messages2 = poller.poll(3000,3000);
425+
List<IMessage> messages2 = poller.poll(5000,3000);
422426
MessageHandler_handler(messages2);
423427
controller_conn.run("try{startDataNode('"+HOST+":"+port_list[2]+"')}catch(ex){}");
424428
Thread.sleep(5000);

‎test/com/xxdb/restart/ThreadPooledClientTest.java‎

Lines changed: 11 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -118,7 +118,8 @@ public void Test_ThreadPooledClient_subscribe_backupSites_server_disconnect() th
118118
controller_conn.connect(controller_host,controller_port,"admin","123456");
119119
controller_conn.run("try{startDataNode('"+HOST+":"+port_list[1]+"')}catch(ex){}");
120120
controller_conn.run("sleep(1000)");
121-
String script1 = "st1 = streamTable(1000000:0,`tag`ts`data,[INT,TIMESTAMP,DOUBLE])\n" +
121+
String script1 = "try{undef(`Trades,SHARED)}catch(ex){};\n" +
122+
"st1 = streamTable(1000000:0,`tag`ts`data,[INT,TIMESTAMP,DOUBLE])\n" +
122123
"share(st1,`Trades)\t\n"
123124
+ "setStreamTableFilterColumn(objByName(`Trades),`tag)";
124125
conn.run(script1);
@@ -155,7 +156,8 @@ public void Test_ThreadPooledClient_subscribe_backupSites_server_disconnect_back
155156
controller_conn.connect(controller_host,controller_port,"admin","123456");
156157
controller_conn.run("try{startDataNode('"+HOST+":"+port_list[1]+"')}catch(ex){}");
157158
controller_conn.run("sleep(1000)");
158-
String script1 = "st1 = streamTable(1000000:0,`tag`ts`data,[INT,TIMESTAMP,DOUBLE])\n" +
159+
String script1 = "try{undef(`Trades,SHARED)}catch(ex){};\n" +
160+
"st1 = streamTable(1000000:0,`tag`ts`data,[INT,TIMESTAMP,DOUBLE])\n" +
159161
"share(st1,`Trades)\t\n"
160162
+ "setStreamTableFilterColumn(objByName(`Trades),`tag)";
161163
conn.run(script1);
@@ -208,7 +210,8 @@ public void Test_ThreadPooledClient_subscribe_backupSites_server_disconnect_back
208210
controller_conn.connect(controller_host,controller_port,"admin","123456");
209211
controller_conn.run("try{startDataNode('"+HOST+":"+port_list[1]+"')}catch(ex){}");
210212
controller_conn.run("sleep(1000)");
211-
String script1 = "st1 = streamTable(1000000:0,`tag`ts`data,[INT,TIMESTAMP,DOUBLE])\n" +
213+
String script1 = "try{undef(`Trades,SHARED)}catch(ex){};\n" +
214+
"st1 = streamTable(1000000:0,`tag`ts`data,[INT,TIMESTAMP,DOUBLE])\n" +
212215
"share(st1,`Trades)\t\n"
213216
+ "setStreamTableFilterColumn(objByName(`Trades),`tag)";
214217
conn.run(script1);
@@ -264,7 +267,8 @@ public void Test_ThreadPooledClient_subscribe_backupSites_resubscribeInterval()
264267
controller_conn.connect(controller_host,controller_port,"admin","123456");
265268
controller_conn.run("try{startDataNode('"+HOST+":"+port_list[1]+"')}catch(ex){}");
266269
controller_conn.run("sleep(1000)");
267-
String script1 = "st1 = streamTable(1000000:0,`tag`ts`data,[INT,TIMESTAMP,DOUBLE])\n" +
270+
String script1 = "try{undef(`Trades,SHARED)}catch(ex){};\n" +
271+
"st1 = streamTable(1000000:0,`tag`ts`data,[INT,TIMESTAMP,DOUBLE])\n" +
268272
"share(st1,`Trades)\t\n"
269273
+ "setStreamTableFilterColumn(objByName(`Trades),`tag)";
270274
conn.run(script1);
@@ -332,7 +336,7 @@ public void run() {
332336
thread.join();
333337
Thread.sleep(5000);
334338
controller_conn.run("try{startDataNode('"+HOST+":"+port_list[1]+"')}catch(ex){}");
335-
Thread.sleep(1000);
339+
Thread.sleep(2000);
336340
BasicTable re = (BasicTable)conn.run("select tag ,now,deltas(now) from Receive order by deltas(now) desc \n");
337341
System.out.println(re.getString());
338342
Assert.assertEquals(1000,re.rows());
@@ -350,7 +354,8 @@ public void Test_ThreadPooledClient_subscribe_resubscribeInterval_subOnce_not_se
350354
controller_conn.connect(controller_host,controller_port,"admin","123456");
351355
controller_conn.run("try{startDataNode('"+HOST+":"+port_list[1]+"')}catch(ex){}");
352356
controller_conn.run("sleep(1000)");
353-
String script1 = "st1 = streamTable(1000000:0,`tag`ts`data,[INT,TIMESTAMP,DOUBLE])\n" +
357+
String script1 = "try{undef(`Trades,SHARED)}catch(ex){};\n" +
358+
"st1 = streamTable(1000000:0,`tag`ts`data,[INT,TIMESTAMP,DOUBLE])\n" +
354359
"share(st1,`Trades)\t\n"
355360
+ "setStreamTableFilterColumn(objByName(`Trades),`tag)";
356361
conn.run(script1);

‎test/com/xxdb/restart/ThreadedClientTest.java‎

Lines changed: 11 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -92,7 +92,8 @@ public void test_ThreadClient_subscribe_backupSites_server_disconnect() throws I
9292
controller_conn.connect(controller_host,controller_port,"admin","123456");
9393
controller_conn.run("try{startDataNode('"+HOST+":"+port_list[1]+"')}catch(ex){}");
9494
controller_conn.run("sleep(1000)");
95-
String script1 = "st1 = streamTable(1000000:0,`tag`ts`data,[INT,TIMESTAMP,DOUBLE])\n" +
95+
String script1 = "try{undef(`Trades,SHARED)}catch(ex){};\n" +
96+
"st1 = streamTable(1000000:0,`tag`ts`data,[INT,TIMESTAMP,DOUBLE])\n" +
9697
"share(st1,`Trades)\t\n"
9798
+ "setStreamTableFilterColumn(objByName(`Trades),`tag)";
9899
conn.run(script1);
@@ -114,7 +115,7 @@ public void test_ThreadClient_subscribe_backupSites_server_disconnect() throws I
114115
Thread.sleep(8000);
115116
conn.run("t=table(5001..5500 as tag,now()+5001..5500 as ts,rand(100.0,500) as data);" + "Trades.append!(t)");
116117
controller_conn.run("try{startDataNode('"+HOST+":"+port_list[1]+"')}catch(ex){}");
117-
Thread.sleep(1000);
118+
Thread.sleep(2000);
118119
BasicTable row_num = (BasicTable)conn.run("select count(*) from Receive");
119120
System.out.println(row_num.getColumn(0).get(0));
120121
assertEquals("5500",row_num.getColumn(0).get(0).getString());
@@ -127,7 +128,8 @@ public void test_ThreadClient_subscribe_backupSites_server_disconnect_backupSite
127128
controller_conn.connect(controller_host,controller_port,"admin","123456");
128129
controller_conn.run("try{startDataNode('"+HOST+":"+port_list[1]+"')}catch(ex){}");
129130
controller_conn.run("sleep(1000)");
130-
String script1 = "st1 = streamTable(1000000:0,`tag`ts`data,[INT,TIMESTAMP,DOUBLE])\n" +
131+
String script1 = "try{undef(`Trades,SHARED)}catch(ex){};\n" +
132+
"st1 = streamTable(1000000:0,`tag`ts`data,[INT,TIMESTAMP,DOUBLE])\n" +
131133
"share(st1,`Trades)\t\n"
132134
+ "setStreamTableFilterColumn(objByName(`Trades),`tag)";
133135
conn.run(script1);
@@ -179,7 +181,8 @@ public void test_ThreadClient_subscribe_backupSites_server_disconnect_backupSite
179181
controller_conn.connect(controller_host,controller_port,"admin","123456");
180182
controller_conn.run("try{startDataNode('"+HOST+":"+port_list[1]+"')}catch(ex){}");
181183
controller_conn.run("sleep(1000)");
182-
String script1 = "st1 = streamTable(1000000:0,`tag`ts`data,[INT,TIMESTAMP,DOUBLE])\n" +
184+
String script1 = "try{undef(`Trades,SHARED)}catch(ex){};\n" +
185+
"st1 = streamTable(1000000:0,`tag`ts`data,[INT,TIMESTAMP,DOUBLE])\n" +
183186
"share(st1,`Trades)\t\n"
184187
+ "setStreamTableFilterColumn(objByName(`Trades),`tag)";
185188
conn.run(script1);
@@ -247,7 +250,8 @@ public void test_ThreadClient_subscribe_backupSites_resubscribeInterval() throws
247250
controller_conn.connect(controller_host,controller_port,"admin","123456");
248251
controller_conn.run("try{startDataNode('"+HOST+":"+port_list[1]+"')}catch(ex){}");
249252
controller_conn.run("sleep(1000)");
250-
String script1 = "st1 = streamTable(1000000:0,`tag`ts`data,[INT,TIMESTAMP,DOUBLE])\n" +
253+
String script1 = "try{undef(`Trades,SHARED)}catch(ex){};\n" +
254+
"st1 = streamTable(1000000:0,`tag`ts`data,[INT,TIMESTAMP,DOUBLE])\n" +
251255
"share(st1,`Trades)\t\n"
252256
+ "setStreamTableFilterColumn(objByName(`Trades),`tag)";
253257
conn.run(script1);
@@ -333,7 +337,8 @@ public void Test_ThreadClient_subscribe_resubscribeInterval_subOnce_not_set() th
333337
controller_conn.connect(controller_host,controller_port,"admin","123456");
334338
controller_conn.run("try{startDataNode('"+HOST+":"+port_list[1]+"')}catch(ex){}");
335339
controller_conn.run("sleep(1000)");
336-
String script1 = "st1 = streamTable(1000000:0,`tag`ts`data,[INT,TIMESTAMP,DOUBLE])\n" +
340+
String script1 = "try{undef(`Trades,SHARED)}catch(ex){};\n" +
341+
"st1 = streamTable(1000000:0,`tag`ts`data,[INT,TIMESTAMP,DOUBLE])\n" +
337342
"share(st1,`Trades)\t\n"
338343
+ "setStreamTableFilterColumn(objByName(`Trades),`tag)";
339344
conn.run(script1);

0 commit comments

Comments
 (0)