Skip to content
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.

Sign up for GitHub

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 new field updatedRows to QueryStatistics.java where it's availabl… #24810

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

add new field updatedRows to QueryStatistics.java where it's availabl… #24810

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions core/trino-main/src/main/java/io/trino/dispatcher/FailedDispatchQuery.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -332,6 +332,7 @@ private static QueryStats immediateFailureQueryStats()
DataSize.ofBytes(0),
0,
0,
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

For the commits head wrap to 50 characters, body to 72 characters https://github.com/trinodb/trino/blob/master/.github/DEVELOPMENT.md.

0,
new Duration(0, MILLISECONDS),
new Duration(0, MILLISECONDS),
DataSize.ofBytes(0),
Expand Down
2 changes: 2 additions & 0 deletions core/trino-main/src/main/java/io/trino/event/QueryMonitor.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -231,6 +231,7 @@ public void queryImmediateFailureEvent(BasicQueryInfo queryInfo, ExecutionFailur
0,
0,
0,
0,
ImmutableList.of(),
0,
true,
Expand Down Expand Up @@ -343,6 +344,7 @@ private QueryStatistics createQueryStatistics(QueryInfo queryInfo)
queryStats.getRawInputPositions(),
queryStats.getOutputDataSize().toBytes(),
queryStats.getOutputPositions(),
queryStats.getUpdatedPositions(),
queryStats.getLogicalWrittenDataSize().toBytes(),
queryStats.getWrittenPositions(),
queryStats.getSpilledDataSize().toBytes(),
Expand Down
1 change: 1 addition & 0 deletions core/trino-main/src/main/java/io/trino/execution/DistributionSnapshot.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -71,6 +71,7 @@ public static OperatorStats pruneOperatorStats(OperatorStats operatorStats)
operatorStats.getGetOutputCpu(),
operatorStats.getOutputDataSize(),
operatorStats.getOutputPositions(),
operatorStats.getUpdatedPositions(),
operatorStats.getDynamicFilterSplitsProcessed(),
pruneMetrics(operatorStats.getMetrics()),
pruneMetrics(operatorStats.getConnectorMetrics()),
Expand Down
4 changes: 4 additions & 0 deletions core/trino-main/src/main/java/io/trino/execution/QueryStateMachine.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -695,6 +695,7 @@ private QueryStats getQueryStats(Optional<StageInfo> rootStage, List<StageInfo>
long outputDataSize = 0;
long failedOutputDataSize = 0;
long outputPositions = 0;
long updatedPositions = 0;
long failedOutputPositions = 0;

long outputBlockedTime = 0;
Expand All @@ -711,6 +712,7 @@ private QueryStats getQueryStats(Optional<StageInfo> rootStage, List<StageInfo>
ImmutableList.Builder<OperatorStats> operatorStatsSummary = ImmutableList.builder();
for (StageInfo stageInfo : allStages) {
StageStats stageStats = stageInfo.getStageStats();
updatedPositions += stageStats.getUpdatedPositions();
totalTasks += stageStats.getTotalTasks();
runningTasks += stageStats.getRunningTasks();
completedTasks += stageStats.getCompletedTasks();
Expand Down Expand Up @@ -907,6 +909,7 @@ private QueryStats getQueryStats(Optional<StageInfo> rootStage, List<StageInfo>
succinctBytes(outputDataSize),
succinctBytes(failedOutputDataSize),
outputPositions,
updatedPositions,
failedOutputPositions,

new Duration(outputBlockedTime, NANOSECONDS).convertToMostSuccinctTimeUnit(),
Expand Down Expand Up @@ -1511,6 +1514,7 @@ private static QueryStats pruneQueryStats(QueryStats queryStats)
queryStats.getOutputDataSize(),
queryStats.getFailedOutputDataSize(),
queryStats.getOutputPositions(),
queryStats.getUpdatedPositions(),
queryStats.getFailedOutputPositions(),
queryStats.getOutputBlockedTime(),
queryStats.getFailedOutputBlockedTime(),
Expand Down
10 changes: 10 additions & 0 deletions core/trino-main/src/main/java/io/trino/execution/QueryStats.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -118,6 +118,7 @@ public class QueryStats
private final DataSize outputDataSize;
private final DataSize failedOutputDataSize;
private final long outputPositions;
private final long updatedPositions;
private final long failedOutputPositions;

private final Duration outputBlockedTime;
Expand Down Expand Up @@ -213,6 +214,7 @@ public QueryStats(
@JsonProperty("outputDataSize") DataSize outputDataSize,
@JsonProperty("failedOutputDataSize") DataSize failedOutputDataSize,
@JsonProperty("outputPositions") long outputPositions,
@JsonProperty("updatedPositions") long updatedPositions,
@JsonProperty("failedOutputPositions") long failedOutputPositions,

@JsonProperty("outputBlockedTime") Duration outputBlockedTime,
Expand Down Expand Up @@ -323,6 +325,8 @@ public QueryStats(
this.failedOutputDataSize = requireNonNull(failedOutputDataSize, "failedOutputDataSize is null");
checkArgument(outputPositions >= 0, "outputPositions is negative");
this.outputPositions = outputPositions;
checkArgument(updatedPositions >= 0, "updatedPositions is negative");
this.updatedPositions = updatedPositions;
checkArgument(failedOutputPositions >= 0, "failedOutputPositions is negative");
this.failedOutputPositions = failedOutputPositions;

Expand Down Expand Up @@ -743,6 +747,12 @@ public long getOutputPositions()
return outputPositions;
}

@JsonProperty
public long getUpdatedPositions()
{
return updatedPositions;
}

@JsonProperty
public long getFailedOutputPositions()
{
Expand Down
3 changes: 3 additions & 0 deletions core/trino-main/src/main/java/io/trino/execution/StageStateMachine.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -473,6 +473,7 @@ public StageInfo getStageInfo(Supplier<Iterable<TaskInfo>> taskInfosSupplier)
long outputDataSize = 0;
long failedOutputDataSize = 0;
long outputPositions = 0;
long updatedPositions = 0;
long failedOutputPositions = 0;
Metrics.Accumulator outputBufferMetrics = Metrics.accumulator();

Expand Down Expand Up @@ -553,6 +554,7 @@ public StageInfo getStageInfo(Supplier<Iterable<TaskInfo>> taskInfosSupplier)
taskInfo.outputBuffers().getUtilization().ifPresent(bufferUtilizationHistograms::add);
outputDataSize += taskStats.getOutputDataSize().toBytes();
outputPositions += taskStats.getOutputPositions();
updatedPositions += taskStats.getUpdatedPositions();
bufferMetrics.ifPresent(outputBufferMetrics::add);

outputBlockedTime += taskStats.getOutputBlockedTime().roundTo(NANOSECONDS);
Expand Down Expand Up @@ -660,6 +662,7 @@ public StageInfo getStageInfo(Supplier<Iterable<TaskInfo>> taskInfosSupplier)
succinctBytes(outputDataSize),
succinctBytes(failedOutputDataSize),
outputPositions,
updatedPositions,
failedOutputPositions,
outputBufferMetrics.get(),
succinctDuration(outputBlockedTime, NANOSECONDS),
Expand Down
11 changes: 11 additions & 0 deletions core/trino-main/src/main/java/io/trino/execution/StageStats.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -106,6 +106,7 @@ public class StageStats
private final DataSize outputDataSize;
private final DataSize failedOutputDataSize;
private final long outputPositions;
private final long updatedPositions;
private final long failedOutputPositions;
private final Metrics outputBufferMetrics;

Expand Down Expand Up @@ -182,6 +183,7 @@ public StageStats(
@JsonProperty("outputDataSize") DataSize outputDataSize,
@JsonProperty("failedOutputDataSize") DataSize failedOutputDataSize,
@JsonProperty("outputPositions") long outputPositions,
@JsonProperty("updatedPositions") long updatedPositions,
@JsonProperty("failedOutputPositions") long failedOutputPositions,
@JsonProperty("outputBufferMetrics") Metrics outputBufferMetrics,

Expand Down Expand Up @@ -273,6 +275,8 @@ public StageStats(
this.failedOutputDataSize = requireNonNull(failedOutputDataSize, "failedOutputDataSize is null");
checkArgument(outputPositions >= 0, "outputPositions is negative");
this.outputPositions = outputPositions;
checkArgument(updatedPositions >= 0, "updatedPositions is negative");
this.updatedPositions = updatedPositions;
checkArgument(failedOutputPositions >= 0, "failedOutputPositions is negative");
this.failedOutputPositions = failedOutputPositions;
this.outputBufferMetrics = requireNonNull(outputBufferMetrics, "outputBufferMetrics is null");
Expand Down Expand Up @@ -588,6 +592,12 @@ public long getOutputPositions()
return outputPositions;
}

@JsonProperty
public long getUpdatedPositions()
{
return updatedPositions;
}

@JsonProperty
public long getFailedOutputPositions()
{
Expand Down Expand Up @@ -736,6 +746,7 @@ public static StageStats createInitial()
zeroBytes,
0,
0,
0,
Metrics.EMPTY,
zeroSeconds,
zeroSeconds,
Expand Down
11 changes: 11 additions & 0 deletions core/trino-main/src/main/java/io/trino/operator/DriverContext.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -308,6 +308,14 @@ public List<OperatorStats> getOperatorStats()
.collect(toImmutableList());
}

public Long getUpdatedPositions()
{
return operatorContexts.stream()
.map(OperatorContext::getOperatorStats)
.mapToLong(OperatorStats::getUpdatedPositions)
.sum();
}

public DriverStats getDriverStats()
{
long totalScheduledTime = overallTiming.getWallNanos();
Expand Down Expand Up @@ -346,6 +354,7 @@ public DriverStats getDriverStats()
Duration inputBlockedTime;
DataSize outputDataSize;
long outputPositions;
long updatedPositions = getUpdatedPositions();
Duration outputBlockedTime;
if (inputOperator != null) {
physicalInputDataSize = inputOperator.getPhysicalInputDataSize();
Expand Down Expand Up @@ -389,6 +398,7 @@ public DriverStats getDriverStats()

outputDataSize = DataSize.ofBytes(0);
outputPositions = 0;
updatedPositions = 0;

outputBlockedTime = new Duration(0, MILLISECONDS);
}
Expand Down Expand Up @@ -428,6 +438,7 @@ public DriverStats getDriverStats()
inputBlockedTime,
outputDataSize.succinct(),
outputPositions,
updatedPositions,
outputBlockedTime,
succinctBytes(physicalWrittenDataSize),
operators);
Expand Down
11 changes: 11 additions & 0 deletions core/trino-main/src/main/java/io/trino/operator/DriverStats.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -67,6 +67,7 @@ public class DriverStats

private final DataSize outputDataSize;
private final long outputPositions;
private final long updatedPositions;

private final Duration outputBlockedTime;

Expand Down Expand Up @@ -109,6 +110,7 @@ public DriverStats()

this.outputDataSize = DataSize.ofBytes(0);
this.outputPositions = 0;
this.updatedPositions = 0;

this.outputBlockedTime = new Duration(0, MILLISECONDS);

Expand Down Expand Up @@ -152,6 +154,7 @@ public DriverStats(

@JsonProperty("outputDataSize") DataSize outputDataSize,
@JsonProperty("outputPositions") long outputPositions,
@JsonProperty("updatedPositions") long updatedPositions,

@JsonProperty("outputBlockedTime") Duration outputBlockedTime,

Expand Down Expand Up @@ -197,6 +200,8 @@ public DriverStats(
this.outputDataSize = requireNonNull(outputDataSize, "outputDataSize is null");
checkArgument(outputPositions >= 0, "outputPositions is negative");
this.outputPositions = outputPositions;
checkArgument(updatedPositions >= 0, "updatedPositions is negative");
this.updatedPositions = updatedPositions;

this.outputBlockedTime = requireNonNull(outputBlockedTime, "outputBlockedTime is null");

Expand Down Expand Up @@ -357,6 +362,12 @@ public long getOutputPositions()
return outputPositions;
}

@JsonProperty
public long getUpdatedPositions()
{
return updatedPositions;
}

@JsonProperty
public Duration getOutputBlockedTime()
{
Expand Down
2 changes: 2 additions & 0 deletions core/trino-main/src/main/java/io/trino/operator/MergeWriterOperator.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -185,6 +185,8 @@ public Page getOutput()
VARBINARY.writeSlice(fragmentBuilder, fragment);
}

this.operatorContext.recordUpdatedPositions(rowCount);

return page.build();
}

Expand Down
13 changes: 13 additions & 0 deletions core/trino-main/src/main/java/io/trino/operator/OperatorContext.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -82,6 +82,7 @@ public class OperatorContext
private final OperationTiming getOutputTiming = new OperationTiming();
private final CounterStat outputDataSize = new CounterStat();
private final CounterStat outputPositions = new CounterStat();
private final CounterStat updatedPositions = new CounterStat();

private final AtomicLong dynamicFilterSplitsProcessed = new AtomicLong();
private final AtomicReference<Metrics> metrics = new AtomicReference<>(Metrics.EMPTY); // this is not incremental, but gets overwritten by the latest value.
Expand Down Expand Up @@ -226,6 +227,12 @@ public void recordDynamicFilterSplitProcessed(long dynamicFilterSplits)
dynamicFilterSplitsProcessed.getAndAdd(dynamicFilterSplits);
}

public void recordUpdatedPositions(long updatedPositions)
{
checkArgument(updatedPositions >= 0, "updatedPositions is negative (%s)", updatedPositions);
this.updatedPositions.update(updatedPositions);
}

/**
* Overwrites the metrics with the latest one.
*
Expand Down Expand Up @@ -490,6 +497,11 @@ public CounterStat getOutputPositions()
return outputPositions;
}

public CounterStat getUpdatedPositions()
{
return updatedPositions;
}

public long getWriterInputDataSize()
{
return writerInputDataSize.get();
Expand Down Expand Up @@ -554,6 +566,7 @@ public OperatorStats getOperatorStats()
new Duration(getOutputTiming.getCpuNanos(), NANOSECONDS).convertToMostSuccinctTimeUnit(),
DataSize.ofBytes(outputDataSize.getTotalCount()),
outputPositions.getTotalCount(),
updatedPositions.getTotalCount(),

dynamicFilterSplitsProcessed.get(),
getOperatorMetrics(
Expand Down
15 changes: 15 additions & 0 deletions core/trino-main/src/main/java/io/trino/operator/OperatorStats.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,6 +62,7 @@ public class OperatorStats
private final Duration getOutputCpu;
private final DataSize outputDataSize;
private final long outputPositions;
private final long updatedPositions;

private final long dynamicFilterSplitsProcessed;
private final Metrics metrics;
Expand Down Expand Up @@ -117,6 +118,7 @@ public OperatorStats(
@JsonProperty("getOutputCpu") Duration getOutputCpu,
@JsonProperty("outputDataSize") DataSize outputDataSize,
@JsonProperty("outputPositions") long outputPositions,
@JsonProperty("updatedPositions") long updatedPositions,

@JsonProperty("dynamicFilterSplitsProcessed") long dynamicFilterSplitsProcessed,
@JsonProperty("metrics") Metrics metrics,
Expand Down Expand Up @@ -174,6 +176,8 @@ public OperatorStats(
this.outputDataSize = requireNonNull(outputDataSize, "outputDataSize is null");
checkArgument(outputPositions >= 0, "outputPositions is negative");
this.outputPositions = outputPositions;
checkArgument(updatedPositions >= 0, "updatedPositions is negative");
this.updatedPositions = updatedPositions;

this.dynamicFilterSplitsProcessed = dynamicFilterSplitsProcessed;
this.metrics = requireNonNull(metrics, "metrics is null");
Expand Down Expand Up @@ -340,6 +344,12 @@ public long getOutputPositions()
return outputPositions;
}

@JsonProperty
public long getUpdatedPositions()
{
return updatedPositions;
}

@JsonProperty
public long getDynamicFilterSplitsProcessed()
{
Expand Down Expand Up @@ -485,6 +495,7 @@ private OperatorStats add(Iterable<OperatorStats> operators, Optional<Metrics> p
long getOutputCpu = this.getOutputCpu.roundTo(NANOSECONDS);
long outputDataSize = this.outputDataSize.toBytes();
long outputPositions = this.outputPositions;
long updatedPositions = this.updatedPositions;

long dynamicFilterSplitsProcessed = this.dynamicFilterSplitsProcessed;
Metrics.Accumulator metricsAccumulator = Metrics.accumulator().add(this.getMetrics());
Expand Down Expand Up @@ -535,6 +546,7 @@ private OperatorStats add(Iterable<OperatorStats> operators, Optional<Metrics> p
getOutputCpu += operator.getGetOutputCpu().roundTo(NANOSECONDS);
outputDataSize += operator.getOutputDataSize().toBytes();
outputPositions += operator.getOutputPositions();
updatedPositions += operator.getUpdatedPositions();

dynamicFilterSplitsProcessed += operator.getDynamicFilterSplitsProcessed();
metricsAccumulator.add(operator.getMetrics());
Expand Down Expand Up @@ -596,6 +608,7 @@ private OperatorStats add(Iterable<OperatorStats> operators, Optional<Metrics> p
new Duration(getOutputCpu, NANOSECONDS).convertToMostSuccinctTimeUnit(),
DataSize.ofBytes(outputDataSize),
outputPositions,
updatedPositions,

dynamicFilterSplitsProcessed,
metricsAccumulator.get(),
Expand Down Expand Up @@ -672,6 +685,7 @@ public OperatorStats summarize()
getOutputCpu,
outputDataSize,
outputPositions,
updatedPositions,
dynamicFilterSplitsProcessed,
metrics,
connectorMetrics,
Expand Down Expand Up @@ -717,6 +731,7 @@ public OperatorStats withPipelineMetrics(Metrics pipelineMetrics)
getOutputCpu,
outputDataSize,
outputPositions,
updatedPositions,
dynamicFilterSplitsProcessed,
metrics,
connectorMetrics,
Expand Down
Loading