Skip to content

Convert DateTime to long along the critical path within coordinator #24673

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
shangm2 merged 6 commits into from
Mar 11, 2025
Merged

Convert DateTime to long along the critical path within coordinator #24673

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
94f89ee
Change DateTime for APIs
shangm2 Mar 6, 2025
b305c05
Change DateTime for tests
shangm2 Mar 6, 2025
13e51f1
Change DateTime for cpp workers
shangm2 Mar 6, 2025
2f1cb35
Change DateTime for presto-spark-base
shangm2 Mar 6, 2025
ca24222
Change DateTime for presto-ui
shangm2 Mar 7, 2025
2898449
Change DateTime for presto-main
shangm2 Mar 6, 2025
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
18 changes: 5 additions & 13 deletions presto-main/src/main/java/com/facebook/presto/connector/system/QuerySystemTable.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,6 @@
import com.facebook.presto.spi.connector.ConnectorTransactionHandle;
import com.facebook.presto.spi.resourceGroups.ResourceGroupId;
import io.airlift.units.Duration;
import org.joda.time.DateTime;

import javax.inject.Inject;

Expand All @@ -44,6 +43,7 @@
import static com.facebook.presto.common.type.VarcharType.createUnboundedVarcharType;
import static com.facebook.presto.metadata.MetadataUtil.TableMetadataBuilder.tableMetadataBuilder;
import static com.facebook.presto.spi.SystemTable.Distribution.ALL_COORDINATORS;
import static com.facebook.presto.util.DateTimeUtils.toTimeStampInMillis;
import static com.google.common.collect.ImmutableList.toImmutableList;
import static io.airlift.slice.Slices.utf8Slice;
import static java.util.Objects.requireNonNull;
Expand Down Expand Up @@ -119,10 +119,10 @@ public RecordCursor cursor(ConnectorTransactionHandle transactionHandle, Connect
toMillis(queryStats.getQueuedTime()),
toMillis(queryStats.getAnalysisTime()),

toTimeStamp(queryStats.getCreateTime()),
toTimeStamp(queryStats.getExecutionStartTime()),
toTimeStamp(queryStats.getLastHeartbeat()),
toTimeStamp(queryStats.getEndTime()));
toTimeStampInMillis(queryStats.getCreateTime()),
toTimeStampInMillis(queryStats.getExecutionStartTime()),
toTimeStampInMillis(queryStats.getLastHeartbeat()),
toTimeStampInMillis(queryStats.getEndTime()));
}
return table.build().cursor();
}
Expand All @@ -145,12 +145,4 @@ private static Long toMillis(Duration duration)
}
return duration.toMillis();
}

private static Long toTimeStamp(DateTime dateTime)
{
if (dateTime == null) {
return null;
}
return dateTime.getMillis();
}
}
17 changes: 4 additions & 13 deletions presto-main/src/main/java/com/facebook/presto/connector/system/TaskSystemTable.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,6 @@
import com.facebook.presto.spi.connector.ConnectorTransactionHandle;
import io.airlift.units.DataSize;
import io.airlift.units.Duration;
import org.joda.time.DateTime;

import javax.inject.Inject;

Expand Down Expand Up @@ -138,10 +137,10 @@ public RecordCursor cursor(ConnectorTransactionHandle transactionHandle, Connect

stats.getPhysicalWrittenDataSizeInBytes(),

toTimeStamp(stats.getCreateTime()),
toTimeStamp(stats.getFirstStartTime()),
toTimeStamp(taskInfo.getLastHeartbeat()),
toTimeStamp(stats.getEndTime()));
stats.getCreateTimeInMillis(),
stats.getFirstStartTimeInMillis(),
taskInfo.getLastHeartbeatInMillis(),
stats.getEndTimeInMillis());
}
return table.build().cursor();
}
Expand All @@ -161,12 +160,4 @@ private static Long toBytes(DataSize dataSize)
}
return dataSize.toBytes();
}

private static Long toTimeStamp(DateTime dateTime)
{
if (dateTime == null) {
return null;
}
return dateTime.getMillis();
}
}
2 changes: 1 addition & 1 deletion presto-main/src/main/java/com/facebook/presto/connector/system/TransactionsSystemTable.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -92,7 +92,7 @@ public RecordCursor cursor(ConnectorTransactionHandle transactionHandle, Connect
info.getIsolationLevel().toString(),
info.isReadOnly(),
info.isAutoCommitContext(),
info.getCreateTime().getMillis(),
info.getCreateTimeInMillis(),
(long) info.getIdleTime().getValue(TimeUnit.SECONDS),
info.getWrittenConnectorId().map(ConnectorId::getCatalogName).orElse(null),
createStringsBlock(info.getConnectorIds()));
Expand Down
17 changes: 8 additions & 9 deletions presto-main/src/main/java/com/facebook/presto/dispatcher/FailedDispatchQuery.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,6 @@
import com.facebook.presto.spi.resourceGroups.ResourceGroupQueryLimits;
import com.google.common.util.concurrent.ListenableFuture;
import io.airlift.units.Duration;
import org.joda.time.DateTime;

import java.net.URI;
import java.util.Optional;
Expand Down Expand Up @@ -146,27 +145,27 @@ public boolean isRetry()
public void recordHeartbeat() {}

@Override
public DateTime getLastHeartbeat()
public long getLastHeartbeatInMillis()
{
return basicQueryInfo.getQueryStats().getEndTime();
return basicQueryInfo.getQueryStats().getEndTimeInMillis();
}

@Override
public DateTime getCreateTime()
public long getCreateTimeInMillis()
{
return basicQueryInfo.getQueryStats().getCreateTime();
return basicQueryInfo.getQueryStats().getCreateTimeInMillis();
}

@Override
public Optional<DateTime> getExecutionStartTime()
public long getExecutionStartTimeInMillis()
{
return getEndTime();
return getEndTimeInMillis();
}

@Override
public Optional<DateTime> getEndTime()
public long getEndTimeInMillis()
{
return Optional.ofNullable(basicQueryInfo.getQueryStats().getEndTime());
return basicQueryInfo.getQueryStats().getEndTimeInMillis();
}

@Override
Expand Down
17 changes: 8 additions & 9 deletions presto-main/src/main/java/com/facebook/presto/dispatcher/LocalDispatchQuery.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,6 @@
import com.google.common.util.concurrent.ListenableFuture;
import com.google.common.util.concurrent.SettableFuture;
import io.airlift.units.Duration;
import org.joda.time.DateTime;

import java.util.Optional;
import java.util.concurrent.CompletableFuture;
Expand Down Expand Up @@ -230,9 +229,9 @@ public void recordHeartbeat()
}

@Override
public DateTime getLastHeartbeat()
public long getLastHeartbeatInMillis()
{
return stateMachine.getLastHeartbeat();
return stateMachine.getLastHeartbeatInMillis();
}

@Override
Expand Down Expand Up @@ -275,21 +274,21 @@ public boolean isDone()
}

@Override
public DateTime getCreateTime()
public long getCreateTimeInMillis()
{
return stateMachine.getCreateTime();
return stateMachine.getCreateTimeInMillis();
}

@Override
public Optional<DateTime> getExecutionStartTime()
public long getExecutionStartTimeInMillis()
{
return stateMachine.getExecutionStartTime();
return stateMachine.getExecutionStartTimeInMillis();
}

@Override
public Optional<DateTime> getEndTime()
public long getEndTimeInMillis()
{
return stateMachine.getEndTime();
return stateMachine.getEndTimeInMillis();
}

@Override
Expand Down
59 changes: 29 additions & 30 deletions presto-main/src/main/java/com/facebook/presto/event/QueryMonitor.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -74,7 +74,6 @@
import com.google.common.collect.ImmutableList;
import com.google.common.collect.ImmutableMap;
import com.google.common.collect.ImmutableSet;
import org.joda.time.DateTime;

import javax.inject.Inject;

Expand Down Expand Up @@ -660,11 +659,11 @@ private static void logQueryTimeline(QueryInfo queryInfo)
{
try {
QueryStats queryStats = queryInfo.getQueryStats();
DateTime queryStartTime = queryStats.getCreateTime();
DateTime queryEndTime = queryStats.getEndTime();
long queryStartTime = queryStats.getCreateTimeInMillis();
long queryEndTime = queryStats.getEndTimeInMillis();

// query didn't finish cleanly
if (queryStartTime == null || queryEndTime == null) {
if (queryStartTime == 0 || queryEndTime == 0) {
return;
}

Expand All @@ -673,9 +672,9 @@ private static void logQueryTimeline(QueryInfo queryInfo)

List<StageInfo> stages = getAllStages(queryInfo.getOutputStage());
// long lastSchedulingCompletion = 0;
long firstTaskStartTime = queryEndTime.getMillis();
long lastTaskStartTime = queryStartTime.getMillis() + planning;
long lastTaskEndTime = queryStartTime.getMillis() + planning;
long firstTaskStartTime = queryEndTime;
long lastTaskStartTime = queryStartTime + planning;
long lastTaskEndTime = queryStartTime + planning;
for (StageInfo stage : stages) {
// only consider leaf stages
if (!stage.getSubStages().isEmpty()) {
Expand All @@ -685,27 +684,27 @@ private static void logQueryTimeline(QueryInfo queryInfo)
for (TaskInfo taskInfo : stage.getLatestAttemptExecutionInfo().getTasks()) {
TaskStats taskStats = taskInfo.getStats();

DateTime firstStartTime = taskStats.getFirstStartTime();
if (firstStartTime != null) {
firstTaskStartTime = Math.min(firstStartTime.getMillis(), firstTaskStartTime);
long firstStartTimeInMillis = taskStats.getFirstStartTimeInMillis();
if (firstStartTimeInMillis != 0) {
firstTaskStartTime = Math.min(firstStartTimeInMillis, firstTaskStartTime);
}

DateTime lastStartTime = taskStats.getLastStartTime();
if (lastStartTime != null) {
lastTaskStartTime = max(lastStartTime.getMillis(), lastTaskStartTime);
long lastStartTimeInMillis = taskStats.getLastStartTimeInMillis();
if (lastStartTimeInMillis != 0) {
lastTaskStartTime = max(lastStartTimeInMillis, lastTaskStartTime);
}

DateTime endTime = taskStats.getEndTime();
if (endTime != null) {
lastTaskEndTime = max(endTime.getMillis(), lastTaskEndTime);
long endTimeInMillis = taskStats.getEndTimeInMillis();
if (endTimeInMillis != 0) {
lastTaskEndTime = max(endTimeInMillis, lastTaskEndTime);
}
}
}

long elapsed = max(queryEndTime.getMillis() - queryStartTime.getMillis(), 0);
long scheduling = max(firstTaskStartTime - queryStartTime.getMillis() - planning, 0);
long elapsed = max(queryEndTime - queryStartTime, 0);
long scheduling = max(firstTaskStartTime - queryStartTime - planning, 0);
long running = max(lastTaskEndTime - firstTaskStartTime, 0);
long finishing = max(queryEndTime.getMillis() - lastTaskEndTime, 0);
long finishing = max(queryEndTime - lastTaskEndTime, 0);

logQueryTimeline(
queryInfo.getQueryId(),
Expand All @@ -725,15 +724,15 @@ private static void logQueryTimeline(QueryInfo queryInfo)

private static void logQueryTimeline(BasicQueryInfo queryInfo)
{
DateTime queryStartTime = queryInfo.getQueryStats().getCreateTime();
DateTime queryEndTime = queryInfo.getQueryStats().getEndTime();
long queryStartTimeInMillis = queryInfo.getQueryStats().getCreateTimeInMillis();
long queryEndTimeInMillis = queryInfo.getQueryStats().getEndTimeInMillis();

// query didn't finish cleanly
if (queryStartTime == null || queryEndTime == null) {
if (queryStartTimeInMillis == 0 || queryEndTimeInMillis == 0) {
return;
}

long elapsed = max(queryEndTime.getMillis() - queryStartTime.getMillis(), 0);
long elapsed = max(queryEndTimeInMillis - queryStartTimeInMillis, 0);

logQueryTimeline(
queryInfo.getQueryId(),
Expand All @@ -743,8 +742,8 @@ private static void logQueryTimeline(BasicQueryInfo queryInfo)
0,
0,
0,
queryStartTime,
queryEndTime);
queryStartTimeInMillis,
queryEndTimeInMillis);
}

private static void logQueryTimeline(
Expand All @@ -755,19 +754,19 @@ private static void logQueryTimeline(
long schedulingMillis,
long runningMillis,
long finishingMillis,
DateTime queryStartTime,
DateTime queryEndTime)
long queryStartTimeInMillis,
long queryEndTimeInMillis)
{
log.info("TIMELINE: Query %s :: Transaction:[%s] :: elapsed %sms :: planning %sms :: scheduling %sms :: running %sms :: finishing %sms :: begin %s :: end %s",
log.info("TIMELINE: Query %s :: Transaction:[%s] :: elapsed %sms :: planning %sms :: scheduling %sms :: running %sms :: finishing %sms :: begin %sms :: end %sms",
queryId,
transactionId,
elapsedMillis,
planningMillis,
schedulingMillis,
runningMillis,
finishingMillis,
queryStartTime,
queryEndTime);
queryStartTimeInMillis,
queryEndTimeInMillis);
}

private static ResourceDistribution createResourceDistribution(
Expand Down
15 changes: 8 additions & 7 deletions presto-main/src/main/java/com/facebook/presto/event/SplitMonitor.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,7 @@
import java.util.Optional;

import static java.time.Duration.ofMillis;
import static java.time.Instant.ofEpochMilli;
import static java.util.Objects.requireNonNull;

public class SplitMonitor
Expand Down Expand Up @@ -59,13 +60,13 @@ public void splitFailedEvent(TaskId taskId, DriverStats driverStats, Throwable c
private void splitCompletedEvent(TaskId taskId, DriverStats driverStats, @Nullable String failureType, @Nullable String failureMessage)
{
Optional<Duration> timeToStart = Optional.empty();
if (driverStats.getStartTime() != null) {
timeToStart = Optional.of(ofMillis(driverStats.getStartTime().getMillis() - driverStats.getCreateTime().getMillis()));
if (driverStats.getStartTimeInMillis() != 0) {
timeToStart = Optional.of(ofMillis(driverStats.getStartTimeInMillis() - driverStats.getCreateTimeInMillis()));
}

Optional<Duration> timeToEnd = Optional.empty();
if (driverStats.getEndTime() != null) {
timeToEnd = Optional.of(ofMillis(driverStats.getEndTime().getMillis() - driverStats.getCreateTime().getMillis()));
if (driverStats.getEndTimeInMillis() != 0) {
timeToEnd = Optional.of(ofMillis(driverStats.getEndTimeInMillis() - driverStats.getCreateTimeInMillis()));
}

Optional<SplitFailureInfo> splitFailureMetadata = Optional.empty();
Expand All @@ -80,9 +81,9 @@ private void splitCompletedEvent(TaskId taskId, DriverStats driverStats, @Nullab
taskId.getStageExecutionId().getStageId().toString(),
taskId.getStageExecutionId().toString(),
Integer.toString(taskId.getId()),
driverStats.getCreateTime().toDate().toInstant(),
Optional.ofNullable(driverStats.getStartTime()).map(startTime -> startTime.toDate().toInstant()),
Optional.ofNullable(driverStats.getEndTime()).map(endTime -> endTime.toDate().toInstant()),
ofEpochMilli(driverStats.getCreateTimeInMillis()),
Optional.ofNullable(ofEpochMilli(driverStats.getStartTimeInMillis())),
Optional.ofNullable(ofEpochMilli(driverStats.getEndTimeInMillis())),
new SplitStatistics(
ofMillis(driverStats.getTotalCpuTime().toMillis()),
ofMillis(driverStats.getElapsedTime().toMillis()),
Expand Down
17 changes: 8 additions & 9 deletions presto-main/src/main/java/com/facebook/presto/execution/AccessControlCheckerExecution.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,6 @@
import com.google.common.util.concurrent.ListenableFuture;
import com.google.inject.Inject;
import io.airlift.units.Duration;
import org.joda.time.DateTime;

import javax.annotation.Nullable;

Expand Down Expand Up @@ -138,27 +137,27 @@ public long getTotalMemoryReservationInBytes()
}

@Override
public DateTime getCreateTime()
public long getCreateTimeInMillis()
{
return stateMachine.getCreateTime();
return stateMachine.getCreateTimeInMillis();
}

@Override
public Optional<DateTime> getExecutionStartTime()
public long getExecutionStartTimeInMillis()
{
return stateMachine.getExecutionStartTime();
return stateMachine.getExecutionStartTimeInMillis();
}

@Override
public DateTime getLastHeartbeat()
public long getLastHeartbeatInMillis()
{
return stateMachine.getLastHeartbeat();
return stateMachine.getLastHeartbeatInMillis();
}

@Override
public Optional<DateTime> getEndTime()
public long getEndTimeInMillis()
{
return stateMachine.getEndTime();
return stateMachine.getEndTimeInMillis();
}

@Override
Expand Down
Loading
Loading