Skip to content

Use precision and scale from BQ numeric/bignumeric field instead of assuming max value #1265

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

Open
wants to merge 1 commit into
base: develop
Choose a base branch
from
Open

Use precision and scale from BQ numeric/bignumeric field instead of assuming max value #1265

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
9 changes: 1 addition & 8 deletions src/main/java/io/cdap/plugin/gcp/bigquery/util/BigQueryUtil.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,15 +36,13 @@
import com.google.common.collect.ImmutableSet;
import io.cdap.cdap.api.data.schema.Schema;
import io.cdap.cdap.etl.api.FailureCollector;
import io.cdap.cdap.etl.api.action.SettableArguments;
import io.cdap.cdap.etl.api.validation.InvalidConfigPropertyException;
import io.cdap.cdap.etl.api.validation.InvalidStageException;
import io.cdap.cdap.etl.api.validation.ValidationFailure;
import io.cdap.plugin.gcp.bigquery.sink.BigQuerySink;
import io.cdap.plugin.gcp.bigquery.source.BigQuerySource;
import io.cdap.plugin.gcp.bigquery.source.BigQuerySourceConfig;
import io.cdap.plugin.gcp.bigquery.util.BigQueryTypeSize.BigNumeric;
import io.cdap.plugin.gcp.bigquery.util.BigQueryTypeSize.Numeric;
import io.cdap.plugin.gcp.common.GCPConfig;
import io.cdap.plugin.gcp.common.GCPUtils;
import io.cdap.plugin.gcp.gcs.GCSPath;
Expand Down Expand Up @@ -307,13 +305,8 @@ public static Schema convertFieldType(Field field, @Nullable FailureCollector co
case TIMESTAMP:
return Schema.of(Schema.LogicalType.TIMESTAMP_MICROS);
case NUMERIC:
// bigquery has Numeric.PRECISION digits of precision and Numeric.SCALE digits of scale for NUMERIC.
// https://cloud.google.com/bigquery/docs/reference/standard-sql/data-types#decimal_types
return Schema.decimalOf(Numeric.PRECISION, Numeric.SCALE);
case BIGNUMERIC:
// bigquery has BigNumeric.PRECISION digits of precision and BigNumeric.SCALE digits of scale for BIGNUMERIC.
// https://cloud.google.com/bigquery/docs/reference/standard-sql/data-types#decimal_types
return Schema.decimalOf(BigNumeric.PRECISION, BigNumeric.SCALE);
return Schema.decimalOf(Math.toIntExact(field.getPrecision()), Math.toIntExact(field.getScale()));
case STRUCT:
FieldList fields = field.getSubFields();
List<Schema.Field> schemaFields = new ArrayList<>();
Expand Down