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]>
363 lines
9.8 KiB
Go
363 lines
9.8 KiB
Go
package sql
|
|
|
|
import (
|
|
"context"
|
|
"database/sql"
|
|
"encoding/json"
|
|
"errors"
|
|
"fmt"
|
|
"strconv"
|
|
"strings"
|
|
|
|
"github.com/shopspring/decimal"
|
|
"github.com/zitadel/logging"
|
|
|
|
"github.com/zitadel/zitadel/internal/api/authz"
|
|
"github.com/zitadel/zitadel/internal/database"
|
|
"github.com/zitadel/zitadel/internal/database/dialect"
|
|
"github.com/zitadel/zitadel/internal/eventstore"
|
|
"github.com/zitadel/zitadel/internal/eventstore/repository"
|
|
"github.com/zitadel/zitadel/internal/zerrors"
|
|
)
|
|
|
|
type querier interface {
|
|
columnName(field repository.Field, useV1 bool) string
|
|
operation(repository.Operation) string
|
|
conditionFormat(repository.Operation) string
|
|
placeholder(query string) string
|
|
eventQuery(useV1 bool) string
|
|
maxPositionQuery(useV1 bool) string
|
|
instanceIDsQuery(useV1 bool) string
|
|
Client() *database.DB
|
|
orderByEventSequence(desc, shouldOrderBySequence, useV1 bool) string
|
|
dialect.Database
|
|
}
|
|
|
|
type scan func(dest ...interface{}) error
|
|
|
|
type tx struct {
|
|
*sql.Tx
|
|
}
|
|
|
|
func (t *tx) QueryContext(ctx context.Context, scan func(rows *sql.Rows) error, query string, args ...any) error {
|
|
rows, err := t.Tx.QueryContext(ctx, query, args...)
|
|
if err != nil {
|
|
return err
|
|
}
|
|
defer func() {
|
|
closeErr := rows.Close()
|
|
logging.OnError(closeErr).Info("rows.Close failed")
|
|
}()
|
|
|
|
if err = scan(rows); err != nil {
|
|
return err
|
|
}
|
|
return rows.Err()
|
|
}
|
|
|
|
func query(ctx context.Context, criteria querier, searchQuery *eventstore.SearchQueryBuilder, dest interface{}, useV1 bool) error {
|
|
q, err := repository.QueryFromBuilder(searchQuery)
|
|
if err != nil {
|
|
return err
|
|
}
|
|
|
|
query, rowScanner := prepareColumns(criteria, q.Columns, useV1)
|
|
where, values := prepareConditions(criteria, q, useV1)
|
|
if where == "" || query == "" {
|
|
return zerrors.ThrowInvalidArgument(nil, "SQL-rWeBw", "invalid query factory")
|
|
}
|
|
|
|
var contextQuerier interface {
|
|
QueryContext(context.Context, func(rows *sql.Rows) error, string, ...interface{}) error
|
|
ExecContext(context.Context, string, ...any) (sql.Result, error)
|
|
}
|
|
contextQuerier = criteria.Client()
|
|
if q.Tx != nil {
|
|
contextQuerier = &tx{Tx: q.Tx}
|
|
}
|
|
|
|
if q.AwaitOpenTransactions && q.Columns == eventstore.ColumnsEvent {
|
|
instanceID := authz.GetInstance(ctx).InstanceID()
|
|
if q.InstanceID != nil {
|
|
instanceID = q.InstanceID.Value.(string)
|
|
}
|
|
|
|
_, err = contextQuerier.ExecContext(ctx,
|
|
"select pg_advisory_lock('eventstore.events2'::REGCLASS::OID::INTEGER, hashtext($1)), pg_advisory_unlock('eventstore.events2'::REGCLASS::OID::INTEGER, hashtext($1))",
|
|
instanceID,
|
|
)
|
|
if err != nil {
|
|
return err
|
|
}
|
|
|
|
where += awaitOpenTransactions(useV1)
|
|
}
|
|
query += where
|
|
|
|
// instead of using the max function of the database (which doesn't work for postgres)
|
|
// we select the most recent row
|
|
if q.Columns == eventstore.ColumnsMaxPosition {
|
|
q.Limit = 1
|
|
q.Desc = true
|
|
}
|
|
|
|
// if there is only one subquery we can optimize the query ordering by sequence
|
|
var shouldOrderBySequence bool
|
|
if q.EventSortKeyAfter == nil && len(q.SubQueries) == 1 {
|
|
for _, filter := range q.SubQueries[0] {
|
|
if filter.Field == repository.FieldAggregateID {
|
|
shouldOrderBySequence = filter.Operation == repository.OperationEquals
|
|
}
|
|
}
|
|
}
|
|
|
|
switch q.Columns {
|
|
case eventstore.ColumnsEvent,
|
|
eventstore.ColumnsMaxPosition:
|
|
query += criteria.orderByEventSequence(q.Desc, shouldOrderBySequence, useV1)
|
|
}
|
|
|
|
if q.Limit > 0 {
|
|
values = append(values, q.Limit)
|
|
query += " LIMIT ?"
|
|
}
|
|
|
|
if q.Offset > 0 {
|
|
values = append(values, q.Offset)
|
|
query += " OFFSET ?"
|
|
}
|
|
|
|
query = criteria.placeholder(query)
|
|
|
|
err = contextQuerier.QueryContext(ctx,
|
|
func(rows *sql.Rows) error {
|
|
for rows.Next() {
|
|
err := rowScanner(rows.Scan, dest)
|
|
if err != nil {
|
|
return err
|
|
}
|
|
}
|
|
return nil
|
|
}, query, values...)
|
|
if err != nil {
|
|
logging.New().WithError(err).Info("query failed")
|
|
return zerrors.ThrowInternal(err, "SQL-KyeAx", "unable to filter events")
|
|
}
|
|
|
|
return nil
|
|
}
|
|
|
|
func prepareColumns(criteria querier, columns eventstore.Columns, useV1 bool) (string, func(s scan, dest interface{}) error) {
|
|
switch columns {
|
|
case eventstore.ColumnsMaxPosition:
|
|
return criteria.maxPositionQuery(useV1), maxPositionScanner
|
|
case eventstore.ColumnsInstanceIDs:
|
|
return criteria.instanceIDsQuery(useV1), instanceIDsScanner
|
|
case eventstore.ColumnsEvent:
|
|
return criteria.eventQuery(useV1), eventsScanner(useV1)
|
|
default:
|
|
return "", nil
|
|
}
|
|
}
|
|
|
|
func maxPositionScanner(row scan, dest interface{}) (err error) {
|
|
position, ok := dest.(*decimal.Decimal)
|
|
if !ok {
|
|
return zerrors.ThrowInvalidArgumentf(nil, "SQL-NBjA9", "type must be pointer to decimal.Decimal got: %T", dest)
|
|
}
|
|
var res decimal.NullDecimal
|
|
err = row(&res)
|
|
if err == nil || errors.Is(err, sql.ErrNoRows) {
|
|
*position = res.Decimal
|
|
return nil
|
|
}
|
|
return zerrors.ThrowInternal(err, "SQL-bN5xg", "something went wrong")
|
|
}
|
|
|
|
func instanceIDsScanner(scanner scan, dest interface{}) (err error) {
|
|
ids, ok := dest.(*[]string)
|
|
if !ok {
|
|
return zerrors.ThrowInvalidArgument(nil, "SQL-Begh2", "type must be an array of string")
|
|
}
|
|
var id string
|
|
err = scanner(&id)
|
|
if err != nil {
|
|
logging.WithError(err).Warn("unable to scan row")
|
|
return zerrors.ThrowInternal(err, "SQL-DEFGe", "unable to scan row")
|
|
}
|
|
*ids = append(*ids, id)
|
|
|
|
return nil
|
|
}
|
|
|
|
func eventsScanner(useV1 bool) func(scanner scan, dest interface{}) (err error) {
|
|
return func(scanner scan, dest interface{}) (err error) {
|
|
reduce, ok := dest.(eventstore.Reducer)
|
|
if !ok {
|
|
return zerrors.ThrowInvalidArgumentf(nil, "SQL-4GP6F", "events scanner: invalid type %T", dest)
|
|
}
|
|
event := new(repository.Event)
|
|
position := new(decimal.NullDecimal)
|
|
|
|
if useV1 {
|
|
err = scanner(
|
|
&event.CreationDate,
|
|
&event.Typ,
|
|
&event.Seq,
|
|
&event.Data,
|
|
&event.EditorUser,
|
|
&event.ResourceOwner,
|
|
&event.InstanceID,
|
|
&event.AggregateType,
|
|
&event.AggregateID,
|
|
&event.Version,
|
|
)
|
|
} else {
|
|
var revision uint8
|
|
err = scanner(
|
|
&event.CreationDate,
|
|
&event.Typ,
|
|
&event.Seq,
|
|
position,
|
|
&event.Data,
|
|
&event.EditorUser,
|
|
&event.ResourceOwner,
|
|
&event.InstanceID,
|
|
&event.AggregateType,
|
|
&event.AggregateID,
|
|
&revision,
|
|
&event.InTx,
|
|
)
|
|
event.Version = eventstore.Version("v" + strconv.Itoa(int(revision)))
|
|
}
|
|
|
|
if err != nil {
|
|
logging.New().WithError(err).Warn("unable to scan row")
|
|
return zerrors.ThrowInternal(err, "SQL-M0dsf", "unable to scan row")
|
|
}
|
|
event.Pos = position.Decimal
|
|
return reduce(event)
|
|
}
|
|
}
|
|
|
|
func prepareConditions(criteria querier, query *repository.SearchQuery, useV1 bool) (_ string, args []any) {
|
|
clauses, args := prepareQuery(criteria, useV1, query.InstanceID, query.InstanceIDs, query.ExcludedInstances)
|
|
if clauses != "" && len(query.SubQueries) > 0 {
|
|
clauses += " AND "
|
|
}
|
|
subClauses := make([]string, len(query.SubQueries))
|
|
for i, filters := range query.SubQueries {
|
|
var subArgs []any
|
|
subClauses[i], subArgs = prepareQuery(criteria, useV1, filters...)
|
|
// an error is thrown in [query]
|
|
if subClauses[i] == "" {
|
|
return "", nil
|
|
}
|
|
if len(query.SubQueries) > 1 && len(subArgs) > 1 {
|
|
subClauses[i] = "(" + subClauses[i] + ")"
|
|
}
|
|
args = append(args, subArgs...)
|
|
}
|
|
if len(subClauses) == 1 {
|
|
clauses += subClauses[0]
|
|
} else if len(subClauses) > 1 {
|
|
clauses += "(" + strings.Join(subClauses, " OR ") + ")"
|
|
}
|
|
|
|
additionalClauses, additionalArgs := prepareQuery(criteria, useV1,
|
|
query.Position,
|
|
query.Owner,
|
|
query.Sequence,
|
|
query.CreatedAfter,
|
|
query.CreatedBefore,
|
|
query.Creator,
|
|
)
|
|
if additionalClauses != "" {
|
|
if clauses != "" {
|
|
clauses += " AND "
|
|
}
|
|
clauses += additionalClauses
|
|
args = append(args, additionalArgs...)
|
|
}
|
|
|
|
if query.EventSortKeyAfter != nil && !useV1 {
|
|
if clauses != "" {
|
|
clauses += " AND "
|
|
}
|
|
clauses += `(` + eventSortKeySQL + `) > (?, ?, ?, ?, ?, ?)`
|
|
args = append(args,
|
|
query.EventSortKeyAfter.Position,
|
|
query.EventSortKeyAfter.InTxOrder,
|
|
query.EventSortKeyAfter.InstanceID,
|
|
query.EventSortKeyAfter.AggregateType,
|
|
query.EventSortKeyAfter.AggregateID,
|
|
query.EventSortKeyAfter.Sequence,
|
|
)
|
|
}
|
|
|
|
excludeAggregateIDs := query.ExcludeAggregateIDs
|
|
if len(excludeAggregateIDs) > 0 {
|
|
excludeAggregateIDs = append(excludeAggregateIDs, query.InstanceID, query.InstanceIDs, query.Position, query.CreatedAfter, query.CreatedBefore)
|
|
}
|
|
excludeAggregateIDsClauses, excludeAggregateIDsArgs := prepareQuery(criteria, useV1, excludeAggregateIDs...)
|
|
if excludeAggregateIDsClauses != "" {
|
|
if clauses != "" {
|
|
clauses += " AND "
|
|
}
|
|
if useV1 {
|
|
clauses += "aggregate_id NOT IN (SELECT aggregate_id FROM eventstore.events WHERE " + excludeAggregateIDsClauses + ")"
|
|
} else {
|
|
clauses += "aggregate_id NOT IN (SELECT aggregate_id FROM eventstore.events2 WHERE " + excludeAggregateIDsClauses + ")"
|
|
}
|
|
args = append(args, excludeAggregateIDsArgs...)
|
|
}
|
|
|
|
if clauses == "" {
|
|
return "", nil
|
|
}
|
|
|
|
return " WHERE " + clauses, args
|
|
}
|
|
|
|
func prepareQuery(criteria querier, useV1 bool, filters ...*repository.Filter) (_ string, args []any) {
|
|
clauses := make([]string, 0, len(filters))
|
|
args = make([]any, 0, len(filters))
|
|
for _, filter := range filters {
|
|
if filter == nil {
|
|
continue
|
|
}
|
|
arg := filter.Value
|
|
|
|
// marshal if payload filter
|
|
if filter.Field == repository.FieldEventData {
|
|
var err error
|
|
arg, err = json.Marshal(arg)
|
|
if err != nil {
|
|
logging.WithError(err).Warn("unable to marshal search value")
|
|
continue
|
|
}
|
|
|
|
}
|
|
|
|
clauses = append(clauses, getCondition(criteria, filter, useV1))
|
|
// if mapping failed an error is thrown in [query]
|
|
if clauses[len(clauses)-1] == "" {
|
|
return "", nil
|
|
}
|
|
args = append(args, arg)
|
|
}
|
|
|
|
return strings.Join(clauses, " AND "), args
|
|
}
|
|
|
|
func getCondition(cond querier, filter *repository.Filter, useV1 bool) (condition string) {
|
|
field := cond.columnName(filter.Field, useV1)
|
|
operation := cond.operation(filter.Operation)
|
|
if field == "" || operation == "" {
|
|
return ""
|
|
}
|
|
format := cond.conditionFormat(filter.Operation)
|
|
|
|
return fmt.Sprintf(format, field, operation)
|
|
}
|