LogDog: Fix archival Get/Tail implementations.

logdog/common/archive/archive_test.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 archive
 
 import (
         "bytes"
         "fmt"
         "io"
@@ skipping 135 matching lines @@
         cr := iotools.CountingReader{
                 Reader: logB,
         }
         csize := uint64(0)
         r := recordio.NewReader(&cr, 1024*1024)
         d, err := r.ReadFrameAll()
         if err != nil {
                 return "failed to skip descriptor frame"
         }
         for {
-                offset := cr.Count()
+                offset := cr.Count
                 d, err = r.ReadFrameAll()
                 if err == io.EOF {
                         break
                 }
                 if err != nil {
                         return fmt.Sprintf("failed to read entry #%d: %v", len(entries), err)
                 }
 
                 le := logpb.LogEntry{}
                 if err := proto.Unmarshal(d, &le); err != nil {
@@ skipping 200 matching lines @@
                         })
                 })
 
                 Convey(`When building sparse index`, func() {
                         ts.add(0, 1, 2, 3, 4, 5)
 
                         Convey(`Can build an index for every 3 StreamIndex.`, func() {
                                 m.StreamIndexRange = 3
                                 So(Archive(m), ShouldBeNil)
 
-                                So(&indexB, ic.shouldContainIndexFor, desc, &logB, 0, 3)
+                                So(&indexB, ic.shouldContainIndexFor, desc, &logB, 0, 3, 5)
                                 So(indexParams(indexB.Bytes()), ShouldResemble, logpb.LogIndex{
                                         Desc:            desc,
                                         LastPrefixIndex: 10,
                                         LastStreamIndex: 5,
                                         LogEntryCount:   6,
                                 })
                         })
 
                         Convey(`Can build an index for every 3 PrefixIndex.`, func() {
                                 m.PrefixIndexRange = 3
                                 So(Archive(m), ShouldBeNil)
 
                                 // Note that in our generated logs, PrefixIndex = 2*StreamIndex.
-                                So(&indexB, ic.shouldContainIndexFor, desc, &logB, 0, 2, 4)
+                                So(&indexB, ic.shouldContainIndexFor, desc, &logB, 0, 2, 4, 5)
                                 So(indexParams(indexB.Bytes()), ShouldResemble, logpb.LogIndex{
                                         Desc:            desc,
                                         LastPrefixIndex: 10,
                                         LastStreamIndex: 5,
                                         LogEntryCount:   6,
                                 })
                         })
 
                         Convey(`Can build an index for every 13 bytes.`, func() {
                                 ic.fixedSize = 5
                                 m.ByteRange = 13
                                 m.sizeFunc = func(pb proto.Message) int {
                                         // Stub all LogEntry to be 5 bytes.
                                         return 5
                                 }
                                 So(Archive(m), ShouldBeNil)
 
                                 So(&indexB, ic.shouldContainIndexFor, desc, &logB, 0, 2, 5)
                                 So(indexParams(indexB.Bytes()), ShouldResemble, logpb.LogIndex{
                                         Desc:            desc,
                                         LastPrefixIndex: 10,
                                         LastStreamIndex: 5,
                                         LogEntryCount:   6,
                                 })
                         })
                 })
         })
 }