This is an automated email from the ASF dual-hosted git repository. caogaofei pushed a commit to branch sparse_index in repository https://gitbox.apache.org/repos/asf/incubator-iotdb.git
commit af5f67d973463c524cf0f146955052772783f43c Merge: 2e4d13f 000891f Author: CGF <[email protected]> AuthorDate: Thu May 30 13:10:47 2019 +0800 Merge branch 'master' into sparse_index .travis.yml | 27 +- README.md | 9 + docs/Documentation/QuickStart.md | 10 + .../UserGuideV0.7.0/4-Deployment and Management.md | 71 +- .../UserGuideV0.7.0/5-SQL Documentation.md | 4 +- .../Documentation/UserGuideV0.7.0/7-Tools-spark.md | 286 ++++---- .../iotdb/tsfile/hadoop/TSFRecordWriter.java | 11 +- .../iotdb/tsfile/hadoop/example/TsFileHelper.java | 6 +- .../cn/edu/thu/tsfile/hadoop/TsFileTestHelper.java | 6 +- iotdb-cli/cli/bin/export-csv.bat | 10 +- iotdb-cli/cli/bin/export-csv.sh | 8 +- iotdb-cli/cli/bin/import-csv.bat | 10 +- iotdb-cli/cli/bin/import-csv.sh | 8 +- iotdb-cli/cli/bin/start-client.bat | 8 +- iotdb-cli/cli/bin/start-client.sh | 6 +- .../java/org/apache/iotdb/cli/tool/ImportCsv.java | 4 +- .../iotdb/db/auth/authorizer/BasicAuthorizer.java | 3 +- .../db/concurrent/IoTDBThreadPoolFactory.java | 8 +- .../org/apache/iotdb/db/concurrent/ThreadName.java | 2 +- .../java/org/apache/iotdb/db/conf/IoTDBConfig.java | 24 +- .../org/apache/iotdb/db/conf/IoTDBConstant.java | 6 +- .../org/apache/iotdb/db/conf/IoTDBDescriptor.java | 7 +- .../engine/bufferwrite/BufferWriteProcessor.java | 23 +- .../iotdb/db/engine/filenode/FileNodeManager.java | 18 +- .../db/engine/filenode/FileNodeProcessor.java | 156 +++-- .../db/engine/overflow/io/OverflowProcessor.java | 33 +- .../apache/iotdb/db/engine/pool/FlushManager.java | 6 +- .../apache/iotdb/db/engine/pool/MergeManager.java | 8 +- .../exception/BufferWriteProcessorException.java | 2 +- .../db/exception/FileNodeManagerException.java | 4 + .../db/exception/FileNodeProcessorException.java | 2 +- .../db/exception/OverflowProcessorException.java | 2 +- .../db/exception/qp/IllegalASTFormatException.java | 7 + .../db/exception/qp/LogicalOperatorException.java | 7 + .../db/exception/qp/LogicalOptimizeException.java | 7 + .../db/exception/qp/QueryProcessorException.java | 4 + .../java/org/apache/iotdb/db/metadata/MGraph.java | 12 +- .../org/apache/iotdb/db/metadata/MManager.java | 13 - .../java/org/apache/iotdb/db/metadata/MTree.java | 32 - .../org/apache/iotdb/db/metadata/Metadata.java | 106 ++- .../org/apache/iotdb/db/qp/QueryProcessor.java | 13 +- .../db/qp/executor/IQueryProcessExecutor.java | 147 ++++ .../iotdb/db/qp/executor/OverflowQPExecutor.java | 3 +- .../iotdb/db/qp/executor/QueryProcessExecutor.java | 99 +-- .../org/apache/iotdb/db/qp/logical/Operator.java | 2 +- .../db/qp/logical/crud/BasicFunctionOperator.java | 5 +- .../iotdb/db/qp/logical/crud/FilterOperator.java | 5 +- .../apache/iotdb/db/qp/physical/PhysicalPlan.java | 4 +- .../iotdb/db/qp/physical/crud/AggregationPlan.java | 1 + .../iotdb/db/qp/physical/crud/DeletePlan.java | 1 + .../iotdb/db/qp/physical/crud/FillQueryPlan.java | 1 + .../iotdb/db/qp/physical/crud/GroupByPlan.java | 1 + .../iotdb/db/qp/physical/crud/InsertPlan.java | 1 + .../iotdb/db/qp/physical/crud/QueryPlan.java | 5 +- .../iotdb/db/qp/physical/crud/UpdatePlan.java | 1 + .../iotdb/db/qp/physical/sys/AuthorPlan.java | 1 + .../iotdb/db/qp/physical/sys/LoadDataPlan.java | 1 + .../iotdb/db/qp/physical/sys/MetadataPlan.java | 1 + .../iotdb/db/qp/physical/sys/PropertyPlan.java | 1 + .../{writelog => qp/physical}/transfer/Codec.java | 3 +- .../physical}/transfer/CodecInstances.java | 5 +- .../physical}/transfer/PhysicalPlanCodec.java | 14 +- .../transfer/PhysicalPlanLogTransfer.java | 2 +- .../physical}/transfer/SystemLogOperator.java | 2 +- .../iotdb/db/qp/strategy/PhysicalGenerator.java | 8 +- .../qp/strategy/optimizer/ConcatPathOptimizer.java | 14 +- .../db/query/aggregation/AggreResultData.java | 2 +- .../db/query/aggregation/AggregateFunction.java | 1 - .../db/query/aggregation/impl/CountAggrFunc.java | 2 +- .../db/query/aggregation/impl/FirstAggrFunc.java | 2 +- .../db/query/aggregation/impl/LastAggrFunc.java | 2 +- .../db/query/aggregation/impl/MaxTimeAggrFunc.java | 2 +- .../query/aggregation/impl/MaxValueAggrFunc.java | 2 +- .../db/query/aggregation/impl/MeanAggrFunc.java | 13 +- .../db/query/aggregation/impl/MinTimeAggrFunc.java | 2 +- .../query/aggregation/impl/MinValueAggrFunc.java | 2 +- .../db/query/aggregation/impl/SumAggrFunc.java | 10 + .../db/query/control/QueryResourceManager.java | 27 +- .../query/dataset/AggreResultDataPointReader.java | 2 +- .../dataset/EngineDataSetWithTimeGenerator.java | 35 +- .../dataset/EngineDataSetWithoutTimeGenerator.java | 4 + .../groupby/GroupByEngineDataSet.java | 11 +- .../groupby/GroupByWithOnlyTimeFilterDataSet.java} | 8 +- .../groupby/GroupByWithValueFilterDataSet.java} | 8 +- .../AbstractExecutorWithoutTimeGenerator.java | 84 +++ .../db/query/executor/AggregateEngineExecutor.java | 2 +- .../EngineExecutorWithoutTimeGenerator.java | 105 +-- .../iotdb/db/query/executor/EngineQueryRouter.java | 44 +- .../db/query/executor/IEngineQueryRouter.java | 78 +++ .../{aggregation => factory}/AggreFuncFactory.java | 3 +- ...nstructor.java => AbstractNodeConstructor.java} | 61 +- .../query/timegenerator/EngineNodeConstructor.java | 62 +- .../query/timegenerator/EngineTimeGenerator.java | 1 - .../apache/iotdb/db/service/CloseMergeService.java | 6 +- .../java/org/apache/iotdb/db/service/IoTDB.java | 9 +- .../org/apache/iotdb/db/service/JDBCService.java | 17 +- .../org/apache/iotdb/db/service/JMXService.java | 5 +- .../java/org/apache/iotdb/db/service/Monitor.java | 3 +- .../apache/iotdb/db/service/RegisterManager.java | 2 +- .../org/apache/iotdb/db/service/TSServiceImpl.java | 213 +++--- .../org/apache/iotdb/db/sql/parse/ParseDriver.java | 2 +- .../iotdb/db/sync/receiver/SyncServiceImpl.java | 2 +- .../iotdb/db/sync/receiver/SyncServiceManager.java | 5 +- .../org/apache/iotdb/db/utils/RecordUtils.java | 2 +- .../apache/iotdb/db/writelog/io/RAFLogReader.java | 2 +- .../writelog/manager/MultiFileLogNodeManager.java | 9 +- .../db/writelog/node/ExclusiveWriteLogNode.java | 4 +- .../recover/ExclusiveLogRecoverPerformer.java | 11 +- .../db/writelog/replay/ConcreteLogReplayer.java | 2 +- .../db/concurrent/IoTDBThreadPoolFactoryTest.java | 2 +- .../iotdb/db/integration/IoTDBAggregationIT.java | 86 ++- .../iotdb/db/integration/IoTDBSeriesReaderIT.java | 2 +- .../iotdb/db/metadata/MManagerBasicTest.java | 29 +- .../org/apache/iotdb/db/metadata/MTreeTest.java | 28 +- .../org/apache/iotdb/db/metadata/MetadataTest.java | 93 +++ .../org/apache/iotdb/db/qp/QueryProcessorTest.java | 88 ++- .../transfer/PhysicalPlanLogTransferTest.java | 2 +- .../org/apache/iotdb/db/qp/plan/QPUpdateTest.java | 2 +- .../apache/iotdb/db/qp/utils/MemIntQpExecutor.java | 3 +- .../EngineDataSetWithTimeGeneratorTest.java | 2 +- .../query/executor/GroupByEngineDataSetTest.java | 14 +- .../org/apache/iotdb/db/tools/WalCheckerTest.java | 2 +- .../apache/iotdb/db/utils/EnvironmentUtils.java | 2 +- .../apache/iotdb/db/writelog/PerformanceTest.java | 3 +- .../apache/iotdb/db/writelog/WriteLogNodeTest.java | 2 +- .../iotdb/db/writelog/io/LogWriterReaderTest.java | 3 +- jdbc/README.md | 4 +- .../org/apache/iotdb/jdbc/IoTDBConnection.java | 6 +- .../java/org/apache/iotdb/jdbc/IoTDBStatement.java | 6 +- pom.xml | 6 +- spark/README.md | 407 +++++++---- spark/pom.xml | 7 +- .../org/apache/iotdb/tsfile/io/CreateTSFile.java | 150 ---- .../java/org/apache/iotdb/tsfile/io/HDFSInput.java | 147 ++++ .../apache/iotdb/tsfile/io/HDFSInputStream.java | 111 --- .../io/{HDFSOutputStream.java => HDFSOutput.java} | 52 +- .../apache/iotdb/tsfile/io/TsFileOutputFormat.java | 10 +- .../apache/iotdb/tsfile/io/TsFileRecordWriter.java | 19 +- .../java/org/apache/iotdb/tsfile/qp/Executor.java | 51 -- .../org/apache/iotdb/tsfile/qp/QueryProcessor.java | 153 ----- .../iotdb/tsfile/qp/common/BasicOperator.java | 75 -- .../iotdb/tsfile/qp/common/FilterOperator.java | 157 ----- .../apache/iotdb/tsfile/qp/common/Operator.java | 47 -- .../apache/iotdb/tsfile/qp/common/SQLConstant.java | 150 ---- .../apache/iotdb/tsfile/qp/common/SingleQuery.java | 63 -- .../apache/iotdb/tsfile/qp/common/TSQueryPlan.java | 63 -- .../qp/exception/BasicOperatorException.java | 34 - .../tsfile/qp/exception/DNFOptimizeException.java | 34 - .../qp/exception/LogicalOptimizeException.java | 33 - .../tsfile/qp/exception/MergeFilterException.java | 30 - .../qp/exception/QueryOperatorException.java | 29 - .../qp/exception/QueryProcessorException.java | 41 -- .../tsfile/qp/exception/RemoveNotException.java | 34 - .../tsfile/qp/optimizer/DNFFilterOptimizer.java | 157 ----- .../tsfile/qp/optimizer/IFilterOptimizer.java | 34 - .../qp/optimizer/MergeSingleFilterOptimizer.java | 141 ---- .../tsfile/qp/optimizer/PhysicalOptimizer.java | 228 ------ .../tsfile/qp/optimizer/RemoveNotOptimizer.java | 108 --- .../scala/org/apache/iotdb/tsfile/Converter.scala | 764 ++++++++++++--------- .../org/apache/iotdb/tsfile/DefaultSource.scala | 177 ++--- .../apache/iotdb/tsfile/TsFileOutputWriter.scala | 52 +- .../apache/iotdb/tsfile/TsFileWriterFactory.scala | 42 +- .../scala/org/apache/iotdb/tsfile/package.scala | 36 +- spark/src/test/resources/test.tsfile | Bin 1406 -> 0 bytes .../cn/edu/tsinghua/tsfile/ConverterTest.scala | 130 ---- .../scala/cn/edu/tsinghua/tsfile/TSFileSuit.scala | 194 ------ .../scala/org/apache/iotdb/tool/TsFileExample.java | 106 +++ .../scala/org/apache/iotdb/tool/TsFileWrite.java | 215 ++++++ .../org/apache/iotdb/tsfile/ConverterTest.scala | 266 +++++++ .../org/apache/iotdb/tsfile/HDFSInputTest.java | 79 +++ .../scala/org/apache/iotdb/tsfile/TSFileSuit.scala | 217 ++++++ .../tsfile/common/constant/QueryConstant.java | 11 +- .../tsfile/exception/write/PageException.java | 8 + .../exception/write/WriteProcessException.java | 16 +- .../apache/iotdb/tsfile/read/ReadOnlyTsFile.java | 17 +- .../iotdb/tsfile/read/TsFileSequenceReader.java | 2 +- .../apache/iotdb/tsfile/read/common/BatchData.java | 4 +- .../org/apache/iotdb/tsfile/read/common/Field.java | 22 + .../org/apache/iotdb/tsfile/read/common/Path.java | 4 +- .../apache/iotdb/tsfile/read/common/TimeRange.java | 328 +++++++++ .../tsfile/read/controller/MetadataQuerier.java | 15 + .../read/controller/MetadataQuerierByFileImpl.java | 159 +++-- .../tsfile/read/expression/ExpressionType.java | 30 +- .../tsfile/read/expression/IBinaryExpression.java | 4 + .../iotdb/tsfile/read/expression/IExpression.java | 4 +- .../read/expression/impl/BinaryExpression.java | 38 +- .../read/expression/impl/GlobalTimeExpression.java | 10 +- .../expression/impl/SingleSeriesExpression.java | 10 +- .../tsfile/read/filter/basic/BinaryFilter.java | 3 + .../iotdb/tsfile/read/filter/basic/Filter.java | 2 + .../tsfile/read/filter/basic/UnaryFilter.java | 3 + .../tsfile/read/filter/operator/AndFilter.java | 7 +- .../iotdb/tsfile/read/filter/operator/Eq.java | 6 + .../iotdb/tsfile/read/filter/operator/Gt.java | 6 + .../iotdb/tsfile/read/filter/operator/GtEq.java | 6 + .../iotdb/tsfile/read/filter/operator/Lt.java | 6 + .../iotdb/tsfile/read/filter/operator/LtEq.java | 6 + .../iotdb/tsfile/read/filter/operator/NotEq.java | 6 + .../tsfile/read/filter/operator/NotFilter.java | 5 + .../tsfile/read/filter/operator/OrFilter.java | 5 + .../query/dataset/DataSetWithTimeGenerator.java | 32 - .../tsfile/read/query/dataset/QueryDataSet.java | 36 + .../query/executor/ExecutorWithTimeGenerator.java | 33 +- .../tsfile/read/query/executor/TsFileExecutor.java | 52 +- .../java/org/apache/iotdb/tsfile/utils/Pair.java | 5 +- .../apache/iotdb/tsfile/write/TsFileWriter.java | 12 + .../iotdb/tsfile/write/chunk/ChunkBuffer.java | 7 +- .../iotdb/tsfile/write/chunk/ChunkWriterImpl.java | 7 +- .../iotdb/tsfile/write/writer/TsFileIOWriter.java | 11 + .../iotdb/tsfile/read/ReadInPartitionTest.java | 240 +++++++ .../org/apache/iotdb/tsfile/read/ReadTest.java | 2 +- .../iotdb/tsfile/read/common/TimeRangeTest.java | 265 +++++++ .../controller/MetadataQuerierByFileImplTest.java | 137 +++- 213 files changed, 4856 insertions(+), 4140 deletions(-)
