-
Notifications
You must be signed in to change notification settings - Fork 1.2k
fix(bigquery-jdbc): fix setting null value with setObject #14113
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.
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
Open
Neenu1995
wants to merge
1
commit into
main
Choose a base branch
from
fix-null
base: main
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
+74
−14
Open
Changes from all commits
Commits
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -34,6 +34,7 @@ | |
| import com.google.cloud.bigquery.storage.v1.TableName; | ||
| import com.google.gson.Gson; | ||
| import com.google.gson.JsonArray; | ||
| import com.google.gson.JsonNull; | ||
| import com.google.gson.JsonObject; | ||
| import com.google.protobuf.Descriptors.DescriptorValidationException; | ||
| import java.io.IOException; | ||
|
|
@@ -319,10 +320,9 @@ public int[] executeBatch() throws SQLException { | |
| if (useWriteAPI()) { | ||
| try (BigQueryWriteClient writeClient = this.connection.getBigQueryWriteClient()) { | ||
| LOG.info("Using Write API for bulk INSERT operation."); | ||
| ArrayList<BigQueryJdbcParameter> currentParameterList = this.batchParameters.peek(); | ||
| if (this.insertSchema == null && this.insertTableName == null) { | ||
| QueryStatistics insertJobQueryStatistics = | ||
| getQueryStatistics(getWriteBatchJobConfiguration(currentParameterList)); | ||
| getQueryStatistics(getJobConfig(this.currentQuery).build()); | ||
| setInsertMetadata(insertJobQueryStatistics); | ||
| } | ||
|
|
||
|
|
@@ -392,7 +392,9 @@ private long bulkInsertWithWriteAPI(BigQueryWriteClient bigQueryWriteClient) | |
| JsonObject rowObject = new JsonObject(); | ||
| for (int j = 0; j < parameterList.size(); j++) { | ||
| BigQueryJdbcParameter parameter = parameterList.get(j); | ||
| if (parameter.getSqlType() == StandardSQLTypeName.STRING) { | ||
| if (parameter.getValue() == null) { | ||
| rowObject.add(fieldLists.get(j).getName(), JsonNull.INSTANCE); | ||
| } else if (parameter.getSqlType() == StandardSQLTypeName.STRING) { | ||
| rowObject.addProperty(fieldLists.get(j).getName(), parameter.getValue().toString()); | ||
| } else { | ||
| rowObject.addProperty(fieldLists.get(j).getName(), gson.toJson(parameter.getValue())); | ||
|
|
@@ -449,17 +451,6 @@ private void setInsertMetadata(QueryStatistics statistics) throws SQLException { | |
| this.insertTableName, this.insertSchema.toString()); | ||
| } | ||
|
|
||
| QueryJobConfiguration getWriteBatchJobConfiguration( | ||
| ArrayList<BigQueryJdbcParameter> currentParameterList) throws SQLException { | ||
| LOG.finer("++enter++"); | ||
| BigQueryParameterHandler batchHandler = | ||
| new BigQueryParameterHandler(this.parameterCount, currentParameterList); | ||
| QueryJobConfiguration.Builder jobConfiguration = getJobConfig(this.currentQuery); | ||
| jobConfiguration.setParameterMode("POSITIONAL"); | ||
| jobConfiguration = batchHandler.configureParameters(jobConfiguration); | ||
| return jobConfiguration.build(); | ||
| } | ||
|
|
||
| QueryJobConfiguration getStandardBatchJobConfiguration(String query) throws SQLException { | ||
|
Comment on lines
453
to
454
Contributor
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Please restore the QueryJobConfiguration getWriteBatchJobConfiguration(
ArrayList<BigQueryJdbcParameter> currentParameterList) throws SQLException {
LOG.finer("++enter++");
BigQueryParameterHandler batchHandler =
new BigQueryParameterHandler(this.parameterCount, currentParameterList);
QueryJobConfiguration.Builder jobConfiguration = getJobConfig(this.currentQuery);
jobConfiguration.setParameterMode("POSITIONAL");
jobConfiguration = batchHandler.configureParameters(jobConfiguration);
return jobConfiguration.build();
}
QueryJobConfiguration getStandardBatchJobConfiguration(String query) throws SQLException { |
||
| LOG.finer("++enter++"); | ||
| QueryJobConfiguration.Builder jobConfiguration = getJobConfig(query); | ||
|
|
||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Bypassing parameter binding for the dry run query by using
getJobConfig(this.currentQuery).build()will causeexecuteBatch()to fail in production for any parameterized query (e.g.,INSERT INTO table (col) VALUES (?)).BigQuery requires all parameters to be bound or declared even during dry runs; otherwise, the backend will throw a
BigQueryExceptionindicating that a query parameter or placeholder was not found.The unit test
testExecuteBatchNullWithWriteAPIdid not catch this because it mocksbigQuery.create(any(JobInfo.class))to return a mocked job and statistics directly, bypassing the actual BigQuery dry run validation.To fix this, we should retain the parameter binding for the dry run. If there was an issue with handling
nullvalues inBigQueryParameterHandler, we should address that specific issue withinBigQueryParameterHandlerorgetWriteBatchJobConfigurationrather than removing parameter binding entirely.