octoleo/restic
2
2
Fork 0
mirror of https://github.com/octoleo/restic.git synced 2024-12-23 11:28:54 +00:00
Code Issues Releases Wiki Activity

rebuild-index: Refactor a bit

Browse Source
This commit is contained in:
Alexander Neumann 2015-10-25 17:53:02 +01:00
parent 5d617edbbf
commit 88849c06a6
2 changed files with 43 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

54
cmd/restic/cmd_rebuild_index.go
View File

@ -22,6 +22,22 @@ func init() {
} }
} }
func (cmd CmdRebuildIndex) storeIndex(index *repository.Index) (*repository.Index, error) {
debug.Log("RebuildIndex.RebuildIndex", "saving index")
cmd.global.Printf(" saving new index\n")
id, err := repository.SaveIndex(cmd.repo, index)
if err != nil {
debug.Log("RebuildIndex.RebuildIndex", "error saving index: %v", err)
return nil, err
}
debug.Log("RebuildIndex.RebuildIndex", "index saved as %v", id.Str())
index = repository.NewIndex()
return index, nil
}
func (cmd CmdRebuildIndex) RebuildIndex() error { func (cmd CmdRebuildIndex) RebuildIndex() error {
debug.Log("RebuildIndex.RebuildIndex", "start") debug.Log("RebuildIndex.RebuildIndex", "start")
@ -33,11 +49,16 @@ func (cmd CmdRebuildIndex) RebuildIndex() error {
indexIDs.Insert(id) indexIDs.Insert(id)
} }
cmd.global.Printf("rebuilding index from %d indexes\n", len(indexIDs))
debug.Log("RebuildIndex.RebuildIndex", "found %v indexes", len(indexIDs)) debug.Log("RebuildIndex.RebuildIndex", "found %v indexes", len(indexIDs))
var combinedIndex *repository.Index combinedIndex := repository.NewIndex()
i := 0
for indexID := range indexIDs { for indexID := range indexIDs {
cmd.global.Printf(" loading index %v\n", i)
debug.Log("RebuildIndex.RebuildIndex", "load index %v", indexID.Str()) debug.Log("RebuildIndex.RebuildIndex", "load index %v", indexID.Str())
idx, err := repository.LoadIndex(cmd.repo, indexID.String()) idx, err := repository.LoadIndex(cmd.repo, indexID.String())
if err != nil { if err != nil {
@ -46,10 +67,6 @@ func (cmd CmdRebuildIndex) RebuildIndex() error {
debug.Log("RebuildIndex.RebuildIndex", "adding blobs from index %v", indexID.Str()) debug.Log("RebuildIndex.RebuildIndex", "adding blobs from index %v", indexID.Str())
if combinedIndex == nil {
combinedIndex = repository.NewIndex()
}
for packedBlob := range idx.Each(done) { for packedBlob := range idx.Each(done) {
combinedIndex.Store(packedBlob.Type, packedBlob.ID, packedBlob.PackID, packedBlob.Offset, packedBlob.Length) combinedIndex.Store(packedBlob.Type, packedBlob.ID, packedBlob.PackID, packedBlob.Offset, packedBlob.Length)
} }
@ -57,31 +74,28 @@ func (cmd CmdRebuildIndex) RebuildIndex() error {
combinedIndex.AddToSupersedes(indexID) combinedIndex.AddToSupersedes(indexID)
if repository.IndexFull(combinedIndex) { if repository.IndexFull(combinedIndex) {
debug.Log("RebuildIndex.RebuildIndex", "saving full index") combinedIndex, err = cmd.storeIndex(combinedIndex)
id, err := repository.SaveIndex(cmd.repo, combinedIndex)
if err != nil { if err != nil {
debug.Log("RebuildIndex.RebuildIndex", "error saving index: %v", err)
return err return err
} }
}
debug.Log("RebuildIndex.RebuildIndex", "index saved as %v", id.Str()) i++
combinedIndex = nil }
var err error
if combinedIndex.Length() > 0 {
combinedIndex, err = cmd.storeIndex(combinedIndex)
if err != nil {
return err
} }
} }
id, err := repository.SaveIndex(cmd.repo, combinedIndex) cmd.global.Printf("removing %d old indexes\n", len(indexIDs))
if err != nil {
debug.Log("RebuildIndex.RebuildIndex", "error saving index: %v", err)
return err
}
debug.Log("RebuildIndex.RebuildIndex", "last index saved as %v", id.Str())
for id := range indexIDs { for id := range indexIDs {
debug.Log("RebuildIndex.RebuildIndex", "remove index %v", id.Str()) debug.Log("RebuildIndex.RebuildIndex", "remove index %v", id.Str())
err = cmd.repo.Backend().Remove(backend.Index, id.String()) err := cmd.repo.Backend().Remove(backend.Index, id.String())
if err != nil { if err != nil {
debug.Log("RebuildIndex.RebuildIndex", "error removing index %v: %v", id.Str(), err) debug.Log("RebuildIndex.RebuildIndex", "error removing index %v: %v", id.Str(), err)
return err return err

9
repository/index.go
View File

@ -248,6 +248,15 @@ func (idx *Index) Count(t pack.BlobType) (n uint) {
return return
} }
// Length returns the number of entries in the Index.
func (idx *Index) Length() uint {
debug.Log("Index.Count", "counting blobs")
idx.m.Lock()
defer idx.m.Unlock()
return uint(len(idx.pack))
}
type packJSON struct { type packJSON struct {
ID backend.ID `json:"id"` ID backend.ID `json:"id"`
Blobs []blobJSON `json:"blobs"` Blobs []blobJSON `json:"blobs"`