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 ea5529280a57125f4aa48a026a2b24d394e15ee5 Merge: 843c2ef 1e3d945 Author: 151250176 <[email protected]> AuthorDate: Wed Sep 30 10:36:36 2020 +0800 Merge branch 'master' of https://github.com/apache/incubator-iotdb LICENSE-binary | 2 +- .../DML Data Manipulation Language.md | 1 + .../controller/DatabaseConnectController.java | 120 ++++----- pom.xml | 12 +- server/pom.xml | 4 + .../resources/conf/iotdb-engine.properties | 4 + .../java/org/apache/iotdb/db/conf/IoTDBConfig.java | 10 + .../org/apache/iotdb/db/conf/IoTDBConstant.java | 2 + .../org/apache/iotdb/db/conf/IoTDBDescriptor.java | 4 + .../engine/storagegroup/StorageGroupProcessor.java | 35 ++- .../org/apache/iotdb/db/metadata/MManager.java | 32 +-- .../java/org/apache/iotdb/db/metadata/MTree.java | 61 +++-- .../apache/iotdb/db/mqtt/JSONPayloadFormatter.java | 27 +- .../apache/iotdb/db/qp/executor/PlanExecutor.java | 10 +- .../db/query/dataset/ShowTimeSeriesResult.java | 81 ++++-- .../db/query/dataset/ShowTimeseriesDataSet.java | 81 +++++- .../java/org/apache/iotdb/db/utils/QueryUtils.java | 107 -------- .../storagegroup/StorageGroupProcessorTest.java | 284 ++++++++++++++++++++- .../iotdb/db/integration/IoTDBAddSubDeviceIT.java | 9 +- .../iotdb/db/integration/IoTDBMetadataFetchIT.java | 35 ++- .../integration/IoTDBSortedShowTimeseriesIT.java | 127 +++++---- .../iotdb/db/integration/IoTDBTagAlterIT.java | 132 +++++----- .../apache/iotdb/db/integration/IoTDBTagIT.java | 259 ++++++++++--------- tsfile/pom.xml | 8 +- .../file/metadata/enums/CompressionType.java | 67 ++++- .../tsfile/file/metadata/enums/TSDataType.java | 60 ++++- .../tsfile/file/metadata/enums/TSEncoding.java | 67 ++++- .../iotdb/tsfile/read/TsFileSequenceReader.java | 9 +- .../tsfile/write/schema/MeasurementSchema.java | 37 ++- .../tsfile/encoding/decoder/BitmapDecoderTest.java | 1 - .../iotdb/tsfile/utils/TsFileGeneratorForTest.java | 8 - .../org/apache/iotdb/tsfile/write/PerfTest.java | 13 +- .../writer/MeasurementSchemaSerializeTest.java | 55 ++++ 33 files changed, 1157 insertions(+), 607 deletions(-)
