Skip to content

Commit de35a26

Browse files
committed
当没有数据时不fetch_block
1 parent 965dcfe commit de35a26

File tree

2 files changed

+23
-59
lines changed

2 files changed

+23
-59
lines changed

src/IoTSharp.Data.Taos/Protocols/TDWebSocket/TaosWebSocket.cs

Lines changed: 23 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -353,27 +353,30 @@ private TaosWSResult Execute(string _commandText)
353353
{
354354
List<byte> data = new List<byte>();
355355
int _rows = repfetch.rows;
356-
do
356+
if (_rows > 0)
357357
{
358-
byte[] buffer = new byte[] { };
359-
var repfetch_block = WSExecute<byte[], WSFetchReq>
360-
(
361-
_ws_client, new WSActionReq<WSFetchReq>()
362-
{
363-
Action = "fetch_block",
364-
Args = new WSFetchReq() { req_id = repquery.req_id, id = repfetch.id }
365-
},
366-
(byte[] bytes, int len) =>
367-
{
368-
buffer = new byte[len];
369-
Array.Copy(bytes, buffer, len);
370-
}
371-
);
372-
repfetch = WSExecute<WSFetchRsp, WSFetchReq>(_ws_client, new WSActionReq<WSFetchReq>() { Action = "fetch", Args = new WSFetchReq { req_id = repquery.req_id, id = repquery.id } });
373-
// _rows += repfetch.rows;
374-
data.AddRange(buffer);
375-
} while (!repfetch.completed);
376-
WSExecute(_ws_client, "free_result", new { repquery.req_id, repquery.id });
358+
do
359+
{
360+
byte[] buffer = new byte[] { };
361+
var repfetch_block = WSExecute<byte[], WSFetchReq>
362+
(
363+
_ws_client, new WSActionReq<WSFetchReq>()
364+
{
365+
Action = "fetch_block",
366+
Args = new WSFetchReq() { req_id = repquery.req_id, id = repfetch.id }
367+
},
368+
(byte[] bytes, int len) =>
369+
{
370+
buffer = new byte[len];
371+
Array.Copy(bytes, buffer, len);
372+
}
373+
);
374+
repfetch = WSExecute<WSFetchRsp, WSFetchReq>(_ws_client, new WSActionReq<WSFetchReq>() { Action = "fetch", Args = new WSFetchReq { req_id = repquery.req_id, id = repquery.id } });
375+
// _rows += repfetch.rows;
376+
data.AddRange(buffer);
377+
} while (!repfetch.completed);
378+
WSExecute(_ws_client, "free_result", new { repquery.req_id, repquery.id });
379+
}
377380
wSResult = new TaosWSResult() { data = data.ToArray(), meta = repquery, rows = _rows };
378381
}
379382
else

src/IoTSharp.HealthChecks.Taos/IoTSharp - Backup.HealthChecks.Taos.csproj

Lines changed: 0 additions & 39 deletions
This file was deleted.

0 commit comments

Comments
 (0)