Skip to content

Commit 8259a78

Browse files
pongadpongad
authored
bigquery: give QueryResult fewer fields (#2592)
In the future, we might populate it with result from tabledata.list. The response has fewer fields than that of getQueryResults.
1 parent c98a09c commit 8259a78

6 files changed

Lines changed: 3 additions & 72 deletions

File tree

‎google-cloud-bigquery/src/main/java/com/google/cloud/bigquery/BigQueryImpl.java‎

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -627,12 +627,6 @@ public GetQueryResultsResponse call() {
627627
results.getPageToken(),
628628
serviceOptions,
629629
ImmutableMap.<BigQueryRpc.Option, Object>of());
630-
if (results.getTotalBytesProcessed() != null) {
631-
resultBuilder.setTotalBytesProcessed(results.getTotalBytesProcessed());
632-
}
633-
if (results.getCacheHit() != null) {
634-
resultBuilder.setCacheHit(results.getCacheHit());
635-
}
636630
if (results.getTotalRows() != null) {
637631
resultBuilder.setTotalRows(results.getTotalRows().longValue());
638632
}

‎google-cloud-bigquery/src/main/java/com/google/cloud/bigquery/QueryResult.java‎

Lines changed: 2 additions & 42 deletions
Original file line numberDiff line numberDiff line change
@@ -26,10 +26,8 @@ public class QueryResult extends PageImpl<FieldValueList> {
2626

2727
private static final long serialVersionUID = -4831062717210349818L;
2828

29-
private final boolean cacheHit;
3029
private final Schema schema;
3130
private final long totalRows;
32-
private final long totalBytesProcessed;
3331

3432
interface QueryResultsPageFetcher extends PageImpl.NextPageFetcher<FieldValueList> {
3533

@@ -42,28 +40,16 @@ static final class Builder {
4240
private QueryResultsPageFetcher pageFetcher;
4341
private String cursor;
4442
private Iterable<FieldValueList> results;
45-
private boolean cacheHit;
4643
private Schema schema;
4744
private long totalRows;
48-
private long totalBytesProcessed;
4945

5046
private Builder() {}
5147

52-
Builder setCacheHit(boolean cacheHit) {
53-
this.cacheHit = cacheHit;
54-
return this;
55-
}
56-
5748
Builder setSchema(Schema schema) {
5849
this.schema = schema;
5950
return this;
6051
}
6152

62-
Builder setTotalBytesProcessed(long totalBytesProcessed) {
63-
this.totalBytesProcessed = totalBytesProcessed;
64-
return this;
65-
}
66-
6753
Builder setTotalRows(long totalRows) {
6854
this.totalRows = totalRows;
6955
return this;
@@ -93,39 +79,17 @@ private QueryResult(Builder builder) {
9379
super(builder.pageFetcher,
9480
builder.cursor,
9581
builder.results != null ? builder.results : ImmutableList.<FieldValueList>of());
96-
this.cacheHit = builder.cacheHit;
9782
this.schema = builder.schema;
98-
this.totalBytesProcessed = builder.totalBytesProcessed;
9983
this.totalRows = builder.totalRows;
10084
}
10185

102-
/**
103-
* Returns whether the query result was fetched from the query cache.
104-
*
105-
* @see <a href="https://cloud.google.com/bigquery/querying-data#querycaching">Query Caching</a>
106-
*/
107-
public boolean cacheHit() {
108-
return cacheHit;
109-
}
110-
111-
11286
/**
11387
* Returns the schema of the results. This is present only when the query completes successfully.
11488
*/
11589
public Schema getSchema() {
11690
return schema;
11791
}
11892

119-
120-
/**
121-
* Returns the total number of bytes processed for the query. If this query was a dry run, this is
122-
* the number of bytes that would be processed if the query were run.
123-
*/
124-
public long getTotalBytesProcessed() {
125-
return totalBytesProcessed;
126-
}
127-
128-
12993
/**
13094
* Returns the total number of rows in the complete query result set, which can be more than the
13195
* number of rows in the first page of results returned by {@link #getValues()}. Returns {@code 0}
@@ -145,17 +109,15 @@ public QueryResult getNextPage() {
145109
public String toString() {
146110
return MoreObjects.toStringHelper(this)
147111
.add("rows", getValues())
148-
.add("cacheHit", cacheHit)
149112
.add("schema", schema)
150-
.add("totalBytesProcessed", totalBytesProcessed)
151113
.add("totalRows", totalRows)
152114
.add("cursor", getNextPageToken())
153115
.toString();
154116
}
155117

156118
@Override
157119
public final int hashCode() {
158-
return Objects.hash(super.hashCode(), cacheHit, schema, totalBytesProcessed, totalRows);
120+
return Objects.hash(super.hashCode(), schema, totalRows);
159121
}
160122

161123
@Override
@@ -170,9 +132,7 @@ public final boolean equals(Object obj) {
170132
return Objects.equals(getNextPageToken(), response.getNextPageToken())
171133
&& Objects.equals(getValues(), response.getValues())
172134
&& Objects.equals(schema, response.schema)
173-
&& totalRows == response.totalRows
174-
&& totalBytesProcessed == response.totalBytesProcessed
175-
&& cacheHit == response.cacheHit;
135+
&& totalRows == response.totalRows;
176136
}
177137

178138
static Builder newBuilder() {

‎google-cloud-bigquery/src/test/java/com/google/cloud/bigquery/BigQueryImplTest.java‎

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1154,11 +1154,9 @@ public void testQueryRequestCompleted() throws InterruptedException {
11541154
assertNull(response.getEtag());
11551155
assertEquals(queryJob, response.getJobId());
11561156
assertEquals(true, response.jobCompleted());
1157-
assertEquals(false, response.getResult().cacheHit());
11581157
assertEquals(ImmutableList.<BigQueryError>of(), response.getExecutionErrors());
11591158
assertFalse(response.hasErrors());
11601159
assertEquals(null, response.getResult().getSchema());
1161-
assertEquals(42L, response.getResult().getTotalBytesProcessed());
11621160
assertEquals(1L, response.getResult().getTotalRows());
11631161
for (FieldValueList row : response.getResult().getValues()) {
11641162
assertEquals(false, row.get(0).getBooleanValue());
@@ -1223,11 +1221,9 @@ public void testQueryRequestCompletedOnSecondAttempt() throws InterruptedExcepti
12231221
assertNull(response.getEtag());
12241222
assertEquals(queryJob, response.getJobId());
12251223
assertEquals(true, response.jobCompleted());
1226-
assertEquals(false, response.getResult().cacheHit());
12271224
assertEquals(ImmutableList.<BigQueryError>of(), response.getExecutionErrors());
12281225
assertFalse(response.hasErrors());
12291226
assertEquals(null, response.getResult().getSchema());
1230-
assertEquals(42L, response.getResult().getTotalBytesProcessed());
12311227
assertEquals(1L, response.getResult().getTotalRows());
12321228
for (FieldValueList row : response.getResult().getValues()) {
12331229
assertEquals(false, row.get(0).getBooleanValue());
@@ -1257,11 +1253,9 @@ public void testGetQueryResults() {
12571253
assertEquals("etag", response.getEtag());
12581254
assertEquals(queryJob, response.getJobId());
12591255
assertEquals(true, response.jobCompleted());
1260-
assertEquals(false, response.getResult().cacheHit());
12611256
assertEquals(ImmutableList.<BigQueryError>of(), response.getExecutionErrors());
12621257
assertFalse(response.hasErrors());
12631258
assertEquals(null, response.getResult().getSchema());
1264-
assertEquals(42L, response.getResult().getTotalBytesProcessed());
12651259
assertEquals(1L, response.getResult().getTotalRows());
12661260
for (FieldValueList row : response.getResult().getValues()) {
12671261
assertEquals(false, row.get(0).getBooleanValue());
@@ -1291,11 +1285,9 @@ public void testGetQueryResultsWithProject() {
12911285
assertEquals("etag", response.getEtag());
12921286
assertEquals(queryJob, response.getJobId());
12931287
assertEquals(true, response.jobCompleted());
1294-
assertEquals(false, response.getResult().cacheHit());
12951288
assertEquals(ImmutableList.<BigQueryError>of(), response.getExecutionErrors());
12961289
assertFalse(response.hasErrors());
12971290
assertEquals(null, response.getResult().getSchema());
1298-
assertEquals(42L, response.getResult().getTotalBytesProcessed());
12991291
assertEquals(1L, response.getResult().getTotalRows());
13001292
for (FieldValueList row : response.getResult().getValues()) {
13011293
assertEquals(false, row.get(0).getBooleanValue());
@@ -1329,11 +1321,9 @@ public void testGetQueryResultsWithOptions() {
13291321
QUERY_RESULTS_OPTION_PAGE_TOKEN);
13301322
assertEquals(queryJob, response.getJobId());
13311323
assertEquals(true, response.jobCompleted());
1332-
assertEquals(false, response.getResult().cacheHit());
13331324
assertEquals(ImmutableList.<BigQueryError>of(), response.getExecutionErrors());
13341325
assertFalse(response.hasErrors());
13351326
assertEquals(null, response.getResult().getSchema());
1336-
assertEquals(42L, response.getResult().getTotalBytesProcessed());
13371327
assertEquals(1L, response.getResult().getTotalRows());
13381328
for (FieldValueList row : response.getResult().getValues()) {
13391329
assertEquals(false, row.get(0).getBooleanValue());

‎google-cloud-bigquery/src/test/java/com/google/cloud/bigquery/QueryResponseTest.java‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -50,21 +50,17 @@ public QueryResult getNextPage() {
5050
return null;
5151
}
5252
};
53-
private static final Long TOTAL_BYTES_PROCESSED = 4200L;
5453
private static final Boolean JOB_COMPLETE = true;
5554
private static final List<BigQueryError> ERRORS = ImmutableList.of(
5655
new BigQueryError("reason1", "location1", "message1", "debugInfo1"),
5756
new BigQueryError("reason2", "location2", "message2", "debugInfo2")
5857
);
59-
private static final Boolean CACHE_HIT = false;
6058
private static final QueryResult QUERY_RESULT = QueryResult.newBuilder()
6159
.setSchema(SCHEMA)
6260
.setTotalRows(TOTAL_ROWS)
63-
.setTotalBytesProcessed(TOTAL_BYTES_PROCESSED)
6461
.setCursor("cursor")
6562
.setPageFetcher(FETCHER)
6663
.setResults(ImmutableList.<FieldValueList>of())
67-
.setCacheHit(CACHE_HIT)
6864
.build();
6965
private static final QueryResponse QUERY_RESPONSE = QueryResponse.newBuilder()
7066
.setEtag(ETAG)

‎google-cloud-bigquery/src/test/java/com/google/cloud/bigquery/QueryResultTest.java‎

Lines changed: 1 addition & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -46,28 +46,22 @@ public QueryResult getNextPage() {
4646
private static final QueryResult QUERY_RESULT = QueryResult.newBuilder()
4747
.setSchema(SCHEMA)
4848
.setTotalRows(TOTAL_ROWS)
49-
.setTotalBytesProcessed(TOTAL_BYTES_PROCESSED)
5049
.setCursor(CURSOR)
5150
.setPageFetcher(FETCHER)
5251
.setResults(ImmutableList.<FieldValueList>of())
53-
.setCacheHit(CACHE_HIT)
5452
.build();
5553
private static final QueryResult QUERY_RESULT_INCOMPLETE = QueryResult.newBuilder()
56-
.setTotalBytesProcessed(TOTAL_BYTES_PROCESSED)
5754
.build();
5855

5956
@Test
6057
public void testBuilder() {
6158
assertEquals(SCHEMA, QUERY_RESULT.getSchema());
6259
assertEquals(TOTAL_ROWS, QUERY_RESULT.getTotalRows());
63-
assertEquals(TOTAL_BYTES_PROCESSED, QUERY_RESULT.getTotalBytesProcessed());
64-
assertEquals(CACHE_HIT, QUERY_RESULT.cacheHit());
6560
assertEquals(CURSOR, QUERY_RESULT.getNextPageToken());
6661
assertEquals(null, QUERY_RESULT.getNextPage());
62+
6763
assertEquals(null, QUERY_RESULT_INCOMPLETE.getSchema());
6864
assertEquals(0L, QUERY_RESULT_INCOMPLETE.getTotalRows());
69-
assertEquals(TOTAL_BYTES_PROCESSED, QUERY_RESULT_INCOMPLETE.getTotalBytesProcessed());
70-
assertEquals(false, QUERY_RESULT_INCOMPLETE.cacheHit());
7165
assertEquals(null, QUERY_RESULT_INCOMPLETE.getNextPageToken());
7266
assertEquals(null, QUERY_RESULT_INCOMPLETE.getNextPage());
7367
}
@@ -86,7 +80,5 @@ private void compareQueryResult(QueryResult expected, QueryResult value) {
8680
assertEquals(expected.getValues(), value.getValues());
8781
assertEquals(expected.getSchema(), value.getSchema());
8882
assertEquals(expected.getTotalRows(), value.getTotalRows());
89-
assertEquals(expected.getTotalBytesProcessed(), value.getTotalBytesProcessed());
90-
assertEquals(expected.cacheHit(), value.cacheHit());
9183
}
9284
}

‎google-cloud-bigquery/src/test/java/com/google/cloud/bigquery/SerializationTest.java‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -197,7 +197,6 @@ public class SerializationTest extends BaseSerializationTest {
197197
private static final QueryResult QUERY_RESULT = QueryResult.newBuilder()
198198
.setSchema(TABLE_SCHEMA)
199199
.setTotalRows(1L)
200-
.setTotalBytesProcessed(42L)
201200
.setCursor("cursor")
202201
.setPageFetcher(null)
203202
.setResults(ImmutableList.<FieldValueList>of())

0 commit comments

Comments
 (0)