Backup_Repos/stash
1
0
Fork 0
mirror of https://github.com/stashapp/stash.git synced 2025-12-06 08:26:00 +01:00
Code Issues Projects Releases Wiki Activity

Improve random sorting algorithm (#4246)

Browse source
This commit is contained in:
DingDongSoLong4 2023-11-02 07:13:56 +02:00 committed by GitHub
parent 795af64e8e
commit d96558704a
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 20 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
Makefile
View file

@ -36,7 +36,7 @@ GO_BUILD_FLAGS := $(GO_BUILD_FLAGS)
# set GO_BUILD_TAGS environment variable to any extra build tags required # set GO_BUILD_TAGS environment variable to any extra build tags required
GO_BUILD_TAGS := $(GO_BUILD_TAGS) GO_BUILD_TAGS := $(GO_BUILD_TAGS)
GO_BUILD_TAGS += sqlite_stat4 GO_BUILD_TAGS += sqlite_stat4 sqlite_math_functions
# set STASH_NOLEGACY environment variable or uncomment to disable legacy browser support # set STASH_NOLEGACY environment variable or uncomment to disable legacy browser support
# STASH_NOLEGACY := true # STASH_NOLEGACY := true

31
pkg/sqlite/sql.go
View file

@ -11,8 +11,6 @@ import (
"github.com/stashapp/stash/pkg/models" "github.com/stashapp/stash/pkg/models"
) )
var randomSortFloat = rand.Float64()
func selectAll(tableName string) string { func selectAll(tableName string) string {
idColumn := getColumn(tableName, "*") idColumn := getColumn(tableName, "*")
return "SELECT " + idColumn + " FROM " + tableName + " " return "SELECT " + idColumn + " FROM " + tableName + " "
@ -66,16 +64,15 @@ func getSort(sort string, direction string, tableName string) string {
return " ORDER BY " + colName + " " + direction return " ORDER BY " + colName + " " + direction
case strings.HasPrefix(sort, randomSeedPrefix): case strings.HasPrefix(sort, randomSeedPrefix):
// seed as a parameter from the UI // seed as a parameter from the UI
// turn the provided seed into a float seedStr := sort[len(randomSeedPrefix):]
seedStr := "0." + sort[len(randomSeedPrefix):] seed, err := strconv.ParseUint(seedStr, 10, 64)
seed, err := strconv.ParseFloat(seedStr, 32)
if err != nil { if err != nil {
// fallback to default seed // fallback to a random seed
seed = randomSortFloat seed = rand.Uint64()
} }
return getRandomSort(tableName, direction, seed) return getRandomSort(tableName, direction, seed)
case strings.Compare(sort, "random") == 0: case strings.Compare(sort, "random") == 0:
return getRandomSort(tableName, direction, randomSortFloat) return getRandomSort(tableName, direction, rand.Uint64())
default: default:
colName := getColumn(tableName, sort) colName := getColumn(tableName, sort)
if strings.Contains(sort, ".") { if strings.Contains(sort, ".") {
@ -92,11 +89,21 @@ func getSort(sort string, direction string, tableName string) string {
} }
} }
func getRandomSort(tableName string, direction string, seed float64) string { func getRandomSort(tableName string, direction string, seed uint64) string {
// https://stackoverflow.com/a/24511461 // cap seed at 10^8
seed %= 1e8
colName := getColumn(tableName, "id") colName := getColumn(tableName, "id")
randomSortString := strconv.FormatFloat(seed, 'f', 16, 32)
return " ORDER BY " + "(substr(" + colName + " * " + randomSortString + ", length(" + colName + ") + 2))" + " " + direction // https://stackoverflow.com/questions/21949795#comment33255354_21949859
// p1 := 52959209
// p2 := 1047483763
// p3 := 2147483647
// n := <colName>
// ORDER BY ((n+seed)*(n+seed)*p1 + (n+seed)*p2) % p3
// since sqlite converts overflowing numbers to reals, a custom db function that uses uints with overflow should be faster,
// however in practice the overhead of calling a custom function vastly outweighs the benefits
return fmt.Sprintf(" ORDER BY mod((%[1]s + %[2]d) * (%[1]s + %[2]d) * 52959209 + (%[1]s + %[2]d) * 1047483763, 2147483647) %[3]s", colName, seed, direction)
} }
func getCountSort(primaryTable, joinTable, primaryFK, direction string) string { func getCountSort(primaryTable, joinTable, primaryFK, direction string) string {