@@ -411,25 +411,18 @@ func (q *DSQueue) clearDatastore(ctx context.Context) (int, error) {
411411 return 0 , fmt .Errorf ("cannot create datastore batch: %w" , err )
412412 }
413413
414- var rmCount , writeCount int
414+ var rmCount int
415415 for result := range results .Next () {
416416 if ctx .Err () != nil {
417417 return 0 , ctx .Err ()
418418 }
419- if writeCount >= DefaultBufferSize {
420- writeCount = 0
421- if err = batch .Commit (ctx ); err != nil {
422- return 0 , fmt .Errorf ("cannot commit datastore updates: %w" , err )
423- }
424- }
425419 if result .Error != nil {
426420 return 0 , fmt .Errorf ("cannot read query result from datastore: %w" , result .Error )
427421 }
428422 if err = batch .Delete (ctx , datastore .NewKey (result .Key )); err != nil {
429423 return 0 , fmt .Errorf ("cannot delete key from datastore: %w" , err )
430424 }
431425 rmCount ++
432- writeCount ++
433426 }
434427
435428 if err = batch .Commit (ctx ); err != nil {
@@ -509,7 +502,6 @@ func (q *DSQueue) readDatastore(ctx context.Context, n int, items [][]byte) ([][
509502 if err != nil {
510503 return nil , fmt .Errorf ("cannot create datastore batch: %w" , err )
511504 }
512- var delCount int
513505
514506 for result := range results .Next () {
515507 if ctx .Err () != nil {
@@ -522,14 +514,6 @@ func (q *DSQueue) readDatastore(ctx context.Context, n int, items [][]byte) ([][
522514 if err = batch .Delete (ctx , datastore .NewKey (result .Key )); err != nil {
523515 return nil , fmt .Errorf ("error deleting queue item: %w" , err )
524516 }
525- delCount ++
526-
527- if delCount >= DefaultBufferSize {
528- delCount = 0
529- if err = batch .Commit (ctx ); err != nil {
530- return nil , fmt .Errorf ("cannot commit datastore updates: %w" , err )
531- }
532- }
533517
534518 parts := strings .SplitN (strings .TrimPrefix (result .Key , "/" ), "/" , 2 )
535519 if len (parts ) != 2 {
0 commit comments