GAE CL for luci-go common refactor

filter/txnBuf/query_merger.go

 // Copyright 2015 The LUCI Authors. All rights reserved.
 // Use of this source code is governed under the Apache License, Version 2.0
 // that can be found in the LICENSE file.
 
 package txnBuf
 
 import (
         "bytes"
         "sort"
 
         "github.com/luci/gae/impl/memory"
         ds "github.com/luci/gae/service/datastore"
         "github.com/luci/gae/service/datastore/serialize"
-        "github.com/luci/luci-go/common/stringset"
+        "github.com/luci/luci-go/common/data/stringset"
 )
 
 // queryToIter takes a FinalizedQuery and returns an iterator function which
 // will produce either *items or errors.
 //
 //  - d is the raw datastore to run this query on
 //  - filter is a function which will return true if the given key should be
 //    excluded from the result set.
 func queryToIter(stopChan chan struct{}, fq *ds.FinalizedQuery, d ds.RawInterface) func() (*item, error) {
         c := make(chan *item)
@@ skipping 264 matching lines @@
                 }
                 if !foundOne {
                         return nil, nil
                 }
         }
         if end != nil && bytes.Compare(soFar, end) >= 0 {
                 return nil, nil
         }
         return soFar, ps["__key__"][0]
 }