Differentiate between single- and multi- props.

impl/memory/datastore_query_execution.go

 // Copyright 2015 The LUCI Authors. All rights reserved.
 // Use of this source code is governed under the Apache License, Version 2.0
 // that can be found in the LICENSE file.
 
 package memory
 
 import (
         "bytes"
         "errors"
         "fmt"
@@ skipping 53 matching lines @@
 func (s *projectionStrategy) handle(rawData [][]byte, decodedProps []ds.Property, key *ds.Key, gc func() (ds.Cursor, error)) error {
         projectedRaw := [][]byte(nil)
         if s.distinct != nil {
                 projectedRaw = make([][]byte, len(decodedProps))
         }
         pmap := make(ds.PropertyMap, len(s.project))
         for i, p := range s.project {
                 if s.distinct != nil {
                         projectedRaw[i] = rawData[p.suffixIndex]
                 }
-                pmap[p.propertyName] = []ds.Property{decodedProps[p.suffixIndex]}
+                pmap[p.propertyName] = decodedProps[p.suffixIndex]
         }
         if s.distinct != nil {
                 if !s.distinct.Add(string(serialize.Join(projectedRaw...))) {
                         return nil
                 }
         }
         return s.cb(key, pmap, gc)
 }
 
 type keysOnlyStrategy struct {
@@ skipping 206 matching lines @@
                 keyProp := decodedProps[len(decodedProps)-1]
                 if keyProp.Type() != ds.PTKey {
                         impossible(fmt.Errorf("decoded index row doesn't end with a Key: %#v", keyProp))
                 }
 
                 return strategy.handle(
                         rawData, decodedProps, keyProp.Value().(*ds.Key),
                         getCursorFn(suffix))
         })
 }