Skip to content

Commit bb7a2d4

Browse files
simplify put
1 parent d154d71 commit bb7a2d4

File tree

1 file changed

+9
-22
lines changed

1 file changed

+9
-22
lines changed

provider/datastore/keystore.go

Lines changed: 9 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -272,7 +272,11 @@ func (s *keyStore) worker() {
272272
// returns the keys that weren't present already in the keystore.
273273
func (s *keyStore) put(ctx context.Context, keys []mh.Multihash) ([]mh.Multihash, error) {
274274
seen := make(map[bit256.Key]struct{}, len(keys))
275-
toPut := make([]pair, 0, len(keys))
275+
b, err := s.ds.Batch(ctx)
276+
if err != nil {
277+
return nil, err
278+
}
279+
newKeys := make([]mh.Multihash, 0, len(keys))
276280

277281
for _, h := range keys {
278282
k := keyspace.MhToBit256(h)
@@ -286,32 +290,15 @@ func (s *keyStore) put(ctx context.Context, keys []mh.Multihash) ([]mh.Multihash
286290
return nil, err
287291
}
288292
if !ok {
289-
toPut = append(toPut, pair{k: dsk, h: h})
290-
}
291-
}
292-
clear(seen)
293-
if len(toPut) == 0 {
294-
// Nothing to do
295-
return nil, nil
296-
}
297-
298-
b, err := s.ds.Batch(ctx)
299-
if err != nil {
300-
return nil, err
301-
}
302-
for _, p := range toPut {
303-
if err := b.Put(ctx, p.k, p.h); err != nil {
304-
return nil, err
293+
if err := b.Put(ctx, dsk, h); err != nil {
294+
return nil, err
295+
}
296+
newKeys = append(newKeys, h)
305297
}
306298
}
307299
if err := b.Commit(ctx); err != nil {
308300
return nil, err
309301
}
310-
311-
newKeys := make([]mh.Multihash, len(toPut))
312-
for i, p := range toPut {
313-
newKeys[i] = p.h
314-
}
315302
return newKeys, nil
316303
}
317304

0 commit comments

Comments
 (0)