-
Notifications
You must be signed in to change notification settings - Fork 3k
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Add metrics for Accumulator and GroupByHash #24015
Open
piotrrzysko
wants to merge
2
commits into
trinodb:master
Choose a base branch
from
piotrrzysko:group-by-stats
base: master
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
+275
−71
Open
Changes from all commits
Commits
Show all changes
2 commits
Select commit
Hold shift + click to select a range
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
58 changes: 58 additions & 0 deletions
58
core/trino-main/src/main/java/io/trino/operator/AggregationMetrics.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,58 @@ | ||
| /* | ||
| * Licensed under the Apache License, Version 2.0 (the "License"); | ||
| * you may not use this file except in compliance with the License. | ||
| * You may obtain a copy of the License at | ||
| * | ||
| * http://www.apache.org/licenses/LICENSE-2.0 | ||
| * | ||
| * Unless required by applicable law or agreed to in writing, software | ||
| * distributed under the License is distributed on an "AS IS" BASIS, | ||
| * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
| * See the License for the specific language governing permissions and | ||
| * limitations under the License. | ||
| */ | ||
| package io.trino.operator; | ||
|
|
||
| import com.google.common.annotations.VisibleForTesting; | ||
| import com.google.common.collect.ImmutableMap; | ||
| import io.airlift.units.Duration; | ||
| import io.trino.plugin.base.metrics.DurationTiming; | ||
| import io.trino.plugin.base.metrics.LongCount; | ||
| import io.trino.spi.metrics.Metrics; | ||
|
|
||
| import static java.util.concurrent.TimeUnit.NANOSECONDS; | ||
|
|
||
| public class AggregationMetrics | ||
| { | ||
| @VisibleForTesting | ||
| static final String INPUT_ROWS_WITH_PARTIAL_AGGREGATION_DISABLED_METRIC_NAME = "Input rows processed without partial aggregation enabled"; | ||
| private static final String ACCUMULATOR_TIME_METRIC_NAME = "Accumulator update CPU time"; | ||
| private static final String GROUP_BY_HASH_TIME_METRIC_NAME = "Group by hash update CPU time"; | ||
|
|
||
| private long accumulatorTimeNanos; | ||
| private long groupByHashTimeNanos; | ||
| private long inputRowsProcessedWithPartialAggregationDisabled; | ||
|
|
||
| public void recordAccumulatorUpdateTimeSince(long startNanos) | ||
| { | ||
| accumulatorTimeNanos += System.nanoTime() - startNanos; | ||
| } | ||
|
|
||
| public void recordGroupByHashUpdateTimeSince(long startNanos) | ||
| { | ||
| groupByHashTimeNanos += System.nanoTime() - startNanos; | ||
| } | ||
|
|
||
| public void recordInputRowsProcessedWithPartialAggregationDisabled(long rows) | ||
| { | ||
| inputRowsProcessedWithPartialAggregationDisabled += rows; | ||
| } | ||
|
|
||
| public Metrics getMetrics() | ||
| { | ||
| return new Metrics(ImmutableMap.of( | ||
| INPUT_ROWS_WITH_PARTIAL_AGGREGATION_DISABLED_METRIC_NAME, new LongCount(inputRowsProcessedWithPartialAggregationDisabled), | ||
| ACCUMULATOR_TIME_METRIC_NAME, new DurationTiming(new Duration(accumulatorTimeNanos, NANOSECONDS)), | ||
| GROUP_BY_HASH_TIME_METRIC_NAME, new DurationTiming(new Duration(groupByHashTimeNanos, NANOSECONDS)))); | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
44 changes: 44 additions & 0 deletions
44
core/trino-main/src/main/java/io/trino/operator/MeasuredGroupByHashWork.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,44 @@ | ||
| /* | ||
| * Licensed under the Apache License, Version 2.0 (the "License"); | ||
| * you may not use this file except in compliance with the License. | ||
| * You may obtain a copy of the License at | ||
| * | ||
| * http://www.apache.org/licenses/LICENSE-2.0 | ||
| * | ||
| * Unless required by applicable law or agreed to in writing, software | ||
| * distributed under the License is distributed on an "AS IS" BASIS, | ||
| * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
| * See the License for the specific language governing permissions and | ||
| * limitations under the License. | ||
| */ | ||
| package io.trino.operator; | ||
|
|
||
| import static java.util.Objects.requireNonNull; | ||
|
|
||
| public class MeasuredGroupByHashWork<T> | ||
| implements Work<T> | ||
| { | ||
| private final Work<T> delegate; | ||
| private final AggregationMetrics metrics; | ||
|
|
||
| public MeasuredGroupByHashWork(Work<T> delegate, AggregationMetrics metrics) | ||
| { | ||
| this.delegate = requireNonNull(delegate, "delegate is null"); | ||
| this.metrics = requireNonNull(metrics, "metrics is null"); | ||
| } | ||
|
|
||
| @Override | ||
| public boolean process() | ||
| { | ||
| long start = System.nanoTime(); | ||
| boolean result = delegate.process(); | ||
| metrics.recordGroupByHashUpdateTimeSince(start); | ||
| return result; | ||
| } | ||
|
|
||
| @Override | ||
| public T getResult() | ||
| { | ||
| return delegate.getResult(); | ||
| } | ||
| } | ||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
nit: alternatively we could use
OperationTimingas intrino/core/trino-main/src/main/java/io/trino/operator/OperatorContext.java
Line 78 in 055430a
But I'm fine keeping it as is for now