You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@iotdb.apache.org by hx...@apache.org on 2020/01/30 14:12:06 UTC

[incubator-iotdb] branch cluster_new updated (5f4003b -> 35b726b)

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

hxd pushed a change to branch cluster_new
in repository https://gitbox.apache.org/repos/asf/incubator-iotdb.git.


    from 5f4003b  add ServerConfigConsistent annotation
     add a8f9063  add compression document. (#735)
     add 7c0f1d5   avoid encoding task dying silently (#737)
     add 08346cc  [IOTDB-396] New query clause: disable align (#738)
     add 1f76c73  close files before merge (#742)
     add ff06ddd  [IOTDB-421]fix that selected seq files for merge are not sorted (#743)
     add c07ce8f  [hotfix] Simplify the setting of Locale defaults for String.format().
     add cce087f  Merge pull request #739 from sunjincheng121/IOTDB-417-followup
     add 3033b52  [IOTDB-423] Using Raw type rather than generic feature in PrimitiveArrayPool (#745)
     add 68d9701  fix client display. (#751)
     add 9d006a7  fix can't change root password (#750)
     add 3a0c406  make jdbc easy to locate problem. (#749)
     add c8f7afc  modify readme
     add 35b726b  merge with master

No new revisions were added by this update.

Summary of changes:
 .travis.yml                                        |    2 +-
 README.md                                          |    2 +-
 .../org/apache/iotdb/client/AbstractClient.java    |  194 ++-
 .../5-Operation Manual/4-SQL Reference.md          |   51 +-
 .../5-Operation Manual/4-SQL Reference.md          |   50 +-
 ...yResultSet.java => AbstractIoTDBResultSet.java} |  254 +---
 .../org/apache/iotdb/jdbc/IoTDBConnection.java     |   75 +-
 .../iotdb/jdbc/IoTDBNonAlignQueryResultSet.java    |  209 ++++
 .../org/apache/iotdb/jdbc/IoTDBQueryResultSet.java | 1303 ++------------------
 .../java/org/apache/iotdb/jdbc/IoTDBStatement.java |   72 +-
 .../org/apache/iotdb/db/qp/strategy/SqlBase.g4     |    2 +-
 .../org/apache/iotdb/db/conf/IoTDBConfigCheck.java |   28 +-
 .../iotdb/db/engine/flush/MemTableFlushTask.java   |   12 +-
 .../db/engine/merge/manage/MergeResource.java      |    3 +
 .../merge/selector/MaxFileMergeFileSelector.java   |   73 +-
 .../engine/storagegroup/StorageGroupProcessor.java |    1 +
 .../iotdb/db/qp/physical/crud/QueryPlan.java       |    9 +
 .../iotdb/db/qp/strategy/LogicalGenerator.java     |    6 +-
 .../iotdb/db/qp/strategy/PhysicalGenerator.java    |    2 +-
 .../NewEngineDataSetWithoutValueFilter.java        |    2 +-
 .../db/query/dataset/NonAlignEngineDataSet.java    |  353 ++++++
 .../iotdb/db/query/executor/DataQueryExecutor.java |    2 +
 .../iotdb/db/query/executor/EngineExecutor.java    |   23 +
 .../iotdb/db/query/executor/EngineQueryRouter.java |   15 +-
 .../org/apache/iotdb/db/rescon/MemTablePool.java   |    5 +-
 .../apache/iotdb/db/rescon/PrimitiveArrayPool.java |   16 +-
 .../org/apache/iotdb/db/service/TSServiceImpl.java |  250 ++--
 .../apache/iotdb/db/utils/QueryDataSetUtils.java   |    1 -
 .../iotdb/db/integration/IoTDBDeletionIT.java      |   13 +-
 ...IoTDBDaemonIT.java => IoTDBDisableAlignIT.java} |  328 +++--
 .../db/integration/IoTDBFlushQueryMergeTest.java   |    7 +-
 .../iotdb/db/integration/IoTDBMergeTest.java       |  132 +-
 service-rpc/rpc-changelist.md                      |    4 +-
 service-rpc/src/main/thrift/rpc.thrift             |   26 +-
 .../org/apache/iotdb/session/SessionDataSet.java   |    2 +-
 35 files changed, 1649 insertions(+), 1878 deletions(-)
 copy jdbc/src/main/java/org/apache/iotdb/jdbc/{IoTDBQueryResultSet.java => AbstractIoTDBResultSet.java} (80%)
 create mode 100644 jdbc/src/main/java/org/apache/iotdb/jdbc/IoTDBNonAlignQueryResultSet.java
 create mode 100644 server/src/main/java/org/apache/iotdb/db/query/dataset/NonAlignEngineDataSet.java
 copy server/src/test/java/org/apache/iotdb/db/integration/{IoTDBDaemonIT.java => IoTDBDisableAlignIT.java} (52%)