This is an automated email from the ASF dual-hosted git repository. geniuspig pushed a commit to branch http in repository https://gitbox.apache.org/repos/asf/incubator-iotdb.git
commit e4325030bae5c576bcc5e71bde724ee348e0b21c Merge: b0f9b1c f461ba2 Author: zhutianci <[email protected]> AuthorDate: Thu Feb 6 22:35:47 2020 +0800 Merge branch 'master' into http .travis.yml | 2 +- README.md | 2 +- .../org/apache/iotdb/client/AbstractClient.java | 25 ++- docs/{ => Community}/Community-History&Vision.md | 0 docs/{ => Community}/Community-Powered By.md | 0 .../Community-Project Committers.md | 0 docs/{ => Development}/Development-Chinese.md | 21 +++ docs/{ => Development}/Development-Contributing.md | 3 + docs/{ => Development}/Development-Document.md | 3 + docs/{ => Development}/Development-IDE.md | 0 docs/{ => Development}/Development-VoteRelease.md | 0 .../SystemDesign/0-Architecture/1-Architecture.md | 55 ++++++ .../1-TsFile/1-TsFile.md} | 11 +- .../1-TsFile/2-Format.md} | 7 +- .../SystemDesign/1-TsFile/3-Write.md | 65 +++++++ .../SystemDesign/1-TsFile/4-Read.md} | 7 +- .../SystemDesign/2-QueryEngine/1-QueryEngine.md | 64 +++++++ .../SystemDesign/2-QueryEngine/2-Planner.md | 63 +++++++ .../SystemDesign/2-QueryEngine/3-PlanExecutor.md} | 6 +- .../3-SchemaManager/1-SchemaManager.md} | 6 +- .../4-StorageEngine/1-StorageEngine.md | 92 ++++++++++ .../SystemDesign/4-StorageEngine/2-WAL.md} | 6 +- .../SystemDesign/4-StorageEngine/3-FlushManager.md | 84 +++++++++ .../4-StorageEngine/4-MergeManager.md} | 6 +- .../SystemDesign/5-DataQuery/1-DataQuery.md | 67 +++++++ .../6-Tools/1-Sync.md} | 6 +- .../SystemDesign/7-Connector/2-Hive-TsFile.md | 114 ++++++++++++ .../1-DDL (Data Definition Language).md | 8 +- .../5-Operation Manual/4-SQL Reference.md | 13 +- .../2-Files.md => 8-Architecture/1-Files.md} | 0 .../2-Writing Data on HDFS.md} | 0 .../3-Shared Nothing Cluster.md} | 0 .../0-Content.md} | 28 ++- .../SystemDesign/1-TsFile/1-TsFile.md} | 10 +- .../1-TsFile/2-Format.md} | 6 +- .../SystemDesign/1-TsFile/3-Write.md} | 4 +- .../SystemDesign/1-TsFile/4-Read.md} | 4 +- .../{Developers => SystemDesign}/release.adoc | 0 docs/Documentation/UserGuide/0-Content.md | 9 +- .../1-DDL (Data Definition Language).md | 9 +- .../5-Operation Manual/4-SQL Reference.md | 18 +- .../2-Files.md => 8-Architecture/1-Files.md} | 0 .../2-Writing Data on HDFS.md} | 0 .../3-Shared Nothing Cluster.md} | 0 .../org/apache/iotdb/jdbc/IoTDBConnection.java | 75 ++++---- .../java/org/apache/iotdb/jdbc/IoTDBStatement.java | 46 +++-- pom.xml | 4 + .../org/apache/iotdb/db/qp/strategy/SqlBase.g4 | 16 +- .../db/conf/adapter/IoTDBConfigDynamicAdapter.java | 4 +- .../apache/iotdb/db/qp/constant/SQLConstant.java | 2 + .../db/qp/executor/IQueryProcessExecutor.java | 2 - .../org/apache/iotdb/db/qp/logical/Operator.java | 2 +- .../db/qp/logical/crud/BasicFunctionOperator.java | 62 ++----- .../iotdb/db/qp/logical/crud/FilterOperator.java | 11 +- .../iotdb/db/qp/logical/crud/FunctionOperator.java | 7 + .../iotdb/db/qp/logical/crud/InOperator.java | 200 +++++++++++++++++++++ .../iotdb/db/qp/strategy/LogicalGenerator.java | 86 ++++++--- .../iotdb/db/qp/strategy/PhysicalGenerator.java | 2 +- .../qp/strategy/optimizer/ConcatPathOptimizer.java | 6 +- .../qp/strategy/optimizer/DnfFilterOptimizer.java | 2 +- .../db/qp/strategy/optimizer/IFilterOptimizer.java | 3 +- .../qp/strategy/optimizer/RemoveNotOptimizer.java | 15 +- .../groupby/GroupByWithValueFilterDataSet.java | 3 +- .../groupby/GroupByWithoutValueFilterDataSet.java | 1 - .../receiver/recover/ISyncReceiverLogAnalyzer.java | 1 - .../iotdb/db/sync/sender/transfer/SyncClient.java | 7 +- .../iotdb/db/integration/IoTDBQueryDemoIT.java | 134 +++++++++++++- .../org/apache/iotdb/db/qp/QueryProcessorTest.java | 4 + .../iotdb/db/qp/plan/LogicalPlanSmallTest.java | 12 ++ .../apache/iotdb/db/qp/plan/PhysicalPlanTest.java | 114 ++++++++---- .../read/expression/impl/GlobalTimeExpression.java | 2 +- .../expression/impl/SingleSeriesExpression.java | 2 +- .../iotdb/tsfile/read/filter/GroupByFilter.java | 2 +- .../iotdb/tsfile/read/filter/TimeFilter.java | 16 ++ .../iotdb/tsfile/read/filter/ValueFilter.java | 16 ++ .../tsfile/read/filter/basic/BinaryFilter.java | 2 +- .../iotdb/tsfile/read/filter/basic/Filter.java | 2 +- .../tsfile/read/filter/basic/UnaryFilter.java | 3 +- .../tsfile/read/filter/factory/FilterFactory.java | 2 - .../read/filter/factory/FilterSerializeId.java | 2 +- .../tsfile/read/filter/operator/AndFilter.java | 4 +- .../iotdb/tsfile/read/filter/operator/Eq.java | 6 +- .../iotdb/tsfile/read/filter/operator/Gt.java | 13 +- .../iotdb/tsfile/read/filter/operator/GtEq.java | 13 +- .../filter/operator/{NotFilter.java => In.java} | 92 +++++----- .../iotdb/tsfile/read/filter/operator/Lt.java | 13 +- .../iotdb/tsfile/read/filter/operator/LtEq.java | 13 +- .../iotdb/tsfile/read/filter/operator/NotEq.java | 13 +- .../tsfile/read/filter/operator/NotFilter.java | 4 +- .../tsfile/read/filter/operator/OrFilter.java | 4 +- 90 files changed, 1480 insertions(+), 389 deletions(-)
