From 424a18cf2b6492848122ef33b888afbcbdee158f Mon Sep 17 00:00:00 2001 From: Bryan Boreham Date: Sat, 8 Jun 2019 13:07:33 +0000 Subject: [PATCH] Fix batching again --- extras/scanner/main.go | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/extras/scanner/main.go b/extras/scanner/main.go index dd29b59ed..a4dad5c8a 100644 --- a/extras/scanner/main.go +++ b/extras/scanner/main.go @@ -233,15 +233,15 @@ func (sc *scanner) deleteOneOrgHour(ctx context.Context, org string, hour int) i end = len(keys) } wait.Add(1) - go func(start, end int) { - sc.deleteFromS3(ctx, keys[start:end]) - for _, key := range keys { + go func(batchKeys []map[string]*dynamodb.AttributeValue) { + sc.deleteFromS3(ctx, batchKeys) + for _, key := range batchKeys { delete(key, reportField) // not part of key in dynamoDB } - sc.deleteFromDynamoDB(keys[start:end]) - s3ItemsDeleted.Add(float64(end - start)) + sc.deleteFromDynamoDB(batchKeys) + s3ItemsDeleted.Add(float64(len(batchKeys))) wait.Done() - }(start, end) + }(keys[start:end]) } wait.Wait() return len(keys)