Refactor keys and queries in datastore service and implementation.

impl/memory/datastore_index_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 (
         "sort"
         "testing"
         "time"
 
         ds "github.com/luci/gae/service/datastore"
         "github.com/luci/gkvlite"
         . "github.com/smartystreets/goconvey/convey"
 )
 
-var fakeKey = key("knd", 10, key("parentKind", "sid"))
+var fakeKey = key("parentKind", "sid", "knd", 10)
 
 func TestCollated(t *testing.T) {
         t.Parallel()
 
         Convey("TestCollated", t, func() {
                 Convey("nil list", func() {
                         pm := ds.PropertyMap(nil)
                         sip := partiallySerialize(fakeKey, pm)
 
                         Convey("nil collated", func() {
@@ skipping 261 matching lines @@
                                                 return true
                                         })
                                         So(i, ShouldEqual, len(vals))
                                 }
                         })
                 }
         })
 }
 
 type dumbItem struct {
-        key   ds.Key
+        key   *ds.Key
         props ds.PropertyMap
 }
 
 var updateIndexesTests = []struct {
         name     string
         idxs     []*ds.IndexDefinition
         data     []dumbItem
         expected map[string][][]byte
 }{
 
@@ skipping 94 matching lines @@
                                                 So(data[i], ShouldResemble, itm.Key)
                                                 i++
                                                 return true
                                         })
                                         So(i, ShouldEqual, len(data))
                                 }
                         })
                 }
         })
 }