impl/memory: Implement Queries

service/datastore/serialize/serialize_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 serialize
 
 import (
         "bytes"
         "fmt"
         "io"
@@ skipping 146 matching lines @@
                         buf := mkBuf(nil)
                         cmpbin.WriteString(buf, "foo")
                         buf.WriteByte(byte(ds.PTInt))
                         cmpbin.WriteInt(buf, 20)
                         So(string(ToBytes(ds.KeyTok{Kind: "foo", IntID: 20})),
                                 ShouldEqual, buf.String())
                 })
 
                 Convey("Property", func() {
                         buf := mkBuf(nil)
-                        buf.WriteByte(byte(ds.PTString))
+                        buf.WriteByte(0x80 | byte(ds.PTString))
                         cmpbin.WriteString(buf, "nerp")
                         So(string(ToBytes(mp("nerp"))),
                                 ShouldEqual, buf.String())
                 })
 
                 Convey("Time", func() {
                         tp := mp(time.Now().UTC())
                         So(string(ToBytes(tp.Value())), ShouldEqual, string(ToBytes(tp)[1:]))
                 })
 
@@ skipping 231 matching lines @@
                                 cmpbin.WriteUint(buf, 10)
                                 cmpbin.WriteString(buf, "ohai")
                                 cmpbin.WriteUint(buf, 10)
                                 _, err := ReadPropertyMap(buf, WithContext, "", "")
                                 So(err, ShouldEqual, io.EOF)
                         })
                 })
 
                 Convey("IndexDefinition", func() {
                         id := ds.IndexDefinition{Kind: "kind"}
-                        data := ToBytes(id)
-                        So(string(data), ShouldStartWith, string(ds.IndexBuiltinQueryPrefix()))
+                        data := ToBytes(*id.PrepForIdxTable())
                         newID, err := ReadIndexDefinition(mkBuf(data))
                         So(err, ShouldBeNil)
-                        So(newID, ShouldResemble, id)
+                        So(newID.Flip(), ShouldResemble, id.Normalize())
 
                         id.SortBy = append(id.SortBy, ds.IndexColumn{Property: "prop"})
-                        data = ToBytes(id)
-                        So(string(data), ShouldStartWith, string(ds.IndexBuiltinQueryPrefix()))
+                        data = ToBytes(*id.PrepForIdxTable())
                         newID, err = ReadIndexDefinition(mkBuf(data))
                         So(err, ShouldBeNil)
-                        So(newID, ShouldResemble, id)
+                        So(newID.Flip(), ShouldResemble, id.Normalize())
 
                         id.SortBy = append(id.SortBy, ds.IndexColumn{Property: "other", Direction: ds.DESCENDING})
                         id.Ancestor = true
-                        data = ToBytes(id)
-                        So(string(data), ShouldStartWith, string(ds.IndexComplexQueryPrefix()))
+                        data = ToBytes(*id.PrepForIdxTable())
                         newID, err = ReadIndexDefinition(mkBuf(data))
                         So(err, ShouldBeNil)
-                        So(newID, ShouldResemble, id)
+                        So(newID.Flip(), ShouldResemble, id.Normalize())
 
                         // invalid
                         id.SortBy = append(id.SortBy, ds.IndexColumn{Property: "", Direction: ds.DESCENDING})
-                        data = ToBytes(id)
-                        So(string(data), ShouldStartWith, string(ds.IndexComplexQueryPrefix()))
+                        data = ToBytes(*id.PrepForIdxTable())
                         newID, err = ReadIndexDefinition(mkBuf(data))
                         So(err, ShouldBeNil)
-                        So(newID, ShouldResemble, id)
+                        So(newID.Flip(), ShouldResemble, id.Normalize())
 
                         Convey("too many", func() {
                                 id := ds.IndexDefinition{Kind: "wat"}
                                 for i := 0; i < MaxIndexColumns+1; i++ {
                                         id.SortBy = append(id.SortBy, ds.IndexColumn{Property: "Hi", Direction: ds.ASCENDING})
                                 }
-                                data := ToBytes(id)
+                                data := ToBytes(*id.PrepForIdxTable())
                                 newID, err = ReadIndexDefinition(mkBuf(data))
                                 So(err, ShouldErrLike, "over 64 sort orders")
                         })
                 })
         })
 }