Skip to content

OperatorStats overflow fix #24843

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

Merged
natashasehgal merged 1 commit into from
Apr 2, 2025
Merged

OperatorStats overflow fix #24843

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
52 changes: 26 additions & 26 deletions presto-main-base/src/main/java/com/facebook/presto/operator/OperatorStats.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -757,21 +757,21 @@ public OperatorStats add(Iterable<OperatorStats> operators)
long addInputCalls = this.addInputCalls;
long addInputWall = this.addInputWall.roundTo(NANOSECONDS);
long addInputCpu = this.addInputCpu.roundTo(NANOSECONDS);
long addInputAllocation = this.addInputAllocationInBytes;
long rawInputDataSize = this.rawInputDataSizeInBytes;
double addInputAllocation = this.addInputAllocationInBytes;
double rawInputDataSize = this.rawInputDataSizeInBytes;
long rawInputPositions = this.rawInputPositions;
long inputDataSize = this.inputDataSizeInBytes;
double inputDataSize = this.inputDataSizeInBytes;
long inputPositions = this.inputPositions;
double sumSquaredInputPositions = this.sumSquaredInputPositions;

long getOutputCalls = this.getOutputCalls;
long getOutputWall = this.getOutputWall.roundTo(NANOSECONDS);
long getOutputCpu = this.getOutputCpu.roundTo(NANOSECONDS);
long getOutputAllocation = this.getOutputAllocationInBytes;
long outputDataSize = this.outputDataSizeInBytes;
double getOutputAllocation = this.getOutputAllocationInBytes;
double outputDataSize = this.outputDataSizeInBytes;
long outputPositions = this.outputPositions;

long physicalWrittenDataSize = this.physicalWrittenDataSizeInBytes;
double physicalWrittenDataSize = this.physicalWrittenDataSizeInBytes;

long additionalCpu = this.additionalCpu.roundTo(NANOSECONDS);
long blockedWall = this.blockedWall.roundTo(NANOSECONDS);
Expand All @@ -781,14 +781,14 @@ public OperatorStats add(Iterable<OperatorStats> operators)
long finishCpu = this.finishCpu.roundTo(NANOSECONDS);
long finishAllocation = this.finishAllocationInBytes;

long memoryReservation = this.userMemoryReservationInBytes;
long revocableMemoryReservation = this.revocableMemoryReservationInBytes;
long systemMemoryReservation = this.systemMemoryReservationInBytes;
long peakUserMemory = this.peakUserMemoryReservationInBytes;
long peakSystemMemory = this.peakSystemMemoryReservationInBytes;
long peakTotalMemory = this.peakTotalMemoryReservationInBytes;
double memoryReservation = this.userMemoryReservationInBytes;
double revocableMemoryReservation = this.revocableMemoryReservationInBytes;
double systemMemoryReservation = this.systemMemoryReservationInBytes;
double peakUserMemory = this.peakUserMemoryReservationInBytes;
double peakSystemMemory = this.peakSystemMemoryReservationInBytes;
double peakTotalMemory = this.peakTotalMemoryReservationInBytes;

long spilledDataSize = this.spilledDataSizeInBytes;
double spilledDataSize = this.spilledDataSizeInBytes;

Optional<BlockedReason> blockedReason = this.blockedReason;

Expand Down Expand Up @@ -884,21 +884,21 @@ public OperatorStats add(Iterable<OperatorStats> operators)
addInputCalls,
succinctNanos(addInputWall),
succinctNanos(addInputCpu),
addInputAllocation,
rawInputDataSize,
(long) addInputAllocation,
(long) rawInputDataSize,
rawInputPositions,
inputDataSize,
(long) inputDataSize,
inputPositions,
sumSquaredInputPositions,

getOutputCalls,
succinctNanos(getOutputWall),
succinctNanos(getOutputCpu),
getOutputAllocation,
outputDataSize,
(long) getOutputAllocation,
(long) outputDataSize,
outputPositions,

physicalWrittenDataSize,
(long) physicalWrittenDataSize,

succinctNanos(additionalCpu),
succinctNanos(blockedWall),
Expand All @@ -908,14 +908,14 @@ public OperatorStats add(Iterable<OperatorStats> operators)
succinctNanos(finishCpu),
finishAllocation,

memoryReservation,
revocableMemoryReservation,
systemMemoryReservation,
peakUserMemory,
peakSystemMemory,
peakTotalMemory,
(long) memoryReservation,
(long) revocableMemoryReservation,
(long) systemMemoryReservation,
(long) peakUserMemory,
(long) peakSystemMemory,
(long) peakTotalMemory,

spilledDataSize,
(long) spilledDataSize,

blockedReason,

Expand Down
6 changes: 3 additions & 3 deletions presto-main-base/src/test/java/com/facebook/presto/operator/TestOperatorStats.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -85,7 +85,7 @@ public class TestOperatorStats
new Duration(18, NANOSECONDS),
345L,

1_000_000_000L,
Long.MAX_VALUE,
20L,
21L,
22L,
Expand Down Expand Up @@ -213,7 +213,7 @@ public static void assertExpectedOperatorStats(OperatorStats actual)
assertEquals(actual.getFinishCpu(), new Duration(18, NANOSECONDS));
assertEquals(actual.getFinishAllocationInBytes(), 345);

assertEquals(actual.getUserMemoryReservationInBytes(), 1_000_000_000L);
assertEquals(actual.getUserMemoryReservationInBytes(), Long.MAX_VALUE);
assertEquals(actual.getRevocableMemoryReservationInBytes(), 20);
assertEquals(actual.getSystemMemoryReservationInBytes(), 21);
assertEquals(actual.getPeakUserMemoryReservationInBytes(), 22);
Expand Down Expand Up @@ -262,7 +262,7 @@ public void testAdd()
assertEquals(actual.getFinishCpu(), new Duration(3 * 18, NANOSECONDS));
assertEquals(actual.getFinishAllocationInBytes(), 3 * 345);

assertEquals(actual.getUserMemoryReservationInBytes(), 3 * 1_000_000_000L);
assertEquals(actual.getUserMemoryReservationInBytes(), Long.MAX_VALUE);
assertEquals(actual.getRevocableMemoryReservationInBytes(), 3 * 20);
assertEquals(actual.getSystemMemoryReservationInBytes(), 3 * 21);
assertEquals(actual.getPeakUserMemoryReservationInBytes(), 22);
Expand Down
Loading