Commit e168b8a9 authored by Kevin Atkinson's avatar Kevin Atkinson

Don't load all the keys in memory first when converting.

This also means that it is no longer possible to report the estimate time
left.
parent e7a3a270
...@@ -8,7 +8,6 @@ import ( ...@@ -8,7 +8,6 @@ import (
"io" "io"
"os" "os"
"path/filepath" "path/filepath"
"time"
"github.com/ipfs/go-datastore" "github.com/ipfs/go-datastore"
"github.com/ipfs/go-datastore/query" "github.com/ipfs/go-datastore/query"
...@@ -50,30 +49,35 @@ func Move(oldPath string, newPath string, out io.Writer) error { ...@@ -50,30 +49,35 @@ func Move(oldPath string, newPath string, out io.Writer) error {
return fmt.Errorf("%s: %v", newPath, err) return fmt.Errorf("%s: %v", newPath, err)
} }
if out != nil {
fmt.Fprintf(out, "Getting Keys...\n")
}
res, err := oldDS.Query(query.Query{KeysOnly: true}) res, err := oldDS.Query(query.Query{KeysOnly: true})
if err != nil { if err != nil {
return err return err
} }
entries, err := res.Rest()
if err != nil {
return err
}
prog := newProgress(len(entries), out)
if out != nil { if out != nil {
fmt.Fprintf(out, "Moving Keys...\n") fmt.Fprintf(out, "Moving Keys...\n")
} }
// first move the keys // first move the keys
for _, e := range entries { count := 0
for {
e, ok := res.NextSync()
if !ok {
break
}
if e.Error != nil {
return e.Error
}
err := moveKey(oldDS, newDS, datastore.RawKey(e.Key)) err := moveKey(oldDS, newDS, datastore.RawKey(e.Key))
if err != nil { if err != nil {
return err return err
} }
prog.Next()
count++
if out != nil && count%10 == 0 {
fmt.Fprintf(out, "\r%d keys so far", count)
}
} }
if out != nil { if out != nil {
...@@ -135,39 +139,3 @@ func moveKey(oldDS *Datastore, newDS *Datastore, key datastore.Key) error { ...@@ -135,39 +139,3 @@ func moveKey(oldDS *Datastore, newDS *Datastore, key datastore.Key) error {
} }
return nil return nil
} }
type progress struct {
total int
current int
out io.Writer
start time.Time
}
func newProgress(total int, out io.Writer) *progress {
return &progress{
total: total,
start: time.Now(),
out: out,
}
}
func (p *progress) Next() {
p.current++
if p.out == nil {
return
}
if p.current%10 == 0 || p.current == p.total {
fmt.Fprintf(p.out, "\r[%d / %d]", p.current, p.total)
}
if p.current%100 == 0 || p.current == p.total {
took := time.Now().Sub(p.start)
av := took / time.Duration(p.current)
estim := av * time.Duration(p.total-p.current)
//est := strings.Split(estim.String(), ".")[0]
fmt.Fprintf(p.out, " Approx time remaining: %s ", estim)
}
}
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment