This is an automated email from the ASF dual-hosted git repository. leirui pushed a commit to branch research/M4-visualization in repository https://gitbox.apache.org/repos/asf/iotdb.git
commit cdc4fc55c33e9e72e104c2c36ccd91b55af51096 Author: Lei Rui <[email protected]> AuthorDate: Thu Jun 15 16:39:31 2023 +0800 fix session fetchsize bug --- client-py/iotdb/Session.py | 1 + client-py/iotdb/utils/SessionDataSet.py | 3 +- .../apache/iotdb/session/SessionConnection.java | 6 ++- .../org/apache/iotdb/session/SessionDataSet.java | 57 ++++++++++++++++++++++ 4 files changed, 64 insertions(+), 3 deletions(-) diff --git a/client-py/iotdb/Session.py b/client-py/iotdb/Session.py index 7e861ffb247..eb90edea588 100644 --- a/client-py/iotdb/Session.py +++ b/client-py/iotdb/Session.py @@ -660,6 +660,7 @@ class Session(object): self.__session_id, resp.queryDataSet, resp.ignoreTimeStamp, + self.__fetch_size ) def execute_non_query_statement(self, sql): diff --git a/client-py/iotdb/utils/SessionDataSet.py b/client-py/iotdb/utils/SessionDataSet.py index 7d49c5e691f..f8946cd3c07 100644 --- a/client-py/iotdb/utils/SessionDataSet.py +++ b/client-py/iotdb/utils/SessionDataSet.py @@ -43,6 +43,7 @@ class SessionDataSet(object): session_id, query_data_set, ignore_timestamp, + fetch_size ): self.iotdb_rpc_data_set = IoTDBRpcDataSet( sql, @@ -55,7 +56,7 @@ class SessionDataSet(object): statement_id, session_id, query_data_set, - 1024, + fetch_size ) def get_fetch_size(self): diff --git a/session/src/main/java/org/apache/iotdb/session/SessionConnection.java b/session/src/main/java/org/apache/iotdb/session/SessionConnection.java index e51d1abe3d9..2d4e846f722 100644 --- a/session/src/main/java/org/apache/iotdb/session/SessionConnection.java +++ b/session/src/main/java/org/apache/iotdb/session/SessionConnection.java @@ -383,7 +383,8 @@ public class SessionConnection { sessionId, execResp.queryDataSet, execResp.isIgnoreTimeStamp(), - timeout); + timeout, + session.fetchSize); } protected void executeNonQueryStatement(String sql) @@ -443,7 +444,8 @@ public class SessionConnection { client, sessionId, execResp.queryDataSet, - execResp.isIgnoreTimeStamp()); + execResp.isIgnoreTimeStamp(), + session.fetchSize); } protected void insertRecord(TSInsertRecordReq request) diff --git a/session/src/main/java/org/apache/iotdb/session/SessionDataSet.java b/session/src/main/java/org/apache/iotdb/session/SessionDataSet.java index 2c72bd8fda8..bb0753223b1 100644 --- a/session/src/main/java/org/apache/iotdb/session/SessionDataSet.java +++ b/session/src/main/java/org/apache/iotdb/session/SessionDataSet.java @@ -71,6 +71,34 @@ public class SessionDataSet { 0); } + public SessionDataSet( + String sql, + List<String> columnNameList, + List<String> columnTypeList, + Map<String, Integer> columnNameIndex, + long queryId, + long statementId, + TSIService.Iface client, + long sessionId, + TSQueryDataSet queryDataSet, + boolean ignoreTimeStamp, + int fetchSize) { + this.ioTDBRpcDataSet = + new IoTDBRpcDataSet( + sql, + columnNameList, + columnTypeList, + columnNameIndex, + ignoreTimeStamp, + queryId, + statementId, + client, + sessionId, + queryDataSet, + fetchSize, + 0); + } + public SessionDataSet(String finishResult) { this.finishResult = finishResult; this.ioTDBRpcDataSet = @@ -117,6 +145,35 @@ public class SessionDataSet { timeout); } + public SessionDataSet( + String sql, + List<String> columnNameList, + List<String> columnTypeList, + Map<String, Integer> columnNameIndex, + long queryId, + long statementId, + TSIService.Iface client, + long sessionId, + TSQueryDataSet queryDataSet, + boolean ignoreTimeStamp, + long timeout, + int fetchSize) { + this.ioTDBRpcDataSet = + new IoTDBRpcDataSet( + sql, + columnNameList, + columnTypeList, + columnNameIndex, + ignoreTimeStamp, + queryId, + statementId, + client, + sessionId, + queryDataSet, + fetchSize, + timeout); + } + public int getFetchSize() { return ioTDBRpcDataSet.fetchSize; }
