alexey.rassokhin/tet123
1
0
Fork 0
Code Issues Pull Requests 1 Packages Projects Releases Wiki Activity

DBZ-7107 Fix SerdeTest failure

Browse Source
This commit is contained in:
Chris Cranford 2024-02-14 11:07:23 -05:00 committed by Jiri Pechanec
parent cac38fc484
commit 659fc8df4e
2 changed files with 17 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
debezium-core/src/main/java/io/debezium/data/Envelope.java
View File

@ -247,7 +247,7 @@ public Struct read(Object record, Struct source, Instant timestamp) {
if (timestamp != null) { if (timestamp != null) {
struct.put(FieldName.TIMESTAMP, timestamp.toEpochMilli()); struct.put(FieldName.TIMESTAMP, timestamp.toEpochMilli());
struct.put(FieldName.TIMESTAMP_US, (timestamp.getEpochSecond() * 1_000_000) + (timestamp.getNano() / 1_000)); struct.put(FieldName.TIMESTAMP_US, (timestamp.getEpochSecond() * 1_000_000) + (timestamp.getNano() / 1_000));
struct.put(FieldName.TIMESTAMP_NS, (timestamp.getEpochSecond() * 1_000_000) + timestamp.getNano()); struct.put(FieldName.TIMESTAMP_NS, (timestamp.getEpochSecond() * 1_000_000_000L) + timestamp.getNano());
} }
return struct; return struct;
} }
@ -270,7 +270,7 @@ public Struct create(Object record, Struct source, Instant timestamp) {
if (timestamp != null) { if (timestamp != null) {
struct.put(FieldName.TIMESTAMP, timestamp.toEpochMilli()); struct.put(FieldName.TIMESTAMP, timestamp.toEpochMilli());
struct.put(FieldName.TIMESTAMP_US, (timestamp.getEpochSecond() * 1_000_000) + (timestamp.getNano() / 1_000)); struct.put(FieldName.TIMESTAMP_US, (timestamp.getEpochSecond() * 1_000_000) + (timestamp.getNano() / 1_000));
struct.put(FieldName.TIMESTAMP_NS, (timestamp.getEpochSecond() * 1_000_000) + timestamp.getNano()); struct.put(FieldName.TIMESTAMP_NS, (timestamp.getEpochSecond() * 1_000_000_000L) + timestamp.getNano());
} }
return struct; return struct;
} }
@ -297,7 +297,7 @@ public Struct update(Object before, Struct after, Struct source, Instant timesta
if (timestamp != null) { if (timestamp != null) {
struct.put(FieldName.TIMESTAMP, timestamp.toEpochMilli()); struct.put(FieldName.TIMESTAMP, timestamp.toEpochMilli());
struct.put(FieldName.TIMESTAMP_US, (timestamp.getEpochSecond() * 1_000_000) + (timestamp.getNano() / 1_000)); struct.put(FieldName.TIMESTAMP_US, (timestamp.getEpochSecond() * 1_000_000) + (timestamp.getNano() / 1_000));
struct.put(FieldName.TIMESTAMP_NS, (timestamp.getEpochSecond() * 1_000_000) + timestamp.getNano()); struct.put(FieldName.TIMESTAMP_NS, (timestamp.getEpochSecond() * 1_000_000_000L) + timestamp.getNano());
} }
return struct; return struct;
} }
@ -322,7 +322,7 @@ public Struct delete(Object before, Struct source, Instant timestamp) {
if (timestamp != null) { if (timestamp != null) {
struct.put(FieldName.TIMESTAMP, timestamp.toEpochMilli()); struct.put(FieldName.TIMESTAMP, timestamp.toEpochMilli());
struct.put(FieldName.TIMESTAMP_US, (timestamp.getEpochSecond() * 1_000_000) + (timestamp.getNano() / 1_000)); struct.put(FieldName.TIMESTAMP_US, (timestamp.getEpochSecond() * 1_000_000) + (timestamp.getNano() / 1_000));
struct.put(FieldName.TIMESTAMP_NS, (timestamp.getEpochSecond() * 1_000_000) + timestamp.getNano()); struct.put(FieldName.TIMESTAMP_NS, (timestamp.getEpochSecond() * 1_000_000_000L) + timestamp.getNano());
} }
return struct; return struct;
} }
@ -340,7 +340,7 @@ public Struct truncate(Struct source, Instant timestamp) {
struct.put(FieldName.SOURCE, source); struct.put(FieldName.SOURCE, source);
struct.put(FieldName.TIMESTAMP, timestamp.toEpochMilli()); struct.put(FieldName.TIMESTAMP, timestamp.toEpochMilli());
struct.put(FieldName.TIMESTAMP_US, (timestamp.getEpochSecond() * 1_000_000) + (timestamp.getNano() / 1_000)); struct.put(FieldName.TIMESTAMP_US, (timestamp.getEpochSecond() * 1_000_000) + (timestamp.getNano() / 1_000));
struct.put(FieldName.TIMESTAMP_NS, (timestamp.getEpochSecond() * 1_000_000) + timestamp.getNano()); struct.put(FieldName.TIMESTAMP_NS, (timestamp.getEpochSecond() * 1_000_000_000L) + timestamp.getNano());
return struct; return struct;
} }

12
debezium-core/src/test/resources/json/serde-with-schema.json
View File

@ -146,6 +146,16 @@
"type": "int64", "type": "int64",
"optional": true, "optional": true,
"field": "ts_ms" "field": "ts_ms"
},
{
"type": "int64",
"optional": true,
"field": "ts_us"
},
{
"type": "int64",
"optional": true,
"field": "ts_ns"
} }
], ],
"optional": false, "optional": false,
@ -154,6 +164,8 @@
"payload": { "payload": {
"op": "c", "op": "c",
"ts_ms": 1465491411815, "ts_ms": 1465491411815,
"ts_us": 1465491411815000,
"ts_ns": 1465491411815000000,
"before": null, "before": null,
"after": { "after": {
"id": 1004, "id": 1004,