Skip to content

Commit 4154a46

Browse files
eedalongeedalong
authored
Merge pull request #13 from eedalong/develop
Develop
2 parents 53e354e + 7b887c7 commit 4154a46

File tree

2 files changed

+74
-32
lines changed

2 files changed

+74
-32
lines changed

‎client/Session.cs‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -310,7 +310,6 @@ public TSInsertStringRecordReq gen_insert_str_record_req(string device_id, List<
310310
public int insert_record(string device_id, List<string> measurements, List<string> values, long timestamp){
311311
// TBD by Luzhan
312312
var req = gen_insert_str_record_req(device_id, measurements, values, timestamp);
313-
Console.WriteLine(req);
314313
TSStatus status;
315314
try{
316315
var task = client.insertStringRecordAsync(req);

‎client/SessionTest.cs‎

Lines changed: 74 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -15,40 +15,47 @@ public class SessionTest
1515
public int port = 6667;
1616
public string user = "root";
1717
public string passwd = "root";
18-
public int fetch_size = 10;
18+
public int fetch_size = 5000;
19+
public bool debug = false;
1920
public void TestOpen(){
2021
Session session = new Session(host, port, user, passwd);
21-
session.open_debug_mode();
22+
if(debug){
23+
session.open_debug_mode();
24+
}
2225
session.open(false);
2326
System.Diagnostics.Debug.Assert(session.is_open());
2427
session.close();
25-
System.Console.WriteLine("TestOpen Passed!");
28+
Console.WriteLine("TestOpen Passed!");
2629
}
2730

2831
public void TestClose(){
2932
var session = new Session(host, port, user, passwd);
3033
session.open(false);
3134
session.close();
3235
System.Diagnostics.Debug.Assert(!session.is_open());
33-
System.Console.WriteLine("TestClose Passed!");
36+
Console.WriteLine("TestClose Passed!");
3437

3538
}
3639
public void TestSetAndDeleteStorageGroup(){
3740
// by Luzhan
3841
var session = new Session(host, port, user, passwd);
3942
session.open(false);
40-
session.open_debug_mode();
43+
if(debug){
44+
session.open_debug_mode();
45+
}
4146
session.delete_storage_group("root.97209_TEST_CSHARP_CLIENT_GROUP");
4247
System.Diagnostics.Debug.Assert(session.set_storage_group("root.97209_TEST_CSHARP_CLIENT_GROUP")==0);
4348
System.Diagnostics.Debug.Assert(session.delete_storage_group("root.97209_TEST_CSHARP_CLIENT_GROUP")==0);
4449
session.close();
45-
System.Console.WriteLine("TestSetAndDeleteStorageGroup Passed!");
50+
Console.WriteLine("TestSetAndDeleteStorageGroup Passed!");
4651
}
4752
public void TestCreateTimeSeries(){
4853
// by Luzhan
4954
var session = new Session(host, port, user, passwd);
5055
session.open(false);
51-
session.open_debug_mode();
56+
if(debug){
57+
session.open_debug_mode();
58+
}
5259
session.delete_storage_group("root.97209_TEST_CSHARP_CLIENT_GROUP");
5360
System.Diagnostics.Debug.Assert(session.create_time_series(("root.97209_TEST_CSHARP_CLIENT_GROUP.TEST_CSHARP_CLIENT_DEVICE.TEST_CSHARP_CLIENT_TS1"), TSDataType.BOOLEAN, TSEncoding.PLAIN, Compressor.SNAPPY)==0);
5461
System.Diagnostics.Debug.Assert(session.create_time_series(("root.97209_TEST_CSHARP_CLIENT_GROUP.TEST_CSHARP_CLIENT_DEVICE.TEST_CSHARP_CLIENT_TS2"), TSDataType.INT32, TSEncoding.PLAIN, Compressor.SNAPPY)==0);
@@ -58,13 +65,15 @@ public void TestCreateTimeSeries(){
5865
System.Diagnostics.Debug.Assert(session.create_time_series(("root.97209_TEST_CSHARP_CLIENT_GROUP.TEST_CSHARP_CLIENT_DEVICE.TEST_CSHARP_CLIENT_TS6"), TSDataType.TEXT, TSEncoding.PLAIN, Compressor.SNAPPY)==0);
5966
session.delete_storage_group("root.97209_TEST_CSHARP_CLIENT_GROUP");
6067
session.close();
61-
System.Console.WriteLine("TestCreateTimeSeries Passed!");
68+
Console.WriteLine("TestCreateTimeSeries Passed!");
6269
}
6370
public void TestCreateMultiTimeSeries(){
6471
// by Luzhan
6572
var session = new Session(host, port, user, passwd);
6673
session.open(false);
67-
session.open_debug_mode();
74+
if(debug){
75+
session.open_debug_mode();
76+
}
6877

6978
session.delete_storage_group("root.97209_TEST_CSHARP_CLIENT_GROUP");
7079
List<string> ts_path_lst = new List<string>(){"root.97209_TEST_CSHARP_CLIENT_GROUP.TEST_CSHARP_CLIENT_DEVICE.TEST_CSHARP_CLIENT_TS1", "root.97209_TEST_CSHARP_CLIENT_GROUP.TEST_CSHARP_CLIENT_DEVICE.TEST_CSHARP_CLIENT_TS2", "root.97209_TEST_CSHARP_CLIENT_GROUP.TEST_CSHARP_CLIENT_DEVICE.TEST_CSHARP_CLIENT_TS3", "root.97209_TEST_CSHARP_CLIENT_GROUP.TEST_CSHARP_CLIENT_DEVICE.TEST_CSHARP_CLIENT_TS4", "root.97209_TEST_CSHARP_CLIENT_GROUP.TEST_CSHARP_CLIENT_DEVICE.TEST_CSHARP_CLIENT_TS5", "root.97209_TEST_CSHARP_CLIENT_GROUP.TEST_CSHARP_CLIENT_DEVICE.TEST_CSHARP_CLIENT_TS6"};
@@ -74,30 +83,34 @@ public void TestCreateMultiTimeSeries(){
7483
System.Diagnostics.Debug.Assert(session.create_multi_time_series(ts_path_lst, data_type_lst, encoding_lst, compressor_lst)==0);
7584
session.delete_storage_group("root.97209_TEST_CSHARP_CLIENT_GROUP");
7685
session.close();
77-
System.Console.WriteLine("TestCreateMultiTimeSeries Passed!");
86+
Console.WriteLine("TestCreateMultiTimeSeries Passed!");
7887

7988
}
8089
public void TestDeleteTimeSeries(){
8190
// by Luzhan
8291
var session = new Session(host, port, user, passwd);
8392
session.open(false);
84-
session.open_debug_mode();
93+
if(debug){
94+
session.open_debug_mode();
95+
}
8596
session.delete_storage_group("root.97209_TEST_CSHARP_CLIENT_GROUP");
8697
List<string> ts_path_lst = new List<string>(){"root.97209_TEST_CSHARP_CLIENT_GROUP.TEST_CSHARP_CLIENT_DEVICE.TEST_CSHARP_CLIENT_TS1", "root.97209_TEST_CSHARP_CLIENT_GROUP.TEST_CSHARP_CLIENT_DEVICE.TEST_CSHARP_CLIENT_TS2", "root.97209_TEST_CSHARP_CLIENT_GROUP.TEST_CSHARP_CLIENT_DEVICE.TEST_CSHARP_CLIENT_TS3", "root.97209_TEST_CSHARP_CLIENT_GROUP.TEST_CSHARP_CLIENT_DEVICE.TEST_CSHARP_CLIENT_TS4", "root.97209_TEST_CSHARP_CLIENT_GROUP.TEST_CSHARP_CLIENT_DEVICE.TEST_CSHARP_CLIENT_TS5", "root.97209_TEST_CSHARP_CLIENT_GROUP.TEST_CSHARP_CLIENT_DEVICE.TEST_CSHARP_CLIENT_TS6"};
8798
List<TSDataType> data_type_lst = new List<TSDataType>(){TSDataType.BOOLEAN, TSDataType.INT32, TSDataType.INT64, TSDataType.FLOAT, TSDataType.DOUBLE, TSDataType.TEXT};
8899
List<TSEncoding> encoding_lst = new List<TSEncoding>(){TSEncoding.PLAIN,TSEncoding.PLAIN,TSEncoding.PLAIN,TSEncoding.PLAIN,TSEncoding.PLAIN,TSEncoding.PLAIN};
89100
List<Compressor> compressor_lst = new List<Compressor>(){Compressor.SNAPPY,Compressor.SNAPPY,Compressor.SNAPPY,Compressor.SNAPPY,Compressor.SNAPPY,Compressor.SNAPPY};
90101
System.Diagnostics.Debug.Assert(session.create_multi_time_series(ts_path_lst, data_type_lst, encoding_lst, compressor_lst)==0);
91102
System.Diagnostics.Debug.Assert(session.delete_time_series(ts_path_lst)==0);
92-
System.Console.WriteLine("TestDeleteTimeSeries Passed!");
103+
Console.WriteLine("TestDeleteTimeSeries Passed!");
93104
session.delete_storage_group("root.97209_TEST_CSHARP_CLIENT_GROUP");
94105
session.close();
95106
}
96107
public void TestDeleteStorageGroups(){
97108
// by Luzhan
98109
var session = new Session(host, port, user, passwd);
99110
session.open(false);
100-
session.open_debug_mode();
111+
if(debug){
112+
session.open_debug_mode();
113+
}
101114

102115
session.set_storage_group("root.97209_TEST_CSHARP_CLIENT_GROUP_01");
103116
session.set_storage_group("root.97209_TEST_CSHARP_CLIENT_GROUP_02");
@@ -110,12 +123,14 @@ public void TestDeleteStorageGroups(){
110123
group_names.Add("root.97209_TEST_CSHARP_CLIENT_GROUP_04");
111124
System.Diagnostics.Debug.Assert(session.delete_storage_groups(group_names)==0);
112125
session.close();
113-
System.Console.WriteLine("TestDeleteStorageGroups Passed!");
126+
Console.WriteLine("TestDeleteStorageGroups Passed!");
114127
}
115128
public void TestGetTimeZone(){
116129
var session = new Session(host, port);
117130
session.open(false);
118-
session.open_debug_mode();
131+
if(debug){
132+
session.open_debug_mode();
133+
}
119134
session.delete_storage_group("root.97209_TEST_CSHARP_CLIENT_GROUP");
120135
System.Diagnostics.Debug.Assert(session.is_open());
121136
var time_zone = session.get_time_zone();
@@ -126,7 +141,9 @@ public void TestInsertStrRecord(){
126141
var session = new Session(host, port);
127142
int status = 0;
128143
session.open(false);
129-
session.open_debug_mode();
144+
if(debug){
145+
session.open_debug_mode();
146+
}
130147
System.Diagnostics.Debug.Assert(session.is_open());
131148
session.delete_storage_group("root.97209_TEST_CSHARP_CLIENT_GROUP");
132149

@@ -152,7 +169,9 @@ public void TestInsertRecord(){
152169
var session = new Session(host, port);
153170
int status = 0;
154171
session.open(false);
155-
session.open_debug_mode();
172+
if(debug){
173+
session.open_debug_mode();
174+
}
156175
System.Diagnostics.Debug.Assert(session.is_open());
157176
session.delete_storage_group("root.97209_TEST_CSHARP_CLIENT_GROUP");
158177

@@ -185,7 +204,9 @@ public void TestInsertRecord(){
185204
public void TestInsertRecords(){
186205
var session = new Session(host, port);
187206
session.open(false);
188-
session.open_debug_mode();
207+
if(debug){
208+
session.open_debug_mode();
209+
}
189210
System.Diagnostics.Debug.Assert(session.is_open());
190211
int status = 0;
191212
status = session.delete_storage_group("root.97209_TEST_CSHARP_CLIENT_GROUP");
@@ -236,7 +257,9 @@ public void TestTestInsertRecord(){
236257
var session = new Session(host, port);
237258
int status = 0;
238259
session.open(false);
239-
session.open_debug_mode();
260+
if(debug){
261+
session.open_debug_mode();
262+
}
240263
System.Diagnostics.Debug.Assert(session.is_open());
241264
status = session.delete_storage_group("root.97209_TEST_CSHARP_CLIENT_GROUP");
242265

@@ -268,7 +291,9 @@ public void TestTestInsertRecord(){
268291
public void TestTestInsertRecords(){
269292
var session = new Session(host, port);
270293
session.open(false);
271-
session.open_debug_mode();
294+
if(debug){
295+
session.open_debug_mode();
296+
}
272297
System.Diagnostics.Debug.Assert(session.is_open());
273298
int status = 0;
274299
status = session.delete_storage_group("root.97209_TEST_CSHARP_CLIENT_GROUP");
@@ -312,7 +337,9 @@ public void TestTestInsertRecords(){
312337
public void TestInsertRecordsOfOneDevice(){
313338
var session = new Session(host, port);
314339
session.open(false);
315-
session.open_debug_mode();
340+
if(debug){
341+
session.open_debug_mode();
342+
}
316343
System.Diagnostics.Debug.Assert(session.is_open());
317344
int status = 0;
318345
status = session.delete_storage_group("root.97209_TEST_CSHARP_CLIENT_GROUP");
@@ -352,7 +379,9 @@ public void TestInsertRecordsOfOneDevice(){
352379
public void TestCheckTimeSeriesExists(){
353380
var session = new Session(host, port);
354381
session.open(false);
355-
session.open_debug_mode();
382+
if(debug){
383+
session.open_debug_mode();
384+
}
356385
System.Diagnostics.Debug.Assert(session.is_open());
357386
int status = 0;
358387
status = session.delete_storage_group("root.97209_TEST_CSHARP_CLIENT_GROUP");
@@ -368,7 +397,9 @@ public void TestCheckTimeSeriesExists(){
368397
public void TestSetTimeZone(){
369398
var session = new Session(host, port);
370399
session.open(false);
371-
session.open_debug_mode();
400+
if(debug){
401+
session.open_debug_mode();
402+
}
372403
session.set_time_zone("GMT+8:00");
373404
System.Diagnostics.Debug.Assert(session.get_time_zone() == "GMT+8:00");
374405
session.close();
@@ -378,7 +409,9 @@ public void TestDeleteData(){
378409
var session = new Session(host, port);
379410
int status = 0;
380411
session.open(false);
381-
session.open_debug_mode();
412+
if(debug){
413+
session.open_debug_mode();
414+
}
382415
System.Diagnostics.Debug.Assert(session.is_open());
383416
status = session.delete_storage_group("root.97209_TEST_CSHARP_CLIENT_GROUP");
384417

@@ -420,7 +453,9 @@ public void TestDeleteData(){
420453
public void TestNonSql(){
421454
var session = new Session(host, port);
422455
session.open(false);
423-
session.open_debug_mode();
456+
if(debug){
457+
session.open_debug_mode();
458+
}
424459
System.Diagnostics.Debug.Assert(session.is_open());
425460
int status = 0;
426461
status = session.delete_storage_group("root.97209_TEST_CSHARP_CLIENT_GROUP");
@@ -445,7 +480,9 @@ public void TestNonSql(){
445480
public void TestSqlQuery(){
446481
var session = new Session(host, port);
447482
session.open(false);
448-
session.open_debug_mode();
483+
if(debug){
484+
session.open_debug_mode();
485+
}
449486
System.Diagnostics.Debug.Assert(session.is_open());
450487
int status = 0;
451488
status = session.delete_storage_group("root.97209_TEST_CSHARP_CLIENT_GROUP");
@@ -497,7 +534,9 @@ public void TestSqlQuery(){
497534
public void TestInsertTablet(){
498535
var session = new Session(host, port);
499536
session.open(false);
500-
session.open_debug_mode();
537+
if(debug){
538+
session.open_debug_mode();
539+
}
501540
System.Diagnostics.Debug.Assert(session.is_open());
502541
int status = 0;
503542
status = session.delete_storage_group("root.97209_TEST_CSHARP_CLIENT_GROUP");
@@ -614,22 +653,26 @@ void TestLargeData(){
614653
System.Diagnostics.Debug.Assert(session.is_open());
615654
int status = 0;
616655
status = session.delete_storage_group("root.97209_TEST_CSHARP_CLIENT_GROUP");
617-
for(var timestamp = 0; timestamp < fetch_size * 4; timestamp++){
656+
int record_inserted_count = fetch_size * 4;
657+
for(var timestamp = 0; timestamp < record_inserted_count; timestamp++){
618658
var measures = new List<string>{"TEST_CSHARP_CLIENT_TS1", "TEST_CSHARP_CLIENT_TS2"};
619659
var values = new List<string>{"test_record", "test_record"};
620660
status = session.insert_record("root.97209_TEST_CSHARP_CLIENT_GROUP.TEST_CSHARP_CLIENT_DEVICE", measures, values, timestamp);
621661
System.Diagnostics.Debug.Assert(status == 0);
622662
}
623663
var res=session.execute_query_statement("select * from root.97209_TEST_CSHARP_CLIENT_GROUP.TEST_CSHARP_CLIENT_DEVICE");
624664
res.show_table_names();
665+
int res_count = 0;
625666
while(res.has_next()){
626-
Console.WriteLine(res.next());
667+
res.next();
668+
res_count += 1;
627669
}
670+
628671
session.delete_storage_group("root.97209_TEST_CSHARP_CLIENT_GROUP");
629672
System.Diagnostics.Debug.Assert(status == 0);
673+
System.Diagnostics.Debug.Assert(record_inserted_count == res_count);
630674
session.close();
631675
Console.WriteLine("TestTestInsertTablet Passed!");
632-
633676
}
634677
static void Main(){
635678
SessionTest session_test = new SessionTest();
@@ -658,7 +701,7 @@ static void Main(){
658701
session_test.TestInsertTablets();
659702
session_test.TestTestInsertTablets();
660703
session_test.TestLargeData();
661-
System.Console.WriteLine("TEST PASSED");
704+
Console.WriteLine("TEST PASSED");
662705

663706
}
664707
}

0 commit comments

Comments
 (0)