This is an automated email from the ASF dual-hosted git repository. qiaojialin pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/incubator-iotdb.git
commit 1064e285447322baa4480ccef0158fe21ac9e831 Merge: 01aa984 d33366e Author: qiaojialin <[email protected]> AuthorDate: Thu May 7 14:11:56 2020 +0800 Merge remote-tracking branch 'origin/master' .../2-QueryEngine/4-ResultSetConstruction.md | 177 +++++++++++++++++++++ .../1-DDL Data Definition Language.md | 31 ++++ .../2-QueryEngine/4-ResultSetConstruction.md | 175 ++++++++++++++++++++ .../1-DDL Data Definition Language.md | 24 +++ .../resources/conf/iotdb-engine.properties | 8 +- .../org/apache/iotdb/db/qp/strategy/SqlBase.g4 | 7 +- .../java/org/apache/iotdb/db/conf/IoTDBConfig.java | 12 -- .../org/apache/iotdb/db/conf/IoTDBDescriptor.java | 14 +- .../db/engine/cache/CacheHitRatioMonitor.java | 6 - .../engine/cache/CacheHitRatioMonitorMXBean.java | 2 - .../iotdb/db/engine/cache/ChunkMetadataCache.java | 10 +- .../db/engine/cache/TimeSeriesMetadataCache.java | 67 ++++---- .../iotdb/db/engine/cache/TsFileMetaDataCache.java | 174 -------------------- .../iotdb/db/engine/merge/task/MergeFileTask.java | 3 - .../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 | 47 +++++- .../org/apache/iotdb/db/qp/logical/Operator.java | 2 +- .../apache/iotdb/db/qp/logical/RootOperator.java | 1 - .../{RootOperator.java => sys/FlushOperator.java} | 37 ++++- .../logical/sys/MergeOperator.java} | 19 ++- .../iotdb/db/qp/physical/crud/QueryPlan.java | 2 +- .../db/qp/physical/crud/RawDataQueryPlan.java | 16 +- .../sys/FlushPlan.java} | 30 +++- .../sys/MergePlan.java} | 26 ++- .../iotdb/db/qp/strategy/LogicalGenerator.java | 36 +++++ .../iotdb/db/qp/strategy/PhysicalGenerator.java | 131 ++++++++++----- .../reader/series/SeriesRawDataBatchReader.java | 24 +-- .../query/timegenerator/ServerTimeGenerator.java | 5 +- .../org/apache/iotdb/db/service/TSServiceImpl.java | 70 +------- .../apache/iotdb/db/engine/merge/MergeTest.java | 2 - .../db/integration/IoTDBEngineTimeGeneratorIT.java | 37 +++-- .../query/reader/series/SeriesReaderTestUtil.java | 3 - .../apache/iotdb/db/utils/EnvironmentUtils.java | 3 - .../java/org/apache/iotdb/session/Session.java | 2 +- .../org/apache/iotdb/session/IoTDBSessionIT.java | 11 +- .../java/org/apache/iotdb/session/SessionUT.java | 2 + site/src/main/.vuepress/config.js | 6 +- .../apache/iotdb/spark/db/EnvironmentUtils.java | 2 - .../tsfile/file/metadata/MetadataIndexNode.java | 2 +- .../file/metadata/enums/MetadataIndexNodeType.java | 9 ++ .../iotdb/tsfile/read/TsFileSequenceReader.java | 141 ++++++++++++++-- .../read/controller/MetadataQuerierByFileImpl.java | 10 +- 45 files changed, 941 insertions(+), 462 deletions(-)
