mirror of
https://github.com/andwati/zitadel.git
synced 2026-10-18 13:52:51 +00:00
Improves compatibility of eventstore and related database components with the new relational table package. ## Which problems are solved 1. **Incompatible Database Interfaces**: The existing eventstore was tightly coupled to the database package, which is incompatible with the new, more abstract relational table package in v3. This prevented the new command-side logic from pushing events to the legacy eventstore. 2. **Missing Health Checks**: The database interfaces in the new package lacked a Ping method, making it impossible to perform health checks on database connections. 3. **Event Publishing Logic**: The command handling logic in domain needed a way to collect and push events to the legacy eventstore after a command was successfully executed. ## How the problems are solved 1. **`LegacyEventstore` Interface**: * A new `LegacyEventstore` interface is introduced in the new `database/eventstore` . This interface exposes a `PushWithNewClient` method that accepts the new `database.QueryExecutor` interface, decoupling the v3 domain from the legacy implementation. * The `internal/eventstore.Eventstore` now implements this interface. A wrapper, PushWithClient, is added to convert the old database client types (`*sql.DB`, `*sql.Tx`) into the new `QueryExecutor` types before calling `PushWithNewClient`. 2. **Database Interface Updates**: * The `database.Pool` and `database.Client` interfaces in `storage/eventstore` have been updated to include a Ping method, allowing for consistent health checks across different database dialects. * The `postgres` and `sql` dialect implementations have been updated to support this new method. 3. **Command and Invoker Refactoring**: * The `Commander` interface in domain now includes an `Events() []legacy_es.Command` method. This allows commands to declare which events they will generate. * The `eventCollector` in the invoker logic has been redesigned. It now ensures a database transaction is started before executing a command. After successful execution, it calls the `Events()` method on the command to collect the generated events and appends them to a list. * The `eventStoreInvoker` then pushes all collected events to the legacy eventstore using the new `LegacyEventstore` interface, ensuring that events are only pushed if the entire command (and any sub-commands) executes successfully within the transaction. 4. **Testing**: * New unit tests have been added for the invoker to verify that events are correctly collected from single commands, batched commands, and nested commands. These changes create a clean bridge between the new v3 command-side logic and the existing v1 eventstore, allowing for incremental adoption of the new architecture while maintaining full functionality. ## Additional Information closes https://github.com/zitadel/zitadel/issues/10442
215 lines
4.9 KiB
Go
215 lines
4.9 KiB
Go
package eventstore
|
|
|
|
import (
|
|
"context"
|
|
"database/sql"
|
|
"encoding/json"
|
|
"errors"
|
|
"sync"
|
|
|
|
"github.com/DATA-DOG/go-sqlmock"
|
|
"github.com/jackc/pgx/v5"
|
|
"github.com/jackc/pgx/v5/pgtype"
|
|
"github.com/jackc/pgx/v5/stdlib"
|
|
"github.com/zitadel/logging"
|
|
|
|
new_db "github.com/zitadel/zitadel/backend/v3/storage/database"
|
|
new_sql "github.com/zitadel/zitadel/backend/v3/storage/database/dialect/sql"
|
|
"github.com/zitadel/zitadel/internal/database"
|
|
"github.com/zitadel/zitadel/internal/database/dialect"
|
|
"github.com/zitadel/zitadel/internal/eventstore"
|
|
)
|
|
|
|
func init() {
|
|
dialect.RegisterAfterConnect(RegisterEventstoreTypes)
|
|
}
|
|
|
|
var (
|
|
// pushPlaceholderFmt defines how data are inserted into the events table
|
|
pushPlaceholderFmt = "($%d, $%d, $%d, $%d, $%d, $%d, $%d, $%d, $%d, statement_timestamp(), EXTRACT(EPOCH FROM clock_timestamp()), $%d)"
|
|
// uniqueConstraintPlaceholderFmt defines the format of the unique constraint error returned from the database
|
|
uniqueConstraintPlaceholderFmt = "(%s, %s, %s)"
|
|
|
|
_ eventstore.Pusher = (*Eventstore)(nil)
|
|
)
|
|
|
|
type Eventstore struct {
|
|
client new_db.Pool
|
|
queue eventstore.ExecutionQueue
|
|
}
|
|
|
|
var (
|
|
textType = &pgtype.Type{
|
|
Name: "text",
|
|
OID: pgtype.TextOID,
|
|
Codec: pgtype.TextCodec{},
|
|
}
|
|
commandType = &pgtype.Type{
|
|
Codec: &pgtype.CompositeCodec{
|
|
Fields: []pgtype.CompositeCodecField{
|
|
{
|
|
Name: "instance_id",
|
|
Type: textType,
|
|
},
|
|
{
|
|
Name: "aggregate_type",
|
|
Type: textType,
|
|
},
|
|
{
|
|
Name: "aggregate_id",
|
|
Type: textType,
|
|
},
|
|
{
|
|
Name: "command_type",
|
|
Type: textType,
|
|
},
|
|
{
|
|
Name: "revision",
|
|
Type: &pgtype.Type{
|
|
Name: "int2",
|
|
OID: pgtype.Int2OID,
|
|
Codec: pgtype.Int2Codec{},
|
|
},
|
|
},
|
|
{
|
|
Name: "payload",
|
|
Type: &pgtype.Type{
|
|
Name: "jsonb",
|
|
OID: pgtype.JSONBOID,
|
|
Codec: &pgtype.JSONBCodec{
|
|
Marshal: json.Marshal,
|
|
Unmarshal: json.Unmarshal,
|
|
},
|
|
},
|
|
},
|
|
{
|
|
Name: "creator",
|
|
Type: textType,
|
|
},
|
|
{
|
|
Name: "owner",
|
|
Type: textType,
|
|
},
|
|
},
|
|
},
|
|
}
|
|
commandArrayCodec = &pgtype.Type{
|
|
Codec: &pgtype.ArrayCodec{
|
|
ElementType: commandType,
|
|
},
|
|
}
|
|
)
|
|
|
|
var typeMu sync.Mutex
|
|
|
|
func RegisterEventstoreTypes(ctx context.Context, conn *pgx.Conn) error {
|
|
// conn.TypeMap is not thread safe
|
|
typeMu.Lock()
|
|
defer typeMu.Unlock()
|
|
|
|
m := conn.TypeMap()
|
|
|
|
var cmd *command
|
|
if _, ok := m.TypeForValue(cmd); ok {
|
|
return nil
|
|
}
|
|
|
|
if commandType.OID == 0 || commandArrayCodec.OID == 0 {
|
|
err := conn.QueryRow(ctx, "select oid, typarray from pg_type where typname = $1 and typnamespace = (select oid from pg_namespace where nspname = $2)", "command", "eventstore").
|
|
Scan(&commandType.OID, &commandArrayCodec.OID)
|
|
if err != nil {
|
|
logging.WithError(err).Debug("failed to get oid for command type")
|
|
return nil
|
|
}
|
|
if commandType.OID == 0 || commandArrayCodec.OID == 0 {
|
|
logging.Debug("oid for command type not found")
|
|
return nil
|
|
}
|
|
}
|
|
|
|
m.RegisterTypes([]*pgtype.Type{
|
|
{
|
|
Name: "eventstore.command",
|
|
Codec: commandType.Codec,
|
|
OID: commandType.OID,
|
|
},
|
|
{
|
|
Name: "command",
|
|
Codec: commandType.Codec,
|
|
OID: commandType.OID,
|
|
},
|
|
{
|
|
Name: "eventstore._command",
|
|
Codec: commandArrayCodec.Codec,
|
|
OID: commandArrayCodec.OID,
|
|
},
|
|
{
|
|
Name: "_command",
|
|
Codec: commandArrayCodec.Codec,
|
|
OID: commandArrayCodec.OID,
|
|
},
|
|
})
|
|
dialect.RegisterDefaultPgTypeVariants[command](m, "eventstore.command", "eventstore._command")
|
|
dialect.RegisterDefaultPgTypeVariants[command](m, "command", "_command")
|
|
|
|
return nil
|
|
}
|
|
|
|
func NewEventstore(client *database.DB, opts ...EventstoreOption) *Eventstore {
|
|
es := &Eventstore{
|
|
client: new_sql.SQLPool(client.DB),
|
|
}
|
|
for _, opt := range opts {
|
|
opt(es)
|
|
}
|
|
return es
|
|
}
|
|
|
|
func (es *Eventstore) Health(ctx context.Context) error {
|
|
return es.client.Ping(ctx)
|
|
}
|
|
|
|
var errTypesNotFound = errors.New("types not found")
|
|
|
|
func CheckExecutionPlan(ctx context.Context, conn *sql.Conn) error {
|
|
return conn.Raw(func(driverConn any) error {
|
|
if _, ok := driverConn.(sqlmock.SqlmockCommon); ok {
|
|
return nil
|
|
}
|
|
conn, ok := driverConn.(*stdlib.Conn)
|
|
if !ok {
|
|
return errTypesNotFound
|
|
}
|
|
|
|
return RegisterEventstoreTypes(ctx, conn.Conn())
|
|
})
|
|
}
|
|
|
|
func (es *Eventstore) pushTx(ctx context.Context, client new_db.QueryExecutor) (tx new_db.Transaction, deferrable func(err error) error, err error) {
|
|
tx, ok := client.(new_db.Transaction)
|
|
if ok {
|
|
return tx, nil, nil
|
|
}
|
|
beginner, ok := client.(new_db.Beginner)
|
|
if !ok {
|
|
beginner = es.client
|
|
}
|
|
|
|
tx, err = beginner.Begin(ctx, &new_db.TransactionOptions{
|
|
IsolationLevel: new_db.IsolationLevelReadCommitted,
|
|
AccessMode: new_db.AccessModeReadWrite,
|
|
})
|
|
if err != nil {
|
|
return nil, nil, err
|
|
}
|
|
return tx, func(err error) error { return tx.End(ctx, err) }, nil
|
|
}
|
|
|
|
type EventstoreOption func(*Eventstore)
|
|
|
|
func WithExecutionQueueOption(queue eventstore.ExecutionQueue) EventstoreOption {
|
|
return func(es *Eventstore) {
|
|
es.queue = queue
|
|
}
|
|
}
|