type ManifestStream struct {
StreamName string
Blocks []string
- BlockOffsets []uint64
+ blockOffsets []uint64
FileStreamSegments []FileStreamSegment
Err error
}
// assumes that all of the blocks are contiguous, so range_start is guaranteed
// to either fall into the range of a block or be outside the block range entirely
for !(range_start >= block_start && range_start < block_end) {
+ fmt.Println(i, block_start, block_end)
if lo == i {
// must be out of range, fail
return -1
lo = i
} else {
hi = i
- i = ((hi + lo) / 2)
- block_start = offsets[i]
- block_end = offsets[i+1]
}
+ i = ((hi + lo) / 2)
+ block_start = offsets[i]
+ block_end = offsets[i+1]
}
return i
}
}
// Binary search to determine first block in the stream
- i := firstBlock(s.BlockOffsets, wantPos)
+ i := firstBlock(s.blockOffsets, wantPos)
if i == -1 {
// Shouldn't happen, file segments are checked in parseManifestStream
panic(fmt.Sprintf("File segment %v extends past end of stream", fTok))
}
for ; i < len(s.Blocks); i++ {
- blockPos := s.BlockOffsets[i]
- blockEnd := s.BlockOffsets[i+1]
+ blockPos := s.blockOffsets[i]
+ blockEnd := s.blockOffsets[i+1]
if blockEnd <= wantPos {
// Shouldn't happen, FirstBlock() should start
// us on the right block, so if this triggers
return
}
- m.BlockOffsets = make([]uint64, len(m.Blocks)+1)
+ m.blockOffsets = make([]uint64, len(m.Blocks)+1)
var streamoffset uint64
for i, b := range m.Blocks {
bl, err := ParseBlockLocator(b)
m.Err = err
return
}
- m.BlockOffsets[i] = streamoffset
+ m.blockOffsets[i] = streamoffset
streamoffset += uint64(bl.Size)
}
- m.BlockOffsets[len(m.Blocks)] = streamoffset
+ m.blockOffsets[len(m.Blocks)] = streamoffset
if len(fileTokens) == 0 {
m.Err = fmt.Errorf("No file tokens found")
return
}
-func (m *Manifest) segment() *segmentedManifest {
+func (m *Manifest) segment() (*segmentedManifest, error) {
files := make(segmentedManifest)
for stream := range m.StreamIter() {
if stream.Err != nil {
- // Skip streams with errors
- continue
+ // Stream has an error
+ return nil, stream.Err
}
currentStreamfiles := make(map[string]bool)
for _, f := range stream.FileStreamSegments {
}
}
- return &files
+ return &files, nil
}
func (stream segmentedStream) normalizedText(name string) string {
return manifest
}
-// ManifestTextForPath extracts some or all of the manifest and returns
-// normalized manifest text. This is a swiss army knife function that can be
-// used a couple of different ways:
+// Extract extracts some or all of the manifest and returns the extracted
+// portion as a normalized manifest. This is a swiss army knife function that
+// can be several ways:
+//
+// If 'srcpath' and 'relocate' are '.' it simply returns an equivalent manifest
+// in normalized form.
+//
+// Extract(".", ".") (return entire normalized manfest text)
//
// If 'srcpath' points to a single file, it will return manifest text for just that file.
// The value of "relocate" is can be used to rename the file or set the file stream.
//
-// ManifestTextForPath("./foo", ".") (extract file "foo" and put it in stream ".")
-// ManifestTextForPath("./foo", "./bar") (extract file "foo", rename it to "bar" in stream ".")
-// ManifestTextForPath("./foo", "./bar/") (extract file "foo", rename it to "./bar/foo")
-// ManifestTextForPath("./foo", "./bar/baz") (extract file "foo", rename it to "./bar/baz")
+// Extract("./foo", ".") (extract file "foo" and put it in stream ".")
+// Extract("./foo", "./bar") (extract file "foo", rename it to "bar" in stream ".")
+// Extract("./foo", "./bar/") (extract file "foo", rename it to "./bar/foo")
+// Extract("./foo", "./bar/baz") (extract file "foo", rename it to "./bar/baz")
//
// Otherwise it will return the manifest text for all streams with the prefix in "srcpath" and place
// them under the path in "relocate".
//
-// ManifestTextForPath(".", ".") (return entire normalized manfest text)
-// ManifestTextForPath("./stream", ".") (extract "./stream" to "." and "./stream/subdir" to "./subdir")
-// ManifestTextForPath("./stream", "./bar") (extract "./stream" to "./bar" and "./stream/subdir" to "./bar/subdir")
-func (m *Manifest) ManifestTextForPath(srcpath, relocate string) string {
- return m.segment().manifestTextForPath(srcpath, relocate)
-}
-
-// NormalizedText returns the manifest text in normalized form.
-func (m *Manifest) NormalizedText() string {
- return m.ManifestTextForPath(".", ".")
+// Extract("./stream", ".") (extract "./stream" to "." and "./stream/subdir" to "./subdir")
+// Extract("./stream", "./bar") (extract "./stream" to "./bar" and "./stream/subdir" to "./bar/subdir")
+func (m Manifest) Extract(srcpath, relocate string) (ret Manifest) {
+ segmented, err := m.segment()
+ if err != nil {
+ ret.Err = err
+ return
+ }
+ ret.Text = segmented.manifestTextForPath(srcpath, relocate)
+ return
}
func (m *Manifest) StreamIter() <-chan ManifestStream {
projects / arvados.git / blobdiff