You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@iotdb.apache.org by ja...@apache.org on 2021/03/30 01:45:12 UTC

[iotdb] branch MasterQueryDebug updated (c9ef7e9 -> 3721d22)

This is an automated email from the ASF dual-hosted git repository.

jackietien pushed a change to branch MasterQueryDebug
in repository https://gitbox.apache.org/repos/asf/iotdb.git.


    from c9ef7e9  format code
     add 5540272  [ISSUE-2827] add an overrided addChild() method in MNode. (#2828)
     add a735202  Optimize the code structure of deduplicate()  (#2856)
     add adc61e2  Optimize the code structure of deduplicate() - PART2 (#2863)
     add a8b01f1  [IOTDB-1234] fix ImportCsv tool cannot parse empty string (#2857)
     add c9026e2  Optimize cluster query (#2859)
     add 32eaa9e  simplify the Avg formula on removing redundant operations (#2868)
     add 6ffd095  [IOTDB-1274] fix the insert blocked caused the bugs in mem control module
     add 9e886df  Use switch case in enums class  (#2882)
     add c351b32  fix add "-" in thread name (#2884)
     add ec70703  [IOTDB-1214] Add Flink-IoTDB documents to the website (#2813)
     add b214511  [IOTDB-1251] optimize route intervals (#2886)
     add 155df75  [IOTDB-1207]Open time partition causes stackoverflow in Cluster Module (#2809)
     add 77cdc38  [IOTDB-1240]support show node command in cluster version (#2866)
     add ee4f073  Fix_IoTDBNewTsFileCompactionIT_problem (#2890)
     add 3781cc2  fix spelling mistake (#2889)
     add 64c11bc  [IOTDB-1255] refactor cluster package and jar name (#2892)
     add 5455d3b  [IOTDB-1252] optimize test mult-times perform (#2887)
     add 4f4ee90  Update cluster setup example after changing artifactId in cluster module  (#2899)
     add 85604b4  [IOTDB-1250] fix pull schema bug that the pullTimeSeriesSchema and  pullMeasurementSchema is misused(#2894)
     add 8fc8de3  [IOTDB-854] Limit the memory foorprint of the committed log cache (#2879)
     add ec5b756  fix Flink TsFile doc url error caused by PR2813 (#2893)
     add 9b22439  IOTDB-1241 support redirect query for cluster (#2867)
     add 3bdde72  Open IoTDBRemovePartitionIT ci log for diagnosis; fix System.out is closed in IoTDBCheckConfigIT (#2812)
     add 4377d18  [IOTDB-1256] upgrade Jackson to 2.11.0 because of loopholes CVE-2020-25649 (#2896)
     add 952a180  Add the method size() to Row in UDF (#2897)
     add 910b184  [IOTDB-1117][Distributed]Batched creation and fetch of RemoteSeriesReader(#2875)
     add be1d6a6  Fix alter context for max_degree_of_index_node default-value. (#2910)
     add 1c66316  fix Chinese Flink TsFile doc name
     add e67b770  [IOTDB-1236] Improve jdbc performance for creating timeseries in cluster module (#2872)
     add c5be711  Improve Python Client (#2898)
     add 876a576  Fix Add Operation bug introduced by #2872 (#2918)
     add 1fd2e19  [IOTDB-1248] forward the pull schema request to the leader (#2902)
     add d2c1030  Make CSV Tool doc more readable (#2926)
     add b28fa65  [ISSUE-2905] Fix Files.deleteIfExists() doesn't work for HDFS file (#2912)
     add e3d0e8e  [IOTDB-1258] jcl-over-slf4j have security vulnerabilities CVE-2018-8088 (#2906)
     add 4b533ff  [IOTDB-1260] optimize time_range query because syncMetaLeader (#2929)
     add a453b2f  [ISSUE-2790] Fix greetings.yml workflow (#2936)
     add c8f6d0f  [Distributed] Fix stackoverflow bug caused by InsertMultiTabletPlan or InsertRowsPlan  (#2938)
     add abdb580  [Distributed] Fix show remote timeseries serialization bug (#2940)
     add 170d679  [IOTDB-1260] optimize time_range query because syncMetaLeader (#2943)
     add e89db55  Merge remote-tracking branch 'origin/master' into MasterQueryDebug
     add 3721d22  fix sql

No new revisions were added by this update.

Summary of changes:
 .github/workflows/greetings.yml                    |   2 +-
 .gitignore                                         |   2 +-
 .../antlr4/org/apache/iotdb/db/qp/sql/SqlBase.g4   |   2 +-
 client-py/pypi/README.md                           |  21 +-
 client-py/src/iotdb/Session.py                     |  13 +-
 client-py/src/iotdb/TestContainer.py               |  49 +++
 cluster/pom.xml                                    |   2 +-
 .../resources/conf/iotdb-cluster.properties        |   7 +
 .../cluster/client/sync/SyncClientAdaptor.java     |  17 ++
 .../apache/iotdb/cluster/config/ClusterConfig.java |  21 ++
 .../iotdb/cluster/config/ClusterDescriptor.java    |  11 +
 .../iotdb/cluster/coordinator/Coordinator.java     |   1 +
 .../java/org/apache/iotdb/cluster/log/Log.java     |  10 +
 .../apache/iotdb/cluster/log/LogDispatcher.java    |   8 +-
 .../cluster/log/manage/CommittedEntryManager.java  |  34 +++
 .../iotdb/cluster/log/manage/RaftLogManager.java   |  37 ++-
 .../apache/iotdb/cluster/metadata/CMManager.java   |  33 ++-
 .../apache/iotdb/cluster/metadata/MetaPuller.java  |   3 +-
 .../cluster/query/ClusterDataQueryExecutor.java    | 213 ++++++++++++-
 .../iotdb/cluster/query/ClusterPlanExecutor.java   |  86 ++++++
 .../iotdb/cluster/query/LocalQueryExecutor.java    | 158 +++++++++-
 .../query/aggregate/ClusterAggregateExecutor.java  |   2 +-
 .../groupby/ClusterGroupByVFilterDataSet.java      |   2 +-
 .../cluster/query/reader/ClusterReaderFactory.java | 329 +++++++++++++++++++--
 .../cluster/query/reader/ClusterTimeGenerator.java | 145 ++++++++-
 .../iotdb/cluster/query/reader/EmptyReader.java    |   3 +-
 .../cluster/query/reader/MergedReaderByTime.java   |   8 +-
 .../reader/RemoteSeriesReaderByTimestamp.java      |  40 ++-
 .../query/reader/mult/AbstractMultPointReader.java |  70 +++++
 .../AssignPathManagedMergeReader.java}             |  12 +-
 .../reader/mult/AssignPathPriorityMergeReader.java |  66 +++++
 .../query/reader/mult/IMultBatchReader.java        |  11 +-
 .../cluster/query/reader/mult/MultBatchReader.java |  73 +++++
 .../MultDataSourceInfo.java}                       | 114 +++----
 .../cluster/query/reader/mult/MultEmptyReader.java |  30 +-
 .../reader/mult/MultSeriesRawDataPointReader.java  |  55 ++++
 .../query/reader/mult/RemoteMultSeriesReader.java  | 222 ++++++++++++++
 .../apache/iotdb/cluster/server/ClientServer.java  |   2 +-
 .../iotdb/cluster/server/DataClusterServer.java    |  63 +++-
 ...dler.java => GetChildNodeNextLevelHandler.java} |   9 +-
 .../cluster/server/member/MetaGroupMember.java     |  53 ++--
 .../iotdb/cluster/server/member/RaftMember.java    |  11 +-
 .../cluster/server/service/DataAsyncService.java   | 129 +++++---
 .../cluster/server/service/DataSyncService.java    | 138 ++++++---
 .../cluster/client/sync/SyncClientAdaptorTest.java |   9 +
 .../iotdb/cluster/common/TestAsyncDataClient.java  |  48 ++-
 .../cluster/common/TestManagedSeriesReader.java    |  23 +-
 .../org/apache/iotdb/cluster/common/TestUtils.java |   1 +
 .../cluster/log/manage/RaftLogManagerTest.java     |  35 +++
 .../apache/iotdb/cluster/query/BaseQueryTest.java  |   4 +-
 .../query/ClusterDataQueryExecutorTest.java        |  83 ++++++
 .../query/groupby/RemoteGroupByExecutorTest.java   |   4 +-
 .../query/manage/ClusterQueryManagerTest.java      |   2 +-
 .../query/reader/ClusterTimeGeneratorTest.java     |   2 +-
 .../reader/RemoteSeriesReaderByTimestampTest.java  |  68 +++--
 .../mult/AssignPathManagedMergeReaderTest.java     | 190 ++++++++++++
 .../mult/MultSeriesRawDataPointReaderTest.java     |  67 +++++
 .../reader/mult/RemoteMultSeriesReaderTest.java    | 286 ++++++++++++++++++
 .../member/{MemberTest.java => BaseMember.java}    | 210 +------------
 .../cluster/server/member/DataGroupMemberTest.java |  96 +++++-
 .../cluster/server/member/MetaGroupMemberTest.java |  43 ++-
 .../cluster/server/member/RaftMemberTest.java      | 244 +++++++++++++++
 docs/SystemDesign/TsFile/Format.md                 |   2 +-
 .../UserGuide/Ecosystem Integration/Flink IoTDB.md |  67 +++--
 .../Ecosystem Integration/Flink TsFile.md          |  17 +-
 docs/UserGuide/Server/Cluster Setup.md             |   6 +-
 docs/UserGuide/System Tools/CSV Tool.md            |  98 ++++--
 docs/zh/SystemDesign/StorageEngine/FileLists.md    |   2 +-
 docs/zh/SystemDesign/TsFile/Format.md              |   2 +-
 .../UserGuide/Ecosystem Integration/Flink IoTDB.md | 122 ++++++++
 .../Ecosystem Integration/Flink TsFile.md          |  38 +--
 docs/zh/UserGuide/Server/Cluster Setup.md          |   6 +-
 docs/zh/UserGuide/System Tools/CSV Tool.md         |  96 ++++--
 .../main/java/org/apache/iotdb/SessionExample.java | 102 ++++++-
 pom.xml                                            |   4 +-
 .../apache/iotdb/db/cost/statistic/Operation.java  |   1 +
 .../org/apache/iotdb/db/engine/StorageEngine.java  |   4 +-
 .../engine/compaction/utils/CompactionUtils.java   |   2 +-
 .../db/engine/storagegroup/TsFileResource.java     |   9 +-
 .../org/apache/iotdb/db/metadata/mnode/MNode.java  |  31 ++
 .../iotdb/db/qp/physical/crud/AggregationPlan.java |  32 ++
 .../iotdb/db/qp/physical/crud/FillQueryPlan.java   |   9 +
 .../iotdb/db/qp/physical/crud/QueryPlan.java       |  28 +-
 .../apache/iotdb/db/qp/physical/crud/UDTFPlan.java |   8 +
 .../iotdb/db/qp/strategy/PhysicalGenerator.java    |  80 +----
 .../db/query/aggregation/AggregateResult.java      |   4 +
 .../db/query/aggregation/impl/AvgAggrResult.java   |  25 +-
 .../db/query/aggregation/impl/CountAggrResult.java |  18 +-
 .../aggregation/impl/FirstValueAggrResult.java     |  26 +-
 .../aggregation/impl/FirstValueDescAggrResult.java |  20 +-
 .../aggregation/impl/LastValueAggrResult.java      |  26 +-
 .../aggregation/impl/LastValueDescAggrResult.java  |  37 ++-
 .../query/aggregation/impl/MaxTimeAggrResult.java  |  20 +-
 .../aggregation/impl/MaxTimeDescAggrResult.java    |  31 +-
 .../query/aggregation/impl/MaxValueAggrResult.java |  18 +-
 .../query/aggregation/impl/MinTimeAggrResult.java  |  24 +-
 .../aggregation/impl/MinTimeDescAggrResult.java    |  17 +-
 .../query/aggregation/impl/MinValueAggrResult.java |  18 +-
 .../db/query/aggregation/impl/SumAggrResult.java   |  15 +-
 .../db/query/control/QueryResourceManager.java     |   9 +
 .../db/query/dataset/AlignByDeviceDataSet.java     |  11 +
 .../dataset/RawQueryDataSetWithValueFilter.java    | 172 +++++++----
 .../dataset/RawQueryDataSetWithoutValueFilter.java |  11 +
 .../db/query/dataset/ShowTimeSeriesResult.java     |   2 +-
 .../db/query/executor/AggregationExecutor.java     |  87 ++++--
 .../db/query/executor/RawDataQueryExecutor.java    |  25 ++
 .../adapter/ByTimestampReaderAdapter.java          |  48 +--
 .../reader/chunk/DiskChunkReaderByTimestamp.java   |  55 ++--
 .../db/query/reader/series/IReaderByTimestamp.java |   2 +-
 .../reader/series/SeriesReaderByTimestamp.java     |  17 +-
 .../universal/CachedPriorityMergeReader.java       |   3 +-
 .../reader/universal/DescPriorityMergeReader.java  |   4 +-
 .../iotdb/db/query/reader/universal/Element.java   |  72 +++++
 .../reader/universal/PriorityMergeReader.java      |  39 +--
 .../apache/iotdb/db/query/udf/api/access/Row.java  |   7 +
 .../iotdb/db/query/udf/core/access/RowImpl.java    |   5 +
 .../org/apache/iotdb/db/rescon/SystemInfo.java     |  56 ++--
 .../org/apache/iotdb/db/service/TSServiceImpl.java | 317 ++++++++++++++++----
 .../integration/IOTDBGroupByInnerIntervalIT.java   | 135 +++++----
 .../iotdb/db/integration/IoTDBCheckConfigIT.java   |   1 +
 .../iotdb/db/integration/IoTDBExecuteBatchIT.java  | 118 ++++++++
 .../db/integration/IoTDBNewTsFileCompactionIT.java |   2 +-
 .../db/integration/IoTDBRemovePartitionIT.java     |  10 +
 .../aggregation/IoTDBAggregationIT.java            | 137 ++++-----
 .../apache/iotdb/db/metadata/mnode/MNodeTest.java  |  27 ++
 .../reader/series/SeriesReaderByTimestampTest.java |  12 +-
 server/src/test/resources/logback.xml              |   8 +-
 .../org/apache/iotdb/rpc/RedirectException.java    |   3 +-
 .../java/org/apache/iotdb/session/Session.java     | 103 ++++++-
 .../apache/iotdb/session/SessionConnection.java    |  32 +-
 site/src/main/.vuepress/config.js                  |   8 +-
 thrift/src/main/thrift/cluster.thrift              |  36 ++-
 thrift/src/main/thrift/rpc.thrift                  |   3 +
 .../file/metadata/enums/CompressionType.java       |  24 +-
 .../file/metadata/enums/MetadataIndexNodeType.java |  17 +-
 .../tsfile/file/metadata/enums/TSDataType.java     |  21 +-
 .../tsfile/file/metadata/enums/TSEncoding.java     |  27 +-
 .../tsfile/fileSystem/fsFactory/FSFactory.java     |   8 +
 .../tsfile/fileSystem/fsFactory/HDFSFactory.java   |   5 +
 .../fileSystem/fsFactory/LocalFSFactory.java       |   6 +
 .../query/dataset/DataSetWithTimeGenerator.java    |   2 +-
 .../tsfile/read/query/dataset/QueryDataSet.java    |  53 ++++
 .../read/query/timegenerator/TimeGenerator.java    |  52 +++-
 .../read/query/timegenerator/node/AndNode.java     |  18 +-
 .../read/query/timegenerator/node/OrNode.java      |  42 +--
 .../apache/iotdb/tsfile/write/schema/Schema.java   |   2 +-
 .../tsfile/read/reader/FakedTimeGenerator.java     |  15 +-
 147 files changed, 5351 insertions(+), 1315 deletions(-)
 create mode 100644 client-py/src/iotdb/TestContainer.py
 create mode 100644 cluster/src/main/java/org/apache/iotdb/cluster/query/reader/mult/AbstractMultPointReader.java
 copy cluster/src/main/java/org/apache/iotdb/cluster/query/reader/{ManagedMergeReader.java => mult/AssignPathManagedMergeReader.java} (88%)
 create mode 100644 cluster/src/main/java/org/apache/iotdb/cluster/query/reader/mult/AssignPathPriorityMergeReader.java
 copy tsfile/src/main/java/org/apache/iotdb/tsfile/read/reader/IBatchReader.java => cluster/src/main/java/org/apache/iotdb/cluster/query/reader/mult/IMultBatchReader.java (75%)
 create mode 100644 cluster/src/main/java/org/apache/iotdb/cluster/query/reader/mult/MultBatchReader.java
 copy cluster/src/main/java/org/apache/iotdb/cluster/query/reader/{DataSourceInfo.java => mult/MultDataSourceInfo.java} (70%)
 copy server/src/main/java/org/apache/iotdb/db/query/externalsort/serialize/IExternalSortFileDeserializer.java => cluster/src/main/java/org/apache/iotdb/cluster/query/reader/mult/MultEmptyReader.java (60%)
 create mode 100644 cluster/src/main/java/org/apache/iotdb/cluster/query/reader/mult/MultSeriesRawDataPointReader.java
 create mode 100644 cluster/src/main/java/org/apache/iotdb/cluster/query/reader/mult/RemoteMultSeriesReader.java
 copy cluster/src/main/java/org/apache/iotdb/cluster/server/handlers/caller/{GetChildNodeNextLevelPathHandler.java => GetChildNodeNextLevelHandler.java} (80%)
 create mode 100644 cluster/src/test/java/org/apache/iotdb/cluster/query/reader/mult/AssignPathManagedMergeReaderTest.java
 create mode 100644 cluster/src/test/java/org/apache/iotdb/cluster/query/reader/mult/MultSeriesRawDataPointReaderTest.java
 create mode 100644 cluster/src/test/java/org/apache/iotdb/cluster/query/reader/mult/RemoteMultSeriesReaderTest.java
 rename cluster/src/test/java/org/apache/iotdb/cluster/server/member/{MemberTest.java => BaseMember.java} (59%)
 create mode 100644 cluster/src/test/java/org/apache/iotdb/cluster/server/member/RaftMemberTest.java
 copy example/flink/src/main/java/org/apache/iotdb/flink/FlinkIoTDBSink.java => docs/UserGuide/Ecosystem Integration/Flink IoTDB.md (59%)
 copy flink-tsfile-connector/README.md => docs/UserGuide/Ecosystem Integration/Flink TsFile.md (97%)
 create mode 100644 docs/zh/UserGuide/Ecosystem Integration/Flink IoTDB.md
 copy flink-tsfile-connector/README.md => docs/zh/UserGuide/Ecosystem Integration/Flink TsFile.md (86%)
 create mode 100644 server/src/main/java/org/apache/iotdb/db/query/reader/universal/Element.java