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]>
183 lines
4.9 KiB
Go
183 lines
4.9 KiB
Go
package eventstore
|
|
|
|
import (
|
|
"encoding/json"
|
|
"log/slog"
|
|
"maps"
|
|
"reflect"
|
|
"slices"
|
|
"time"
|
|
|
|
"github.com/shopspring/decimal"
|
|
|
|
"github.com/zitadel/zitadel/internal/zerrors"
|
|
)
|
|
|
|
type action interface {
|
|
Aggregate() *Aggregate
|
|
|
|
// Creator is the userid of the user which created the action
|
|
Creator() string
|
|
// Type describes the action
|
|
Type() EventType
|
|
// Revision of the action
|
|
Revision() uint16
|
|
}
|
|
|
|
// Command is the intent to store an event into the eventstore
|
|
type Command interface {
|
|
action
|
|
// Payload returns the payload of the event. It represents the changed fields by the event
|
|
// valid types are:
|
|
// * nil: no payload
|
|
// * struct: which can be marshalled to json
|
|
// * pointer: to struct which can be marshalled to json
|
|
// * []byte: json marshalled data
|
|
Payload() any
|
|
// UniqueConstraints should be added for unique attributes of an event, if nil constraints will not be checked
|
|
UniqueConstraints() []*UniqueConstraint
|
|
// Fields should be added for fields which should be indexed for lookup, if nil fields will not be indexed
|
|
Fields() []*FieldOperation
|
|
}
|
|
|
|
type EnforceResourceOwnerCommand interface {
|
|
Command
|
|
// EnforceResourceOwner indicates that the resource owner of the event does not respect the previous events and should be enforced by the eventstore.
|
|
EnforceResourceOwner()
|
|
}
|
|
|
|
func ShouldEnforceResourceOwner(cmd Command) bool {
|
|
_, ok := cmd.(EnforceResourceOwnerCommand)
|
|
return ok
|
|
}
|
|
|
|
// Event is a stored activity
|
|
type Event interface {
|
|
action
|
|
|
|
// Sequence of the event in the aggregate
|
|
Sequence() uint64
|
|
// CreatedAt is the time the event was created at
|
|
CreatedAt() time.Time
|
|
// Position is the global position of the event
|
|
Position() decimal.Decimal
|
|
// InTxOrder is the 1-based ordinal of the event inside its push transaction
|
|
InTxOrder() uint32
|
|
|
|
// Unmarshal parses the payload and stores the result
|
|
// in the value pointed to by ptr. If ptr is nil or not a pointer,
|
|
// Unmarshal returns an error
|
|
Unmarshal(ptr any) error
|
|
|
|
// Deprecated: only use for migration
|
|
DataAsBytes() []byte
|
|
}
|
|
|
|
type EventType string
|
|
|
|
func EventData(event Command) ([]byte, error) {
|
|
switch data := event.Payload().(type) {
|
|
case nil:
|
|
return nil, nil
|
|
case []byte:
|
|
if json.Valid(data) {
|
|
return data, nil
|
|
}
|
|
return nil, zerrors.ThrowInvalidArgument(nil, "V2-6SbbS", "data bytes are not json")
|
|
}
|
|
dataType := reflect.TypeOf(event.Payload())
|
|
if dataType.Kind() == reflect.Ptr {
|
|
dataType = dataType.Elem()
|
|
}
|
|
if dataType.Kind() == reflect.Struct {
|
|
dataBytes, err := json.Marshal(event.Payload())
|
|
if err != nil {
|
|
return nil, zerrors.ThrowInvalidArgument(err, "V2-xG87M", "could not marshal data")
|
|
}
|
|
return dataBytes, nil
|
|
}
|
|
return nil, zerrors.ThrowInvalidArgument(nil, "V2-91NRm", "wrong type of event data")
|
|
}
|
|
|
|
type BaseEventSetter[T any] interface {
|
|
Event
|
|
SetBaseEvent(*BaseEvent)
|
|
*T
|
|
}
|
|
|
|
func GenericEventMapper[T any, PT BaseEventSetter[T]](event Event) (Event, error) {
|
|
e := PT(new(T))
|
|
e.SetBaseEvent(BaseEventFromRepo(event))
|
|
|
|
err := event.Unmarshal(e)
|
|
if err != nil {
|
|
return nil, zerrors.ThrowInternal(err, "ES-Thai6", "unable to unmarshal event")
|
|
}
|
|
|
|
return e, nil
|
|
}
|
|
|
|
func isEventTypes(command Command, types ...EventType) bool {
|
|
for _, typ := range types {
|
|
if command.Type() == typ {
|
|
return true
|
|
}
|
|
}
|
|
return false
|
|
}
|
|
|
|
type logValue struct {
|
|
event Event
|
|
}
|
|
|
|
func eventToLogValue(event Event) slog.LogValuer {
|
|
return &logValue{
|
|
event: event,
|
|
}
|
|
}
|
|
|
|
func (lv *logValue) LogValue() slog.Value {
|
|
attributes := make([]slog.Attr, 0, 12)
|
|
aggregate := lv.event.Aggregate()
|
|
attributes = append(attributes,
|
|
slog.String("aggregate_id", aggregate.ID),
|
|
slog.String("aggregate_type", string(aggregate.Type)),
|
|
slog.String("resource_owner", aggregate.ResourceOwner),
|
|
slog.String("instance_id", aggregate.InstanceID),
|
|
slog.String("version", string(aggregate.Version)),
|
|
slog.String("creator", lv.event.Creator()),
|
|
slog.String("event_type", string(lv.event.Type())),
|
|
slog.Uint64("revision", uint64(lv.event.Revision())),
|
|
slog.Uint64("sequence", lv.event.Sequence()),
|
|
slog.Time("created_at", lv.event.CreatedAt()),
|
|
slog.String("position", lv.event.Position().String()),
|
|
)
|
|
|
|
var m map[string]any
|
|
err := lv.event.Unmarshal(&m)
|
|
if err != nil {
|
|
attributes = append(attributes,
|
|
slog.String("msg", "failed to unmarshal event for logging"),
|
|
slog.String("err", err.Error()),
|
|
)
|
|
return slog.GroupValue(attributes...)
|
|
}
|
|
attributes = append(attributes,
|
|
slog.Any("data", mapToLogValue(m)),
|
|
)
|
|
return slog.GroupValue(attributes...)
|
|
}
|
|
|
|
// mapToLogValue converts a map[string]any to a [slog.Value], handling nested maps recursively.
|
|
func mapToLogValue(m map[string]any) slog.Value {
|
|
attributes := make([]slog.Attr, 0, len(m))
|
|
for _, key := range slices.Sorted(maps.Keys(m)) {
|
|
value := m[key]
|
|
if nestedMap, ok := value.(map[string]any); ok {
|
|
value = mapToLogValue(nestedMap)
|
|
}
|
|
attributes = append(attributes, slog.Any(key, value))
|
|
}
|
|
return slog.GroupValue(attributes...)
|
|
}
|