feat: fandom doesn't need queries by nid, to speed up the queries skip nid where clauses, this will need to be revewed during the next kratos upgrade, SPLAT-930

Author: abador

persistence/sql/persister_continuity.go

@@ -76,13 +76,12 @@ func (p *Persister) DeleteExpiredContinuitySessions(ctx context.Context, expires
 	defer otelx.End(span, &err)
 	//#nosec G201 -- TableName is static
 	err = p.GetConnection(ctx).RawQuery(fmt.Sprintf(
-		"DELETE FROM %s WHERE id in (SELECT id FROM (SELECT id FROM %s c WHERE expires_at <= ? and nid = ? ORDER BY expires_at ASC LIMIT %d ) AS s )",
+		"DELETE FROM %s WHERE id in (SELECT id FROM (SELECT id FROM %s c WHERE expires_at <= ? ORDER BY expires_at ASC LIMIT %d ) AS s )",
 		new(continuity.Container).TableName(ctx),
 		new(continuity.Container).TableName(ctx),
 		limit,
 	),
 		expiresAt,
-		p.NetworkID(ctx),
 	).Exec()
 	if err != nil {
 		return sqlcon.HandleError(err)

persistence/sql/persister_login.go

@@ -73,13 +73,12 @@ func (p *Persister) DeleteExpiredLoginFlows(ctx context.Context, expiresAt time.
 	defer otelx.End(span, &err)
 	//#nosec G201 -- TableName is static
 	err = p.GetConnection(ctx).RawQuery(fmt.Sprintf(
-		"DELETE FROM %s WHERE id in (SELECT id FROM (SELECT id FROM %s c WHERE expires_at <= ? and nid = ? ORDER BY expires_at ASC LIMIT %d ) AS s )",
+		"DELETE FROM %s WHERE id in (SELECT id FROM (SELECT id FROM %s c WHERE expires_at <= ? ORDER BY expires_at ASC LIMIT %d ) AS s )",
 		new(login.Flow).TableName(ctx),
 		new(login.Flow).TableName(ctx),
 		limit,
 	),
 		expiresAt,
-		p.NetworkID(ctx),
 	).Exec()
 	if err != nil {
 		return sqlcon.HandleError(err)

persistence/sql/persister_recovery.go

@@ -124,13 +124,12 @@ func (p *Persister) DeleteExpiredRecoveryFlows(ctx context.Context, expiresAt ti
 	defer otelx.End(span, &err)
 	//#nosec G201 -- TableName is static
 	err = p.GetConnection(ctx).RawQuery(fmt.Sprintf(
-		"DELETE FROM %s WHERE id in (SELECT id FROM (SELECT id FROM %s c WHERE expires_at <= ? and nid = ? ORDER BY expires_at ASC LIMIT %d ) AS s )",
+		"DELETE FROM %s WHERE id in (SELECT id FROM (SELECT id FROM %s c WHERE expires_at <= ? ORDER BY expires_at ASC LIMIT %d ) AS s )",
 		new(recovery.Flow).TableName(ctx),
 		new(recovery.Flow).TableName(ctx),
 		limit,
 	),
 		expiresAt,
-		p.NetworkID(ctx),
 	).Exec()
 	if err != nil {
 		return sqlcon.HandleError(err)

persistence/sql/persister_registration.go

@@ -54,13 +54,12 @@ func (p *Persister) DeleteExpiredRegistrationFlows(ctx context.Context, expiresA
 	defer otelx.End(span, &err)
 	//#nosec G201 -- TableName is static
 	err = p.GetConnection(ctx).RawQuery(fmt.Sprintf(
-		"DELETE FROM %s WHERE id in (SELECT id FROM (SELECT id FROM %s c WHERE expires_at <= ? and nid = ? ORDER BY expires_at ASC LIMIT %d ) AS s )",
+		"DELETE FROM %s WHERE id in (SELECT id FROM (SELECT id FROM %s c WHERE expires_at <= ? ORDER BY expires_at ASC LIMIT %d ) AS s )",
 		new(registration.Flow).TableName(ctx),
 		new(registration.Flow).TableName(ctx),
 		limit,
 	),
 		expiresAt,
-		p.NetworkID(ctx),
 	).Exec()
 	if err != nil {
 		return sqlcon.HandleError(err)

persistence/sql/persister_session.go

@@ -509,10 +509,10 @@ func (p *Persister) DeleteExpiredSessions(ctx context.Context, expiresAt time.Ti
 
 	//#nosec G201 -- TableName is static
 	if err = p.GetConnection(ctx).RawQuery(fmt.Sprintf(
-		"SELECT id FROM %s WHERE (expires_at <= ? OR active = false) AND nid = ? ORDER BY expires_at ASC LIMIT %d",
+		"SELECT id FROM %s WHERE expires_at <= ? OR active = false ORDER BY expires_at ASC LIMIT %d",
 		new(session.Session).TableName(ctx),
 		limit,
-	), expiresAt, p.NetworkID(ctx)).All(&rows); err != nil {
+	), expiresAt).All(&rows); err != nil {
 		return sqlcon.HandleError(err)
 	}
 

persistence/sql/persister_sessiontokenexchanger.go

@@ -114,13 +114,12 @@ func (p *Persister) DeleteExpiredExchangers(ctx context.Context, at time.Time, l
 
 	//#nosec G201 -- TableName is static
 	err := conn.RawQuery(fmt.Sprintf(
-		"DELETE FROM %s WHERE id in (SELECT id FROM (SELECT id FROM %s c WHERE created_at <= ? and nid = ? ORDER BY created_at ASC LIMIT %d ) AS s )",
+		"DELETE FROM %s WHERE id in (SELECT id FROM (SELECT id FROM %s c WHERE created_at <= ? ORDER BY created_at ASC LIMIT %d ) AS s )",
 		conn.Dialect.Quote(new(sessiontokenexchange.Exchanger).TableName()),
 		conn.Dialect.Quote(new(sessiontokenexchange.Exchanger).TableName()),
 		limit,
 	),
 		expiredAfter,
-		p.NetworkID(ctx),
 	).Exec()
 
 	return sqlcon.HandleError(err)

persistence/sql/persister_settings.go

@@ -64,13 +64,12 @@ func (p *Persister) DeleteExpiredSettingsFlows(ctx context.Context, expiresAt ti
 	defer otelx.End(span, &err)
 	//#nosec G201 -- TableName is static
 	err = p.GetConnection(ctx).RawQuery(fmt.Sprintf(
-		"DELETE FROM %s WHERE id in (SELECT id FROM (SELECT id FROM %s c WHERE expires_at <= ? and nid = ? ORDER BY expires_at ASC LIMIT %d ) AS s )",
+		"DELETE FROM %s WHERE id in (SELECT id FROM (SELECT id FROM %s c WHERE expires_at <= ? ORDER BY expires_at ASC LIMIT %d ) AS s )",
 		new(settings.Flow).TableName(ctx),
 		new(settings.Flow).TableName(ctx),
 		limit,
 	),
 		expiresAt,
-		p.NetworkID(ctx),
 	).Exec()
 	if err != nil {
 		return sqlcon.HandleError(err)

persistence/sql/persister_verification.go

@@ -124,13 +124,12 @@ func (p *Persister) DeleteExpiredVerificationFlows(ctx context.Context, expiresA
 	defer otelx.End(span, &err)
 	//#nosec G201 -- TableName is static
 	err = p.GetConnection(ctx).RawQuery(fmt.Sprintf(
-		"DELETE FROM %s WHERE id in (SELECT id FROM (SELECT id FROM %s c WHERE expires_at <= ? and nid = ? ORDER BY expires_at ASC LIMIT %d ) AS s )",
+		"DELETE FROM %s WHERE id in (SELECT id FROM (SELECT id FROM %s c WHERE expires_at <= ? ORDER BY expires_at ASC LIMIT %d ) AS s )",
 		new(verification.Flow).TableName(ctx),
 		new(verification.Flow).TableName(ctx),
 		limit,
 	),
 		expiresAt,
-		p.NetworkID(ctx),
 	).Exec()
 	if err != nil {
 		return sqlcon.HandleError(err)