Skip to content

Commit fec65b7

Browse files
tswastpongad
tswast
authored and
pongad
committed
---
yaml --- r: 9819 b: refs/heads/master c: 3939fd6 h: refs/heads/master i: 9817: 111dea8 9815: 44a9747
1 parent a8198ba commit fec65b7

6 files changed

Lines changed: 176 additions & 38 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: a90e826770d2844a7467753f73268be00c6aafe2
2+
refs/heads/master: 3939fd678fd7cfa51e93ef1d3f3cbe93f8246b32
33
refs/heads/travis: 47e4fee4fd5af9b2a8ce46f23c72ec95f9b195b2
44
refs/heads/gh-pages: 03aa637ca038bc7904083f090fd16e091f513230
55
refs/tags/0.0.9: 22f1839238f66c39e67ed4dfdcd273b1ae2e8444

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

Lines changed: 44 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -560,22 +560,24 @@ public int hashCode() {
560560
* String sourceUri = "gs://cloud-samples-data/bigquery/us-states/us-states.json";
561561
* TableId tableId = TableId.of(datasetName, tableName);
562562
* // Table field definition
563-
* Field[] fields = new Field[] {
564-
* Field.of("name", LegacySQLTypeName.STRING),
565-
* Field.of("post_abbr", LegacySQLTypeName.STRING)
566-
* };
563+
* Field[] fields =
564+
* new Field[] {
565+
* Field.of("name", LegacySQLTypeName.STRING),
566+
* Field.of("post_abbr", LegacySQLTypeName.STRING)
567+
* };
567568
* // Table schema definition
568569
* Schema schema = Schema.of(fields);
569-
* LoadJobConfiguration configuration = LoadJobConfiguration.builder(tableId, sourceUri)
570-
* .setFormatOptions(FormatOptions.json())
571-
* .setCreateDisposition(CreateDisposition.CREATE_IF_NEEDED)
572-
* .setSchema(schema)
573-
* .build();
570+
* LoadJobConfiguration configuration =
571+
* LoadJobConfiguration.builder(tableId, sourceUri)
572+
* .setFormatOptions(FormatOptions.json())
573+
* .setCreateDisposition(CreateDisposition.CREATE_IF_NEEDED)
574+
* .setSchema(schema)
575+
* .build();
574576
* // Load the table
575-
* Job remoteLoadJob = bigquery.create(JobInfo.of(configuration));
576-
* remoteLoadJob = remoteLoadJob.waitFor();
577+
* Job loadJob = bigquery.create(JobInfo.of(configuration));
578+
* loadJob = loadJob.waitFor();
577579
* // Check the table
578-
* System.out.println("State: " + remoteLoadJob.getStatus().getState());
580+
* System.out.println("State: " + loadJob.getStatus().getState());
579581
* return ((StandardTableDefinition) bigquery.getTable(tableId).getDefinition()).getNumRows();
580582
* }</pre>
581583
*
@@ -771,9 +773,25 @@ public int hashCode() {
771773
* String datasetName = "my_dataset_name";
772774
* String tableName = "my_table_name";
773775
* String newDescription = "new_description";
774-
* Table oldTable = bigquery.getTable(datasetName, tableName);
775-
* TableInfo tableInfo = oldTable.toBuilder().setDescription(newDescription).build();
776-
* Table newTable = bigquery.update(tableInfo);
776+
* Table beforeTable = bigquery.getTable(datasetName, tableName);
777+
* TableInfo tableInfo = beforeTable.toBuilder()
778+
* .setDescription(newDescription)
779+
* .build();
780+
* Table afterTable = bigquery.update(tableInfo);
781+
* }</pre>
782+
*
783+
* <p>Example of updating a table by changing its expiration.
784+
* <pre> {@code
785+
* String datasetName = "my_dataset_name";
786+
* String tableName = "my_table_name";
787+
* Table beforeTable = bigquery.getTable(datasetName, tableName);
788+
*
789+
* // Set table to expire 5 days from now.
790+
* long expirationMillis = DateTime.now().plusDays(5).getMillis();
791+
* TableInfo tableInfo = beforeTable.toBuilder()
792+
* .setExpirationTime(expirationMillis)
793+
* .build();
794+
* Table afterTable = bigquery.update(tableInfo);
777795
* }</pre>
778796
*
779797
* @throws BigQueryException upon failure
@@ -869,10 +887,12 @@ public int hashCode() {
869887
* Map<String, Object> recordsContent = new HashMap<>();
870888
* recordsContent.put("stringField", "Hello, World!");
871889
* rowContent.put("recordField", recordsContent);
872-
* InsertAllResponse response = bigquery.insertAll(InsertAllRequest.newBuilder(tableId)
873-
* .addRow("rowId", rowContent)
874-
* // More rows can be added in the same RPC by invoking .addRow() on the builder
875-
* .build());
890+
* InsertAllResponse response =
891+
* bigquery.insertAll(
892+
* InsertAllRequest.newBuilder(tableId)
893+
* .addRow("rowId", rowContent)
894+
* // More rows can be added in the same RPC by invoking .addRow() on the builder
895+
* .build());
876896
* if (response.hasErrors()) {
877897
* // If any of the insertions failed, this lets you inspect the errors
878898
* for (Entry<Long, List<BigQueryError>> entry : response.getInsertErrors().entrySet()) {
@@ -936,8 +956,7 @@ public int hashCode() {
936956
* String tableName = "my_table_name";
937957
* Schema schema = ...;
938958
* String field = "field";
939-
* TableResult tableData =
940-
* bigquery.listTableData(datasetName, tableName, schema);
959+
* TableResult tableData = bigquery.listTableData(datasetName, tableName, schema);
941960
* for (FieldValueList row : tableData.iterateAll()) {
942961
* row.get(field);
943962
* }
@@ -1083,10 +1102,8 @@ TableResult listTableData(
10831102
* <p>Example of running a query.
10841103
* <pre> {@code
10851104
* // BigQuery bigquery = BigQueryOptions.getDefaultInstance().getService();
1086-
* String query =
1087-
* "SELECT corpus FROM `bigquery-public-data.samples.shakespeare` GROUP BY corpus;";
1088-
* QueryJobConfiguration queryConfig =
1089-
* QueryJobConfiguration.newBuilder(query).build();
1105+
* String query = "SELECT corpus FROM `bigquery-public-data.samples.shakespeare` GROUP BY corpus;";
1106+
* QueryJobConfiguration queryConfig = QueryJobConfiguration.newBuilder(query).build();
10901107
*
10911108
* // Print the results.
10921109
* for (FieldValueList row : bigquery.query(queryConfig).iterateAll()) {
@@ -1145,9 +1162,7 @@ TableResult query(QueryJobConfiguration configuration, JobId jobId, JobOption...
11451162
* String csvData = "StringValue1\nStringValue2\n";
11461163
* TableId tableId = TableId.of(datasetName, tableName);
11471164
* WriteChannelConfiguration writeChannelConfiguration =
1148-
* WriteChannelConfiguration.newBuilder(tableId)
1149-
* .setFormatOptions(FormatOptions.csv())
1150-
* .build();
1165+
* WriteChannelConfiguration.newBuilder(tableId).setFormatOptions(FormatOptions.csv()).build();
11511166
* TableDataWriteChannel writer = bigquery.writer(writeChannelConfiguration);
11521167
* // Write data to writer
11531168
* try {
@@ -1170,9 +1185,7 @@ TableResult query(QueryJobConfiguration configuration, JobId jobId, JobOption...
11701185
* String location = "us";
11711186
* TableId tableId = TableId.of(datasetName, tableName);
11721187
* WriteChannelConfiguration writeChannelConfiguration =
1173-
* WriteChannelConfiguration.newBuilder(tableId)
1174-
* .setFormatOptions(FormatOptions.csv())
1175-
* .build();
1188+
* WriteChannelConfiguration.newBuilder(tableId).setFormatOptions(FormatOptions.csv()).build();
11761189
* // The location must be specified; other fields can be auto-detected.
11771190
* JobId jobId = JobId.newBuilder().setLocation(location).build();
11781191
* TableDataWriteChannel writer = bigquery.writer(jobId, writeChannelConfiguration);

‎trunk/google-cloud-examples/src/main/java/com/google/cloud/examples/bigquery/snippets/BigQuerySnippets.java‎

Lines changed: 29 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -59,6 +59,8 @@
5959
import com.google.cloud.bigquery.TableInfo;
6060
import com.google.cloud.bigquery.TableResult;
6161
import com.google.cloud.bigquery.WriteChannelConfiguration;
62+
import org.joda.time.DateTime;
63+
6264
import java.io.IOException;
6365
import java.io.OutputStream;
6466
import java.nio.ByteBuffer;
@@ -123,13 +125,35 @@ public Dataset updateDataset(String datasetName, String newDescription) {
123125
// [VARIABLE "my_dataset_name"]
124126
// [VARIABLE "my_table_name"]
125127
// [VARIABLE "new_description"]
126-
public Table updateTable(String datasetName, String tableName, String newDescription) {
128+
public Table updateTableDescription(String datasetName, String tableName, String newDescription) {
127129
// [START bigquery_update_table_description]
128-
Table oldTable = bigquery.getTable(datasetName, tableName);
129-
TableInfo tableInfo = oldTable.toBuilder().setDescription(newDescription).build();
130-
Table newTable = bigquery.update(tableInfo);
130+
Table beforeTable = bigquery.getTable(datasetName, tableName);
131+
TableInfo tableInfo = beforeTable.toBuilder()
132+
.setDescription(newDescription)
133+
.build();
134+
Table afterTable = bigquery.update(tableInfo);
131135
// [END bigquery_update_table_description]
132-
return newTable;
136+
return afterTable;
137+
}
138+
139+
/**
140+
* Example of updating a table by changing its expiration.
141+
*/
142+
// [TARGET update(TableInfo, TableOption...)]
143+
// [VARIABLE "my_dataset_name"]
144+
// [VARIABLE "my_table_name"]
145+
public Table updateTableExpiration(String datasetName, String tableName) {
146+
// [START bigquery_update_table_expiration]
147+
Table beforeTable = bigquery.getTable(datasetName, tableName);
148+
149+
// Set table to expire 5 days from now.
150+
long expirationMillis = DateTime.now().plusDays(5).getMillis();
151+
TableInfo tableInfo = beforeTable.toBuilder()
152+
.setExpirationTime(expirationMillis)
153+
.build();
154+
Table afterTable = bigquery.update(tableInfo);
155+
// [END bigquery_update_table_expiration]
156+
return afterTable;
133157
}
134158

135159
/**

‎trunk/google-cloud-examples/src/main/java/com/google/cloud/examples/bigquery/snippets/CloudSnippets.java‎

Lines changed: 85 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@
1717
package com.google.cloud.examples.bigquery.snippets;
1818

1919
import com.google.cloud.bigquery.BigQuery;
20+
import com.google.cloud.bigquery.CopyJobConfiguration;
2021
import com.google.cloud.bigquery.FieldValue;
2122
import com.google.cloud.bigquery.FieldValueList;
2223
import com.google.cloud.bigquery.FormatOptions;
@@ -27,9 +28,13 @@
2728
import com.google.cloud.bigquery.QueryParameterValue;
2829
import com.google.cloud.bigquery.StandardTableDefinition;
2930
import com.google.cloud.bigquery.TableId;
31+
32+
import java.util.Arrays;
3033
import java.util.concurrent.TimeoutException;
34+
3135
import org.joda.time.DateTime;
3236
import org.joda.time.DateTimeZone;
37+
import org.joda.time.Instant;
3338
import org.joda.time.format.DateTimeFormatter;
3439
import org.joda.time.format.ISODateTimeFormat;
3540

@@ -309,4 +314,84 @@ public void loadTableGcsParquet(String datasetName) throws InterruptedException
309314
System.out.printf("Loaded %d rows.\n", destinationTable.getNumRows());
310315
// [END bigquery_load_table_gcs_parquet]
311316
}
317+
318+
private void generateTableWithDdl(String datasetId, String tableId) throws InterruptedException {
319+
String sql = String.format(
320+
"CREATE TABLE %s.%s " +
321+
"AS " +
322+
"SELECT " +
323+
"2000 + CAST(18 * RAND() as INT64) AS year, " +
324+
"IF(RAND() > 0.5,\"foo\",\"bar\") AS token " +
325+
"FROM " +
326+
"UNNEST(GENERATE_ARRAY(0,5,1)) AS r", datasetId, tableId);
327+
Job job = bigquery.create(JobInfo.of(QueryJobConfiguration.newBuilder(sql).build()));
328+
job.waitFor();
329+
}
330+
331+
/**
332+
* Example of copying multiple tables to a destination.
333+
*/
334+
public void copyTables(String datasetId, String destinationTableId) throws InterruptedException {
335+
generateTableWithDdl(datasetId, "table1");
336+
generateTableWithDdl(datasetId, "table2");
337+
338+
// [START bigquery_copy_table_multiple_source]
339+
TableId destinationTable = TableId.of(datasetId, destinationTableId);
340+
CopyJobConfiguration configuration =
341+
CopyJobConfiguration.newBuilder(
342+
destinationTable,
343+
Arrays.asList(
344+
TableId.of(datasetId, "table1"),
345+
TableId.of(datasetId, "table2")))
346+
.build();
347+
348+
// Copy the tables.
349+
Job job = bigquery.create(JobInfo.of(configuration));
350+
job = job.waitFor();
351+
352+
// Check the table
353+
StandardTableDefinition table = bigquery.getTable(destinationTable).getDefinition();
354+
System.out.println("State: " + job.getStatus().getState());
355+
System.out.printf("Copied %d rows.\n", table.getNumRows());
356+
// [END bigquery_copy_table_multiple_source]
357+
}
358+
359+
/**
360+
* Example of undeleting a table.
361+
*/
362+
public void undeleteTable(String datasetId) throws InterruptedException {
363+
generateTableWithDdl(datasetId, "oops_undelete_me");
364+
365+
// [START bigquery_undelete_table]
366+
// String datasetId = "my_dataset";
367+
String tableId = "oops_undelete_me";
368+
369+
// Record the current time. We'll use this as the snapshot time
370+
// for recovering the table.
371+
long snapTime = Instant.now().getMillis();
372+
373+
// "Accidentally" delete the table.
374+
bigquery.delete(TableId.of(datasetId, tableId));
375+
376+
// Construct the restore-from tableID using a snapshot decorator.
377+
String snapshotTableId = String.format("%s@%d", tableId, snapTime);
378+
// Choose a new table ID for the recovered table data.
379+
String recoverTableId = String.format("%s_recovered", tableId);
380+
381+
// Construct and run a copy job.
382+
CopyJobConfiguration configuration =
383+
CopyJobConfiguration.newBuilder(
384+
TableId.of(datasetId, recoverTableId),
385+
TableId.of(datasetId, snapshotTableId))
386+
.build();
387+
Job job = bigquery.create(JobInfo.of(configuration));
388+
job = job.waitFor();
389+
390+
// Check the table
391+
StandardTableDefinition table = bigquery.getTable(
392+
TableId.of(datasetId, recoverTableId)).getDefinition();
393+
System.out.println("State: " + job.getStatus().getState());
394+
System.out.printf("Recovered %d rows.\n", table.getNumRows());
395+
// [END bigquery_undelete_table]
396+
}
312397
}

‎trunk/google-cloud-examples/src/test/java/com/google/cloud/examples/bigquery/snippets/ITBigQuerySnippets.java‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -123,7 +123,9 @@ public void testCreateGetAndDeleteTable() throws InterruptedException {
123123
TableId tableId = TableId.of(bigquery.getOptions().getProjectId(), DATASET, tableName);
124124
assertEquals(
125125
tableId, bigquerySnippets.getTable(tableId.getDataset(), tableId.getTable()).getTableId());
126-
assertNotNull(bigquerySnippets.updateTable(DATASET, tableName, "new description"));
126+
assertNotNull(bigquerySnippets.updateTableDescription(DATASET, tableName, "new description"));
127+
table = bigquerySnippets.updateTableExpiration(DATASET, tableName);
128+
assertNotNull(table.getExpirationTime());
127129
assertEquals(
128130
"new description",
129131
bigquerySnippets

‎trunk/google-cloud-examples/src/test/java/com/google/cloud/examples/bigquery/snippets/ITCloudSnippets.java‎

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -127,4 +127,18 @@ public void testLoadTableGcsParquet() throws InterruptedException {
127127
assertTrue(got.contains("DONE"));
128128
assertTrue(got.contains("Loaded 50 rows."));
129129
}
130+
131+
@Test
132+
public void testCopyTables() throws InterruptedException {
133+
cloudSnippets.copyTables(DATASET, "copytablesdestination");
134+
String got = bout.toString();
135+
assertTrue(got.contains("DONE"));
136+
}
137+
138+
@Test
139+
public void testUndeleteTable() throws InterruptedException {
140+
cloudSnippets.undeleteTable(DATASET);
141+
String got = bout.toString();
142+
assertTrue(got.contains("DONE"));
143+
}
130144
}

0 commit comments

Comments
 (0)