-
Notifications
You must be signed in to change notification settings - Fork 4.3k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Support DECIMAL logical type in python sdk
* migrate FixedPrecisionNumeric jdbclogicaltype to portable logical type * Support DECIMAL type in python sdk xlang jdbc transform * Support standard logical type with argument in java sdk * proto support logical type's argument type in java sdk. Support of logical type's argument value is still pending * Implement BigIntegerCoder and DecimalCoder in python sdk
- Loading branch information
Showing
13 changed files
with
449 additions
and
113 deletions.
There are no files selected for viewing
This file contains 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
94 changes: 94 additions & 0 deletions
94
...va/core/src/main/java/org/apache/beam/sdk/schemas/logicaltypes/FixedPrecisionNumeric.java
This file contains 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 |
---|---|---|
@@ -0,0 +1,94 @@ | ||
/* | ||
* Licensed to the Apache Software Foundation (ASF) under one | ||
* or more contributor license agreements. See the NOTICE file | ||
* distributed with this work for additional information | ||
* regarding copyright ownership. The ASF licenses this file | ||
* to you under the Apache License, Version 2.0 (the | ||
* "License"); you may not use this file except in compliance | ||
* with the License. You may obtain a copy of the License at | ||
* | ||
* http://www.apache.org/licenses/LICENSE-2.0 | ||
* | ||
* Unless required by applicable law or agreed to in writing, software | ||
* distributed under the License is distributed on an "AS IS" BASIS, | ||
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
* See the License for the specific language governing permissions and | ||
* limitations under the License. | ||
*/ | ||
package org.apache.beam.sdk.schemas.logicaltypes; | ||
|
||
import static org.apache.beam.vendor.guava.v26_0_jre.com.google.common.base.MoreObjects.firstNonNull; | ||
import static org.apache.beam.vendor.guava.v26_0_jre.com.google.common.base.Preconditions.checkArgument; | ||
|
||
import java.math.BigDecimal; | ||
import java.math.MathContext; | ||
import org.apache.beam.sdk.schemas.Schema; | ||
import org.apache.beam.sdk.schemas.Schema.FieldType; | ||
import org.apache.beam.sdk.values.Row; | ||
|
||
/** Fixed precision numeric types used to represent jdbc NUMERIC and DECIMAL types. */ | ||
public class FixedPrecisionNumeric extends PassThroughLogicalType<BigDecimal> { | ||
public static final String IDENTIFIER = "beam:logical_type:fixed_decimal:v1"; | ||
|
||
// TODO(https://github.com/apache/beam/issues/19817) implement beam:logical_type:decimal:v1 as | ||
// CoderLogicalType (once CoderLogicalType is implemented). | ||
/** | ||
* Identifier of the unspecified precision numeric type. It corresponds to Java SDK's {@link | ||
* FieldType#DECIMAL}. It is the underlying representation type of FixedPrecisionNumeric logical | ||
* type in order to be compatible with existing Java field types. | ||
*/ | ||
public static final String BASE_IDENTIFIER = "beam:logical_type:decimal:v1"; | ||
|
||
private final int precision; | ||
private final int scale; | ||
|
||
/** | ||
* Create a FixedPrecisionNumeric instance with specified precision and scale. ``precision=-1`` | ||
* indicates unspecified precision. | ||
*/ | ||
public static FixedPrecisionNumeric of(int precision, int scale) { | ||
Schema schema = Schema.builder().addInt32Field("precision").addInt32Field("scale").build(); | ||
return new FixedPrecisionNumeric(schema, precision, scale); | ||
} | ||
|
||
/** Create a FixedPrecisionNumeric instance with specified scale and unspecified precision. */ | ||
public static FixedPrecisionNumeric of(int scale) { | ||
return of(-1, scale); | ||
} | ||
|
||
/** Create a FixedPrecisionNumeric instance with specified argument row. */ | ||
public static FixedPrecisionNumeric of(Row row) { | ||
final Integer precision = row.getInt32("precision"); | ||
final Integer scale = row.getInt32("scale"); | ||
checkArgument( | ||
precision != null && scale != null, | ||
"precision and scale cannot be null for FixedPrecisionNumeric arguments."); | ||
// firstNonNull is used to cast precision and scale to @NonNull input | ||
return of(firstNonNull(precision, -1), firstNonNull(scale, 0)); | ||
} | ||
|
||
private FixedPrecisionNumeric(Schema schema, int precision, int scale) { | ||
super( | ||
IDENTIFIER, | ||
FieldType.row(schema), | ||
Row.withSchema(schema).addValues(precision, scale).build(), | ||
FieldType.DECIMAL); | ||
this.precision = precision; | ||
this.scale = scale; | ||
} | ||
|
||
@Override | ||
public BigDecimal toInputType(BigDecimal base) { | ||
checkArgument( | ||
base == null | ||
|| (base.precision() <= precision && base.scale() <= scale) | ||
// for cases when received values can be safely coerced to the schema | ||
|| base.round(new MathContext(precision)).compareTo(base) == 0, | ||
"Expected BigDecimal base to be null or have precision <= %s (was %s), scale <= %s (was %s)", | ||
precision, | ||
(base == null) ? null : base.precision(), | ||
scale, | ||
(base == null) ? null : base.scale()); | ||
return base; | ||
} | ||
} |
This file contains 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
This file contains 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.