Unify uses of job id token and job uuid.

apache · May 3, 2017 · 72b495f · 72b495f
1 parent 5ccd968
commit 72b495f
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 12 deletions.
diff --git a/...gle-cloud-platform/src/main/java/org/apache/beam/sdk/io/gcp/bigquery/BigQueryHelpers.java b/...gle-cloud-platform/src/main/java/org/apache/beam/sdk/io/gcp/bigquery/BigQueryHelpers.java
@@ -298,15 +298,11 @@ public TableReference apply(String from) {
   }
 
   static String createJobIdToken(String jobName, String stepUuid) {
-    return "beam_job_" + createJobUuid(jobName, stepUuid);
-  }
-
-  static String createJobUuid(String jobName, String stepUuid) {
-    return stepUuid + "_" + jobName.replaceAll("-", "");
+    return String.format("beam_job_%s_%s", stepUuid, jobName.replaceAll("-", ""));
   }
 
   static String getExtractJobId(String jobIdToken) {
-    return jobIdToken + "-extract";
+    return String.format("%s-extract", jobIdToken);
   }
 
   static TableReference createTempTableReference(String projectId, String jobUuid) {

diff --git a/...cloud-platform/src/main/java/org/apache/beam/sdk/io/gcp/bigquery/BigQueryQuerySource.java b/...cloud-platform/src/main/java/org/apache/beam/sdk/io/gcp/bigquery/BigQueryQuerySource.java
@@ -20,7 +20,6 @@
 
 import static com.google.common.base.Preconditions.checkNotNull;
 import static org.apache.beam.sdk.io.gcp.bigquery.BigQueryHelpers.createJobIdToken;
-import static org.apache.beam.sdk.io.gcp.bigquery.BigQueryHelpers.createJobUuid;
 import static org.apache.beam.sdk.io.gcp.bigquery.BigQueryHelpers.createTempTableReference;
 
 import com.google.api.services.bigquery.model.Job;
@@ -112,7 +111,7 @@ protected TableReference getTableToExtract(BigQueryOptions bqOptions)
 
     // 2. Create the temporary dataset in the query location.
     TableReference tableToExtract = createTempTableReference(
-        bqOptions.getProject(), createJobUuid(bqOptions.getJobName(), stepUuid));
+        bqOptions.getProject(), createJobIdToken(bqOptions.getJobName(), stepUuid));
 
     tableService.createDataset(
         tableToExtract.getProjectId(),
@@ -133,7 +132,7 @@ protected TableReference getTableToExtract(BigQueryOptions bqOptions)
   @Override
   protected void cleanupTempResource(BigQueryOptions bqOptions) throws Exception {
     TableReference tableToRemove = createTempTableReference(
-        bqOptions.getProject(), createJobUuid(bqOptions.getJobName(), stepUuid));
+        bqOptions.getProject(), createJobIdToken(bqOptions.getJobName(), stepUuid));
 
     DatasetService tableService = bqServices.getDatasetService(bqOptions);
     tableService.deleteTable(tableToRemove);

diff --git a/...ogle-cloud-platform/src/test/java/org/apache/beam/sdk/io/gcp/bigquery/BigQueryIOTest.java b/...ogle-cloud-platform/src/test/java/org/apache/beam/sdk/io/gcp/bigquery/BigQueryIOTest.java
@@ -20,7 +20,7 @@
 import static com.google.common.base.Preconditions.checkArgument;
 import static com.google.common.base.Preconditions.checkNotNull;
 import static com.google.common.base.Preconditions.checkState;
-import static org.apache.beam.sdk.io.gcp.bigquery.BigQueryHelpers.createJobUuid;
+import static org.apache.beam.sdk.io.gcp.bigquery.BigQueryHelpers.createJobIdToken;
 import static org.apache.beam.sdk.io.gcp.bigquery.BigQueryHelpers.createTempTableReference;
 import static org.apache.beam.sdk.io.gcp.bigquery.BigQueryHelpers.toJsonString;
 import static org.apache.beam.sdk.transforms.display.DisplayDataMatchers.hasDisplayItem;
@@ -1322,7 +1322,7 @@ public void testBigQueryQuerySourceInitSplit() throws Exception {
     String stepUuid = "testStepUuid";
 
     TableReference tempTableReference = createTempTableReference(
-        bqOptions.getProject(), createJobUuid(bqOptions.getJobName(), stepUuid));
+        bqOptions.getProject(), createJobIdToken(bqOptions.getJobName(), stepUuid));
     fakeDatasetService.createDataset(
         bqOptions.getProject(), tempTableReference.getDatasetId(), "", "");
     fakeDatasetService.createTable(new Table()
@@ -1397,7 +1397,7 @@ public void testBigQueryNoTableQuerySourceInitSplit() throws Exception {
     String stepUuid = "testStepUuid";
 
     TableReference tempTableReference = createTempTableReference(
-        bqOptions.getProject(), createJobUuid(bqOptions.getJobName(), stepUuid));
+        bqOptions.getProject(), createJobIdToken(bqOptions.getJobName(), stepUuid));
     List<TableRow> expected = ImmutableList.of(
         new TableRow().set("name", "a").set("number", 1L),
         new TableRow().set("name", "b").set("number", 2L),