-
Notifications
You must be signed in to change notification settings - Fork 198
clickhouse: fix date overflow for initial load #4534
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.
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
Merged
dtunikov
merged 13 commits into
main
from
fix/dbi-812/mysql-datetime-date-clickhouse-range
Jul 7, 2026
Merged
Changes from all commits
Commits
Show all changes
13 commits
Select commit
Hold shift + click to select a range
ebb0355
fix clickhouse date overflow
dtunikov 204ab19
default to unix epoch when we hit date overflow for ch
dtunikov 1b13de0
use slog.DiscardHandler in test to satisfy sloglint
dtunikov e89439c
cleanup comments
dtunikov c29ba9c
clamp out-of-range dates to CH boundary, matching CDC path
dtunikov 1d88b80
Merge branch 'main' of github.com:PeerDB-io/peerdb into fix/dbi-812/m…
dtunikov 185eb1f
read boundary datetimes as strings in e2e to avoid driver nano overflow
dtunikov 1dcb3bc
cleanup comments
dtunikov 8701ccc
rm unit test
dtunikov 24b996c
avoid string concat in loop (perfsprint)
dtunikov 1fa3ef0
drop self-named column aliases in e2e datetime range query
dtunikov cebfe42
move ch CI versions
dtunikov de08694
stable tag
dtunikov File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -369,8 +369,12 @@ func (c *QValueAvroConverter) processGoTime(t time.Duration, so sizeOpt) (any, i | |
| return t, varIntSize(int64(t/time.Microsecond), so) | ||
| } | ||
|
|
||
| func (c *QValueAvroConverter) processGeneralTime(t time.Time, format string, avroVal int64, so sizeOpt) (any, int64) { | ||
| // Bigquery will not allow timestamp if it is less than 1AD and more than 9999AD | ||
| const ( | ||
| clickHouseMinYear = 1900 | ||
| clickHouseMaxYear = 2299 | ||
| ) | ||
|
|
||
| func (c *QValueAvroConverter) processGeneralTime(t time.Time, format string, isDate bool, so sizeOpt) (any, int64) { | ||
| switch c.TargetDWH { | ||
| case protos.DBType_BIGQUERY: | ||
| year := t.Year() | ||
|
|
@@ -383,26 +387,36 @@ func (c *QValueAvroConverter) processGeneralTime(t time.Time, format string, avr | |
| return time.Date(1, 1, 1, 0, 0, 0, 0, time.UTC), varIntSize(0, so) | ||
| } | ||
| } | ||
| case protos.DBType_CLICKHOUSE: | ||
| if year := t.Year(); year < clickHouseMinYear { | ||
| t = time.Date(clickHouseMinYear, time.January, 1, t.Hour(), t.Minute(), t.Second(), t.Nanosecond(), t.Location()) | ||
| } else if year > clickHouseMaxYear { | ||
| t = time.Date(clickHouseMaxYear, time.December, 31, t.Hour(), t.Minute(), t.Second(), t.Nanosecond(), t.Location()) | ||
| } | ||
| case protos.DBType_SNOWFLAKE: | ||
| // Snowflake has issues with avro timestamp types, returning as string form | ||
| // See: https://stackoverflow.com/questions/66104762/snowflake-date-column-have-incorrect-date-from-avro-file | ||
| s := t.Format(format) | ||
| return s, stringSize(s, so) | ||
| } | ||
| // Timestamps are micros since epoch; dates are days since epoch. Both encoded as Avro varint. | ||
| avroVal := t.UnixMicro() | ||
| if isDate { | ||
| avroVal = t.Unix() / 86400 | ||
|
Collaborator
Author
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. had to move it here out of process[type] functions because we clamp |
||
| } | ||
| return t, varIntSize(avroVal, so) | ||
| } | ||
|
|
||
| func (c *QValueAvroConverter) processGoTimestampTZ(t time.Time, so sizeOpt) (any, int64) { | ||
| return c.processGeneralTime(t, "2006-01-02 15:04:05.999999-0700", t.UnixMicro(), so) | ||
| return c.processGeneralTime(t, "2006-01-02 15:04:05.999999-0700", false, so) | ||
| } | ||
|
|
||
| func (c *QValueAvroConverter) processGoTimestamp(t time.Time, so sizeOpt) (any, int64) { | ||
| return c.processGeneralTime(t, "2006-01-02 15:04:05.999999", t.UnixMicro(), so) | ||
| return c.processGeneralTime(t, "2006-01-02 15:04:05.999999", false, so) | ||
| } | ||
|
|
||
| func (c *QValueAvroConverter) processGoDate(t time.Time, so sizeOpt) (any, int64) { | ||
| // Date is days since epoch, encoded as Avro int (varint) | ||
| return c.processGeneralTime(t, "2006-01-02", t.Unix()/86400, so) | ||
| return c.processGeneralTime(t, "2006-01-02", true, so) | ||
| } | ||
|
|
||
| func (c *QValueAvroConverter) processNullableUnion( | ||
|
|
||
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Uh oh!
There was an error while loading. Please reload this page.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
it was consistently failing on
v25.8.11.66-lts: https://github.com/PeerDB-io/peerdb/actions/runs/28783586496/job/85344784176and what is weird is that clickhouse holds correct value
but clickhouse-go driver seems to interpret it incorrectly...
v25.8.28.1 is the latest patch of the oldest supported release (clickhouse LTS support seems to be 1 year).
so, I think it's ok if we test on the patched version, right?
i can also investigate further why
v25.8.11.66wasn't working properly, but it seems out-of-scope as it works fine on patched version.There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Seems niche enough, yeah