Switch to external stringset implementation.

impl/memory/datastore_query_execution.go

 // Copyright 2015 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 package memory
 
 import (
         "bytes"
         "fmt"
 
         ds "github.com/luci/gae/service/datastore"
         "github.com/luci/gae/service/datastore/serialize"
         "github.com/luci/luci-go/common/cmpbin"
+        "github.com/luci/luci-go/common/stringset"
 )
 
 type queryStrategy interface {
         // handle applies the strategy to the embedded user callback.
         //   - rawData is the slice of encoded Properties from the index row
         //     (correctly de-inverted).
         //   - decodedProps is the slice of decoded Properties from the index row
         //   - key is the decoded Key from the index row (the last item in rawData and
         //     decodedProps)
         //   - gc is the getCursor function to be passed to the user's callback
         handle(rawData [][]byte, decodedProps []ds.Property, key ds.Key, gc func() (ds.Cursor, error)) bool
 }
 
 type projectionLookup struct {
         suffixIndex  int
         propertyName string
 }
 
 type projectionStrategy struct {
         cb ds.RawRunCB
 
         project  []projectionLookup
-        distinct stringSet
+        distinct stringset.Set
 }
 
 func newProjectionStrategy(q *queryImpl, rq *reducedQuery, cb ds.RawRunCB) queryStrategy {
         projectionLookups := make([]projectionLookup, len(q.project))
         for i, prop := range q.project {
                 projectionLookups[i].propertyName = prop
                 lookupErr := fmt.Errorf("planning a strategy for an unfulfillable query?")
                 for j, col := range rq.suffixFormat {
                         if col.Property == prop {
                                 projectionLookups[i].suffixIndex = j
                                 lookupErr = nil
                                 break
                         }
                 }
                 impossible(lookupErr)
         }
         ret := &projectionStrategy{cb: cb, project: projectionLookups}
         if q.distinct {
-                ret.distinct = stringSet{}
+                ret.distinct = stringset.New(0)
         }
         return ret
 }
 
 func (s *projectionStrategy) handle(rawData [][]byte, decodedProps []ds.Property, key ds.Key, gc func() (ds.Cursor, error)) bool {
         projectedRaw := [][]byte(nil)
         if s.distinct != nil {
                 projectedRaw = make([][]byte, len(decodedProps))
         }
         pmap := make(ds.PropertyMap, len(s.project))
         for i, p := range s.project {
                 if s.distinct != nil {
                         projectedRaw[i] = rawData[p.suffixIndex]
                 }
                 pmap[p.propertyName] = []ds.Property{decodedProps[p.suffixIndex]}
         }
         if s.distinct != nil {
-                if !s.distinct.add(string(bjoin(projectedRaw...))) {
+                if !s.distinct.Add(string(bjoin(projectedRaw...))) {
                         return true
                 }
         }
         return s.cb(key, pmap, gc)
 }
 
 type keysOnlyStrategy struct {
         cb ds.RawRunCB
 
-        dedup stringSet
+        dedup stringset.Set
 }
 
 func (s *keysOnlyStrategy) handle(rawData [][]byte, _ []ds.Property, key ds.Key, gc func() (ds.Cursor, error)) bool {
-        if !s.dedup.add(string(rawData[len(rawData)-1])) {
+        if !s.dedup.Add(string(rawData[len(rawData)-1])) {
                 return true
         }
         return s.cb(key, nil, gc)
 }
 
 type normalStrategy struct {
         cb ds.RawRunCB
 
         ns    string
         head  *memCollection
-        dedup stringSet
+        dedup stringset.Set
 }
 
 func newNormalStrategy(ns string, cb ds.RawRunCB, head *memStore) queryStrategy {
         coll := head.GetCollection("ents:" + ns)
         if coll == nil {
                 return nil
         }
-        return &normalStrategy{cb, ns, coll, stringSet{}}
+        return &normalStrategy{cb, ns, coll, stringset.New(0)}
 }
 
 func (s *normalStrategy) handle(rawData [][]byte, _ []ds.Property, key ds.Key, gc func() (ds.Cursor, error)) bool {
         rawKey := rawData[len(rawData)-1]
-        if !s.dedup.add(string(rawKey)) {
+        if !s.dedup.Add(string(rawKey)) {
                 return true
         }
 
         rawEnt := s.head.Get(rawKey)
         if rawEnt == nil {
                 // entity doesn't exist at head
                 return true
         }
         pm, err := serialize.ReadPropertyMap(bytes.NewBuffer(rawEnt), serialize.WithoutContext, globalAppID, s.ns)
         memoryCorruption(err)
 
         return s.cb(key, pm, gc)
 }
 
 func pickQueryStrategy(q *queryImpl, rq *reducedQuery, cb ds.RawRunCB, head *memStore) queryStrategy {
         if q.keysOnly {
-                return &keysOnlyStrategy{cb, stringSet{}}
+                return &keysOnlyStrategy{cb, stringset.New(0)}
         }
         if len(q.project) > 0 {
                 return newProjectionStrategy(q, rq, cb)
         }
         return newNormalStrategy(rq.ns, cb, head)
 }
 
 func parseSuffix(ns string, suffixFormat []ds.IndexColumn, suffix []byte, count int) (raw [][]byte, decoded []ds.Property) {
         buf := serialize.Invertible(bytes.NewBuffer(suffix))
         decoded = make([]ds.Property, len(suffixFormat))
@@ skipping 90 matching lines @@
                         impossible(fmt.Errorf("decoded index row doesn't end with a Key: %#v", keyProp))
                 }
 
                 return strategy.handle(
                         rawData, decodedProps, keyProp.Value().(ds.Key),
                         getCursorFn(suffix))
         })
 
         return nil
 }