Merge pull request #967 from go-kivik/collateMutext

Protect collator with a mutex

x/sqlite/collation.go

@@ -18,12 +18,16 @@ import (
  "slices"
  "sort"
  "strconv"
+ "sync"
 
  "golang.org/x/text/collate"
  "golang.org/x/text/language"
 )
 
-var collator = collate.New(language.Und)
+var (
+ collatorMu = new(sync.Mutex)
+ collator = collate.New(language.Und)
+)
 
 func couchdbCmpString(a, b string) int {
  return couchdbCmpJSON(json.RawMessage(a), json.RawMessage(b))
@@ -79,7 +83,10 @@ func couchdbCmpJSON(a, b json.RawMessage) int {
  if bt != jsTypeString {
  return -1
  }
- return collator.CompareString(string(a), string(b))
+ collatorMu.Lock()
+ cmp := collator.CompareString(string(a), string(b))
+ collatorMu.Unlock()
+ return cmp
  case bt == jsTypeString:
  return 1
 

x/sqlite/collation_test.go

@@ -111,3 +111,9 @@ func Test_couchdbCmp(t *testing.T) {
  })
  }
 }
+
+// This test triggers the race detector if the collator isn't protected
+func Test_collator_race(*testing.T) {
+ go couchdbCmpJSON(json.RawMessage(`"a"`), json.RawMessage(`"b"`))
+ go couchdbCmpJSON(json.RawMessage(`"a"`), json.RawMessage(`"b"`))
+}