Commit e7677715 authored by Andrei Mihu's avatar Andrei Mihu
Browse files

Ensure leaderboard record fields only change if the score or subscore change on writes.

parent e93d787e

CHANGELOG.md

+1 −0
Original line number Diff line number Diff line
@@ -15,6 +15,7 @@ The format is based on [keep a changelog](http://keepachangelog.com) and this pr 
- Ensure storage writes and deletes are performed in a consistent order within each batch.

- Ensure wallet updates are performed in a consistent order within each batch.

- Increase default socket pong wait time.

- Ensure leaderboard record metadata, number of scores, and update time are only changed during leaderboard write operations if the score or subscore change.



### Fixed

- Storage write batches now correctly abort when any query in the batch fails.

server/core_leaderboard.go

+4 −1
Original line number Diff line number Diff line
@@ -322,6 +322,7 @@ func LeaderboardRecordWrite(ctx context.Context, logger *zap.Logger, db *sql.DB, 
	}



	var opSql string

	var filterSql string

	var scoreDelta int64

	var subscoreDelta int64

	var scoreAbs int64
@@ -345,9 +346,11 @@ func LeaderboardRecordWrite(ctx context.Context, logger *zap.Logger, db *sql.DB, 
		if leaderboard.SortOrder == LeaderboardSortOrderAscending {

			// Lower score is better.

			opSql = "score = ((leaderboard_record.score + $8::BIGINT - abs(leaderboard_record.score - $8::BIGINT)) / 2)::BIGINT, subscore = ((leaderboard_record.subscore + $9::BIGINT - abs(leaderboard_record.subscore - $9::BIGINT)) / 2)::BIGINT"

			filterSql = " WHERE leaderboard_record.score > $8::BIGINT OR leaderboard_record.subscore > $9::BIGINT"

		} else {

			// Higher score is better.

			opSql = "score = ((leaderboard_record.score + $8::BIGINT + abs(leaderboard_record.score - $8::BIGINT)) / 2)::BIGINT, subscore = ((leaderboard_record.subscore + $9::BIGINT + abs(leaderboard_record.subscore - $9::BIGINT)) / 2)::BIGINT"

			filterSql = " WHERE leaderboard_record.score < $8::BIGINT OR leaderboard_record.subscore < $9::BIGINT"

		}

		scoreDelta = score

		subscoreDelta = subscore
@@ -358,7 +361,7 @@ func LeaderboardRecordWrite(ctx context.Context, logger *zap.Logger, db *sql.DB, 
	query := `INSERT INTO leaderboard_record (leaderboard_id, owner_id, username, score, subscore, metadata, expiry_time)

            VALUES ($1, $2, $3, $4, $5, COALESCE($6, '{}'::JSONB), $7)

            ON CONFLICT (owner_id, leaderboard_id, expiry_time)

            DO UPDATE SET ` + opSql + `, num_score = leaderboard_record.num_score + 1, metadata = COALESCE($6, leaderboard_record.metadata), update_time = now()`

            DO UPDATE SET ` + opSql + `, num_score = leaderboard_record.num_score + 1, metadata = COALESCE($6, leaderboard_record.metadata), update_time = now()` + filterSql

	params := make([]interface{}, 0, 9)

	params = append(params, leaderboardId, ownerId)

	if username == "" {