lock pre-existing rows

stellar · Aug 13, 2024 · 9ad40ad · 9ad40ad
1 parent a39f734
commit 9ad40ad
Showing 1 changed file with 6 additions and 2 deletions.
diff --git a/services/horizon/internal/db2/history/account_loader.go b/services/horizon/internal/db2/history/account_loader.go
@@ -166,6 +166,7 @@ func bulkGetOrCreate(ctx context.Context, q *Q, table string, fields []columnVal
 	}
 
 	columns := strings.Join(insertFieldsPart, ",")
+	preExistingRowsSuffix := "ORDER BY id ASC FOR KEY SHARE"
 	sql := `
 	WITH rows AS
 		(SELECT ` + strings.Join(unnestPart, ",") + `),
@@ -175,11 +176,14 @@ func bulkGetOrCreate(ctx context.Context, q *Q, table string, fields []columnVal
 		SELECT * FROM rows
 		ON CONFLICT (` + columns + `) DO NOTHING
 		RETURNING *
+	),
+	pre_existing_rows AS (
+		SELECT * FROM ` + table + ` WHERE (` + columns + `) IN
+		(SELECT * FROM rows) ` + preExistingRowsSuffix + `
 	)
 	SELECT * FROM inserted_rows
 	UNION ALL
-	SELECT * FROM ` + table + ` WHERE (` + columns + `) IN 
-	(SELECT * FROM rows)`
+	SELECT * FROM pre_existing_rows`
 
 	return q.SelectRaw(
 		ctx,