diff --git a/presto-main-base/src/main/java/com/facebook/presto/operator/OperatorStats.java b/presto-main-base/src/main/java/com/facebook/presto/operator/OperatorStats.java
index e38378290d8d6..4538969f30ca7 100644
--- a/presto-main-base/src/main/java/com/facebook/presto/operator/OperatorStats.java
+++ b/presto-main-base/src/main/java/com/facebook/presto/operator/OperatorStats.java
@@ -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);
@@ -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;
 
@@ -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),
@@ -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,
 
diff --git a/presto-main-base/src/test/java/com/facebook/presto/operator/TestOperatorStats.java b/presto-main-base/src/test/java/com/facebook/presto/operator/TestOperatorStats.java
index ec0df55ecb90d..1c43c601692b2 100644
--- a/presto-main-base/src/test/java/com/facebook/presto/operator/TestOperatorStats.java
+++ b/presto-main-base/src/test/java/com/facebook/presto/operator/TestOperatorStats.java
@@ -85,7 +85,7 @@ public class TestOperatorStats
             new Duration(18, NANOSECONDS),
             345L,
 
-            1_000_000_000L,
+            Long.MAX_VALUE,
             20L,
             21L,
             22L,
@@ -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);
@@ -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);