Skip to content

Commit 80126ef

Browse files
shollymanshollyman
authored
---
yaml --- r: 9921 b: refs/heads/master c: 49f93c8 h: refs/heads/master i: 9919: 4af32c1
1 parent ee17ac6 commit 80126ef

12 files changed

Lines changed: 274 additions & 6 deletions

File tree

‎[refs]‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
---
2-
refs/heads/master: b3e9a4ce1fa1756f7a992b6160c44974d0050f84
2+
refs/heads/master: 49f93c83c6feaf4e3f984fd798e03450bce3f5cf
33
refs/heads/travis: 47e4fee4fd5af9b2a8ce46f23c72ec95f9b195b2
44
refs/heads/gh-pages: 021e62d6370c5c0e0dbcdcbe7fa636aca17f4b52
55
refs/tags/0.0.9: 22f1839238f66c39e67ed4dfdcd273b1ae2e8444

‎trunk/google-cloud-clients/google-cloud-bigquery/src/main/java/com/google/cloud/bigquery/Clustering.java‎

Lines changed: 66 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,66 @@
1+
/*
2+
* Copyright 2018 Google LLC
3+
*
4+
* Licensed under the Apache License, Version 2.0 (the "License");
5+
* you may not use this file except in compliance with the License.
6+
* You may obtain a copy of the License at
7+
*
8+
* http://www.apache.org/licenses/LICENSE-2.0
9+
*
10+
* Unless required by applicable law or agreed to in writing, software
11+
* distributed under the License is distributed on an "AS IS" BASIS,
12+
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
13+
* See the License for the specific language governing permissions and
14+
* limitations under the License.
15+
*/
16+
package com.google.cloud.bigquery;
17+
18+
19+
import com.google.auto.value.AutoValue;
20+
import com.google.common.collect.ImmutableList;
21+
import java.io.Serializable;
22+
import java.util.List;
23+
import javax.annotation.Nullable;
24+
25+
@AutoValue
26+
public abstract class Clustering implements Serializable {
27+
28+
private static final long serialVersionUID = 1L;
29+
30+
31+
@Nullable
32+
abstract ImmutableList<String> getFieldsImmut();
33+
34+
public List<String> getFields() {return getFieldsImmut();}
35+
36+
37+
public abstract Builder toBuilder();
38+
39+
@AutoValue.Builder
40+
public abstract static class Builder {
41+
42+
abstract Builder setFieldsImmut(ImmutableList<String> fieldsImmut);
43+
44+
public Builder setFields(List<String> fields) {
45+
return setFieldsImmut(ImmutableList.copyOf(fields));
46+
}
47+
48+
public abstract Clustering build();
49+
}
50+
51+
public static Builder newBuilder() {
52+
return new AutoValue_Clustering.Builder();
53+
}
54+
55+
com.google.api.services.bigquery.model.Clustering toPb() {
56+
com.google.api.services.bigquery.model.Clustering clusterPb =
57+
new com.google.api.services.bigquery.model.Clustering();
58+
clusterPb.setFields(getFields());
59+
return clusterPb;
60+
}
61+
62+
static Clustering fromPb(com.google.api.services.bigquery.model.Clustering clusterPb) {
63+
return newBuilder().setFields(clusterPb.getFields()).build();
64+
}
65+
66+
}

‎trunk/google-cloud-clients/google-cloud-bigquery/src/main/java/com/google/cloud/bigquery/LoadConfiguration.java‎

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -119,6 +119,16 @@ interface Builder {
119119
*/
120120
Builder setAutodetect(Boolean autodetect);
121121

122+
/**
123+
* Sets the time partitioning specification for the destination table.
124+
*/
125+
Builder setTimePartitioning(TimePartitioning timePartitioning);
126+
127+
/**
128+
* Sets the clustering specification for the destination table.
129+
*/
130+
Builder setClustering(Clustering clustering);
131+
122132
LoadConfiguration build();
123133
}
124134

@@ -211,6 +221,16 @@ interface Builder {
211221
*/
212222
Boolean getAutodetect();
213223

224+
/**
225+
* Returns the time partitioning specification defined for the destination table.
226+
*/
227+
TimePartitioning getTimePartitioning();
228+
229+
/**
230+
* Returns the clustering specification for the definition table.
231+
*/
232+
Clustering getClustering();
233+
214234
/**
215235
* Returns a builder for the load configuration object.
216236
*/

‎trunk/google-cloud-clients/google-cloud-bigquery/src/main/java/com/google/cloud/bigquery/LoadJobConfiguration.java‎

Lines changed: 41 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,6 +46,8 @@ public final class LoadJobConfiguration extends JobConfiguration implements Load
4646
private final Boolean ignoreUnknownValues;
4747
private final List<JobInfo.SchemaUpdateOption> schemaUpdateOptions;
4848
private final Boolean autodetect;
49+
private final TimePartitioning timePartitioning;
50+
private final Clustering clustering;
4951

5052
public static final class Builder
5153
extends JobConfiguration.Builder<LoadJobConfiguration, Builder>
@@ -64,6 +66,8 @@ public static final class Builder
6466
private List<String> projectionFields;
6567
private List<JobInfo.SchemaUpdateOption> schemaUpdateOptions;
6668
private Boolean autodetect;
69+
private TimePartitioning timePartitioning;
70+
private Clustering clustering;
6771

6872
private Builder() {
6973
super(Type.LOAD);
@@ -84,6 +88,8 @@ private Builder(LoadJobConfiguration loadConfiguration) {
8488
this.autodetect = loadConfiguration.autodetect;
8589
this.destinationEncryptionConfiguration =
8690
loadConfiguration.destinationEncryptionConfiguration;
91+
this.timePartitioning = loadConfiguration.timePartitioning;
92+
this.clustering = loadConfiguration.clustering;
8793
}
8894

8995
private Builder(com.google.api.services.bigquery.model.JobConfiguration configurationPb) {
@@ -141,6 +147,12 @@ private Builder(com.google.api.services.bigquery.model.JobConfiguration configur
141147
}
142148
this.schemaUpdateOptions = schemaUpdateOptionsBuilder.build();
143149
}
150+
if (loadConfigurationPb.getTimePartitioning() != null) {
151+
this.timePartitioning = TimePartitioning.fromPb(loadConfigurationPb.getTimePartitioning());
152+
}
153+
if (loadConfigurationPb.getClustering() != null) {
154+
this.clustering = Clustering.fromPb(loadConfigurationPb.getClustering());
155+
}
144156
this.autodetect = loadConfigurationPb.getAutodetect();
145157
if (loadConfigurationPb.getDestinationEncryptionConfiguration() != null) {
146158
this.destinationEncryptionConfiguration = new EncryptionConfiguration.Builder(
@@ -211,6 +223,18 @@ public Builder setIgnoreUnknownValues(Boolean ignoreUnknownValues) {
211223
return this;
212224
}
213225

226+
@Override
227+
public Builder setTimePartitioning(TimePartitioning timePartitioning) {
228+
this.timePartitioning = timePartitioning;
229+
return this;
230+
}
231+
232+
@Override
233+
public Builder setClustering(Clustering clustering) {
234+
this.clustering = clustering;
235+
return this;
236+
}
237+
214238
/**
215239
* Sets the fully-qualified URIs that point to source data in Google Cloud Storage (e.g.
216240
* gs://bucket/path). Each URI can contain one '*' wildcard character and it must come after the
@@ -253,6 +277,8 @@ private LoadJobConfiguration(Builder builder) {
253277
this.schemaUpdateOptions = builder.schemaUpdateOptions;
254278
this.autodetect = builder.autodetect;
255279
this.destinationEncryptionConfiguration = builder.destinationEncryptionConfiguration;
280+
this.timePartitioning = builder.timePartitioning;
281+
this.clustering = builder.clustering;
256282
}
257283

258284

@@ -333,6 +359,12 @@ public Boolean getAutodetect() {
333359
return autodetect;
334360
}
335361

362+
@Override
363+
public TimePartitioning getTimePartitioning() { return timePartitioning; }
364+
365+
@Override
366+
public Clustering getClustering() { return clustering; }
367+
336368
@Override
337369
public List<JobInfo.SchemaUpdateOption> getSchemaUpdateOptions() {
338370
return schemaUpdateOptions;
@@ -357,7 +389,9 @@ ToStringHelper toStringHelper() {
357389
.add("ignoreUnknownValue", ignoreUnknownValues)
358390
.add("sourceUris", sourceUris)
359391
.add("schemaUpdateOptions", schemaUpdateOptions)
360-
.add("autodetect", autodetect);
392+
.add("autodetect", autodetect)
393+
.add("timePartitioning", timePartitioning)
394+
.add("clustering", clustering);
361395
}
362396

363397
@Override
@@ -429,6 +463,12 @@ com.google.api.services.bigquery.model.JobConfiguration toPb() {
429463
loadConfigurationPb.setDestinationEncryptionConfiguration(
430464
destinationEncryptionConfiguration.toPb());
431465
}
466+
if (timePartitioning != null) {
467+
loadConfigurationPb.setTimePartitioning(timePartitioning.toPb());
468+
}
469+
if (clustering != null) {
470+
loadConfigurationPb.setClustering(clustering.toPb());
471+
}
432472
return new com.google.api.services.bigquery.model.JobConfiguration()
433473
.setLoad(loadConfigurationPb);
434474
}

‎trunk/google-cloud-clients/google-cloud-bigquery/src/main/java/com/google/cloud/bigquery/QueryJobConfiguration.java‎

Lines changed: 50 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -62,6 +62,8 @@ public final class QueryJobConfiguration extends JobConfiguration {
6262
private final Integer maximumBillingTier;
6363
private final List<SchemaUpdateOption> schemaUpdateOptions;
6464
private final EncryptionConfiguration destinationEncryptionConfiguration;
65+
private final TimePartitioning timePartitioning;
66+
private final Clustering clustering;
6567

6668
/**
6769
* Priority levels for a query. If not specified the priority is assumed to be
@@ -104,6 +106,8 @@ public static final class Builder
104106
private Integer maximumBillingTier;
105107
private List<SchemaUpdateOption> schemaUpdateOptions;
106108
private EncryptionConfiguration destinationEncryptionConfiguration;
109+
private TimePartitioning timePartitioning;
110+
private Clustering clustering;
107111

108112
private Builder() {
109113
super(Type.QUERY);
@@ -129,6 +133,8 @@ private Builder(QueryJobConfiguration jobConfiguration) {
129133
this.maximumBillingTier = jobConfiguration.maximumBillingTier;
130134
this.schemaUpdateOptions = jobConfiguration.schemaUpdateOptions;
131135
this.destinationEncryptionConfiguration = jobConfiguration.destinationEncryptionConfiguration;
136+
this.timePartitioning = jobConfiguration.timePartitioning;
137+
this.clustering = jobConfiguration.clustering;
132138
}
133139

134140
private Builder(com.google.api.services.bigquery.model.JobConfiguration configurationPb) {
@@ -195,6 +201,12 @@ private Builder(com.google.api.services.bigquery.model.JobConfiguration configur
195201
this.destinationEncryptionConfiguration = new EncryptionConfiguration.Builder(
196202
queryConfigurationPb.getDestinationEncryptionConfiguration()).build();
197203
}
204+
if (queryConfigurationPb.getTimePartitioning() != null) {
205+
this.timePartitioning = TimePartitioning.fromPb(queryConfigurationPb.getTimePartitioning());
206+
}
207+
if (queryConfigurationPb.getClustering() != null) {
208+
this.clustering = Clustering.fromPb(queryConfigurationPb.getClustering());
209+
}
198210
}
199211

200212

@@ -488,6 +500,22 @@ public Builder setSchemaUpdateOptions(List<SchemaUpdateOption> schemaUpdateOptio
488500
return this;
489501
}
490502

503+
/**
504+
* Sets the time partitioning specification for the destination table.
505+
*/
506+
public Builder setTimePartitioning(TimePartitioning timePartitioning) {
507+
this.timePartitioning = timePartitioning;
508+
return this;
509+
}
510+
511+
/**
512+
* Sets the clustering specification for the destination table.
513+
*/
514+
public Builder setClustering(Clustering clustering) {
515+
this.clustering = clustering;
516+
return this;
517+
}
518+
491519
public QueryJobConfiguration build() {
492520
return new QueryJobConfiguration(this);
493521
}
@@ -522,6 +550,8 @@ private QueryJobConfiguration(Builder builder) {
522550
this.maximumBillingTier = builder.maximumBillingTier;
523551
this.schemaUpdateOptions = builder.schemaUpdateOptions;
524552
this.destinationEncryptionConfiguration = builder.destinationEncryptionConfiguration;
553+
this.timePartitioning = builder.timePartitioning;
554+
this.clustering = builder.clustering;
525555
}
526556

527557
/**
@@ -693,6 +723,16 @@ public List<SchemaUpdateOption> getSchemaUpdateOptions() {
693723
return schemaUpdateOptions;
694724
}
695725

726+
/**
727+
* Returns the time partitioning specification for the destination table.
728+
*/
729+
public TimePartitioning getTimePartitioning() { return timePartitioning; }
730+
731+
/**
732+
* Returns the clustering specification for the destination table.
733+
*/
734+
public Clustering getClustering() { return clustering; }
735+
696736
@Override
697737
public Builder toBuilder() {
698738
return new Builder(this);
@@ -718,7 +758,9 @@ ToStringHelper toStringHelper() {
718758
.add("dryRun", dryRun)
719759
.add("useLegacySql", useLegacySql)
720760
.add("maximumBillingTier", maximumBillingTier)
721-
.add("schemaUpdateOptions", schemaUpdateOptions);
761+
.add("schemaUpdateOptions", schemaUpdateOptions)
762+
.add("timePartitioning", timePartitioning)
763+
.add("clustering", clustering);
722764
}
723765

724766
@Override
@@ -734,7 +776,7 @@ public int hashCode() {
734776
defaultDataset, flattenResults, priority, query, positionalParameters,
735777
namedParameters, tableDefinitions, useQueryCache,
736778
userDefinedFunctions, writeDisposition, dryRun, useLegacySql, maximumBillingTier,
737-
schemaUpdateOptions);
779+
schemaUpdateOptions, timePartitioning, clustering);
738780
}
739781

740782
@Override
@@ -813,6 +855,12 @@ com.google.api.services.bigquery.model.JobConfiguration toPb() {
813855
if (destinationEncryptionConfiguration != null) {
814856
queryConfigurationPb.setDestinationEncryptionConfiguration(destinationEncryptionConfiguration.toPb());
815857
}
858+
if (timePartitioning != null) {
859+
queryConfigurationPb.setTimePartitioning(timePartitioning.toPb());
860+
}
861+
if (clustering != null) {
862+
queryConfigurationPb.setClustering(clustering.toPb());
863+
}
816864
return configurationPb.setQuery(queryConfigurationPb);
817865
}
818866

‎trunk/google-cloud-clients/google-cloud-bigquery/src/main/java/com/google/cloud/bigquery/StandardTableDefinition.java‎

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -142,6 +142,13 @@ public abstract static class Builder
142142
*/
143143
public abstract Builder setTimePartitioning(TimePartitioning timePartitioning);
144144

145+
/**
146+
* Set the clustering configuration for the table. If not set, the table is not
147+
* clustered. Clustering is only available for partitioned tables.
148+
*/
149+
public abstract Builder setClustering(Clustering clustering);
150+
151+
145152
/** Creates a {@code StandardTableDefinition} object. */
146153
public abstract StandardTableDefinition build();
147154
}
@@ -179,6 +186,14 @@ public abstract static class Builder
179186
@Nullable
180187
public abstract TimePartitioning getTimePartitioning();
181188

189+
190+
/**
191+
* Returns the clustering configuration for this table. If {@code null}, the table is not
192+
* clustered.
193+
*/
194+
@Nullable
195+
public abstract Clustering getClustering();
196+
182197
/**
183198
* Returns a builder for a BigQuery standard table definition.
184199
*/
@@ -212,6 +227,9 @@ Table toPb() {
212227
if (getTimePartitioning() != null) {
213228
tablePb.setTimePartitioning(getTimePartitioning().toPb());
214229
}
230+
if (getClustering() != null) {
231+
tablePb.setClustering(getClustering().toPb());
232+
}
215233
return tablePb;
216234
}
217235

@@ -227,6 +245,9 @@ static StandardTableDefinition fromPb(Table tablePb) {
227245
if (tablePb.getTimePartitioning() != null) {
228246
builder.setTimePartitioning(TimePartitioning.fromPb(tablePb.getTimePartitioning()));
229247
}
248+
if (tablePb.getClustering() != null) {
249+
builder.setClustering(Clustering.fromPb(tablePb.getClustering()));
250+
}
230251
return builder.setNumBytes(tablePb.getNumBytes()).setLocation(tablePb.getLocation()).build();
231252
}
232253
}

0 commit comments

Comments
 (0)