Skip to content

BE: Serde: Impl Avro type for timestamp-nanos and `local-timestamp-… #877

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 3 commits into
base: main
Choose a base branch
from
Open

BE: Serde: Impl Avro type for timestamp-nanos and `local-timestamp-… #877

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
0d8b24d
BE: Serde: Impl Avro type for `timestamp-nanos` and `local-timestamp-…
wernerdv Feb 28, 2025
a8103d6
Merge branch 'main' into issues/872
wernerdv Mar 10, 2025
6b1c976
BE: Serde: Impl Avro type for timestamp-nanos and `local-timestamp-na…
wernerdv Mar 10, 2025
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
30 changes: 30 additions & 0 deletions api/src/main/java/io/kafbat/ui/util/jsonschema/JsonAvroConversion.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -462,6 +462,24 @@ enum LogicalTypeConversion {
Map.of(FORMAT, new TextNode(DATE_TIME))))
),

TIMESTAMP_NANOS("timestamp-nanos",
(node, schema) -> {
if (node.isIntegralNumber()) {
long nanosFromEpoch = node.longValue();
long epochSeconds = nanosFromEpoch / 1_000_000_000L;
long nanoAdjustment = nanosFromEpoch % 1_000_000_000L;
return Instant.ofEpochSecond(epochSeconds, nanoAdjustment);
} else if (node.isTextual()) {
return Instant.parse(node.asText());
} else {
throw new JsonAvroConversionException("node '%s' can't be converted to timestamp-nanos logical type"
.formatted(node));
}
},
(obj, schema) -> new TextNode(obj.toString()),
new SimpleFieldSchema(new SimpleJsonType(JsonType.Type.STRING, Map.of(FORMAT, new TextNode(DATE_TIME))))
),

LOCAL_TIMESTAMP_MILLIS("local-timestamp-millis",
(node, schema) -> {
if (node.isTextual()) {
Expand Down Expand Up @@ -491,6 +509,18 @@ enum LogicalTypeConversion {
new SimpleJsonType(
JsonType.Type.STRING,
Map.of(FORMAT, new TextNode(DATE_TIME))))
),

LOCAL_TIMESTAMP_NANOS("local-timestamp-nanos",
(node, schema) -> {
if (node.isTextual()) {
return LocalDateTime.parse(node.asText());
}
Instant instant = (Instant) TIMESTAMP_NANOS.jsonToAvroConversion.apply(node, schema);
return LocalDateTime.ofInstant(instant, ZoneOffset.UTC);
},
(obj, schema) -> new TextNode(obj.toString()),
new SimpleFieldSchema(new SimpleJsonType(JsonType.Type.STRING, Map.of(FORMAT, new TextNode(DATE_TIME))))
);

private final String name;
Expand Down
49 changes: 35 additions & 14 deletions api/src/test/java/io/kafbat/ui/serdes/builtin/sr/SchemaRegistrySerdeTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,11 +12,19 @@
import io.kafbat.ui.util.jsonschema.JsonAvroConversion;
import java.io.ByteArrayOutputStream;
import java.io.IOException;
import java.math.BigDecimal;
import java.nio.ByteBuffer;
import java.time.Instant;
import java.time.LocalDate;
import java.time.LocalDateTime;
import java.time.LocalTime;
import java.time.ZoneOffset;
import java.util.List;
import java.util.Map;
import java.util.UUID;
import lombok.SneakyThrows;
import net.bytebuddy.utility.RandomString;
import org.apache.avro.generic.GenericData;
import org.apache.avro.generic.GenericDatumWriter;
import org.apache.avro.io.Encoder;
import org.apache.avro.io.EncoderFactory;
Expand Down Expand Up @@ -341,34 +349,47 @@ void avroLogicalTypesRepresentationIsConsistentForSerializationAndDeserializatio
"name": "lt_timestamp_micros",
"type": { "type": "long", "logicalType": "timestamp-micros" }
},
{
"name": "lt_timestamp_nanos",
"type": { "type": "long", "logicalType": "timestamp-nanos" }
},
{
"name": "lt_local_timestamp_millis",
"type": { "type": "long", "logicalType": "local-timestamp-millis" }
},
{
"name": "lt_local_timestamp_micros",
"type": { "type": "long", "logicalType": "local-timestamp-micros" }
},
{
"name": "lt_local_timestamp_nanos",
"type": { "type": "long", "logicalType": "local-timestamp-nanos" }
}
]
}"""
);

String jsonPayload = """
{
"lt_date":"1991-08-14",
"lt_decimal": 2.1617413862327545E11,
"lt_time_millis": "10:15:30.001",
"lt_time_micros": "10:15:30.123456",
"lt_uuid": "a37b75ca-097c-5d46-6119-f0637922e908",
"lt_timestamp_millis": "2007-12-03T10:15:30.123Z",
"lt_timestamp_micros": "2007-12-03T10:15:30.123456Z",
"lt_local_timestamp_millis": "2017-12-03T10:15:30.123",
"lt_local_timestamp_micros": "2017-12-03T10:15:30.123456"
}
""";
Instant instant = Instant.parse("2007-12-03T10:15:30.123456789Z");
long timestampNanos = instant.getEpochSecond() * 1_000_000_000L + instant.getNano();

instant = LocalDateTime.parse("2017-12-03T10:15:30.123456789").toInstant(ZoneOffset.UTC);
long localTimestampNanos = instant.getEpochSecond() * 1_000_000_000L + instant.getNano();

GenericData.Record inputRecord = new GenericData.Record(schema.rawSchema());
inputRecord.put("lt_date", LocalDate.of(1991, 8, 14));
inputRecord.put("lt_uuid", UUID.fromString("a37b75ca-097c-5d46-6119-f0637922e908"));
inputRecord.put("lt_decimal", new BigDecimal("2.16"));
inputRecord.put("lt_time_millis", LocalTime.parse("10:15:30.001"));
inputRecord.put("lt_time_micros", LocalTime.parse("10:15:30.123456"));
inputRecord.put("lt_timestamp_millis", Instant.parse("2007-12-03T10:15:30.123Z"));
inputRecord.put("lt_timestamp_micros", Instant.parse("2007-12-03T10:15:30.123456Z"));
inputRecord.put("lt_timestamp_nanos", timestampNanos);
inputRecord.put("lt_local_timestamp_millis", LocalDateTime.parse("2017-12-03T10:15:30.123"));
inputRecord.put("lt_local_timestamp_micros", LocalDateTime.parse("2017-12-03T10:15:30.123456"));
inputRecord.put("lt_local_timestamp_nanos", localTimestampNanos);

registryClient.register("test-value", schema);
assertSerdeCycle("test", jsonPayload);
assertSerdeCycle("test", inputRecord.toString());
}

// 1. serialize input json to binary
Expand Down
30 changes: 28 additions & 2 deletions api/src/test/java/io/kafbat/ui/util/jsonschema/JsonAvroConversionTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -384,13 +384,21 @@ void logicalTypesField() {
"name": "lt_timestamp_micros",
"type": { "type": "long", "logicalType": "timestamp-micros" }
},
{
"name": "lt_timestamp_nanos",
"type": { "type": "long", "logicalType": "timestamp-nanos" }
},
{
"name": "lt_local_timestamp_millis",
"type": { "type": "long", "logicalType": "local-timestamp-millis" }
},
{
"name": "lt_local_timestamp_micros",
"type": { "type": "long", "logicalType": "local-timestamp-micros" }
},
{
"name": "lt_local_timestamp_nanos",
"type": { "type": "long", "logicalType": "local-timestamp-nanos" }
}
]
}"""
Expand All @@ -405,8 +413,10 @@ void logicalTypesField() {
"lt_uuid": "a37b75ca-097c-5d46-6119-f0637922e908",
"lt_timestamp_millis": "2007-12-03T10:15:30.123Z",
"lt_timestamp_micros": "2007-12-13T10:15:30.123456Z",
"lt_timestamp_nanos": "2007-12-13T10:15:30.123456789Z",
"lt_local_timestamp_millis": "2017-12-03T10:15:30.123",
"lt_local_timestamp_micros": "2017-12-13T10:15:30.123456"
"lt_local_timestamp_micros": "2017-12-13T10:15:30.123456",
"lt_local_timestamp_nanos": "2017-12-13T10:15:30.123456789"
}
""";

Expand All @@ -427,10 +437,14 @@ var record = (GenericData.Record) converted;
.isEqualTo(Instant.parse("2007-12-03T10:15:30.123Z"));
assertThat(record.get("lt_timestamp_micros"))
.isEqualTo(Instant.parse("2007-12-13T10:15:30.123456Z"));
assertThat(record.get("lt_timestamp_nanos"))
.isEqualTo(Instant.parse("2007-12-13T10:15:30.123456789Z"));
assertThat(record.get("lt_local_timestamp_millis"))
.isEqualTo(LocalDateTime.parse("2017-12-03T10:15:30.123"));
assertThat(record.get("lt_local_timestamp_micros"))
.isEqualTo(LocalDateTime.parse("2017-12-13T10:15:30.123456"));
assertThat(record.get("lt_local_timestamp_nanos"))
.isEqualTo(LocalDateTime.parse("2017-12-13T10:15:30.123456789"));
}
}

Expand Down Expand Up @@ -582,13 +596,21 @@ void logicalTypesField() {
"name": "lt_timestamp_micros",
"type": { "type": "long", "logicalType": "timestamp-micros" }
},
{
"name": "lt_timestamp_nanos",
"type": { "type": "long", "logicalType": "timestamp-nanos" }
},
{
"name": "lt_local_timestamp_millis",
"type": { "type": "long", "logicalType": "local-timestamp-millis" }
},
{
"name": "lt_local_timestamp_micros",
"type": { "type": "long", "logicalType": "local-timestamp-micros" }
},
{
"name": "lt_local_timestamp_nanos",
"type": { "type": "long", "logicalType": "local-timestamp-nanos" }
}
]
}"""
Expand All @@ -602,8 +624,10 @@ void logicalTypesField() {
inputRecord.put("lt_time_micros", LocalTime.parse("10:15:30.123456"));
inputRecord.put("lt_timestamp_millis", Instant.parse("2007-12-03T10:15:30.123Z"));
inputRecord.put("lt_timestamp_micros", Instant.parse("2007-12-13T10:15:30.123456Z"));
inputRecord.put("lt_timestamp_nanos", Instant.parse("2007-12-13T10:15:30.123456789Z"));
inputRecord.put("lt_local_timestamp_millis", LocalDateTime.parse("2017-12-03T10:15:30.123"));
inputRecord.put("lt_local_timestamp_micros", LocalDateTime.parse("2017-12-13T10:15:30.123456"));
inputRecord.put("lt_local_timestamp_nanos", LocalDateTime.parse("2017-12-13T10:15:30.123456789"));

String expectedJson = """
{
Expand All @@ -614,8 +638,10 @@ void logicalTypesField() {
"lt_time_micros": "10:15:30.123456",
"lt_timestamp_millis": "2007-12-03T10:15:30.123Z",
"lt_timestamp_micros": "2007-12-13T10:15:30.123456Z",
"lt_timestamp_nanos": "2007-12-13T10:15:30.123456789Z",
"lt_local_timestamp_millis": "2017-12-03T10:15:30.123",
"lt_local_timestamp_micros": "2017-12-13T10:15:30.123456"
"lt_local_timestamp_micros": "2017-12-13T10:15:30.123456",
"lt_local_timestamp_nanos": "2017-12-13T10:15:30.123456789"
}
""";

Expand Down
2 changes: 1 addition & 1 deletion pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@
<antlr4-maven-plugin.version>4.12.0</antlr4-maven-plugin.version>
<apache.commons.version>2.12.0</apache.commons.version>
<assertj.version>3.26.3</assertj.version>
<avro.version>1.11.4</avro.version>
<avro.version>1.12.0</avro.version>
<byte-buddy.version>1.15.11</byte-buddy.version>
<confluent.version>7.8.0</confluent.version>
<datasketches-java.version>3.1.0</datasketches-java.version>
Expand Down
Loading