Update perf tests for package refactor

marcosvm · Aug 20, 2015 · 848b7c7 · 848b7c7
1 parent 1fd4c57
commit 848b7c7
Show file tree

Hide file tree

Showing 8 changed files with 37 additions and 35 deletions.
diff --git a/internal/test/perf/dynamodb/dynamodb_live_test.go b/internal/test/perf/dynamodb/dynamodb_live_test.go
@@ -55,4 +55,3 @@ func benchPutItemParallel(p, c int, b *testing.B) {
 		}
 	})
 }
-
diff --git a/internal/test/perf/dynamodb/dynamodb_test.go b/internal/test/perf/dynamodb/dynamodb_test.go
@@ -3,15 +3,15 @@
 package dynamodb
 
 import (
+	"io"
+	"net/http"
 	"testing"
 
 	"github.com/aws/aws-sdk-go/aws"
 	"github.com/aws/aws-sdk-go/aws/credentials"
-	"github.com/aws/aws-sdk-go/aws/service"
+	"github.com/aws/aws-sdk-go/aws/request"
 	"github.com/aws/aws-sdk-go/service/dynamodb"
 	"github.com/aws/aws-sdk-go/service/dynamodb/dynamodbattribute"
-	"io"
-	"net/http"
 )
 
 type noopReadCloser struct{}
@@ -27,6 +27,7 @@ var noopBody = &noopReadCloser{}
 
 func BenchmarkPutItem(b *testing.B) {
 	cfg := aws.Config{
+		Region:      aws.String("us-east-1"),
 		DisableSSL:  aws.Bool(true),
 		Credentials: credentials.NewStaticCredentials("AKID", "SECRET", ""),
 	}
@@ -35,7 +36,7 @@ func BenchmarkPutItem(b *testing.B) {
 
 	svc := dynamodb.New(&cfg)
 	svc.Handlers.Send.Clear()
-	svc.Handlers.Send.PushBack(func(r *service.Request) {
+	svc.Handlers.Send.PushBack(func(r *request.Request) {
 		r.HTTPResponse = &http.Response{
 			StatusCode: http.StatusOK,
 			Status:     http.StatusText(http.StatusOK),

diff --git a/internal/test/perf/dynamodb/stub.go b/internal/test/perf/dynamodb/stub.go
@@ -1,8 +1,8 @@
 package dynamodb
 
 import (
-	"net/http/httptest"
 	"net/http"
+	"net/http/httptest"
 )
 
 type dbItem struct {

diff --git a/internal/test/perf/protocol/ec2query_build_test.go b/internal/test/perf/protocol/ec2query_build_test.go
@@ -6,6 +6,7 @@ import (
 	"testing"
 
 	"github.com/aws/aws-sdk-go/aws"
+	"github.com/aws/aws-sdk-go/aws/request"
 	"github.com/aws/aws-sdk-go/aws/service"
 	"github.com/aws/aws-sdk-go/internal/protocol/ec2query"
 	"github.com/aws/aws-sdk-go/service/ec2"
@@ -66,12 +67,12 @@ func BenchmarkEC2QueryBuild_Simple_ec2AttachNetworkInterface(b *testing.B) {
 }
 
 func benchEC2QueryBuild(b *testing.B, opName string, params interface{}) {
-	svc := service.NewService(nil)
+	svc := service.New(nil)
 	svc.ServiceName = "ec2"
 	svc.APIVersion = "2015-04-15"
 
 	for i := 0; i < b.N; i++ {
-		r := service.NewRequest(svc, &service.Operation{
+		r := svc.NewRequest(&request.Operation{
 			Name:       opName,
 			HTTPMethod: "POST",
 			HTTPPath:   "/",

diff --git a/internal/test/perf/protocol/jsonrpc_build_test.go b/internal/test/perf/protocol/jsonrpc_build_test.go
@@ -3,25 +3,26 @@
 package protocol
 
 import (
+	"bytes"
+	"encoding/json"
 	"testing"
 
 	"github.com/aws/aws-sdk-go/aws"
+	"github.com/aws/aws-sdk-go/aws/request"
 	"github.com/aws/aws-sdk-go/aws/service"
-	"github.com/aws/aws-sdk-go/internal/protocol/jsonrpc"
 	"github.com/aws/aws-sdk-go/internal/protocol/json/jsonutil"
+	"github.com/aws/aws-sdk-go/internal/protocol/jsonrpc"
 	"github.com/aws/aws-sdk-go/service/dynamodb"
 	"github.com/aws/aws-sdk-go/service/dynamodb/dynamodbattribute"
-	"encoding/json"
-	"bytes"
 )
 
 func BenchmarkJSONRPCBuild_Simple_dynamodbPutItem(b *testing.B) {
-	svc := service.NewService(nil)
+	svc := service.New(nil)
 
 	params := getDynamodbPutItemParams(b)
 
 	for i := 0; i < b.N; i++ {
-		r := service.NewRequest(svc, &service.Operation{Name: "Operation"}, params, nil)
+		r := svc.NewRequest(&request.Operation{Name: "Operation"}, params, nil)
 		jsonrpc.Build(r)
 		if r.Error != nil {
 			b.Fatal("Unexpected error", r.Error)
@@ -30,12 +31,12 @@ func BenchmarkJSONRPCBuild_Simple_dynamodbPutItem(b *testing.B) {
 }
 
 func BenchmarkJSONUtilBuild_Simple_dynamodbPutItem(b *testing.B) {
-	svc := service.NewService(nil)
+	svc := service.New(nil)
 
 	params := getDynamodbPutItemParams(b)
 
 	for i := 0; i < b.N; i++ {
-		r := service.NewRequest(svc, &service.Operation{Name: "Operation"}, params, nil)
+		r := svc.NewRequest(&request.Operation{Name: "Operation"}, params, nil)
 		_, err := jsonutil.BuildJSON(r.Params)
 		if err != nil {
 			b.Fatal("Unexpected error", err)
@@ -67,4 +68,4 @@ func getDynamodbPutItemParams(b *testing.B) *dynamodb.PutItemInput {
 		Item:      av,
 		TableName: aws.String("tablename"),
 	}
-}
+}
diff --git a/internal/test/perf/protocol/restjson_build_test.go b/internal/test/perf/protocol/restjson_build_test.go
@@ -3,24 +3,25 @@
 package protocol
 
 import (
+	"bytes"
+	"encoding/json"
 	"testing"
 
 	"github.com/aws/aws-sdk-go/aws"
+	"github.com/aws/aws-sdk-go/aws/request"
 	"github.com/aws/aws-sdk-go/aws/service"
 	"github.com/aws/aws-sdk-go/internal/protocol/rest"
 	"github.com/aws/aws-sdk-go/internal/protocol/restjson"
 	"github.com/aws/aws-sdk-go/service/elastictranscoder"
-	"bytes"
-	"encoding/json"
 )
 
 func BenchmarkRESTJSONBuild_Complex_elastictranscoderCreateJobInput(b *testing.B) {
-	svc := service.NewService(nil)
+	svc := service.New(nil)
 	svc.ServiceName = "elastictranscoder"
 	svc.APIVersion = "2012-09-25"
 
 	for i := 0; i < b.N; i++ {
-		r := service.NewRequest(svc, &service.Operation{Name: "CreateJobInput"}, restjsonBuildParms, nil)
+		r := svc.NewRequest(&request.Operation{Name: "CreateJobInput"}, restjsonBuildParms, nil)
 		restjson.Build(r)
 		if r.Error != nil {
 			b.Fatal("Unexpected error", r.Error)
@@ -29,12 +30,12 @@ func BenchmarkRESTJSONBuild_Complex_elastictranscoderCreateJobInput(b *testing.B
 }
 
 func BenchmarkRESTBuild_Complex_elastictranscoderCreateJobInput(b *testing.B) {
-	svc := service.NewService(nil)
+	svc := service.New(nil)
 	svc.ServiceName = "elastictranscoder"
 	svc.APIVersion = "2012-09-25"
 
 	for i := 0; i < b.N; i++ {
-		r := service.NewRequest(svc, &service.Operation{Name: "CreateJobInput"}, restjsonBuildParms, nil)
+		r := svc.NewRequest(&request.Operation{Name: "CreateJobInput"}, restjsonBuildParms, nil)
 		rest.Build(r)
 		if r.Error != nil {
 			b.Fatal("Unexpected error", r.Error)
@@ -55,7 +56,7 @@ func BenchmarkEncodingJSONMarshal_Complex_elastictranscoderCreateJobInput(b *tes
 }
 
 func BenchmarkRESTJSONBuild_Simple_elastictranscoderListJobsByPipeline(b *testing.B) {
-	svc := service.NewService(nil)
+	svc := service.New(nil)
 	svc.ServiceName = "elastictranscoder"
 	svc.APIVersion = "2012-09-25"
 
@@ -66,7 +67,7 @@ func BenchmarkRESTJSONBuild_Simple_elastictranscoderListJobsByPipeline(b *testin
 	}
 
 	for i := 0; i < b.N; i++ {
-		r := service.NewRequest(svc, &service.Operation{Name: "ListJobsByPipeline"}, params, nil)
+		r := svc.NewRequest(&request.Operation{Name: "ListJobsByPipeline"}, params, nil)
 		restjson.Build(r)
 		if r.Error != nil {
 			b.Fatal("Unexpected error", r.Error)
@@ -75,7 +76,7 @@ func BenchmarkRESTJSONBuild_Simple_elastictranscoderListJobsByPipeline(b *testin
 }
 
 func BenchmarkRESTBuild_Simple_elastictranscoderListJobsByPipeline(b *testing.B) {
-	svc := service.NewService(nil)
+	svc := service.New(nil)
 	svc.ServiceName = "elastictranscoder"
 	svc.APIVersion = "2012-09-25"
 
@@ -86,15 +87,14 @@ func BenchmarkRESTBuild_Simple_elastictranscoderListJobsByPipeline(b *testing.B)
 	}
 
 	for i := 0; i < b.N; i++ {
-		r := service.NewRequest(svc, &service.Operation{Name: "ListJobsByPipeline"}, params, nil)
+		r := svc.NewRequest(&request.Operation{Name: "ListJobsByPipeline"}, params, nil)
 		rest.Build(r)
 		if r.Error != nil {
 			b.Fatal("Unexpected error", r.Error)
 		}
 	}
 }
 
-
 func BenchmarkEncodingJSONMarshal_Simple_elastictranscoderListJobsByPipeline(b *testing.B) {
 	params := &elastictranscoder.ListJobsByPipelineInput{
 		PipelineId: aws.String("Id"), // Required

diff --git a/internal/test/perf/protocol/restxml_build_test.go b/internal/test/perf/protocol/restxml_build_test.go
@@ -5,18 +5,19 @@ package protocol
 import (
 	"testing"
 
+	"bytes"
+	"encoding/xml"
 	"github.com/aws/aws-sdk-go/aws"
+	"github.com/aws/aws-sdk-go/aws/request"
 	"github.com/aws/aws-sdk-go/aws/service"
 	"github.com/aws/aws-sdk-go/internal/protocol/restxml"
 	"github.com/aws/aws-sdk-go/service/cloudfront"
-	"bytes"
-	"encoding/xml"
 )
 
 func BenchmarkRESTXMLBuild_Complex_cloudfrontCreateDistribution(b *testing.B) {
 	params := restxmlBuildCreateDistroParms
 
-	op := &service.Operation{
+	op := &request.Operation{
 		Name:       "CreateDistribution",
 		HTTPMethod: "POST",
 		HTTPPath:   "/2015-04-17/distribution/{DistributionId}/invalidation",
@@ -30,7 +31,7 @@ func BenchmarkRESTXMLBuild_Simple_cloudfrontDeleteStreamingDistribution(b *testi
 		Id:      aws.String("string"), // Required
 		IfMatch: aws.String("string"),
 	}
-	op := &service.Operation{
+	op := &request.Operation{
 		Name:       "DeleteStreamingDistribution",
 		HTTPMethod: "DELETE",
 		HTTPPath:   "/2015-04-17/streaming-distribution/{Id}",
@@ -53,13 +54,13 @@ func BenchmarkEncodingXMLMarshal_Simple_cloudfrontDeleteStreamingDistribution(b
 	}
 }
 
-func benchRESTXMLBuild(b *testing.B, op *service.Operation, params interface{}) {
-	svc := service.NewService(nil)
+func benchRESTXMLBuild(b *testing.B, op *request.Operation, params interface{}) {
+	svc := service.New(nil)
 	svc.ServiceName = "cloudfront"
 	svc.APIVersion = "2015-04-17"
 
 	for i := 0; i < b.N; i++ {
-		r := service.NewRequest(svc, op, params, nil)
+		r := svc.NewRequest(op, params, nil)
 		restxml.Build(r)
 		if r.Error != nil {
 			b.Fatal("Unexpected error", r.Error)

diff --git a/internal/test/perf/s3/s3manager/stub.go b/internal/test/perf/s3/s3manager/stub.go
Original file line number	Diff line number	Diff line change
Expand Up		@@ -55,4 +55,3 @@ func benchPutItemParallel(p, c int, b *testing.B) {
		}
		})
		}