Refactor keys and queries in datastore service and implementation.

impl/memory/testing_utils_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 memory
 
 import (
         "bytes"
         "fmt"
         "strings"
         "time"
 
         ds "github.com/luci/gae/service/datastore"
-        "github.com/luci/gae/service/datastore/dskey"
         "github.com/luci/gae/service/datastore/serialize"
         "github.com/luci/luci-go/common/cmpbin"
 )
 
 func init() {
         serializationDeterministic = true
         serialize.WritePropertyMapDeterministic = true
 }
 
 var NEXT_STR = "NEXT MARKER"
@@ skipping 27 matching lines @@
                         for len(stuff) > 0 && stuff[0] != NEXT {
                                 ret[pname] = append(ret[pname], prop(nom()))
                         }
                 }
                 nom()
         }
 
         return ret
 }
 
-func nq(kind_ns ...string) ds.Query {
-        if len(kind_ns) == 2 {
-                return &queryImpl{kind: kind_ns[0], ns: kind_ns[1]}
-        } else if len(kind_ns) == 1 {
-                return &queryImpl{kind: kind_ns[0], ns: "ns"}
+func nq(kindMaybe ...string) *ds.Query {
+        kind := "Foo"
+        if len(kindMaybe) == 1 {
+                kind = kindMaybe[0]
         }
-        return &queryImpl{kind: "Foo", ns: "ns"}
+        return ds.NewQuery(kind)

[iannucci, 2015/09/18 04:31:52]

Querys no longer embed the namespace and appid inside of them. Instead, the
implementation validates that the Query is valid in the current appid and
namespace right before execution. 

 }
 
 func indx(kind string, orders ...string) *ds.IndexDefinition {
         ancestor := false
         if kind[len(kind)-1] == '!' {
                 ancestor = true
                 kind = kind[:len(kind)-1]
         }
         ret := &ds.IndexDefinition{Kind: kind, Ancestor: ancestor}
         for _, o := range orders {
                 dir := ds.ASCENDING
                 if o[0] == '-' {
                         dir = ds.DESCENDING
                         o = o[1:]
                 }
                 ret.SortBy = append(ret.SortBy, ds.IndexColumn{Property: o, Direction: dir})
         }
         return ret
 }
 
 var (
         prop   = ds.MkProperty
         propNI = ds.MkPropertyNI
 )
 
-func key(kind string, id interface{}, parent ...ds.Key) ds.Key {

[iannucci, 2015/09/18 04:31:52]

I had like 5 copies of this function all over the place. I think that qualifies
as 'useful enough to be a real function'

-        p := ds.Key(nil)
-        if len(parent) > 0 {
-                p = parent[0]
-        }
-        switch x := id.(type) {
-        case string:
-                return dskey.New(globalAppID, "ns", kind, x, 0, p)
-        case int:
-                return dskey.New(globalAppID, "ns", kind, "", int64(x), p)
-        default:
-                return dskey.New(globalAppID, "ns", kind, "invalid", 100, p)
-        }
+func key(elems ...interface{}) *ds.Key {
+        return ds.MakeKey(globalAppID, "ns", elems...)
 }
 
 // cat is a convenience method for concatenating anything with an underlying
 // byte representation into a single []byte.
 func cat(bytethings ...interface{}) []byte {
         buf := &bytes.Buffer{}
         for _, thing := range bytethings {
                 switch x := thing.(type) {
                 case int64:
                         cmpbin.WriteInt(buf, x)
                 case int:
                         cmpbin.WriteInt(buf, int64(x))
                 case uint64:
                         cmpbin.WriteUint(buf, x)
                 case uint:
                         cmpbin.WriteUint(buf, uint64(x))
                 case float64:
                         cmpbin.WriteFloat64(buf, x)
                 case byte:
                         buf.WriteByte(x)
                 case ds.PropertyType:
                         buf.WriteByte(byte(x))
                 case string:
                         cmpbin.WriteString(buf, x)
                 case []byte:
                         buf.Write(x)
                 case time.Time:
                         serialize.WriteTime(buf, x)
-                case ds.Key:
+                case *ds.Key:
                         serialize.WriteKey(buf, serialize.WithoutContext, x)
                 case *ds.IndexDefinition:
                         serialize.WriteIndexDefinition(buf, *x)
                 case ds.Property:
                         serialize.WriteProperty(buf, serialize.WithoutContext, x)
                 default:
                         panic(fmt.Errorf("I don't know how to deal with %T: %#v", thing, thing))
                 }
         }
         ret := buf.Bytes()
         if ret == nil {
                 ret = []byte{}
         }
         return ret
 }
 
 func icat(bytethings ...interface{}) []byte {
         ret := cat(bytethings...)
         for i := range ret {
                 ret[i] ^= 0xFF
         }
         return ret
 }
 
 func sat(bytethings ...interface{}) string {
         return string(cat(bytethings...))
 }