@@ -47,7 +47,7 @@ type DealData struct {
4747 Close func ()
4848}
4949
50- func DealDataSDRPoRep (ctx context.Context , db * harmonydb.DB , sc * ffi.SealCalls , spId , sectorNumber int64 , spt abi.RegisteredSealProof ) (* DealData , error ) {
50+ func DealDataSDRPoRep (ctx context.Context , db * harmonydb.DB , sc * ffi.SealCalls , spId , sectorNumber int64 , spt abi.RegisteredSealProof , commDOnly bool ) (* DealData , error ) {
5151 var pieces []dealMetadata
5252 err := db .Select (ctx , & pieces , `
5353 SELECT piece_index, piece_cid, piece_size, data_url, data_headers, data_raw_size, data_delete_on_finalize
@@ -57,7 +57,7 @@ func DealDataSDRPoRep(ctx context.Context, db *harmonydb.DB, sc *ffi.SealCalls,
5757 return nil , xerrors .Errorf ("getting pieces: %w" , err )
5858 }
5959
60- return getDealMetadata (ctx , db , sc , spt , pieces )
60+ return getDealMetadata (ctx , db , sc , spt , pieces , commDOnly )
6161}
6262
6363func DealDataSnap (ctx context.Context , db * harmonydb.DB , sc * ffi.SealCalls , spId , sectorNumber int64 , spt abi.RegisteredSealProof ) (* DealData , error ) {
@@ -70,10 +70,10 @@ func DealDataSnap(ctx context.Context, db *harmonydb.DB, sc *ffi.SealCalls, spId
7070 return nil , xerrors .Errorf ("getting pieces: %w" , err )
7171 }
7272
73- return getDealMetadata (ctx , db , sc , spt , pieces )
73+ return getDealMetadata (ctx , db , sc , spt , pieces , false )
7474}
7575
76- func getDealMetadata (ctx context.Context , db * harmonydb.DB , sc * ffi.SealCalls , spt abi.RegisteredSealProof , pieces []dealMetadata ) (* DealData , error ) {
76+ func getDealMetadata (ctx context.Context , db * harmonydb.DB , sc * ffi.SealCalls , spt abi.RegisteredSealProof , pieces []dealMetadata , commDOnly bool ) (* DealData , error ) {
7777 ssize , err := spt .SectorSize ()
7878 if err != nil {
7979 return nil , xerrors .Errorf ("getting sector size: %w" , err )
@@ -125,51 +125,53 @@ func getDealMetadata(ctx context.Context, db *harmonydb.DB, sc *ffi.SealCalls, s
125125 offset += abi .PaddedPieceSize (p .PieceSize ).Unpadded ()
126126
127127 // make pieceReader
128- if p .DataUrl != nil {
129- dataUrl := * p .DataUrl
128+ if ! commDOnly {
129+ if p .DataUrl != nil {
130+ dataUrl := * p .DataUrl
130131
131- goUrl , err := url .Parse (dataUrl )
132- if err != nil {
133- return nil , xerrors .Errorf ("parsing data URL: %w" , err )
134- }
135-
136- if goUrl .Scheme == "pieceref" {
137- // url is to a piece reference
138-
139- refNum , err := strconv .ParseInt (goUrl .Opaque , 10 , 64 )
132+ goUrl , err := url .Parse (dataUrl )
140133 if err != nil {
141- return nil , xerrors .Errorf ("parsing piece reference number : %w" , err )
134+ return nil , xerrors .Errorf ("parsing data URL : %w" , err )
142135 }
143136
144- // get pieceID
145- var pieceID []struct {
146- PieceID storiface.PieceNumber `db:"piece_id"`
147- }
148- err = db .Select (ctx , & pieceID , `SELECT piece_id FROM parked_piece_refs WHERE ref_id = $1` , refNum )
149- if err != nil {
150- return nil , xerrors .Errorf ("getting pieceID: %w" , err )
137+ if goUrl .Scheme == "pieceref" {
138+ // url is to a piece reference
139+
140+ refNum , err := strconv .ParseInt (goUrl .Opaque , 10 , 64 )
141+ if err != nil {
142+ return nil , xerrors .Errorf ("parsing piece reference number: %w" , err )
143+ }
144+
145+ // get pieceID
146+ var pieceID []struct {
147+ PieceID storiface.PieceNumber `db:"piece_id"`
148+ }
149+ err = db .Select (ctx , & pieceID , `SELECT piece_id FROM parked_piece_refs WHERE ref_id = $1` , refNum )
150+ if err != nil {
151+ return nil , xerrors .Errorf ("getting pieceID: %w" , err )
152+ }
153+
154+ if len (pieceID ) != 1 {
155+ return nil , xerrors .Errorf ("expected 1 pieceID, got %d" , len (pieceID ))
156+ }
157+
158+ pr , err := sc .PieceReader (ctx , pieceID [0 ].PieceID )
159+ if err != nil {
160+ return nil , xerrors .Errorf ("getting piece reader: %w" , err )
161+ }
162+
163+ closers = append (closers , pr )
164+
165+ reader , _ := padreader .New (pr , uint64 (* p .DataRawSize ))
166+ pieceReaders = append (pieceReaders , reader )
167+ } else {
168+ reader , _ := padreader .New (NewUrlReader (dataUrl , * p .DataRawSize ), uint64 (* p .DataRawSize ))
169+ pieceReaders = append (pieceReaders , reader )
151170 }
152171
153- if len (pieceID ) != 1 {
154- return nil , xerrors .Errorf ("expected 1 pieceID, got %d" , len (pieceID ))
155- }
156-
157- pr , err := sc .PieceReader (ctx , pieceID [0 ].PieceID )
158- if err != nil {
159- return nil , xerrors .Errorf ("getting piece reader: %w" , err )
160- }
161-
162- closers = append (closers , pr )
163-
164- reader , _ := padreader .New (pr , uint64 (* p .DataRawSize ))
165- pieceReaders = append (pieceReaders , reader )
166- } else {
167- reader , _ := padreader .New (NewUrlReader (dataUrl , * p .DataRawSize ), uint64 (* p .DataRawSize ))
168- pieceReaders = append (pieceReaders , reader )
172+ } else { // padding piece (w/o fr32 padding, added in TreeD)
173+ pieceReaders = append (pieceReaders , nullreader .NewNullReader (abi .PaddedPieceSize (p .PieceSize ).Unpadded ()))
169174 }
170-
171- } else { // padding piece (w/o fr32 padding, added in TreeD)
172- pieceReaders = append (pieceReaders , nullreader .NewNullReader (abi .PaddedPieceSize (p .PieceSize ).Unpadded ()))
173175 }
174176
175177 if ! p .DataDelOnFinalize {
@@ -199,18 +201,22 @@ func getDealMetadata(ctx context.Context, db *harmonydb.DB, sc *ffi.SealCalls, s
199201 out .IsUnpadded = true
200202 } else {
201203 out .CommD = zerocomm .ZeroPieceCommitment (abi .PaddedPieceSize (ssize ).Unpadded ())
202- out .Data = nullreader .NewNullReader (abi .UnpaddedPieceSize (ssize ))
204+ if ! commDOnly {
205+ out .Data = nullreader .NewNullReader (abi .UnpaddedPieceSize (ssize ))
206+ }
203207 out .PieceInfos = []abi.PieceInfo {{
204208 Size : abi .PaddedPieceSize (ssize ),
205209 PieceCID : out .CommD ,
206210 }}
207211 out .IsUnpadded = false // nullreader includes fr32 zero bits
208212 }
209213
210- out .Close = func () {
211- for _ , c := range closers {
212- if err := c .Close (); err != nil {
213- log .Errorw ("error closing piece reader" , "error" , err )
214+ if ! commDOnly {
215+ out .Close = func () {
216+ for _ , c := range closers {
217+ if err := c .Close (); err != nil {
218+ log .Errorw ("error closing piece reader" , "error" , err )
219+ }
214220 }
215221 }
216222 }
0 commit comments