Skip to content

Commit 9a4260c

Browse files
fpddmwfpddmw
committed
fix bugs & pass test
1 parent 2e7c802 commit 9a4260c

File tree

121 files changed

+9625
-7777
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

121 files changed

+9625
-7777
lines changed

‎Apache-IoTDB-Client-CSharp-UserCase/Program.cs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -99,9 +99,9 @@ static async Task ExecuteQueryStatement()
9999
await session_pool.Open(false);
100100
var res = await session_pool.ExecuteQueryStatementAsync("select * from root.ln.wf01.wt01");
101101
res.ShowTableNames();
102-
while (res.HasNext())
102+
while (res.Next())
103103
{
104-
Console.WriteLine(res.Next());
104+
Console.WriteLine(res.GetRow());
105105
}
106106
await res.Close();
107107
await session_pool.Close();

‎samples/Apache.IoTDB.Samples/SessionPoolTest.AlignedRecord.cs‎

Lines changed: 15 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -98,9 +98,8 @@ public async Task TestInsertAlignedStringRecord()
9898
Console.WriteLine(string.Format("total insert aligned string record time is {0}", end_ms - start_ms));
9999
var res = await session_pool.ExecuteQueryStatementAsync("select * from " + string.Format("{0}.{1}", testDatabaseName, testDevice));
100100
var res_cnt = 0;
101-
while (res.HasNext())
101+
while (res.Next())
102102
{
103-
res.Next();
104103
res_cnt++;
105104
}
106105
Console.WriteLine(res_cnt + " " + fetchSize * processedSize);
@@ -185,8 +184,10 @@ public async Task TestInsertAlignedRecords()
185184
System.Diagnostics.Debug.Assert(status == 0);
186185
var res = await session_pool.ExecuteQueryStatementAsync(
187186
"select * from " + string.Format("{0}.{1}", testDatabaseName, testDevice) + " where time<10");
188-
res.ShowTableNames();
189-
while (res.HasNext()) Console.WriteLine(res.Next());
187+
UtilsTest.PrintDataSet2(res);
188+
Console.WriteLine(rowRecords);
189+
190+
System.Diagnostics.Debug.Assert(true);
190191

191192
await res.Close();
192193
Console.WriteLine(status);
@@ -214,10 +215,10 @@ public async Task TestInsertAlignedRecords()
214215
res.ShowTableNames();
215216
var record_count = fetchSize * processedSize;
216217
var res_count = 0;
217-
while (res.HasNext())
218+
while (res.Next())
218219
{
219-
res.Next();
220220
res_count += 1;
221+
Console.WriteLine(res.GetRow());
221222
}
222223

223224
await res.Close();
@@ -265,8 +266,7 @@ public async Task TestInsertAlignedStringRecords()
265266
System.Diagnostics.Debug.Assert(status == 0);
266267
var res = await session_pool.ExecuteQueryStatementAsync(
267268
"select * from " + string.Format("{0}.{1}", testDatabaseName, testDevice) + " where time<10");
268-
res.ShowTableNames();
269-
while (res.HasNext()) Console.WriteLine(res.Next());
269+
UtilsTest.PrintDataSet2(res);
270270

271271
await res.Close();
272272

@@ -297,9 +297,9 @@ public async Task TestInsertAlignedStringRecords()
297297
"select * from " + string.Format("{0}.{1}", testDatabaseName, testDevice));
298298
res.ShowTableNames();
299299
var res_count = 0;
300-
while (res.HasNext())
300+
while (res.Next())
301301
{
302-
res.Next();
302+
Console.WriteLine(res.GetRow());
303303
res_count += 1;
304304
}
305305

@@ -386,8 +386,7 @@ public async Task TestInsertAlignedRecordsOfOneDevice()
386386
System.Diagnostics.Debug.Assert(status == 0);
387387
var res = await session_pool.ExecuteQueryStatementAsync(
388388
"select * from " + string.Format("{0}.{1}", testDatabaseName, testDevice) + " where time<10");
389-
res.ShowTableNames();
390-
while (res.HasNext()) Console.WriteLine(res.Next());
389+
UtilsTest.PrintDataSet2(res);
391390

392391
await res.Close();
393392
rowRecords = new List<RowRecord>() { };
@@ -407,9 +406,9 @@ public async Task TestInsertAlignedRecordsOfOneDevice()
407406
res = await session_pool.ExecuteQueryStatementAsync(
408407
"select * from " + string.Format("{0}.{1}", testDatabaseName, testDevice));
409408
var res_count = 0;
410-
while (res.HasNext())
409+
while (res.Next())
411410
{
412-
res.Next();
411+
Console.WriteLine(res.GetRow());
413412
res_count += 1;
414413
}
415414

@@ -454,8 +453,7 @@ public async Task TestInsertAlignedStringRecordsOfOneDevice()
454453
System.Diagnostics.Debug.Assert(status == 0);
455454
var res = await session_pool.ExecuteQueryStatementAsync(
456455
"select * from " + string.Format("{0}.{1}", testDatabaseName, testDevice) + " where time<10");
457-
res.ShowTableNames();
458-
while (res.HasNext()) Console.WriteLine(res.Next());
456+
UtilsTest.PrintDataSet2(res);
459457

460458
await res.Close();
461459
// large data test
@@ -481,9 +479,8 @@ public async Task TestInsertAlignedStringRecordsOfOneDevice()
481479
res = await session_pool.ExecuteQueryStatementAsync(
482480
"select * from " + string.Format("{0}.{1}", testDatabaseName, testDevice));
483481
var res_count = 0;
484-
while (res.HasNext())
482+
while (res.Next())
485483
{
486-
res.Next();
487484
res_count += 1;
488485
}
489486

‎samples/Apache.IoTDB.Samples/SessionPoolTest.AlignedTablet.cs‎

Lines changed: 6 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -54,8 +54,7 @@ public async Task TestInsertAlignedTablet()
5454
System.Diagnostics.Debug.Assert(status == 0);
5555
var res = await session_pool.ExecuteQueryStatementAsync(
5656
"select * from " + string.Format("{0}.{1}", testDatabaseName, testDevice) + " where time<15");
57-
res.ShowTableNames();
58-
while (res.HasNext()) Console.WriteLine(res.Next());
57+
UtilsTest.PrintDataSet2(res);
5958

6059
await res.Close();
6160
// large data test
@@ -84,9 +83,9 @@ public async Task TestInsertAlignedTablet()
8483
"select * from " + string.Format("{0}.{1}", testDatabaseName, testDevice));
8584
res.ShowTableNames();
8685
var res_count = 0;
87-
while (res.HasNext())
86+
while (res.Next())
8887
{
89-
res.Next();
88+
Console.WriteLine(res.GetRow());
9089
res_count += 1;
9190
}
9291

@@ -149,8 +148,7 @@ public async Task TestInsertAlignedTablets()
149148
System.Diagnostics.Debug.Assert(status == 0);
150149
var res = await session_pool.ExecuteQueryStatementAsync(
151150
"select * from " + string.Format("{0}.{1}", testDatabaseName, testDevices[1]) + " where time<15");
152-
res.ShowTableNames();
153-
while (res.HasNext()) Console.WriteLine(res.Next());
151+
UtilsTest.PrintDataSet2(res);
154152

155153
// large data test
156154
var tasks = new List<Task<int>>();
@@ -177,9 +175,9 @@ public async Task TestInsertAlignedTablets()
177175
"select * from " + string.Format("{0}.{1}", testDatabaseName, testDevices[1]));
178176
res.ShowTableNames();
179177
var res_count = 0;
180-
while (res.HasNext())
178+
while (res.Next())
181179
{
182-
res.Next();
180+
Console.WriteLine(res.GetRow());
183181
res_count += 1;
184182
}
185183

‎samples/Apache.IoTDB.Samples/SessionPoolTest.Record.cs‎

Lines changed: 24 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -111,9 +111,8 @@ public async Task TestInsertStringRecord()
111111
Console.WriteLine(string.Format("total insert string record time is {0}", end_ms - start_ms));
112112
var res = await session_pool.ExecuteQueryStatementAsync("select * from " + string.Format("{0}.{1}", testDatabaseName, testDevice));
113113
var res_cnt = 0;
114-
while (res.HasNext())
114+
while (res.Next())
115115
{
116-
res.Next();
117116
res_cnt++;
118117
}
119118
Console.WriteLine(res_cnt + " " + fetchSize * processedSize);
@@ -149,8 +148,7 @@ public async Task TestInsertStrRecord()
149148
System.Diagnostics.Debug.Assert(status == 0);
150149
var res = await session_pool.ExecuteQueryStatementAsync(
151150
"select * from " + string.Format("{0}.{1}", testDatabaseName, testDevice) + " where time<2");
152-
res.ShowTableNames();
153-
while (res.HasNext()) Console.WriteLine(res.Next());
151+
UtilsTest.PrintDataSet2(res);
154152

155153
await res.Close();
156154

@@ -171,9 +169,8 @@ public async Task TestInsertStrRecord()
171169
res = await session_pool.ExecuteQueryStatementAsync(
172170
"select * from " + string.Format("{0}.{1}", testDatabaseName, testDevice));
173171
var res_count = 0;
174-
while (res.HasNext())
172+
while (res.Next())
175173
{
176-
res.Next();
177174
res_count += 1;
178175
}
179176

@@ -256,8 +253,7 @@ public async Task TestInsertRecords()
256253
System.Diagnostics.Debug.Assert(status == 0);
257254
var res = await session_pool.ExecuteQueryStatementAsync(
258255
"select * from " + string.Format("{0}.{1}", testDatabaseName, testDevice) + " where time<10");
259-
res.ShowTableNames();
260-
while (res.HasNext()) Console.WriteLine(res.Next());
256+
UtilsTest.PrintDataSet2(res);
261257

262258
await res.Close();
263259
Console.WriteLine(status);
@@ -282,12 +278,14 @@ public async Task TestInsertRecords()
282278
Task.WaitAll(tasks.ToArray());
283279
res = await session_pool.ExecuteQueryStatementAsync(
284280
"select * from " + string.Format("{0}.{1}", testDatabaseName, testDevice));
285-
res.ShowTableNames();
281+
286282
var record_count = fetchSize * processedSize;
283+
284+
res.ShowTableNames();
287285
var res_count = 0;
288-
while (res.HasNext())
286+
while (res.Next())
289287
{
290-
res.Next();
288+
Console.WriteLine(res.GetRow());
291289
res_count += 1;
292290
}
293291

@@ -300,16 +298,16 @@ public async Task TestInsertRecords()
300298
res = await session_pool.ExecuteQueryStatementAsync(sql);
301299
res.ShowTableNames();
302300
RowRecord row = null;
303-
while (res.HasNext())
301+
while (res.Next())
304302
{
305-
row = res.Next();
303+
row = res.GetRow();
306304
break;
307305
}
308306

309-
Console.WriteLine($"{testDatabaseName}.{testDevice}.{row.Measurements[0]} {testMeasurements[3]}");
310-
System.Diagnostics.Debug.Assert($"{testDatabaseName}.{testDevice}.{testMeasurements[3]}" == row.Measurements[0]);
311-
System.Diagnostics.Debug.Assert($"{testDatabaseName}.{testDevice}.{testMeasurements[1]}" == row.Measurements[1]);
312-
System.Diagnostics.Debug.Assert($"{testDatabaseName}.{testDevice}.{testMeasurements[2]}" == row.Measurements[2]);
307+
Console.WriteLine($"{testDatabaseName}.{testDevice}.{row.Measurements[1]} {testMeasurements[3]}");
308+
System.Diagnostics.Debug.Assert($"{testDatabaseName}.{testDevice}.{testMeasurements[3]}" == row.Measurements[1]);
309+
System.Diagnostics.Debug.Assert($"{testDatabaseName}.{testDevice}.{testMeasurements[1]}" == row.Measurements[2]);
310+
System.Diagnostics.Debug.Assert($"{testDatabaseName}.{testDevice}.{testMeasurements[2]}" == row.Measurements[3]);
313311

314312
status = await session_pool.DeleteDatabaseAsync(testDatabaseName);
315313
System.Diagnostics.Debug.Assert(status == 0);
@@ -351,8 +349,7 @@ public async Task TestInsertStringRecords()
351349
System.Diagnostics.Debug.Assert(status == 0);
352350
var res = await session_pool.ExecuteQueryStatementAsync(
353351
"select * from " + string.Format("{0}.{1}", testDatabaseName, testDevice) + " where time<10");
354-
res.ShowTableNames();
355-
while (res.HasNext()) Console.WriteLine(res.Next());
352+
UtilsTest.PrintDataSet2(res);
356353

357354
await res.Close();
358355

@@ -384,9 +381,9 @@ public async Task TestInsertStringRecords()
384381
res.ShowTableNames();
385382
var record_count = fetchSize * processedSize;
386383
var res_count = 0;
387-
while (res.HasNext())
384+
while (res.Next())
388385
{
389-
res.Next();
386+
Console.WriteLine(res.GetRow());
390387
res_count += 1;
391388
}
392389

@@ -468,8 +465,7 @@ public async Task TestInsertRecordsOfOneDevice()
468465
System.Diagnostics.Debug.Assert(status == 0);
469466
var res = await session_pool.ExecuteQueryStatementAsync(
470467
"select * from " + string.Format("{0}.{1}", testDatabaseName, testDevice) + " where time<10");
471-
res.ShowTableNames();
472-
while (res.HasNext()) Console.WriteLine(res.Next());
468+
UtilsTest.PrintDataSet2(res);
473469

474470
await res.Close();
475471
// large data test
@@ -490,9 +486,8 @@ public async Task TestInsertRecordsOfOneDevice()
490486
res = await session_pool.ExecuteQueryStatementAsync(
491487
"select * from " + string.Format("{0}.{1}", testDatabaseName, testDevice));
492488
var res_count = 0;
493-
while (res.HasNext())
489+
while (res.Next())
494490
{
495-
res.Next();
496491
res_count += 1;
497492
}
498493

@@ -543,8 +538,7 @@ public async Task TestInsertStringRecordsOfOneDevice()
543538
System.Diagnostics.Debug.Assert(status == 0);
544539
var res = await session_pool.ExecuteQueryStatementAsync(
545540
"select * from " + string.Format("{0}.{1}", testDatabaseName, testDevice) + " where time<10");
546-
res.ShowTableNames();
547-
while (res.HasNext()) Console.WriteLine(res.Next());
541+
UtilsTest.PrintDataSet2(res);
548542

549543
await res.Close();
550544
// large data test
@@ -570,9 +564,8 @@ public async Task TestInsertStringRecordsOfOneDevice()
570564
res = await session_pool.ExecuteQueryStatementAsync(
571565
"select * from " + string.Format("{0}.{1}", testDatabaseName, testDevice));
572566
var res_count = 0;
573-
while (res.HasNext())
567+
while (res.Next())
574568
{
575-
res.Next();
576569
res_count += 1;
577570
}
578571

@@ -651,9 +644,9 @@ public async Task TestInsertRecordsWithAllType()
651644
"select * from " + string.Format("{0}.{1}", testDatabaseName, testDevice));
652645
res.ShowTableNames();
653646
var res_count = 0;
654-
while (res.HasNext())
647+
while (res.Next())
655648
{
656-
Console.WriteLine(res.Next());
649+
Console.WriteLine(res_count);
657650
res_count += 1;
658651
}
659652

‎samples/Apache.IoTDB.Samples/SessionPoolTest.Tablet.cs‎

Lines changed: 10 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -55,8 +55,7 @@ public async Task TestInsertTablet()
5555
System.Diagnostics.Debug.Assert(status == 0);
5656
var res = await session_pool.ExecuteQueryStatementAsync(
5757
"select * from " + string.Format("{0}.{1}", testDatabaseName, testDevice) + " where time<15");
58-
res.ShowTableNames();
59-
while (res.HasNext()) Console.WriteLine(res.Next());
58+
UtilsTest.PrintDataSet2(res);
6059

6160
await res.Close();
6261
// large data test
@@ -84,9 +83,9 @@ public async Task TestInsertTablet()
8483
"select * from " + string.Format("{0}.{1}", testDatabaseName, testDevice));
8584
res.ShowTableNames();
8685
var res_count = 0;
87-
while (res.HasNext())
86+
while (res.Next())
8887
{
89-
res.Next();
88+
Console.WriteLine(res.GetRow());
9089
res_count += 1;
9190
}
9291

@@ -149,8 +148,7 @@ public async Task TestInsertTablets()
149148
// System.Diagnostics.Debug.Assert(status == 0);
150149
var res = await session_pool.ExecuteQueryStatementAsync(
151150
"select * from " + string.Format("{0}.{1}", testDatabaseName, testDevices[1]) + " where time<15");
152-
res.ShowTableNames();
153-
while (res.HasNext()) Console.WriteLine(res.Next());
151+
UtilsTest.PrintDataSet2(res);
154152

155153
// large data test
156154

@@ -178,9 +176,9 @@ public async Task TestInsertTablets()
178176
"select * from " + string.Format("{0}.{1}", testDatabaseName, testDevices[1]));
179177
res.ShowTableNames();
180178
var res_count = 0;
181-
while (res.HasNext())
179+
while (res.Next())
182180
{
183-
res.Next();
181+
Console.WriteLine(res.GetRow());
184182
res_count += 1;
185183
}
186184

@@ -217,9 +215,9 @@ public async Task TestInsertTabletWithNullValue()
217215
"select * from " + string.Format("{0}.{1}", testDatabaseName, testDevice));
218216
res.ShowTableNames();
219217
var res_count = 0;
220-
while (res.HasNext())
218+
while (res.Next())
221219
{
222-
Console.WriteLine(res.Next());
220+
Console.WriteLine(res.GetRow());
223221
res_count += 1;
224222
}
225223

@@ -280,9 +278,9 @@ public async Task TestInsertTabletWithAllType()
280278
"select * from " + string.Format("{0}.{1}", testDatabaseName, testDevice));
281279
res.ShowTableNames();
282280
var res_count = 0;
283-
while (res.HasNext())
281+
while (res.Next())
284282
{
285-
Console.WriteLine(res.Next());
283+
Console.WriteLine(res.GetRow());
286284
res_count += 1;
287285
}
288286

0 commit comments

Comments
 (0)