Skip to content

Commit d138821

Browse files
ajaaymajaaym
authored
---
yaml --- r: 14267 b: refs/heads/autosynth-video-intelligence c: d122744 h: refs/heads/master i: 14265: 5057b4e 14263: 6cfb5e1
1 parent c6ad4d3 commit d138821

9 files changed

Lines changed: 96 additions & 16 deletions

File tree

‎[refs]‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -117,7 +117,7 @@ refs/heads/autosynth-container: f6384095f50b31bfc8208542a49181e158d3681c
117117
refs/heads/autosynth-dataproc: bc74a8841bc1693d7945d991d15979df550b1fd1
118118
refs/heads/autosynth-monitoring: e67db7395a868e5f6ecc3476eb4a91c47abd4234
119119
refs/heads/autosynth-pubsub: fd363d13793a853214eb8193c922b28c54e7a6b3
120-
refs/heads/autosynth-video-intelligence: f3d070350ae78d030012ec258ddfe32c7eb27c9d
120+
refs/heads/autosynth-video-intelligence: d122744fa3d43ce2977f3417fa6b5d6e0c2fa24e
121121
refs/heads/autosynth-vision: d758c43ba2ef4f4f7ad07b722617cb39fe3f29db
122122
refs/heads/spanner: 54a5e197bfe0a004e13c190427f46c3413ab572d
123123
refs/tags/v0.68.0: 9cc799fcf68c82ab431d425fefa58ef615ce8e5b

‎branches/autosynth-video-intelligence/google-cloud-clients/google-cloud-bigquery/src/main/java/com/google/cloud/bigquery/CopyJobConfiguration.java‎

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@
2121
import com.google.api.services.bigquery.model.JobConfigurationTableCopy;
2222
import com.google.common.base.Function;
2323
import com.google.common.base.MoreObjects.ToStringHelper;
24+
import com.google.common.base.Strings;
2425
import com.google.common.collect.ImmutableList;
2526
import com.google.common.collect.Lists;
2627
import java.util.List;
@@ -216,10 +217,15 @@ CopyJobConfiguration setProjectId(final String projectId) {
216217
new Function<TableId, TableId>() {
217218
@Override
218219
public TableId apply(TableId tableId) {
219-
return tableId.setProjectId(projectId);
220+
if (Strings.isNullOrEmpty(tableId.getProject())) {
221+
return tableId.setProjectId(projectId);
222+
}
223+
return tableId;
220224
}
221225
}));
222-
builder.setDestinationTable(getDestinationTable().setProjectId(projectId));
226+
if (Strings.isNullOrEmpty(getDestinationTable().getProject())) {
227+
builder.setDestinationTable(getDestinationTable().setProjectId(projectId));
228+
}
223229
return builder.build();
224230
}
225231

‎branches/autosynth-video-intelligence/google-cloud-clients/google-cloud-bigquery/src/main/java/com/google/cloud/bigquery/ExtractJobConfiguration.java‎

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@
2020

2121
import com.google.api.services.bigquery.model.JobConfigurationExtract;
2222
import com.google.common.base.MoreObjects.ToStringHelper;
23+
import com.google.common.base.Strings;
2324
import com.google.common.collect.ImmutableList;
2425
import java.util.List;
2526
import java.util.Objects;
@@ -215,7 +216,10 @@ public int hashCode() {
215216

216217
@Override
217218
ExtractJobConfiguration setProjectId(String projectId) {
218-
return toBuilder().setSourceTable(getSourceTable().setProjectId(projectId)).build();
219+
if (Strings.isNullOrEmpty(getSourceTable().getProject())) {
220+
return toBuilder().setSourceTable(getSourceTable().setProjectId(projectId)).build();
221+
}
222+
return this;
219223
}
220224

221225
@Override

‎branches/autosynth-video-intelligence/google-cloud-clients/google-cloud-bigquery/src/main/java/com/google/cloud/bigquery/LoadJobConfiguration.java‎

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@
2020

2121
import com.google.api.services.bigquery.model.JobConfigurationLoad;
2222
import com.google.common.base.MoreObjects.ToStringHelper;
23+
import com.google.common.base.Strings;
2324
import com.google.common.collect.ImmutableList;
2425
import com.google.common.primitives.Ints;
2526
import java.util.List;
@@ -398,7 +399,10 @@ public int hashCode() {
398399

399400
@Override
400401
LoadJobConfiguration setProjectId(String projectId) {
401-
return toBuilder().setDestinationTable(getDestinationTable().setProjectId(projectId)).build();
402+
if (Strings.isNullOrEmpty(getDestinationTable().getProject())) {
403+
return toBuilder().setDestinationTable(getDestinationTable().setProjectId(projectId)).build();
404+
}
405+
return this;
402406
}
403407

404408
@Override

‎branches/autosynth-video-intelligence/google-cloud-clients/google-cloud-bigquery/src/main/java/com/google/cloud/bigquery/QueryJobConfiguration.java‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,7 @@
2626
import com.google.cloud.bigquery.JobInfo.WriteDisposition;
2727
import com.google.common.base.Function;
2828
import com.google.common.base.MoreObjects.ToStringHelper;
29+
import com.google.common.base.Strings;
2930
import com.google.common.collect.ImmutableList;
3031
import com.google.common.collect.ImmutableMap;
3132
import com.google.common.collect.Iterables;
@@ -769,7 +770,8 @@ public int hashCode() {
769770
@Override
770771
QueryJobConfiguration setProjectId(String projectId) {
771772
Builder builder = toBuilder();
772-
if (getDestinationTable() != null) {
773+
if (getDestinationTable() != null
774+
&& Strings.isNullOrEmpty(getDestinationTable().getProject())) {
773775
builder.setDestinationTable(getDestinationTable().setProjectId(projectId));
774776
}
775777
if (getDefaultDataset() != null) {

‎branches/autosynth-video-intelligence/google-cloud-clients/google-cloud-bigquery/src/test/java/com/google/cloud/bigquery/CopyJobConfigurationTest.java‎

Lines changed: 30 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -22,12 +22,15 @@
2222

2323
import com.google.cloud.bigquery.JobInfo.CreateDisposition;
2424
import com.google.cloud.bigquery.JobInfo.WriteDisposition;
25+
import com.google.common.base.Function;
2526
import com.google.common.collect.ImmutableList;
27+
import com.google.common.collect.Lists;
2628
import java.util.List;
2729
import org.junit.Test;
2830

2931
public class CopyJobConfigurationTest {
3032

33+
private static final String TEST_PROJECT_ID = "test-project-id";
3134
private static final TableId SOURCE_TABLE = TableId.of("dataset", "sourceTable");
3235
private static final List<TableId> SOURCE_TABLES =
3336
ImmutableList.of(
@@ -115,10 +118,34 @@ public void testToPbAndFromPb() {
115118

116119
@Test
117120
public void testSetProjectId() {
118-
CopyJobConfiguration configuration = COPY_JOB_CONFIGURATION_MULTIPLE_TABLES.setProjectId("p");
119-
assertEquals("p", configuration.getDestinationTable().getProject());
121+
CopyJobConfiguration configuration =
122+
COPY_JOB_CONFIGURATION_MULTIPLE_TABLES.setProjectId(TEST_PROJECT_ID);
123+
assertEquals(TEST_PROJECT_ID, configuration.getDestinationTable().getProject());
120124
for (TableId sourceTable : configuration.getSourceTables()) {
121-
assertEquals("p", sourceTable.getProject());
125+
assertEquals(TEST_PROJECT_ID, sourceTable.getProject());
126+
}
127+
}
128+
129+
@Test
130+
public void testSetProjectIdDoNotOverride() {
131+
CopyJobConfiguration configuration =
132+
COPY_JOB_CONFIGURATION_MULTIPLE_TABLES
133+
.toBuilder()
134+
.setSourceTables(
135+
Lists.transform(
136+
SOURCE_TABLES,
137+
new Function<TableId, TableId>() {
138+
@Override
139+
public TableId apply(TableId tableId) {
140+
return tableId.setProjectId(TEST_PROJECT_ID);
141+
}
142+
}))
143+
.setDestinationTable(DESTINATION_TABLE.setProjectId(TEST_PROJECT_ID))
144+
.build()
145+
.setProjectId("do-not-update");
146+
assertEquals(TEST_PROJECT_ID, configuration.getDestinationTable().getProject());
147+
for (TableId sourceTable : configuration.getSourceTables()) {
148+
assertEquals(TEST_PROJECT_ID, sourceTable.getProject());
122149
}
123150
}
124151

‎branches/autosynth-video-intelligence/google-cloud-clients/google-cloud-bigquery/src/test/java/com/google/cloud/bigquery/ExtractJobConfigurationTest.java‎

Lines changed: 14 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,7 @@
2626

2727
public class ExtractJobConfigurationTest {
2828

29+
private static final String TEST_PROJECT_ID = "test-project-id";
2930
private static final List<String> DESTINATION_URIS = ImmutableList.of("uri1", "uri2");
3031
private static final String DESTINATION_URI = "uri1";
3132
private static final TableId TABLE_ID = TableId.of("dataset", "table");
@@ -118,8 +119,19 @@ public void testToPbAndFromPb() {
118119

119120
@Test
120121
public void testSetProjectId() {
121-
ExtractJobConfiguration configuration = EXTRACT_CONFIGURATION.setProjectId("p");
122-
assertEquals("p", configuration.getSourceTable().getProject());
122+
ExtractJobConfiguration configuration = EXTRACT_CONFIGURATION.setProjectId(TEST_PROJECT_ID);
123+
assertEquals(TEST_PROJECT_ID, configuration.getSourceTable().getProject());
124+
}
125+
126+
@Test
127+
public void testSetProjectIdDoNotOverride() {
128+
ExtractJobConfiguration configuration =
129+
EXTRACT_CONFIGURATION
130+
.toBuilder()
131+
.setSourceTable(TABLE_ID.setProjectId(TEST_PROJECT_ID))
132+
.build()
133+
.setProjectId("do-not-update");
134+
assertEquals(TEST_PROJECT_ID, configuration.getSourceTable().getProject());
123135
}
124136

125137
@Test

‎branches/autosynth-video-intelligence/google-cloud-clients/google-cloud-bigquery/src/test/java/com/google/cloud/bigquery/LoadJobConfigurationTest.java‎

Lines changed: 14 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,7 @@
2929

3030
public class LoadJobConfigurationTest {
3131

32+
private static final String TEST_PROJECT_ID = "test-project-id";
3233
private static final CsvOptions CSV_OPTIONS =
3334
CsvOptions.newBuilder()
3435
.setAllowJaggedRows(true)
@@ -146,8 +147,19 @@ public void testToPbAndFromPb() {
146147

147148
@Test
148149
public void testSetProjectId() {
149-
LoadConfiguration configuration = LOAD_CONFIGURATION_CSV.setProjectId("p");
150-
assertEquals("p", configuration.getDestinationTable().getProject());
150+
LoadConfiguration configuration = LOAD_CONFIGURATION_CSV.setProjectId(TEST_PROJECT_ID);
151+
assertEquals(TEST_PROJECT_ID, configuration.getDestinationTable().getProject());
152+
}
153+
154+
@Test
155+
public void testSetProjectIdDoNotOverride() {
156+
LoadConfiguration configuration =
157+
LOAD_CONFIGURATION_CSV
158+
.toBuilder()
159+
.setDestinationTable(TABLE_ID.setProjectId(TEST_PROJECT_ID))
160+
.build()
161+
.setProjectId("do-not-update");
162+
assertEquals(TEST_PROJECT_ID, configuration.getDestinationTable().getProject());
151163
}
152164

153165
@Test

‎branches/autosynth-video-intelligence/google-cloud-clients/google-cloud-bigquery/src/test/java/com/google/cloud/bigquery/QueryJobConfigurationTest.java‎

Lines changed: 16 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,7 @@
3333

3434
public class QueryJobConfigurationTest {
3535

36+
private static final String TEST_PROJECT_ID = "test-project-id";
3637
private static final String QUERY = "BigQuery SQL";
3738
private static final DatasetId DATASET_ID = DatasetId.of("dataset");
3839
private static final TableId TABLE_ID = TableId.of("dataset", "table");
@@ -140,9 +141,21 @@ public void testToPbAndFromPb() {
140141

141142
@Test
142143
public void testSetProjectId() {
143-
QueryJobConfiguration configuration = QUERY_JOB_CONFIGURATION.setProjectId("p");
144-
assertEquals("p", configuration.getDefaultDataset().getProject());
145-
assertEquals("p", configuration.getDestinationTable().getProject());
144+
QueryJobConfiguration configuration = QUERY_JOB_CONFIGURATION.setProjectId(TEST_PROJECT_ID);
145+
assertEquals(TEST_PROJECT_ID, configuration.getDefaultDataset().getProject());
146+
assertEquals(TEST_PROJECT_ID, configuration.getDestinationTable().getProject());
147+
}
148+
149+
@Test
150+
public void testSetProjectIdDoNotOverride() {
151+
QueryJobConfiguration configuration =
152+
QUERY_JOB_CONFIGURATION
153+
.toBuilder()
154+
.setDestinationTable(TABLE_ID.setProjectId(TEST_PROJECT_ID))
155+
.build()
156+
.setProjectId("update-only-on-dataset");
157+
assertEquals("update-only-on-dataset", configuration.getDefaultDataset().getProject());
158+
assertEquals(TEST_PROJECT_ID, configuration.getDestinationTable().getProject());
146159
}
147160

148161
@Test

0 commit comments

Comments
 (0)