Skip to content

[fix](streaming-job) fix postgres historical-date timestamp handling in cdc-client #63618

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
JNSimba wants to merge 5 commits into
base: master
Choose a base branch
from
Open

[fix](streaming-job) fix postgres historical-date timestamp handling in cdc-client #63618

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
52f7942
[fix](streaming-job) handle pre-1970 sub-millisecond timestamps in cd…
JNSimba May 25, 2026
f464e62
[fix](streaming-job) align pg snapshot timestamp/date values with bin…
JNSimba May 25, 2026
6d724a4
[fix](streaming-job) add pg historical-date golden file and align all…
JNSimba May 25, 2026
db12d6f
[improvement](streaming-job) include column/value context in cdc-clie…
JNSimba May 26, 2026
fea5db9
[improvement](streaming-job) drop unused import and tidy cdc-client c…
JNSimba May 26, 2026
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
905 changes: 905 additions & 0 deletions ..._client/src/main/java/io/debezium/connector/postgresql/connection/PostgresConnection.java
View file
Open in desktop

Large diffs are not rendered by default.

46 changes: 36 additions & 10 deletions ...src/main/java/org/apache/doris/cdcclient/source/deserialize/DebeziumJsonDeserializer.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@
import org.apache.doris.job.cdc.DataSourceConfigKeys;

import org.apache.commons.lang3.StringUtils;
import org.apache.commons.lang3.exception.ExceptionUtils;
import org.apache.flink.cdc.connectors.mysql.source.utils.RecordUtils;
import org.apache.flink.cdc.debezium.utils.TemporalConversions;
import org.apache.flink.table.data.TimestampData;
Expand Down Expand Up @@ -161,6 +162,7 @@ private String extractAfterRow(Struct value, Schema valueSchema, Set<String> exc
if (!excludeColumns.contains(field.name())) {
Object valueConverted =
convert(
field.name(),
field.schema(),
after.getWithoutDefault(field.name()));
record.put(field.name(), valueConverted);
Expand All @@ -185,6 +187,7 @@ private String extractBeforeRow(Struct value, Schema valueSchema, Set<String> ex
if (!excludeColumns.contains(field.name())) {
Object valueConverted =
convert(
field.name(),
field.schema(),
before.getWithoutDefault(field.name()));
record.put(field.name(), valueConverted);
Expand All @@ -194,7 +197,20 @@ private String extractBeforeRow(Struct value, Schema valueSchema, Set<String> ex
return objectMapper.writeValueAsString(record);
}

private Object convert(Schema fieldSchema, Object dbzObj) {
private Object convert(String fieldName, Schema fieldSchema, Object dbzObj) {
try {
return convertInternal(fieldSchema, dbzObj);
} catch (Exception e) {
String msg =
String.format(
"Failed to convert column '%s' value=%s: %s",
fieldName, dbzObj, ExceptionUtils.getMessage(e));
LOG.error(msg, e);
throw new RuntimeException(msg);
}
}

private Object convertInternal(Schema fieldSchema, Object dbzObj) {
if (dbzObj == null) {
return null;
}
Expand Down Expand Up @@ -307,15 +323,25 @@ private Object convertTimestamp(String typeName, Object dbzObj) {
case Timestamp.SCHEMA_NAME:
return TimestampData.fromEpochMillis((Long) dbzObj).toTimestamp().toString();
case MicroTimestamp.SCHEMA_NAME:
long micro = (long) dbzObj;
return TimestampData.fromEpochMillis(micro / 1000, (int) (micro % 1000 * 1000))
.toTimestamp()
.toString();
{
// floorDiv/floorMod keep nanoOfMillisecond non-negative for pre-1970
// values.
long micro = (long) dbzObj;
long millis = Math.floorDiv(micro, 1000L);
int nanos = (int) Math.floorMod(micro, 1000L) * 1000;
return TimestampData.fromEpochMillis(millis, nanos)
.toTimestamp()
.toString();
}
case NanoTimestamp.SCHEMA_NAME:
long nano = (long) dbzObj;
return TimestampData.fromEpochMillis(nano / 1000_000, (int) (nano % 1000_000))
.toTimestamp()
.toString();
{
long nano = (long) dbzObj;
long millis = Math.floorDiv(nano, 1_000_000L);
int nanos = (int) Math.floorMod(nano, 1_000_000L);
return TimestampData.fromEpochMillis(millis, nanos)
.toTimestamp()
.toString();
}
}
}
LocalDateTime localDateTime = TemporalConversions.toLocalDateTime(dbzObj, serverTimeZone);
Expand Down Expand Up @@ -364,7 +390,7 @@ private Object convertToArray(Schema fieldSchema, Object dbzObj) {
Schema elementSchema = fieldSchema.valueSchema();
List<Object> result = new ArrayList<>();
for (Object element : (List<?>) dbzObj) {
result.add(element == null ? null : convert(elementSchema, element));
result.add(element == null ? null : convertInternal(elementSchema, element));
}
return result;
}
Expand Down
Loading
Loading