mirror of
https://github.com/andwati/zitadel.git
synced 2026-10-18 05:52:51 +00:00
<!-- CURSOR_AGENT_PR_BODY_BEGIN -->
# Which Problems Are Solved
Handler/v2 projections (`users14` and every other event projection) can
overlook committed events under load:
- `eventstore.commands_to_events` stamped `position` with `NOW()`
(transaction start). A slow create TX could commit after a faster TX
that started later, so the projector stored a later position and never
saw the earlier one.
- Resume used `OFFSET` on a **filtered** row count. That could skip
`in_tx_order = 1` at the next position (for example `user.human.added`).
- Two transactions in the same microsecond both start at `in_tx_order =
1`. A cursor of `in_tx_order > last` alone would drop the other TX’s
first event.
This does not repair rows that are already missing from projections.
# How the Problems Are Solved
- Setup step 77 replaces `eventstore.commands_to_events` so `created_at
= statement_timestamp()` and `position = EXTRACT(EPOCH FROM
clock_timestamp())` at INSERT time. Initialise `08_events_table.sql`
matches that for new databases. The function is `VOLATILE` to match
`clock_timestamp()`.
- The projector still drains in-flight writers with `pg_advisory_lock` /
`pg_advisory_unlock` in one statement, then caps with `position <=
EXTRACT(EPOCH FROM now())` (projector TX start). The exclusive lock is
**not** held across the event `SELECT`. The cap must stay `now()`, not
`clock_timestamp()`, or later inserts become a high-water mark.
- Resume is a lexicographic `EventSortKey` on `(position, in_tx_order,
instance_id, aggregate_type, aggregate_id, sequence)` via
`AfterEventSortKey`. SQL `OFFSET` is no longer used for projection
catch-up.
- Handler and FieldHandler persist the last event’s `in_tx_order` in
`current_states.filter_offset` (existing column, new meaning). Step 77
backfills matching rows from `events2`; unmatched rows keep their
previous value.
# Additional Changes
- `eventstore.Event` exposes `InTxOrder() uint32` (BaseEvent, repository
Event, v3 event, v1 models).
- v3 push SELECT/RETURNING now includes `in_tx_order` so newly written
events carry a real ordinal.
- `WithMinPosition` stays an inclusive `PositionAtLeast` floor and does
not smash the sort-key cursor.
- `SearchQuery.PositionAfter(decimal)` is unchanged (used by
access-token lookup). Do not confuse it with
`SearchQueryBuilder.AfterEventSortKey`.
- `commands_to_events` in setup 77 and initialise 08 is `VOLATILE
PARALLEL SAFE`. Shipped 40/64/70 stay `STABLE` because they still stamp
with `NOW()`.
- Drop unused `last_owner TEXT` DECLARE from setup 77 and initialise
`08_events_table.sql` (`i INTEGER` remains for the enforce-owner loop).
Shipped 40/64/70 keep the leftover.
- This PR’s migration is numbered 77 because `main` already has setup 76
(`76_users14_login_equality_indexes`). First-loop order is s70, then
main’s 76, then this 77.
# Additional Context
**Reviewer map**
| Start here | Why |
| --- | --- |
| `cmd/setup/77.sql` + `cmd/setup/77.go` | Position stamp + atomic
function replace/backfill after shipped `s70` and main’s s76 |
| `internal/eventstore/event_sort_key.go` + `search_query.go` |
Canonical cursor and `AfterEventSortKey` |
| `internal/eventstore/handler/v2/{state.go,handler.go}` |
Persist/resume cursor; `eventQuery` |
| `internal/eventstore/repository/sql/{query.go,postgres.go}` | Tuple
`>` filter, 6-column `ORDER BY`, await cap |
| `internal/eventstore/v3/push.go` / `push.sql` | Scan `in_tx_order` on
write |
Mechanical / low-risk: handler and query test fixtures, Event interface
stubs (`event_base.go`, repository Event, mocks, v1 models).
**Do not look for** a `70.sql` change — shipped migrations stay as on
`main`. Setup 40/64 still use `NOW()`; step 77 overwrites the function
afterward. Fresh `FirstInstance` (runs before `s70`) can still stamp
`NOW()` until 77; runtime pushes after 77 use `clock_timestamp()`.
Main’s `cmd/setup/76.go` is the users14 login-equality indexes, not this
stamp.
**Rollout**
1. Run setup so 77 replaces `commands_to_events` and backfills
`filter_offset`.
2. Restart ZITADEL so projectors load the new resume path.
3. Existing missing `users14` rows are not repaired by this PR.
**Tests**
- `go test ./internal/eventstore/... ./cmd/setup/`
- Sort-key SQL fixtures in `query_sort_key_test.go` (no `OFFSET`;
aggregate-id queries keep 6-column `ORDER BY`)
- `cmd/setup/77_test.go` asserts the embed has no unused `last_owner`
and still uses `clock_timestamp()` / `VOLATILE PARALLEL SAFE`
Related: #8509, #10480 (remove OFFSET), #10560 (advisory locks), #10710
(stable ORDER BY).
Out of scope: repairing already-missing projection rows, holding the
exclusive lock during SELECT, rewriting historical setup 40/64 SQL.
<!-- CURSOR_AGENT_PR_BODY_END -->
<div><a
href="https://cursor.com/agents/bc-3da6eb51-11d4-4a8a-8ba0-e190f116df05?cursor_ref=pr_footer&cursor_cta=open_in_web"><picture><source
media="(prefers-color-scheme: dark)"
srcset="https://cursor.com/assets/images/open-in-web-dark.png"><source
media="(prefers-color-scheme: light)"
srcset="https://cursor.com/assets/images/open-in-web-light.png"><img
alt="Open in Web" width="114" height="28"
src="https://cursor.com/assets/images/open-in-web-dark.png"></picture></a> <a
href="https://cursor.com/background-agent?bcId=bc-3da6eb51-11d4-4a8a-8ba0-e190f116df05&cursor_ref=pr_footer&cursor_cta=open_in_cursor"><picture><source
media="(prefers-color-scheme: dark)"
srcset="https://cursor.com/assets/images/open-in-cursor-dark.png"><source
media="(prefers-color-scheme: light)"
srcset="https://cursor.com/assets/images/open-in-cursor-light.png"><img
alt="Open in Cursor" width="131" height="28"
src="https://cursor.com/assets/images/open-in-cursor-dark.png"></picture></a> </div>
---------
Co-authored-by: Cursor Agent <[email protected]>
Co-authored-by: Silvan <[email protected]>
248 lines
6.0 KiB
Go
248 lines
6.0 KiB
Go
package sql
|
|
|
|
import (
|
|
"context"
|
|
"errors"
|
|
"regexp"
|
|
"strconv"
|
|
|
|
"github.com/jackc/pgx/v5/pgconn"
|
|
"github.com/shopspring/decimal"
|
|
|
|
"github.com/zitadel/zitadel/internal/database"
|
|
"github.com/zitadel/zitadel/internal/eventstore"
|
|
"github.com/zitadel/zitadel/internal/eventstore/repository"
|
|
"github.com/zitadel/zitadel/internal/telemetry/tracing"
|
|
)
|
|
|
|
// awaitOpenTransactions drains in-flight writers, then caps at projector TX start (now()),
|
|
// not clock_timestamp(). A wall-clock cap at SELECT time would include rows inserted after
|
|
// BEGIN and recreate position overtake.
|
|
var (
|
|
awaitOpenTransactionsV1 = ` AND created_at <= now()`
|
|
awaitOpenTransactionsV2 = ` AND "position" <= EXTRACT(EPOCH FROM now())`
|
|
)
|
|
|
|
func awaitOpenTransactions(useV1 bool) string {
|
|
if useV1 {
|
|
return awaitOpenTransactionsV1
|
|
}
|
|
return awaitOpenTransactionsV2
|
|
}
|
|
|
|
type Postgres struct {
|
|
*database.DB
|
|
}
|
|
|
|
func NewPostgres(client *database.DB) *Postgres {
|
|
return &Postgres{client}
|
|
}
|
|
|
|
func (db *Postgres) Health(ctx context.Context) error { return db.Ping() }
|
|
|
|
const eventSortKeySQL = `"position", in_tx_order, instance_id, aggregate_type, aggregate_id, "sequence"`
|
|
|
|
// FilterToReducer finds all events matching the given search query and passes them to the reduce function.
|
|
func (psql *Postgres) FilterToReducer(ctx context.Context, searchQuery *eventstore.SearchQueryBuilder, reduce eventstore.Reducer) (err error) {
|
|
ctx, span := tracing.NewSpan(ctx)
|
|
defer func() { span.EndWithError(err) }()
|
|
|
|
err = query(ctx, psql, searchQuery, reduce, false)
|
|
if err == nil {
|
|
return nil
|
|
}
|
|
pgErr := new(pgconn.PgError)
|
|
// check events2 not exists
|
|
if errors.As(err, &pgErr) && pgErr.Code == "42P01" {
|
|
return query(ctx, psql, searchQuery, reduce, true)
|
|
}
|
|
return err
|
|
}
|
|
|
|
// LatestPosition returns the latest position found by the search query
|
|
func (db *Postgres) LatestPosition(ctx context.Context, searchQuery *eventstore.SearchQueryBuilder) (decimal.Decimal, error) {
|
|
var position decimal.Decimal
|
|
err := query(ctx, db, searchQuery, &position, false)
|
|
return position, err
|
|
}
|
|
|
|
// InstanceIDs returns the instance ids found by the search query
|
|
func (db *Postgres) InstanceIDs(ctx context.Context, searchQuery *eventstore.SearchQueryBuilder) ([]string, error) {
|
|
var ids []string
|
|
err := query(ctx, db, searchQuery, &ids, false)
|
|
if err != nil {
|
|
return nil, err
|
|
}
|
|
return ids, nil
|
|
}
|
|
|
|
func (db *Postgres) Client() *database.DB {
|
|
return db.DB
|
|
}
|
|
|
|
func (db *Postgres) orderByEventSequence(desc, shouldOrderBySequence, useV1 bool) string {
|
|
if useV1 {
|
|
if desc {
|
|
return ` ORDER BY event_sequence DESC`
|
|
}
|
|
return ` ORDER BY event_sequence`
|
|
}
|
|
if shouldOrderBySequence {
|
|
if desc {
|
|
return ` ORDER BY "sequence" DESC`
|
|
}
|
|
return ` ORDER BY "sequence"`
|
|
}
|
|
|
|
if desc {
|
|
return ` ORDER BY (` + eventSortKeySQL + `) DESC`
|
|
}
|
|
return ` ORDER BY ` + eventSortKeySQL
|
|
}
|
|
|
|
func (db *Postgres) eventQuery(useV1 bool) string {
|
|
if useV1 {
|
|
return "SELECT" +
|
|
" creation_date" +
|
|
", event_type" +
|
|
", event_sequence" +
|
|
", event_data" +
|
|
", editor_user" +
|
|
", resource_owner" +
|
|
", instance_id" +
|
|
", aggregate_type" +
|
|
", aggregate_id" +
|
|
", aggregate_version" +
|
|
" FROM eventstore.events"
|
|
}
|
|
return "SELECT" +
|
|
" created_at" +
|
|
", event_type" +
|
|
`, "sequence"` +
|
|
`, "position"` +
|
|
", payload" +
|
|
", creator" +
|
|
`, "owner"` +
|
|
", instance_id" +
|
|
", aggregate_type" +
|
|
", aggregate_id" +
|
|
", revision" +
|
|
", in_tx_order" +
|
|
" FROM eventstore.events2"
|
|
}
|
|
|
|
func (db *Postgres) maxPositionQuery(useV1 bool) string {
|
|
if useV1 {
|
|
return `SELECT event_sequence FROM eventstore.events`
|
|
}
|
|
return `SELECT "position" FROM eventstore.events2`
|
|
}
|
|
|
|
func (db *Postgres) instanceIDsQuery(useV1 bool) string {
|
|
table := "eventstore.events2"
|
|
if useV1 {
|
|
table = "eventstore.events"
|
|
}
|
|
return "SELECT DISTINCT instance_id FROM " + table
|
|
}
|
|
|
|
func (db *Postgres) columnName(col repository.Field, useV1 bool) string {
|
|
switch col {
|
|
case repository.FieldAggregateID:
|
|
return "aggregate_id"
|
|
case repository.FieldAggregateType:
|
|
return "aggregate_type"
|
|
case repository.FieldSequence:
|
|
if useV1 {
|
|
return "event_sequence"
|
|
}
|
|
return `"sequence"`
|
|
case repository.FieldResourceOwner:
|
|
if useV1 {
|
|
return "resource_owner"
|
|
}
|
|
return `"owner"`
|
|
case repository.FieldInstanceID:
|
|
return "instance_id"
|
|
case repository.FieldEditorService:
|
|
if useV1 {
|
|
return "editor_service"
|
|
}
|
|
return ""
|
|
case repository.FieldEditorUser:
|
|
if useV1 {
|
|
return "editor_user"
|
|
}
|
|
return "creator"
|
|
case repository.FieldEventType:
|
|
return "event_type"
|
|
case repository.FieldEventData:
|
|
if useV1 {
|
|
return "event_data"
|
|
}
|
|
return "payload"
|
|
case repository.FieldCreationDate:
|
|
if useV1 {
|
|
return "creation_date"
|
|
}
|
|
return "created_at"
|
|
case repository.FieldPosition:
|
|
return `"position"`
|
|
default:
|
|
return ""
|
|
}
|
|
}
|
|
|
|
func (db *Postgres) conditionFormat(operation repository.Operation) string {
|
|
switch operation {
|
|
case repository.OperationIn:
|
|
return "%s %s ANY(?)"
|
|
case repository.OperationNotIn:
|
|
return "%s %s ALL(?)"
|
|
case repository.OperationEquals, repository.OperationGreater, repository.OperationLess, repository.OperationJSONContains:
|
|
fallthrough
|
|
default:
|
|
return "%s %s ?"
|
|
}
|
|
}
|
|
|
|
func (db *Postgres) operation(operation repository.Operation) string {
|
|
switch operation {
|
|
case repository.OperationEquals, repository.OperationIn:
|
|
return "="
|
|
case repository.OperationGreater:
|
|
return ">"
|
|
case repository.OperationGreaterOrEquals:
|
|
return ">="
|
|
case repository.OperationLess:
|
|
return "<"
|
|
case repository.OperationJSONContains:
|
|
return "@>"
|
|
case repository.OperationNotIn:
|
|
return "<>"
|
|
}
|
|
return ""
|
|
}
|
|
|
|
var (
|
|
placeholder = regexp.MustCompile(`\?`)
|
|
)
|
|
|
|
// placeholder replaces all "?" with postgres placeholders ($<NUMBER>)
|
|
func (db *Postgres) placeholder(query string) string {
|
|
occurrences := placeholder.FindAllStringIndex(query, -1)
|
|
if len(occurrences) == 0 {
|
|
return query
|
|
}
|
|
replaced := query[:occurrences[0][0]]
|
|
|
|
for i, l := range occurrences {
|
|
nextIDX := len(query)
|
|
if i < len(occurrences)-1 {
|
|
nextIDX = occurrences[i+1][0]
|
|
}
|
|
replaced = replaced + "$" + strconv.Itoa(i+1) + query[l[1]:nextIDX]
|
|
}
|
|
return replaced
|
|
}
|