Skip to content

Better warning and Exception message in CalciteUtil #24414

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
Abacn merged 1 commit into from
Nov 29, 2022
Merged

Better warning and Exception message in CalciteUtil #24414

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
18 changes: 16 additions & 2 deletions ...ensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/impl/utils/CalciteUtils.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,9 +40,13 @@
import org.apache.beam.vendor.calcite.v1_28_0.org.apache.calcite.sql.type.SqlTypeName;
import org.joda.time.Instant;
import org.joda.time.base.AbstractInstant;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;

/** Utility methods for Calcite related operations. */
public class CalciteUtils {
private static final Logger LOG = LoggerFactory.getLogger(CalciteUtils.class);

private static final long UNLIMITED_ARRAY_SIZE = -1L;

// SQL has schema types that do not directly correspond to Beam Schema types. We define
Expand Down Expand Up @@ -187,11 +191,21 @@ public static SqlTypeName toSqlTypeName(FieldType type) {
typeName = BEAM_TO_CALCITE_DEFAULT_MAPPING.get(type);
}
if (typeName == null) {
if (type.getLogicalType() != null) {
Schema.LogicalType<?, ?> logicalType = type.getLogicalType();
Schema.LogicalType<?, ?> logicalType = type.getLogicalType();
if (logicalType != null) {
if (logicalType instanceof PassThroughLogicalType) {
// for pass through logical type, just return its base type
return toSqlTypeName(logicalType.getBaseType());
} else if ("SqlCharType".equals(logicalType.getIdentifier())) {
LOG.warn(
"SqlCharType is used in Schema. It was removed in Beam 2.44.0 and should be"
+ " replaced by FixedString logical type.");
return SqlTypeName.CHAR;
} else {
throw new IllegalArgumentException(
String.format(
"Cannot find a matching Calcite SqlTypeName for Beam logical type: %s",
logicalType.getIdentifier()));
}
}
throw new IllegalArgumentException(
Expand Down