This is an automated email from the ASF dual-hosted git repository. haonan pushed a commit to branch master_with_chunk_size in repository https://gitbox.apache.org/repos/asf/iotdb.git
commit 7190bb2330374a419a2c8fb441e0870a45993a4b Merge: 5dcd47b 1c1ccb6 Author: HTHou <[email protected]> AuthorDate: Tue Oct 20 15:25:06 2020 +0800 Merge branch 'master' of https://github.com/apache/iotdb into master_with_chunk_size .travis.yml | 2 +- DISCLAIMER | 6 - LICENSE-binary | 4 +- README.md | 50 +- README_ZH.md | 42 +- .../org/apache/iotdb/db/qp/strategy/SqlBase.g4 | 97 +- cli/src/assembly/resources/sbin/start-cli.bat | 10 +- cli/src/assembly/resources/sbin/start-cli.sh | 35 +- .../tests/tools/importCsv/AbstractScript.java | 7 +- .../tests/tools/importCsv/ImportCsvTestIT.java | 4 +- distribution/pom.xml | 4 +- distribution/src/assembly/distribution.xml | 3 - docker/src/main/Dockerfile | 10 +- docker/src/main/Dockerfile-0.8.1 | 4 +- docker/src/main/Dockerfile-0.9.0 | 4 +- docker/src/main/Dockerfile-0.9.1 | 4 +- docker/src/main/Dockerfile-0.9.1-jre8 | 4 +- docs/Community/Community-Powered By.md | 2 +- docs/Community/Feedback.md | 4 +- docs/Development/ContributeGuide.md | 2 +- docs/Development/HowToCommit.md | 22 +- docs/Development/VoteRelease.md | 16 +- docs/Download/README.md | 46 +- docs/SystemDesign/TsFile/Format.md | 33 +- docs/UserGuide/Client/Command Line Interface.md | 6 +- docs/UserGuide/Client/Programming - TsFile API.md | 4 +- docs/UserGuide/Ecosystem Integration/Grafana.md | 8 +- .../UserGuide/Ecosystem Integration/Hive TsFile.md | 8 +- .../Ecosystem Integration/MapReduce TsFile.md | 6 +- .../Ecosystem Integration/Spark TsFile.md | 6 +- .../Get Started/Frequently asked questions.md | 12 +- docs/UserGuide/Get Started/QuickStart.md | 4 +- docs/UserGuide/Operation Manual/Administration.md | 1 - .../DDL Data Definition Language.md | 22 +- .../DML Data Manipulation Language.md | 1 + docs/UserGuide/Operation Manual/SQL Reference.md | 30 +- docs/UserGuide/Server/Docker Image.md | 8 +- docs/UserGuide/Server/Download.md | 14 +- docs/zh/Community/Community-Powered By.md | 2 +- docs/zh/Community/Feedback.md | 4 +- docs/zh/Development/ContributeGuide.md | 2 +- docs/zh/Development/HowToCommit.md | 20 +- docs/zh/Development/VoteRelease.md | 16 +- docs/zh/Download/README.md | 46 +- docs/zh/SystemDesign/TsFile/Format.md | 29 +- docs/zh/UserGuide/Client/Command Line Interface.md | 8 +- .../UserGuide/Client/Programming - TsFile API.md | 4 +- docs/zh/UserGuide/Ecosystem Integration/Grafana.md | 8 +- .../UserGuide/Ecosystem Integration/Hive TsFile.md | 12 +- .../Ecosystem Integration/MapReduce TsFile.md | 6 +- .../Ecosystem Integration/Spark TsFile.md | 6 +- .../Get Started/Frequently asked questions.md | 14 +- docs/zh/UserGuide/Get Started/QuickStart.md | 4 +- .../UserGuide/Operation Manual/Administration.md | 1 - .../DDL Data Definition Language.md | 8 +- .../zh/UserGuide/Operation Manual/SQL Reference.md | 28 +- docs/zh/UserGuide/Server/Config Manual.md | 4 +- docs/zh/UserGuide/Server/Docker Image.md | 10 +- docs/zh/UserGuide/Server/Download.md | 2 +- .../iotdb/hadoop/tsfile/TSFMRReadExample.java | 1 - .../iotdb/hadoop/tsfile/TSMRWriteExample.java | 6 +- .../java/org/apache/iotdb/rocketmq/Constant.java | 17 +- .../main/java/org/apache/iotdb/SessionExample.java | 58 +- example/tsfile/readme.md | 2 +- .../apache/iotdb/tsfile/TsFileWriteWithTablet.java | 6 +- flink-iotdb-connector/pom.xml | 1 + .../controller/DatabaseConnectController.java | 120 +- .../apache/iotdb/hadoop/fileSystem/HDFSFile.java | 59 +- .../org/apache/iotdb/hive/TsFileDeserializer.java | 17 +- .../iotdb/jdbc/AbstractIoTDBJDBCResultSet.java | 2 +- .../main/java/org/apache/iotdb/jdbc/Activator.java | 21 +- .../org/apache/iotdb/jdbc/IoTDBConnection.java | 18 +- .../org/apache/iotdb/jdbc/IoTDBDataSource.java | 230 ++-- .../apache/iotdb/jdbc/IoTDBDataSourceFactory.java | 79 ++ .../java/org/apache/iotdb/jdbc/IoTDBStatement.java | 78 +- .../apache/iotdb/jdbc/IoTDbDataSourceFactory.java | 79 -- .../apache/iotdb/jdbc/IoTDBJDBCResultSetTest.java | 28 +- .../apache/iotdb/jdbc/IoTDBResultMetadataTest.java | 4 +- pom.xml | 45 +- server/pom.xml | 4 + .../resources/conf/iotdb-engine.properties | 11 + server/src/assembly/resources/conf/logback.xml | 4 +- .../iotdb/db/auth/user/BasicUserManager.java | 4 +- .../java/org/apache/iotdb/db/conf/IoTDBConfig.java | 23 + .../org/apache/iotdb/db/conf/IoTDBConstant.java | 2 + .../org/apache/iotdb/db/conf/IoTDBDescriptor.java | 30 + .../iotdb/db/cost/statistic/Measurement.java | 29 +- .../org/apache/iotdb/db/engine/StorageEngine.java | 28 +- .../db/engine/cache/TimeSeriesMetadataCache.java | 1 + .../db/engine/fileSystem/SystemFileFactory.java | 10 +- .../iotdb/db/engine/memtable/AbstractMemTable.java | 33 +- .../apache/iotdb/db/engine/memtable/IMemTable.java | 9 +- .../db/engine/merge/manage/MergeResource.java | 10 +- .../engine/storagegroup/StorageGroupProcessor.java | 238 ++-- .../db/engine/storagegroup/TsFileProcessor.java | 20 +- .../level/LevelTsFileManagement.java | 2 - .../tsfilemanagement/utils/HotCompactionUtils.java | 2 +- .../org/apache/iotdb/db/metadata/MLogWriter.java | 13 +- .../org/apache/iotdb/db/metadata/MManager.java | 1247 ++++++++------------ .../java/org/apache/iotdb/db/metadata/MTree.java | 456 +++---- .../org/apache/iotdb/db/metadata/PartialPath.java | 53 +- .../org/apache/iotdb/db/metadata/mnode/MNode.java | 123 +- .../iotdb/db/metadata/mnode/MeasurementMNode.java | 13 +- .../apache/iotdb/db/metrics/source/JvmSource.java | 12 +- .../iotdb/db/metrics/source/MetricsSource.java | 24 +- .../org/apache/iotdb/db/monitor/StatMonitor.java | 2 +- .../apache/iotdb/db/mqtt/JSONPayloadFormatter.java | 27 +- .../apache/iotdb/db/qp/executor/PlanExecutor.java | 159 +-- .../org/apache/iotdb/db/qp/logical/Operator.java | 3 +- .../apache/iotdb/db/qp/physical/PhysicalPlan.java | 7 +- .../iotdb/db/qp/physical/crud/InsertPlan.java | 2 + .../iotdb/db/qp/physical/crud/InsertRowPlan.java | 49 +- .../qp/physical/sys/CreateMultiTimeSeriesPlan.java | 304 +++++ .../iotdb/db/qp/strategy/LogicalGenerator.java | 43 +- .../iotdb/db/query/context/QueryContext.java | 7 +- .../db/query/control/QueryResourceManager.java | 15 +- .../iotdb/db/query/control/TracingManager.java | 32 +- .../db/query/dataset/ShowTimeSeriesResult.java | 81 +- .../db/query/dataset/ShowTimeseriesDataSet.java | 81 +- .../iotdb/db/query/executor/LastQueryExecutor.java | 42 +- .../chunk/metadata/DiskChunkMetadataLoader.java | 7 +- .../org/apache/iotdb/db/service/TSServiceImpl.java | 124 +- .../db/sync/receiver/transfer/SyncServiceImpl.java | 2 + .../org/apache/iotdb/db/utils/FileLoaderUtils.java | 2 +- .../java/org/apache/iotdb/db/utils/QueryUtils.java | 107 -- .../iotdb/db/writelog/recover/LogReplayer.java | 29 +- .../iotdb/db/engine/merge/MergeManagerTest.java | 2 +- .../engine/modification/DeletionFileNodeTest.java | 28 +- .../db/engine/modification/DeletionQueryTest.java | 52 +- .../storagegroup/StorageGroupProcessorTest.java | 289 ++++- .../iotdb/db/engine/storagegroup/TTLTest.java | 39 +- .../engine/storagegroup/TsFileProcessorTest.java | 9 +- .../apache/iotdb/db/integration/IOTDBInsertIT.java | 123 ++ .../iotdb/db/integration/IoTDBAddSubDeviceIT.java | 9 +- .../iotdb/db/integration/IoTDBAlignByDeviceIT.java | 435 +++---- .../db/integration/IoTDBCreateSnapshotIT.java | 39 +- .../iotdb/db/integration/IoTDBDisableAlignIT.java | 178 ++- .../apache/iotdb/db/integration/IoTDBLastIT.java | 38 +- .../db/integration/IoTDBLoadExternalTsfileIT.java | 41 +- .../iotdb/db/integration/IoTDBMetadataFetchIT.java | 112 +- .../iotdb/db/integration/IoTDBMultiSeriesIT.java | 29 + .../iotdb/db/integration/IoTDBQueryDemoIT.java | 191 ++- .../iotdb/db/integration/IoTDBResultSetIT.java | 124 ++ .../iotdb/db/integration/IoTDBSimpleQueryIT.java | 67 +- .../integration/IoTDBSortedShowTimeseriesIT.java | 141 ++- .../iotdb/db/integration/IoTDBTagAlterIT.java | 132 +-- .../apache/iotdb/db/integration/IoTDBTagIT.java | 337 +++--- .../iotdb/db/integration/IoTDBTracingTest.java | 6 +- .../apache/iotdb/db/integration/IoTDBTtlIT.java | 18 +- .../iotdb/db/metadata/MManagerImproveTest.java | 18 +- .../org/apache/iotdb/db/metadata/MTreeTest.java | 74 +- .../apache/iotdb/db/metadata/PartialPathTest.java | 27 +- .../iotdb/db/qp/plan/LogicalPlanSmallTest.java | 2 +- .../apache/iotdb/db/qp/plan/PhysicalPlanTest.java | 4 +- .../iotdb/db/writelog/recover/LogReplayerTest.java | 2 +- .../java/org/apache/iotdb/session/Session.java | 35 +- .../org/apache/iotdb/session/SessionDataSet.java | 6 +- .../iotdb/session/IoTDBSessionComplexIT.java | 54 +- .../apache/iotdb/session/IoTDBSessionSimpleIT.java | 47 +- .../java/org/apache/iotdb/session/SessionUT.java | 26 +- site/README-zh.md | 6 +- site/README.md | 2 + site/iotdb-doap.rdf | 14 +- site/pom.xml | 20 +- site/src/main/.vuepress/config.js | 2 +- site/src/main/.vuepress/theme/components/Page.vue | 5 +- .../.vuepress/theme/global-components/IoTDB.vue | 23 +- .../.vuepress/theme/global-components/IoTDBZH.vue | 16 +- site/src/main/deploy.js | 2 +- site/src/main/package.json | 6 +- .../scala/org/apache/iotdb/spark/db/IoTDBRDD.scala | 4 +- thrift/src/main/thrift/rpc.thrift | 1 + thrift/src/pypi/setup.py | 2 +- tools/common.sh | 8 +- tools/download_staged_release.sh | 8 +- tsfile/pom.xml | 8 +- .../iotdb/tsfile/compress/IUnCompressor.java | 9 +- .../iotdb/tsfile/encoding/decoder/Decoder.java | 13 +- .../file/metadata/enums/CompressionType.java | 74 +- .../tsfile/file/metadata/enums/TSDataType.java | 41 +- .../tsfile/file/metadata/enums/TSEncoding.java | 41 +- .../file/metadata/statistics/BinaryStatistics.java | 22 +- .../iotdb/tsfile/read/TsFileSequenceReader.java | 97 +- .../apache/iotdb/tsfile/read/common/BatchData.java | 14 +- .../org/apache/iotdb/tsfile/utils/BytesUtils.java | 21 +- .../iotdb/tsfile/utils/ReadWriteIOUtils.java | 42 +- .../apache/iotdb/tsfile/write/record/Tablet.java | 7 +- .../tsfile/write/schema/MeasurementSchema.java | 47 +- .../tsfile/encoding/decoder/BitmapDecoderTest.java | 1 - .../iotdb/tsfile/read/GetAllDevicesTest.java | 90 ++ .../tsfile/read/TsFileSequenceReaderTest.java | 1 - .../iotdb/tsfile/read/reader/ReaderTest.java | 6 +- .../apache/iotdb/tsfile/utils/FileGenerator.java | 79 +- .../apache/iotdb/tsfile/utils/RecordUtilsTest.java | 100 +- .../iotdb/tsfile/utils/TsFileGeneratorForTest.java | 8 - .../org/apache/iotdb/tsfile/write/PerfTest.java | 13 +- .../writer/MeasurementSchemaSerializeTest.java | 55 + 197 files changed, 5123 insertions(+), 3695 deletions(-)
