This is an automated email from the ASF dual-hosted git repository. jackietien pushed a commit to branch ty_new_vector in repository https://gitbox.apache.org/repos/asf/iotdb.git
commit 1c86fa22d41967a1febb92160d33efabc6d1ddad Merge: 6370cac aaadc5c Author: JackieTien97 <[email protected]> AuthorDate: Fri Nov 19 16:09:33 2021 +0800 resolve conflicts client-py/SessionExample.py | 9 +- client-py/iotdb/utils/SessionDataSet.py | 6 + .../iotdb/cluster/query/ClusterPlanExecutor.java | 80 ++- .../iotdb/cluster/query/ClusterQueryRouter.java | 9 + .../ClusterGroupByFillNoVFilterDataSet.java | 7 +- ....java => ClusterGroupByFillVFilterDataSet.java} | 50 +- docs/Download/README.md | 34 +- docs/zh/Download/README.md | 34 +- .../main/java/org/apache/iotdb/SessionExample.java | 225 ++++--- .../controller/DatabaseConnectController.java | 63 +- .../iotdb/web/grafana/dao/impl/BasicDaoImpl.java | 16 +- .../grafana/service/DatabaseConnectService.java | 2 - .../service/impl/DatabaseConnectServiceImpl.java | 5 - .../db/engine/cache/TimeSeriesMetadataCache.java | 2 +- .../db/engine/compaction/TsFileIdentifier.java | 184 ++++++ ...yzer.java => InplaceCompactionLogAnalyzer.java} | 56 +- ...rgeLogger.java => InplaceCompactionLogger.java} | 20 +- .../cross/inplace/task/CrossSpaceMergeTask.java | 23 +- .../cross/inplace/task/MergeFileTask.java | 18 +- .../cross/inplace/task/MergeMultiChunkTask.java | 16 +- .../cross/inplace/task/RecoverCrossMergeTask.java | 23 +- .../SizeTieredCompactionRecoverTask.java | 108 +-- .../inner/sizetiered/SizeTieredCompactionTask.java | 16 +- .../inner/utils/InnerSpaceCompactionUtils.java | 7 - .../utils/SizeTieredCompactionLogAnalyzer.java | 27 +- .../inner/utils/SizeTieredCompactionLogger.java | 13 +- .../compaction/task/CompactionRecoverTask.java | 5 +- .../querycontext/AlignedReadOnlyMemChunk.java | 4 +- ...rDataSet.java => GroupByFillEngineDataSet.java} | 380 +++-------- .../groupby/GroupByFillWithValueFilterDataSet.java | 438 ++++++++++++ .../GroupByFillWithoutValueFilterDataSet.java | 406 ++---------- .../groupby/GroupByWithValueFilterDataSet.java | 4 +- .../iotdb/db/query/executor/QueryRouter.java | 19 +- .../query/reader/chunk/MemAlignedChunkLoader.java | 52 ++ .../query/reader/chunk/MemAlignedChunkReader.java | 110 ++++ .../query/reader/chunk/MemAlignedPageReader.java | 91 +++ .../iotdb/db/query/reader/series/SeriesReader.java | 37 +- .../db/engine/compaction/TsFileIdentifierUT.java | 194 ++++++ .../compaction/inner/InnerSeqCompactionTest.java | 21 +- .../inner/InnerSpaceCompactionUtilsTest.java | 13 +- .../compaction/inner/InnerUnseqCompactionTest.java | 7 +- .../SizeTieredCompactionRecoverTest.java | 331 ++++++++-- .../recover/SizeTieredCompactionRecoverTest.java | 732 +++++++++++++++++++++ .../iotdb/db/integration/IoTDBGroupByFillIT.java | 448 +++++++++++++ .../db/integration/IoTDBGroupByFillMixPathsIT.java | 191 ++++++ .../iotdb/db/integration/IoTDBMetadataFetchIT.java | 17 +- .../dataset/groupby/GroupByFillDataSetTest.java | 170 +++-- .../org/apache/iotdb/session/SessionDataSet.java | 7 +- site/pom.xml | 154 +---- site/src/main/.vuepress/config.js | 4 +- testcontainer/src/tool/README.md | 33 + testcontainer/src/tool/parser.py | 79 +++ .../tsfile/read/filter/GroupByMonthFilter.java | 114 +++- .../tsfile/read/filter/basic/BinaryFilter.java | 8 + .../tsfile/read/filter/factory/FilterFactory.java | 8 + .../read/filter/factory/FilterSerializeId.java | 1 + .../iotdb/tsfile/read/filter/operator/In.java | 15 +- .../IAlignedPageReader.java} | 20 +- .../tsfile/read/reader/page/AlignedPageReader.java | 4 +- .../tsfile/read/filter/FilterSerializeTest.java | 25 +- 60 files changed, 3755 insertions(+), 1440 deletions(-) diff --cc server/src/main/java/org/apache/iotdb/db/query/reader/series/SeriesReader.java index 12c0436,416f47b..128686e --- a/server/src/main/java/org/apache/iotdb/db/query/reader/series/SeriesReader.java +++ b/server/src/main/java/org/apache/iotdb/db/query/reader/series/SeriesReader.java @@@ -18,6 -18,6 +18,16 @@@ */ package org.apache.iotdb.db.query.reader.series; ++import java.io.IOException; ++import java.io.Serializable; ++import java.util.Comparator; ++import java.util.LinkedList; ++import java.util.List; ++import java.util.Objects; ++import java.util.PriorityQueue; ++import java.util.Set; ++import java.util.function.ToLongFunction; ++import java.util.stream.Collectors; import org.apache.iotdb.db.engine.querycontext.QueryDataSource; import org.apache.iotdb.db.engine.storagegroup.TsFileResource; import org.apache.iotdb.db.metadata.path.PartialPath; @@@ -42,21 -42,21 +52,10 @@@ import org.apache.iotdb.tsfile.read.com import org.apache.iotdb.tsfile.read.common.BatchDataFactory; import org.apache.iotdb.tsfile.read.filter.basic.Filter; import org.apache.iotdb.tsfile.read.filter.basic.UnaryFilter; + import org.apache.iotdb.tsfile.read.reader.IAlignedPageReader; import org.apache.iotdb.tsfile.read.reader.IPageReader; - import org.apache.iotdb.tsfile.read.reader.page.AlignedPageReader; import org.apache.iotdb.tsfile.utils.TsPrimitiveType; --import java.io.IOException; --import java.io.Serializable; --import java.util.Comparator; --import java.util.LinkedList; --import java.util.List; --import java.util.Objects; --import java.util.PriorityQueue; --import java.util.Set; --import java.util.function.ToLongFunction; --import java.util.stream.Collectors; -- public class SeriesReader { // inner class of SeriesReader for order purpose
