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

Side by Side Diff: impl/prod/raw_datastore.go

Issue 1289323002: Fix miscellaneous prod bugs. (Closed) Base URL: https://github.com/luci/gae@master
Patch Set: Remove superfluous function added in PS#1. Created 5 years, 4 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 unified diff | Download patch
OLDNEW
1 // Copyright 2015 The Chromium Authors. All rights reserved. 1 // Copyright 2015 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 package prod 5 package prod
6 6
7 import ( 7 import (
8 ds "github.com/luci/gae/service/datastore" 8 ds "github.com/luci/gae/service/datastore"
9 "github.com/luci/gae/service/info" 9 "github.com/luci/gae/service/info"
10 "golang.org/x/net/context" 10 "golang.org/x/net/context"
(...skipping 99 matching lines...) Expand 10 before | Expand all | Expand 10 after
110 cb(vals[idx].(*typeFilter).pm, err) 110 cb(vals[idx].(*typeFilter).pm, err)
111 }) 111 })
112 } 112 }
113 113
114 func (d rdsImpl) PutMulti(keys []ds.Key, vals []ds.PropertyMap, cb ds.PutMultiCB ) error { 114 func (d rdsImpl) PutMulti(keys []ds.Key, vals []ds.PropertyMap, cb ds.PutMultiCB ) error {
115 rkeys := dsMF2R(keys) 115 rkeys := dsMF2R(keys)
116 rvals := make([]datastore.PropertyLoadSaver, len(vals)) 116 rvals := make([]datastore.PropertyLoadSaver, len(vals))
117 for i, val := range vals { 117 for i, val := range vals {
118 rvals[i] = &typeFilter{val} 118 rvals[i] = &typeFilter{val}
119 } 119 }
120 » rkeys, err := datastore.PutMulti(d, rkeys, vals) 120 » rkeys, err := datastore.PutMulti(d, rkeys, rvals)
121 return idxCallbacker(err, len(keys), func(idx int, err error) { 121 return idxCallbacker(err, len(keys), func(idx int, err error) {
122 k := ds.Key(nil) 122 k := ds.Key(nil)
123 if err == nil { 123 if err == nil {
124 k = dsR2F(rkeys[idx]) 124 k = dsR2F(rkeys[idx])
125 } 125 }
126 cb(k, err) 126 cb(k, err)
127 }) 127 })
128 } 128 }
129 129
130 func (d rdsImpl) NewQuery(kind string) ds.Query { 130 func (d rdsImpl) NewQuery(kind string) ds.Query {
(...skipping 17 matching lines...) Expand all
148 if !cb(dsR2F(k), tf.pm, cfunc) { 148 if !cb(dsR2F(k), tf.pm, cfunc) {
149 return nil 149 return nil
150 } 150 }
151 } 151 }
152 } 152 }
153 153
154 func (d rdsImpl) RunInTransaction(f func(c context.Context) error, opts *ds.Tran sactionOptions) error { 154 func (d rdsImpl) RunInTransaction(f func(c context.Context) error, opts *ds.Tran sactionOptions) error {
155 ropts := (*datastore.TransactionOptions)(opts) 155 ropts := (*datastore.TransactionOptions)(opts)
156 return datastore.RunInTransaction(d, f, ropts) 156 return datastore.RunInTransaction(d, f, ropts)
157 } 157 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698