Import YDB C++ SDK 28

.github/import_generation.txt

@@ -1 +1 @@
-28
+29

.github/last_commit.txt

@@ -1 +1 @@
-42606baa568dd1f0408b0651dce31577f28bcfe1
+eaa66fe4cc75727a60d89a9ec9d99970e03ce0e0

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

@@ -5,6 +5,7 @@
 namespace Ydb {
 namespace Monitoring {
     class SelfCheckResult;
+    class ClusterStateResult;
 }
 }
 
@@ -34,6 +35,12 @@ struct TSelfCheckSettings : public TOperationRequestSettings<TSelfCheckSettings>
     FLUENT_SETTING_OPTIONAL(uint32_t, MaximumLevel);
 };
 
+struct TClusterStateSettings : public TOperationRequestSettings<TClusterStateSettings> {
+    FLUENT_SETTING_OPTIONAL(uint32_t, DurationSeconds);
+    FLUENT_SETTING_OPTIONAL(uint32_t, PeriodSeconds);
+};
+
+
 class TSelfCheckResult : public TStatus {
     friend class NYdb::TProtoAccessor;
 public:
@@ -45,13 +52,26 @@ class TSelfCheckResult : public TStatus {
 
 using TAsyncSelfCheckResult = NThreading::TFuture<TSelfCheckResult>;
 
+class TClusterStateResult : public TStatus {
+    friend class NYdb::TProtoAccessor;
+public:
+    TClusterStateResult(TStatus&& status, Ydb::Monitoring::ClusterStateResult&& result);
+private:
+    class TImpl;
+    std::shared_ptr<TImpl> Impl_;
+};
+
+using TAsyncClusterStateResult = NThreading::TFuture<TClusterStateResult>;
+
 class TMonitoringClient {
     class TImpl;
 
 public:
     TMonitoringClient(const TDriver& driver, const TCommonClientSettings& settings = TCommonClientSettings());
 
     TAsyncSelfCheckResult SelfCheck(const TSelfCheckSettings& settings = TSelfCheckSettings());
+
+    TAsyncClusterStateResult ClusterState(const TClusterStateSettings& settings = TClusterStateSettings());
 private:
     std::shared_ptr<TImpl> Impl_;
 };

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

@@ -49,6 +49,7 @@ class TProtoAccessor {
     static const Ydb::Topic::DescribeTopicResult& GetProto(const NYdb::NTopic::TTopicDescription& topicDescription);
     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::Monitoring::ClusterStateResult& GetProto(const NYdb::NMonitoring::TClusterStateResult& clusterStateResult);
     static const Ydb::Coordination::DescribeNodeResult& GetProto(const NYdb::NCoordination::TNodeDescription& describeNodeResult);
     static const Ydb::Import::ListObjectsInS3ExportResult& GetProto(const NYdb::NImport::TListObjectsInS3ExportResult& result);
 

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

@@ -31,6 +31,7 @@ class ExplicitPartitions;
 class GlobalIndexSettings;
 class VectorIndexSettings;
 class KMeansTreeSettings;
+class FulltextIndexSettings;
 class PartitioningSettings;
 class ReadReplicasSettings;
 class DateTypeColumnModeSettings;
@@ -295,6 +296,49 @@ struct TKMeansTreeSettings {
     void Out(IOutputStream &o) const;
 };
 
+struct TFulltextIndexSettings {
+public:
+    enum class ELayout {
+        Unspecified = 0,
+        Flat,
+    };
+
+    enum class ETokenizer {
+        Unspecified = 0,
+        Whitespace,
+        Standard,
+        Keyword,
+    };
+
+    struct TAnalyzers {
+        std::optional<ETokenizer> Tokenizer;
+        std::optional<std::string> Language;
+        std::optional<bool> UseFilterLowercase;
+        std::optional<bool> UseFilterStopwords;
+        std::optional<bool> UseFilterNgram;
+        std::optional<bool> UseFilterEdgeNgram;
+        std::optional<int32_t> FilterNgramMinLength;
+        std::optional<int32_t> FilterNgramMaxLength;
+        std::optional<bool> UseFilterLength;
+        std::optional<int32_t> FilterLengthMin;
+        std::optional<int32_t> FilterLengthMax;
+    };
+
+    struct TColumnAnalyzers {
+        std::optional<std::string> Column;
+        std::optional<TAnalyzers> Analyzers;
+    };
+
+    std::optional<ELayout> Layout;
+    std::vector<TColumnAnalyzers> Columns;
+
+    static TFulltextIndexSettings FromProto(const Ydb::Table::FulltextIndexSettings& proto);
+
+    void SerializeTo(Ydb::Table::FulltextIndexSettings& settings) const;
+
+    void Out(IOutputStream& o) const;
+};
+
 //! Represents index description
 class TIndexDescription {
     friend class NYdb::TProtoAccessor;
@@ -306,7 +350,7 @@ class TIndexDescription {
         const std::vector<std::string>& indexColumns,
         const std::vector<std::string>& dataColumns = {},
         const std::vector<TGlobalIndexSettings>& globalIndexSettings = {},
-        const std::variant<std::monostate, TKMeansTreeSettings>& specializedIndexSettings = {}
+        const std::variant<std::monostate, TKMeansTreeSettings, TFulltextIndexSettings>& specializedIndexSettings = {}
     );
 
     TIndexDescription(
@@ -320,7 +364,7 @@ class TIndexDescription {
     EIndexType GetIndexType() const;
     const std::vector<std::string>& GetIndexColumns() const;
     const std::vector<std::string>& GetDataColumns() const;
-    const std::variant<std::monostate, TKMeansTreeSettings>& GetIndexSettings() const;
+    const std::variant<std::monostate, TKMeansTreeSettings, TFulltextIndexSettings>& GetIndexSettings() const;
     uint64_t GetSizeBytes() const;
 
     void SerializeTo(Ydb::Table::TableIndex& proto) const;
@@ -340,7 +384,7 @@ class TIndexDescription {
     std::vector<std::string> IndexColumns_;
     std::vector<std::string> DataColumns_;
     std::vector<TGlobalIndexSettings> GlobalIndexSettings_;
-    std::variant<std::monostate, TKMeansTreeSettings> SpecializedIndexSettings_;
+    std::variant<std::monostate, TKMeansTreeSettings, TFulltextIndexSettings> SpecializedIndexSettings_;
     uint64_t SizeBytes_ = 0;
 };
 
@@ -755,6 +799,9 @@ class TTableDescription {
     // vector KMeansTree
     void AddVectorKMeansTreeIndex(const std::string& indexName, const std::vector<std::string>& indexColumns, const TKMeansTreeSettings& indexSettings);
     void AddVectorKMeansTreeIndex(const std::string& indexName, const std::vector<std::string>& indexColumns, const std::vector<std::string>& dataColumns, const TKMeansTreeSettings& indexSettings);
+    // fulltext
+    void AddFulltextIndex(const std::string& indexName, const std::vector<std::string>& indexColumns, const TFulltextIndexSettings& indexSettings);
+    void AddFulltextIndex(const std::string& indexName, const std::vector<std::string>& indexColumns, const std::vector<std::string>& dataColumns, const TFulltextIndexSettings& indexSettings);
 
     // default
     void AddSecondaryIndex(const std::string& indexName, const std::vector<std::string>& indexColumns);
@@ -996,6 +1043,10 @@ class TTableBuilder {
     TTableBuilder& AddVectorKMeansTreeIndex(const std::string& indexName, const std::vector<std::string>& indexColumns, const TKMeansTreeSettings& indexSettings);
     TTableBuilder& AddVectorKMeansTreeIndex(const std::string& indexName, const std::vector<std::string>& indexColumns, const std::vector<std::string>& dataColumns, const TKMeansTreeSettings& indexSettings);
 
+    // fulltext
+    TTableBuilder& AddFulltextIndex(const std::string& indexName, const std::vector<std::string>& indexColumns, const TFulltextIndexSettings& indexSettings);
+    TTableBuilder& AddFulltextIndex(const std::string& indexName, const std::vector<std::string>& indexColumns, const std::vector<std::string>& dataColumns, const TFulltextIndexSettings& indexSettings);
+
     // default
     TTableBuilder& AddSecondaryIndex(const std::string& indexName, const std::vector<std::string>& indexColumns, const std::vector<std::string>& dataColumns);
     TTableBuilder& AddSecondaryIndex(const std::string& indexName, const std::vector<std::string>& indexColumns);

include/ydb-cpp-sdk/client/table/table_enum.h

@@ -35,6 +35,7 @@ enum class EIndexType {
     GlobalAsync,
     GlobalUnique,
     GlobalVectorKMeansTree,
+    GlobalFulltext,
 
     Unknown = std::numeric_limits<int>::max()
 };

include/ydb-cpp-sdk/client/types/request_settings.h

@@ -20,7 +20,7 @@ struct TRequestSettings {
     FLUENT_SETTING(std::string, TraceId);
     FLUENT_SETTING(std::string, RequestType);
     FLUENT_SETTING(THeader, Header);
-    FLUENT_SETTING(TDuration, ClientTimeout);
+    FLUENT_SETTING_DEFAULT(TDuration, ClientTimeout, TDuration::Max());
     FLUENT_SETTING(std::string, TraceParent);
 
     TRequestSettings() = default;

src/api/grpc/ydb_monitoring_v1.proto

@@ -10,4 +10,6 @@ service MonitoringService {
     rpc SelfCheck(Monitoring.SelfCheckRequest) returns (Monitoring.SelfCheckResponse);
     // Checks current node health
     rpc NodeCheck(Monitoring.NodeCheckRequest) returns (Monitoring.NodeCheckResponse);
+    // Get cluster state
+    rpc ClusterState(Monitoring.ClusterStateRequest) returns (Monitoring.ClusterStateResponse);
 }

src/api/protos/ydb_monitoring.proto

@@ -182,12 +182,19 @@ message LocationBridgePile {
     string name = 1;
 }
 
+message LocationStateStorage {
+    uint32 ring = 1;
+    LocationNode node = 2;
+    LocationBridgePile pile = 3;
+}
+
 message LocationCompute {
     LocationNode node = 1;
     LocationComputePool pool = 2;
     LocationComputeTablet tablet = 3;
     LocationComputeSchema schema = 4;
     LocationBridgePile pile = 5;
+    LocationStateStorage state_storage = 6;
 }
 
 message LocationDatabase {
@@ -227,3 +234,18 @@ message SelfCheckResult {
     repeated DatabaseStatus database_status = 3;
     LocationNode location = 4;
 }
+
+message ClusterStateRequest {
+    Ydb.Operations.OperationParams operation_params = 1; // basic operation params, including timeout
+    uint32 duration_seconds = 2;
+    uint32 period_seconds = 3;
+}
+
+message ClusterStateResponse {
+    // After successfull completion must contain ClusterStateResult.
+    Ydb.Operations.Operation operation = 1;
+}
+
+message ClusterStateResult {
+    string result = 1;
+}

src/api/protos/ydb_scheme.proto

@@ -68,7 +68,7 @@ message Entry {
         RESOURCE_POOL = 21;
         TRANSFER = 23;
         SYS_VIEW = 24;
-        STREAMING_QUERY = 25;
+        STREAMING_QUERY = 26;
     }
 
     // Name of scheme entry (dir2 of /dir1/dir2)

src/client/common_client/impl/CMakeLists.txt

@@ -3,6 +3,7 @@ _ydb_sdk_add_library(client-ydb_common_client-impl)
 target_link_libraries(client-ydb_common_client-impl PUBLIC
   yutil
   impl-internal-grpc_connections
+  impl-internal-rpc_request_settings
 )
 
 target_sources(client-ydb_common_client-impl PRIVATE

src/client/common_client/impl/client.h

@@ -53,7 +53,7 @@ class TClientImplCommon
         return DbDriverState_->DiscoveryCompleted();
     }
 
-    void ScheduleTask(const std::function<void()>& fn, TDuration timeout) override {
+    void ScheduleTask(const std::function<void()>& fn, TDeadline::Duration timeout) override {
         std::weak_ptr<IClientImplCommon> weak = this->shared_from_this();
         auto cbGuard = [weak, fn]() {
             auto strongClient = weak.lock();

src/client/common_client/impl/iface.h

@@ -1,14 +1,15 @@
 #pragma once
 
+#include <src/library/time/time.h>
+
 #include <functional>
-#include <util/datetime/base.h>
 
 namespace NYdb::inline V3 {
 
 class IClientImplCommon {
 public:
     virtual ~IClientImplCommon() = default;
-    virtual void ScheduleTask(const std::function<void()>& fn, TDuration timeout) = 0;
+    virtual void ScheduleTask(const std::function<void()>& fn, TDeadline::Duration timeout) = 0;
 };
 
 }

src/client/driver/driver.cpp

@@ -265,9 +265,9 @@ TDriverConfig TDriver::GetConfig() const {
     );
     config.SetDrainOnDtors(Impl_->DrainOnDtors_);
     config.SetBalancingPolicy(std::make_unique<TBalancingPolicy::TImpl>(Impl_->BalancingSettings_));
-    config.SetGRpcKeepAliveTimeout(Impl_->GRpcKeepAliveTimeout_);
+    config.SetGRpcKeepAliveTimeout(std::chrono::duration_cast<std::chrono::microseconds>(Impl_->GRpcKeepAliveTimeout_));
     config.SetGRpcKeepAlivePermitWithoutCalls(Impl_->GRpcKeepAlivePermitWithoutCalls_);
-    config.SetSocketIdleTimeout(Impl_->SocketIdleTimeout_);
+    config.SetSocketIdleTimeout(std::chrono::duration_cast<std::chrono::microseconds>(Impl_->SocketIdleTimeout_));
     config.SetMaxInboundMessageSize(Impl_->MaxInboundMessageSize_);
     config.SetMaxOutboundMessageSize(Impl_->MaxOutboundMessageSize_);
     config.SetMaxMessageSize(Impl_->MaxMessageSize_);

src/client/federated_topic/impl/federation_observer.cpp

@@ -13,9 +13,9 @@ TFederatedDbObserverImpl::TFederatedDbObserverImpl(std::shared_ptr<TGRpcConnecti
     , PromiseToInitState(NThreading::NewPromise())
     , FederationDiscoveryRetryPolicy(settings.RetryPolicy_)
 {
-    RpcSettings.ClientTimeout = settings.ConnectionTimeout_;
     RpcSettings.EndpointPolicy = TRpcRequestSettings::TEndpointPolicy::UseDiscoveryEndpoint;
     RpcSettings.UseAuth = true;
+    ConnectionTimeout = TDeadline::SafeDurationCast(settings.ConnectionTimeout_);
 }
 
 TFederatedDbObserverImpl::~TFederatedDbObserverImpl() {
@@ -82,6 +82,9 @@ void TFederatedDbObserverImpl::RunFederationDiscoveryImpl() {
         }
     };
 
+    TRpcRequestSettings settings = RpcSettings;
+    settings.Deadline = TDeadline::AfterDuration(ConnectionTimeout);
+
     Connections_->RunDeferred<Ydb::FederationDiscovery::V1::FederationDiscoveryService,
                              Ydb::FederationDiscovery::ListFederationDatabasesRequest,
                              Ydb::FederationDiscovery::ListFederationDatabasesResponse>(
@@ -90,7 +93,7 @@ void TFederatedDbObserverImpl::RunFederationDiscoveryImpl() {
         &Ydb::FederationDiscovery::V1::FederationDiscoveryService::Stub::AsyncListFederationDatabases,
         DbDriverState_,
         {},  // no polling unready operations, so no need in delay parameter
-        RpcSettings,
+        settings,
         FederationDiscoveryDelayContext);
 }
 

src/client/federated_topic/impl/federation_observer.h

@@ -84,6 +84,7 @@ class TFederatedDbObserverImpl : public TClientImplCommon<TFederatedDbObserverIm
     std::shared_ptr<TFederatedDbState> FederatedDbState;
     NThreading::TPromise<void> PromiseToInitState;
     TRpcRequestSettings RpcSettings;
+    TDeadline::Duration ConnectionTimeout;
     TSpinLock Lock;
 
     NTopic::IRetryPolicy::TPtr FederationDiscoveryRetryPolicy;

src/client/impl/internal/CMakeLists.txt

@@ -4,6 +4,7 @@ add_subdirectory(grpc_connections)
 add_subdirectory(logger)
 add_subdirectory(make_request)
 add_subdirectory(plain_status)
+add_subdirectory(rpc_request_settings)
 add_subdirectory(retry)
 add_subdirectory(thread_pool)
 add_subdirectory(value_helpers)

src/client/impl/internal/db_driver_state/state.cpp

@@ -20,9 +20,11 @@ namespace {
 
 namespace NYdb::inline V3 {
 
+using namespace std::chrono_literals;
+
 constexpr int PESSIMIZATION_DISCOVERY_THRESHOLD = 50; // percent of endpoints pessimized by transport error to start recheck
 constexpr TDuration ENDPOINT_UPDATE_PERIOD = TDuration::Minutes(1); // period to perform endpoints update in "normal" case
-constexpr TDuration DISCOVERY_RECHECK_PERIOD = TDuration::Seconds(5); // period to run periodic discovery task
+constexpr TDeadline::Duration DISCOVERY_RECHECK_PERIOD = 5s; // period to run periodic discovery task
 
 TDbDriverState::TDbDriverState(
     const std::string& database,
@@ -237,7 +239,7 @@ TDbDriverStatePtr TDbDriverStateTracker::GetDriverState(
     return strongState;
 }
 
-void TDbDriverState::AddPeriodicTask(TPeriodicCb&& cb, TDuration period) {
+void TDbDriverState::AddPeriodicTask(TPeriodicCb&& cb, TDeadline::Duration period) {
     Client->AddPeriodicTask(std::move(cb), period);
 }
 

src/client/impl/internal/db_driver_state/state.h

@@ -39,7 +39,7 @@ class TDbDriverState
 
     void SignalDiscoveryCompleted();
 
-    void AddPeriodicTask(TPeriodicCb&& cb, TDuration period) override;
+    void AddPeriodicTask(TPeriodicCb&& cb, TDeadline::Duration period) override;
 
     void AddCb(TCb&& cb, ENotifyType type);
     void ForEachEndpoint(const TEndpointElectorSafe::THandleCb& cb, const void* tag) const;

src/client/impl/internal/grpc_connections/CMakeLists.txt

@@ -6,6 +6,7 @@ target_link_libraries(impl-internal-grpc_connections PUBLIC
   api-protos
   impl-internal-db_driver_state
   impl-internal-plain_status
+  impl-internal-rpc_request_settings
   client-impl-ydb_stats
   client-resources
   client-types-exceptions