Skip to content

fix: set timestamp to postgres revision when using optimizedRevisionFunc #2917

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

Draft
ostafen wants to merge 6 commits into
base: main
Choose a base branch
from
Draft

fix: set timestamp to postgres revision when using optimizedRevisionFunc #2917

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
8105ad1
fix: set timestamp to postgres revision when using optimizedRevisionFunc
ostafen Feb 23, 2026
aa07d0b
make ts nullable
ostafen Feb 23, 2026
c1ba30c
fix query
ostafen Feb 23, 2026
112fca2
Fix query 2
ostafen Feb 23, 2026
e404e01
ts nullable
ostafen Feb 23, 2026
747f6e0
Merge branch 'main' into fix/postgres-opt-revision
ostafen Feb 23, 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
1 change: 1 addition & 0 deletions internal/datastore/postgres/postgres.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -265,6 +265,7 @@ func newPostgresDatastore(
quantizationPeriodNanos,
schema.ColSnapshot,
followerReadDelayNanos,
schema.ColTimestamp,
)

var revisionHeartbeatQuery string
Expand Down
24 changes: 20 additions & 4 deletions internal/datastore/postgres/revisions.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,8 +58,9 @@
(SELECT %[1]s FROM %[2]s WHERE %[3]s >= TO_TIMESTAMP(FLOOR((EXTRACT(EPOCH FROM NOW() AT TIME ZONE 'utc') * 1000000000 - %[6]d)/ %[4]d) * %[4]d / 1000000000) AT TIME ZONE 'utc' ORDER BY %[3]s ASC LIMIT 1)
) as xid)
SELECT selected.xid,
COALESCE((SELECT %[5]s FROM %[2]s WHERE %[1]s = selected.xid), (SELECT pg_current_snapshot())),
%[4]d - CAST(EXTRACT(EPOCH FROM NOW() AT TIME ZONE 'utc') * 1000000000 as bigint) %% %[4]d
COALESCE((SELECT %[5]s FROM %[2]s WHERE %[1]s = selected.xid), (SELECT pg_current_snapshot())),
%[4]d - CAST(EXTRACT(EPOCH FROM NOW() AT TIME ZONE 'utc') * 1000000000 as bigint) %% %[4]d,
(SELECT %[3]s FROM %[2]s WHERE %[1]s = selected.xid)
FROM selected;`

// queryValidTransaction will return a single row with three values:
Expand Down Expand Up @@ -109,14 +110,29 @@
var revision xid8
var snapshot pgSnapshot
var validForNanos time.Duration
var timestamp *time.Time
var err error

if err := pgd.readPool.QueryRow(ctx, pgd.optimizedRevisionQuery).
Scan(&revision, &snapshot, &validForNanos); err != nil {
Scan(&revision, &snapshot, &validForNanos, &timestamp); err != nil {
return datastore.NoRevision, 0, fmt.Errorf(errRevision, err)
}

var tsNanos uint64
if timestamp != nil {
tsNanos, err = safecast.Convert[uint64](timestamp.UnixNano())
if err != nil {
return nil, 0, spiceerrors.MustBugf("could not cast timestamp to uint64")
}

Check warning on line 126 in internal/datastore/postgres/revisions.go

View check run for this annotation

Codecov / codecov/patch

internal/datastore/postgres/revisions.go#L125-L126 

Added lines #L125 - L126 were not covered by tests
}

snapshot = snapshot.markComplete(revision.Uint64)

return postgresRevision{snapshot: snapshot, optionalTxID: revision}, validForNanos, nil
return postgresRevision{
snapshot: snapshot,
optionalInexactNanosTimestamp: tsNanos,
optionalTxID: revision,
}, validForNanos, nil
}

func (pgd *pgDatastore) HeadRevision(ctx context.Context) (datastore.Revision, error) {
Expand Down
Loading