Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(475)

Unified Diff: impl/prod/raw_datastore.go

Issue 1957953002: Add cloud datastore implementation. (Closed) Base URL: https://chromium.googlesource.com/external/github.com/luci/gae@master
Patch Set: Created 4 years, 7 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: impl/prod/raw_datastore.go
diff --git a/impl/prod/raw_datastore.go b/impl/prod/raw_datastore.go
index 0a638eecfd53c1bea34e99f08d3bf8bfac54d71b..e1c8e84055a359282d19351213112008b3a6d4b1 100644
--- a/impl/prod/raw_datastore.go
+++ b/impl/prod/raw_datastore.go
@@ -39,10 +39,12 @@ type rdsImpl struct {
aeCtx context.Context
}
-func idxCallbacker(err error, amt int, cb func(idx int, err error)) error {
+func idxCallbacker(err error, amt int, cb func(idx int, err error) error) error {
if err == nil {
for i := 0; i < amt; i++ {
- cb(i, nil)
+ if err := cb(i, nil); err != nil {
+ return err
+ }
}
return nil
}
@@ -50,7 +52,9 @@ func idxCallbacker(err error, amt int, cb func(idx int, err error)) error {
me, ok := err.(errors.MultiError)
if ok {
for i, err := range me {
- cb(i, err)
+ if err := cb(i, err); err != nil {
+ return err
+ }
}
return nil
}
@@ -72,8 +76,8 @@ func (d rdsImpl) DeleteMulti(ks []*ds.Key, cb ds.DeleteMultiCB) error {
if err == nil {
err = datastore.DeleteMulti(d.aeCtx, keys)
}
- return idxCallbacker(err, len(ks), func(_ int, err error) {
- cb(err)
+ return idxCallbacker(err, len(ks), func(_ int, err error) error {
+ return cb(err)
})
}
@@ -86,12 +90,11 @@ func (d rdsImpl) GetMulti(keys []*ds.Key, _meta ds.MultiMetaGetter, cb ds.GetMul
}
err = datastore.GetMulti(d.aeCtx, rkeys, vals)
}
- return idxCallbacker(err, len(keys), func(idx int, err error) {
+ return idxCallbacker(err, len(keys), func(idx int, err error) error {
if pls := vals[idx]; pls != nil {
- cb(pls.(*typeFilter).pm, err)
- } else {
- cb(nil, err)
+ return cb(pls.(*typeFilter).pm, err)
}
+ return cb(nil, err)
})
}
@@ -104,12 +107,12 @@ func (d rdsImpl) PutMulti(keys []*ds.Key, vals []ds.PropertyMap, cb ds.PutMultiC
}
rkeys, err = datastore.PutMulti(d.aeCtx, rkeys, rvals)
}
- return idxCallbacker(err, len(keys), func(idx int, err error) {
+ return idxCallbacker(err, len(keys), func(idx int, err error) error {
k := (*ds.Key)(nil)
if err == nil {
k = dsR2F(rkeys[idx])
}
- cb(k, err)
+ return cb(k, err)
})
}

Powered by Google App Engine
This is Rietveld 408576698