LogDog: Fix archival Get/Tail implementations.

logdog/server/collector/utils_test.go

 // Copyright 2016 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 collector
 
 import (
         "bytes"
         "crypto/sha256"
         "encoding/hex"
         "errors"
         "fmt"
         "sort"
         "strings"
         "sync"
 
-        "github.com/golang/protobuf/proto"
         "github.com/luci/luci-go/common/clock"
         "github.com/luci/luci-go/common/config"
         "github.com/luci/luci-go/common/proto/google"
         "github.com/luci/luci-go/logdog/api/logpb"
         "github.com/luci/luci-go/logdog/client/butlerproto"
         "github.com/luci/luci-go/logdog/common/storage"
         "github.com/luci/luci-go/logdog/common/types"
         cc "github.com/luci/luci-go/logdog/server/collector/coordinator"
+
         "golang.org/x/net/context"
 )
 
 var testSecret = bytes.Repeat([]byte{0x55}, types.PrefixSecretLength)
 
 type streamKey struct {
         project string
         id      string
 }
 
@@ skipping 258 matching lines @@
         expected = expected[2:]
 
         // Load all entries for this stream.
         req := storage.GetRequest{
                 Project: config.ProjectName(project),
                 Path:    types.StreamPath(name),
         }
 
         entries := make(map[int]*logpb.LogEntry)
         var ierr error
-        err := st.Get(req, func(idx types.MessageIndex, d []byte) bool {
-                le := logpb.LogEntry{}
-                if ierr = proto.Unmarshal(d, &le); ierr != nil {
+        err := st.Get(req, func(e *storage.Entry) bool {
+                var le *logpb.LogEntry
+                if le, ierr = e.GetLogEntry(); ierr != nil {
                         return false
                 }
-                entries[int(idx)] = &le
+                entries[int(le.StreamIndex)] = le
                 return true
         })
         if ierr != nil {
                 err = ierr
         }
         if err != nil && err != storage.ErrDoesNotExist {
                 return fmt.Sprintf("error: %v", err)
         }
 
         assertLogEntry := func(i int) string {
@@ skipping 51 matching lines @@
         if len(failed) > 0 {
                 return strings.Join(failed, ", ")
         }
         return ""
 }
 
 func idFromPath(path string) string {
         hash := sha256.Sum256([]byte(path))
         return hex.EncodeToString(hash[:])
 }