refactor ReadAllResultSetsHelper

Author: XmasApple

src/Ydb.Sdk/src/Services/Query/QueryClient.cs

@@ -137,21 +137,13 @@ public async Task<QueryResponse> Exec(string queryString,
 
     internal static async Task<IReadOnlyList<Value.ResultSet.Row>> ReadAllRowsHelper(ExecuteQueryStream stream)
     {
-        var rows = new List<Value.ResultSet.Row>();
-        await foreach (var part in stream)
+        var resultSets = await ReadAllResultSetsHelper(stream);
+        if (resultSets.Count > 1)
         {
-            if (part.ResultSetIndex != 0)
-            {
-                throw new QueryWrongResultFormatException("Should be only one resultSet");
-            }
-
-            if (part.ResultSet is not null)
-            {
-                rows.AddRange(part.ResultSet.Rows);
-            }
+            throw new QueryWrongResultFormatException("Should be only one resultSet");
         }
 
-        return rows;
+        return resultSets[0];
     }
 
     internal static async Task<Value.ResultSet.Row> ReadSingleRowHelper(ExecuteQueryStream stream)
@@ -184,6 +176,7 @@ internal static async Task<YdbValue> ReadScalarHelper(ExecuteQueryStream stream)
         {
             throw new QueryWrongResultFormatException("Row should contain exactly one field");
         }
+
         return row[0];
     }
 

src/Ydb.Sdk/src/Services/Query/Tx.cs

@@ -56,7 +56,7 @@ internal static Tx Begin(ITxModeSettings? txModeSettings, QueryClient client, st
 
         var txSettings = GetTransactionSettings(txModeSettings);
 
-        var tx = new Tx(new TransactionControl { BeginTx = txSettings, CommitTx = commit }, client: client, sessionId: sessionId);
+        var tx = new Tx(new TransactionControl { BeginTx = txSettings, CommitTx = commit }, client, sessionId);
         return tx;
     }
 
@@ -136,7 +136,8 @@ public async Task<QueryResponse> Exec(string queryString,
         return response;
     }
 
-    public async Task<QueryResponseWithResult<IReadOnlyList<IReadOnlyList<Value.ResultSet.Row>>>> ReadAllResultSets(string queryString,
+    public async Task<QueryResponseWithResult<IReadOnlyList<IReadOnlyList<Value.ResultSet.Row>>>> ReadAllResultSets(
+        string queryString,
         Dictionary<string, YdbValue>? parameters = null,
         ExecuteQuerySettings? executeQuerySettings = null)
     {
@@ -145,23 +146,27 @@ public async Task<QueryResponse> Exec(string queryString,
         return response;
     }
 
-    public async Task<QueryResponseWithResult<IReadOnlyList<Value.ResultSet.Row>>> ReadAllRows(string queryString,
+    public async Task<QueryResponseWithResult<IReadOnlyList<Value.ResultSet.Row>>> ReadAllRows(
+        string queryString,
         Dictionary<string, YdbValue>? parameters = null,
         ExecuteQuerySettings? executeQuerySettings = null)
     {
         var response = await Query(queryString, parameters, QueryClient.ReadAllRowsHelper, executeQuerySettings);
         return response;
     }
-    
-    public async Task<QueryResponseWithResult<Value.ResultSet.Row>> ReadSingleRow(string queryString,
+
+    public async Task<QueryResponseWithResult<Value.ResultSet.Row>> ReadSingleRow(
+        string queryString,
         Dictionary<string, YdbValue>? parameters = null,
         ExecuteQuerySettings? executeQuerySettings = null)
     {
         var response = await Query(queryString, parameters, QueryClient.ReadSingleRowHelper,
             executeQuerySettings);
         return response;
     }
-    public async Task<QueryResponseWithResult<YdbValue>> ReadScalar(string queryString,
+
+    public async Task<QueryResponseWithResult<YdbValue>> ReadScalar(
+        string queryString,
         Dictionary<string, YdbValue>? parameters = null,
         ExecuteQuerySettings? executeQuerySettings = null)
     {