feat: refine miner_sector_deal_v2 performance issue (#1300)

* Integrate sectorNumber to dealState and get the sectorID * Use dealProposal to find the providerID
filecoin-project · May 16, 2024 · 8273f89 · 8273f89
1 parent 661d756
commit 8273f89
Show file tree

Hide file tree

Showing 18 changed files with 144 additions and 44 deletions.
diff --git a/chain/actors/builtin/market/actor.go.template b/chain/actors/builtin/market/actor.go.template
@@ -77,7 +77,7 @@ type State interface {
 	DealStatesAmtBitwidth() int
 
 	GetProviderSectors() (map[abi.SectorID][]abi.DealID, error)
-	GetProviderSectorsByDealID(map[abi.DealID]bool) (map[abi.DealID]abi.SectorID, error)
+	GetProviderSectorsByDealID(map[abi.DealID]bool, map[abi.SectorNumber]bool) (map[abi.DealID]abi.SectorID, error)
 }
 
 type BalanceTable interface {
@@ -106,6 +106,7 @@ type DealProposal = markettypes.DealProposal
 type DealLabel = markettypes.DealLabel
 
 type DealState interface {
+	SectorNumber() abi.SectorNumber
 	SectorStartEpoch() abi.ChainEpoch // -1 if not yet included in proven sector
 	LastUpdatedEpoch() abi.ChainEpoch // -1 if deal state never updated
 	SlashEpoch() abi.ChainEpoch       // -1 if deal never slashed

diff --git a/chain/actors/builtin/market/market.go b/chain/actors/builtin/market/market.go
diff --git a/chain/actors/builtin/market/state.go.template b/chain/actors/builtin/market/state.go.template
@@ -156,6 +156,14 @@ func (d dealStateV{{.v}}) SectorStartEpoch() abi.ChainEpoch {
 	return d.ds{{.v}}.SectorStartEpoch
 }
 
+func (d dealStateV{{.v}}) SectorNumber() abi.SectorNumber {
+	{{if ge .v 13}}
+	return d.ds{{.v}}.SectorNumber
+	{{else}}
+	return 0
+	{{end}}
+}
+
 func (d dealStateV{{.v}}) LastUpdatedEpoch() abi.ChainEpoch {
 	return d.ds{{.v}}.LastUpdatedEpoch
 }
@@ -348,7 +356,7 @@ func (s *state{{.v}}) GetProviderSectors() (map[abi.SectorID][]abi.DealID, error
 	{{end}}
    }
 
-func (s *state{{.v}}) GetProviderSectorsByDealID(dealIDMap map[abi.DealID]bool) (map[abi.DealID]abi.SectorID, error) {
+func (s *state{{.v}}) GetProviderSectorsByDealID(dealIDMap map[abi.DealID]bool, sectorIDMap map[abi.SectorNumber]bool) (map[abi.DealID]abi.SectorID, error) {
 	{{if (le .v 12)}}
 	return nil, nil
 	{{else}}
@@ -376,6 +384,10 @@ func (s *state{{.v}}) GetProviderSectorsByDealID(dealIDMap map[abi.DealID]bool)
 				return err
 			}
 
+			if _, found := sectorIDMap[abi.SectorNumber(sectorNumber)]; !found {
+				return nil
+			}
+
 			dealIDsCopy := make([]abi.DealID, len(dealIDs))
 			copy(dealIDsCopy, dealIDs)
 

diff --git a/chain/actors/builtin/market/v0.go b/chain/actors/builtin/market/v0.go
diff --git a/chain/actors/builtin/market/v10.go b/chain/actors/builtin/market/v10.go
diff --git a/chain/actors/builtin/market/v11.go b/chain/actors/builtin/market/v11.go
diff --git a/chain/actors/builtin/market/v12.go b/chain/actors/builtin/market/v12.go
diff --git a/chain/actors/builtin/market/v13.go b/chain/actors/builtin/market/v13.go
diff --git a/chain/actors/builtin/market/v2.go b/chain/actors/builtin/market/v2.go
diff --git a/chain/actors/builtin/market/v3.go b/chain/actors/builtin/market/v3.go
diff --git a/chain/actors/builtin/market/v4.go b/chain/actors/builtin/market/v4.go
diff --git a/chain/actors/builtin/market/v5.go b/chain/actors/builtin/market/v5.go
diff --git a/chain/actors/builtin/market/v6.go b/chain/actors/builtin/market/v6.go
diff --git a/chain/actors/builtin/market/v7.go b/chain/actors/builtin/market/v7.go
diff --git a/chain/actors/builtin/market/v8.go b/chain/actors/builtin/market/v8.go
diff --git a/chain/actors/builtin/market/v9.go b/chain/actors/builtin/market/v9.go
diff --git a/lens/util/builtinactor.go b/lens/util/builtinactor.go
@@ -3,13 +3,14 @@ package util
 import (
 	"strconv"
 
-	"github.com/filecoin-project/lotus/chain/types"
 	"github.com/fxamacker/cbor/v2"
 	"github.com/ipfs/go-cid"
 	"github.com/ipld/go-ipld-prime"
 	"github.com/ipld/go-ipld-prime/codec/dagcbor"
 	"github.com/ipld/go-ipld-prime/node/basicnode"
 	"github.com/ipld/go-ipld-prime/node/bindnode"
+
+	"github.com/filecoin-project/lotus/chain/types"
 )
 
 type KVEvent struct {