add size to FilStorage, add Query method for CidInfo

asutula · asutula · commit c34091eca59e · 2020-04-28T11:46:13.000-05:00
Signed-off-by: Aaron Sutula &lt;hi@asutula.com&gt;
diff --git a/ffs/filcold/filcold.go b/ffs/filcold/filcold.go
@@ -242,6 +242,7 @@ func (fc *FilCold) waitForDeals(ctx context.Context, c cid.Cid, storeResults []d
 				Duration:        duration,
 				Miner:           d.Config.Miner,
 				ActivationEpoch: di.ActivationEpoch,
+				Size:            di.Size,
 			}
 			delete(notDone, di.ProposalCid)
 			fc.l.Log(ctx, c, "Deal %d with miner %s is active on-chain", di.DealID, di.Miner)
diff --git a/ffs/scheduler/cistore/cistore.go b/ffs/scheduler/cistore/cistore.go
@@ -6,12 +6,15 @@ import (
 
 	"github.com/ipfs/go-cid"
 	"github.com/ipfs/go-datastore"
+	"github.com/ipfs/go-datastore/query"
+	logging "github.com/ipfs/go-log/v2"
 	"github.com/textileio/powergate/ffs"
 	"github.com/textileio/powergate/ffs/scheduler"
 )
 
 var (
 	dsBase = datastore.NewKey("cistore")
+	log    = logging.Logger("ffs-sched-cistore")
 )
 
 // Store is an Datastore implementation of CidInfoStore
@@ -59,6 +62,32 @@ func (s *Store) Put(ci ffs.CidInfo) error {
 	return nil
 }
 
+// Query returns a list of CidInfo
+func (s *Store) Query(selector func(ffs.CidInfo) bool) ([]ffs.CidInfo, error) {
+	q := query.Query{Prefix: ""}
+	res, err := s.ds.Query(q)
+	if err != nil {
+		return nil, fmt.Errorf("executing query in datastore: %s", err)
+	}
+	defer func() {
+		if err := res.Close(); err != nil {
+			log.Errorf("closing query result: %s", err)
+		}
+	}()
+
+	var infos []ffs.CidInfo
+	for r := range res.Next() {
+		var i ffs.CidInfo
+		if err := json.Unmarshal(r.Value, &i); err != nil {
+			return nil, fmt.Errorf("unmarshalling push config action in query: %s", err)
+		}
+		if selector(i) {
+			infos = append(infos, i)
+		}
+	}
+	return infos, nil
+}
+
 func makeKey(c cid.Cid) datastore.Key {
 	return dsBase.ChildString(c.String())
 }
diff --git a/ffs/scheduler/types.go b/ffs/scheduler/types.go
@@ -56,4 +56,5 @@ type ActionStore interface {
 type CidInfoStore interface {
 	Put(ffs.CidInfo) error
 	Get(cid.Cid) (ffs.CidInfo, error)
+	Query(func(ffs.CidInfo) bool) ([]ffs.CidInfo, error)
 }
diff --git a/ffs/types.go b/ffs/types.go
@@ -336,6 +336,7 @@ type FilStorage struct {
 	Duration        int64
 	ActivationEpoch int64
 	Miner           string
+	Size            uint64
 }
 
 // CidLoggerCtxKey is a type to use in ctx values for CidLogger.

Original file line number	Diff line number	Diff line change
`@@ -242,6 +242,7 @@ func (fc *FilCold) waitForDeals(ctx context.Context, c cid.Cid, storeResults []d`
`242`	`242`	`Duration: duration,`
`243`	`243`	`Miner: d.Config.Miner,`
`244`	`244`	`ActivationEpoch: di.ActivationEpoch,`
	`245`	`+ Size: di.Size,`
`245`	`246`	`}`
`246`	`247`	`delete(notDone, di.ProposalCid)`
`247`	`248`	`fc.l.Log(ctx, c, "Deal %d with miner %s is active on-chain", di.DealID, di.Miner)`
Original file line number	Diff line number	Diff line change
`@@ -56,4 +56,5 @@ type ActionStore interface {`
`56`	`56`	`type CidInfoStore interface {`
`57`	`57`	`Put(ffs.CidInfo) error`
`58`	`58`	`Get(cid.Cid) (ffs.CidInfo, error)`
	`59`	`+ Query(func(ffs.CidInfo) bool) ([]ffs.CidInfo, error)`
`59`	`60`	`}`
Original file line number	Diff line number	Diff line change
`@@ -336,6 +336,7 @@ type FilStorage struct {`
`336`	`336`	`Duration int64`
`337`	`337`	`ActivationEpoch int64`
`338`	`338`	`Miner string`
	`339`	`+ Size uint64`
`339`	`340`	`}`
`340`	`341`
`341`	`342`	`// CidLoggerCtxKey is a type to use in ctx values for CidLogger.`