From 9a7b23440f5dd8972fe619da5e6fc8f51beaaa0b Mon Sep 17 00:00:00 2001 From: Scott Miller Date: Wed, 7 Apr 2021 11:25:23 -0500 Subject: [PATCH] Fix err shadowing (#11296) --- physical/dynamodb/dynamodb.go | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/physical/dynamodb/dynamodb.go b/physical/dynamodb/dynamodb.go index 596d9f4a92..ff5f7a2bcf 100644 --- a/physical/dynamodb/dynamodb.go +++ b/physical/dynamodb/dynamodb.go @@ -500,7 +500,7 @@ func (d *DynamoDBBackend) HAEnabled() bool { func (d *DynamoDBBackend) batchWriteRequests(requests []*dynamodb.WriteRequest) error { for len(requests) > 0 { batchSize := int(math.Min(float64(len(requests)), 25)) - batch := map[string][]*dynamodb.WriteRequest{ d.table: requests[:batchSize] } + batch := map[string][]*dynamodb.WriteRequest{d.table: requests[:batchSize]} requests = requests[batchSize:] var err error @@ -511,19 +511,20 @@ func (d *DynamoDBBackend) batchWriteRequests(requests []*dynamodb.WriteRequest) boff.MaxElapsedTime = 600 * time.Second for len(batch) > 0 { - output, err := d.client.BatchWriteItem(&dynamodb.BatchWriteItemInput{ + var output *dynamodb.BatchWriteItemOutput + output, err = d.client.BatchWriteItem(&dynamodb.BatchWriteItemInput{ RequestItems: batch, }) - if err != nil{ + if err != nil { break } if len(output.UnprocessedItems) == 0 { break } else { - duration := boff.NextBackOff(); - if (duration != backoff.Stop) { + duration := boff.NextBackOff() + if duration != backoff.Stop { batch = output.UnprocessedItems time.Sleep(duration) } else {