fix pr issues

Author: Alan4506

tests/performance-tests/CMakeLists.txt

@@ -9,6 +9,15 @@ add_project(performance-tests
         aws-cpp-sdk-dynamodb
 )
 
+# Add cxxopts dependency
+include(FetchContent)
+FetchContent_Declare(
+        cxxopts
+        GIT_REPOSITORY https://github.com/jarro2783/cxxopts.git
+        GIT_TAG v3.1.1
+)
+FetchContent_MakeAvailable(cxxopts)
+
 function(add_service_test SERVICE SDK_LIB PERF_TEST_FILE)
     add_executable(${SERVICE}-performance-test
             src/services/${SERVICE}/main.cpp
@@ -18,8 +27,8 @@ function(add_service_test SERVICE SDK_LIB PERF_TEST_FILE)
     set_compiler_flags(${SERVICE}-performance-test)
     set_compiler_warnings(${SERVICE}-performance-test)
     target_include_directories(${SERVICE}-performance-test PRIVATE include)
-    target_link_libraries(${SERVICE}-performance-test PRIVATE aws-cpp-sdk-core ${SDK_LIB})
-    target_compile_options(${SERVICE}-performance-test PRIVATE -std=c++17)
+    target_link_libraries(${SERVICE}-performance-test PRIVATE aws-cpp-sdk-core ${SDK_LIB} cxxopts::cxxopts)
+    target_compile_options(${SERVICE}-performance-test PRIVATE -std=c++17 -fexceptions)
 endfunction()
 
 add_service_test(s3 aws-cpp-sdk-s3 S3PerformanceTest.cpp)

tests/performance-tests/include/performance-tests/PerformanceTestBase.h

@@ -0,0 +1,33 @@
+/**
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0.
+ */
+
+#pragma once
+
+namespace PerformanceTest {
+
+/**
+ * Base class for all performance tests.
+ */
+class PerformanceTestBase {
+ public:
+  virtual ~PerformanceTestBase() = default;
+
+  /**
+   * Initialize resources for the test.
+   */
+  virtual void Setup() = 0;
+
+  /**
+   * Run the performance test operations.
+   */
+  virtual void Run() = 0;
+
+  /**
+   * Clean up resources created during setup.
+   */
+  virtual void TearDown() = 0;
+};
+
+}  // namespace PerformanceTest

tests/performance-tests/include/performance-tests/Utils.h

@@ -5,17 +5,13 @@
 
 #pragma once
 
-#include <aws/core/Aws.h>
 #include <aws/core/utils/StringUtils.h>
 #include <aws/core/utils/UUID.h>
 #include <aws/core/utils/memory/stl/AWSString.h>
 
 #include <algorithm>
 #include <cstddef>
 #include <cstdlib>
-#include <iostream>
-#include <random>
-#include <string>
 
 namespace PerformanceTest {
 namespace Utils {
@@ -37,16 +33,6 @@ static inline Aws::String RandomString(size_t length) {
   return str;
 }
 
-/**
- * Log error messages to stderr.
- * @param service The name of the AWS service
- * @param operation The name of the operation that failed
- * @param message The error message to log
- */
-static inline void LogError(const Aws::String& service, const Aws::String& operation, const Aws::String& message) {
-  std::cerr << "[ERROR] " << service << ":" << operation << " failed: " << message << '\n';
-}
-
 /**
  * Generate a unique identifier using UUID.
  * @return A 10-character lowercase UUID substring
@@ -56,16 +42,5 @@ static inline Aws::String GenerateUniqueId() {
   return Aws::Utils::StringUtils::ToLower(rawUUID.c_str()).substr(0, 10);
 }
 
-/**
- * Get the current SDK version as a formatted string.
- * @return SDK version in the format "major.minor.patch" (e.g., "1.11.0")
- */
-static inline Aws::String GetSDKVersionString() {
-  Aws::SDKOptions::SDKVersion const version;
-  return Aws::Utils::StringUtils::to_string(static_cast<int>(version.major)) + "." +
-         Aws::Utils::StringUtils::to_string(static_cast<int>(version.minor)) + "." +
-         Aws::Utils::StringUtils::to_string(static_cast<int>(version.patch));
-}
-
 }  // namespace Utils
 }  // namespace PerformanceTest

tests/performance-tests/include/performance-tests/services/dynamodb/DynamoDBPerformanceTest.h

@@ -5,8 +5,10 @@
 
 #pragma once
 
+#include <aws/core/utils/memory/AWSMemory.h>
 #include <aws/core/utils/memory/stl/AWSString.h>
 #include <aws/dynamodb/DynamoDBClient.h>
+#include <performance-tests/PerformanceTestBase.h>
 
 #include <cstddef>
 
@@ -17,42 +19,30 @@ namespace DynamoDB {
  * Configuration for DynamoDB performance test cases.
  */
 struct TestCase {
-  Aws::String sizeLabel;
+  const char* sizeLabel;
   size_t sizeBytes;
 };
 
 /**
- * Runs DynamoDB performance test by creating a table, performing PutItem and GetItem operations,
- * then cleaning up resources.
- * @param dynamodb DynamoDB client instance to use for operations
- * @param config Test configuration containing size parameters
- * @param iterations Number of put/get operations to perform
+ * DynamoDB performance test implementation.
+ * Tests PutItem and GetItem operations with different payload sizes.
  */
-void RunTest(Aws::DynamoDB::DynamoDBClient& dynamodb, const TestCase& config, int iterations = 3);
-
-/**
- * Create DynamoDB table for testing and wait for it to become active.
- * @param dynamodb DynamoDB client instance
- * @param config Test configuration
- * @return Table name if successful, empty string if failed
- */
-Aws::String SetupTable(Aws::DynamoDB::DynamoDBClient& dynamodb, const TestCase& config);
-
-/**
- * Run PutItem and GetItem operations.
- * @param dynamodb DynamoDB client instance
- * @param tableName Name of the table to use
- * @param config Test configuration
- * @param iterations Number of operations to perform
- */
-void RunOperations(Aws::DynamoDB::DynamoDBClient& dynamodb, const Aws::String& tableName, const TestCase& config, int iterations);
+class DynamoDBPerformanceTest : public PerformanceTestBase {
+ public:
+  DynamoDBPerformanceTest(const Aws::String& region, const TestCase& config, int iterations = 3);
+
+  void Setup() override;
+  void TearDown() override;
+  void Run() override;
+
+ private:
+  const TestCase& m_config;
+  const Aws::String m_region;
+  const int m_iterations;
+  Aws::UniquePtr<Aws::DynamoDB::DynamoDBClient> m_dynamodb;
+  Aws::String m_tableName;
+};
 
-/**
- * Clean up DynamoDB resources (delete table).
- * @param dynamodb DynamoDB client instance
- * @param tableName Name of the table to delete
- */
-void CleanupResources(Aws::DynamoDB::DynamoDBClient& dynamodb, const Aws::String& tableName);
 }  // namespace DynamoDB
 }  // namespace Services
 }  // namespace PerformanceTest

tests/performance-tests/include/performance-tests/services/dynamodb/DynamoDBTestConfig.h

@@ -5,19 +5,20 @@
 
 #pragma once
 
-#include <aws/core/utils/memory/stl/AWSSet.h>
-#include <aws/core/utils/memory/stl/AWSString.h>
-#include <aws/core/utils/memory/stl/AWSVector.h>
+#include <performance-tests/services/dynamodb/DynamoDBPerformanceTest.h>
+
+#include <array>
+#include <set>
 
 namespace PerformanceTest {
 namespace Services {
 namespace DynamoDB {
 namespace TestConfig {
-const Aws::Set<Aws::String> TestOperations = {"PutItem", "GetItem"};
+const std::set<const char*> TestOperations = {"PutItem", "GetItem"};
 
-const Aws::Vector<TestCase> TestMatrix = {{"8KB", 8 * 1024}, {"64KB", 64 * 1024}, {"392KB", 392 * 1024}};
+const std::array<TestCase, 3> TestMatrix = {{{"8KB", 8 * 1024}, {"64KB", 64 * 1024}, {"392KB", 392 * 1024}}};
 
-const Aws::String OutputFilename = "dynamodb-performance-test-results.json";
+const char* OutputFilename = "dynamodb-performance-test-results.json";
 }  // namespace TestConfig
 }  // namespace DynamoDB
 }  // namespace Services

tests/performance-tests/include/performance-tests/services/s3/S3PerformanceTest.h

@@ -5,8 +5,10 @@
 
 #pragma once
 
+#include <aws/core/utils/memory/AWSMemory.h>
 #include <aws/core/utils/memory/stl/AWSString.h>
 #include <aws/s3/S3Client.h>
+#include <performance-tests/PerformanceTestBase.h>
 
 #include <cstddef>
 
@@ -17,46 +19,32 @@ namespace S3 {
  * Configuration for S3 performance test cases.
  */
 struct TestCase {
-  Aws::String sizeLabel;
+  const char* sizeLabel;
   size_t sizeBytes;
-  Aws::String bucketTypeLabel;
+  const char* bucketTypeLabel;
 };
 
 /**
- * Runs S3 performance test by creating a bucket, performing PutObject and GetObject operations,
- * then cleaning up resources.
- * @param s3 S3 client instance to use for operations
- * @param config Test configuration containing object size and bucket type parameters
- * @param availabilityZoneId Availability zone ID for S3 Express buckets
- * @param iterations Number of put/get operations to perform
+ * S3 performance test implementation.
+ * Tests PutObject and GetObject operations with different payload sizes and bucket types.
  */
-void RunTest(Aws::S3::S3Client& s3, const TestCase& config, const Aws::String& availabilityZoneId, int iterations = 3);
-
-/**
- * Create S3 bucket for testing.
- * @param s3 S3 client instance
- * @param config Test configuration
- * @param availabilityZoneId Availability zone ID for S3 Express buckets
- * @return Bucket name if successful, empty string if failed
- */
-Aws::String SetupBucket(Aws::S3::S3Client& s3, const TestCase& config, const Aws::String& availabilityZoneId);
-
-/**
- * Run PutObject and GetObject operations.
- * @param s3 S3 client instance
- * @param bucketName Name of the bucket to use
- * @param config Test configuration
- * @param iterations Number of operations to perform
- */
-void RunOperations(Aws::S3::S3Client& s3, const Aws::String& bucketName, const TestCase& config, int iterations);
+class S3PerformanceTest : public PerformanceTestBase {
+ public:
+  S3PerformanceTest(const Aws::String& region, const TestCase& config, const Aws::String& availabilityZoneId, int iterations = 3);
+
+  void Setup() override;
+  void TearDown() override;
+  void Run() override;
+
+ private:
+  const TestCase& m_config;
+  const Aws::String m_region;
+  const Aws::String m_availabilityZoneId;
+  const int m_iterations;
+  Aws::UniquePtr<Aws::S3::S3Client> m_s3;
+  Aws::String m_bucketName;
+};
 
-/**
- * Clean up S3 resources (objects and bucket).
- * @param s3 S3 client instance
- * @param bucketName Name of the bucket to clean up
- * @param iterations Number of objects to delete
- */
-void CleanupResources(Aws::S3::S3Client& s3, const Aws::String& bucketName, int iterations);
 }  // namespace S3
 }  // namespace Services
 }  // namespace PerformanceTest

tests/performance-tests/include/performance-tests/services/s3/S3TestConfig.h

@@ -5,21 +5,25 @@
 
 #pragma once
 
-#include <aws/core/utils/memory/stl/AWSSet.h>
-#include <aws/core/utils/memory/stl/AWSString.h>
-#include <aws/core/utils/memory/stl/AWSVector.h>
+#include <performance-tests/services/s3/S3PerformanceTest.h>
+
+#include <array>
+#include <set>
 
 namespace PerformanceTest {
 namespace Services {
 namespace S3 {
 namespace TestConfig {
-const Aws::Set<Aws::String> TestOperations = {"PutObject", "GetObject"};
+const std::set<const char*> TestOperations = {"PutObject", "GetObject"};
 
-const Aws::Vector<TestCase> TestMatrix = {{"8KB", 8 * 1024, "s3-standard"},    {"64KB", 64 * 1024, "s3-standard"},
-                                          {"1MB", 1024 * 1024, "s3-standard"}, {"8KB", 8 * 1024, "s3-express"},
-                                          {"64KB", 64 * 1024, "s3-express"},   {"1MB", 1024 * 1024, "s3-express"}};
+const std::array<TestCase, 6> TestMatrix = {{{"8KB", 8 * 1024, "s3-standard"},
+                                             {"64KB", 64 * 1024, "s3-standard"},
+                                             {"1MB", 1024 * 1024, "s3-standard"},
+                                             {"8KB", 8 * 1024, "s3-express"},
+                                             {"64KB", 64 * 1024, "s3-express"},
+                                             {"1MB", 1024 * 1024, "s3-express"}}};
 
-const Aws::String OutputFilename = "s3-performance-test-results.json";
+const char* OutputFilename = "s3-performance-test-results.json";
 }  // namespace TestConfig
 }  // namespace S3
 }  // namespace Services