Make rawdatastore API safer for writing filters.

filter/count/count_test.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 count
 
 import (
         "fmt"
         "testing"
 
         "github.com/luci/gae/filter/featureBreaker"
         "github.com/luci/gae/impl/memory"
         "github.com/luci/gae/service/info"
         "github.com/luci/gae/service/memcache"
         "github.com/luci/gae/service/rawdatastore"
         "github.com/luci/gae/service/taskqueue"
         . "github.com/smartystreets/goconvey/convey"
         "golang.org/x/net/context"
 )
 
 func TestCount(t *testing.T) {
         t.Parallel()
 
+        pnil := func(_ rawdatastore.Key, err error) {

[estaab, 2015/07/28 21:52:40]

Can this have a more descriptive name like putAssertNoError or something along
those lines?

[iannucci, 2015/07/29 07:35:48]

yeah... I actually take all these out completely in the next CL :)

+                So(err, ShouldBeNil)
+        }
+
+        gnil := func(_ rawdatastore.PropertyMap, err error) {
+                So(err, ShouldBeNil)
+        }
+
         Convey("Test Count filter", t, func() {
-                c, ctr := FilterRDS(memory.Use(context.Background()))
+                c, fb := featureBreaker.FilterRDS(memory.Use(context.Background()), nil)
+                c, ctr := FilterRDS(c)
 
                 So(c, ShouldNotBeNil)
                 So(ctr, ShouldNotBeNil)
 
                 rds := rawdatastore.Get(c)
 
                 Convey("Calling a rds function should reflect in counter", func() {
                         p := rawdatastore.Property{}
                         p.SetValue(100, false)
-                        _, err := rds.Put(rds.NewKey("Kind", "", 0, nil), &rawdatastore.PropertyMap{
-                                "Val": {p},
-                        })
-                        So(err, ShouldBeNil)
+                        keys := []rawdatastore.Key{rds.NewKey("Kind", "", 0, nil)}
+                        vals := []rawdatastore.PropertyLoadSaver{&rawdatastore.PropertyMap{"Val": {p}}}
+
+                        So(rds.PutMulti(keys, vals, pnil), ShouldBeNil)
                         So(ctr.NewKey.Successes, ShouldEqual, 1)
-                        So(ctr.Put.Successes, ShouldEqual, 1)
+                        So(ctr.PutMulti.Successes, ShouldEqual, 1)
 
                         Convey("effects are cumulative", func() {
-                                _, err := rds.Put(rds.NewKey("Kind", "", 0, nil), &rawdatastore.PropertyMap{
-                                        "Val": {p},
-                                })
-                                So(err, ShouldBeNil)
-                                So(ctr.NewKey.Successes, ShouldEqual, 2)
-                                So(ctr.Put.Successes, ShouldEqual, 2)
+                                So(rds.PutMulti(keys, vals, pnil), ShouldBeNil)
+                                So(ctr.PutMulti.Successes, ShouldEqual, 2)
 
                                 Convey("even within transactions", func() {
+                                        root := rds.NewKey("Root", "", 1, nil)
                                         rds.RunInTransaction(func(c context.Context) error {
                                                 rds := rawdatastore.Get(c)
-                                                k := rds.NewKey("Wat", "sup", 0, nil)
-                                                rds.Put(k, &rawdatastore.PropertyMap{"Wat": {p}})
-                                                rds.Put(k, &rawdatastore.PropertyMap{"Wat": {p}})
+                                                keys := []rawdatastore.Key{
+                                                        rds.NewKey("Kind", "hi", 0, root),
+                                                        rds.NewKey("Kind", "there", 0, root),
+                                                }
+                                                vals = append(vals, vals[0])
+                                                So(rds.PutMulti(keys, vals, pnil), ShouldBeNil)
                                                 return nil
                                         }, nil)
                                 })
                         })
                 })
+
                 Convey("errors count against errors", func() {
-                        rds.Get(nil, nil)
-                        So(ctr.Get.Errors, ShouldEqual, 1)
-                        k, err := rds.Put(rds.NewKey("Kind", "", 0, nil), &rawdatastore.PropertyMap{
-                                "Val": {rawdatastore.Property{}},
+                        keys := []rawdatastore.Key{rds.NewKey("Kind", "", 1, nil)}
+                        vals := []rawdatastore.PropertyLoadSaver{&rawdatastore.PropertyMap{"Val": {{}}}}
+
+                        fb.BreakFeatures(nil, "GetMulti")
+
+                        rds.GetMulti(keys, gnil)
+                        So(ctr.GetMulti.Errors, ShouldEqual, 1)
+
+                        fb.UnbreakFeatures("GetMulti")
+
+                        err := rds.PutMulti(keys, vals, func(k rawdatastore.Key, err error) {
+                                keys[0] = k
+                                So(err, ShouldBeNil)
                         })
                         So(err, ShouldBeNil)
-                        So(ctr.NewKey.Successes, ShouldEqual, 1)
-                        rds.Get(k, &rawdatastore.PropertyMap{})
-                        So(ctr.Get.Errors, ShouldEqual, 1)
-                        So(ctr.Get.Successes, ShouldEqual, 1)
-                        So(ctr.Get.Total(), ShouldEqual, 2)
+
+                        rds.GetMulti(keys, gnil)
+                        So(ctr.GetMulti.Errors, ShouldEqual, 1)
+                        So(ctr.GetMulti.Successes, ShouldEqual, 1)
+                        So(ctr.GetMulti.Total(), ShouldEqual, 2)
                 })
         })
 
         Convey("works for memcache", t, func() {
                 c, ctr := FilterMC(memory.Use(context.Background()))
                 So(c, ShouldNotBeNil)
                 So(ctr, ShouldNotBeNil)
                 mc := memcache.Get(c)
 
                 mc.Set(mc.NewItem("hello").SetValue([]byte("sup")))
@@ skipping 43 matching lines @@
         // functions use RDS from the context like normal... they don't need to know
         // that there are any filters at all.
         someCalledFunc := func(c context.Context) {
                 rds := rawdatastore.Get(c)
                 key := rds.NewKey("Kind", "", 1, nil)
                 prop := rawdatastore.Property{}
                 prop.SetValue(100, false)
                 val := rawdatastore.PropertyMap{
                         "FieldName": {prop},
                 }
-                rds.Put(key, &val)
+                rds.PutMulti([]rawdatastore.Key{key}, []rawdatastore.PropertyLoadSaver{&val}, nil)
         }
 
         // Using the other function.
         someCalledFunc(c)
         someCalledFunc(c)
 
         // Then we can see what happened!
         fmt.Printf("%#v\n", counter.NewKey)
-        fmt.Printf("%d\n", counter.Put.Successes)
+        fmt.Printf("%d\n", counter.PutMulti.Successes)
         // Output:
         // count.Entry{Successes:2, Errors:0}
         // 2
 }