This is an automated email from the ASF dual-hosted git repository. rong pushed a commit to branch IOTDB-1859 in repository https://gitbox.apache.org/repos/asf/iotdb.git
commit ff5ef3cdcc1514d875d427171821d0a7bdb655a9 Merge: e7716ae 3a4fb77 Author: Steve Yurong Su <[email protected]> AuthorDate: Tue Nov 16 09:59:31 2021 +0800 merge master .../main/java/org/apache/iotdb/tool/ImportCsv.java | 18 +- .../iotdb/cluster/log/applier/BaseApplier.java | 8 +- .../iotdb/cluster/query/ClusterQueryRouter.java | 16 +- .../iotdb/cluster/query/LocalQueryExecutor.java | 48 +-- .../cluster/query/fill/ClusterFillExecutor.java | 3 +- .../cluster/query/fill/ClusterLinearFill.java | 4 +- .../cluster/query/fill/ClusterPreviousFill.java | 26 +- ...ava => ClusterGroupByFillNoVFilterDataSet.java} | 26 +- .../groupby/ClusterGroupByNoVFilterDataSet.java | 6 +- .../groupby/ClusterGroupByVFilterDataSet.java | 4 +- .../query/groupby/RemoteGroupByExecutor.java | 4 +- .../iotdb/cluster/query/reader/DataSourceInfo.java | 5 +- .../query/reader/mult/MultDataSourceInfo.java | 5 +- .../query/reader/mult/RemoteMultSeriesReader.java | 8 +- .../handlers/caller/PreviousFillHandler.java | 26 +- .../ClusterGroupByNoVFilterDataSetTest.java | 2 +- .../groupby/ClusterGroupByVFilterDataSetTest.java | 2 +- .../org/apache/iotdb/hive/TSFHiveRecordWriter.java | 3 +- .../iotdb/jdbc/AbstractIoTDBJDBCResultSet.java | 4 +- .../apache/iotdb/jdbc/IoTDBDatabaseMetadata.java | 15 +- .../java/org/apache/iotdb/jdbc/StringUtils.java | 19 +- .../resources/conf/iotdb-engine.properties | 8 +- .../WrappedSingleThreadScheduledExecutor.java | 17 + .../java/org/apache/iotdb/db/conf/IoTDBConfig.java | 17 +- .../org/apache/iotdb/db/conf/IoTDBConstant.java | 1 + .../org/apache/iotdb/db/conf/IoTDBDescriptor.java | 8 +- .../org/apache/iotdb/db/engine/StorageEngine.java | 5 - .../iotdb/db/engine/cache/BloomFilterCache.java | 188 ++++++++++ .../db/engine/cache/CacheHitRatioMonitor.java | 25 ++ .../engine/cache/CacheHitRatioMonitorMXBean.java | 10 + .../db/engine/cache/TimeSeriesMetadataCache.java | 8 +- .../AbstractCrossSpaceCompactionSelector.java | 1 + .../AbstractInnerSpaceCompactionSelector.java | 1 + .../SizeTieredCompactionRecoverTask.java | 1 + .../compaction/task/AbstractCompactionTask.java | 1 + .../apache/iotdb/db/engine/flush/FlushManager.java | 1 + .../iotdb/db/engine/memtable/WritableMemChunk.java | 8 +- .../io/LocalTextModificationAccessor.java | 4 +- .../modification/utils/TracedBufferedReader.java | 79 +++- .../db/engine/storagegroup/TsFileResource.java | 4 +- .../iotdb/db/metadata/mnode/EntityMNode.java | 1 + .../iotdb/db/metadata/mnode/IEntityMNode.java | 1 + .../iotdb/db/metadata/mnode/InternalMNode.java | 1 + .../iotdb/db/metadata/template/Template.java | 56 +-- .../db/metadata/template/TemplateManager.java | 3 +- .../apache/iotdb/db/qp/executor/PlanExecutor.java | 8 +- .../iotdb/db/qp/logical/crud/LikeOperator.java | 12 +- .../iotdb/db/qp/logical/crud/RegexpOperator.java | 12 +- .../db/qp/physical/crud/CreateTemplatePlan.java | 103 +++++- .../db/qp/physical/crud/InsertMultiTabletPlan.java | 2 + .../physical/crud/InsertRowsOfOneDevicePlan.java | 1 + .../iotdb/db/qp/physical/crud/InsertRowsPlan.java | 1 + .../qp/physical/sys/CreateMultiTimeSeriesPlan.java | 1 + .../iotdb/db/qp/utils/EmptyOutputStream.java | 1 + .../db/query/aggregation/AggregateResult.java | 10 +- .../aggregation/impl/FirstValueAggrResult.java | 8 +- .../aggregation/impl/FirstValueDescAggrResult.java | 5 + .../iotdb/db/query/control/QueryFileManager.java | 38 +- .../GroupByFillWithoutValueFilterDataSet.java | 5 +- .../groupby/GroupByWithValueFilterDataSet.java | 8 +- .../groupby/GroupByWithoutValueFilterDataSet.java | 5 +- .../iotdb/db/query/executor/FillQueryExecutor.java | 3 +- .../iotdb/db/query/executor/QueryRouter.java | 16 +- .../apache/iotdb/db/query/executor/fill/IFill.java | 3 +- .../iotdb/db/query/executor/fill/PreviousFill.java | 3 +- .../iotdb/db/query/udf/builtin/UDTFCast.java | 2 +- .../org/apache/iotdb/db/service/TSServiceImpl.java | 410 +++------------------ .../basic/BasicOpenSessionResp.java} | 22 +- .../db/service/basic/BasicServiceProvider.java | 268 ++++++++++++++ .../db/service/basic/QueryFrequencyRecorder.java | 54 +++ .../db/tools/settle/TsFileAndModSettleTool.java | 4 +- .../apache/iotdb/db/utils/ErrorHandlingUtils.java | 152 ++++++++ .../db/engine/cache/BloomFilterCacheTest.java | 208 +++++++++++ .../iotdb/db/metadata/MManagerBasicTest.java | 132 +------ .../org/apache/iotdb/db/metadata/TemplateTest.java | 254 +++++++++++++ .../iotdb/db/metadata/mlog/MLogUpgraderTest.java | 72 ++++ .../query/aggregation/DescAggregateResultTest.java | 63 ++++ .../apache/iotdb/db/utils/EnvironmentUtils.java | 2 + .../iotdb/session/template/InternalNode.java | 7 +- session/src/test/resources/iotdb-rest.properties | 55 +++ site/src/main/.vuepress/config.js | 1 + .../apache/iotdb/spark/db/EnvironmentUtils.java | 2 + .../iotdb/tsfile/read/filter/GroupByFilter.java | 20 +- .../iotdb/tsfile/read/filter/operator/Like.java | 8 +- .../org/apache/iotdb/tsfile/utils/BloomFilter.java | 39 ++ .../apache/iotdb/tsfile/utils/FilePathUtils.java | 4 +- .../apache/iotdb/tsfile/utils/StringContainer.java | 8 +- 87 files changed, 1988 insertions(+), 745 deletions(-)
