Skip to content

Commit d8de308

Browse files
fpddmwfpddmw
committed
fix pull request
1 parent e77bb23 commit d8de308

File tree

119 files changed

+7636
-9347
lines changed

Some content is hidden

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

119 files changed

+7636
-9347
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.Next())
102+
while (res.HasNext())
103103
{
104-
Console.WriteLine(res.GetRow());
104+
Console.WriteLine(res.Next());
105105
}
106106
await res.Close();
107107
await session_pool.Close();

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

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -98,7 +98,7 @@ 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.Next())
101+
while (res.HasNext())
102102
{
103103
res_cnt++;
104104
}
@@ -215,10 +215,10 @@ public async Task TestInsertAlignedRecords()
215215
res.ShowTableNames();
216216
var record_count = fetchSize * processedSize;
217217
var res_count = 0;
218-
while (res.Next())
218+
while (res.HasNext())
219219
{
220220
res_count += 1;
221-
Console.WriteLine(res.GetRow());
221+
Console.WriteLine(res.Next());
222222
}
223223

224224
await res.Close();
@@ -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.Next())
300+
while (res.HasNext())
301301
{
302-
Console.WriteLine(res.GetRow());
302+
Console.WriteLine(res.Next());
303303
res_count += 1;
304304
}
305305

@@ -406,7 +406,7 @@ public async Task TestInsertAlignedRecordsOfOneDevice()
406406
res = await session_pool.ExecuteQueryStatementAsync(
407407
"select * from " + string.Format("{0}.{1}", testDatabaseName, testDevice));
408408
var res_count = 0;
409-
while (res.Next())
409+
while (res.HasNext())
410410
{
411411
res_count += 1;
412412
}
@@ -478,7 +478,7 @@ public async Task TestInsertAlignedStringRecordsOfOneDevice()
478478
res = await session_pool.ExecuteQueryStatementAsync(
479479
"select * from " + string.Format("{0}.{1}", testDatabaseName, testDevice));
480480
var res_count = 0;
481-
while (res.Next())
481+
while (res.HasNext())
482482
{
483483
res_count += 1;
484484
}

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -83,7 +83,7 @@ public async Task TestInsertAlignedTablet()
8383
"select * from " + string.Format("{0}.{1}", testDatabaseName, testDevice));
8484
res.ShowTableNames();
8585
var res_count = 0;
86-
while (res.Next())
86+
while (res.HasNext())
8787
{
8888
res_count += 1;
8989
}
@@ -174,7 +174,7 @@ public async Task TestInsertAlignedTablets()
174174
"select * from " + string.Format("{0}.{1}", testDatabaseName, testDevices[1]));
175175
res.ShowTableNames();
176176
var res_count = 0;
177-
while (res.Next())
177+
while (res.HasNext())
178178
{
179179
res_count += 1;
180180
}

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

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -111,7 +111,7 @@ 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.Next())
114+
while (res.HasNext())
115115
{
116116
res_cnt++;
117117
}
@@ -169,7 +169,7 @@ public async Task TestInsertStrRecord()
169169
res = await session_pool.ExecuteQueryStatementAsync(
170170
"select * from " + string.Format("{0}.{1}", testDatabaseName, testDevice));
171171
var res_count = 0;
172-
while (res.Next())
172+
while (res.HasNext())
173173
{
174174
res_count += 1;
175175
}
@@ -283,7 +283,7 @@ public async Task TestInsertRecords()
283283

284284
res.ShowTableNames();
285285
var res_count = 0;
286-
while (res.Next())
286+
while (res.HasNext())
287287
{
288288
res_count += 1;
289289
}
@@ -297,9 +297,9 @@ public async Task TestInsertRecords()
297297
res = await session_pool.ExecuteQueryStatementAsync(sql);
298298
res.ShowTableNames();
299299
RowRecord row = null;
300-
while (res.Next())
300+
while (res.HasNext())
301301
{
302-
row = res.GetRow();
302+
row = res.Next();
303303
break;
304304
}
305305

@@ -380,9 +380,9 @@ public async Task TestInsertStringRecords()
380380
res.ShowTableNames();
381381
var record_count = fetchSize * processedSize;
382382
var res_count = 0;
383-
while (res.Next())
383+
while (res.HasNext())
384384
{
385-
Console.WriteLine(res.GetRow());
385+
Console.WriteLine(res.Next());
386386
res_count += 1;
387387
}
388388

@@ -485,7 +485,7 @@ public async Task TestInsertRecordsOfOneDevice()
485485
res = await session_pool.ExecuteQueryStatementAsync(
486486
"select * from " + string.Format("{0}.{1}", testDatabaseName, testDevice));
487487
var res_count = 0;
488-
while (res.Next())
488+
while (res.HasNext())
489489
{
490490
res_count += 1;
491491
}
@@ -563,7 +563,7 @@ public async Task TestInsertStringRecordsOfOneDevice()
563563
res = await session_pool.ExecuteQueryStatementAsync(
564564
"select * from " + string.Format("{0}.{1}", testDatabaseName, testDevice));
565565
var res_count = 0;
566-
while (res.Next())
566+
while (res.HasNext())
567567
{
568568
res_count += 1;
569569
}
@@ -643,9 +643,9 @@ public async Task TestInsertRecordsWithAllType()
643643
"select * from " + string.Format("{0}.{1}", testDatabaseName, testDevice));
644644
res.ShowTableNames();
645645
var res_count = 0;
646-
while (res.Next())
646+
while (res.HasNext())
647647
{
648-
Console.WriteLine(res.GetRow());
648+
Console.WriteLine(res.Next());
649649
res_count += 1;
650650
}
651651

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

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -83,7 +83,7 @@ public async Task TestInsertTablet()
8383
"select * from " + string.Format("{0}.{1}", testDatabaseName, testDevice));
8484
res.ShowTableNames();
8585
var res_count = 0;
86-
while (res.Next())
86+
while (res.HasNext())
8787
{
8888
res_count += 1;
8989
}
@@ -175,7 +175,7 @@ public async Task TestInsertTablets()
175175
"select * from " + string.Format("{0}.{1}", testDatabaseName, testDevices[1]));
176176
res.ShowTableNames();
177177
var res_count = 0;
178-
while (res.Next())
178+
while (res.HasNext())
179179
{
180180
res_count += 1;
181181
}
@@ -213,9 +213,9 @@ public async Task TestInsertTabletWithNullValue()
213213
"select * from " + string.Format("{0}.{1}", testDatabaseName, testDevice));
214214
res.ShowTableNames();
215215
var res_count = 0;
216-
while (res.Next())
216+
while (res.HasNext())
217217
{
218-
Console.WriteLine(res.GetRow());
218+
Console.WriteLine(res.Next());
219219
res_count += 1;
220220
}
221221

@@ -276,9 +276,9 @@ public async Task TestInsertTabletWithAllType()
276276
"select * from " + string.Format("{0}.{1}", testDatabaseName, testDevice));
277277
res.ShowTableNames();
278278
var res_count = 0;
279-
while (res.Next())
279+
while (res.HasNext())
280280
{
281-
Console.WriteLine(res.GetRow());
281+
Console.WriteLine(res.Next());
282282
res_count += 1;
283283
}
284284

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -171,7 +171,7 @@ public async Task TestTestInsertRecords()
171171
res.ShowTableNames();
172172
var record_count = fetchSize * processedSize;
173173
var res_count = 0;
174-
while (res.Next())
174+
while (res.HasNext())
175175
{
176176
res_count += 1;
177177
}
@@ -240,7 +240,7 @@ public async Task TestTestInsertTablet()
240240
"select * from " + string.Format("{0}.{1}", testDatabaseName, testDevice));
241241
res.ShowTableNames();
242242
var res_count = 0;
243-
while (res.Next())
243+
while (res.HasNext())
244244
{
245245
res_count += 1;
246246
}
@@ -331,7 +331,7 @@ public async Task TestTestInsertTablets()
331331
"select * from " + string.Format("{0}.{1}", testDatabaseName, testDevices[1]));
332332
res.ShowTableNames();
333333
var res_count = 0;
334-
while (res.Next())
334+
while (res.HasNext())
335335
{
336336
res_count += 1;
337337
}

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -512,7 +512,7 @@ public async Task TestRawDataQuery()
512512

513513
var res = await session_pool.ExecuteRawDataQuery(paths, 10, fetchSize * processedSize);
514514
var count = 0;
515-
while (res.Next())
515+
while (res.HasNext())
516516
{
517517
count++;
518518
}
@@ -558,7 +558,7 @@ public async Task TestLastDataQuery()
558558

559559
var res = await session_pool.ExecuteLastDataQueryAsync(paths, fetchSize * processedSize - 10);
560560
var count = 0;
561-
while (res.Next())
561+
while (res.HasNext())
562562
{
563563
Console.WriteLine(count);
564564
count++;
@@ -621,7 +621,7 @@ public async Task TestMultiNodeDataFetch()
621621
Console.WriteLine();
622622

623623
var count = 0;
624-
while (res.Next()) count++;
624+
while (res.HasNext()) count++;
625625

626626
Console.WriteLine(count + " " + (fetchSize * processedSize * 4 + 783));
627627
System.Diagnostics.Debug.Assert(count == fetchSize * processedSize * 4 + 783);

‎samples/Apache.IoTDB.Samples/TableSessionPoolTest.cs‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -73,14 +73,14 @@ await tableSessionPool.ExecuteNonQueryStatementAsync(
7373
// show tables from current database
7474
var res = await tableSessionPool.ExecuteQueryStatementAsync("SHOW TABLES");
7575
res.ShowTableNames();
76-
while (res.Next()) Console.WriteLine(res.GetRow());
76+
while (res.HasNext()) Console.WriteLine(res.Next());
7777
await res.Close();
7878

7979
// show tables by specifying another database
8080
// using SHOW tables FROM
8181
res = await tableSessionPool.ExecuteQueryStatementAsync("SHOW TABLES FROM test1");
8282
res.ShowTableNames();
83-
while (res.Next()) Console.WriteLine(res.GetRow());
83+
while (res.HasNext()) Console.WriteLine(res.Next());
8484
await res.Close();
8585

8686
var tableName = "testTable1";
@@ -123,7 +123,7 @@ await tableSessionPool.ExecuteNonQueryStatementAsync(
123123
res = await tableSessionPool.ExecuteQueryStatementAsync("select * from testTable1 "
124124
+ "where region_id = '1' and plant_id in ('3', '5') and device_id = '3'");
125125
res.ShowTableNames();
126-
while (res.Next()) Console.WriteLine(res.GetRow());
126+
while (res.HasNext()) Console.WriteLine(res.Next());
127127
await res.Close();
128128

129129
await tableSessionPool.Close();
@@ -148,15 +148,15 @@ public async Task TestUseDatabase()
148148
// show tables from current database
149149
var res = await tableSessionPool.ExecuteQueryStatementAsync("SHOW TABLES");
150150
res.ShowTableNames();
151-
while (res.Next()) Console.WriteLine(res.GetRow());
151+
while (res.HasNext()) Console.WriteLine(res.Next());
152152
await res.Close();
153153

154154
await tableSessionPool.ExecuteNonQueryStatementAsync("use test2");
155155

156156
// show tables from current database
157157
res = await tableSessionPool.ExecuteQueryStatementAsync("SHOW TABLES");
158158
res.ShowTableNames();
159-
while (res.Next()) Console.WriteLine(res.GetRow());
159+
while (res.HasNext()) Console.WriteLine(res.Next());
160160
await res.Close();
161161

162162
await tableSessionPool.Close();
@@ -225,9 +225,9 @@ await tableSessionPool.ExecuteNonQueryStatementAsync(
225225

226226

227227
var res = await tableSessionPool.ExecuteQueryStatementAsync("select count(*) from " + tableName + " where f1 is null");
228-
while (res.Next())
228+
while (res.HasNext())
229229
{
230-
var row = res.GetRow();
230+
var row = res.Next();
231231
Console.WriteLine(row);
232232
var value = row.Values[0];
233233
if (value is long longValue)

‎samples/Apache.IoTDB.Samples/UtilsTest.cs‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -90,7 +90,7 @@ static public void PrintDataSetByType(SessionDataSet sessionDataSet)
9090
}
9191
Console.WriteLine();
9292

93-
while (sessionDataSet.Next())
93+
while (sessionDataSet.HasNext())
9494
{
9595
for (int i = 0; i < columns.Count; i++)
9696
{
@@ -147,7 +147,7 @@ static public void PrintDataSetByObject(SessionDataSet sessionDataSet)
147147
}
148148
Console.WriteLine();
149149

150-
while (sessionDataSet.Next())
150+
while (sessionDataSet.HasNext())
151151
{
152152
for (int i = 0; i < columns.Count; i++)
153153
{
@@ -169,7 +169,7 @@ static public void PrintDataSetByString(SessionDataSet sessionDataSet)
169169
}
170170
Console.WriteLine();
171171

172-
while (sessionDataSet.Next())
172+
while (sessionDataSet.HasNext())
173173
{
174174
for (int i = 0; i < columns.Count; i++)
175175
{

‎src/Apache.IoTDB.Data/IoTDBDataReader.cs‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -137,9 +137,9 @@ public override bool Read()
137137
{
138138
throw new InvalidOperationException($"DataReaderClosed{nameof(Read)}");
139139
}
140-
if (_dataSet.Next())
140+
if (_dataSet.HasNext())
141141
{
142-
rowdata = _dataSet.GetRow();
142+
rowdata = _dataSet.Next();
143143
}
144144
else
145145
{
@@ -455,9 +455,9 @@ public override int GetValues(object[] values)
455455
/// <returns>A System.Data.DataTable that describes the column metadata.</returns>
456456
public override DataTable GetSchemaTable()
457457
{
458-
if (_dataSet.Next())
458+
if (_dataSet.HasNext())
459459
{
460-
rowdata = _dataSet.GetRow();
460+
rowdata = _dataSet.Next();
461461
}
462462
var schemaTable = new DataTable("SchemaTable");
463463
if (_metas != null && rowdata != null)

0 commit comments

Comments
 (0)