Fix missing/broken ds.Stop handling in raw DS.

filter/count/rds.go

Index: filter/count/rds.go
diff --git a/filter/count/rds.go b/filter/count/rds.go
index eeeccc520163d5eada3f771154617164c3df35da..0f905777d74351353dc641bfc798047a911063fa 100644
--- a/filter/count/rds.go
+++ b/filter/count/rds.go
@@ -5,7 +5,6 @@
 package count
 
 import (
-	"github.com/luci/luci-go/common/errors"
 	"golang.org/x/net/context"
 
 	ds "github.com/luci/gae/service/datastore"
@@ -42,7 +41,7 @@ func (r *dsCounter) DecodeCursor(s string) (ds.Cursor, error) {
 }
 
 func (r *dsCounter) Run(q *ds.FinalizedQuery, cb ds.RawRunCB) error {
-	return r.c.Run.up(errors.Filter(r.ds.Run(q, cb), ds.Stop))
+	return r.c.Run.upFilter(r.ds.Run(q, cb), ds.Stop)
 }
 
 func (r *dsCounter) Count(q *ds.FinalizedQuery) (int64, error) {
@@ -55,15 +54,15 @@ func (r *dsCounter) RunInTransaction(f func(context.Context) error, opts *ds.Tra
 }
 
 func (r *dsCounter) DeleteMulti(keys []*ds.Key, cb ds.DeleteMultiCB) error {
-	return r.c.DeleteMulti.up(errors.Filter(r.ds.DeleteMulti(keys, cb), ds.Stop))
+	return r.c.DeleteMulti.upFilter(r.ds.DeleteMulti(keys, cb), ds.Stop)
 }
 
 func (r *dsCounter) GetMulti(keys []*ds.Key, meta ds.MultiMetaGetter, cb ds.GetMultiCB) error {
-	return r.c.GetMulti.up(errors.Filter(r.ds.GetMulti(keys, meta, cb), ds.Stop))
+	return r.c.GetMulti.upFilter(r.ds.GetMulti(keys, meta, cb), ds.Stop)
 }
 
 func (r *dsCounter) PutMulti(keys []*ds.Key, vals []ds.PropertyMap, cb ds.PutMultiCB) error {
-	return r.c.PutMulti.up(errors.Filter(r.ds.PutMulti(keys, vals, cb), ds.Stop))
+	return r.c.PutMulti.upFilter(r.ds.PutMulti(keys, vals, cb), ds.Stop)
 }
 
 func (r *dsCounter) Testable() ds.Testable {