mirror of
https://github.com/zitadel/zitadel.git
synced 2025-11-02 03:38:46 +00:00
# Which Problems Are Solved
The event execution system currently uses a projection handler that
subscribes to and processes all events for all instances. This creates a
high static cost because the system over-fetches event data, handling
many events that are not needed by most instances. This inefficiency is
also reflected in high "rows returned" metrics in the database.
# How the Problems Are Solved
Eliminate the use of a project handler. Instead, events for which
"execution targets" are defined, are directly pushed to the queue by the
eventstore. A Router is populated in the Instance object in the authz
middleware.
- By joining the execution targets to the instance, no additional
queries are needed anymore.
- As part of the instance object, execution targets are now cached as
well.
- Events are queued within the same transaction, giving transactional
guarantees on delivery.
- Uses the "insert many fast` variant of River. Multiple jobs are queued
in a single round-trip to the database.
- Fix compatibility with PostgreSQL 15
# Additional Changes
- The signing key was stored as plain-text in the river job payload in
the DB. This violated our [Secrets
Storage](https://zitadel.com/docs/concepts/architecture/secrets#secrets-storage)
principle. This change removed the field and only uses the encrypted
version of the signing key.
- Fixed the target ordering from descending to ascending.
- Some minor linter warnings on the use of `io.WriteString()`.
# Additional Context
- Introduced in https://github.com/zitadel/zitadel/pull/9249
- Closes https://github.com/zitadel/zitadel/issues/10553
- Closes https://github.com/zitadel/zitadel/issues/9832
- Closes https://github.com/zitadel/zitadel/issues/10372
- Closes https://github.com/zitadel/zitadel/issues/10492
---------
Co-authored-by: Stefan Benz <46600784+stebenz@users.noreply.github.com>
(cherry picked from commit a9ebc06c77)
114 lines
3.0 KiB
Go
114 lines
3.0 KiB
Go
package query
|
|
|
|
import (
|
|
"context"
|
|
"database/sql"
|
|
|
|
sq "github.com/Masterminds/squirrel"
|
|
"github.com/zitadel/logging"
|
|
|
|
"github.com/zitadel/zitadel/internal/api/authz"
|
|
"github.com/zitadel/zitadel/internal/database"
|
|
"github.com/zitadel/zitadel/internal/telemetry/tracing"
|
|
"github.com/zitadel/zitadel/internal/zerrors"
|
|
)
|
|
|
|
func genericRowsQuery[R any](
|
|
ctx context.Context,
|
|
client *database.DB,
|
|
query sq.SelectBuilder,
|
|
scan func(rows *sql.Rows) (R, error),
|
|
) (resp R, err error) {
|
|
var rnil R
|
|
ctx, span := tracing.NewSpan(ctx)
|
|
defer func() { span.EndWithError(err) }()
|
|
|
|
stmt, args, err := query.ToSql()
|
|
if err != nil {
|
|
logging.OnError(err).Warn("query: invalid request")
|
|
return rnil, zerrors.ThrowInvalidArgument(err, "QUERY-05wf2q36ji", "Errors.Query.InvalidRequest")
|
|
}
|
|
err = client.QueryContext(ctx, func(rows *sql.Rows) error {
|
|
resp, err = scan(rows)
|
|
return err
|
|
}, stmt, args...)
|
|
if err != nil {
|
|
logging.OnError(err).Error("query: internal error")
|
|
return rnil, zerrors.ThrowInternal(err, "QUERY-y2u7vctrha", "Errors.Internal")
|
|
}
|
|
return resp, err
|
|
}
|
|
|
|
func genericRowsQueryWithState[R Stateful](
|
|
ctx context.Context,
|
|
client *database.DB,
|
|
projection table,
|
|
query sq.SelectBuilder,
|
|
scan func(rows *sql.Rows) (R, error),
|
|
) (resp R, err error) {
|
|
var rnil R
|
|
resp, err = genericRowsQuery(ctx, client, query, scan)
|
|
if err != nil {
|
|
return rnil, err
|
|
}
|
|
state, err := latestState(ctx, client, projection)
|
|
if err != nil {
|
|
logging.OnError(err).Error("query: latest state")
|
|
return rnil, err
|
|
}
|
|
resp.SetState(state)
|
|
return resp, err
|
|
}
|
|
|
|
func latestState(ctx context.Context, client *database.DB, projections ...table) (state *State, err error) {
|
|
ctx, span := tracing.NewSpan(ctx)
|
|
defer func() { span.EndWithError(err) }()
|
|
|
|
query, scan := prepareLatestState()
|
|
or := make(sq.Or, len(projections))
|
|
for i, projection := range projections {
|
|
or[i] = sq.Eq{CurrentStateColProjectionName.identifier(): projection.name}
|
|
}
|
|
stmt, args, err := query.
|
|
Where(or).
|
|
Where(sq.Eq{CurrentStateColInstanceID.identifier(): authz.GetInstance(ctx).InstanceID()}).
|
|
OrderBy(CurrentStateColEventDate.identifier() + " DESC").
|
|
ToSql()
|
|
if err != nil {
|
|
return nil, zerrors.ThrowInternal(err, "QUERY-5CfX9", "Errors.Query.SQLStatement")
|
|
}
|
|
|
|
err = client.QueryRowContext(ctx, func(row *sql.Row) error {
|
|
state, err = scan(row)
|
|
return err
|
|
}, stmt, args...)
|
|
|
|
return state, err
|
|
}
|
|
|
|
func genericRowQuery[R any](
|
|
ctx context.Context,
|
|
client *database.DB,
|
|
query sq.SelectBuilder,
|
|
scan func(row *sql.Row) (R, error),
|
|
) (resp R, err error) {
|
|
var rnil R
|
|
ctx, span := tracing.NewSpan(ctx)
|
|
defer func() { span.EndWithError(err) }()
|
|
|
|
stmt, args, err := query.ToSql()
|
|
if err != nil {
|
|
return rnil, zerrors.ThrowInternal(err, "QUERY-s969t763z4", "Errors.Query.SQLStatement")
|
|
}
|
|
|
|
err = client.QueryRowContext(ctx, func(row *sql.Row) error {
|
|
resp, err = scan(row)
|
|
return err
|
|
}, stmt, args...)
|
|
return resp, err
|
|
}
|
|
|
|
func combineToWhereStmt(query sq.SelectBuilder, toQuery func(query sq.SelectBuilder) sq.SelectBuilder, eq interface{}) sq.SelectBuilder {
|
|
return toQuery(query).Where(eq)
|
|
}
|