fix comments (#2)

lausannel · fpddmw · web-flow · commit 357307a612d6 · 2025-08-24T17:57:31.000+01:00
* add tsblock

* develop tsblock and rpcdataset

* improve code specifications

* develop RpcDataSet api

* coding api in SessionDataSet and rpcDataSet

* fix bugs &amp; pass test

* adapted to IoTDBDataReader

* adopted comments

* add license and change ubuntu version

* format code

* fix pull request

* fix valueIsNull

---------

Co-authored-by: xxhz22 &lt;1791961174@qq.com&gt;
diff --git a/samples/Apache.IoTDB.Samples/SessionPoolTest.AlignedRecord.cs b/samples/Apache.IoTDB.Samples/SessionPoolTest.AlignedRecord.cs
@@ -218,7 +218,7 @@ public async Task TestInsertAlignedRecords()
             while (res.Next())
             {
                 res_count += 1;
-                Console.WriteLine(res.GetRow());
+                Console.WriteLine(res.Next());
             }
 
             await res.Close();
@@ -299,7 +299,7 @@ public async Task TestInsertAlignedStringRecords()
             var res_count = 0;
             while (res.Next())
             {
-                Console.WriteLine(res.GetRow());
+                Console.WriteLine(res.Next());
                 res_count += 1;
             }
 
diff --git a/samples/Apache.IoTDB.Samples/SessionPoolTest.Record.cs b/samples/Apache.IoTDB.Samples/SessionPoolTest.Record.cs
@@ -382,7 +382,7 @@ public async Task TestInsertStringRecords()
             var res_count = 0;
             while (res.Next())
             {
-                Console.WriteLine(res.GetRow());
+                Console.WriteLine(res.Next());
                 res_count += 1;
             }
 
diff --git a/samples/Apache.IoTDB.Samples/SessionPoolTest.cs b/samples/Apache.IoTDB.Samples/SessionPoolTest.cs
@@ -621,7 +621,7 @@ public async Task TestMultiNodeDataFetch()
             Console.WriteLine();
 
             var count = 0;
-            while (res.Next()) count++;
+            while (res.HasNext()) count++;
 
             Console.WriteLine(count + " " + (fetchSize * processedSize * 4 + 783));
             System.Diagnostics.Debug.Assert(count == fetchSize * processedSize * 4 + 783);
diff --git a/samples/Apache.IoTDB.Samples/UtilsTest.cs b/samples/Apache.IoTDB.Samples/UtilsTest.cs
@@ -90,7 +90,7 @@ static public void PrintDataSetByType(SessionDataSet sessionDataSet)
             }
             Console.WriteLine();
 
-            while (sessionDataSet.Next())
+            while (sessionDataSet.HasNext())
             {
                 for (int i = 0; i < columns.Count; i++)
                 {
@@ -147,7 +147,7 @@ static public void PrintDataSetByObject(SessionDataSet sessionDataSet)
             }
             Console.WriteLine();
 
-            while (sessionDataSet.Next())
+            while (sessionDataSet.HasNext())
             {
                 for (int i = 0; i < columns.Count; i++)
                 {
@@ -169,7 +169,7 @@ static public void PrintDataSetByString(SessionDataSet sessionDataSet)
             }
             Console.WriteLine();
 
-            while (sessionDataSet.Next())
+            while (sessionDataSet.HasNext())
             {
                 for (int i = 0; i < columns.Count; i++)
                 {
diff --git a/src/Apache.IoTDB.Data/IoTDBDataReader.cs b/src/Apache.IoTDB.Data/IoTDBDataReader.cs
@@ -457,7 +457,7 @@ public override DataTable GetSchemaTable()
         {
             if (_dataSet.Next())
             {
-                rowdata = _dataSet.GetRow();
+                rowdata = _dataSet.Next();
             }
             var schemaTable = new DataTable("SchemaTable");
             if (_metas != null && rowdata != null)
diff --git a/src/Apache.IoTDB/DataStructure/ByteBuffer.cs b/src/Apache.IoTDB/DataStructure/ByteBuffer.cs
@@ -146,7 +146,7 @@ public byte[] GetBuffer()
             return _buffer[.._writePos];
         }
 
-        public byte[] GetBytesbyLength(int length)
+        public byte[] GetBytesByLengthh(int length)
         {
             if (_readPos + length > _buffer.Length)
                 throw new ArgumentOutOfRangeException(nameof(length),
diff --git a/src/Apache.IoTDB/DataStructure/Column.cs b/src/Apache.IoTDB/DataStructure/Column.cs
@@ -175,7 +175,7 @@ public BinaryColumn(int arrayOffset, int positionCount, bool[] valueIsNull, Bina
             ColumnEncoding.BinaryArray,
             arrayOffset: arrayOffset,
             positionCount: positionCount,
-            valueIsNull: null,
+            valueIsNull: valueIsNull,
             values: values)
         { }
 
@@ -193,7 +193,7 @@ public IntColumn(int arrayOffset, int positionCount, bool[] valueIsNull, int[] v
             ColumnEncoding.Int32Array,
             arrayOffset: arrayOffset,
             positionCount: positionCount,
-            valueIsNull: null,
+            valueIsNull: valueIsNull,
             values: values)
         { }
 
@@ -211,7 +211,7 @@ public FloatColumn(int arrayOffset, int positionCount, bool[] valueIsNull, float
             ColumnEncoding.Int32Array,
             arrayOffset: arrayOffset,
             positionCount: positionCount,
-            valueIsNull: null,
+            valueIsNull: valueIsNull,
             values: values)
         { }
 
@@ -229,7 +229,7 @@ public LongColumn(int arrayOffset, int positionCount, bool[] valueIsNull, long[]
             ColumnEncoding.Int64Array,
             arrayOffset: arrayOffset,
             positionCount: positionCount,
-            valueIsNull: null,
+            valueIsNull: valueIsNull,
             values: values)
         { }
 
@@ -247,7 +247,7 @@ public DoubleColumn(int arrayOffset, int positionCount, bool[] valueIsNull, doub
             ColumnEncoding.Int64Array,
             arrayOffset: arrayOffset,
             positionCount: positionCount,
-            valueIsNull: null,
+            valueIsNull: valueIsNull,
             values: values)
         { }
 
@@ -265,7 +265,7 @@ public BooleanColumn(int arrayOffset, int positionCount, bool[] valueIsNull, boo
             ColumnEncoding.ByteArray,
             arrayOffset: arrayOffset,
             positionCount: positionCount,
-            valueIsNull: null,
+            valueIsNull: valueIsNull,
             values: values)
         { }
 
diff --git a/src/Apache.IoTDB/DataStructure/ColumnDecoder.cs b/src/Apache.IoTDB/DataStructure/ColumnDecoder.cs
@@ -68,7 +68,7 @@ public static bool[] DeserializeNullIndicators(ByteBuffer reader, int positionCo
         public static bool[] DeserializeBooleanArray(ByteBuffer reader, int size)
         {
             int packedSize = (size + 7) / 8;
-            byte[] packedBytes = reader.GetBytesbyLength(packedSize);
+            byte[] packedBytes = reader.GetBytesByLengthh(packedSize);
             if (packedBytes.Length < packedSize)
                 throw new InvalidDataException(
                     $"Boolean array decoding failed: expected {packedSize} bytes for {size} bits, but only received {packedBytes.Length} bytes from buffer."
@@ -199,7 +199,7 @@ public Column ReadColumn(ByteBuffer reader, TSDataType dataType, int positionCou
                 if (nullIndicators != null && nullIndicators[i])
                     continue;
                 int length = reader.GetInt();
-                byte[] value = reader.GetBytesbyLength(length);
+                byte[] value = reader.GetBytesByLengthh(length);
                 values[i] = new Binary(value);
             }
 
diff --git a/src/Apache.IoTDB/DataStructure/RpcDataSet.cs b/src/Apache.IoTDB/DataStructure/RpcDataSet.cs
@@ -185,7 +185,7 @@ public async Task Close()
 
             try
             {
-                var status = await _client.ServiceClient.closeOperation(closeRequest);
+                var status = await _client.ServiceClient.closeOperationAsync(closeRequest);
             }
             catch (TException e)
             {
@@ -242,8 +242,7 @@ private bool FetchResults()
 
             try
             {
-                var task = _client.ServiceClient.fetchResultsV2(req);
-
+                var task = _client.ServiceClient.fetchResultsV2Async(req);
                 var resp = task.ConfigureAwait(false).GetAwaiter().GetResult();
 
                 if (!resp.HasResultSet)
diff --git a/src/Apache.IoTDB/DataStructure/SessionDataSet.cs b/src/Apache.IoTDB/DataStructure/SessionDataSet.cs
@@ -33,11 +33,7 @@ public class SessionDataSet : System.IDisposable
         private readonly List<string> _columnNames;
         private readonly Dictionary<string, int> _columnNameIndexMap;
         private readonly List<string> _columnTypeLst;
-        private readonly int _columnSize;
-        private List<ByteBuffer> _valueBufferLst, _bitmapBufferLst;
         private Client _client;
-        private int _rowIndex;
-        private RowRecord _cachedRowRecord;
         private bool _isClosed = false;
         private bool disposedValue;
         private RpcDataSet _rpcDataSet;
@@ -52,35 +48,28 @@ public class SessionDataSet : System.IDisposable
         public SessionDataSet(
             string sql, List<string> ColumnNameList, List<string> ColumnTypeList,
             Dictionary<string, int> ColumnNameIndexMap, long QueryId, long statementId, Client client, List<byte[]> QueryResult,
-            bool IgnoreTimeStamp, bool MoreData, string zoneId, List<int> ColumnIndex2TsBlockColumnIndexList, ConcurrentClientQueue _clientQueueS
+            bool IgnoreTimeStamp, bool MoreData, string zoneId, List<int> ColumnIndex2TsBlockColumnIndexList, ConcurrentClientQueue clientQueue
         )
         {
             _client = client;
             _sql = sql;
             _queryId = QueryId;
             _statementId = statementId;
-            _columnSize = ColumnNameList.Count;
             _columnNameIndexMap = ColumnNameIndexMap;
-            _rowIndex = 0;
 
             _columnNames = ColumnNameList;
             _columnTypeLst = ColumnTypeList;
             _zoneId = zoneId;
-            _clientQueue = _clientQueueS;
-
+            _clientQueue = clientQueue;
+            
             _rpcDataSet = new RpcDataSet(
                 _sql, _columnNames, _columnTypeLst, _columnNameIndexMap, IgnoreTimeStamp,
                 MoreData, _queryId, _statementId, _client, _client.SessionId, QueryResult, FetchSize,
                 DefaultTimeout, _zoneId, ColumnIndex2TsBlockColumnIndexList
             );
         }
-        public bool HasNext()
-        {
-            if (_rpcDataSet.HasCachedRecord) return true;
-            return Next();
-        }
-
-        public bool Next() => _rpcDataSet.Next();
+        public bool HasNext() => _rpcDataSet.Next();
+        public RowRecord Next() => _rpcDataSet.GetRow();
         public bool IsNull(string columnName) => _rpcDataSet.IsNullByColumnName(columnName);
         public bool IsNullByIndex(int columnIndex) => _rpcDataSet.IsNullByIndex(columnIndex);
 
@@ -119,9 +108,7 @@ public bool HasNext()
         public IReadOnlyList<string> GetColumnNames() => _rpcDataSet._columnNameList;
         public IReadOnlyList<string> GetColumnTypes() => _rpcDataSet._columnTypeList;
 
-        public RowRecord GetRow() => _rpcDataSet.GetRow();
         public int RowCount() => _rpcDataSet._tsBlockSize;
-
         public void ShowTableNames()
         {
             IReadOnlyList<string> columns = GetColumnNames();
@@ -173,8 +160,6 @@ protected virtual void Dispose(bool disposing)
                     {
                     }
                 }
-                _valueBufferLst = null;
-                _bitmapBufferLst = null;
                 disposedValue = true;
             }
         }
diff --git a/src/Apache.IoTDB/DataStructure/TsBlock.cs b/src/Apache.IoTDB/DataStructure/TsBlock.cs
@@ -77,10 +77,10 @@ public static TsBlock Deserialize(ByteBuffer reader)
             ColumnEncoding timeColumnEncodings = DeserializeColumnEncoding(reader);
 
             // Read value column encodings
-            var valuecolumnEncodings = new ColumnEncoding[valueColumnCount];
+            var valueColumnEncodings = new ColumnEncoding[valueColumnCount];
             for (int i = 1; i < valueColumnCount + 1; i++)
             {
-                valuecolumnEncodings[i - 1] = DeserializeColumnEncoding(reader);
+                valueColumnEncodings[i - 1] = DeserializeColumnEncoding(reader);
             }
 
             // Read time column
@@ -91,7 +91,7 @@ public static TsBlock Deserialize(ByteBuffer reader)
             var valueColumns = new Column[valueColumnCount];
             for (int i = 1; i < valueColumnCount + 1; i++)
             {
-                var decoder = BaseColumnDecoder.GetDecoder(valuecolumnEncodings[i - 1]);
+                var decoder = BaseColumnDecoder.GetDecoder(valueColumnEncodings[i - 1]);
                 valueColumns[i - 1] = decoder.ReadColumn(reader, valueColumnDataTypes[i - 1], positionCount);
             }
 
diff --git a/src/Apache.IoTDB/SessionPool.cs b/src/Apache.IoTDB/SessionPool.cs
@@ -1327,7 +1327,7 @@ public async Task<SessionDataSet> ExecuteQueryStatementAsync(string sql, long ti
                         Timeout = timeoutInMs
                     };
 
-                    var resp = await client.ServiceClient.executeQueryStatementV2(req);
+                    var resp = await client.ServiceClient.executeQueryStatementV2Async(req);
                     var status = resp.Status;
 
                     if (_utilFunctions.VerifySuccess(status) == -1)
@@ -1360,7 +1360,7 @@ public async Task<SessionDataSet> ExecuteStatementAsync(string sql, long timeout
                         Timeout = timeout
                     };
 
-                    var resp = await client.ServiceClient.executeStatementV2(req);
+                    var resp = await client.ServiceClient.executeStatementV2Async(req);
                     var status = resp.Status;
 
                     if (_utilFunctions.VerifySuccess(status) == -1)
@@ -1440,7 +1440,7 @@ public async Task<SessionDataSet> ExecuteRawDataQuery(List<string> paths, long s
                         EnableRedirectQuery = false
                     };
 
-                    var resp = await client.ServiceClient.executeRawDataQueryV2(req);
+                    var resp = await client.ServiceClient.executeRawDataQueryV2Async(req);
                     var status = resp.Status;
 
                     if (_utilFunctions.VerifySuccess(status) == -1)
@@ -1472,7 +1472,7 @@ public async Task<SessionDataSet> ExecuteLastDataQueryAsync(List<string> paths,
                         EnableRedirectQuery = false
                     };
 
-                    var resp = await client.ServiceClient.executeLastDataQueryV2(req);
+                    var resp = await client.ServiceClient.executeLastDataQueryV2Async(req);
                     var status = resp.Status;
 
                     if (_utilFunctions.VerifySuccess(status) == -1)

Original file line number	Diff line number	Diff line change
`@@ -218,7 +218,7 @@ public async Task TestInsertAlignedRecords()`
`218`	`218`	`while (res.Next())`
`219`	`219`	`{`
`220`	`220`	`res_count += 1;`
`221`		`- Console.WriteLine(res.GetRow());`
	`221`	`+ Console.WriteLine(res.Next());`
`222`	`222`	`}`
`223`	`223`
`224`	`224`	`await res.Close();`
`@@ -299,7 +299,7 @@ public async Task TestInsertAlignedStringRecords()`
`299`	`299`	`var res_count = 0;`
`300`	`300`	`while (res.Next())`
`301`	`301`	`{`
`302`		`- Console.WriteLine(res.GetRow());`
	`302`	`+ Console.WriteLine(res.Next());`
`303`	`303`	`res_count += 1;`
`304`	`304`	`}`
`305`	`305`
Original file line number	Diff line number	Diff line change
`@@ -382,7 +382,7 @@ public async Task TestInsertStringRecords()`
`382`	`382`	`var res_count = 0;`
`383`	`383`	`while (res.Next())`
`384`	`384`	`{`
`385`		`- Console.WriteLine(res.GetRow());`
	`385`	`+ Console.WriteLine(res.Next());`
`386`	`386`	`res_count += 1;`
`387`	`387`	`}`
`388`	`388`
Original file line number	Diff line number	Diff line change
`@@ -90,7 +90,7 @@ static public void PrintDataSetByType(SessionDataSet sessionDataSet)`
`90`	`90`	`}`
`91`	`91`	`Console.WriteLine();`
`92`	`92`
`93`		`- while (sessionDataSet.Next())`
	`93`	`+ while (sessionDataSet.HasNext())`
`94`	`94`	`{`
`95`	`95`	`for (int i = 0; i < columns.Count; i++)`
`96`	`96`	`{`
`@@ -147,7 +147,7 @@ static public void PrintDataSetByObject(SessionDataSet sessionDataSet)`
`147`	`147`	`}`
`148`	`148`	`Console.WriteLine();`
`149`	`149`
`150`		`- while (sessionDataSet.Next())`
	`150`	`+ while (sessionDataSet.HasNext())`
`151`	`151`	`{`
`152`	`152`	`for (int i = 0; i < columns.Count; i++)`
`153`	`153`	`{`
`@@ -169,7 +169,7 @@ static public void PrintDataSetByString(SessionDataSet sessionDataSet)`
`169`	`169`	`}`
`170`	`170`	`Console.WriteLine();`
`171`	`171`
`172`		`- while (sessionDataSet.Next())`
	`172`	`+ while (sessionDataSet.HasNext())`
`173`	`173`	`{`
`174`	`174`	`for (int i = 0; i < columns.Count; i++)`
`175`	`175`	`{`
Original file line number	Diff line number	Diff line change
`@@ -457,7 +457,7 @@ public override DataTable GetSchemaTable()`
`457`	`457`	`{`
`458`	`458`	`if (_dataSet.Next())`
`459`	`459`	`{`
`460`		`- rowdata = _dataSet.GetRow();`
	`460`	`+ rowdata = _dataSet.Next();`
`461`	`461`	`}`
`462`	`462`	`var schemaTable = new DataTable("SchemaTable");`
`463`	`463`	`if (_metas != null && rowdata != null)`
Original file line number	Diff line number	Diff line change
`@@ -146,7 +146,7 @@ public byte[] GetBuffer()`
`146`	`146`	`return _buffer[.._writePos];`
`147`	`147`	`}`
`148`	`148`
`149`		`- public byte[] GetBytesbyLength(int length)`
	`149`	`+ public byte[] GetBytesByLengthh(int length)`
`150`	`150`	`{`
`151`	`151`	`if (_readPos + length > _buffer.Length)`
`152`	`152`	`throw new ArgumentOutOfRangeException(nameof(length),`
Original file line number	Diff line number	Diff line change
`@@ -185,7 +185,7 @@ public async Task Close()`
`185`	`185`
`186`	`186`	`try`
`187`	`187`	`{`
`188`		`- var status = await _client.ServiceClient.closeOperation(closeRequest);`
	`188`	`+ var status = await _client.ServiceClient.closeOperationAsync(closeRequest);`
`189`	`189`	`}`
`190`	`190`	`catch (TException e)`
`191`	`191`	`{`
`@@ -242,8 +242,7 @@ private bool FetchResults()`
`242`	`242`
`243`	`243`	`try`
`244`	`244`	`{`
`245`		`- var task = _client.ServiceClient.fetchResultsV2(req);`
`246`		`-`
	`245`	`+ var task = _client.ServiceClient.fetchResultsV2Async(req);`
`247`	`246`	`var resp = task.ConfigureAwait(false).GetAwaiter().GetResult();`
`248`	`247`
`249`	`248`	`if (!resp.HasResultSet)`