You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@iotdb.apache.org by xu...@apache.org on 2022/01/05 02:17:28 UTC
[iotdb] 02/02: Merge branch 'master' of git://github.com/apache/iotdb into xkf_id_table_flush_time
This is an automated email from the ASF dual-hosted git repository.
xuekaifeng pushed a commit to branch xkf_id_table_flush_time
in repository https://gitbox.apache.org/repos/asf/iotdb.git
commit 3b4bcf51ad66ae8a43f01156eae26dcce7f36a80
Merge: 3355a9e 3cbf9af
Author: 151250176 <15...@smail.nju.edu.cn>
AuthorDate: Wed Jan 5 10:15:02 2022 +0800
Merge branch 'master' of git://github.com/apache/iotdb into xkf_id_table_flush_time
.../cluster/query/ClusterUDTFQueryExecutor.java | 4 +-
.../iotdb/cluster/query/LocalQueryExecutor.java | 20 +-
.../cluster/server/service/DataAsyncService.java | 2 +-
.../cluster/server/service/DataSyncService.java | 2 +-
.../query/ClusterDataQueryExecutorTest.java | 87 +++++++
.../UserGuide/Data-Concept/Auto-Create-MetaData.md | 14 +-
docs/UserGuide/Data-Concept/Compression.md | 95 ++++++-
.../Data-Concept/Data-Model-and-Terminology.md | 37 ++-
docs/UserGuide/Data-Concept/Data-Type.md | 14 +-
docs/UserGuide/Data-Concept/Encoding.md | 11 +-
docs/UserGuide/Data-Concept/SDT.md | 111 ---------
docs/UserGuide/Data-Concept/Schema-Template.md | 8 +-
docs/UserGuide/Data-Concept/Time-Partition.md | 8 +-
.../DML-Data-Manipulation-Language.md | 33 ++-
.../UserGuide/Data-Concept/Auto-Create-MetaData.md | 14 +-
docs/zh/UserGuide/Data-Concept/Compression.md | 90 ++++++-
.../Data-Concept/Data-Model-and-Terminology.md | 34 ++-
docs/zh/UserGuide/Data-Concept/Data-Type.md | 18 +-
docs/zh/UserGuide/Data-Concept/Encoding.md | 6 +-
docs/zh/UserGuide/Data-Concept/SDT.md | 106 --------
docs/zh/UserGuide/Data-Concept/Schema-Template.md | 32 +--
docs/zh/UserGuide/Data-Concept/Time-Partition.md | 8 +-
.../DML-Data-Manipulation-Language.md | 29 ++-
.../integration/IOTDBGroupByInnerIntervalIT.java | 2 +-
.../IoTDBQueryWithComplexValueFilterIT.java | 122 +++++++++
.../db/integration/aligned/IoTDBDeletionIT.java | 31 +++
.../apache/iotdb/session/IoTDBSessionSimpleIT.java | 4 +-
library-udf/pom.xml | 8 +-
.../resources/conf/iotdb-engine.properties | 12 +-
.../org/apache/iotdb/db/concurrent/ThreadName.java | 1 +
.../java/org/apache/iotdb/db/conf/IoTDBConfig.java | 30 ++-
.../org/apache/iotdb/db/conf/IoTDBDescriptor.java | 16 ++
.../org/apache/iotdb/db/engine/StorageEngine.java | 37 ++-
.../db/engine/querycontext/QueryDataSource.java | 45 ++++
.../db/engine/storagegroup/TsFileProcessor.java | 74 +++---
.../db/engine/storagegroup/TsFileResource.java | 209 ++++++++++++----
.../storagegroup/VirtualStorageGroupProcessor.java | 46 ++--
.../org/apache/iotdb/db/metadata/MManager.java | 21 +-
.../org/apache/iotdb/db/metadata/mtree/MTree.java | 23 +-
.../apache/iotdb/db/metadata/path/AlignedPath.java | 6 +-
.../iotdb/db/metadata/path/MeasurementPath.java | 8 +-
.../apache/iotdb/db/metadata/path/PartialPath.java | 7 +
.../apache/iotdb/db/metadata/tag/TagManager.java | 24 +-
.../apache/iotdb/db/qp/sql/IoTDBSqlVisitor.java | 4 +
.../iotdb/db/query/context/QueryContext.java | 9 +
.../db/query/control/QueryResourceManager.java | 110 +++++++--
.../db/query/control/tracing/TracingInfo.java | 8 +
.../db/query/control/tracing/TracingManager.java | 4 +
.../db/query/dataset/NonAlignEngineDataSet.java | 4 +-
.../dataset/RawQueryDataSetWithoutValueFilter.java | 26 +-
.../groupby/GroupByWithValueFilterDataSet.java | 30 ++-
.../groupby/GroupByWithoutValueFilterDataSet.java | 24 +-
.../dataset/groupby/LocalGroupByExecutor.java | 5 +-
.../db/query/executor/AggregationExecutor.java | 49 +++-
.../iotdb/db/query/executor/FillQueryExecutor.java | 113 ++++++---
.../iotdb/db/query/executor/LastQueryExecutor.java | 14 +-
.../db/query/executor/RawDataQueryExecutor.java | 38 ++-
.../iotdb/db/query/executor/UDFQueryExecutor.java | 4 +-
...yTaskPoolManager.java => QueryTaskManager.java} | 46 +---
...nager.java => RawQueryReadTaskPoolManager.java} | 34 ++-
.../metadata/MemAlignedChunkMetadataLoader.java | 4 +-
.../chunk/metadata/MemChunkMetadataLoader.java | 4 +-
.../query/reader/series/SeriesAggregateReader.java | 27 ++
.../reader/series/SeriesRawDataBatchReader.java | 1 -
.../iotdb/db/query/reader/series/SeriesReader.java | 212 +++++++++++-----
.../reader/series/SeriesReaderByTimestamp.java | 27 ++
.../query/timegenerator/ServerTimeGenerator.java | 60 ++++-
.../db/service/thrift/impl/TSServiceImpl.java | 273 ++++++++++++---------
.../org/apache/iotdb/db/utils/FileLoaderUtils.java | 5 +-
.../java/org/apache/iotdb/db/utils/QueryUtils.java | 26 ++
.../db/utils/datastructure/AlignedTVList.java | 20 +-
.../engine/modification/DeletionFileNodeTest.java | 44 +++-
.../storagegroup/StorageGroupProcessorTest.java | 70 +++++-
.../iotdb/db/engine/storagegroup/TTLTest.java | 23 +-
.../engine/storagegroup/TsFileProcessorTest.java | 40 +--
.../iotdb/db/metadata/MManagerBasicTest.java | 48 +++-
.../reader/series/SeriesAggregateReaderTest.java | 6 +-
.../reader/series/SeriesReaderByTimestampTest.java | 6 +-
site/src/main/.vuepress/config.js | 10 +-
.../read/query/timegenerator/TimeGenerator.java | 3 +
.../query/timegenerator/TsFileTimeGenerator.java | 6 +
.../tsfile/read/reader/FakedTimeGenerator.java | 6 +
82 files changed, 2058 insertions(+), 894 deletions(-)