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/25 05:29:33 UTC
[iotdb] branch Fix_flush created (now efb2598)
This is an automated email from the ASF dual-hosted git repository.
haonan pushed a change to branch Fix_flush
in repository https://gitbox.apache.org/repos/asf/iotdb.git.
at efb2598 Fix calculate
This branch includes the following new commits:
new 2778af8 Fix
new 485bdc8 Merge branch 'master' of https://github.com/apache/iotdb into Fix_flush
new efb2598 Fix calculate
The 3 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
[iotdb] 02/03: Merge branch 'master' of https://github.com/apache/iotdb into Fix_flush
Posted by ha...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
haonan pushed a commit to branch Fix_flush
in repository https://gitbox.apache.org/repos/asf/iotdb.git
commit 485bdc822e756bebd3312df95a212864045d1be4
Merge: 2778af8 1f853f1
Author: HTHou <hh...@outlook.com>
AuthorDate: Thu Nov 25 12:36:47 2021 +0800
Merge branch 'master' of https://github.com/apache/iotdb into Fix_flush
.../cluster/query/ClusterDataQueryExecutor.java | 2 +-
.../cluster/query/reader/ClusterReaderFactory.java | 7 +-
....java => AssignPathAscPriorityMergeReader.java} | 37 +-
.../mult/AssignPathDescPriorityMergeReader.java | 31 +-
.../reader/mult/AssignPathManagedMergeReader.java | 43 +-
.../mult/IAssignPathPriorityMergeReader.java | 47 +++
.../cluster/query/reader/mult/MultElement.java | 49 +++
.../mult/AssignPathManagedMergeReaderTest.java | 3 +-
.../IoTDB-SQL-Language/Maintenance-Command.md | 4 +
.../IoTDB-SQL-Language/Maintenance-Command.md | 3 +
.../dropwizard/DropwizardMetricManager.java | 134 +++---
.../dropwizard/type/DropwizardHistogram.java | 5 -
.../dropwizard/DropwizardMetricManagerTest.java | 15 +-
.../org/apache/iotdb/metrics/MetricManager.java | 6 +-
.../iotdb/metrics/impl/DoNothingHistogram.java | 4 -
.../org/apache/iotdb/metrics/type/Histogram.java | 3 -
.../micrometer/MicrometerMetricManager.java | 162 +++++---
.../micrometer/type/MicrometerHistogram.java | 5 -
.../micrometer/MicrometerMetricManagerTest.java | 52 +++
.../iotdb/db/engine/memtable/AbstractMemTable.java | 11 +-
.../org/apache/iotdb/db/metadata/MManager.java | 16 +-
.../apache/iotdb/db/metadata/path/AlignedPath.java | 6 +-
.../iotdb/db/qp/physical/crud/InsertPlan.java | 26 +-
.../db/query/aggregation/impl/CountAggrResult.java | 1 +
.../db/query/executor/AggregationExecutor.java | 34 +-
.../iotdb/db/query/executor/LastQueryExecutor.java | 6 +-
.../db/query/executor/fill/LastPointReader.java | 1 +
.../query/reader/chunk/MemAlignedPageReader.java | 10 +-
...ader.java => AlignedSeriesAggregateReader.java} | 36 +-
.../iotdb/db/query/reader/series/SeriesReader.java | 33 +-
.../reader/series/SeriesReaderByTimestamp.java | 5 +-
.../java/org/apache/iotdb/db/utils/MemUtils.java | 16 +-
.../org/apache/iotdb/db/constant/TestConstant.java | 3 +
.../apache/iotdb/db/integration/IoTDBLastIT.java | 9 +-
.../IoTDBAggregationWithoutValueFilter2IT.java | 63 +++
.../IoTDBAggregationWithoutValueFilterIT.java | 444 ++++++++++++++++++++
...gregationWithoutValueFilterWithDeletion2IT.java | 83 ++++
...ggregationWithoutValueFilterWithDeletionIT.java | 447 +++++++++++++++++++++
.../db/integration/aligned/IoTDBLastQuery2IT.java | 63 +++
.../db/integration/aligned/IoTDBLastQueryIT.java | 374 +++++++++++++++++
.../aligned/IoTDBLastQueryWithDeletion2IT.java | 81 ++++
.../aligned/IoTDBLastQueryWithDeletionIT.java | 380 ++++++++++++++++++
.../aligned/IoTDBLastQueryWithoutLastCache2IT.java | 66 +++
.../aligned/IoTDBLastQueryWithoutLastCacheIT.java | 379 +++++++++++++++++
...DBLastQueryWithoutLastCacheWithDeletion2IT.java | 86 ++++
...TDBLastQueryWithoutLastCacheWithDeletionIT.java | 384 ++++++++++++++++++
.../iotdb/db/metadata/MManagerBasicTest.java | 4 -
.../org/apache/iotdb/db/utils/MemUtilsTest.java | 10 +-
.../session/IoTDBSessionDisableMemControlIT.java | 205 ++++++++++
.../apache/iotdb/session/IoTDBSessionSimpleIT.java | 68 ++++
.../iotdb/session/IoTDBSessionVectorInsertIT.java | 75 ++++
.../tsfile/file/metadata/AlignedChunkMetadata.java | 4 +
.../file/metadata/AlignedTimeSeriesMetadata.java | 4 +
.../apache/iotdb/tsfile/read/common/BatchData.java | 16 +
.../iotdb/tsfile/read/filter/TimeFilter.java | 11 +
.../tsfile/read/reader/IAlignedPageReader.java | 2 +
.../tsfile/read/reader/page/AlignedPageReader.java | 5 +
.../zeppelin/iotdb/IoTDBInterpreterTest.java | 3 +-
58 files changed, 3821 insertions(+), 261 deletions(-)
[iotdb] 01/03: Fix
Posted by ha...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
haonan pushed a commit to branch Fix_flush
in repository https://gitbox.apache.org/repos/asf/iotdb.git
commit 2778af8cc5d419a7efc3e0a12213f50dc5c57d01
Author: HTHou <hh...@outlook.com>
AuthorDate: Thu Nov 25 12:36:41 2021 +0800
Fix
---
.../apache/iotdb/db/engine/memtable/AbstractMemTable.java | 12 ++----------
.../iotdb/db/engine/memtable/WritableMemChunkGroup.java | 9 ++-------
2 files changed, 4 insertions(+), 17 deletions(-)
diff --git a/server/src/main/java/org/apache/iotdb/db/engine/memtable/AbstractMemTable.java b/server/src/main/java/org/apache/iotdb/db/engine/memtable/AbstractMemTable.java
index c5e8ae2..811cdda 100644
--- a/server/src/main/java/org/apache/iotdb/db/engine/memtable/AbstractMemTable.java
+++ b/server/src/main/java/org/apache/iotdb/db/engine/memtable/AbstractMemTable.java
@@ -94,11 +94,7 @@ public abstract class AbstractMemTable implements IMemTable {
IWritableMemChunkGroup memChunkGroup =
memTableMap.computeIfAbsent(
deviceId,
- k -> {
- seriesNumber++;
- totalPointsNumThreshold += avgSeriesPointNumThreshold;
- return new WritableMemChunkGroup(schemaList);
- });
+ k -> new WritableMemChunkGroup());
for (IMeasurementSchema schema : schemaList) {
if (!memChunkGroup.contains(schema.getMeasurementId())) {
seriesNumber++;
@@ -113,11 +109,7 @@ public abstract class AbstractMemTable implements IMemTable {
IWritableMemChunkGroup memChunkGroup =
memTableMap.computeIfAbsent(
deviceId,
- k -> {
- seriesNumber++;
- totalPointsNumThreshold += avgSeriesPointNumThreshold;
- return new AlignedWritableMemChunkGroup(schemaList);
- });
+ k -> new AlignedWritableMemChunkGroup(schemaList));
for (IMeasurementSchema schema : schemaList) {
if (!memChunkGroup.contains(schema.getMeasurementId())) {
seriesNumber++;
diff --git a/server/src/main/java/org/apache/iotdb/db/engine/memtable/WritableMemChunkGroup.java b/server/src/main/java/org/apache/iotdb/db/engine/memtable/WritableMemChunkGroup.java
index 2ca32ce..4a88394 100644
--- a/server/src/main/java/org/apache/iotdb/db/engine/memtable/WritableMemChunkGroup.java
+++ b/server/src/main/java/org/apache/iotdb/db/engine/memtable/WritableMemChunkGroup.java
@@ -30,11 +30,8 @@ public class WritableMemChunkGroup implements IWritableMemChunkGroup {
private Map<String, IWritableMemChunk> memChunkMap;
- public WritableMemChunkGroup(List<IMeasurementSchema> schemaList) {
+ public WritableMemChunkGroup() {
memChunkMap = new HashMap<>();
- for (IMeasurementSchema schema : schemaList) {
- createMemChunkIfNotExistAndGet(schema);
- }
}
@Override
@@ -66,9 +63,7 @@ public class WritableMemChunkGroup implements IWritableMemChunkGroup {
private IWritableMemChunk createMemChunkIfNotExistAndGet(IMeasurementSchema schema) {
return memChunkMap.computeIfAbsent(
schema.getMeasurementId(),
- k -> {
- return new WritableMemChunk(schema);
- });
+ k -> new WritableMemChunk(schema));
}
@Override
[iotdb] 03/03: Fix calculate
Posted by ha...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
haonan pushed a commit to branch Fix_flush
in repository https://gitbox.apache.org/repos/asf/iotdb.git
commit efb2598e7bba4b0bb795bbc7d85050f7aa5dfea8
Author: HTHou <hh...@outlook.com>
AuthorDate: Thu Nov 25 13:24:33 2021 +0800
Fix calculate
---
.../org/apache/iotdb/db/engine/memtable/AbstractMemTable.java | 8 ++------
.../apache/iotdb/db/engine/memtable/WritableMemChunkGroup.java | 3 +--
2 files changed, 3 insertions(+), 8 deletions(-)
diff --git a/server/src/main/java/org/apache/iotdb/db/engine/memtable/AbstractMemTable.java b/server/src/main/java/org/apache/iotdb/db/engine/memtable/AbstractMemTable.java
index 24c901e..c55a4a3 100644
--- a/server/src/main/java/org/apache/iotdb/db/engine/memtable/AbstractMemTable.java
+++ b/server/src/main/java/org/apache/iotdb/db/engine/memtable/AbstractMemTable.java
@@ -92,9 +92,7 @@ public abstract class AbstractMemTable implements IMemTable {
private IWritableMemChunkGroup createMemChunkGroupIfNotExistAndGet(
String deviceId, List<IMeasurementSchema> schemaList) {
IWritableMemChunkGroup memChunkGroup =
- memTableMap.computeIfAbsent(
- deviceId,
- k -> new WritableMemChunkGroup());
+ memTableMap.computeIfAbsent(deviceId, k -> new WritableMemChunkGroup());
for (IMeasurementSchema schema : schemaList) {
if (!memChunkGroup.contains(schema.getMeasurementId())) {
seriesNumber++;
@@ -107,9 +105,7 @@ public abstract class AbstractMemTable implements IMemTable {
private IWritableMemChunkGroup createAlignedMemChunkGroupIfNotExistAndGet(
String deviceId, List<IMeasurementSchema> schemaList) {
IWritableMemChunkGroup memChunkGroup =
- memTableMap.computeIfAbsent(
- deviceId,
- k -> new AlignedWritableMemChunkGroup(schemaList));
+ memTableMap.computeIfAbsent(deviceId, k -> new AlignedWritableMemChunkGroup(schemaList));
for (IMeasurementSchema schema : schemaList) {
if (!memChunkGroup.contains(schema.getMeasurementId())) {
seriesNumber++;
diff --git a/server/src/main/java/org/apache/iotdb/db/engine/memtable/WritableMemChunkGroup.java b/server/src/main/java/org/apache/iotdb/db/engine/memtable/WritableMemChunkGroup.java
index 4a88394..fd6c408 100644
--- a/server/src/main/java/org/apache/iotdb/db/engine/memtable/WritableMemChunkGroup.java
+++ b/server/src/main/java/org/apache/iotdb/db/engine/memtable/WritableMemChunkGroup.java
@@ -62,8 +62,7 @@ public class WritableMemChunkGroup implements IWritableMemChunkGroup {
private IWritableMemChunk createMemChunkIfNotExistAndGet(IMeasurementSchema schema) {
return memChunkMap.computeIfAbsent(
- schema.getMeasurementId(),
- k -> new WritableMemChunk(schema));
+ schema.getMeasurementId(), k -> new WritableMemChunk(schema));
}
@Override