Refactor keys and queries in datastore service and implementation.

impl/prod/raw_datastore_type_converter_test.go

Index: impl/prod/raw_datastore_type_converter_test.go
diff --git a/impl/prod/raw_datastore_type_converter_test.go b/impl/prod/raw_datastore_type_converter_test.go
index 437b945d7442a3c19aa58d2a090fe196c9802704..02549842b8c7b5c7190561b73305d1e29280b4e4 100644
--- a/impl/prod/raw_datastore_type_converter_test.go
+++ b/impl/prod/raw_datastore_type_converter_test.go
@@ -29,7 +29,7 @@ type TestStruct struct {
 	ValueS  []string
 	ValueF  []float64
 	ValueBS [][]byte // "ByteString"
-	ValueK  []dstore.Key
+	ValueK  []*dstore.Key
 	ValueBK []blobstore.Key
 	ValueGP []dstore.GeoPoint
 }
@@ -57,7 +57,7 @@ func TestBasicDatastore(t *testing.T) {
 					[]byte("world"),
 					[]byte("zurple"),
 				},
-				ValueK: []dstore.Key{
+				ValueK: []*dstore.Key{
 					ds.NewKey("Something", "Cool", 0, nil),
 					ds.NewKey("Something", "", 1, nil),
 					ds.NewKey("Something", "Recursive", 0,
@@ -78,14 +78,14 @@ func TestBasicDatastore(t *testing.T) {
 			time.Sleep(time.Second)
 
 			Convey("Can query", func() {
-				ds.Run(ds.NewQuery("TestStruct"), func(ts *TestStruct, _ dstore.CursorCB) bool {
+				ds.Run(dstore.NewQuery("TestStruct"), func(ts *TestStruct, _ dstore.CursorCB) bool {
 					So(*ts, ShouldResemble, orig)
 					return true
 				})
 			})
 
 			Convey("Can project", func() {
-				q := ds.NewQuery("TestStruct").Project("ValueS")
+				q := dstore.NewQuery("TestStruct").Project("ValueS")
 				rslts := []dstore.PropertyMap{}
 				So(ds.GetAll(q, &rslts), ShouldBeNil)
 				So(rslts, ShouldResemble, []dstore.PropertyMap{
@@ -99,7 +99,7 @@ func TestBasicDatastore(t *testing.T) {
 					},
 				})
 
-				q = ds.NewQuery("TestStruct").Project("ValueBS")
+				q = dstore.NewQuery("TestStruct").Project("ValueBS")
 				rslts = []dstore.PropertyMap{}
 				So(ds.GetAll(q, &rslts), ShouldBeNil)
 				So(rslts, ShouldResemble, []dstore.PropertyMap{
@@ -137,7 +137,7 @@ func TestBasicDatastore(t *testing.T) {
 
 			So(pm["Time"][0].Value(), ShouldResemble, rslt["Time"][0].Value())
 
-			q := ds.NewQuery("Something").Project("Time")
+			q := dstore.NewQuery("Something").Project("Time")
 			all := []dstore.PropertyMap{}
 			So(ds.GetAll(q, &all), ShouldBeNil)
 			So(len(all), ShouldEqual, 1)