Added CI check for GCC

Author: Gazizonoki

.github/actions/build/action.yaml

@@ -13,14 +13,14 @@ runs:
     - name: Configure
       shell: bash
       run: |
-        mkdir -p ../build${{ inputs.compiler == 'gcc' && '-gcc' || '' }}
-        rm -rf ../build${{ inputs.compiler == 'gcc' && '-gcc' || '' }}/*
-        cmake --preset release-test-with-ccache-basedir${{ inputs.compiler == 'gcc' && '-gcc' || '' }}
+        mkdir -p ../build
+        rm -rf ../build/*
+        cmake --preset release-test-with-ccache-basedir-${{ inputs.compiler }}
     - name: Build
       shell: bash
       run: |
         ccache -z
         export CCACHE_BASEDIR=`realpath ..`
         export CCACHE_DIR=~/.ccache
-        cmake --build --preset release${{ inputs.compiler == 'gcc' && '-gcc' || '' }} -- -j32
+        cmake --build --preset release-${{ inputs.compiler }} -- -j32
         ccache -s

.github/actions/prepare_vm/action.yaml

@@ -12,12 +12,16 @@ runs:
         sudo apt-get -y install git cmake ninja-build libidn11-dev ragel yasm protobuf-compiler \
           protobuf-compiler-grpc libprotobuf-dev libgrpc++-dev libgrpc-dev libgrpc++1 libgrpc10 \
           rapidjson-dev zlib1g-dev libxxhash-dev libzstd-dev libsnappy-dev libgtest-dev libgmock-dev \
-          libbz2-dev libdouble-conversion-dev libstdc++-13-dev
+          libbz2-dev libdouble-conversion-dev libstdc++-13-dev gcc-13 g++-13
         wget https://apt.llvm.org/llvm.sh
         chmod u+x llvm.sh
         sudo ./llvm.sh 16
-        sudo ln -sf /usr/bin/clang-16 /usr/bin/clang
-        sudo ln -sf /usr/bin/clang++-16 /usr/bin/clang++
+        sudo update-alternatives --install /usr/bin/clang clang /usr/bin/clang-16 100
+        sudo update-alternatives --install /usr/bin/clang++ clang++ /usr/bin/clang++-16 100
+
+        sudo update-alternatives --install /usr/bin/gcc gcc /usr/bin/gcc-13 100
+        sudo update-alternatives --install /usr/bin/g++ g++ /usr/bin/g++-13 100
+
         wget https://ftp.gnu.org/pub/gnu/libiconv/libiconv-1.15.tar.gz
         tar -xvzf libiconv-1.15.tar.gz
         cd libiconv-1.15

.github/workflows/tests.yaml

@@ -56,7 +56,7 @@ jobs:
     - name: Test
       shell: bash
       run: |
-        ctest -j32 --preset release-unit${{ matrix.compiler == 'gcc' && '-gcc' || '' }}
+        ctest -j32 --preset release-unit
 
   integration:
     concurrency:
@@ -116,4 +116,4 @@ jobs:
     - name: Test
       shell: bash
       run: |
-        ctest -j32 --preset release-integration${{ matrix.compiler == 'gcc' && '-gcc' || '' }}
+        ctest -j32 --preset release-integration

.gitignore

@@ -46,6 +46,7 @@ __pycache__/
 
 /compile_commands.json
 
+/build
 /build_*
 /build-*
 

CMakeLists.txt

@@ -1,5 +1,11 @@
 cmake_minimum_required(VERSION 3.15)
-project(YDB-CPP-SDK LANGUAGES C CXX ASM)
+
+file(READ "src/version.h" YDB_SDK_VERSION_FILE_RAW)
+string(REGEX MATCH "YDB_SDK_VERSION = \"([0-9]+\\.[0-9]+\\.[0-9]+)\"" _ ${YDB_SDK_VERSION_FILE_RAW})
+set(YDB_SDK_VERSION ${CMAKE_MATCH_1})
+message(STATUS "YDB С++ SDK version: ${YDB_SDK_VERSION}")
+
+project(YDB-CPP-SDK VERSION ${YDB_SDK_VERSION} LANGUAGES C CXX ASM)
 
 option(YDB_SDK_INSTALL "Install YDB C++ SDK" Off)
 option(YDB_SDK_TESTS "Build YDB C++ SDK tests" Off)
@@ -16,10 +22,6 @@ set(YDB_SDK_SOURCE_DIR ${CMAKE_CURRENT_SOURCE_DIR})
 set(YDB_SDK_BINARY_DIR ${CMAKE_CURRENT_BINARY_DIR})
 set(YDB-CPP-SDK_AVAILABLE_COMPONENTS "" CACHE INTERNAL "")
 set(YDB-CPP-SDK_COMPONENT_TARGETS "" CACHE INTERNAL "")
-file(READ "src/version.h" YDB_SDK_VERSION_FILE_RAW)
-string(REGEX MATCH "YDB_SDK_VERSION = \"([0-9]+\\.[0-9]+\\.[0-9]+)\"" _ ${YDB_SDK_VERSION_FILE_RAW})
-set(YDB_SDK_VERSION ${CMAKE_MATCH_1})
-message(STATUS "YDB С++ SDK version: ${YDB_SDK_VERSION}")
 
 #[=============================================================================[
   NOTE: if `ccache` is used with the environment variable `CCACHE_BASEDIR`,

CMakePresets.json

@@ -7,19 +7,25 @@
   },
   "configurePresets": [
     {
-      "name": "ninja-generator",
+      "name": "base",
       "hidden": true,
-      "generator": "Ninja"
+      "cacheVariables": {
+        "CMAKE_EXPORT_COMPILE_COMMANDS": "ON"
+      },
+      "generator": "Ninja",
+      "binaryDir": "${sourceDir}/build"
     },
     {
-      "name": "release-build",
+      "name": "release-base",
+      "inherits": "base",
       "hidden": true,
       "cacheVariables": {
         "CMAKE_BUILD_TYPE": "Release"
       }
     },
     {
-      "name": "debug-build",
+      "name": "debug-base",
+      "inherits": "base",
       "hidden": true,
       "cacheVariables": {
         "CMAKE_BUILD_TYPE": "Debug"
@@ -28,38 +34,42 @@
     {
       "name": "clang-toolchain",
       "hidden": true,
-      "toolchainFile": "${sourceDir}/clang.toolchain"
+      "cacheVariables": {
+        "CMAKE_CXX_COMPILER": "clang++",
+        "CMAKE_C_COMPILER": "clang",
+        "CMAKE_EXE_LINKER_FLAGS": "-fuse-ld=lld",
+        "CMAKE_SHARED_LINKER_FLAGS": "-fuse-ld=lld"
+      }
     },
     {
       "name": "gcc-toolchain",
       "hidden": true,
-      "toolchainFile": "${sourceDir}/gcc.toolchain"
+      "cacheVariables": {
+        "CMAKE_CXX_COMPILER": "g++",
+        "CMAKE_C_COMPILER": "gcc"
+      }
     },
     {
-      "name": "release",
+      "name": "release-clang",
       "inherits": [
-        "ninja-generator",
-        "release-build",
+        "release-base",
         "clang-toolchain"
       ],
       "displayName": "Default Release Config (Clang)",
-      "description": "Default release build configuration using Ninja generator and Clang compiler",
-      "binaryDir": "${sourceDir}/../build"
+      "description": "Default release build configuration using Ninja generator and Clang compiler"
     },
     {
       "name": "release-gcc",
       "inherits": [
-        "ninja-generator",
-        "release-build",
+        "release-base",
         "gcc-toolchain"
       ],
       "displayName": "Default Release Config (GCC)",
-      "description": "Default release build configuration using Ninja generator and GCC compiler",
-      "binaryDir": "${sourceDir}/../build-gcc"
+      "description": "Default release build configuration using Ninja generator and GCC compiler"
     },
     {
-      "name": "release-test",
-      "inherits": "release",
+      "name": "release-test-clang",
+      "inherits": "release-clang",
       "displayName": "Default Release Test Config (Clang)",
       "description": "Default release build configuration with all tests and examples",
       "cacheVariables": {
@@ -78,10 +88,10 @@
       }
     },
     {
-      "name": "release-test-with-ccache-basedir",
-      "inherits": "release-test",
+      "name": "release-test-with-ccache-basedir-clang",
+      "inherits": "release-test-clang",
       "displayName": "Release Test Config CCACHE_BASEDIR Case (Clang)",
-      "description": "Only for the case when using CCACHE_BASEDIR",
+      "description": "Only for the case when using CCACHE_BASEDIR with Clang",
       "cacheVariables": {
         "ARCADIA_ROOT": "../ydb-cpp-sdk",
         "ARCADIA_BUILD_ROOT": "."
@@ -100,8 +110,8 @@
   ],
   "buildPresets": [
     {
-      "name": "release",
-      "configurePreset": "release",
+      "name": "release-clang",
+      "configurePreset": "release-clang",
       "displayName": "Default Release Build (Clang)"
     },
     {
@@ -124,18 +134,8 @@
     {
       "name": "release",
       "inherits": "common",
-      "configurePreset": "release-test",
-      "displayName": "Default Release Tests (Clang)",
-      "environment": {
-        "YDB_ENDPOINT": "localhost:2136",
-        "YDB_DATABASE": "/local"
-      }
-    },
-    {
-      "name": "release-gcc",
-      "inherits": "common",
-      "configurePreset": "release-test-gcc",
-      "displayName": "Default Release Tests (GCC)",
+      "configurePreset": "release-base",
+      "displayName": "Default Release Tests",
       "environment": {
         "YDB_ENDPOINT": "localhost:2136",
         "YDB_DATABASE": "/local"
@@ -144,19 +144,8 @@
     {
       "name": "release-unit",
       "inherits": "common",
-      "configurePreset": "release-test",
-      "displayName": "Default Unit Release Tests (Clang)",
-      "filter" : {
-        "include": {
-          "label": "unit"
-        }
-      }
-    },
-    {
-      "name": "release-unit-gcc",
-      "inherits": "common",
-      "configurePreset": "release-test-gcc",
-      "displayName": "Default Unit Release Tests (GCC)",
+      "configurePreset": "release-base",
+      "displayName": "Default Unit Release Tests",
       "filter" : {
         "include": {
           "label": "unit"
@@ -166,23 +155,8 @@
     {
       "name": "release-integration",
       "inherits": "common",
-      "configurePreset": "release-test",
-      "displayName": "Default Integration Release Tests (Clang)",
-      "filter" : {
-        "include": {
-          "label": "integration"
-        }
-      },
-      "environment": {
-        "YDB_ENDPOINT": "localhost:2136",
-        "YDB_DATABASE": "/local"
-      }
-    },
-    {
-      "name": "release-integration-gcc",
-      "inherits": "common",
-      "configurePreset": "release-test-gcc",
-      "displayName": "Default Integration Release Tests (GCC)",
+      "configurePreset": "release-base",
+      "displayName": "Default Integration Release Tests",
       "filter" : {
         "include": {
           "label": "integration"

clang.toolchain

@@ -1,2 +1,3 @@
 add_subdirectory(iam/common)
 add_subdirectory(iam_private/common)
+add_subdirectory(topic)

gcc.toolchain

@@ -176,6 +176,8 @@ struct TCreateResourceSettings
     : public TOperationRequestSettings<TCreateResourceSettings>
     , public THierarchicalDrrSettings<TCreateResourceSettings>
 {
+    using TSelf = TCreateResourceSettings;
+
     TCreateResourceSettings() = default;
     TCreateResourceSettings(const Ydb::RateLimiter::CreateResourceRequest&);
 
@@ -187,6 +189,8 @@ struct TAlterResourceSettings
     : public TOperationRequestSettings<TAlterResourceSettings>
     , public THierarchicalDrrSettings<TAlterResourceSettings>
 {
+    using TSelf = TAlterResourceSettings;
+
     FLUENT_SETTING_OPTIONAL(TMeteringConfig, MeteringConfig);
 };
 

include/ydb-cpp-sdk/client/CMakeLists.txt

@@ -0,0 +1,27 @@
+_ydb_sdk_add_library(client-ydb_topic-include)
+
+target_link_libraries(client-ydb_topic-include
+  PUBLIC
+    yutil
+    api-grpc
+    api-protos
+    streams-zstd
+)
+
+generate_enum_serilization(client-ydb_topic-include
+  ${YDB_SDK_SOURCE_DIR}/include/ydb-cpp-sdk/client/topic/control_plane.h
+  INCLUDE_HEADERS
+  include/ydb-cpp-sdk/client/topic/control_plane.h
+)
+
+generate_enum_serilization(client-ydb_topic-include
+  ${YDB_SDK_SOURCE_DIR}/include/ydb-cpp-sdk/client/topic/read_events.h
+  INCLUDE_HEADERS
+  include/ydb-cpp-sdk/client/topic/read_events.h
+)
+
+generate_enum_serilization(client-ydb_topic-include
+  ${YDB_SDK_SOURCE_DIR}/include/ydb-cpp-sdk/client/topic/write_events.h
+  INCLUDE_HEADERS
+  include/ydb-cpp-sdk/client/topic/write_events.h
+)

include/ydb-cpp-sdk/client/rate_limiter/rate_limiter.h

@@ -11,6 +11,7 @@ target_link_libraries(client-ydb_topic PUBLIC
   retry
   client-ydb_topic-common
   client-ydb_topic-impl
+  client-ydb_topic-include
   client-ydb_proto
   client-ydb_driver
   api-grpc
@@ -20,26 +21,7 @@ target_link_libraries(client-ydb_topic PUBLIC
 )
 
 target_sources(client-ydb_topic PRIVATE
-  proto_accessor.cpp
   out.cpp
 )
 
-generate_enum_serilization(client-ydb_topic
-  ${YDB_SDK_SOURCE_DIR}/include/ydb-cpp-sdk/client/topic/control_plane.h
-  INCLUDE_HEADERS
-  include/ydb-cpp-sdk/client/topic/control_plane.h
-)
-
-generate_enum_serilization(client-ydb_topic
-  ${YDB_SDK_SOURCE_DIR}/include/ydb-cpp-sdk/client/topic/read_events.h
-  INCLUDE_HEADERS
-  include/ydb-cpp-sdk/client/topic/read_events.h
-)
-
-generate_enum_serilization(client-ydb_topic
-  ${YDB_SDK_SOURCE_DIR}/include/ydb-cpp-sdk/client/topic/write_events.h
-  INCLUDE_HEADERS
-  include/ydb-cpp-sdk/client/topic/write_events.h
-)
-
 _ydb_sdk_make_client_component(Topic client-ydb_topic)

include/ydb-cpp-sdk/client/topic/CMakeLists.txt

@@ -15,6 +15,7 @@ target_link_libraries(client-ydb_topic-impl PUBLIC
   client-ydb_topic-common
   client-ydb_proto
   client-ydb_topic-codecs
+  client-ydb_topic-include
   proto_output
 )
 
@@ -29,6 +30,7 @@ target_sources(client-ydb_topic-impl
     deferred_commit.cpp
     event_handlers.cpp
     offsets_collector.cpp
+    proto_accessor.cpp
     read_session_event.cpp
     read_session.cpp
     topic_impl.cpp