Skip to content

Commit 53e354e

Browse files
eedalongeedalong
authored
Merge pull request #11 from eedalong/develop
Develop
2 parents 7ae25e6 + ceb6f5c commit 53e354e

File tree

3 files changed

+56
-27
lines changed

3 files changed

+56
-27
lines changed

‎client/Session.cs‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -667,7 +667,9 @@ public SessionDataSet execute_query_statement(string sql){
667667
if(verify_success(status) == -1){
668668
throw new TException("execute query failed", null);
669669
}
670-
return new SessionDataSet(sql, resp.Columns, resp.DataTypeList, resp.ColumnNameIndexMap, resp.QueryId, client, sessionId, resp.QueryDataSet);
670+
var session_dataset = new SessionDataSet(sql, resp.Columns, resp.DataTypeList, resp.ColumnNameIndexMap, resp.QueryId, client, sessionId, resp.QueryDataSet);
671+
session_dataset.fetch_size = fetch_size;
672+
return session_dataset;
671673

672674
}
673675
public int execute_non_query_statement(string sql){

‎client/SessionTest.cs‎

Lines changed: 52 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -6,15 +6,18 @@
66
/*
77
group: root.97209_TEST_CSHARP_CLIENT_GROUP
88
timeseries: root.97209_TEST_CSHARP_CLIENT_GROUP.TEST_CSHARP_CLIENT_DEVICE.TEST_CSHARP_CLIENT_TSX;
9-
109
*/
1110
namespace iotdb_client_csharp.client
1211
{
1312
public class SessionTest
1413
{
15-
14+
public string host = "localhost";
15+
public int port = 6667;
16+
public string user = "root";
17+
public string passwd = "root";
18+
public int fetch_size = 10;
1619
public void TestOpen(){
17-
Session session = new Session("localhost", 6667, "root", "root");
20+
Session session = new Session(host, port, user, passwd);
1821
session.open_debug_mode();
1922
session.open(false);
2023
System.Diagnostics.Debug.Assert(session.is_open());
@@ -23,7 +26,7 @@ public void TestOpen(){
2326
}
2427

2528
public void TestClose(){
26-
var session = new Session("localhost", 6667, "root", "root");
29+
var session = new Session(host, port, user, passwd);
2730
session.open(false);
2831
session.close();
2932
System.Diagnostics.Debug.Assert(!session.is_open());
@@ -32,7 +35,7 @@ public void TestClose(){
3235
}
3336
public void TestSetAndDeleteStorageGroup(){
3437
// by Luzhan
35-
var session = new Session("localhost", 6667, "root", "root");
38+
var session = new Session(host, port, user, passwd);
3639
session.open(false);
3740
session.open_debug_mode();
3841
session.delete_storage_group("root.97209_TEST_CSHARP_CLIENT_GROUP");
@@ -43,7 +46,7 @@ public void TestSetAndDeleteStorageGroup(){
4346
}
4447
public void TestCreateTimeSeries(){
4548
// by Luzhan
46-
var session = new Session("localhost", 6667, "root", "root");
49+
var session = new Session(host, port, user, passwd);
4750
session.open(false);
4851
session.open_debug_mode();
4952
session.delete_storage_group("root.97209_TEST_CSHARP_CLIENT_GROUP");
@@ -59,7 +62,7 @@ public void TestCreateTimeSeries(){
5962
}
6063
public void TestCreateMultiTimeSeries(){
6164
// by Luzhan
62-
var session = new Session("localhost", 6667, "root", "root");
65+
var session = new Session(host, port, user, passwd);
6366
session.open(false);
6467
session.open_debug_mode();
6568

@@ -76,7 +79,7 @@ public void TestCreateMultiTimeSeries(){
7679
}
7780
public void TestDeleteTimeSeries(){
7881
// by Luzhan
79-
var session = new Session("localhost", 6667, "root", "root");
82+
var session = new Session(host, port, user, passwd);
8083
session.open(false);
8184
session.open_debug_mode();
8285
session.delete_storage_group("root.97209_TEST_CSHARP_CLIENT_GROUP");
@@ -92,7 +95,7 @@ public void TestDeleteTimeSeries(){
9295
}
9396
public void TestDeleteStorageGroups(){
9497
// by Luzhan
95-
var session = new Session("localhost", 6667, "root", "root");
98+
var session = new Session(host, port, user, passwd);
9699
session.open(false);
97100
session.open_debug_mode();
98101

@@ -110,7 +113,7 @@ public void TestDeleteStorageGroups(){
110113
System.Console.WriteLine("TestDeleteStorageGroups Passed!");
111114
}
112115
public void TestGetTimeZone(){
113-
var session = new Session("localhost", 6667);
116+
var session = new Session(host, port);
114117
session.open(false);
115118
session.open_debug_mode();
116119
session.delete_storage_group("root.97209_TEST_CSHARP_CLIENT_GROUP");
@@ -120,7 +123,7 @@ public void TestGetTimeZone(){
120123
Console.WriteLine("TestGetTimeZone Passed!");
121124
}
122125
public void TestInsertStrRecord(){
123-
var session = new Session("localhost", 6667);
126+
var session = new Session(host, port);
124127
int status = 0;
125128
session.open(false);
126129
session.open_debug_mode();
@@ -146,7 +149,7 @@ public void TestInsertStrRecord(){
146149
Console.WriteLine("TestInsertStrRecord Passed!");
147150
}
148151
public void TestInsertRecord(){
149-
var session = new Session("localhost", 6667);
152+
var session = new Session(host, port);
150153
int status = 0;
151154
session.open(false);
152155
session.open_debug_mode();
@@ -180,7 +183,7 @@ public void TestInsertRecord(){
180183
Console.WriteLine("TestInsertRecord Passed!");
181184
}
182185
public void TestInsertRecords(){
183-
var session = new Session("localhost", 6667);
186+
var session = new Session(host, port);
184187
session.open(false);
185188
session.open_debug_mode();
186189
System.Diagnostics.Debug.Assert(session.is_open());
@@ -230,7 +233,7 @@ public void TestInsertRecords(){
230233
Console.WriteLine("TestInsertRecords Passed!");
231234
}
232235
public void TestTestInsertRecord(){
233-
var session = new Session("localhost", 6667);
236+
var session = new Session(host, port);
234237
int status = 0;
235238
session.open(false);
236239
session.open_debug_mode();
@@ -263,7 +266,7 @@ public void TestTestInsertRecord(){
263266
}
264267

265268
public void TestTestInsertRecords(){
266-
var session = new Session("localhost", 6667);
269+
var session = new Session(host, port);
267270
session.open(false);
268271
session.open_debug_mode();
269272
System.Diagnostics.Debug.Assert(session.is_open());
@@ -307,7 +310,7 @@ public void TestTestInsertRecords(){
307310
Console.WriteLine("TestTestInsertRecords Passed!");
308311
}
309312
public void TestInsertRecordsOfOneDevice(){
310-
var session = new Session("localhost", 6667);
313+
var session = new Session(host, port);
311314
session.open(false);
312315
session.open_debug_mode();
313316
System.Diagnostics.Debug.Assert(session.is_open());
@@ -347,7 +350,7 @@ public void TestInsertRecordsOfOneDevice(){
347350
Console.WriteLine("TestInsertRecordsOfOneDevice Passed!");
348351
}
349352
public void TestCheckTimeSeriesExists(){
350-
var session = new Session("localhost", 6667);
353+
var session = new Session(host, port);
351354
session.open(false);
352355
session.open_debug_mode();
353356
System.Diagnostics.Debug.Assert(session.is_open());
@@ -363,7 +366,7 @@ public void TestCheckTimeSeriesExists(){
363366
Console.WriteLine("TestCheckTimeSeriesExists Passed!");
364367
}
365368
public void TestSetTimeZone(){
366-
var session = new Session("localhost", 6667);
369+
var session = new Session(host, port);
367370
session.open(false);
368371
session.open_debug_mode();
369372
session.set_time_zone("GMT+8:00");
@@ -372,7 +375,7 @@ public void TestSetTimeZone(){
372375
Console.WriteLine("TestSetTimeZone Passed!");
373376
}
374377
public void TestDeleteData(){
375-
var session = new Session("localhost", 6667);
378+
var session = new Session(host, port);
376379
int status = 0;
377380
session.open(false);
378381
session.open_debug_mode();
@@ -415,7 +418,7 @@ public void TestDeleteData(){
415418
Console.WriteLine("TestDeleteData Passed!");
416419
}
417420
public void TestNonSql(){
418-
var session = new Session("localhost", 6667);
421+
var session = new Session(host, port);
419422
session.open(false);
420423
session.open_debug_mode();
421424
System.Diagnostics.Debug.Assert(session.is_open());
@@ -440,7 +443,7 @@ public void TestNonSql(){
440443
Console.WriteLine("TestNonSql Passed");
441444
}
442445
public void TestSqlQuery(){
443-
var session = new Session("localhost", 6667);
446+
var session = new Session(host, port);
444447
session.open(false);
445448
session.open_debug_mode();
446449
System.Diagnostics.Debug.Assert(session.is_open());
@@ -492,7 +495,7 @@ public void TestSqlQuery(){
492495

493496
}
494497
public void TestInsertTablet(){
495-
var session = new Session("localhost", 6667);
498+
var session = new Session(host, port);
496499
session.open(false);
497500
session.open_debug_mode();
498501
System.Diagnostics.Debug.Assert(session.is_open());
@@ -517,7 +520,7 @@ public void TestInsertTablet(){
517520
Console.WriteLine("TestInsertTablet Passed!");
518521
}
519522
public void TestTestInsertTablet(){
520-
var session = new Session("localhost", 6667);
523+
var session = new Session(host, port);
521524
session.open(false);
522525
System.Diagnostics.Debug.Assert(session.is_open());
523526
int status = 0;
@@ -541,7 +544,7 @@ public void TestTestInsertTablet(){
541544
Console.WriteLine("TestTestInsertTablet Passed!");
542545
}
543546
public void TestInsertTablets(){
544-
var session = new Session("localhost", 6667);
547+
var session = new Session(host, port);
545548
session.open(false);
546549
System.Diagnostics.Debug.Assert(session.is_open());
547550
int status = 0;
@@ -574,7 +577,7 @@ public void TestInsertTablets(){
574577
Console.WriteLine("TestInsertTablets Passed!");
575578
}
576579
public void TestTestInsertTablets(){
577-
var session = new Session("localhost", 6667);
580+
var session = new Session(host, port);
578581
session.open(false);
579582
System.Diagnostics.Debug.Assert(session.is_open());
580583
int status = 0;
@@ -605,6 +608,29 @@ public void TestTestInsertTablets(){
605608
session.close();
606609
Console.WriteLine("TestTestInsertTablets Passed!");
607610
}
611+
void TestLargeData(){
612+
var session = new Session(host, port, user, passwd, fetch_size);
613+
session.open(false);
614+
System.Diagnostics.Debug.Assert(session.is_open());
615+
int status = 0;
616+
status = session.delete_storage_group("root.97209_TEST_CSHARP_CLIENT_GROUP");
617+
for(var timestamp = 0; timestamp < fetch_size * 4; timestamp++){
618+
var measures = new List<string>{"TEST_CSHARP_CLIENT_TS1", "TEST_CSHARP_CLIENT_TS2"};
619+
var values = new List<string>{"test_record", "test_record"};
620+
status = session.insert_record("root.97209_TEST_CSHARP_CLIENT_GROUP.TEST_CSHARP_CLIENT_DEVICE", measures, values, timestamp);
621+
System.Diagnostics.Debug.Assert(status == 0);
622+
}
623+
var res=session.execute_query_statement("select * from root.97209_TEST_CSHARP_CLIENT_GROUP.TEST_CSHARP_CLIENT_DEVICE");
624+
res.show_table_names();
625+
while(res.has_next()){
626+
Console.WriteLine(res.next());
627+
}
628+
session.delete_storage_group("root.97209_TEST_CSHARP_CLIENT_GROUP");
629+
System.Diagnostics.Debug.Assert(status == 0);
630+
session.close();
631+
Console.WriteLine("TestTestInsertTablet Passed!");
632+
633+
}
608634
static void Main(){
609635
SessionTest session_test = new SessionTest();
610636

@@ -631,6 +657,7 @@ static void Main(){
631657
session_test.TestTestInsertTablet();
632658
session_test.TestInsertTablets();
633659
session_test.TestTestInsertTablets();
660+
session_test.TestLargeData();
634661
System.Console.WriteLine("TEST PASSED");
635662

636663
}

‎client/utils/SessionDataSet.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -217,7 +217,7 @@ private bool fetch_results(){
217217
try{
218218
var task = client.fetchResultsAsync(req);
219219
task.Wait();
220-
var resp = task.Result;
220+
var resp = task.Result;
221221
if(resp.HasResultSet){
222222
this.query_dataset = resp.QueryDataSet;
223223
// reset buffer

0 commit comments

Comments
 (0)