Azure · Larry Osterman (LarryOsterman) · Sep 22, 2023 · Sep 14, 2023 · Sep 14, 2023 · Sep 14, 2023
@@ -90,6 +90,22 @@
       },
       "architecture": "win32"
     },
+    {
+      "name": "x64-msvc-static",
+      "displayName": "Windows x64 MSVC Static",
+      "description": "Windows Default, MSVC, x64 architecture.",
+      "inherits": "msvc-windows-default",
+      "hidden": true,
+      "cacheVariables": {
+        "VCPKG_TARGET_TRIPLET": "x64-windows-static",
+        "MSVC_USE_STATIC_CRT": true
+      },
+      "architecture": {
+        "value": "x64",
+        "strategy": "external"
+      }
+    },
+
     {
       "name": "x64",
       "displayName": "Windows x64",
@@ -305,6 +321,16 @@
       "displayName": "x86 MSVC Debug static With Perf Tests and samples",
       "inherits": [ "x86-msvc-static", "debug-build", "enable-tests", "enable-perf", "enable-samples", "curl-transport", "winhttp-transport" ]
     },
+    {
+      "name": "x64-msvc-static-debug-perftests",
+      "displayName": "x64 MSVC Debug static With Perf Tests and samples",
+      "inherits": [ "x64-msvc-static", "debug-build", "enable-tests", "enable-perf", "enable-samples", "curl-transport", "winhttp-transport" ]
+    },
+    {
+      "name": "x64-msvc-static-release-perftests",
+      "displayName": "x64 MSVC Release static With Perf Tests and samples",
+      "inherits": [ "x64-msvc-static", "release-build", "enable-tests", "enable-perf", "enable-samples", "curl-transport", "winhttp-transport" ]
+    },
     {
       "name": "x64-static-release-perftests",
       "displayName": "x64 Release With Perf Tests, static",

@@ -6,7 +6,7 @@
 # Usage: generate_documentation(azure-core 1.0.0-preview.1)
 # Requires: Doxygen
 # Target name in the form of ${PROJECT_NAME}-docs (e.g. azure-core-docs)
-
+# Note that PROJECT_NAME is also the directory containing the package.
 function(generate_documentation PROJECT_NAME PROJECT_VERSION)
     if(BUILD_DOCUMENTATION)
         find_package(Doxygen 1.9.7 REQUIRED doxygen)

@@ -6,6 +6,7 @@ set(AZ_ROOT_DIR "${CMAKE_CURRENT_LIST_DIR}/..")
 
 macro(az_vcpkg_integrate)
   message("Vcpkg integrate step.")
+
   # AUTO CMAKE_TOOLCHAIN_FILE:
   #   User can call `cmake -DCMAKE_TOOLCHAIN_FILE="path_to_the_toolchain"` as the most specific scenario.
   #   As the last alternative (default case), Azure SDK will automatically clone VCPKG folder and set toolchain from there.
@@ -17,7 +18,7 @@ macro(az_vcpkg_integrate)
       message("AZURE_SDK_DISABLE_AUTO_VCPKG is not defined. Fetch a local copy of vcpkg.")
       # GET VCPKG FROM SOURCE
       #  User can set env var AZURE_SDK_VCPKG_COMMIT to pick the VCPKG commit to fetch
-      set(VCPKG_COMMIT_STRING dafef74af53669ef1cc9015f55e0ce809ead62aa) # default SDK tested commit
+      set(VCPKG_COMMIT_STRING 33409307f1e3411112a0a6bbf3011ea3cca1bfc9) # default SDK tested commit
       if(DEFINED ENV{AZURE_SDK_VCPKG_COMMIT})
         message("AZURE_SDK_VCPKG_COMMIT is defined. Using that instead of the default.")
         set(VCPKG_COMMIT_STRING "$ENV{AZURE_SDK_VCPKG_COMMIT}") # default SDK tested commit

@@ -33,6 +33,10 @@ macro(GetFolderList project)
     elseif(${project} STREQUAL EVENTHUBS)
         DownloadDepVersion(sdk/core azure-core 1.10.1)
         DownloadDepVersion(sdk/core azure-core-amqp 1.0.0-beta.1)
+    elseif(${project} STREQUAL EVENTHUBS_CHECKPOINT_BLOB)
+        DownloadDepVersion(sdk/core azure-core 1.10.1)
+        DownloadDepVersion(sdk/core azure-core-amqp 1.0.0-beta.1)
+        DownloadDepVersion(sdk/eventhubs azure-messaging-eventhubs 1.0.0-beta.3)
         DownloadDepVersion(sdk/storage/azure-storage-common azure-storage-common 12.3.3)
         DownloadDepVersion(sdk/storage/azure-storage-blobs azure-storage-blobs 12.8.0)
     endif()

@@ -254,7 +254,7 @@ jobs:
                 }
               displayName: Copy CHANGELOG.md to package artifact
 
-            - script: cmake --build . --target ${{ artifact.Name }}-docs
+            - script: cmake --build . --target ${{ artifact.Path }}-docs
               workingDirectory: build
               displayName: Generate docs (${{ artifact.Name }}-docs)
 

@@ -9,3 +9,5 @@ set(CMAKE_CXX_STANDARD_REQUIRED ON)
 set(CMAKE_WINDOWS_EXPORT_ALL_SYMBOLS ON)
 
 add_subdirectory(azure-messaging-eventhubs)
+#add_subdirectory(azure-messaging-eventhubs-checkpointstore-blob)
+add_subdirectory(blob-store)
@@ -2,5 +2,5 @@
   "AssetsRepo": "Azure/azure-sdk-assets",
   "AssetsRepoPrefixPath": "cpp",
   "TagPrefix": "cpp/eventhubs",
-  "Tag": "cpp/eventhubs_ea4655bf2e"
+  "Tag": "cpp/eventhubs_d59a0a9f3c"
 }
@@ -49,10 +49,6 @@ elseif(NOT AZ_ALL_LIBRARIES)
     find_package(azure-core-amqp-cpp REQUIRED)
   endif()
 
-  find_package(azure-storage-blobs-cpp CONFIG QUIET)
-  if(NOT azure-storage-blobs-cpp_FOUND)
-    find_package(azure-storage-blobs-cpp REQUIRED)
-  endif()
 endif()
 
 set(
@@ -110,7 +106,7 @@ target_include_directories(
       $<INSTALL_INTERFACE:include>
 )
 
-target_link_libraries(azure-messaging-eventhubs PUBLIC Azure::azure-core Azure::azure-core-amqp Azure::azure-storage-blobs)
+target_link_libraries(azure-messaging-eventhubs PUBLIC Azure::azure-core Azure::azure-core-amqp)
 
 # coverage. Has no effect if BUILD_CODE_COVERAGE is OFF
 create_code_coverage(eventhubs azure-messaging-eventhubs azure-messaging-eventhubs-test "tests?/*;samples?/*")

@@ -6,7 +6,6 @@
 #include <azure/core/context.hpp>
 #include <azure/core/datetime.hpp>
 #include <azure/core/nullable.hpp>
-#include <azure/storage/blobs.hpp>
 
 #include <sstream>
 #include <stdexcept>
@@ -65,68 +64,4 @@ namespace Azure { namespace Messaging { namespace EventHubs {
     virtual ~CheckpointStore() = default;
   };
 
-  /** @brief BlobCheckpointStore is an implementation of a CheckpointStore backed by Azure Blob
-   * Storage.
-   */
-  class BlobCheckpointStore final : public CheckpointStore {
-    Azure::Storage::Blobs::BlobContainerClient m_containerClient;
-
-    void UpdateCheckpointImpl(
-        Azure::Storage::Metadata const& metadata,
-        Models::Checkpoint& checkpoint);
-
-    void UpdateOwnership(
-        Azure::Storage::Blobs::Models::BlobItem const& blob,
-        Models::Ownership& ownership);
-
-    Azure::Storage::Metadata CreateCheckpointBlobMetadata(Models::Checkpoint const& checkpoint);
-
-    std::pair<Azure::DateTime, Azure::ETag> SetMetadata(
-        std::string const& blobName,
-        Azure::Storage::Metadata const& metadata,
-        Azure::ETag const& etag,
-        Core::Context const& context = {});
-
-  public:
-    /** @brief  Construct a BlobCheckpointStore from another BlobCheckpointStore.
-     */
-    BlobCheckpointStore(BlobCheckpointStore const& other) = default;
-
-    /** @brief  Assign a BlobCheckpointStore to another BlobCheckpointStore.
-     */
-    BlobCheckpointStore& operator=(BlobCheckpointStore const& other) = default;
-
-    /**@brief  Construct a BlobCheckpointStore.
-     *
-     * @param containerClient An Azure Blob ContainerClient used to hold the checkpoints.
-     */
-    BlobCheckpointStore(Azure::Storage::Blobs::BlobContainerClient const& containerClient)
-        : CheckpointStore(), m_containerClient(containerClient)
-    {
-      m_containerClient.CreateIfNotExists();
-    }
-
-    std::vector<Models::Ownership> ClaimOwnership(
-        std::vector<Models::Ownership> const& partitionOwnership,
-        Core::Context const& context = {}) override;
-
-    std::vector<Models::Checkpoint> ListCheckpoints(
-        std::string const& fullyQualifiedNamespace,
-        std::string const& eventHubName,
-        std::string const& consumerGroup,
-        Core::Context const& context = {}) override;
-
-    /**@brief  ListOwnership lists all ownerships.
-     */
-    std::vector<Models::Ownership> ListOwnership(
-        std::string const& fullyQualifiedNamespace,
-        std::string const& eventHubName,
-        std::string const& consumerGroup,
-        Core::Context const& context = {}) override;
-
-    /**@brief  UpdateCheckpoint updates a specific checkpoint with a sequence and offset.
-     */
-    void UpdateCheckpoint(Models::Checkpoint const& checkpoint, Core::Context const& context = {})
-        override;
-  };
 }}} // namespace Azure::Messaging::EventHubs
@@ -3,8 +3,8 @@
 #pragma once
 #include <azure/core/context.hpp>
 #include <azure/core/datetime.hpp>
+#include <azure/core/etag.hpp>
 #include <azure/core/nullable.hpp>
-#include <azure/storage/blobs.hpp>
 
 #include <sstream>
 #include <vector>

@@ -130,7 +130,7 @@ namespace Azure { namespace Messaging { namespace EventHubs {
      *
      * @param context The context to control the request lifetime.
      */
-    void Run(Core::Context const& context = {})
+    void Run(Core::Context const& context)
     {
       Models::EventHubProperties eventHubProperties
           = m_consumerClient->GetEventHubProperties(context);
@@ -140,12 +140,12 @@ namespace Azure { namespace Messaging { namespace EventHubs {
       //        = std::chrono::system_clock::to_time_t(std::chrono::system_clock::now());
       // const auto current = std::chrono::system_clock::from_time_t(timeNowSeconds);
 
-      // TODO : this is where we re load balance on the update interval
-      /* while (!context.IsCancelled())
-      {
-        std::this_thread::sleep_for(m_ownershipUpdateInterval);
-        Dispatch(eventHubProperties, consumers, context);
-      }*/
+      //// TODO : this is where we re load balance on the update interval
+      // while (!context.IsCancelled())
+      //{
+      //  std::this_thread::sleep_for(m_ownershipUpdateInterval);
+      //  Dispatch(eventHubProperties, consumers, context);
+      //}
     }
 
     /** @brief Dispatches events to the appropriate partition clients.