This is an automated email from the ASF dual-hosted git repository. ejttianyu pushed a commit to branch win_e_option in repository https://gitbox.apache.org/repos/asf/incubator-iotdb.git
commit ae0a373cb2e96b1a765dc5337bc418fc38a3bdfe Merge: 505d68c 5ce272a Author: EJTTianyu <[email protected]> AuthorDate: Thu May 7 21:12:56 2020 +0800 Merge branch 'master' of github.com:apache/incubator-iotdb into origin_master README.md | 18 +- README_ZH.md | 14 +- {client => cli}/pom.xml | 6 +- .../client.xml => cli/src/assembly/cli.xml | 2 +- .../src/assembly/resources/sbin/start-cli.bat | 4 +- .../src/assembly/resources/sbin/start-cli.sh | 2 +- .../src/assembly/resources/tools/export-csv.bat | 0 .../src/assembly/resources/tools/export-csv.sh | 0 .../src/assembly/resources/tools/import-csv.bat | 0 .../src/assembly/resources/tools/import-csv.sh | 0 .../java/org/apache/iotdb/cli/AbstractCli.java | 9 +- .../src/main/java/org/apache/iotdb/cli/Cli.java | 10 +- .../src/main/java/org/apache/iotdb/cli/WinCli.java | 6 +- .../apache/iotdb/exception/ArgsErrorException.java | 0 .../org/apache/iotdb/tool/AbstractCsvTool.java | 0 .../main/java/org/apache/iotdb/tool/ExportCsv.java | 4 +- .../main/java/org/apache/iotdb/tool/ImportCsv.java | 0 .../java/org/apache/iotdb/cli/AbstractCliIT.java | 218 +++++++ .../java/org/apache/iotdb/cli}/AbstractScript.java | 4 +- .../org/apache/iotdb/cli}/StartClientScriptIT.java | 8 +- .../org/apache/iotdb/tool/ExportCsvTestIT.java | 2 +- .../org/apache/iotdb/tool/ImportCsvTestIT.java | 2 +- {client => cli}/src/test/resources/logback.xml | 0 client-py/src/client_example.py | 8 +- .../org/apache/iotdb/client/AbstractClientIT.java | 218 ------- distribution/pom.xml | 2 +- docker/src/main/Dockerfile-0.9.1-jre8 | 41 ++ docs/Development/ContributeGuide.md | 3 +- docs/Download/README.md | 10 + docs/SystemDesign/1-TsFile/3-Write.md | 4 +- .../2-QueryEngine/4-ResultSetConstruction.md | 177 +++++ .../3-SchemaManager/1-SchemaManager.md | 218 ++++++- .../4-StorageEngine/6-DataManipulation.md | 2 +- docs/SystemDesign/5-DataQuery/1-DataQuery.md | 4 +- .../5-DataQuery/2-QueryFundamentals.md | 128 ++++ .../5-DataQuery/3-ModificationHandle.md | 73 --- .../{2-SeriesReader.md => 3-SeriesReader.md} | 0 docs/SystemDesign/5-DataQuery/9-FillFunction.md | 12 +- docs/UserGuide/0-Get Started/1-QuickStart.md | 12 +- .../0-Get Started/2-Frequently asked questions.md | 14 +- docs/UserGuide/3-Server/4-Config Manual.md | 12 + .../UserGuide/4-Client/1-Command Line Interface.md | 44 +- .../4-Client/2-Programming - Native API.md | 114 ++-- docs/UserGuide/4-Client/3-Programming - JDBC.md | 8 + .../4-Client/5-Programming - TsFile API.md | 153 +---- docs/UserGuide/4-Client/7-Status Codes.md | 11 +- .../1-DDL Data Definition Language.md | 122 +++- .../2-DML Data Manipulation Language.md | 3 + .../5-Operation Manual/4-SQL Reference.md | 47 ++ .../6-System Tools/8-Load External Tsfile.md | 4 +- .../UserGuide/7-Ecosystem Integration/1-Grafana.md | 7 +- docs/zh/Development/ContributeGuide.md | 2 +- docs/zh/Download/README.md | 10 + docs/zh/SystemDesign/1-TsFile/3-Write.md | 2 +- .../2-QueryEngine/4-ResultSetConstruction.md | 175 +++++ .../3-SchemaManager/1-SchemaManager.md | 210 +++++- .../4-StorageEngine/6-DataManipulation.md | 2 +- docs/zh/SystemDesign/5-DataQuery/1-DataQuery.md | 4 +- .../5-DataQuery/2-QueryFundamentals.md | 110 ++++ .../5-DataQuery/3-ModificationHandle.md | 73 --- .../{2-SeriesReader.md => 3-SeriesReader.md} | 0 docs/zh/SystemDesign/5-DataQuery/9-FillFunction.md | 13 +- docs/zh/UserGuide/0-Get Started/1-QuickStart.md | 10 +- .../0-Get Started/2-Frequently asked questions.md | 8 +- docs/zh/UserGuide/3-Server/1-Download.md | 36 +- docs/zh/UserGuide/3-Server/4-Config Manual.md | 13 + .../UserGuide/4-Client/1-Command Line Interface.md | 38 +- .../4-Client/2-Programming - Native API.md | 101 ++- docs/zh/UserGuide/4-Client/3-Programming - JDBC.md | 11 +- .../4-Client/5-Programming - TsFile API.md | 152 +---- docs/zh/UserGuide/4-Client/7-Status Codes.md | 11 +- .../1-DDL Data Definition Language.md | 111 +++- .../2-DML Data Manipulation Language.md | 3 + .../5-Operation Manual/4-SQL Reference.md | 46 ++ .../6-System Tools/8-Load External Tsfile.md | 4 +- .../UserGuide/7-Ecosystem Integration/1-Grafana.md | 7 +- example/flink/README.md | 2 + .../apache/iotdb/flink/FlinkTsFileBatchSink.java | 114 ++++ .../apache/iotdb/flink/FlinkTsFileStreamSink.java | 115 ++++ .../java/org/apache/iotdb/flink/TsFlieUtils.java | 26 + .../apache/iotdb/hadoop/tsfile/TsFileHelper.java | 50 +- .../apache/iotdb/rocketmq/RocketMQConsumer.java | 2 +- .../main/java/org/apache/iotdb/SessionExample.java | 213 +++--- .../java/org/apache/iotdb/tsfile/TsFileRead.java | 4 +- .../apache/iotdb/tsfile/TsFileSequenceRead.java | 15 +- ...ithRowBatch.java => TsFileWriteWithTablet.java} | 76 ++- .../java/org/apache/iotdb/flink/IoTDBSink.java | 4 +- .../iotdb/flink/IoTDBSinkBatchInsertTest.java | 4 +- .../iotdb/flink/IoTDBSinkBatchTimerTest.java | 2 +- .../apache/iotdb/flink/IoTDBSinkInsertTest.java | 2 +- flink-tsfile-connector/README.md | 86 ++- .../iotdb/flink/tsfile/RowTSRecordConverter.java | 163 +++++ .../iotdb/flink/tsfile/TSRecordConverter.java | 61 ++ .../iotdb/flink/tsfile/TSRecordOutputFormat.java | 99 +++ .../iotdb/flink/tsfile/TsFileOutputFormat.java | 122 ++++ .../iotdb/flink/tsfile/util/TSFileConfigUtil.java | 1 + .../tsfile/RowTSRecordOutputFormatITCase.java | 56 ++ .../flink/tsfile/RowTSRecordOutputFormatTest.java | 77 +++ .../flink/tsfile/RowTsFileConnectorTestBase.java | 87 +++ .../flink/tsfile/RowTsFileInputFormatTestBase.java | 72 +-- .../tsfile/RowTsFileOutputFormatTestBase.java | 117 ++++ .../util/TSFileConfigUtilCompletenessTest.java | 102 +-- .../apache/iotdb/flink/util/TsFileWriteUtil.java | 2 +- .../iotdb/web/grafana/dao/impl/BasicDaoImpl.java | 109 ++-- grafana/src/main/resources/application.properties | 6 +- .../apache/iotdb/hadoop/fileSystem/HDFSFile.java | 24 +- .../apache/iotdb/hadoop/tsfile/TSFInputFormat.java | 10 +- .../iotdb/hadoop/tsfile/TsFileTestHelper.java | 40 +- .../org/apache/iotdb/hive/TsFileTestHelper.java | 41 +- .../java/org/apache/iotdb/jdbc/IoTDBStatement.java | 12 +- pom.xml | 2 +- .../resources/conf/iotdb-engine.properties | 19 +- .../org/apache/iotdb/db/qp/strategy/SqlBase.g4 | 26 +- .../java/org/apache/iotdb/db/conf/IoTDBConfig.java | 14 +- .../org/apache/iotdb/db/conf/IoTDBDescriptor.java | 54 +- .../org/apache/iotdb/db/engine/StorageEngine.java | 10 +- .../db/engine/cache/CacheHitRatioMonitor.java | 6 - .../engine/cache/CacheHitRatioMonitorMXBean.java | 2 - .../apache/iotdb/db/engine/cache/ChunkCache.java | 1 + .../iotdb/db/engine/cache/ChunkMetadataCache.java | 11 +- .../db/engine/cache/TimeSeriesMetadataCache.java | 83 +-- .../iotdb/db/engine/cache/TsFileMetaDataCache.java | 174 ----- .../iotdb/db/engine/memtable/AbstractMemTable.java | 20 +- .../apache/iotdb/db/engine/memtable/IMemTable.java | 6 +- .../iotdb/db/engine/merge/task/MergeFileTask.java | 34 +- .../engine/storagegroup/StorageGroupProcessor.java | 122 ++-- .../db/engine/storagegroup/TsFileProcessor.java | 28 +- .../db/engine/storagegroup/TsFileResource.java | 44 +- .../exception/metadata/DeleteFailedException.java | 19 +- .../org/apache/iotdb/db/metadata/MLogWriter.java | 6 + .../org/apache/iotdb/db/metadata/MManager.java | 714 +++++++++++++++------ .../java/org/apache/iotdb/db/metadata/MTree.java | 211 ++++-- .../org/apache/iotdb/db/metadata/MetaUtils.java | 6 +- .../iotdb/db/metadata/MetadataOperationType.java | 1 + .../org/apache/iotdb/db/metadata/TagLogFile.java | 24 +- .../iotdb/db/metadata/mnode/InternalMNode.java | 59 +- .../org/apache/iotdb/db/metadata/mnode/MNode.java | 8 +- .../org/apache/iotdb/db/mqtt/PublishHandler.java | 7 +- .../main/java/org/apache/iotdb/db/qp/Planner.java | 8 +- .../apache/iotdb/db/qp/constant/SQLConstant.java | 11 +- .../apache/iotdb/db/qp/executor/IPlanExecutor.java | 8 +- .../apache/iotdb/db/qp/executor/PlanExecutor.java | 441 +++++++++---- .../org/apache/iotdb/db/qp/logical/Operator.java | 3 +- .../apache/iotdb/db/qp/logical/RootOperator.java | 1 - .../iotdb/db/qp/logical/crud/QueryOperator.java | 2 +- .../db/qp/logical/sys/AlterTimeSeriesOperator.java | 97 +++ .../{RootOperator.java => sys/FlushOperator.java} | 37 +- .../iotdb/db/qp/logical/sys/MergeOperator.java | 16 +- .../db/qp/logical/sys/ShowTimeSeriesOperator.java | 2 +- .../apache/iotdb/db/qp/physical/PhysicalPlan.java | 4 +- .../iotdb/db/qp/physical/crud/FillQueryPlan.java | 2 +- .../iotdb/db/qp/physical/crud/GroupByFillPlan.java | 2 +- ...{BatchInsertPlan.java => InsertTabletPlan.java} | 24 +- .../iotdb/db/qp/physical/crud/QueryPlan.java | 2 +- .../db/qp/physical/crud/RawDataQueryPlan.java | 16 +- .../db/qp/physical/sys/AlterTimeSeriesPlan.java | 86 +++ .../GroupByFillPlan.java => sys/FlushPlan.java} | 34 +- .../apache/iotdb/db/qp/physical/sys/MergePlan.java | 22 +- .../db/qp/physical/sys/ShowTimeSeriesPlan.java | 15 +- .../iotdb/db/qp/strategy/LogicalGenerator.java | 141 +++- .../iotdb/db/qp/strategy/PhysicalGenerator.java | 266 +++++--- .../query/dataset/groupby/GroupByFillDataSet.java | 4 +- .../dataset/groupby/LocalGroupByExecutor.java | 92 +-- .../iotdb/db/query/executor/FillQueryExecutor.java | 4 +- .../iotdb/db/query/executor/LastQueryExecutor.java | 17 +- .../iotdb/db/query/executor/QueryRouter.java | 2 +- .../iotdb/db/query/{ => executor}/fill/IFill.java | 16 +- .../fill/LastPointReader.java} | 89 +-- .../db/query/{ => executor}/fill/LinearFill.java | 93 ++- .../iotdb/db/query/executor/fill/PreviousFill.java | 115 ++++ .../reader/series/SeriesRawDataBatchReader.java | 24 +- .../iotdb/db/query/reader/series/SeriesReader.java | 135 ++-- .../query/timegenerator/ServerTimeGenerator.java | 5 +- .../org/apache/iotdb/db/service/TSServiceImpl.java | 184 +++--- .../apache/iotdb/db/tools/TsFileSketchTool.java | 66 +- .../java/org/apache/iotdb/db/utils/AuthUtils.java | 22 +- .../org/apache/iotdb/db/utils/FileLoaderUtils.java | 38 +- .../java/org/apache/iotdb/db/utils/MemUtils.java | 10 +- .../java/org/apache/iotdb/db/utils/MergeUtils.java | 14 +- .../iotdb/db/writelog/recover/LogReplayer.java | 31 +- .../writelog/recover/TsFileRecoverPerformer.java | 28 +- .../apache/iotdb/db/engine/merge/MergeTest.java | 2 - .../storagegroup/StorageGroupProcessorTest.java | 29 +- .../db/integration/IoTDBEngineTimeGeneratorIT.java | 37 +- .../apache/iotdb/db/integration/IoTDBFillIT.java | 52 +- .../apache/iotdb/db/integration/IoTDBLastIT.java | 8 +- .../db/integration/IoTDBLoadExternalTsfileIT.java | 6 +- .../iotdb/db/integration/IoTDBSimpleQueryIT.java | 2 + .../iotdb/db/integration/IoTDBTagAlterIT.java | 455 +++++++++++++ .../apache/iotdb/db/integration/IoTDBTagIT.java | 69 +- .../iotdb/db/metadata/MManagerImproveTest.java | 24 +- .../apache/iotdb/db/qp/plan/PhysicalPlanTest.java | 10 +- .../query/reader/series/SeriesReaderTestUtil.java | 3 - .../apache/iotdb/db/utils/EnvironmentUtils.java | 3 - service-rpc/rpc-changelist.md | 68 +- .../java/org/apache/iotdb/rpc/TSStatusCode.java | 3 +- service-rpc/src/main/thrift/rpc.thrift | 30 +- .../java/org/apache/iotdb/session/Session.java | 419 ++++++------ .../org/apache/iotdb/session/SessionUtils.java | 42 +- .../org/apache/iotdb/session/pool/SessionPool.java | 123 ++-- .../org/apache/iotdb/session/IoTDBSessionIT.java | 264 ++++---- .../java/org/apache/iotdb/session/SessionUT.java | 92 +++ .../apache/iotdb/session/pool/SessionPoolTest.java | 17 +- site/pom.xml | 1 + site/src/main/.vuepress/config.js | 20 +- site/src/main/.vuepress/styles/index.styl | 2 +- .../.vuepress/theme/global-components/IoTDB.vue | 4 +- .../apache/iotdb/spark/db/EnvironmentUtils.java | 2 - .../apache/iotdb/spark/tsfile/DefaultSource.scala | 2 +- .../iotdb/spark/tsfile/NarrowConverter.scala | 2 +- .../apache/iotdb/spark/tsfile/WideConverter.scala | 7 +- tsfile/format-changelist.md | 1 + .../iotdb/tsfile/common/conf/TSFileConfig.java | 12 + .../iotdb/tsfile/common/conf/TSFileDescriptor.java | 2 + .../iotdb/tsfile/exception/NullFieldException.java | 12 +- .../file/metadata/MetadataIndexConstructor.java | 151 +++++ .../tsfile/file/metadata/MetadataIndexEntry.java | 91 +++ .../tsfile/file/metadata/MetadataIndexNode.java | 125 ++++ .../tsfile/file/metadata/TimeseriesMetadata.java | 14 +- .../iotdb/tsfile/file/metadata/TsFileMetadata.java | 50 +- .../file/metadata/enums/MetadataIndexNodeType.java | 95 +++ .../iotdb/tsfile/read/TsFileSequenceReader.java | 447 ++++++++++--- .../org/apache/iotdb/tsfile/read/common/Field.java | 23 + .../tsfile/read/controller/IMetadataQuerier.java | 2 +- .../read/controller/MetadataQuerierByFileImpl.java | 37 +- .../tsfile/read/query/executor/TsFileExecutor.java | 3 - .../iotdb/tsfile/utils/ReadWriteIOUtils.java | 7 + .../apache/iotdb/tsfile/write/TsFileWriter.java | 40 +- .../tsfile/write/chunk/ChunkGroupWriterImpl.java | 24 +- .../tsfile/write/chunk/IChunkGroupWriter.java | 14 +- .../write/record/{RowBatch.java => Tablet.java} | 100 +-- .../apache/iotdb/tsfile/write/schema/Schema.java | 24 +- .../write/writer/RestorableTsFileIOWriter.java | 9 +- .../iotdb/tsfile/write/writer/TsFileIOWriter.java | 67 +- .../file/metadata/MetadataIndexNodeTest.java | 46 ++ .../tsfile/file/metadata/utils/TestHelper.java | 20 +- .../iotdb/tsfile/file/metadata/utils/Utils.java | 14 +- .../apache/iotdb/tsfile/read/common/FieldTest.java | 15 +- .../iotdb/tsfile/read/reader/ReaderTest.java | 2 + .../iotdb/tsfile/write/TsFileIOWriterTest.java | 5 +- .../iotdb/tsfile/write/TsFileWriterTest.java | 35 +- 241 files changed, 8383 insertions(+), 3670 deletions(-)
