You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@iotdb.apache.org by ha...@apache.org on 2021/11/16 08:35:19 UTC
[iotdb] 04/06: merge new vector
This is an automated email from the ASF dual-hosted git repository.
haonan pushed a commit to branch new_vector_writablechunkgroup
in repository https://gitbox.apache.org/repos/asf/iotdb.git
commit a67383ecfb3890dbcc991364e3f8b2396d2ffcff
Merge: bb49af9 2d9bcf9
Author: HTHou <hh...@outlook.com>
AuthorDate: Tue Nov 16 14:01:04 2021 +0800
merge new vector
.../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 +-
.../query/reader/mult/RemoteMultSeriesReader.java | 8 +-
.../handlers/caller/PreviousFillHandler.java | 26 +-
.../ClusterGroupByNoVFilterDataSetTest.java | 2 +-
.../groupby/ClusterGroupByVFilterDataSetTest.java | 2 +-
.../iotdb/AlignedTimeseriesSessionExample.java | 63 +++-
.../tsfile/TsFileWriteAlignedWithTSRecord.java | 7 +-
.../iotdb/tsfile/TsFileWriteAlignedWithTablet.java | 4 +-
.../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 +-
pom.xml | 1 +
.../resources/conf/iotdb-engine.properties | 8 +-
.../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 +-
.../iotdb/db/engine/cache/BloomFilterCache.java | 188 ++++++++++
.../db/engine/cache/CacheHitRatioMonitor.java | 25 ++
.../engine/cache/CacheHitRatioMonitorMXBean.java | 10 +
.../db/engine/cache/TimeSeriesMetadataCache.java | 4 +-
.../engine/memtable/AlignedWritableMemChunk.java | 6 +-
.../iotdb/db/engine/memtable/WritableMemChunk.java | 8 +-
.../io/LocalTextModificationAccessor.java | 4 +-
.../modification/utils/TracedBufferedReader.java | 71 +++-
.../db/engine/storagegroup/TsFileResource.java | 4 +-
.../db/metadata/lastCache/LastCacheManager.java | 7 +
.../iotdb/db/metadata/path/MeasurementPath.java | 7 +-
.../iotdb/db/metadata/template/Template.java | 4 +-
.../db/metadata/template/TemplateManager.java | 3 +-
.../apache/iotdb/db/qp/executor/PlanExecutor.java | 12 +-
.../iotdb/db/qp/logical/crud/LikeOperator.java | 12 +-
.../iotdb/db/qp/logical/crud/RegexpOperator.java | 12 +-
.../db/query/aggregation/AggregateResult.java | 10 +-
.../aggregation/impl/FirstValueAggrResult.java | 8 +-
.../aggregation/impl/FirstValueDescAggrResult.java | 5 +
.../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 +-
.../db/query/executor/fill/LastPointReader.java | 1 -
.../iotdb/db/query/executor/fill/PreviousFill.java | 3 +-
.../iotdb/db/query/udf/builtin/UDTFCast.java | 2 +-
.../org/apache/iotdb/db/service/TSServiceImpl.java | 406 +++------------------
.../basic/BasicOpenSessionResp.java} | 40 +-
.../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 +++++++++++
.../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 +
.../test/java/org/apache/iotdb/db/sql/Cases.java | 30 --
.../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 +-
.../zeppelin/iotdb/IoTDBInterpreterTest.java | 6 +-
75 files changed, 1555 insertions(+), 619 deletions(-)
diff --cc server/src/main/java/org/apache/iotdb/db/engine/memtable/AlignedWritableMemChunk.java
index 9fa3311,cd7184b..69ebabb
--- a/server/src/main/java/org/apache/iotdb/db/engine/memtable/AlignedWritableMemChunk.java
+++ b/server/src/main/java/org/apache/iotdb/db/engine/memtable/AlignedWritableMemChunk.java
@@@ -39,8 -39,7 +39,8 @@@ import java.util.Map
public class AlignedWritableMemChunk implements IWritableMemChunk {
- private Map<String, Integer> measurementIndexMap;
- private List<IMeasurementSchema> schemaList;
- private final VectorMeasurementSchema schema;
++ private final Map<String, Integer> measurementIndexMap;
++ private final List<IMeasurementSchema> schemaList;
private AlignedTVList list;
private static final String UNSUPPORTED_TYPE = "Unsupported data type:";
private static final Logger LOGGER = LoggerFactory.getLogger(AlignedWritableMemChunk.class);
@@@ -187,7 -182,7 +187,7 @@@
@Override
public long count() {
- return list.size() * measurementIndexMap.size();
- return (long) list.size() * schema.getSubMeasurementsCount();
++ return (long) list.size() * measurementIndexMap.size();
}
public long alignedListSize() {