This is an automated email from the ASF dual-hosted git repository. haonan pushed a commit to branch jira-768 in repository https://gitbox.apache.org/repos/asf/incubator-iotdb.git
commit d6c850e40c22c6065cc9593d547294eb9735e8c1 Merge: c811611 decd8a3 Author: HTHou <[email protected]> AuthorDate: Thu Jun 18 13:56:27 2020 +0800 Merge branch 'master' of https://github.com/apache/incubator-iotdb into jira-768 README.md | 2 +- README_ZH.md | 4 +- RELEASE_NOTES.md | 181 +++++++++++++ distribution/src/assembly/distribution.xml | 40 ++- docs/UserGuide/Client/Programming - Native API.md | 30 ++- .../DDL Data Definition Language.md | 8 +- .../DML Data Manipulation Language.md | 4 +- .../System Tools/Monitor and Log Tools.md | 2 +- .../UserGuide/Client/Programming - Native API.md | 34 ++- .../DDL Data Definition Language.md | 9 +- example/rocketmq/readme.md | 2 +- .../main/java/org/apache/iotdb/SessionExample.java | 6 +- .../java/org/apache/iotdb/jdbc/IoTDBStatement.java | 20 +- .../test/java/org/apache/iotdb/jdbc/BatchTest.java | 27 +- server/src/assembly/resources/conf/logback.xml | 21 ++ .../src/assembly/resources/sbin/start-server.bat | 5 +- .../assembly/resources/tools/detect-watermark.bat | 4 +- .../tools/logVisualize/log-visualizer-cmd.bat | 4 +- .../tools/logVisualize/log-visualizer-gui.bat | 4 +- .../src/assembly/resources/tools/memory-tool.bat | 4 +- .../assembly/resources/tools/start-WalChecker.bat | 5 +- .../assembly/resources/tools/start-sync-client.bat | 5 +- .../tools/tsfileToolSet/print-iotdb-data-dir.bat | 4 +- .../tsfileToolSet/print-tsfile-resource-files.bat | 4 +- .../tools/tsfileToolSet/print-tsfile-sketch.bat | 4 +- .../resources/tools/upgrade/offline-upgrade.bat | 2 +- .../org/apache/iotdb/db/qp/strategy/SqlBase.g4 | 6 +- .../org/apache/iotdb/db/conf/IoTDBConfigCheck.java | 48 +++- .../org/apache/iotdb/db/conf/IoTDBConstant.java | 2 + .../org/apache/iotdb/db/engine/StorageEngine.java | 12 +- .../iotdb/db/engine/merge/task/MergeTask.java | 11 +- .../engine/storagegroup/StorageGroupProcessor.java | 57 ++-- .../db/exception/BatchInsertionException.java | 28 +- .../org/apache/iotdb/db/metadata/MManager.java | 50 ++-- .../java/org/apache/iotdb/db/metadata/MTree.java | 188 ++++++++------ .../apache/iotdb/db/metadata/MetadataConstant.java | 11 +- .../iotdb/db/metadata/mnode/InternalMNode.java | 135 ---------- .../org/apache/iotdb/db/metadata/mnode/MNode.java | 137 +++++++++- .../iotdb/db/metadata/mnode/MeasurementMNode.java | 77 +++++- .../iotdb/db/metadata/mnode/StorageGroupMNode.java | 22 +- .../apache/iotdb/db/qp/executor/IPlanExecutor.java | 4 +- .../apache/iotdb/db/qp/executor/PlanExecutor.java | 54 ++-- .../db/qp/logical/sys/ShowTimeSeriesOperator.java | 9 +- .../db/qp/physical/sys/ShowTimeSeriesPlan.java | 15 +- .../iotdb/db/qp/strategy/LogicalGenerator.java | 154 +++++------ .../iotdb/db/qp/strategy/PhysicalGenerator.java | 61 ++--- .../org/apache/iotdb/db/service/TSServiceImpl.java | 134 ++++------ .../iotdb/db/utils/datastructure/DoubleTVList.java | 2 +- .../iotdb/db/utils/datastructure/FloatTVList.java | 2 +- .../integration/IoTDBSortedShowTimeseriesIT.java | 287 +++++++++++++++++++++ .../iotdb/db/metadata/MManagerImproveTest.java | 5 +- .../org/apache/iotdb/db/metadata/MTreeTest.java | 40 +-- .../apache/iotdb/db/utils/VersionUtilsTest.java | 55 ++++ .../db/utils/datastructure/PrecisionTest.java | 125 +++++++++ service-rpc/rpc-changelist.md | 21 ++ .../apache/iotdb/rpc/BatchExecutionException.java | 3 +- .../main/java/org/apache/iotdb/rpc/RpcUtils.java | 39 +-- .../java/org/apache/iotdb/rpc/TSStatusCode.java | 1 + service-rpc/src/main/thrift/rpc.thrift | 22 +- .../java/org/apache/iotdb/session/Session.java | 48 ++-- .../org/apache/iotdb/session/pool/SessionPool.java | 40 +-- .../org/apache/iotdb/session/IoTDBSessionIT.java | 12 +- .../iotdb/tsfile/utils/ReadWriteIOUtils.java | 12 +- .../apache/iotdb/tsfile/utils/VersionUtils.java | 13 +- 64 files changed, 1647 insertions(+), 730 deletions(-)
