Skip to content

Support TIMESTAMP_NS, TIMESTAMP_MS & TIMESTAMP_S #534

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

Merged
JelteF merged 12 commits into from
Jan 27, 2025
Merged

Support TIMESTAMP_NS, TIMESTAMP_MS & TIMESTAMP_S #534

Changes from 4 commits
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
bc88d9c
insert timestamp_ms & timestamp_ns into duckdb from pg working
destrex271 Jan 15, 2025
62c517f
timestamp_ms, timestamp_s converted accordingly when received from du…
destrex271 Jan 16, 2025
461c01f
timestamp_ms, timestamp_s converted accordingly when received from du…
destrex271 Jan 16, 2025
9b9f809
Merge branch 'main' into feature/ts_ns
destrex271 Jan 16, 2025
4679d7a
Merge branch 'main' into feature/ts_ns
destrex271 Jan 24, 2025
c10f6c4
added default case to silence CI
destrex271 Jan 24, 2025
7ba27b3
added default case to silence CI
destrex271 Jan 24, 2025
f3f569d
added default case to silence CI
destrex271 Jan 24, 2025
121a5d7
added default case to silence CI
destrex271 Jan 24, 2025
f249272
Added expected output for timestamp_ns, timestamp_ms and timestamp_s
destrex271 Jan 26, 2025
173607e
fixed format
destrex271 Jan 26, 2025
eaf37aa
Fix date format
JelteF Jan 27, 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
28 changes: 26 additions & 2 deletions src/pgduckdb_types.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -221,8 +221,25 @@ ConvertDateDatum(const duckdb::Value &value) {

inline Datum
ConvertTimestampDatum(const duckdb::Value &value) {
duckdb::timestamp_t timestamp = value.GetValue<duckdb::timestamp_t>();
return timestamp.value - pgduckdb::PGDUCKDB_DUCK_TIMESTAMP_OFFSET;
// Extract raw int64_t value of timestamp
int64_t rawValue = value.GetValue<int64_t>();

// Handle specific Timestamp unit(sec, ms, ns) types
switch(value.type().id()){
Copy link
Collaborator

@JelteF JelteF Jan 24, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

needs a default case to silence the compiler warning

case duckdb::LogicalType::TIMESTAMP_MS:
// 1 ms = 10^3 micro-sec
rawValue *= 1000;
break;
case duckdb::LogicalType::TIMESTAMP_NS:
Copy link
Collaborator

@JelteF JelteF Jan 24, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

You need to run make format to solve the formatting warning.

// 1 ns = 10^-3 micro-sec
rawValue /= 1000;
break;
case duckdb::LogicalType::TIMESTAMP_S:
// 1 s = 10^6 micro-sec
rawValue *= 1000000;
break;
}
return rawValue - pgduckdb::PGDUCKDB_DUCK_TIMESTAMP_OFFSET;
}

inline Datum
Expand Down Expand Up @@ -1002,6 +1019,9 @@ GetPostgresDuckDBType(const duckdb::LogicalType &type) {
case duckdb::LogicalTypeId::DATE:
return DATEOID;
case duckdb::LogicalTypeId::TIMESTAMP:
case duckdb::LogicalTypeId::TIMESTAMP_SEC:
case duckdb::LogicalTypeId::TIMESTAMP_MS:
case duckdb::LogicalTypeId::TIMESTAMP_NS:
return TIMESTAMPOID;
case duckdb::LogicalTypeId::TIMESTAMP_TZ:
return TIMESTAMPTZOID;
Expand Down Expand Up @@ -1223,6 +1243,10 @@ ConvertPostgresToDuckValue(Oid attr_type, Datum value, duckdb::Vector &result, i
case duckdb::LogicalTypeId::DATE:
Append<duckdb::date_t>(result, duckdb::date_t(static_cast<int32_t>(value + PGDUCKDB_DUCK_DATE_OFFSET)), offset);
break;

case duckdb::LogicalTypeId::TIMESTAMP_SEC:
case duckdb::LogicalTypeId::TIMESTAMP_MS:
case duckdb::LogicalTypeId::TIMESTAMP_NS:
case duckdb::LogicalTypeId::TIMESTAMP:
Append<duckdb::timestamp_t>(
result, duckdb::timestamp_t(static_cast<int64_t>(value + PGDUCKDB_DUCK_TIMESTAMP_OFFSET)), offset);
Expand Down