Import YDB C++ SDK 29

.github/import_generation.txt

@@ -1 +1 @@
-29
+30

.github/last_commit.txt

@@ -1 +1 @@
-eaa66fe4cc75727a60d89a9ec9d99970e03ce0e0
+8f09fc5ca428fadaf61de1abdea31c06a664f147

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

@@ -126,6 +126,40 @@ class TExportToS3Response : public TOperation {
     TMetadata Metadata_;
 };
 
+/// FS
+struct TExportToFsSettings : public TOperationRequestSettings<TExportToFsSettings> {
+    using TSelf = TExportToFsSettings;
+
+    struct TItem {
+        std::string Src;
+        std::string Dst;
+    };
+
+    FLUENT_SETTING(std::string, BasePath);
+    FLUENT_SETTING_VECTOR(TItem, Item);
+    FLUENT_SETTING_OPTIONAL(std::string, Description);
+    FLUENT_SETTING_OPTIONAL(uint32_t, NumberOfRetries);
+    FLUENT_SETTING_OPTIONAL(std::string, Compression);
+};
+
+class TExportToFsResponse : public TOperation {
+public:
+    struct TMetadata {
+        TExportToFsSettings Settings;
+        EExportProgress Progress;
+        std::vector<TExportItemProgress> ItemsProgress;
+    };
+
+public:
+    using TOperation::TOperation;
+    TExportToFsResponse(TStatus&& status, Ydb::Operations::Operation&& operation);
+
+    const TMetadata& Metadata() const;
+
+private:
+    TMetadata Metadata_;
+};
+
 class TExportClient {
     class TImpl;
 
@@ -134,6 +168,7 @@ class TExportClient {
 
     NThreading::TFuture<TExportToYtResponse> ExportToYt(const TExportToYtSettings& settings);
     NThreading::TFuture<TExportToS3Response> ExportToS3(const TExportToS3Settings& settings);
+    NThreading::TFuture<TExportToFsResponse> ExportToFs(const TExportToFsSettings& settings);
 
 private:
     std::shared_ptr<TImpl> Impl_;

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

@@ -139,6 +139,48 @@ class TListObjectsInS3ExportResult : public TStatus {
 
 using TAsyncListObjectsInS3ExportResult = NThreading::TFuture<TListObjectsInS3ExportResult>;
 
+/// FS
+struct TImportFromFsSettings : public TOperationRequestSettings<TImportFromFsSettings> {
+    using TSelf = TImportFromFsSettings;
+
+    struct TItem {
+        // Source path.
+        // Path to the exported table/directory in FS (relative to base_path)
+        std::string Src;
+
+        // Destination path.
+        // database path where to import data
+        std::string Dst;
+    };
+
+    FLUENT_SETTING(std::string, BasePath);
+    FLUENT_SETTING_VECTOR(TItem, Item);
+    FLUENT_SETTING_OPTIONAL(std::string, Description);
+    FLUENT_SETTING_OPTIONAL(uint32_t, NumberOfRetries);
+    FLUENT_SETTING_OPTIONAL(bool, NoACL);
+    FLUENT_SETTING_OPTIONAL(bool, SkipChecksumValidation);
+};
+
+class TImportFromFsResponse : public TOperation {
+public:
+    struct TMetadata {
+        TImportFromFsSettings Settings;
+        EImportProgress Progress;
+        std::vector<TImportItemProgress> ItemsProgress;
+    };
+
+public:
+    using TOperation::TOperation;
+    TImportFromFsResponse(TStatus&& status, Ydb::Operations::Operation&& operation);
+
+    const TMetadata& Metadata() const;
+
+private:
+    TMetadata Metadata_;
+};
+
+using TAsyncImportFromFsResponse = NThreading::TFuture<TImportFromFsResponse>;
+
 /// Data
 struct TImportYdbDumpDataSettings : public TOperationRequestSettings<TImportYdbDumpDataSettings> {
     using TSelf = TImportYdbDumpDataSettings;
@@ -162,6 +204,7 @@ class TImportClient {
     TImportClient(const TDriver& driver, const TCommonClientSettings& settings = TCommonClientSettings());
 
     TAsyncImportFromS3Response ImportFromS3(const TImportFromS3Settings& settings);
+    TAsyncImportFromFsResponse ImportFromFs(const TImportFromFsSettings& settings);
 
     TAsyncListObjectsInS3ExportResult ListObjectsInS3Export(const TListObjectsInS3ExportSettings& settings, std::int64_t pageSize = 0, const std::string& pageToken = {});
 

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

@@ -27,7 +27,9 @@ namespace NYdb::inline V3 {
 namespace NYdb::inline V3::NQuery {
 
 struct TCreateSessionSettings : public TSimpleRequestSettings<TCreateSessionSettings> {
-    TCreateSessionSettings();
+    TCreateSessionSettings() {
+        ClientTimeout(TDuration::Seconds(5));
+    }
 };
 
 using TAsyncCreateSessionResult = NThreading::TFuture<TCreateSessionResult>;