Skip to content

PLUGIN-557: BigQuerySink fix for upsert operation in existing table but in different project #555

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
CuriousVini merged 1 commit into from
Feb 26, 2021
Merged

PLUGIN-557: BigQuerySink fix for upsert operation in existing table but in different project #555

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions src/main/java/io/cdap/plugin/gcp/bigquery/sink/BigQuerySink.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -231,7 +231,7 @@ private void configureBigQuerySink() {
*/
private void configureTable(Schema schema) {
AbstractBigQuerySinkConfig config = getConfig();
Table table = BigQueryUtil.getBigQueryTable(config.getProject(), config.getDataset(),
Table table = BigQueryUtil.getBigQueryTable(config.getDatasetProject(), config.getDataset(),
Copy link
Copy Markdown
Member

@CuriousVini CuriousVini Feb 18, 2021

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

what if config.getProject() is provided? In that case we will rely on config.getDatasetProject()?

Copy link
Copy Markdown
Contributor Author

@flakrimjusufi flakrimjusufi Feb 22, 2021 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

If config.getProject() and config.getDatasetProject() are provided, then datasetProject will get priority.

If datasetProject is not defined, then config.getProject() will be set up in configuration.
That's how it is defined in AbstractBigQuerySinkConfig

google-cloud/src/main/java/io/cdap/plugin/gcp/bigquery/sink/AbstractBigQuerySinkConfig.java

Lines 114 to 120 in 86f4b91

@Nullable
public String getDatasetProject() {
if (GCPConfig.AUTO_DETECT.equalsIgnoreCase(datasetProject)) {
return ServiceOptions.getDefaultProjectId();
}
return Strings.isNullOrEmpty(datasetProject) ? getProject() : datasetProject;
}

config.getTable(),
config.getServiceAccount(),
config.isServiceAccountFilePath());
Expand All @@ -253,7 +253,7 @@ private void validateConfiguredSchema(Schema schema, FailureCollector collector)
}

String tableName = config.getTable();
Table table = BigQueryUtil.getBigQueryTable(config.getProject(), config.getDataset(), tableName,
Table table = BigQueryUtil.getBigQueryTable(config.getDatasetProject(), config.getDataset(), tableName,
config.getServiceAccount(), config.isServiceAccountFilePath(),
collector);

Expand Down