Skip to content

[fix](catalog) Keep the TIME scale that connectors declare #70351

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
morningman wants to merge 1 commit into
base: master
Choose a base branch
from
Open

[fix](catalog) Keep the TIME scale that connectors declare #70351

Show file tree
Hide file tree
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
6 changes: 6 additions & 0 deletions ...c/main/java/org/apache/doris/datasource/connector/converter/ConnectorColumnConverter.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -371,6 +371,12 @@ private static Type convertScalarType(String typeName, int precision, int scale)
return ScalarType.createTimeStampTzType(precision);
}
return ScalarType.createTimeStampTzType(0);
case "TIMEV2":
// Like DATETIMEV2, connectors put the time scale in the precision field.
if (precision >= 0) {
return ScalarType.createTimeV2Type(precision);
}
return ScalarType.TIMEV2;
case "VARBINARY":
if (precision > 0) {
return ScalarType.createVarbinaryType(precision);
Expand Down
17 changes: 17 additions & 0 deletions ...st/java/org/apache/doris/datasource/connector/converter/ConnectorColumnConverterTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -230,6 +230,23 @@ void testDecimalTypeRoundtrip() {
Assertions.assertEquals(6, ct.getScale());
}

@Test
void timeScaleRidesInThePrecisionSlot() {
// Connectors put the TIMEV2 scale where they put the DATETIMEV2 one: hudi maps Avro time-millis
// and time-micros to ("TIMEV2", 3|6, 0), and lance maps Arrow time32(ms) / time64(us|ns) the same
// way. Dropping it shows time(3) as time and reads the column at second precision.
Assertions.assertEquals(ScalarType.createTimeV2Type(0),
ConnectorColumnConverter.convertType(ConnectorType.of("TIMEV2", 0, 0)));
Assertions.assertEquals(ScalarType.createTimeV2Type(3),
ConnectorColumnConverter.convertType(ConnectorType.of("TIMEV2", 3, 0)));
Assertions.assertEquals(ScalarType.createTimeV2Type(6),
ConnectorColumnConverter.convertType(ConnectorType.of("TIMEV2", 6, 0)));
Assertions.assertEquals("time(3)",
ConnectorColumnConverter.convertType(ConnectorType.of("TIMEV2", 3, 0)).toSql());
// No precision given: the scale-0 TIMEV2 it has always been.
Assertions.assertEquals(ScalarType.TIMEV2, ConnectorColumnConverter.convertType(ConnectorType.of("TIMEV2")));
}

@Test
void testWithTimeZoneColumnSetsExtraInfo() {
// A ConnectorColumn marked withTimeZone() must convert to a Doris Column carrying the
Expand Down
Loading