Import YDB C++ SDK 12

.github/import_generation.txt

@@ -0,0 +1 @@
+13

.github/last_commit.txt

@@ -0,0 +1 @@
+a19b867b82af456bce938a0506364f0ba85214a5

.github/scripts/copy_sources.sh

@@ -0,0 +1,93 @@
+#!/bin/bash
+
+tmp_dir=$(mktemp -d)
+
+echo "Copying sources..."
+
+cp -r $1/ydb/public/sdk/cpp/* $tmp_dir
+echo "tmp_dir: $tmp_dir"
+
+rm -r $tmp_dir/client
+rm -r $tmp_dir/src/client/cms
+rm -r $tmp_dir/src/client/config
+rm -r $tmp_dir/src/client/debug
+rm -r $tmp_dir/src/client/draft
+
+rm -r $tmp_dir/include/ydb-cpp-sdk/client/cms
+rm -r $tmp_dir/include/ydb-cpp-sdk/client/config
+rm -r $tmp_dir/include/ydb-cpp-sdk/client/debug
+rm -r $tmp_dir/include/ydb-cpp-sdk/client/draft
+
+rm -r $tmp_dir/tests/unit/client/draft
+
+mkdir -p $tmp_dir/src/api/client/yc_private
+mkdir -p $tmp_dir/src/api/client/yc_public
+
+cp -r $1/ydb/public/api/client/yc_private/iam $tmp_dir/src/api/client/yc_private
+cp -r $1/ydb/public/api/client/yc_private/operation $tmp_dir/src/api/client/yc_private
+cp -r $1/ydb/public/api/client/yc_public/common $tmp_dir/src/api/client/yc_public
+cp -r $1/ydb/public/api/client/yc_public/iam $tmp_dir/src/api/client/yc_public
+cp -r $1/ydb/public/api/grpc $tmp_dir/src/api
+cp -r $1/ydb/public/api/protos $tmp_dir/src/api
+
+rm -r $tmp_dir/src/api/protos/out
+rm $tmp_dir/include/ydb-cpp-sdk/type_switcher.h $tmp_dir/src/version.h
+
+cp -r $2/util $tmp_dir
+cp -r $2/library $tmp_dir
+
+cp -r $2/.devcontainer $tmp_dir
+cp -r $2/.git $tmp_dir
+cp -r $2/.github $tmp_dir
+cp -r $2/contrib $tmp_dir
+cp -r $2/cmake $tmp_dir
+cp -r $2/scripts $tmp_dir
+cp -r $2/third_party $tmp_dir
+cp -r $2/tools $tmp_dir
+
+cp $2/.gitignore $tmp_dir
+cp $2/.gitmodules $tmp_dir
+cp $2/CMakePresets.json $tmp_dir
+cp $2/CMakeLists.txt $tmp_dir
+cp $2/LICENSE $tmp_dir
+cp $2/README.md $tmp_dir
+
+cp $2/include/ydb-cpp-sdk/type_switcher.h $tmp_dir/include/ydb-cpp-sdk/type_switcher.h
+cp $2/src/version.h $tmp_dir/src/version.h
+
+cd $2
+
+find src/ include/ tests/ examples/ -type f -name "CMakeLists.txt" | while read f;
+do
+    mkdir -p "$(dirname "$tmp_dir/$f")" && cp -p $f $tmp_dir/$f
+done
+
+cd -
+
+echo "Copying completed"
+echo "Patching sources..."
+
+rm -rf $tmp_dir/adapters $tmp_dir/client
+
+SED_INCLUDE='(^\s*#include\s*)(<|\")'
+
+find $tmp_dir -type f -regex ".*\(h\|cpp\|cpp.in\|c\|ipp\|jnj\|rl6\|h.txt\|proto\)$" | while read f;
+do
+    sed -i -E \
+        's/'$SED_INCLUDE'ydb\/public\/api\//\1\2src\/api\//g;
+         s/(^\s*import\s*)(\")ydb\/public\/api\//\1\2src\/api\//g;
+         s/'$SED_INCLUDE'ydb\/public\/sdk\/cpp\/include\//\1\2/g;
+         s/'$SED_INCLUDE'ydb\/public\/sdk\/cpp\//\1\2/g;
+         s/'$SED_INCLUDE'library\/cpp\/retry\/retry_policy\.h/\1\2ydb-cpp-sdk\/library\/retry\/retry_policy\.h/g;
+         s/'$SED_INCLUDE'library\/cpp\/string_utils\/base64\/base64\.h/\1\2src\/library\/string_utils\/base64\/base64\.h/g;
+         s/(inline\s*)Dev/\1V3/g;
+         s/(inline\s*namespace\s*)Dev/\1V3/g;' $f
+done
+
+echo "Patching completed"
+echo "RSync..."
+
+rsync -c -I -W -r --delete --filter '- **/ya.make' --filter '- sdk_common.inc' $tmp_dir/ $2
+rm -rf $tmp_dir
+
+echo "RSync completed"

.github/workflows/examples.yaml

@@ -35,13 +35,13 @@ jobs:
         options: '-h localhost'
     steps:
     - name: Checkout PR
-      uses: actions/checkout@v3
+      uses: actions/checkout@v4
       if: github.event.pull_request.head.sha != ''
       with:
         submodules: true
         ref: ${{ github.event.pull_request.head.sha }}
     - name: Checkout
-      uses: actions/checkout@v3
+      uses: actions/checkout@v4
       if: github.event.pull_request.head.sha == ''
       with:
         submodules: true

.github/workflows/import.yaml

@@ -0,0 +1,85 @@
+name: Import
+
+on:
+  workflow_dispatch:
+
+jobs:
+  import-ydb-sdk:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout ydb-cpp-sdk
+        uses: actions/checkout@v4
+        with:
+          submodules: true
+          path: ydb-cpp-sdk
+
+      - name: Checkout ydb
+        uses: actions/checkout@v4
+        with:
+          repository: ydb-platform/ydb
+          ref: main
+          fetch-depth: 0
+          submodules: true
+          path: ydb
+
+      - name: Sync commits
+        run: |
+          sudo apt-get -y update
+          sudo apt-get -y install rsync
+
+          git config --global user.name "github-actions[bot]"
+          git config --global user.email "41898282+github-actions[bot]@users.noreply.github.com"
+
+          LAST_COMMIT=$(cat ydb-cpp-sdk/.github/last_commit.txt)
+
+          COMMITS=$(git -C ydb log --format="%H" --reverse $LAST_COMMIT..main -- ydb/public/sdk/cpp ydb/public/api)
+          if [ -z "$COMMITS" ]; then
+            echo "No new commits to import"
+            exit 0
+          fi
+
+          GENERATION=$(cat ydb-cpp-sdk/.github/import_generation.txt)
+
+          git -C ydb-cpp-sdk checkout -b import-pr-$GENERATION
+          for commit in $COMMITS; do
+            echo "Importing commit: $commit"
+            git -C ydb checkout $commit
+            ydb-cpp-sdk/.github/scripts/copy_sources.sh ydb ydb-cpp-sdk
+            if [ -z "$(git -C ydb-cpp-sdk status --porcelain)" ]; then
+              echo "No changes for commit: $commit"
+              continue
+            fi
+            echo $commit > ydb-cpp-sdk/.github/last_commit.txt
+
+            message=$(git -C ydb show -s --format='%s')
+
+            git -C ydb-cpp-sdk add .
+            git -C ydb-cpp-sdk status
+
+            git -C ydb-cpp-sdk commit --author="$(git -C ydb show -s --format='%an <%ae>' $commit)" -m "$message" --no-edit
+
+            git -C ydb-cpp-sdk show -s --pretty=medium
+          done
+
+      - name: Create Pull Request
+        run: |
+          cd ydb-cpp-sdk
+          sudo apt-get -y install gh
+
+          GENERATION=$(cat .github/import_generation.txt)
+
+          echo "$((GENERATION + 1))" > .github/import_generation.txt
+
+          git add .github/import_generation.txt
+          git commit -m "Update import generation: $GENERATION"
+
+          git remote add token-origin https://${{ secrets.GITHUB_TOKEN }}@github.com/ydb-platform/ydb-cpp-sdk.git
+          git push token-origin import-pr-$GENERATION
+
+          gh pr create \
+            --base main \
+            --head import-pr-$GENERATION \
+            --title "Import YDB C++ SDK $GENERATION" \
+            --body "Automatic import of new commits from ydb repository"
+        env:
+          GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}

.github/workflows/tests.yaml

@@ -24,13 +24,13 @@ jobs:
     runs-on: ubuntu-22.04
     steps:
     - name: Checkout PR
-      uses: actions/checkout@v3
+      uses: actions/checkout@v4
       if: github.event.pull_request.head.sha != ''
       with:
         submodules: true
         ref: ${{ github.event.pull_request.head.sha }}
     - name: Checkout
-      uses: actions/checkout@v3
+      uses: actions/checkout@v4
       if: github.event.pull_request.head.sha == ''
       with:
         submodules: true
@@ -84,13 +84,13 @@ jobs:
         options: '-h localhost'
     steps:
     - name: Checkout PR
-      uses: actions/checkout@v3
+      uses: actions/checkout@v4
       if: github.event.pull_request.head.sha != ''
       with:
         submodules: true
         ref: ${{ github.event.pull_request.head.sha }}
     - name: Checkout
-      uses: actions/checkout@v3
+      uses: actions/checkout@v4
       if: github.event.pull_request.head.sha == ''
       with:
         submodules: true

.github/workflows/warmup_cache.yaml

@@ -14,8 +14,7 @@ jobs:
         compiler: [clang, gcc]
     steps:
     - name: Checkout
-      uses: actions/checkout@v3
-      if: github.event.pull_request.head.sha == ''
+      uses: actions/checkout@v4
       with:
         submodules: true
     - name: Install dependencies

.gitignore

@@ -20,7 +20,8 @@ _deps
 !*/
 # Unignore all files inside canondata dir
 !*/canondata/*
-
+# Unignore all files inside .github dir
+!*/.github/*
 # C libraries
 *.so
 *.a

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

@@ -48,6 +48,7 @@ struct TNodeRegistrationSettings : public TSimpleRequestSettings<TNodeRegistrati
     FLUENT_SETTING(std::string, DomainPath);
     FLUENT_SETTING_DEFAULT(bool, FixedNodeId, false);
     FLUENT_SETTING(std::string, Path);
+    FLUENT_SETTING(std::string, BridgePileName);
 };
 
 struct TEndpointInfo {
@@ -96,6 +97,7 @@ struct TNodeInfo {
     std::string Address;
     TNodeLocation Location;
     uint64_t Expire;
+    std::optional<uint32_t> BridgePileId;
 };
 
 class TNodeRegistrationResult : public TStatus {

include/ydb-cpp-sdk/client/proto/accessor.h

@@ -1,5 +1,7 @@
 #pragma once
 
+#include <src/api/protos/draft/ydb_replication.pb.h>
+#include <src/api/protos/draft/ydb_view.pb.h>
 #include <src/api/protos/ydb_coordination.pb.h>
 #include <src/api/protos/ydb_export.pb.h>
 #include <src/api/protos/ydb_import.pb.h>
@@ -8,6 +10,8 @@
 #include <src/api/protos/ydb_topic.pb.h>
 #include <src/api/protos/ydb_value.pb.h>
 
+#include <ydb-cpp-sdk/client/draft/ydb_replication.h>
+#include <ydb-cpp-sdk/client/draft/ydb_view.h>
 #include <ydb-cpp-sdk/client/coordination/coordination.h>
 #include <ydb-cpp-sdk/client/export/export.h>
 #include <ydb-cpp-sdk/client/import/import.h>
@@ -45,6 +49,8 @@ class TProtoAccessor {
     static const Ydb::Topic::DescribeConsumerResult& GetProto(const NYdb::NTopic::TConsumerDescription& consumerDescription);
     static const Ydb::Monitoring::SelfCheckResult& GetProto(const NYdb::NMonitoring::TSelfCheckResult& selfCheckResult);
     static const Ydb::Coordination::DescribeNodeResult& GetProto(const NYdb::NCoordination::TNodeDescription &describeNodeResult);
+    static const Ydb::Replication::DescribeReplicationResult& GetProto(const NYdb::NReplication::TDescribeReplicationResult& desc);
+    static const Ydb::View::DescribeViewResult& GetProto(const NYdb::NView::TDescribeViewResult& desc);
 
     static NTable::TQueryStats FromProto(const Ydb::TableStats::QueryStats& queryStats);
     static NTable::TTableDescription FromProto(const Ydb::Table::CreateTableRequest& request);

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

@@ -124,15 +124,21 @@ class TResultSetMeta {
 public:
     TResultSetMeta() = default;
 
-    explicit TResultSetMeta(const std::vector<TColumn>& columns)
+    explicit TResultSetMeta(const std::vector<TColumn>& columns, uint64_t rowsCount = 0, bool finished = false)
         : Columns(columns)
+        , RowsCount(rowsCount)
+        , Finished(finished)
     {}
 
-    explicit TResultSetMeta(std::vector<TColumn>&& columns)
+    explicit TResultSetMeta(std::vector<TColumn>&& columns, uint64_t rowsCount = 0, bool finished = false)
         : Columns(std::move(columns))
+        , RowsCount(rowsCount)
+        , Finished(finished)
     {}
 
     std::vector<TColumn> Columns;
+    uint64_t RowsCount = 0;
+    bool Finished = false;
 };
 
 class TScriptExecutionOperation : public TOperation {

include/ydb-cpp-sdk/client/topic/control_plane.h

@@ -128,6 +128,7 @@ class TPartitionConsumerStats {
 class TPartitionLocation {
 public:
     TPartitionLocation(const Ydb::Topic::PartitionLocation& partitionLocation);
+    TPartitionLocation(std::int32_t nodeId, std::int64_t generation);
     int32_t GetNodeId() const;
     int64_t GetGeneration() const;
 

include/ydb-cpp-sdk/client/topic/read_events.h

@@ -1,10 +1,12 @@
 #pragma once
 
 #include "codecs.h"
+#include "control_plane.h"
 #include "events_common.h"
 
 #include <util/datetime/base.h>
 
+
 namespace NYdb::inline V3::NTopic {
 
 //! Partition session.
@@ -42,10 +44,14 @@ struct TPartitionSession: public TThrRefBase, public TPrintable<TPartitionSessio
     }
 
 protected:
+
     uint64_t PartitionSessionId;
     std::string TopicPath;
     std::string ReadSessionId;
     uint64_t PartitionId;
+    std::optional<TPartitionLocation> Location;
+    /*TDirectReadId*/ std::int64_t NextDirectReadId = 1;
+    std::optional</*TDirectReadId*/ std::int64_t> LastDirectReadId;
 };
 
 template<>

include/ydb-cpp-sdk/client/topic/read_session.h

@@ -193,6 +193,9 @@ struct TReadSessionSettings: public TRequestSettings<TReadSessionSettings> {
     //! AutoPartitioningSupport.
     FLUENT_SETTING_DEFAULT(bool, AutoPartitioningSupport, false);
 
+    // TODO(qyryq) Uncomment when direct read is ready.
+    // FLUENT_SETTING_DEFAULT(bool, DirectRead, false);
+
     //! Log.
     FLUENT_SETTING_OPTIONAL(TLog, Log);
 };

src/api/grpc/draft/ydb_dynamic_config_v1.proto

@@ -49,4 +49,7 @@ service DynamicConfigService {
 
     // Generate dynamic config based on cluster's static config.
     rpc FetchStartupConfig(DynamicConfig.FetchStartupConfigRequest) returns (DynamicConfig.FetchStartupConfigResponse);
+
+    // Get configuration version of nodes.
+    rpc GetConfigurationVersion(DynamicConfig.GetConfigurationVersionRequest) returns (DynamicConfig.GetConfigurationVersionResponse);
 }