Skip to content

Commit f6049e1

Browse files
shangm2NikhilCollooru
shangm2
authored and
NikhilCollooru
committed
Convert DataSize for execution
1 parent 7458b52 commit f6049e1

27 files changed

+267
-290
lines changed

‎presto-main/src/main/java/com/facebook/presto/execution/AccessControlCheckerExecution.java

+11-13
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,6 @@
3636
import com.google.common.util.concurrent.Futures;
3737
import com.google.common.util.concurrent.ListenableFuture;
3838
import com.google.inject.Inject;
39-
import io.airlift.units.DataSize;
4039
import io.airlift.units.Duration;
4140
import org.joda.time.DateTime;
4241

@@ -53,7 +52,6 @@
5352
import static com.google.common.base.Throwables.throwIfInstanceOf;
5453
import static com.google.common.util.concurrent.Futures.immediateFuture;
5554
import static com.google.common.util.concurrent.MoreExecutors.directExecutor;
56-
import static io.airlift.units.DataSize.Unit.BYTE;
5755
import static java.util.Objects.requireNonNull;
5856
import static java.util.concurrent.TimeUnit.NANOSECONDS;
5957

@@ -128,15 +126,15 @@ public Session getSession()
128126
}
129127

130128
@Override
131-
public DataSize getUserMemoryReservation()
129+
public long getUserMemoryReservationInBytes()
132130
{
133-
return new DataSize(0, BYTE);
131+
return 0L;
134132
}
135133

136134
@Override
137-
public DataSize getTotalMemoryReservation()
135+
public long getTotalMemoryReservationInBytes()
138136
{
139-
return new DataSize(0, BYTE);
137+
return 0L;
140138
}
141139

142140
@Override
@@ -170,27 +168,27 @@ public Duration getTotalCpuTime()
170168
}
171169

172170
@Override
173-
public DataSize getRawInputDataSize()
171+
public long getRawInputDataSizeInBytes()
174172
{
175-
return DataSize.succinctBytes(0);
173+
return 0L;
176174
}
177175

178176
@Override
179-
public DataSize getWrittenIntermediateDataSize()
177+
public long getWrittenIntermediateDataSizeInBytes()
180178
{
181-
return DataSize.succinctBytes(0);
179+
return 0L;
182180
}
183181

184182
@Override
185183
public long getOutputPositions()
186184
{
187-
return 0;
185+
return 0L;
188186
}
189187

190188
@Override
191-
public DataSize getOutputDataSize()
189+
public long getOutputDataSizeInBytes()
192190
{
193-
return DataSize.succinctBytes(0);
191+
return 0L;
194192
}
195193

196194
@Override

‎presto-main/src/main/java/com/facebook/presto/execution/BasicStageExecutionStats.java

+37-35
Original file line numberDiff line numberDiff line change
@@ -15,15 +15,13 @@
1515

1616
import com.facebook.presto.operator.BlockedReason;
1717
import com.google.common.collect.ImmutableSet;
18-
import io.airlift.units.DataSize;
1918
import io.airlift.units.Duration;
2019

2120
import java.util.HashSet;
2221
import java.util.OptionalDouble;
2322
import java.util.Set;
2423

25-
import static io.airlift.units.DataSize.Unit.BYTE;
26-
import static io.airlift.units.DataSize.succinctBytes;
24+
import static com.google.common.base.Preconditions.checkArgument;
2725
import static io.airlift.units.Duration.succinctDuration;
2826
import static java.lang.Math.min;
2927
import static java.util.Objects.requireNonNull;
@@ -39,21 +37,21 @@ public class BasicStageExecutionStats
3937
0,
4038
0,
4139

42-
new DataSize(0, BYTE),
40+
0L,
4341
0,
4442

4543
0.0,
4644
0.0,
47-
new DataSize(0, BYTE),
48-
new DataSize(0, BYTE),
45+
0L,
46+
0L,
4947

5048
new Duration(0, MILLISECONDS),
5149
new Duration(0, MILLISECONDS),
5250

5351
false,
5452
ImmutableSet.of(),
5553

56-
new DataSize(0, BYTE),
54+
0L,
5755

5856
OptionalDouble.empty());
5957

@@ -62,17 +60,17 @@ public class BasicStageExecutionStats
6260
private final int queuedDrivers;
6361
private final int runningDrivers;
6462
private final int completedDrivers;
65-
private final DataSize rawInputDataSize;
63+
private final long rawInputDataSizeInBytes;
6664
private final long rawInputPositions;
6765
private final double cumulativeUserMemory;
6866
private final double cumulativeTotalMemory;
69-
private final DataSize userMemoryReservation;
70-
private final DataSize totalMemoryReservation;
67+
private final long userMemoryReservationInBytes;
68+
private final long totalMemoryReservationInBytes;
7169
private final Duration totalCpuTime;
7270
private final Duration totalScheduledTime;
7371
private final boolean fullyBlocked;
7472
private final Set<BlockedReason> blockedReasons;
75-
private final DataSize totalAllocation;
73+
private final long totalAllocationInBytes;
7674
private final OptionalDouble progressPercentage;
7775

7876
public BasicStageExecutionStats(
@@ -83,21 +81,21 @@ public BasicStageExecutionStats(
8381
int runningDrivers,
8482
int completedDrivers,
8583

86-
DataSize rawInputDataSize,
84+
long rawInputDataSizeInBytes,
8785
long rawInputPositions,
8886

8987
double cumulativeUserMemory,
9088
double cumulativeTotalMemory,
91-
DataSize userMemoryReservation,
92-
DataSize totalMemoryReservation,
89+
long userMemoryReservationInBytes,
90+
long totalMemoryReservationInBytes,
9391

9492
Duration totalCpuTime,
9593
Duration totalScheduledTime,
9694

9795
boolean fullyBlocked,
9896
Set<BlockedReason> blockedReasons,
9997

100-
DataSize totalAllocation,
98+
long totalAllocationInBytes,
10199

102100
OptionalDouble progressPercentage)
103101
{
@@ -106,17 +104,21 @@ public BasicStageExecutionStats(
106104
this.queuedDrivers = queuedDrivers;
107105
this.runningDrivers = runningDrivers;
108106
this.completedDrivers = completedDrivers;
109-
this.rawInputDataSize = requireNonNull(rawInputDataSize, "rawInputDataSize is null");
107+
checkArgument(rawInputDataSizeInBytes >= 0, "rawInputDataSizeInBytes is negative");
108+
this.rawInputDataSizeInBytes = rawInputDataSizeInBytes;
110109
this.rawInputPositions = rawInputPositions;
111110
this.cumulativeUserMemory = cumulativeUserMemory;
112111
this.cumulativeTotalMemory = cumulativeTotalMemory;
113-
this.userMemoryReservation = requireNonNull(userMemoryReservation, "userMemoryReservation is null");
114-
this.totalMemoryReservation = requireNonNull(totalMemoryReservation, "totalMemoryReservation is null");
112+
checkArgument(userMemoryReservationInBytes >= 0, "userMemoryReservationInBytes is negative");
113+
this.userMemoryReservationInBytes = userMemoryReservationInBytes;
114+
checkArgument(totalMemoryReservationInBytes >= 0, "totalMemoryReservationInBytes is negative");
115+
this.totalMemoryReservationInBytes = totalMemoryReservationInBytes;
115116
this.totalCpuTime = requireNonNull(totalCpuTime, "totalCpuTime is null");
116117
this.totalScheduledTime = requireNonNull(totalScheduledTime, "totalScheduledTime is null");
117118
this.fullyBlocked = fullyBlocked;
118119
this.blockedReasons = ImmutableSet.copyOf(requireNonNull(blockedReasons, "blockedReasons is null"));
119-
this.totalAllocation = requireNonNull(totalAllocation, "totalAllocation is null");
120+
checkArgument(totalAllocationInBytes >= 0, "totalAllocationInBytes is negative");
121+
this.totalAllocationInBytes = totalAllocationInBytes;
120122
this.progressPercentage = requireNonNull(progressPercentage, "progressPercentage is null");
121123
}
122124

@@ -145,9 +147,9 @@ public int getCompletedDrivers()
145147
return completedDrivers;
146148
}
147149

148-
public DataSize getRawInputDataSize()
150+
public long getRawInputDataSizeInBytes()
149151
{
150-
return rawInputDataSize;
152+
return rawInputDataSizeInBytes;
151153
}
152154

153155
public long getRawInputPositions()
@@ -165,14 +167,14 @@ public double getCumulativeTotalMemory()
165167
return cumulativeTotalMemory;
166168
}
167169

168-
public DataSize getUserMemoryReservation()
170+
public long getUserMemoryReservationInBytes()
169171
{
170-
return userMemoryReservation;
172+
return userMemoryReservationInBytes;
171173
}
172174

173-
public DataSize getTotalMemoryReservation()
175+
public long getTotalMemoryReservationInBytes()
174176
{
175-
return totalMemoryReservation;
177+
return totalMemoryReservationInBytes;
176178
}
177179

178180
public Duration getTotalCpuTime()
@@ -195,9 +197,9 @@ public Set<BlockedReason> getBlockedReasons()
195197
return blockedReasons;
196198
}
197199

198-
public DataSize getTotalAllocation()
200+
public long getTotalAllocationInBytes()
199201
{
200-
return totalAllocation;
202+
return totalAllocationInBytes;
201203
}
202204

203205
public OptionalDouble getProgressPercentage()
@@ -238,8 +240,8 @@ public static BasicStageExecutionStats aggregateBasicStageStats(Iterable<BasicSt
238240

239241
cumulativeUserMemory += stageStats.getCumulativeUserMemory();
240242
cumulativeTotalMemory += stageStats.getCumulativeTotalMemory();
241-
userMemoryReservation += stageStats.getUserMemoryReservation().toBytes();
242-
totalMemoryReservation += stageStats.getTotalMemoryReservation().toBytes();
243+
userMemoryReservation += stageStats.getUserMemoryReservationInBytes();
244+
totalMemoryReservation += stageStats.getTotalMemoryReservationInBytes();
243245

244246
totalScheduledTimeMillis += stageStats.getTotalScheduledTime().roundTo(MILLISECONDS);
245247
totalCpuTime += stageStats.getTotalCpuTime().roundTo(MILLISECONDS);
@@ -249,9 +251,9 @@ public static BasicStageExecutionStats aggregateBasicStageStats(Iterable<BasicSt
249251
fullyBlocked &= stageStats.isFullyBlocked();
250252
blockedReasons.addAll(stageStats.getBlockedReasons());
251253

252-
totalAllocation += stageStats.getTotalAllocation().toBytes();
254+
totalAllocation += stageStats.getTotalAllocationInBytes();
253255

254-
rawInputDataSize += stageStats.getRawInputDataSize().toBytes();
256+
rawInputDataSize += stageStats.getRawInputDataSizeInBytes();
255257
rawInputPositions += stageStats.getRawInputPositions();
256258
}
257259

@@ -268,21 +270,21 @@ public static BasicStageExecutionStats aggregateBasicStageStats(Iterable<BasicSt
268270
runningDrivers,
269271
completedDrivers,
270272

271-
succinctBytes(rawInputDataSize),
273+
rawInputDataSize,
272274
rawInputPositions,
273275

274276
cumulativeUserMemory,
275277
cumulativeTotalMemory,
276-
succinctBytes(userMemoryReservation),
277-
succinctBytes(totalMemoryReservation),
278+
userMemoryReservation,
279+
totalMemoryReservation,
278280

279281
succinctDuration(totalCpuTime, MILLISECONDS),
280282
succinctDuration(totalScheduledTimeMillis, MILLISECONDS),
281283

282284
fullyBlocked,
283285
blockedReasons,
284286

285-
succinctBytes(totalAllocation),
287+
totalAllocation,
286288

287289
progressPercentage);
288290
}

‎presto-main/src/main/java/com/facebook/presto/execution/DataDefinitionExecution.java

+10-12
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,6 @@
2828
import com.google.common.util.concurrent.FutureCallback;
2929
import com.google.common.util.concurrent.Futures;
3030
import com.google.common.util.concurrent.ListenableFuture;
31-
import io.airlift.units.DataSize;
3231
import io.airlift.units.Duration;
3332
import org.joda.time.DateTime;
3433

@@ -41,7 +40,6 @@
4140

4241
import static com.google.common.base.Throwables.throwIfInstanceOf;
4342
import static com.google.common.util.concurrent.MoreExecutors.directExecutor;
44-
import static io.airlift.units.DataSize.Unit.BYTE;
4543
import static java.util.Objects.requireNonNull;
4644
import static java.util.concurrent.TimeUnit.NANOSECONDS;
4745

@@ -110,15 +108,15 @@ public Session getSession()
110108
}
111109

112110
@Override
113-
public DataSize getUserMemoryReservation()
111+
public long getUserMemoryReservationInBytes()
114112
{
115-
return new DataSize(0, BYTE);
113+
return 0L;
116114
}
117115

118116
@Override
119-
public DataSize getTotalMemoryReservation()
117+
public long getTotalMemoryReservationInBytes()
120118
{
121-
return new DataSize(0, BYTE);
119+
return 0L;
122120
}
123121

124122
@Override
@@ -152,15 +150,15 @@ public Duration getTotalCpuTime()
152150
}
153151

154152
@Override
155-
public DataSize getRawInputDataSize()
153+
public long getRawInputDataSizeInBytes()
156154
{
157-
return DataSize.succinctBytes(0);
155+
return 0L;
158156
}
159157

160158
@Override
161-
public DataSize getWrittenIntermediateDataSize()
159+
public long getWrittenIntermediateDataSizeInBytes()
162160
{
163-
return DataSize.succinctBytes(0);
161+
return 0L;
164162
}
165163

166164
@Override
@@ -170,9 +168,9 @@ public long getOutputPositions()
170168
}
171169

172170
@Override
173-
public DataSize getOutputDataSize()
171+
public long getOutputDataSizeInBytes()
174172
{
175-
return DataSize.succinctBytes(0);
173+
return 0L;
176174
}
177175

178176
@Override

‎presto-main/src/main/java/com/facebook/presto/execution/ManagedQueryExecution.java

+2-3
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,6 @@
1818
import com.facebook.presto.execution.StateMachine.StateChangeListener;
1919
import com.facebook.presto.server.BasicQueryInfo;
2020
import com.facebook.presto.spi.resourceGroups.ResourceGroupQueryLimits;
21-
import io.airlift.units.DataSize;
2221
import io.airlift.units.Duration;
2322

2423
import java.util.Optional;
@@ -40,9 +39,9 @@ public interface ManagedQueryExecution
4039

4140
Session getSession();
4241

43-
DataSize getUserMemoryReservation();
42+
long getUserMemoryReservationInBytes();
4443

45-
DataSize getTotalMemoryReservation();
44+
long getTotalMemoryReservationInBytes();
4645

4746
Duration getTotalCpuTime();
4847

0 commit comments

Comments
 (0)