Skip to content
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

[BEAM-12385] Handle VARCHAR and other SQL specific logical types in AvroUtils #14858

Closed
wants to merge 7 commits into from
Closed

[BEAM-12385] Handle VARCHAR and other SQL specific logical types in AvroUtils #14858

Changes from 1 commit
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
1efc744
Handle VARCHAR and other JDBC specific logical types in AvroUtils.
May 21, 2021
e2a50f6
Varchar and related string types tests
anantdamle May 29, 2021
bf99251
Add tests related to JDBC logical date-time fields.
anantdamle May 29, 2021
7758d60
Make JDBC Strings handling similar to Hive's approach by mapping to L…
anantdamle Jun 3, 2021
0b64485
fix whitespace error in CHANGES.md
anantdamle Jun 3, 2021
499eba0
Actually fixing whitespace error in CHANGES.md
anantdamle Jun 3, 2021
de939da
Conform to Hive types of SQL char and varchar.
anantdamle Jun 7, 2021
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
22 changes: 22 additions & 0 deletions sdks/java/core/src/main/java/org/apache/beam/sdk/schemas/utils/AvroUtils.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -906,6 +906,18 @@ private static org.apache.avro.Schema getFieldSchema(
.map(x -> getFieldSchema(x.getType(), x.getName(), namespace))
.collect(Collectors.toList()));
break;

case "NVARCHAR":
anantdamle marked this conversation as resolved.
Show resolved Hide resolved
case "VARCHAR":
case "LONGNVARCHAR":
case "LONGVARCHAR":
baseType = org.apache.avro.Schema.create(Type.STRING);
anantdamle marked this conversation as resolved.
Show resolved Hide resolved
break;

case "DATE":
baseType = LogicalTypes.date().addToSchema(org.apache.avro.Schema.create(Type.INT));
break;

default:
throw new RuntimeException(
"Unhandled logical type " + fieldType.getLogicalType().getIdentifier());
Expand Down Expand Up @@ -1017,6 +1029,16 @@ private static org.apache.avro.Schema getFieldSchema(
typeWithNullability.type.getTypes().get(oneOfValue.getCaseType().getValue()),
oneOfValue.getValue());
}

case "NVARCHAR":
anantdamle marked this conversation as resolved.
Show resolved Hide resolved
case "VARCHAR":
case "LONGNVARCHAR":
case "LONGVARCHAR":
return new Utf8((String) value);

case "DATE":
return Days.daysBetween(Instant.EPOCH, (Instant) value).getDays();

default:
throw new RuntimeException(
"Unhandled logical type " + fieldType.getLogicalType().getIdentifier());
Expand Down