Skip to content

Sync sdks #365

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 4 commits into from
Jan 17, 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
5 changes: 2 additions & 3 deletions include/ydb-cpp-sdk/client/driver/driver.h
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
#pragma once

#include "fwd.h"

#include <ydb-cpp-sdk/client/common_client/settings.h>
#include <ydb-cpp-sdk/client/types/status_codes.h>
#include <ydb-cpp-sdk/client/types/credentials/credentials.h>
Expand All @@ -13,11 +15,8 @@

namespace NYdb::inline V3 {

class TDriver;
class TGRpcConnectionsImpl;

////////////////////////////////////////////////////////////////////////////////

//! Represents configuration of YDB driver
class TDriverConfig {
friend class TDriver;
Expand Down
8 changes: 8 additions & 0 deletions include/ydb-cpp-sdk/client/driver/fwd.h
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
#pragma once

namespace NYdb::inline V3 {

class TDriver;
class TDriverConfig;

} // namespace NYdb
9 changes: 9 additions & 0 deletions include/ydb-cpp-sdk/client/params/fwd.h
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
#pragma once

namespace NYdb::inline V3 {

class TParams;
class TParamValueBuilder;
class TParamsBuilder;

} // namespace NYdb
4 changes: 2 additions & 2 deletions include/ydb-cpp-sdk/client/params/params.h
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
#pragma once

#include "fwd.h"

#include <ydb-cpp-sdk/type_switcher.h>
#include <ydb-cpp-sdk/client/value/value.h>

Expand Down Expand Up @@ -32,8 +34,6 @@ namespace NQuery {
class TQueryClient;
}

class TParamsBuilder;

class TParams {
friend class TParamsBuilder;
friend class NTable::TTableClient;
Expand Down
5 changes: 2 additions & 3 deletions include/ydb-cpp-sdk/client/query/client.h
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
#pragma once

#include "fwd.h"

#include "query.h"
#include "tx.h"

Expand Down Expand Up @@ -27,7 +29,6 @@ struct TCreateSessionSettings : public TSimpleRequestSettings<TCreateSessionSett
TCreateSessionSettings();
};

class TCreateSessionResult;
using TAsyncCreateSessionResult = NThreading::TFuture<TCreateSessionResult>;
using TRetryOperationSettings = NYdb::NRetry::TRetryOperationSettings;

Expand Down Expand Up @@ -55,7 +56,6 @@ struct TClientSettings : public TCommonClientSettingsBase<TClientSettings> {
// ! This API is currently in experimental state and is a subject for changes.
// ! No backward and/or forward compatibility guarantees are provided.
// ! DO NOT USE for production workloads.
class TSession;
class TQueryClient {
friend class TSession;
friend class NRetry::Async::TRetryContext<TQueryClient, TAsyncExecuteQueryResult>;
Expand Down Expand Up @@ -126,7 +126,6 @@ class TQueryClient {
std::shared_ptr<TImpl> Impl_;
};

class TTransaction;
class TSession {
friend class TQueryClient;
friend class TTransaction;
Expand Down
37 changes: 37 additions & 0 deletions include/ydb-cpp-sdk/client/query/fwd.h
Original file line number Diff line number Diff line change
@@ -0,0 +1,37 @@
#pragma once

namespace NYdb::inline V3::NQuery {

struct TClientSettings;
struct TSessionPoolSettings;
struct TCreateSessionSettings;
struct TExecuteQuerySettings;
struct TBeginTxSettings;
struct TCommitTxSettings;
struct TRollbackTxSettings;
struct TExecuteScriptSettings;
struct TFetchScriptResultsSettings;
struct TTxOnlineSettings;
struct TTxSettings;

class TQueryClient;
class TSession;

class TCreateSessionResult;
class TBeginTransactionResult;
class TExecuteQueryResult;
class TCommitTransactionResult;
class TFetchScriptResultsResult;

class TExecuteQueryPart;
class TExecuteQueryIterator;

class TTransaction;
struct TTxControl;

class TQueryContent;
class TResultSetMeta;
class TScriptExecutionOperation;
class TExecStats;

} // namespace NYdb
6 changes: 2 additions & 4 deletions include/ydb-cpp-sdk/client/query/query.h
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
#pragma once

#include "fwd.h"

#include "stats.h"

#include <ydb-cpp-sdk/client/result/result.h>
Expand Down Expand Up @@ -46,7 +48,6 @@ enum class EExecStatus {
Failed = 50,
};

class TExecuteQueryPart;
using TAsyncExecuteQueryPart = NThreading::TFuture<TExecuteQueryPart>;

class TExecuteQueryIterator : public TStatus {
Expand Down Expand Up @@ -88,8 +89,6 @@ class TCommitTransactionResult : public TStatus {
TCommitTransactionResult(TStatus&& status);
};

class TBeginTransactionResult;

using TAsyncBeginTransactionResult = NThreading::TFuture<TBeginTransactionResult>;
using TAsyncCommitTransactionResult = NThreading::TFuture<TCommitTransactionResult>;

Expand Down Expand Up @@ -182,7 +181,6 @@ class TFetchScriptResultsResult : public TStatus {
std::string NextFetchToken_;
};

class TExecuteQueryResult;
using TAsyncFetchScriptResultsResult = NThreading::TFuture<TFetchScriptResultsResult>;
using TAsyncExecuteQueryResult = NThreading::TFuture<TExecuteQueryResult>;

Expand Down
2 changes: 0 additions & 2 deletions include/ydb-cpp-sdk/client/query/stats.h
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,6 @@
#include <optional>
#include <string>

class TDuration;

namespace Ydb::TableStats {
class QueryStats;
}
Expand Down
8 changes: 8 additions & 0 deletions include/ydb-cpp-sdk/client/result/fwd.h
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
#pragma once

namespace NYdb::inline V3 {

class TResultSet;
class TResultSetParser;

} // namespace NYdb
2 changes: 2 additions & 0 deletions include/ydb-cpp-sdk/client/result/result.h
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
#pragma once

#include "fwd.h"

#include <ydb-cpp-sdk/client/value/value.h>

#include <string>
Expand Down
116 changes: 116 additions & 0 deletions include/ydb-cpp-sdk/client/table/fwd.h
Original file line number Diff line number Diff line change
@@ -0,0 +1,116 @@
#pragma once

namespace NYdb::inline V3::NTable {

class TKeyBound;
class TKeyRange;

struct TTableColumn;
struct TAlterTableColumn;

struct TPartitionStats;

struct TSequenceDescription;
class TChangefeedDescription;
class TIndexDescription;
class TColumnFamilyDescription;
class TTableDescription;

struct TExplicitPartitions;

struct TRenameIndex;

struct TGlobalIndexSettings;
struct TVectorIndexSettings;
struct TKMeansTreeSettings;
struct TCreateSessionSettings;
struct TSessionPoolSettings;
struct TClientSettings;
struct TBulkUpsertSettings;
struct TReadRowsSettings;
struct TStreamExecScanQuerySettings;
struct TTxOnlineSettings;
struct TCreateTableSettings;
struct TDropTableSettings;
struct TAlterTableSettings;
struct TCopyTableSettings;
struct TCopyTablesSettings;
struct TRenameTablesSettings;
struct TDescribeTableSettings;
struct TExplainDataQuerySettings;
struct TPrepareDataQuerySettings;
struct TExecDataQuerySettings;
struct TExecSchemeQuerySettings;
struct TBeginTxSettings;
struct TCommitTxSettings;
struct TRollbackTxSettings;
struct TCloseSessionSettings;
struct TKeepAliveSettings;
struct TReadTableSettings;

class TPartitioningSettings;
class TDateTypeColumnModeSettings;
class TValueSinceUnixEpochModeSettings;
class TTtlTierSettings;
class TTtlSettings;
class TAlterTtlSettings;
class TStorageSettings;
class TReadReplicasSettings;
class TTxSettings;

struct TColumnFamilyPolicy;
struct TStoragePolicy;
struct TPartitioningPolicy;
struct TReplicationPolicy;

class TBuildIndexOperation;

class TTtlDeleteAction;
class TTtlEvictToExternalStorageAction;

class TStorageSettingsBuilder;
class TPartitioningSettingsBuilder;
class TColumnFamilyBuilder;
class TTableStorageSettingsBuilder;
class TTableColumnFamilyBuilder;
class TTablePartitioningSettingsBuilder;
class TTableBuilder;
class TAlterStorageSettingsBuilder;
class TAlterColumnFamilyBuilder;
class TAlterTtlSettingsBuilder;
class TAlterAttributesBuilder;
class TAlterPartitioningSettingsBuilder;

class TPrepareQueryResult;
class TExplainQueryResult;
class TDescribeTableResult;
class TDataQueryResult;
class TBeginTransactionResult;
class TCommitTransactionResult;
class TCreateSessionResult;
class TKeepAliveResult;
class TBulkUpsertResult;
class TReadRowsResult;

template<typename TPart>
class TSimpleStreamPart;

class TScanQueryPart;

class TTablePartIterator;
class TScanQueryPartIterator;

class TReadTableSnapshot;

class TCopyItem;
class TRenameItem;

class TDataQuery;

class TTransaction;
class TTxControl;

class TSession;
class TTableClient;

} // namespace NYdb
29 changes: 2 additions & 27 deletions include/ydb-cpp-sdk/client/table/table.h
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
#pragma once

#include "fwd.h"

#include "table_enum.h"

#include <ydb-cpp-sdk/client/driver/driver.h>
Expand Down Expand Up @@ -643,9 +645,6 @@ class TReadReplicasSettings {
uint64_t ReadReplicasCount_;
};

struct TExplicitPartitions;
struct TDescribeTableSettings;

enum class EStoreType {
Row = 0,
Column = 1
Expand Down Expand Up @@ -826,8 +825,6 @@ class TColumnFamilyBuilder {

////////////////////////////////////////////////////////////////////////////////

class TTableBuilder;

class TTableStorageSettingsBuilder {
public:
explicit TTableStorageSettingsBuilder(TTableBuilder& parent)
Expand Down Expand Up @@ -1071,19 +1068,6 @@ class TRenameItem {

////////////////////////////////////////////////////////////////////////////////

class TCreateSessionResult;
class TDataQueryResult;
class TTablePartIterator;
class TPrepareQueryResult;
class TExplainQueryResult;
class TDescribeTableResult;
class TBeginTransactionResult;
class TCommitTransactionResult;
class TKeepAliveResult;
class TBulkUpsertResult;
class TReadRowsResult;
class TScanQueryPartIterator;

using TAsyncCreateSessionResult = NThreading::TFuture<TCreateSessionResult>;
using TAsyncDataQueryResult = NThreading::TFuture<TDataQueryResult>;
using TAsyncPrepareQueryResult = NThreading::TFuture<TPrepareQueryResult>;
Expand Down Expand Up @@ -1177,9 +1161,6 @@ struct TStreamExecScanQuerySettings : public TRequestSettings<TStreamExecScanQue
FLUENT_SETTING_DEFAULT(bool, CollectFullDiagnostics, false);
};

class TSession;
class TSessionPool;

enum class EDataFormat {
ApacheArrow = 1,
CSV = 2,
Expand Down Expand Up @@ -1287,8 +1268,6 @@ class TTableClient {

////////////////////////////////////////////////////////////////////////////////

class TTransaction;

struct TTxOnlineSettings {
using TSelf = TTxOnlineSettings;

Expand Down Expand Up @@ -1367,8 +1346,6 @@ class TTxSettings {
ETransactionMode Mode_;
};

class TTxControl;

enum class EAutoPartitioningPolicy {
Disabled = 1,
AutoSplit = 2,
Expand Down Expand Up @@ -1457,8 +1434,6 @@ struct TDropTableSettings : public TOperationRequestSettings<TDropTableSettings>

////////////////////////////////////////////////////////////////////////////////

struct TAlterTableSettings;

class TAlterStorageSettingsBuilder {
public:
explicit TAlterStorageSettingsBuilder(TAlterTableSettings& parent)
Expand Down
2 changes: 2 additions & 0 deletions include/ydb-cpp-sdk/client/types/credentials/credentials.h
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
#pragma once

#include <ydb-cpp-sdk/client/types/fwd.h>

#include <memory>
#include <string>

Expand Down
Loading
Loading