This is an automated email from the ASF dual-hosted git repository. hxd pushed a commit to branch comparison_doc in repository https://gitbox.apache.org/repos/asf/incubator-iotdb.git
commit dd9193f0b61f9274249fd938c30b88ee5cd1c8af Merge: edbd41d 1275474 Author: xiangdong huang <[email protected]> AuthorDate: Mon May 11 17:48:59 2020 +0800 Merge remote-tracking branch 'origin/master' into comparison_doc .gitignore | 3 + LICENSE-binary | 2 +- 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 | 17 +- .../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 .../org/apache/iotdb/client/AbstractClientIT.java | 218 ---------- distribution/pom.xml | 2 +- docs/SystemDesign/1-TsFile/2-Format.md | 283 +++++++++--- docs/SystemDesign/1-TsFile/3-Write.md | 2 +- .../2-QueryEngine/4-ResultSetConstruction.md | 177 ++++++++ .../3-SchemaManager/1-SchemaManager.md | 218 +++++++++- 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 +- docs/UserGuide/4-Client/3-Programming - JDBC.md | 8 + .../4-Client/5-Programming - TsFile API.md | 12 - docs/UserGuide/4-Client/7-Status Codes.md | 11 +- .../1-DDL Data Definition Language.md | 31 ++ .../2-DML Data Manipulation Language.md | 7 +- .../3-Account Management Statements.md | 2 +- docs/UserGuide/6-System Tools/3-JMX Tool.md | 47 +- .../6-System Tools/8-Load External Tsfile.md | 4 +- .../UserGuide/7-Ecosystem Integration/1-Grafana.md | 7 +- .../2-QueryEngine/4-ResultSetConstruction.md | 175 ++++++++ .../3-SchemaManager/1-SchemaManager.md | 210 ++++++++- 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/4-Config Manual.md | 13 + .../UserGuide/4-Client/1-Command Line Interface.md | 38 +- docs/zh/UserGuide/4-Client/3-Programming - JDBC.md | 9 +- .../4-Client/5-Programming - TsFile API.md | 13 - docs/zh/UserGuide/4-Client/7-Status Codes.md | 11 +- .../1-DDL Data Definition Language.md | 24 ++ .../2-DML Data Manipulation Language.md | 7 +- .../3-Account Management Statements.md | 2 +- docs/zh/UserGuide/6-System Tools/3-JMX Tool.md | 59 +-- .../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 ++ .../main/java/org/apache/iotdb/SessionExample.java | 40 +- .../apache/iotdb/tsfile/TsFileSequenceRead.java | 15 +- 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 | 26 +- .../apache/iotdb/hadoop/fileSystem/HDFSInput.java | 45 +- .../apache/iotdb/hadoop/fileSystem/HDFSOutput.java | 15 +- .../apache/iotdb/hadoop/tsfile/TSFInputFormat.java | 10 +- ...ultSet.java => AbstractIoTDBJDBCResultSet.java} | 273 +++++------- .../org/apache/iotdb/jdbc/IoTDBJDBCResultSet.java | 93 ++++ ...ultSet.java => IoTDBNonAlignJDBCResultSet.java} | 110 ++--- .../org/apache/iotdb/jdbc/IoTDBQueryResultSet.java | 203 --------- .../java/org/apache/iotdb/jdbc/IoTDBStatement.java | 14 +- ...ultSetTest.java => IoTDBJDBCResultSetTest.java} | 2 +- pom.xml | 4 +- .../resources/conf/iotdb-engine.properties | 19 +- .../org/apache/iotdb/db/qp/strategy/SqlBase.g4 | 7 +- .../java/org/apache/iotdb/db/conf/IoTDBConfig.java | 14 +- .../org/apache/iotdb/db/conf/IoTDBDescriptor.java | 51 ++- .../db/engine/cache/CacheHitRatioMonitor.java | 6 - .../engine/cache/CacheHitRatioMonitorMXBean.java | 2 - .../iotdb/db/engine/cache/ChunkMetadataCache.java | 10 +- .../db/engine/cache/TimeSeriesMetadataCache.java | 82 ++-- .../iotdb/db/engine/cache/TsFileMetaDataCache.java | 175 -------- .../iotdb/db/engine/merge/task/MergeFileTask.java | 34 +- .../engine/storagegroup/StorageGroupProcessor.java | 14 +- .../db/engine/storagegroup/TsFileProcessor.java | 2 +- .../db/engine/storagegroup/TsFileResource.java | 44 +- .../org/apache/iotdb/db/metadata/MManager.java | 14 + .../java/org/apache/iotdb/db/metadata/MTree.java | 20 + .../org/apache/iotdb/db/metadata/MetaUtils.java | 6 +- .../org/apache/iotdb/db/mqtt/PublishHandler.java | 7 +- .../main/java/org/apache/iotdb/db/qp/Planner.java | 2 + .../apache/iotdb/db/qp/constant/SQLConstant.java | 4 + .../apache/iotdb/db/qp/executor/IPlanExecutor.java | 4 +- .../apache/iotdb/db/qp/executor/PlanExecutor.java | 50 ++- .../org/apache/iotdb/db/qp/logical/Operator.java | 2 +- .../apache/iotdb/db/qp/logical/RootOperator.java | 1 - .../iotdb/db/qp/logical/crud/QueryOperator.java | 2 +- .../{RootOperator.java => sys/FlushOperator.java} | 37 +- .../iotdb/db/qp/logical/sys/MergeOperator.java | 16 +- .../iotdb/db/qp/physical/crud/FillQueryPlan.java | 2 +- .../iotdb/db/qp/physical/crud/GroupByFillPlan.java | 2 +- .../iotdb/db/qp/physical/crud/QueryPlan.java | 2 +- .../db/qp/physical/crud/RawDataQueryPlan.java | 16 +- .../GroupByFillPlan.java => sys/FlushPlan.java} | 34 +- .../apache/iotdb/db/qp/physical/sys/MergePlan.java | 22 +- .../iotdb/db/qp/strategy/LogicalGenerator.java | 42 +- .../iotdb/db/qp/strategy/PhysicalGenerator.java | 149 +++++-- .../qp/strategy/optimizer/ConcatPathOptimizer.java | 27 +- .../query/dataset/groupby/GroupByFillDataSet.java | 7 +- .../dataset/groupby/LocalGroupByExecutor.java | 6 +- .../db/query/executor/AggregationExecutor.java | 31 +- .../iotdb/db/query/executor/FillQueryExecutor.java | 4 +- .../iotdb/db/query/executor/LastQueryExecutor.java | 26 +- .../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 +- .../query/timegenerator/ServerTimeGenerator.java | 5 +- .../org/apache/iotdb/db/service/TSServiceImpl.java | 196 ++++----- .../apache/iotdb/db/tools/TsFileSketchTool.java | 142 ++++--- .../org/apache/iotdb/db/utils/FileLoaderUtils.java | 38 +- .../java/org/apache/iotdb/db/utils/MergeUtils.java | 14 +- .../writelog/recover/TsFileRecoverPerformer.java | 30 +- .../apache/iotdb/db/engine/merge/MergeTest.java | 2 - .../apache/iotdb/db/integration/IoTDBAliasIT.java | 273 ++++++++++++ .../db/integration/IoTDBEngineTimeGeneratorIT.java | 37 +- .../apache/iotdb/db/integration/IoTDBFillIT.java | 52 ++- .../iotdb/db/integration/IoTDBGroupByFillIT.java | 60 ++- .../apache/iotdb/db/integration/IoTDBLastIT.java | 2 + .../db/integration/IoTDBLoadExternalTsfileIT.java | 6 +- .../IoTDBMultiOverlappedChunkInUnseqIT.java | 17 +- .../db/integration/IoTDBMultiOverlappedPageIT.java | 42 +- .../apache/iotdb/db/integration/IoTDBTagIT.java | 32 ++ .../org/apache/iotdb/db/metadata/MTreeTest.java | 14 + .../apache/iotdb/db/qp/plan/PhysicalPlanTest.java | 10 +- .../query/reader/series/SeriesReaderTestUtil.java | 3 - .../apache/iotdb/db/utils/EnvironmentUtils.java | 3 - .../recover/RecoverResourceFromReaderTest.java | 189 +++++++++ service-rpc/pom.xml | 5 + .../java/org/apache/iotdb/rpc/IoTDBRpcDataSet.java | 406 ++++++++++++++++++ .../java/org/apache/iotdb/rpc/TSStatusCode.java | 2 +- .../java/org/apache/iotdb/session/Session.java | 16 +- .../org/apache/iotdb/session/SessionDataSet.java | 298 ++++++------- .../iotdb/session/pool/SessionDataSetWrapper.java | 4 +- .../org/apache/iotdb/session/pool/SessionPool.java | 4 +- .../org/apache/iotdb/session/IoTDBSessionIT.java | 19 +- .../iotdb/session/IoTDBSessionIteratorIT.java | 122 ++++++ .../java/org/apache/iotdb/session/SessionUT.java | 92 ++++ site/src/main/.vuepress/config.js | 20 +- site/src/main/.vuepress/styles/index.styl | 2 +- .../org/apache/iotdb/spark/db/Converter.scala | 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 + .../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 +++++ .../file/metadata/statistics/BinaryStatistics.java | 2 +- .../iotdb/tsfile/read/TsFileSequenceReader.java | 472 +++++++++++++++------ .../org/apache/iotdb/tsfile/read/common/Path.java | 8 +- .../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/schema/Schema.java | 4 +- .../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 +- .../iotdb/tsfile/read/reader/ReaderTest.java | 2 + .../iotdb/tsfile/write/TsFileIOWriterTest.java | 5 +- 209 files changed, 6828 insertions(+), 2626 deletions(-)
