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

service/datastore/datastore.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 datastore
 
 import (
         "fmt"
         "io"
         "io/ioutil"
@@ skipping 150 matching lines @@
                 })
         }
         return filterStop(err)
 }
 
 func (d *datastoreImpl) Count(q *Query) (int64, error) {
         fq, err := q.Finalize()
         if err != nil {
                 return 0, err
         }
-        return d.RawInterface.Count(fq)
+        v, err := d.RawInterface.Count(fq)
+        return v, filterStop(err)
 }
 
 func (d *datastoreImpl) GetAll(q *Query, dst interface{}) error {
         v := reflect.ValueOf(dst)
         if v.Kind() != reflect.Ptr {
                 panic(fmt.Errorf("invalid GetAll dst: must have a ptr-to-slice: %T", dst))
         }
         if !v.IsValid() || v.IsNil() {
                 panic(errors.New("invalid GetAll dst: <nil>"))
         }
@@ skipping 15 matching lines @@
         }
 
         slice := v.Elem()
         mat := parseMultiArg(slice.Type())
         if mat.newElem == nil {
                 panic(fmt.Errorf("invalid GetAll dst (non-concrete element type): %T", dst))
         }
 
         errs := map[int]error{}
         i := 0
-        err = d.RawInterface.Run(fq, func(k *Key, pm PropertyMap, _ CursorCB) error {
+        err = filterStop(d.RawInterface.Run(fq, func(k *Key, pm PropertyMap, _ CursorCB) error {
                 slice.Set(reflect.Append(slice, mat.newElem()))
                 itm := slice.Index(i)
                 mat.setKey(itm, k)
                 err := mat.setPM(itm, pm)
                 if err != nil {
                         errs[i] = err
                 }
                 i++
                 return nil
-        })
+        }))
         if err == nil {
                 if len(errs) > 0 {
                         me := make(errors.MultiError, slice.Len())
                         for i, e := range errs {
                                 me[i] = e
                         }
                         err = me
                 }
         }
         return err
@@ skipping 212 matching lines @@
                 currentDir = filepath.Dir(currentDir)
         }
 }
 
 func filterStop(err error) error {
         if err == Stop {
                 err = nil
         }
         return err
 }