Skip to content
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

Jump to bottom

feat: expose slotms field in querystage #172

Merged
merged 1 commit into from Feb 17, 2020
Merged

feat: expose slotms field in querystage #172

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
24 changes: 21 additions & 3 deletions google-cloud-bigquery/src/main/java/com/google/cloud/bigquery/QueryStage.java
View file
Open in desktop
Expand Up @@ -163,6 +163,7 @@ static QueryStep fromPb(com.google.api.services.bigquery.model.ExplainQueryStep
private final long writeMsMax;
private final double writeRatioAvg;
private final double writeRatioMax;
private final long slotMs;

static final class Builder {

Expand Down Expand Up @@ -195,6 +196,7 @@ static final class Builder {
private long writeMsMax;
private double writeRatioAvg;
private double writeRatioMax;
private long slotMs;

private Builder() {}

Expand Down Expand Up @@ -343,6 +345,11 @@ Builder setWriteRatioMax(double writeRatioMax) {
return this;
}

Builder setSlotMs(long slotMs) {
this.slotMs = slotMs;
return this;
}

QueryStage build() {
return new QueryStage(this);
}
Expand Down Expand Up @@ -378,6 +385,7 @@ QueryStage build() {
writeMsMax = builder.writeMsMax;
writeRatioAvg = builder.writeRatioAvg;
writeRatioMax = builder.writeRatioMax;
slotMs = builder.slotMs;
}

/** Returns the number of parallel input segments completed. */
Expand Down Expand Up @@ -551,6 +559,11 @@ public double getWriteRatioMax() {
return writeRatioMax;
}

/** Returns the slot-milliseconds used by the stage. */
public long getSlotMs() {
return slotMs;
}

@Override
public String toString() {
return MoreObjects.toStringHelper(this)
Expand Down Expand Up @@ -583,6 +596,7 @@ public String toString() {
.add("writeMsMax", writeMsMax)
.add("writeRatioAvg", writeRatioAvg)
.add("writeRatioMax", writeRatioMax)
.add("slotMs", slotMs)
.toString();
}

Expand Down Expand Up @@ -617,7 +631,8 @@ public final int hashCode() {
writeMsAvg,
writeMsMax,
writeRatioAvg,
writeRatioMax);
writeRatioMax,
slotMs);
}

@Override
Expand Down Expand Up @@ -657,7 +672,8 @@ public final boolean equals(Object obj) {
&& Objects.equals(steps, other.steps)
&& Objects.equals(name, other.name)
&& Objects.equals(status, other.status)
&& Objects.equals(inputStages, other.inputStages);
&& Objects.equals(inputStages, other.inputStages)
&& Objects.equals(slotMs, other.slotMs);
}

static Builder newBuilder() {
Expand Down Expand Up @@ -694,7 +710,8 @@ ExplainQueryStage toPb() {
.setWriteMsAvg(writeMsAvg)
.setWriteMsMax(writeMsMax)
.setWriteRatioAvg(writeRatioAvg)
.setWriteRatioMax(writeRatioMax);
.setWriteRatioMax(writeRatioMax)
.setSlotMs(slotMs);
if (steps != null) {
stagePb.setSteps(Lists.transform(steps, QueryStep.TO_PB_FUNCTION));
}
Expand Down Expand Up @@ -734,6 +751,7 @@ static QueryStage fromPb(com.google.api.services.bigquery.model.ExplainQueryStag
builder.setWriteMsMax(stagePb.getWriteMsMax());
builder.setWriteRatioAvg(stagePb.getWriteRatioAvg());
builder.setWriteRatioMax(stagePb.getWriteRatioMax());
builder.setSlotMs(stagePb.getSlotMs());
return builder.build();
}
}
7 changes: 7 additions & 0 deletions google-cloud-bigquery/src/test/java/com/google/cloud/bigquery/QueryStageTest.java
View file
Open in desktop
Expand Up @@ -59,6 +59,7 @@ public class QueryStageTest {
private static final long WRITE_MS_MAX = 50;
private static final double WRITE_RATIO_AVG = 9.9;
private static final double WRITE_RATIO_MAX = 10.10;
private static final long SLOTMS = 1522540800000L;
private static final QueryStage QUERY_STAGE =
QueryStage.newBuilder()
.setCompletedParallelInputs(COMPLETED_PARALLEL_INPUTS)
Expand Down Expand Up @@ -90,6 +91,7 @@ public class QueryStageTest {
.setWriteMsMax(WRITE_MS_MAX)
.setWriteRatioAvg(WRITE_RATIO_AVG)
.setWriteRatioMax(WRITE_RATIO_MAX)
.setSlotMs(SLOTMS)
.build();

@Test
Expand All @@ -112,6 +114,8 @@ public void testBuilder() {
assertEquals(INPUT_STAGES, QUERY_STAGE.getInputStages());
assertEquals(PARALLEL_INPUTS, QUERY_STAGE.getParallelInputs());
assertEquals(NAME, QUERY_STAGE.getName());
assertEquals(READ_MS_AVG, QUERY_STAGE.getReadMsAvg());
assertEquals(READ_MS_MAX, QUERY_STAGE.getReadMsMax());
assertEquals(READ_RATIO_AVG, QUERY_STAGE.getReadRatioAvg(), 0);
assertEquals(READ_RATIO_MAX, QUERY_STAGE.getReadRatioMax(), 0);
assertEquals(RECORDS_READ, QUERY_STAGE.getRecordsRead());
Expand All @@ -129,6 +133,7 @@ public void testBuilder() {
assertEquals(WRITE_MS_MAX, QUERY_STAGE.getWriteMsMax());
assertEquals(WRITE_RATIO_AVG, QUERY_STAGE.getWriteRatioAvg(), 0);
assertEquals(WRITE_RATIO_MAX, QUERY_STAGE.getWriteRatioMax(), 0);
assertEquals(SLOTMS, QUERY_STAGE.getSlotMs());
}

@Test
Expand Down Expand Up @@ -178,7 +183,9 @@ private void compareQueryStage(QueryStage expected, QueryStage value) {
assertEquals(expected.getWriteMsMax(), expected.getWriteMsMax());
assertEquals(expected.getWriteRatioAvg(), value.getWriteRatioAvg(), 0);
assertEquals(expected.getWriteRatioMax(), value.getWriteRatioMax(), 0);
assertEquals(expected.getSlotMs(), value.getSlotMs());
assertEquals(expected.hashCode(), value.hashCode());
assertEquals(expected.toString(), value.toString());
}

private void compareQueryStep(QueryStep expected, QueryStep value) {
Expand Down