mirror of
https://github.com/zitadel/zitadel.git
synced 2025-08-12 00:57:33 +00:00
fix(eventstore): precise decimal (#8527)
# Which Problems Are Solved Float64 which was used for the event.Position field is [not precise in go and gets rounded](https://github.com/golang/go/issues/47300). This can lead to unprecies position tracking of events and therefore projections especially on cockcoachdb as the position used there is a big number. example of a unprecies position: exact: 1725257931223002628 float64: 1725257931223002624.000000 # How the Problems Are Solved The float64 was replaced by [github.com/jackc/pgx-shopspring-decimal](https://github.com/jackc/pgx-shopspring-decimal). # Additional Changes Correct behaviour of makefile for load tests. Rename `latestSequence`-queries to `latestPosition`
This commit is contained in:
@@ -5,6 +5,7 @@ import (
|
||||
"strings"
|
||||
"time"
|
||||
|
||||
"github.com/shopspring/decimal"
|
||||
"golang.org/x/text/language"
|
||||
|
||||
"github.com/zitadel/zitadel/internal/domain"
|
||||
@@ -140,7 +141,7 @@ func (q *Queries) accessTokenByOIDCSessionAndTokenID(ctx context.Context, oidcSe
|
||||
|
||||
// checkSessionNotTerminatedAfter checks if a [session.TerminateType] event (or user events leading to a session termination)
|
||||
// occurred after a certain time and will return an error if so.
|
||||
func (q *Queries) checkSessionNotTerminatedAfter(ctx context.Context, sessionID, userID string, position float64, fingerprintID string) (err error) {
|
||||
func (q *Queries) checkSessionNotTerminatedAfter(ctx context.Context, sessionID, userID string, position decimal.Decimal, fingerprintID string) (err error) {
|
||||
ctx, span := tracing.NewSpan(ctx)
|
||||
defer func() { span.EndWithError(err) }()
|
||||
|
||||
@@ -162,7 +163,7 @@ func (q *Queries) checkSessionNotTerminatedAfter(ctx context.Context, sessionID,
|
||||
}
|
||||
|
||||
type sessionTerminatedModel struct {
|
||||
position float64
|
||||
position decimal.Decimal
|
||||
sessionID string
|
||||
userID string
|
||||
fingerPrintID string
|
||||
@@ -182,7 +183,7 @@ func (s *sessionTerminatedModel) AppendEvents(events ...eventstore.Event) {
|
||||
|
||||
func (s *sessionTerminatedModel) Query() *eventstore.SearchQueryBuilder {
|
||||
query := eventstore.NewSearchQueryBuilder(eventstore.ColumnsEvent).
|
||||
PositionAfter(s.position).
|
||||
PositionGreaterEqual(s.position).
|
||||
AddQuery().
|
||||
AggregateTypes(session.AggregateType).
|
||||
AggregateIDs(s.sessionID).
|
||||
|
@@ -10,6 +10,7 @@ import (
|
||||
"time"
|
||||
|
||||
sq "github.com/Masterminds/squirrel"
|
||||
"github.com/shopspring/decimal"
|
||||
"github.com/zitadel/logging"
|
||||
|
||||
"github.com/zitadel/zitadel/internal/api/call"
|
||||
@@ -26,7 +27,7 @@ type Stateful interface {
|
||||
type State struct {
|
||||
LastRun time.Time
|
||||
|
||||
Position float64
|
||||
Position decimal.Decimal
|
||||
EventCreatedAt time.Time
|
||||
AggregateID string
|
||||
AggregateType eventstore.AggregateType
|
||||
@@ -221,7 +222,7 @@ func prepareLatestState(ctx context.Context, db prepareDatabase) (sq.SelectBuild
|
||||
var (
|
||||
creationDate sql.NullTime
|
||||
lastUpdated sql.NullTime
|
||||
position sql.NullFloat64
|
||||
position decimal.NullDecimal
|
||||
)
|
||||
err := row.Scan(
|
||||
&creationDate,
|
||||
@@ -234,7 +235,7 @@ func prepareLatestState(ctx context.Context, db prepareDatabase) (sq.SelectBuild
|
||||
return &State{
|
||||
EventCreatedAt: creationDate.Time,
|
||||
LastRun: lastUpdated.Time,
|
||||
Position: position.Float64,
|
||||
Position: position.Decimal,
|
||||
}, nil
|
||||
}
|
||||
}
|
||||
@@ -259,7 +260,7 @@ func prepareCurrentStateQuery(ctx context.Context, db prepareDatabase) (sq.Selec
|
||||
var (
|
||||
lastRun sql.NullTime
|
||||
eventDate sql.NullTime
|
||||
currentPosition sql.NullFloat64
|
||||
currentPosition decimal.NullDecimal
|
||||
aggregateType sql.NullString
|
||||
aggregateID sql.NullString
|
||||
sequence sql.NullInt64
|
||||
@@ -280,7 +281,7 @@ func prepareCurrentStateQuery(ctx context.Context, db prepareDatabase) (sq.Selec
|
||||
}
|
||||
currentState.State.EventCreatedAt = eventDate.Time
|
||||
currentState.State.LastRun = lastRun.Time
|
||||
currentState.Position = currentPosition.Float64
|
||||
currentState.Position = currentPosition.Decimal
|
||||
currentState.AggregateType = eventstore.AggregateType(aggregateType.String)
|
||||
currentState.AggregateID = aggregateID.String
|
||||
currentState.Sequence = uint64(sequence.Int64)
|
||||
|
@@ -7,6 +7,8 @@ import (
|
||||
"fmt"
|
||||
"regexp"
|
||||
"testing"
|
||||
|
||||
"github.com/shopspring/decimal"
|
||||
)
|
||||
|
||||
var (
|
||||
@@ -87,7 +89,7 @@ func Test_CurrentSequencesPrepares(t *testing.T) {
|
||||
State: State{
|
||||
EventCreatedAt: testNow,
|
||||
LastRun: testNow,
|
||||
Position: 20211108,
|
||||
Position: decimal.NewFromInt(20211108),
|
||||
AggregateID: "agg-id",
|
||||
AggregateType: "agg-type",
|
||||
Sequence: 20211108,
|
||||
@@ -134,7 +136,7 @@ func Test_CurrentSequencesPrepares(t *testing.T) {
|
||||
ProjectionName: "projection-name",
|
||||
State: State{
|
||||
EventCreatedAt: testNow,
|
||||
Position: 20211108,
|
||||
Position: decimal.NewFromInt(20211108),
|
||||
LastRun: testNow,
|
||||
AggregateID: "agg-id",
|
||||
AggregateType: "agg-type",
|
||||
@@ -145,7 +147,7 @@ func Test_CurrentSequencesPrepares(t *testing.T) {
|
||||
ProjectionName: "projection-name2",
|
||||
State: State{
|
||||
EventCreatedAt: testNow,
|
||||
Position: 20211108,
|
||||
Position: decimal.NewFromInt(20211108),
|
||||
LastRun: testNow,
|
||||
AggregateID: "agg-id",
|
||||
AggregateType: "agg-type",
|
||||
|
@@ -277,7 +277,7 @@ func (q *Queries) UserGrants(ctx context.Context, queries *UserGrantsQueries, sh
|
||||
return nil, zerrors.ThrowInternal(err, "QUERY-wXnQR", "Errors.Query.SQLStatement")
|
||||
}
|
||||
|
||||
latestSequence, err := q.latestState(ctx, userGrantTable)
|
||||
latestState, err := q.latestState(ctx, userGrantTable)
|
||||
if err != nil {
|
||||
return nil, err
|
||||
}
|
||||
@@ -290,7 +290,7 @@ func (q *Queries) UserGrants(ctx context.Context, queries *UserGrantsQueries, sh
|
||||
return nil, err
|
||||
}
|
||||
|
||||
grants.State = latestSequence
|
||||
grants.State = latestState
|
||||
return grants, nil
|
||||
}
|
||||
|
||||
|
@@ -144,7 +144,7 @@ func (q *Queries) Memberships(ctx context.Context, queries *MembershipSearchQuer
|
||||
if err != nil {
|
||||
return nil, zerrors.ThrowInvalidArgument(err, "QUERY-T84X9", "Errors.Query.InvalidRequest")
|
||||
}
|
||||
latestSequence, err := q.latestState(ctx, orgMemberTable, instanceMemberTable, projectMemberTable, projectGrantMemberTable)
|
||||
latestState, err := q.latestState(ctx, orgMemberTable, instanceMemberTable, projectMemberTable, projectGrantMemberTable)
|
||||
if err != nil {
|
||||
return nil, err
|
||||
}
|
||||
@@ -157,7 +157,7 @@ func (q *Queries) Memberships(ctx context.Context, queries *MembershipSearchQuer
|
||||
if err != nil {
|
||||
return nil, err
|
||||
}
|
||||
memberships.State = latestSequence
|
||||
memberships.State = latestState
|
||||
return memberships, nil
|
||||
}
|
||||
|
||||
|
Reference in New Issue
Block a user