idx2rwmap: do not sort by serving path

stapelberg · stapelberg · commit adb0794ba693 · 2023-08-05T17:12:14.000+02:00
this is a revert of commit 4c40626 I’m not sure what was non-deterministic about the output back then, but redirect.IndexFromProto() returns entries in the order in which they were loaded from the index. Maybe non-determinism was addressed at a different stage in the meantime. An unintended side-effect of the sorting was a preference for uppercase paths, as they come first in ASCII. Removing the sorting removes a behavioral difference between serving the redirect index via auxserver and using idx2rwmap. related to #161
diff --git a/cmd/debiman-idx2rwmap/rwmap.go b/cmd/debiman-idx2rwmap/rwmap.go
@@ -22,7 +22,6 @@ import (
 	"os"
 	"path/filepath"
 	"runtime"
-	"sort"
 	"strconv"
 	"strings"
 	"sync"
@@ -71,20 +70,6 @@ func (op oncePrinter) mustPrint(key string, template redirect.IndexEntry) {
 	op.printed[key] = true
 }
 
-type byServingPath []redirect.IndexEntry
-
-func (p byServingPath) Len() int {
-	return len(p)
-}
-
-func (p byServingPath) Swap(i, j int) {
-	p[i], p[j] = p[j], p[i]
-}
-
-func (p byServingPath) Less(i, j int) bool {
-	return p[i].ServingPath(".html") < p[j].ServingPath(".html")
-}
-
 func printAll(bufw *bufio.Writer, idx redirect.Index, name string) {
 	variants := idx.Entries[name]
 
@@ -95,9 +80,6 @@ func printAll(bufw *bufio.Writer, idx redirect.Index, name string) {
 		variants: variants,
 	}
 
-	// sort to make the output deterministic
-	sort.Stable(byServingPath(variants))
-
 	for _, v := range variants {
 		suites := []string{v.Suite}
 		for name, rewrite := range idx.Suites {
