You are viewing a plain text version of this content. The canonical link for it is here.

Posted to commits@iotdb.apache.org by ja...@apache.org on 2021/01/19 06:58:53 UTC

[iotdb] branch master updated (36e80ad -> 3070992)

This is an automated email from the ASF dual-hosted git repository.

jackietien pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/iotdb.git.


    from 36e80ad  edit DDL, DML, SQL doc for show devices limit (#2519)
     add 3070992  [IOTDB-965] Modify query timeout parameter (#2508)

No new revisions were added by this update.

Summary of changes:
 docs/UserGuide/Operation Manual/Kill Query.md      |  2 +-
 docs/zh/UserGuide/Operation Manual/Kill Query.md   |  2 +-
 .../java/org/apache/iotdb/jdbc/IoTDBStatement.java | 12 ++--
 .../apache/iotdb/db/qp/executor/PlanExecutor.java  |  5 +-
 .../iotdb/db/query/control/QueryTimeManager.java   | 74 ++++++++++++----------
 .../db/query/dataset/NonAlignEngineDataSet.java    | 22 +++----
 .../dataset/RawQueryDataSetWithoutValueFilter.java | 37 ++++-------
 .../db/query/executor/RawDataQueryExecutor.java    | 11 ++--
 .../iotdb/db/query/reader/series/SeriesReader.java | 23 ++-----
 .../iotdb/db/query/udf/core/input/InputLayer.java  |  2 +-
 .../org/apache/iotdb/db/service/TSServiceImpl.java | 24 ++-----
 .../main/java/org/apache/iotdb/session/Config.java |  1 -
 .../java/org/apache/iotdb/session/Session.java     |  4 +-
 .../apache/iotdb/session/SessionConnection.java    |  2 +-
 .../org/apache/iotdb/session/SessionDataSet.java   |  3 +-
 thrift/rpc-changelist.md                           | 24 +++++++
 .../exception/QueryTimeoutRuntimeException.java    | 37 -----------
 .../iotdb/tsfile/read/reader/LocalTsFileInput.java | 20 ------
 18 files changed, 114 insertions(+), 191 deletions(-)
 delete mode 100644 tsfile/src/main/java/org/apache/iotdb/tsfile/exception/QueryTimeoutRuntimeException.java