Refactor keys and queries in datastore service and implementation.

service/datastore/properties_test.go

Index: service/datastore/properties_test.go
diff --git a/service/datastore/properties_test.go b/service/datastore/properties_test.go
index b09776d25cd5838b6ae4e8b5a4c3c2da5c88f700..f814d435f39119ae4d989e5532cfc85ff41aa23b 100644
--- a/service/datastore/properties_test.go
+++ b/service/datastore/properties_test.go
@@ -36,7 +36,7 @@ func TestProperties(t *testing.T) {
 				So(pv.IndexSetting(), ShouldEqual, NoIndex)
 				So(pv.Type().String(), ShouldEqual, "PTInt")
 
-				pv.SetValue(nil, ShouldIndex)
+				So(pv.SetValue(nil, ShouldIndex), ShouldBeNil)
 				So(pv.Value(), ShouldBeNil)
 				So(pv.IndexSetting(), ShouldEqual, ShouldIndex)
 				So(pv.Type().String(), ShouldEqual, "PTNull")
@@ -69,7 +69,7 @@ func TestProperties(t *testing.T) {
 				})
 				Convey("float", func() {
 					pv := Property{}
-					pv.SetValue(myfloat(19.7), ShouldIndex)
+					So(pv.SetValue(myfloat(19.7), ShouldIndex), ShouldBeNil)
 					So(pv.Value(), ShouldHaveSameTypeAs, float64(19.7))
 					So(pv.Value(), ShouldEqual, float32(19.7))
 					So(pv.IndexSetting(), ShouldEqual, ShouldIndex)
@@ -111,14 +111,14 @@ func TestProperties(t *testing.T) {
 				pv := Property{}
 				now := time.Now().In(time.UTC)
 				now = now.Round(time.Microsecond).Add(time.Nanosecond * 313)
-				pv.SetValue(now, ShouldIndex)
+				So(pv.SetValue(now, ShouldIndex), ShouldBeNil)
 				So(pv.Value(), ShouldHappenBefore, now)
 				So(pv.IndexSetting(), ShouldEqual, ShouldIndex)
 				So(pv.Type().String(), ShouldEqual, "PTTime")
 			})
 			Convey("[]byte allows IndexSetting", func() {
 				pv := Property{}
-				pv.SetValue([]byte("hello"), ShouldIndex)
+				So(pv.SetValue([]byte("hello"), ShouldIndex), ShouldBeNil)
 				So(pv.Value(), ShouldResemble, []byte("hello"))
 				So(pv.IndexSetting(), ShouldEqual, ShouldIndex)
 				So(pv.Type().String(), ShouldEqual, "PTBytes")