Don't need DynamoDB request wrapper to do so much now

Now we are calling QueryPagesWithContext directly we don't need the
paging interface and we never re-use request objects.

Signed-off-by: Bryan Boreham <[email protected]>

Author: bboreham

pkg/chunk/aws/dynamodb_storage_client.go

@@ -358,11 +358,9 @@ func (a dynamoDBStorageClient) query(ctx context.Context, query chunk.IndexQuery
 }
 
 type dynamoDBRequest interface {
-	NextPage() dynamoDBRequest
 	Send() error
 	Data() interface{}
 	Error() error
-	HasNextPage() bool
 	Retryable() bool
 }
 
@@ -382,33 +380,18 @@ type dynamoDBRequestAdapter struct {
 	request *request.Request
 }
 
-func (a dynamoDBRequestAdapter) NextPage() dynamoDBRequest {
-	next := a.request.NextPage()
-	if next == nil {
-		return nil
-	}
-	return dynamoDBRequestAdapter{next}
-}
-
 func (a dynamoDBRequestAdapter) Data() interface{} {
 	return a.request.Data
 }
 
 func (a dynamoDBRequestAdapter) Send() error {
-	// Clear error in case we are retrying the same operation - if we
-	// don't do this then the same error will come back again immediately
-	a.request.Error = nil
 	return a.request.Send()
 }
 
 func (a dynamoDBRequestAdapter) Error() error {
 	return a.request.Error
 }
 
-func (a dynamoDBRequestAdapter) HasNextPage() bool {
-	return a.request.HasNextPage()
-}
-
 func (a dynamoDBRequestAdapter) Retryable() bool {
 	return aws.BoolValue(a.request.Retryable)
 }

pkg/chunk/aws/mock.go

@@ -250,9 +250,6 @@ type dynamoDBMockRequest struct {
 	err    error
 }
 
-func (m *dynamoDBMockRequest) NextPage() dynamoDBRequest {
-	return m
-}
 func (m *dynamoDBMockRequest) Send() error {
 	return m.err
 }
@@ -262,9 +259,6 @@ func (m *dynamoDBMockRequest) Data() interface{} {
 func (m *dynamoDBMockRequest) Error() error {
 	return m.err
 }
-func (m *dynamoDBMockRequest) HasNextPage() bool {
-	return false
-}
 func (m *dynamoDBMockRequest) Retryable() bool {
 	return false
 }