This is an automated email from the ASF dual-hosted git repository. xuekaifeng pushed a commit to branch remove-mmanager-lock in repository https://gitbox.apache.org/repos/asf/incubator-iotdb.git
commit d6e585131c19aa8b9f7e34c25bd40b79295f3ca8 Merge: b6d3ce7 ccc627a Author: 151250176 <[email protected]> AuthorDate: Tue Jun 23 21:05:57 2020 +0800 Merge branch 'master' of https://github.com/apache/incubator-iotdb README.md | 48 ++-- README_ZH.md | 50 ++-- RELEASE_NOTES.md | 181 +++++++++++++ cli/pom.xml | 6 + distribution/src/assembly/distribution.xml | 40 ++- docs/Community/Materials.md | 12 + docs/SystemDesign/Connector/Spark-TsFile.md | 22 +- docs/UserGuide/Client/Programming - Native API.md | 30 ++- docs/UserGuide/Client/Status Codes.md | 2 + .../DDL Data Definition Language.md | 8 +- .../DML Data Manipulation Language.md | 4 +- .../System Tools/Monitor and Log Tools.md | 2 +- docs/zh/SystemDesign/Connector/Spark-TsFile.md | 16 ++ .../UserGuide/Client/Programming - Native API.md | 34 ++- docs/zh/UserGuide/Client/Status Codes.md | 2 + .../DDL Data Definition Language.md | 9 +- example/flink/pom.xml | 8 + example/rocketmq/readme.md | 2 +- .../main/java/org/apache/iotdb/SessionExample.java | 6 +- flink-tsfile-connector/pom.xml | 23 ++ .../apache/iotdb/jdbc/IoTDBDatabaseMetadata.java | 11 +- .../java/org/apache/iotdb/jdbc/IoTDBStatement.java | 20 +- .../test/java/org/apache/iotdb/jdbc/BatchTest.java | 27 +- pom.xml | 6 + server/pom.xml | 6 + 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 | 47 +++- .../org/apache/iotdb/db/conf/IoTDBConstant.java | 7 +- .../org/apache/iotdb/db/engine/StorageEngine.java | 42 ++- .../iotdb/db/engine/cache/ChunkMetadataCache.java | 2 +- .../iotdb/db/engine/memtable/AbstractMemTable.java | 6 +- .../iotdb/db/engine/merge/task/MergeTask.java | 11 +- .../engine/storagegroup/StorageGroupProcessor.java | 79 ++++-- .../db/engine/storagegroup/TsFileProcessor.java | 12 + .../db/exception/BatchInsertionException.java | 28 +- .../iotdb/db/exception/ShutdownException.java | 28 +- .../org/apache/iotdb/db/metadata/MManager.java | 85 +++--- .../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 | 65 +++-- .../db/qp/logical/sys/ShowTimeSeriesOperator.java | 9 +- .../db/qp/physical/crud/InsertTabletPlan.java | 49 +++- .../db/qp/physical/sys/ShowTimeSeriesPlan.java | 15 +- .../iotdb/db/qp/strategy/LogicalGenerator.java | 154 +++++------ .../iotdb/db/qp/strategy/PhysicalGenerator.java | 61 ++--- .../java/org/apache/iotdb/db/service/IService.java | 3 + .../java/org/apache/iotdb/db/service/IoTDB.java | 8 + .../apache/iotdb/db/service/RegisterManager.java | 15 ++ .../org/apache/iotdb/db/service/TSServiceImpl.java | 135 +++++----- .../java/org/apache/iotdb/db/utils/MemUtils.java | 3 + .../iotdb/db/utils/datastructure/DoubleTVList.java | 2 +- .../iotdb/db/utils/datastructure/FloatTVList.java | 2 +- .../writelog/manager/MultiFileLogNodeManager.java | 57 ++-- .../iotdb/db/writelog/node/WriteLogNode.java | 1 + .../db/integration/IoTDBRecoverUnclosedIT.java | 270 +++++++++++++++++++ .../iotdb/db/integration/IoTDBRestartIT.java | 148 ++++++++++- .../integration/IoTDBSortedShowTimeseriesIT.java | 287 +++++++++++++++++++++ .../iotdb/db/metadata/MManagerImproveTest.java | 5 +- .../org/apache/iotdb/db/metadata/MTreeTest.java | 40 +-- .../apache/iotdb/db/utils/EnvironmentUtils.java | 10 +- .../apache/iotdb/db/utils/VersionUtilsTest.java | 55 ++++ .../db/utils/datastructure/PrecisionTest.java | 125 +++++++++ .../apache/iotdb/db/writelog/WriteLogNodeTest.java | 34 +++ 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 | 2 + service-rpc/src/main/thrift/rpc.thrift | 22 +- .../java/org/apache/iotdb/session/Session.java | 48 ++-- .../iotdb/session/pool/SessionDataSetWrapper.java | 9 +- .../org/apache/iotdb/session/pool/SessionPool.java | 40 +-- .../org/apache/iotdb/session/IoTDBSessionIT.java | 12 +- .../java/org/apache/iotdb/session/SessionUT.java | 83 +++++- .../apache/iotdb/spark/tsfile/DefaultSource.scala | 13 +- .../tsfile/file/metadata/TimeseriesMetadata.java | 21 +- .../iotdb/tsfile/utils/ReadWriteIOUtils.java | 12 +- .../apache/iotdb/tsfile/utils/VersionUtils.java | 13 +- .../iotdb/tsfile/write/writer/TsFileIOWriter.java | 14 +- 95 files changed, 2580 insertions(+), 893 deletions(-)
