Skip to content

Commit 75ea1f9

Browse files
mziccardmziccard
committed
---
yaml --- r: 1531 b: refs/heads/master c: 0a59620 h: refs/heads/master i: 1529: 6135f36 1527: 433d9df
1 parent 56be5b1 commit 75ea1f9

8 files changed

Lines changed: 118 additions & 11 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: 8d37c32cd8db5cddb9ac5a5ce962203b7de00119
2+
refs/heads/master: 0a5962034bace33b6f1705a0ee32048d0762ed6e
33
refs/heads/travis: e21ee7b88a5edc3f3d8c71f90c3fc32abf7e8dd6
44
refs/heads/gh-pages: d1b373c30c176edc08692348167bec3a244bb823
55
refs/heads/bigquery: 762fa5830e6c398c0396177e3e7fd243bd62cfc3

‎trunk/gcloud-java-bigquery/src/main/java/com/google/gcloud/bigquery/Dataset.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,7 @@ private static class LazyTableIterable implements Iterable<Table>, Serializable
6969
private static final long serialVersionUID = 3312744215731674032L;
7070

7171
private final BigQueryOptions options;
72-
private final Iterable<BaseTableInfo> infoIterable;
72+
private Iterable<BaseTableInfo> infoIterable;
7373
private transient BigQuery bigquery;
7474

7575
public LazyTableIterable(BigQueryOptions options, Iterable<BaseTableInfo> infoIterable) {

‎trunk/gcloud-java-bigquery/src/main/java/com/google/gcloud/bigquery/ExtractJobInfo.java‎

Lines changed: 35 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -263,6 +263,23 @@ public static ExtractJobInfo of(TableId sourceTable, List<String> destinationUri
263263
return builder(sourceTable, destinationUris).build();
264264
}
265265

266+
/**
267+
* Returns a BigQuery Extract Job for the given source table, format and destination URI. Job's id
268+
* is chosen by the service.
269+
*/
270+
public static ExtractJobInfo of(TableId sourceTable, String format, String destinationUri) {
271+
return builder(sourceTable, destinationUri).format(format).build();
272+
}
273+
274+
/**
275+
* Returns a BigQuery Extract Job for the given source table, format and destination URIs. Job's
276+
* id is chosen by the service.
277+
*/
278+
public static ExtractJobInfo of(TableId sourceTable, String format,
279+
List<String> destinationUris) {
280+
return builder(sourceTable, destinationUris).format(format).build();
281+
}
282+
266283
/**
267284
* Returns a BigQuery Extract Job for the given source table and destination URI. Job's id is set
268285
* to the provided value.
@@ -279,6 +296,24 @@ public static ExtractJobInfo of(JobId jobId, TableId sourceTable, List<String> d
279296
return builder(sourceTable, destinationUris).jobId(jobId).build();
280297
}
281298

299+
/**
300+
* Returns a BigQuery Extract Job for the given source table, format and destination URI. Job's id
301+
* is set to the provided value.
302+
*/
303+
public static ExtractJobInfo of(JobId jobId, TableId sourceTable, String format,
304+
String destinationUri) {
305+
return builder(sourceTable, destinationUri).format(format).jobId(jobId).build();
306+
}
307+
308+
/**
309+
* Returns a BigQuery Extract Job for the given source table, format and destination URIs. Job's
310+
* id is set to the provided value.
311+
*/
312+
public static ExtractJobInfo of(JobId jobId, TableId sourceTable, String format,
313+
List<String> destinationUris) {
314+
return builder(sourceTable, destinationUris).format(format).jobId(jobId).build();
315+
}
316+
282317
@SuppressWarnings("unchecked")
283318
static ExtractJobInfo fromPb(Job jobPb) {
284319
return new Builder(jobPb).build();

‎trunk/gcloud-java-bigquery/src/main/java/com/google/gcloud/bigquery/LoadJobInfo.java‎

Lines changed: 35 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -407,6 +407,23 @@ public static LoadJobInfo of(TableId destinationTable, List<String> sourceUris)
407407
return builder(destinationTable, sourceUris).build();
408408
}
409409

410+
/**
411+
* Returns a BigQuery Load Job for the given destination table, format and source URI. Job's id is
412+
* chosen by the service.
413+
*/
414+
public static LoadJobInfo of(TableId destinationTable, FormatOptions format, String sourceUri) {
415+
return builder(destinationTable, sourceUri).formatOptions(format).build();
416+
}
417+
418+
/**
419+
* Returns a BigQuery Load Job for the given destination table, format and source URIs. Job's id
420+
* is chosen by the service.
421+
*/
422+
public static LoadJobInfo of(TableId destinationTable, FormatOptions format,
423+
List<String> sourceUris) {
424+
return builder(destinationTable, sourceUris).formatOptions(format).build();
425+
}
426+
410427
/**
411428
* Returns a BigQuery Load Job for the given destination table and source URI. Job's id is set to
412429
* the provided value.
@@ -423,6 +440,24 @@ public static LoadJobInfo of(JobId jobId, TableId destinationTable, List<String>
423440
return builder(destinationTable, sourceUris).jobId(jobId).build();
424441
}
425442

443+
/**
444+
* Returns a BigQuery Load Job for the given destination table, format, and source URI. Job's id
445+
* is set to the provided value.
446+
*/
447+
public static LoadJobInfo of(JobId jobId, TableId destinationTable, FormatOptions format,
448+
String sourceUri) {
449+
return builder(destinationTable, sourceUri).formatOptions(format).jobId(jobId).build();
450+
}
451+
452+
/**
453+
* Returns a BigQuery Load Job for the given destination table, format and source URIs. Job's id
454+
* is set to the provided value.
455+
*/
456+
public static LoadJobInfo of(JobId jobId, TableId destinationTable, FormatOptions format,
457+
List<String> sourceUris) {
458+
return builder(destinationTable, sourceUris).formatOptions(format).jobId(jobId).build();
459+
}
460+
426461
@SuppressWarnings("unchecked")
427462
static LoadJobInfo fromPb(Job jobPb) {
428463
return new Builder(jobPb).build();

‎trunk/gcloud-java-bigquery/src/main/java/com/google/gcloud/bigquery/Table.java‎

Lines changed: 4 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -231,10 +231,8 @@ Job extract(String format, String destinationUri, BigQuery.JobOption... options)
231231
*/
232232
Job extract(String format, List<String> destinationUris, BigQuery.JobOption... options)
233233
throws BigQueryException {
234-
ExtractJobInfo job = ExtractJobInfo.builder(info.tableId(), destinationUris)
235-
.format(format)
236-
.build();
237-
return new Job(bigquery, bigquery.create(job, options));
234+
return new Job(bigquery,
235+
bigquery.create(ExtractJobInfo.of(info.tableId(), format, destinationUris), options));
238236
}
239237

240238
/**
@@ -264,10 +262,8 @@ Job load(FormatOptions format, String sourceUri, BigQuery.JobOption... options)
264262
*/
265263
Job load(FormatOptions format, List<String> sourceUris, BigQuery.JobOption... options)
266264
throws BigQueryException {
267-
LoadJobInfo job = LoadJobInfo.builder(info.tableId(), sourceUris)
268-
.formatOptions(format)
269-
.build();
270-
return new Job(bigquery, bigquery.create(job, options));
265+
return new Job(bigquery, bigquery.create(LoadJobInfo.of(info.tableId(), format, sourceUris),
266+
options));
271267
}
272268

273269
/**

‎trunk/gcloud-java-bigquery/src/test/java/com/google/gcloud/bigquery/ExtractJobInfoTest.java‎

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -38,6 +38,7 @@ public class ExtractJobInfoTest {
3838
private static final TableId TABLE_ID = TableId.of("dataset", "table");
3939
private static final String FIELD_DELIMITER = ",";
4040
private static final String FORMAT = "CSV";
41+
private static final String JSON_FORMAT = "NEWLINE_DELIMITED_JSON";
4142
private static final Boolean PRINT_HEADER = true;
4243
private static final String COMPRESSION = "GZIP";
4344
private static final JobId JOB_ID = JobId.of("job");
@@ -95,6 +96,14 @@ public void testOf() {
9596
job = ExtractJobInfo.of(TABLE_ID, DESTINATION_URI);
9697
assertEquals(TABLE_ID, job.sourceTable());
9798
assertEquals(ImmutableList.of(DESTINATION_URI), job.destinationUris());
99+
job = ExtractJobInfo.of(TABLE_ID, JSON_FORMAT, DESTINATION_URIS);
100+
assertEquals(TABLE_ID, job.sourceTable());
101+
assertEquals(DESTINATION_URIS, job.destinationUris());
102+
assertEquals(JSON_FORMAT, job.format());
103+
job = ExtractJobInfo.of(TABLE_ID, JSON_FORMAT, DESTINATION_URI);
104+
assertEquals(TABLE_ID, job.sourceTable());
105+
assertEquals(ImmutableList.of(DESTINATION_URI), job.destinationUris());
106+
assertEquals(JSON_FORMAT, job.format());
98107
job = ExtractJobInfo.of(JOB_ID, TABLE_ID, DESTINATION_URIS);
99108
assertEquals(JOB_ID, job.jobId());
100109
assertEquals(TABLE_ID, job.sourceTable());
@@ -103,6 +112,16 @@ public void testOf() {
103112
assertEquals(JOB_ID, job.jobId());
104113
assertEquals(TABLE_ID, job.sourceTable());
105114
assertEquals(ImmutableList.of(DESTINATION_URI), job.destinationUris());
115+
job = ExtractJobInfo.of(JOB_ID, TABLE_ID, JSON_FORMAT, DESTINATION_URIS);
116+
assertEquals(JOB_ID, job.jobId());
117+
assertEquals(TABLE_ID, job.sourceTable());
118+
assertEquals(DESTINATION_URIS, job.destinationUris());
119+
assertEquals(JSON_FORMAT, job.format());
120+
job = ExtractJobInfo.of(JOB_ID, TABLE_ID, JSON_FORMAT, DESTINATION_URI);
121+
assertEquals(JOB_ID, job.jobId());
122+
assertEquals(TABLE_ID, job.sourceTable());
123+
assertEquals(ImmutableList.of(DESTINATION_URI), job.destinationUris());
124+
assertEquals(JSON_FORMAT, job.format());
106125
}
107126

108127
@Test

‎trunk/gcloud-java-bigquery/src/test/java/com/google/gcloud/bigquery/LoadJobInfoTest.java‎

Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -102,6 +102,16 @@ public void testOf() {
102102
job = LoadJobInfo.of(TABLE_ID, SOURCE_URI);
103103
assertEquals(TABLE_ID, job.destinationTable());
104104
assertEquals(ImmutableList.of(SOURCE_URI), job.sourceUris());
105+
job = LoadJobInfo.of(TABLE_ID, CSV_OPTIONS, SOURCE_URIS);
106+
assertEquals(TABLE_ID, job.destinationTable());
107+
assertEquals(SOURCE_URIS, job.sourceUris());
108+
assertEquals(FORMAT, job.format());
109+
assertEquals(CSV_OPTIONS, job.csvOptions());
110+
job = LoadJobInfo.of(TABLE_ID, CSV_OPTIONS, SOURCE_URI);
111+
assertEquals(TABLE_ID, job.destinationTable());
112+
assertEquals(ImmutableList.of(SOURCE_URI), job.sourceUris());
113+
assertEquals(FORMAT, job.format());
114+
assertEquals(CSV_OPTIONS, job.csvOptions());
105115
job = LoadJobInfo.of(JOB_ID, TABLE_ID, SOURCE_URIS);
106116
assertEquals(JOB_ID, job.jobId());
107117
assertEquals(TABLE_ID, job.destinationTable());
@@ -110,6 +120,18 @@ public void testOf() {
110120
assertEquals(JOB_ID, job.jobId());
111121
assertEquals(TABLE_ID, job.destinationTable());
112122
assertEquals(ImmutableList.of(SOURCE_URI), job.sourceUris());
123+
job = LoadJobInfo.of(JOB_ID, TABLE_ID, CSV_OPTIONS, SOURCE_URIS);
124+
assertEquals(JOB_ID, job.jobId());
125+
assertEquals(TABLE_ID, job.destinationTable());
126+
assertEquals(SOURCE_URIS, job.sourceUris());
127+
assertEquals(FORMAT, job.format());
128+
assertEquals(CSV_OPTIONS, job.csvOptions());
129+
job = LoadJobInfo.of(JOB_ID, TABLE_ID, CSV_OPTIONS, SOURCE_URI);
130+
assertEquals(JOB_ID, job.jobId());
131+
assertEquals(TABLE_ID, job.destinationTable());
132+
assertEquals(ImmutableList.of(SOURCE_URI), job.sourceUris());
133+
assertEquals(FORMAT, job.format());
134+
assertEquals(CSV_OPTIONS, job.csvOptions());
113135
}
114136

115137
@Test

‎trunk/gcloud-java-storage/src/main/java/com/google/gcloud/storage/Bucket.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -81,7 +81,7 @@ private static class LazyBlobIterable implements Iterable<Blob>, Serializable {
8181
private static final long serialVersionUID = -3092290247725378832L;
8282

8383
private final StorageOptions options;
84-
private final Iterable<BlobInfo> infoIterable;
84+
private Iterable<BlobInfo> infoIterable;
8585
private transient Storage storage;
8686

8787
public LazyBlobIterable(StorageOptions options, Iterable<BlobInfo> infoIterable) {

0 commit comments

Comments
 (0)