Skip to content

YDB C++ SDK Import 3 #380

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 7 commits into from
Feb 21, 2025
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
69 changes: 0 additions & 69 deletions include/ydb-cpp-sdk/client/bsconfig/storage_config.h

This file was deleted.

120 changes: 120 additions & 0 deletions include/ydb-cpp-sdk/client/config/config.h
Original file line number Diff line number Diff line change
@@ -0,0 +1,120 @@
#pragma once

#include <ydb-cpp-sdk/client/common_client/settings.h>
#include <ydb-cpp-sdk/client/driver/driver.h>
#include <ydb-cpp-sdk/client/types/status/status.h>
#include <ydb-cpp-sdk/client/types/request_settings.h>
#include <ydb-cpp-sdk/client/types/ydb.h>

#include <memory>
#include <string>

namespace NYdb::inline V3::NConfig {

struct TReplaceConfigSettings : public NYdb::TOperationRequestSettings<TReplaceConfigSettings> {
FLUENT_SETTING_FLAG(DryRun);
FLUENT_SETTING_FLAG(AllowUnknownFields);
FLUENT_SETTING_FLAG(BypassChecks);
};

enum class EFetchAllConfigsTransform {
NONE,
DETACH_STORAGE_CONFIG_SECTION,
ATTACH_STORAGE_CONFIG_SECTION,
};

struct TFetchAllConfigsSettings : public NYdb::TOperationRequestSettings<TFetchAllConfigsSettings> {
FLUENT_SETTING(EFetchAllConfigsTransform, Transform);
};

struct TBootstrapClusterSettings : public NYdb::TOperationRequestSettings<TBootstrapClusterSettings> {};

struct TMainConfigIdentity {
std::uint64_t Version;
std::string Cluster;
};

struct TStorageConfigIdentity {
std::uint64_t Version;
std::string Cluster;
};

struct TDatabaseConfigIdentity {
std::uint64_t Version;
std::string Cluster;
std::string Database;
};

using TIdentityTypes = std::variant<
std::monostate
, TMainConfigIdentity
, TStorageConfigIdentity
, TDatabaseConfigIdentity
>;

struct TConfig {
TIdentityTypes Identity;
std::string Config;
};

struct TFetchConfigResult : public TStatus {
TFetchConfigResult(
TStatus&& status,
std::vector<TConfig>&& configs)
: TStatus(std::move(status))
, Configs_(std::move(configs))
{}

const std::vector<TConfig>& GetConfigs() const {
return Configs_;
}

private:
std::vector<TConfig> Configs_;
};

using TAsyncFetchConfigResult = NThreading::TFuture<TFetchConfigResult>;

class TConfigClient {
public:
explicit TConfigClient(const TDriver& driver, const TCommonClientSettings& settings = {});

~TConfigClient();

// Replace config
TAsyncStatus ReplaceConfig(
const std::string& mainConfig,
const TReplaceConfigSettings& settings = {});

// Replace config
TAsyncStatus ReplaceConfig(
const std::string& mainConfig,
const std::string& storageConfig,
const TReplaceConfigSettings& settings = {});

// Replace config
TAsyncStatus ReplaceConfigDisableDedicatedStorageSection(
const std::string& mainConfig,
const TReplaceConfigSettings& settings = {});

// Replace config
TAsyncStatus ReplaceConfigEnableDedicatedStorageSection(
const std::string& mainConfig,
const std::string& storageConfig,
const TReplaceConfigSettings& settings = {});

// Fetch current cluster storage config
TAsyncFetchConfigResult FetchAllConfigs(const TFetchAllConfigsSettings& settings = {});

// Bootstrap cluster with automatic configuration
TAsyncStatus BootstrapCluster(
const std::string& selfAssemblyUUID,
const TBootstrapClusterSettings& settings = {});

private:
class TImpl;

std::unique_ptr<TImpl> Impl_;
};

}
1 change: 1 addition & 0 deletions include/ydb-cpp-sdk/client/import/import.h
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@ enum class EImportProgress {
Done = 4,
Cancellation = 5,
Cancelled = 6,
CreateChangefeeds = 7,

Unknown = std::numeric_limits<int>::max(),
};
Expand Down
22 changes: 0 additions & 22 deletions src/api/grpc/ydb_bsconfig_v1.proto

This file was deleted.

20 changes: 20 additions & 0 deletions src/api/grpc/ydb_config_v1.proto
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
syntax = "proto3";

package Ydb.Config.V1;

option java_package = "com.yandex.ydb.config.v1";
option java_outer_classname = "ConfigGrpc";
option java_multiple_files = true;

import "src/api/protos/ydb_config.proto";

service ConfigService {
// Replace one or many configs.
rpc ReplaceConfig(Config.ReplaceConfigRequest) returns (Config.ReplaceConfigResponse);

// Fetch configs from cluster.
rpc FetchConfig(Config.FetchConfigRequest) returns (Config.FetchConfigResponse);

// Start cluster initialization process.
rpc BootstrapCluster(Config.BootstrapClusterRequest) returns (Config.BootstrapClusterResponse);
}
53 changes: 0 additions & 53 deletions src/api/protos/ydb_bsconfig.proto

This file was deleted.

Loading
Loading