You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@iotdb.apache.org by ma...@apache.org on 2023/03/03 04:13:09 UTC
[iotdb] branch IOTDB-5517 updated (94d6baa3da -> 1997e44c2f)
This is an automated email from the ASF dual-hosted git repository.
marklau99 pushed a change to branch IOTDB-5517
in repository https://gitbox.apache.org/repos/asf/iotdb.git
discard 94d6baa3da fix mistake in DiskMetrics tags
add e0372b148e Remove jackson-mapper-asl to fix security alert (#9199)
add 9f2b526c61 Fix timeout in Schema UT (#9195)
add eba644717e feat(site):home break-word (#9203)
add 3057e4dce1 Remove redundant logic in reconstructExpressions() (#9200)
add 10ef294d72 Update query user guide (#9205)
add 0a4a84fca3 [IOTDB-5563] Extract and decouple the logic of window segmentation in Aggregator (#9141)
new 1997e44c2f fix mistake in DiskMetrics tags
This update added new revisions after undoing existing revisions.
That is to say, some revisions that were in the old version of the
branch are not in the new version. This situation occurs
when a user --force pushes a change and generates a repository
containing something like this:
* -- * -- B -- O -- O -- O (94d6baa3da)
\
N -- N -- N refs/heads/IOTDB-5517 (1997e44c2f)
You should already have received notification emails for all of the O
revisions, and so the following emails describe only the N revisions
from the common base, B.
Any revisions marked "omit" are not gone; other references still
refer to them. Any revisions marked "discard" are gone forever.
The 1 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.
Summary of changes:
docs/UserGuide/Query-Data/Pagination.md | 6 +-
docs/UserGuide/Query-Data/Select-Into.md | 24 ++--
docs/zh/UserGuide/Query-Data/Pagination.md | 4 +-
docs/zh/UserGuide/Query-Data/Select-Into.md | 26 ++--
.../db/it/groupby/IoTDBGroupByConditionIT.java | 2 +-
.../iotdb/db/it/groupby/IoTDBGroupBySessionIT.java | 18 +--
pom.xml | 6 -
...eventWindow.ftl => abstractVariationWindow.ftl} | 30 ++---
.../main/codegen/templates/eventWindowManager.ftl | 51 -------
.../{evEventWindow.ftl => variationWindow.ftl} | 16 +--
...indowManager.ftl => variationWindowManager.ftl} | 36 ++---
.../mtree/store/disk/cache/CacheMemoryManager.java | 8 ++
.../iotdb/db/mpp/aggregation/Accumulator.java | 16 +--
.../iotdb/db/mpp/aggregation/Aggregator.java | 35 +----
.../iotdb/db/mpp/aggregation/AvgAccumulator.java | 90 +++++--------
.../iotdb/db/mpp/aggregation/CountAccumulator.java | 23 ++--
.../db/mpp/aggregation/CountIfAccumulator.java | 25 ++--
.../db/mpp/aggregation/ExtremeAccumulator.java | 90 +++++--------
.../db/mpp/aggregation/FirstValueAccumulator.java | 150 +++++++--------------
.../mpp/aggregation/FirstValueDescAccumulator.java | 110 +++++----------
.../db/mpp/aggregation/LastValueAccumulator.java | 132 +++++++-----------
.../mpp/aggregation/LastValueDescAccumulator.java | 122 +++++------------
.../db/mpp/aggregation/MaxTimeAccumulator.java | 22 +--
.../db/mpp/aggregation/MaxTimeDescAccumulator.java | 25 ++--
.../db/mpp/aggregation/MaxValueAccumulator.java | 94 +++++--------
.../db/mpp/aggregation/MinTimeAccumulator.java | 25 ++--
.../db/mpp/aggregation/MinTimeDescAccumulator.java | 20 +--
.../db/mpp/aggregation/MinValueAccumulator.java | 93 +++++--------
.../iotdb/db/mpp/aggregation/SumAccumulator.java | 92 +++++--------
.../slidingwindow/SlidingWindowAggregator.java | 5 +-
.../db/mpp/execution/operator/AggregationUtil.java | 18 ++-
.../operator/process/AggregationOperator.java | 2 +-
.../process/RawDataAggregationOperator.java | 48 +++++--
.../process/SlidingWindowAggregationOperator.java | 5 +-
.../AbstractSeriesAggregationScanOperator.java | 2 +-
...entWindow.java => AbstractVariationWindow.java} | 40 +++---
.../{SeriesWindow.java => ConditionWindow.java} | 11 +-
...dowManager.java => ConditionWindowManager.java} | 63 +++------
...arameter.java => ConditionWindowParameter.java} | 6 +-
.../db/mpp/execution/operator/window/IWindow.java | 2 +-
.../execution/operator/window/IWindowManager.java | 52 +++++--
.../execution/operator/window/SessionWindow.java | 5 +-
.../operator/window/SessionWindowManager.java | 33 +----
.../operator/window/TimeWindowManager.java | 24 +---
...dowManager.java => VariationWindowManager.java} | 48 ++-----
...arameter.java => VariationWindowParameter.java} | 6 +-
.../operator/window/WindowManagerFactory.java | 40 +++---
.../mpp/execution/operator/window/WindowType.java | 4 +-
.../iotdb/db/mpp/plan/analyze/AnalyzeVisitor.java | 28 ++--
.../iotdb/db/mpp/plan/analyze/ExpressionUtils.java | 92 +------------
.../iotdb/db/mpp/plan/parser/ASTVisitor.java | 20 +--
.../db/mpp/plan/planner/OperatorTreeGenerator.java | 34 +++--
...rameter.java => GroupByConditionParameter.java} | 14 +-
.../planner/plan/parameter/GroupByParameter.java | 6 +-
.../plan/parameter/GroupByVariationParameter.java | 2 +-
...mponent.java => GroupByConditionComponent.java} | 6 +-
.../component/GroupByVariationComponent.java | 2 +-
.../db/mpp/plan/statement/crud/QueryStatement.java | 10 +-
.../iotdb/db/mpp/aggregation/AccumulatorTest.java | 55 ++++----
.../operator/RawDataAggregationOperatorTest.java | 15 ++-
site/src/main/.vuepress/styles/index.scss | 8 ++
61 files changed, 776 insertions(+), 1321 deletions(-)
rename server/src/main/codegen/templates/{eventWindow.ftl => abstractVariationWindow.ftl} (73%)
delete mode 100644 server/src/main/codegen/templates/eventWindowManager.ftl
rename server/src/main/codegen/templates/{evEventWindow.ftl => variationWindow.ftl} (83%)
rename server/src/main/codegen/templates/{evEventWindowManager.ftl => variationWindowManager.ftl} (74%)
rename server/src/main/java/org/apache/iotdb/db/mpp/execution/operator/window/{EventWindow.java => AbstractVariationWindow.java} (63%)
rename server/src/main/java/org/apache/iotdb/db/mpp/execution/operator/window/{SeriesWindow.java => ConditionWindow.java} (88%)
rename server/src/main/java/org/apache/iotdb/db/mpp/execution/operator/window/{SeriesWindowManager.java => ConditionWindowManager.java} (68%)
rename server/src/main/java/org/apache/iotdb/db/mpp/execution/operator/window/{SeriesWindowParameter.java => ConditionWindowParameter.java} (91%)
rename server/src/main/java/org/apache/iotdb/db/mpp/execution/operator/window/{EventWindowManager.java => VariationWindowManager.java} (58%)
rename server/src/main/java/org/apache/iotdb/db/mpp/execution/operator/window/{EventWindowParameter.java => VariationWindowParameter.java} (91%)
rename server/src/main/java/org/apache/iotdb/db/mpp/plan/planner/plan/parameter/{GroupBySeriesParameter.java => GroupByConditionParameter.java} (83%)
rename server/src/main/java/org/apache/iotdb/db/mpp/plan/statement/component/{GroupBySeriesComponent.java => GroupByConditionComponent.java} (89%)
[iotdb] 01/01: fix mistake in DiskMetrics tags
Posted by ma...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
marklau99 pushed a commit to branch IOTDB-5517
in repository https://gitbox.apache.org/repos/asf/iotdb.git
commit 1997e44c2f29202550c3e501ea58427899cfae35
Author: Liu Xuxin <li...@outlook.com>
AuthorDate: Wed Mar 1 10:11:31 2023 +0800
fix mistake in DiskMetrics tags
---
.../java/org/apache/iotdb/metrics/metricsets/disk/DiskMetrics.java | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/metrics/interface/src/main/java/org/apache/iotdb/metrics/metricsets/disk/DiskMetrics.java b/metrics/interface/src/main/java/org/apache/iotdb/metrics/metricsets/disk/DiskMetrics.java
index 00d550be49..92552914dd 100644
--- a/metrics/interface/src/main/java/org/apache/iotdb/metrics/metricsets/disk/DiskMetrics.java
+++ b/metrics/interface/src/main/java/org/apache/iotdb/metrics/metricsets/disk/DiskMetrics.java
@@ -106,7 +106,7 @@ public class DiskMetrics implements IMetricSet {
diskMetricsManager,
x -> x.getMergedReadOperationForDisk().getOrDefault(diskID, 0L),
TYPE,
- MERGED_WRITE,
+ MERGED_READ,
NAME,
diskID);
metricService.createAutoGauge(
@@ -115,7 +115,7 @@ public class DiskMetrics implements IMetricSet {
diskMetricsManager,
x -> x.getMergedWriteOperationForDisk().getOrDefault(diskID, 0L),
TYPE,
- MERGED_READ,
+ MERGED_WRITE,
NAME,
diskID);
metricService.createAutoGauge(