You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@iotdb.apache.org by qi...@apache.org on 2020/01/02 07:51:11 UTC
[incubator-iotdb] 02/02: merge master
This is an automated email from the ASF dual-hosted git repository.
qiaojialin pushed a commit to branch new_series_reader
in repository https://gitbox.apache.org/repos/asf/incubator-iotdb.git
commit d77a7706866d87f80d5787768c63a2a896173e89
Merge: 588c640 aa48a76
Author: qiaojialin <64...@qq.com>
AuthorDate: Thu Jan 2 15:50:47 2020 +0800
merge master
docs/Development-Chinese.md | 78 ++++
docs/Development-ReleaseCheck.md | 161 +++++++
... - Session.md => 2-Programming - Native API.md} | 19 +-
...ogramming - JDBC.md => 3-Programming - JDBC.md} | 0
.../1-DDL (Data Definition Language).md | 4 +-
.../2-DML (Data Manipulation Language).md | 2 +-
.../3-Account Management Statements.md | 4 +-
... - Session.md => 2-Programming - Native API.md} | 19 +-
...ogramming - JDBC.md => 3-Programming - JDBC.md} | 9 +-
.../4-Client/5-Programming - TsFile API.md | 3 +-
.../1-DDL (Data Definition Language).md | 2 +-
.../2-DML (Data Manipulation Language).md | 2 +-
.../3-Account Management Statements.md | 56 +--
.../main/java/org/apache/iotdb/JDBCExample.java | 4 +-
example/rocketmq/pom.xml | 2 +-
example/rocketmq/readme.md | 14 +-
.../java/org/apache/iotdb/rocketmq/Constant.java | 62 +--
.../apache/iotdb/rocketmq/RocketMQConsumer.java | 97 ++--
.../apache/iotdb/rocketmq/RocketMQProducer.java | 1 +
.../main/java/org/apache/iotdb/rocketmq/Utils.java | 2 +-
.../main/java/org/apache/iotdb/SessionExample.java | 24 +-
.../apache/iotdb/tsfile/TsFileSequenceRead.java | 16 +-
.../iotdb/hadoop/tsfile/TSFRecordReader.java | 22 +-
.../assembly/resources/tools/start-sync-client.bat | 2 +-
.../assembly/resources/tools/start-sync-client.sh | 2 +-
.../org/apache/iotdb/db/qp/strategy/SqlBase.g4 | 25 +-
.../org/apache/iotdb/db/concurrent/ThreadName.java | 3 +-
.../java/org/apache/iotdb/db/conf/IoTDBConfig.java | 22 +-
.../db/engine/merge/task/MergeMultiChunkTask.java | 7 +-
.../java/org/apache/iotdb/db/metadata/MGraph.java | 6 +-
.../org/apache/iotdb/db/metadata/MManager.java | 19 +-
.../java/org/apache/iotdb/db/metadata/MTree.java | 67 ++-
.../qp/executor/AbstractQueryProcessExecutor.java | 97 +---
.../db/qp/executor/IQueryProcessExecutor.java | 33 +-
.../iotdb/db/qp/executor/QueryProcessExecutor.java | 45 +-
.../db/qp/logical/crud/BasicFunctionOperator.java | 3 -
.../iotdb/db/qp/logical/crud/FilterOperator.java | 15 +-
.../iotdb/db/qp/logical/crud/QueryOperator.java | 9 +
.../iotdb/db/qp/physical/crud/AggregationPlan.java | 13 +
.../iotdb/db/qp/physical/crud/QueryPlan.java | 66 ++-
.../iotdb/db/qp/strategy/LogicalGenerator.java | 6 +
.../iotdb/db/qp/strategy/PhysicalGenerator.java | 171 ++++---
.../qp/strategy/optimizer/ConcatPathOptimizer.java | 131 +++++-
.../optimizer/MergeSingleFilterOptimizer.java | 13 +-
.../db/query/dataset/DeviceIterateDataSet.java | 56 ++-
.../NewEngineDataSetWithoutValueFilter.java | 203 ++++++--
.../dataset/groupby/GroupByEngineDataSet.java | 38 +-
.../groupby/GroupByWithValueFilterDataSet.java | 36 +-
.../groupby/GroupByWithoutValueFilterDataSet.java | 24 +-
.../db/query/executor/AggregateEngineExecutor.java | 35 +-
.../iotdb/db/query/executor/EngineExecutor.java | 75 ++-
.../iotdb/db/query/executor/EngineQueryRouter.java | 68 +--
.../db/query/executor/FillEngineExecutor.java | 16 +-
.../db/query/executor/IEngineQueryRouter.java | 39 +-
.../iotdb/db/query/pool/QueryTaskPoolManager.java | 78 ++++
.../reader/ManagedSeriesReader.java} | 29 +-
.../reader/chunkRelated/CachedDiskChunkReader.java | 14 +-
.../query/reader/chunkRelated/ChunkReaderWrap.java | 3 +-
.../query/reader/chunkRelated/DiskChunkReader.java | 13 +-
.../chunkRelated/DiskChunkReaderByTimestamp.java | 8 +-
.../query/reader/chunkRelated/MemChunkReader.java | 17 +-
.../CachedUnseqResourceMergeReader.java | 3 +-
.../NewUnseqResourceMergeReader.java | 23 +-
.../resourceRelated/SeqResourceIterateReader.java | 21 -
.../SeriesReaderWithoutValueFilter.java | 57 ++-
.../java/org/apache/iotdb/db/service/IoTDB.java | 2 +-
.../org/apache/iotdb/db/service/TSServiceImpl.java | 112 +++--
.../db/sync/sender/manage/SyncFileManager.java | 17 +-
.../java/org/apache/iotdb/db/utils/MergeUtils.java | 7 +-
.../db/engine/modification/DeletionQueryTest.java | 57 ++-
.../storagegroup/StorageGroupProcessorTest.java | 43 ++
.../iotdb/db/integration/IoTDBGroupbyDeviceIT.java | 18 +-
.../integration/IoTDBLoadExternalTsfileTest.java | 19 +-
.../db/integration/IoTDBSequenceDataQueryIT.java | 90 ++--
.../iotdb/db/integration/IoTDBSeriesReaderIT.java | 93 ++--
.../iotdb/db/integration/IoTDBSimpleQueryTest.java | 91 ++++
.../iotdb/db/metadata/MManagerBasicTest.java | 35 +-
.../iotdb/db/qp/plan/LogicalPlanSmallTest.java | 25 +
.../apache/iotdb/db/qp/utils/MemIntQpExecutor.java | 25 +-
.../query/executor/GroupByEngineDataSetTest.java | 62 ++-
.../reader/seriesRelated/FakedIBatchPoint.java | 18 +-
.../SeriesReaderWithValueFilterTest.java | 3 +-
.../SeriesReaderWithoutValueFilterTest.java | 5 +-
.../db/sync/sender/manage/SyncFileManagerTest.java | 54 ++-
.../sender/recover/SyncSenderLogAnalyzerTest.java | 20 +-
.../db/writelog/recover/SeqTsFileRecoverTest.java | 3 +
.../writelog/recover/UnseqTsFileRecoverTest.java | 6 +-
.../apache/iotdb/tsfile/read/common/BatchData.java | 515 ++++++++-------------
.../iotdb/tsfile/read/common/SignalBatchData.java | 27 +-
.../tsfile/read/expression/QueryExpression.java | 17 +-
.../tsfile/read/query/dataset/QueryDataSet.java | 4 -
.../read/reader/chunk/AbstractChunkReader.java | 163 -------
.../tsfile/read/reader/chunk/ChunkReader.java | 135 +++++-
.../read/reader/chunk/ChunkReaderByTimestamp.java | 2 +-
.../iotdb/tsfile/read/reader/page/PageReader.java | 158 +------
.../reader/series/AbstractFileSeriesReader.java | 10 +-
.../reader/series/FileSeriesReaderByTimestamp.java | 20 +-
.../tsfile/read/query/timegenerator/NodeTest.java | 7 +-
.../iotdb/tsfile/read/reader/PageReaderTest.java | 9 +-
99 files changed, 2446 insertions(+), 1640 deletions(-)