From d953b41914f04f878b6bd3c72e71a8fab8853ea3 Mon Sep 17 00:00:00 2001 From: Jelte Fennema-Nio Date: Mon, 11 Mar 2024 15:56:28 +0100 Subject: [PATCH v21 4/5] Fix comments a bit --- src/backend/utils/adt/uuid.c | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/src/backend/utils/adt/uuid.c b/src/backend/utils/adt/uuid.c index 93327d27a8b..535a7c08025 100644 --- a/src/backend/utils/adt/uuid.c +++ b/src/backend/utils/adt/uuid.c @@ -615,7 +615,8 @@ uuid_extract_timestamp(PG_FUNCTION_ARGS) tms += ((uint64_t) uuid->data[1]) << 32; tms += ((uint64_t) uuid->data[0]) << 40; - ts = (TimestampTz) (tms * 1000) - /* convert ms to us, than adjust */ + /* convert ms to us, then adjust */ + ts = (TimestampTz) (tms * 1000) - (POSTGRES_EPOCH_JDATE - UNIX_EPOCH_JDATE) * SECS_PER_DAY * USECS_PER_SEC; PG_RETURN_TIMESTAMPTZ(ts); @@ -632,8 +633,8 @@ uuid_extract_timestamp(PG_FUNCTION_ARGS) tms += (((uint64_t) uuid->data[6]) & 0xf) << 56; tms += ((uint64_t) uuid->data[7]) << 48; - ts = (TimestampTz) (tms / 10) - /* convert 100-ns intervals to us, - * than adjust */ + /* convert 100-ns intervals to us, then adjust */ + ts = (TimestampTz) (tms / 10) - ((uint64_t) POSTGRES_EPOCH_JDATE - GREGORIAN_EPOCH_JDATE) * SECS_PER_DAY * USECS_PER_SEC; PG_RETURN_TIMESTAMPTZ(ts); @@ -650,8 +651,8 @@ uuid_extract_timestamp(PG_FUNCTION_ARGS) tms += (((uint64_t) uuid->data[6]) & 0xf) << 8; tms += ((uint64_t) uuid->data[7]); - ts = (TimestampTz) (tms / 10) - /* convert 100-ns intervals to us, - * than adjust */ + /* convert 100-ns intervals to us, then adjust */ + ts = (TimestampTz) (tms / 10) - ((uint64_t) POSTGRES_EPOCH_JDATE - GREGORIAN_EPOCH_JDATE) * SECS_PER_DAY * USECS_PER_SEC; PG_RETURN_TIMESTAMPTZ(ts); -- 2.34.1