Skip to content

Commit 84ae840

Browse files
spershinspershin
committed
Remove negative check on several stats.
1 parent 4f0d345 commit 84ae840

File tree

4 files changed

+31
-62
lines changed

4 files changed

+31
-62
lines changed

‎presto-main-base/src/main/java/com/facebook/presto/execution/StageExecutionStats.java‎

Lines changed: 15 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -207,18 +207,13 @@ public StageExecutionStats(
207207
this.runningSplits = runningSplits;
208208
checkArgument(completedSplits >= 0, "completedSplits is negative");
209209
this.completedSplits = completedSplits;
210-
checkArgument(cumulativeUserMemory >= 0, "cumulativeUserMemory is negative");
211-
this.cumulativeUserMemory = cumulativeUserMemory;
212-
checkArgument(cumulativeTotalMemory >= 0, "cumulativeTotalMemory is negative");
213-
this.cumulativeTotalMemory = cumulativeTotalMemory;
214-
checkArgument(userMemoryReservationInBytes >= 0, "userMemoryReservationInBytes is negative");
215-
this.userMemoryReservationInBytes = userMemoryReservationInBytes;
216-
checkArgument(totalMemoryReservationInBytes >= 0, "totalMemoryReservationInBytes is negative");
217-
this.totalMemoryReservationInBytes = totalMemoryReservationInBytes;
218-
checkArgument(peakUserMemoryReservationInBytes >= 0, "peakUserMemoryReservationInBytes is negative");
219-
this.peakUserMemoryReservationInBytes = peakUserMemoryReservationInBytes;
220-
checkArgument(peakNodeTotalMemoryReservationInBytes >= 0, "peakNodeTotalMemoryReservationInBytes is negative");
221-
this.peakNodeTotalMemoryReservationInBytes = peakNodeTotalMemoryReservationInBytes;
210+
211+
this.cumulativeUserMemory = (cumulativeUserMemory >= 0) ? cumulativeUserMemory : Long.MAX_VALUE;
212+
this.cumulativeTotalMemory = (cumulativeTotalMemory >= 0) ? cumulativeTotalMemory : Long.MAX_VALUE;
213+
this.userMemoryReservationInBytes = (userMemoryReservationInBytes >= 0) ? userMemoryReservationInBytes : Long.MAX_VALUE;
214+
this.totalMemoryReservationInBytes = (totalMemoryReservationInBytes >= 0) ? totalMemoryReservationInBytes : Long.MAX_VALUE;
215+
this.peakUserMemoryReservationInBytes = (peakUserMemoryReservationInBytes >= 0) ? peakUserMemoryReservationInBytes : Long.MAX_VALUE;
216+
this.peakNodeTotalMemoryReservationInBytes = (peakNodeTotalMemoryReservationInBytes >= 0) ? peakNodeTotalMemoryReservationInBytes : Long.MAX_VALUE;
222217

223218
this.totalScheduledTime = requireNonNull(totalScheduledTime, "totalScheduledTime is null");
224219
this.totalCpuTime = requireNonNull(totalCpuTime, "totalCpuTime is null");
@@ -227,29 +222,20 @@ public StageExecutionStats(
227222
this.fullyBlocked = fullyBlocked;
228223
this.blockedReasons = ImmutableSet.copyOf(requireNonNull(blockedReasons, "blockedReasons is null"));
229224

230-
checkArgument(totalAllocationInBytes >= 0, "totalAllocationInBytes is negative");
231-
this.totalAllocationInBytes = totalAllocationInBytes;
232-
checkArgument(rawInputDataSizeInBytes >= 0, "rawInputDataSizeInBytes is negative");
233-
this.rawInputDataSizeInBytes = rawInputDataSizeInBytes;
234-
checkArgument(rawInputPositions >= 0, "rawInputPositions is negative");
235-
this.rawInputPositions = rawInputPositions;
225+
this.totalAllocationInBytes = (totalAllocationInBytes >= 0) ? totalAllocationInBytes : Long.MAX_VALUE;
226+
this.rawInputDataSizeInBytes = (rawInputDataSizeInBytes >= 0) ? rawInputDataSizeInBytes : Long.MAX_VALUE;
227+
this.rawInputPositions = (rawInputPositions >= 0) ? rawInputPositions : Long.MAX_VALUE;
236228

237-
checkArgument(processedInputDataSizeInBytes >= 0, "processedInputDataSizeInBytes is negative");
238-
this.processedInputDataSizeInBytes = processedInputDataSizeInBytes;
239-
checkArgument(processedInputPositions >= 0, "processedInputPositions is negative");
240-
this.processedInputPositions = processedInputPositions;
229+
this.processedInputDataSizeInBytes = (processedInputDataSizeInBytes >= 0) ? processedInputDataSizeInBytes : Long.MAX_VALUE;
230+
this.processedInputPositions = (processedInputPositions >= 0) ? processedInputPositions : Long.MAX_VALUE;
241231

242-
checkArgument(bufferedDataSizeInBytes >= 0, "bufferedDataSizeInBytes is negative");
243-
this.bufferedDataSizeInBytes = bufferedDataSizeInBytes;
232+
this.bufferedDataSizeInBytes = (bufferedDataSizeInBytes >= 0) ? bufferedDataSizeInBytes : Long.MAX_VALUE;
244233

245-
// An overflow could have occurred on this stat - handle this gracefully.
246234
this.outputDataSizeInBytes = (outputDataSizeInBytes >= 0) ? outputDataSizeInBytes : Long.MAX_VALUE;
247235

248-
checkArgument(outputPositions >= 0, "outputPositions is negative");
249-
this.outputPositions = outputPositions;
236+
this.outputPositions = (outputPositions >= 0) ? outputPositions : Long.MAX_VALUE;
250237

251-
checkArgument(physicalWrittenDataSizeInBytes >= 0, "writtenDataSizeInBytes is negative");
252-
this.physicalWrittenDataSizeInBytes = physicalWrittenDataSizeInBytes;
238+
this.physicalWrittenDataSizeInBytes = (physicalWrittenDataSizeInBytes >= 0) ? physicalWrittenDataSizeInBytes : Long.MAX_VALUE;
253239

254240
this.gcInfo = requireNonNull(gcInfo, "gcInfo is null");
255241

‎presto-main-base/src/main/java/com/facebook/presto/operator/DriverStats.java‎

Lines changed: 10 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -156,43 +156,32 @@ public DriverStats(
156156
this.queuedTime = requireNonNull(queuedTime, "queuedTime is null");
157157
this.elapsedTime = requireNonNull(elapsedTime, "elapsedTime is null");
158158

159-
checkArgument(userMemoryReservationInBytes >= 0, "userMemoryReservationInBytes is negative");
160-
this.userMemoryReservationInBytes = userMemoryReservationInBytes;
161-
checkArgument(revocableMemoryReservationInBytes >= 0, "revocableMemoryReservationInBytes is negative");
162-
this.revocableMemoryReservationInBytes = revocableMemoryReservationInBytes;
163-
checkArgument(systemMemoryReservationInBytes >= 0, "systemMemoryReservationInBytes is negative");
164-
this.systemMemoryReservationInBytes = systemMemoryReservationInBytes;
159+
this.userMemoryReservationInBytes = (userMemoryReservationInBytes >= 0) ? userMemoryReservationInBytes : Long.MAX_VALUE;
160+
this.revocableMemoryReservationInBytes = (revocableMemoryReservationInBytes >= 0) ? revocableMemoryReservationInBytes : Long.MAX_VALUE;
161+
this.systemMemoryReservationInBytes = (systemMemoryReservationInBytes >= 0) ? systemMemoryReservationInBytes : Long.MAX_VALUE;
165162

166163
this.totalScheduledTime = requireNonNull(totalScheduledTime, "totalScheduledTime is null");
167164
this.totalCpuTime = requireNonNull(totalCpuTime, "totalCpuTime is null");
168165
this.totalBlockedTime = requireNonNull(totalBlockedTime, "totalBlockedTime is null");
169166
this.fullyBlocked = fullyBlocked;
170167
this.blockedReasons = ImmutableSet.copyOf(requireNonNull(blockedReasons, "blockedReasons is null"));
171168

172-
checkArgument(totalAllocationInBytes >= 0, "totalAllocationInBytes is negative");
173-
this.totalAllocationInBytes = totalAllocationInBytes;
169+
this.totalAllocationInBytes = (totalAllocationInBytes >= 0) ? totalAllocationInBytes : Long.MAX_VALUE;
174170

175-
checkArgument(rawInputDataSizeInBytes >= 0, "rawInputDataSizeInBytes is negative");
176-
this.rawInputDataSizeInBytes = rawInputDataSizeInBytes;
171+
this.rawInputDataSizeInBytes = (rawInputDataSizeInBytes >= 0) ? rawInputDataSizeInBytes : Long.MAX_VALUE;
177172

178-
checkArgument(rawInputPositions >= 0, "rawInputPositions is negative");
179-
this.rawInputPositions = rawInputPositions;
173+
this.rawInputPositions = (rawInputPositions >= 0) ? rawInputPositions : Long.MAX_VALUE;
180174
this.rawInputReadTime = requireNonNull(rawInputReadTime, "rawInputReadTime is null");
181175

182-
checkArgument(processedInputDataSizeInBytes >= 0, "processedInputDataSizeInBytes is negative");
183-
this.processedInputDataSizeInBytes = processedInputDataSizeInBytes;
176+
this.processedInputDataSizeInBytes = (processedInputDataSizeInBytes >= 0) ? processedInputDataSizeInBytes : Long.MAX_VALUE;
184177

185-
checkArgument(processedInputPositions >= 0, "processedInputPositions is negative");
186-
this.processedInputPositions = processedInputPositions;
178+
this.processedInputPositions = (processedInputPositions >= 0) ? processedInputPositions : Long.MAX_VALUE;
187179

188-
// An overflow could have occurred on this stat - handle this gracefully.
189180
this.outputDataSizeInBytes = (outputDataSizeInBytes >= 0) ? outputDataSizeInBytes : Long.MAX_VALUE;
190181

191-
checkArgument(outputPositions >= 0, "outputPositions is negative");
192-
this.outputPositions = outputPositions;
182+
this.outputPositions = (outputPositions >= 0) ? outputPositions : Long.MAX_VALUE;
193183

194-
checkArgument(physicalWrittenDataSizeInBytes >= 0, "writtenDataSizeInBytes is negative");
195-
this.physicalWrittenDataSizeInBytes = physicalWrittenDataSizeInBytes;
184+
this.physicalWrittenDataSizeInBytes = (physicalWrittenDataSizeInBytes >= 0) ? physicalWrittenDataSizeInBytes : Long.MAX_VALUE;
196185

197186
this.operatorStats = ImmutableList.copyOf(requireNonNull(operatorStats, "operatorStats is null"));
198187
}

‎presto-main-base/src/main/java/com/facebook/presto/operator/PipelineStats.java‎

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -178,16 +178,13 @@ public PipelineStats(
178178
this.totalAllocationInBytes = totalAllocationInBytes;
179179

180180
this.rawInputDataSizeInBytes = rawInputDataSizeInBytes;
181-
checkArgument(rawInputPositions >= 0, "rawInputPositions is negative");
182-
this.rawInputPositions = rawInputPositions;
181+
this.rawInputPositions = (rawInputPositions >= 0) ? rawInputPositions : Long.MAX_VALUE;
183182

184183
this.processedInputDataSizeInBytes = processedInputDataSizeInBytes;
185-
checkArgument(processedInputPositions >= 0, "processedInputPositions is negative");
186-
this.processedInputPositions = processedInputPositions;
184+
this.processedInputPositions = (processedInputPositions >= 0) ? processedInputPositions : Long.MAX_VALUE;
187185

188186
this.outputDataSizeInBytes = outputDataSizeInBytes;
189-
checkArgument(outputPositions >= 0, "outputPositions is negative");
190-
this.outputPositions = outputPositions;
187+
this.outputPositions = (outputPositions >= 0) ? outputPositions : Long.MAX_VALUE;
191188

192189
this.physicalWrittenDataSizeInBytes = physicalWrittenDataSizeInBytes;
193190

‎presto-main-base/src/main/java/com/facebook/presto/operator/TaskStats.java‎

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -346,16 +346,13 @@ public TaskStats(
346346
this.totalAllocationInBytes = totalAllocationInBytes;
347347

348348
this.rawInputDataSizeInBytes = rawInputDataSizeInBytes;
349-
checkArgument(rawInputPositions >= 0, "rawInputPositions is negative");
350-
this.rawInputPositions = rawInputPositions;
349+
this.rawInputPositions = (rawInputPositions >= 0) ? rawInputPositions : Long.MAX_VALUE;
351350

352351
this.processedInputDataSizeInBytes = processedInputDataSizeInBytes;
353-
checkArgument(processedInputPositions >= 0, "processedInputPositions is negative");
354-
this.processedInputPositions = processedInputPositions;
352+
this.processedInputPositions = (processedInputPositions >= 0) ? processedInputPositions : Long.MAX_VALUE;
355353

356354
this.outputDataSizeInBytes = outputDataSizeInBytes;
357-
checkArgument(outputPositions >= 0, "outputPositions is negative");
358-
this.outputPositions = outputPositions;
355+
this.outputPositions = (outputPositions >= 0) ? outputPositions : Long.MAX_VALUE;
359356

360357
this.physicalWrittenDataSizeInBytes = physicalWrittenDataSizeInBytes;
361358

0 commit comments

Comments
 (0)