You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@iotdb.apache.org by qi...@apache.org on 2020/03/25 00:59:07 UTC

[incubator-iotdb] branch new_TsFile updated (93d72b2 -> 6fee3f4)

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

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


    from 93d72b2  Fix some potential bugs
     add 99310d4  add merge doc (#852)
     add d384cb5  add rpc compression api in client and session module (#930)
     add 94411e0  Delete dataTypeMapping etc fields in QueryPlan (#934)
     add 8b8d4c3  Fix Travis issues about timeout and the socket problem in the Sync module  (#940)
     add 9fe3895  support Chinese character (#939)
     add b1c209d  fix downloading pentaho-aggdesigner-algorithm error from maven repo (#941)
     add 6fee3f4  Merge branch 'master' into new_TsFile

No new revisions were added by this update.

Summary of changes:
 .travis.yml                                        |  2 +-
 .../org/apache/iotdb/client/AbstractClient.java    | 21 ++++--
 .../main/java/org/apache/iotdb/client/Client.java  |  3 +
 .../java/org/apache/iotdb/client/WinClient.java    |  3 +
 .../SystemDesign/4-StorageEngine/4-MergeManager.md | 88 +++++++++++++++++++++-
 .../main/java/org/apache/iotdb/SessionExample.java | 20 +++--
 hive-connector/pom.xml                             | 16 ++++
 .../main/java/org/apache/iotdb/jdbc/Config.java    |  2 +-
 .../org/apache/iotdb/db/qp/strategy/SqlBase.g4     |  9 ++-
 .../apache/iotdb/db/qp/constant/SQLConstant.java   |  3 -
 .../db/qp/physical/crud/AlignByDevicePlan.java     | 12 ++-
 .../iotdb/db/qp/physical/crud/QueryPlan.java       | 11 ---
 .../iotdb/db/qp/strategy/PhysicalGenerator.java    | 65 ++++++----------
 .../db/query/dataset/AlignByDeviceDataSet.java     | 53 +++++++------
 .../iotdb/db/sync/receiver/SyncServerManager.java  | 36 ++++++++-
 .../thrift/SyncServiceEventHandler.java}           | 29 ++++---
 .../iotdb/db/qp/plan/LogicalPlanSmallTest.java     | 33 ++++++--
 .../java/org/apache/iotdb/session/Session.java     | 33 ++++----
 18 files changed, 295 insertions(+), 144 deletions(-)
 copy server/src/main/java/org/apache/iotdb/db/{service/JDBCServiceEventHandler.java => sync/thrift/SyncServiceEventHandler.java} (65%)