Skip to content

Commit 369deb7

Browse files
shangm2NikhilCollooru
shangm2
authored and
NikhilCollooru
committed
Convert DataSize for operator
1 parent f6049e1 commit 369deb7

File tree

3 files changed

+43
-47
lines changed

3 files changed

+43
-47
lines changed

‎presto-main/src/main/java/com/facebook/presto/operator/DriverContext.java

+18-21
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,6 @@
2626
import com.google.common.collect.ImmutableList;
2727
import com.google.common.collect.ImmutableSet;
2828
import com.google.common.util.concurrent.ListenableFuture;
29-
import io.airlift.units.DataSize;
3029
import io.airlift.units.Duration;
3130
import org.joda.time.DateTime;
3231

@@ -43,8 +42,6 @@
4342
import static com.google.common.collect.Iterables.getFirst;
4443
import static com.google.common.collect.Iterables.getLast;
4544
import static com.google.common.collect.Iterables.transform;
46-
import static io.airlift.units.DataSize.Unit.BYTE;
47-
import static io.airlift.units.DataSize.succinctBytes;
4845
import static io.airlift.units.Duration.succinctNanos;
4946
import static java.lang.Math.max;
5047
import static java.util.Objects.requireNonNull;
@@ -344,41 +341,41 @@ public DriverStats getDriverStats()
344341

345342
List<OperatorStats> operators = ImmutableList.copyOf(transform(operatorContexts, OperatorContext::getOperatorStats));
346343
OperatorStats inputOperator = getFirst(operators, null);
347-
DataSize rawInputDataSize;
344+
long rawInputDataSize;
348345
long rawInputPositions;
349346
Duration rawInputReadTime;
350-
DataSize processedInputDataSize;
347+
long processedInputDataSize;
351348
long processedInputPositions;
352-
DataSize outputDataSize;
349+
long outputDataSize;
353350
long outputPositions;
354351
if (inputOperator != null) {
355-
rawInputDataSize = inputOperator.getRawInputDataSize();
352+
rawInputDataSize = inputOperator.getRawInputDataSizeInBytes();
356353
rawInputPositions = inputOperator.getRawInputPositions();
357354
rawInputReadTime = inputOperator.getAddInputWall();
358355

359-
processedInputDataSize = inputOperator.getInputDataSize();
356+
processedInputDataSize = inputOperator.getInputDataSizeInBytes();
360357
processedInputPositions = inputOperator.getInputPositions();
361358

362359
OperatorStats outputOperator = requireNonNull(getLast(operators, null));
363-
outputDataSize = outputOperator.getOutputDataSize();
360+
outputDataSize = outputOperator.getOutputDataSizeInBytes();
364361
outputPositions = outputOperator.getOutputPositions();
365362
}
366363
else {
367-
rawInputDataSize = new DataSize(0, BYTE);
364+
rawInputDataSize = 0L;
368365
rawInputPositions = 0;
369366
rawInputReadTime = new Duration(0, MILLISECONDS);
370367

371-
processedInputDataSize = new DataSize(0, BYTE);
368+
processedInputDataSize = 0L;
372369
processedInputPositions = 0;
373370

374-
outputDataSize = new DataSize(0, BYTE);
371+
outputDataSize = 0L;
375372
outputPositions = 0;
376373
}
377374

378375
ImmutableSet.Builder<BlockedReason> builder = ImmutableSet.builder();
379376
long physicalWrittenDataSize = 0;
380377
for (OperatorStats operator : operators) {
381-
physicalWrittenDataSize += operator.getPhysicalWrittenDataSize().toBytes();
378+
physicalWrittenDataSize += operator.getPhysicalWrittenDataSizeInBytes();
382379
if (operator.getBlockedReason().isPresent()) {
383380
builder.add(operator.getBlockedReason().get());
384381
}
@@ -392,23 +389,23 @@ public DriverStats getDriverStats()
392389
executionEndTime,
393390
queuedTime.convertToMostSuccinctTimeUnit(),
394391
elapsedTime.convertToMostSuccinctTimeUnit(),
395-
succinctBytes(driverMemoryContext.getUserMemory()),
396-
succinctBytes(driverMemoryContext.getRevocableMemory()),
397-
succinctBytes(driverMemoryContext.getSystemMemory()),
392+
driverMemoryContext.getUserMemory(),
393+
driverMemoryContext.getRevocableMemory(),
394+
driverMemoryContext.getSystemMemory(),
398395
succinctNanos(totalScheduledTime),
399396
succinctNanos(totalCpuTime),
400397
succinctNanos(totalBlockedTime),
401398
blockedMonitor != null,
402399
builder.build(),
403-
succinctBytes(totalAllocation),
404-
rawInputDataSize.convertToMostSuccinctDataSize(),
400+
totalAllocation,
401+
rawInputDataSize,
405402
rawInputPositions,
406403
rawInputReadTime,
407-
processedInputDataSize.convertToMostSuccinctDataSize(),
404+
processedInputDataSize,
408405
processedInputPositions,
409-
outputDataSize.convertToMostSuccinctDataSize(),
406+
outputDataSize,
410407
outputPositions,
411-
succinctBytes(physicalWrittenDataSize),
408+
physicalWrittenDataSize,
412409
operators);
413410
}
414411

‎presto-main/src/main/java/com/facebook/presto/operator/OperatorContext.java

+15-16
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,6 @@
4646
import static com.google.common.base.Preconditions.checkArgument;
4747
import static com.google.common.base.Preconditions.checkState;
4848
import static com.google.common.util.concurrent.MoreExecutors.directExecutor;
49-
import static io.airlift.units.DataSize.succinctBytes;
5049
import static io.airlift.units.Duration.succinctNanos;
5150
import static java.lang.Math.max;
5251
import static java.lang.String.format;
@@ -541,44 +540,44 @@ public OperatorStats getOperatorStats()
541540
isBlockedTiming.getCalls(),
542541
succinctNanos(isBlockedTiming.getWallNanos()),
543542
succinctNanos(isBlockedTiming.getCpuNanos()),
544-
succinctBytes(isBlockedTiming.getAllocationBytes()),
543+
isBlockedTiming.getAllocationBytes(),
545544

546545
addInputTiming.getCalls(),
547546
succinctNanos(addInputTiming.getWallNanos()),
548547
succinctNanos(addInputTiming.getCpuNanos()),
549-
succinctBytes(addInputTiming.getAllocationBytes()),
550-
succinctBytes(rawInputDataSize.getTotalCount()),
548+
addInputTiming.getAllocationBytes(),
549+
rawInputDataSize.getTotalCount(),
551550
rawInputPositions.getTotalCount(),
552-
succinctBytes(inputDataSize.getTotalCount()),
551+
inputDataSize.getTotalCount(),
553552
inputPositionsCount,
554553
(double) inputPositionsCount * inputPositionsCount,
555554

556555
getOutputTiming.getCalls(),
557556
succinctNanos(getOutputTiming.getWallNanos()),
558557
succinctNanos(getOutputTiming.getCpuNanos()),
559-
succinctBytes(getOutputTiming.getAllocationBytes()),
560-
succinctBytes(outputDataSize.getTotalCount()),
558+
getOutputTiming.getAllocationBytes(),
559+
outputDataSize.getTotalCount(),
561560
outputPositions.getTotalCount(),
562561

563-
succinctBytes(physicalWrittenDataSize.get()),
562+
physicalWrittenDataSize.get(),
564563

565564
succinctNanos(additionalCpuNanos.get()),
566565
succinctNanos(blockedWallNanos.get()),
567566

568567
finishTiming.getCalls(),
569568
succinctNanos(finishTiming.getWallNanos()),
570569
succinctNanos(finishTiming.getCpuNanos()),
571-
succinctBytes(finishTiming.getAllocationBytes()),
570+
finishTiming.getAllocationBytes(),
572571

573-
succinctBytes(operatorMemoryContext.getUserMemory()),
574-
succinctBytes(getReservedRevocableBytes()),
575-
succinctBytes(operatorMemoryContext.getSystemMemory()),
572+
operatorMemoryContext.getUserMemory(),
573+
getReservedRevocableBytes(),
574+
operatorMemoryContext.getSystemMemory(),
576575

577-
succinctBytes(peakUserMemoryReservation.get()),
578-
succinctBytes(peakSystemMemoryReservation.get()),
579-
succinctBytes(peakTotalMemoryReservation.get()),
576+
peakUserMemoryReservation.get(),
577+
peakSystemMemoryReservation.get(),
578+
peakTotalMemoryReservation.get(),
580579

581-
succinctBytes(spillContext.getSpilledBytes()),
580+
spillContext.getSpilledBytes(),
582581

583582
memoryFuture.get().isDone() ? Optional.empty() : Optional.of(WAITING_FOR_MEMORY),
584583
info,

‎presto-main/src/main/java/com/facebook/presto/operator/PipelineContext.java

+10-10
Original file line numberDiff line numberDiff line change
@@ -199,24 +199,24 @@ public void driverFinished(DriverContext driverContext)
199199

200200
totalBlockedTime.getAndAdd(driverStats.getTotalBlockedTime().roundTo(NANOSECONDS));
201201

202-
totalAllocation.getAndAdd(driverStats.getTotalAllocation().toBytes());
202+
totalAllocation.getAndAdd(driverStats.getTotalAllocationInBytes());
203203

204204
List<OperatorStats> operators = driverStats.getOperatorStats();
205205
for (OperatorStats operator : operators) {
206206
operatorStatsById.compute(operator.getOperatorId(),
207207
(operatorId, summaryStats) -> summaryStats == null ? operator : OperatorStats.merge(ImmutableList.of(operator, summaryStats)).orElse(null));
208208
}
209209

210-
rawInputDataSize.update(driverStats.getRawInputDataSize().toBytes());
210+
rawInputDataSize.update(driverStats.getRawInputDataSizeInBytes());
211211
rawInputPositions.update(driverStats.getRawInputPositions());
212212

213-
processedInputDataSize.update(driverStats.getProcessedInputDataSize().toBytes());
213+
processedInputDataSize.update(driverStats.getProcessedInputDataSizeInBytes());
214214
processedInputPositions.update(driverStats.getProcessedInputPositions());
215215

216-
outputDataSize.update(driverStats.getOutputDataSize().toBytes());
216+
outputDataSize.update(driverStats.getOutputDataSizeInBytes());
217217
outputPositions.update(driverStats.getOutputPositions());
218218

219-
physicalWrittenDataSize.getAndAdd(driverStats.getPhysicalWrittenDataSize().toBytes());
219+
physicalWrittenDataSize.getAndAdd(driverStats.getPhysicalWrittenDataSizeInBytes());
220220
}
221221

222222
public void start()
@@ -403,22 +403,22 @@ public PipelineStats getPipelineStats()
403403
totalCpuTime += driverStats.getTotalCpuTime().roundTo(NANOSECONDS);
404404
totalBlockedTime += driverStats.getTotalBlockedTime().roundTo(NANOSECONDS);
405405

406-
totalAllocation += driverStats.getTotalAllocation().toBytes();
406+
totalAllocation += driverStats.getTotalAllocationInBytes();
407407

408408
for (OperatorStats operatorStats : driverStats.getOperatorStats()) {
409409
operatorStatsById.computeIfAbsent(operatorStats.getOperatorId(), k -> new ArrayList<>()).add(operatorStats);
410410
}
411411

412-
rawInputDataSize += driverStats.getRawInputDataSize().toBytes();
412+
rawInputDataSize += driverStats.getRawInputDataSizeInBytes();
413413
rawInputPositions += driverStats.getRawInputPositions();
414414

415-
processedInputDataSize += driverStats.getProcessedInputDataSize().toBytes();
415+
processedInputDataSize += driverStats.getProcessedInputDataSizeInBytes();
416416
processedInputPositions += driverStats.getProcessedInputPositions();
417417

418-
outputDataSize += driverStats.getOutputDataSize().toBytes();
418+
outputDataSize += driverStats.getOutputDataSizeInBytes();
419419
outputPositions += driverStats.getOutputPositions();
420420

421-
physicalWrittenDataSize += driverStats.getPhysicalWrittenDataSize().toBytes();
421+
physicalWrittenDataSize += driverStats.getPhysicalWrittenDataSizeInBytes();
422422
}
423423

424424
PipelineStatus pipelineStatus = pipelineStatusBuilder.build();

0 commit comments

Comments
 (0)