Skip to content

Speedup bulkupsert (#17333) #19793

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.

Sign up for GitHub

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 2 commits into from
Jun 19, 2025
Merged

Speedup bulkupsert (#17333) #19793

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
5bee300
Speedup bulkupsert
eivanov89 Jun 18, 2025
432b180
Don't break shared TValue's impl case
eivanov89 Jun 18, 2025
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
11 changes: 8 additions & 3 deletions ydb/public/sdk/cpp/client/ydb_table/impl/table_client.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -934,11 +934,16 @@ void TTableClient::TImpl::SetStatCollector(const NSdkStats::TStatCollector::TCli
RequestMigrated.Set(collector.RequestMigrated);
}

TAsyncBulkUpsertResult TTableClient::TImpl::BulkUpsert(const TString& table, TValue&& rows, const TBulkUpsertSettings& settings) {
TAsyncBulkUpsertResult TTableClient::TImpl::BulkUpsert(const TString& table, TValue&& rows, const TBulkUpsertSettings& settings, bool canMove) {
auto request = MakeOperationRequest<Ydb::Table::BulkUpsertRequest>(settings);
request.set_table(table);
*request.mutable_rows()->mutable_type() = TProtoAccessor::GetProto(rows.GetType());
*request.mutable_rows()->mutable_value() = rows.GetProto();
if (canMove) {
request.mutable_rows()->mutable_type()->Swap(&rows.GetType().GetProto());
request.mutable_rows()->mutable_value()->Swap(&rows.GetProto());
} else {
*request.mutable_rows()->mutable_type() = TProtoAccessor::GetProto(rows.GetType());
*request.mutable_rows()->mutable_value() = rows.GetProto();
}

auto promise = NewPromise<TBulkUpsertResult>();

Expand Down
2 changes: 1 addition & 1 deletion ydb/public/sdk/cpp/client/ydb_table/impl/table_client.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -134,7 +134,7 @@ class TTableClient::TImpl: public TClientImplCommon<TTableClient::TImpl>, public

void SetStatCollector(const NSdkStats::TStatCollector::TClientStatCollector& collector);

TAsyncBulkUpsertResult BulkUpsert(const TString& table, TValue&& rows, const TBulkUpsertSettings& settings);
TAsyncBulkUpsertResult BulkUpsert(const TString& table, TValue&& rows, const TBulkUpsertSettings& settings, bool canMove);
TAsyncBulkUpsertResult BulkUpsert(const TString& table, EDataFormat format,
const TString& data, const TString& schema, const TBulkUpsertSettings& settings);

Expand Down
2 changes: 1 addition & 1 deletion ydb/public/sdk/cpp/client/ydb_table/table.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1459,7 +1459,7 @@ NThreading::TFuture<void> TTableClient::Stop() {
TAsyncBulkUpsertResult TTableClient::BulkUpsert(const TString& table, TValue&& rows,
const TBulkUpsertSettings& settings)
{
return Impl_->BulkUpsert(table, std::move(rows), settings);
return Impl_->BulkUpsert(table, std::move(rows), settings, rows.Impl_.use_count() == 1);
}

TAsyncBulkUpsertResult TTableClient::BulkUpsert(const TString& table, EDataFormat format,
Expand Down
7 changes: 7 additions & 0 deletions ydb/public/sdk/cpp/include/ydb-cpp-sdk/client/value/value.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -262,10 +262,17 @@ struct TUuidValue {
} Buf_;
};

namespace NTable {

class TTableClient;

} // namespace NTable

//! Representation of YDB value.
class TValue {
friend class TValueParser;
friend class TProtoAccessor;
friend class ::NYdb::Dev::NTable::TTableClient;
public:
TValue(const TType& type, const Ydb::Value& valueProto);
TValue(const TType& type, Ydb::Value&& valueProto);
Expand Down
11 changes: 8 additions & 3 deletions ydb/public/sdk/cpp/src/client/table/impl/table_client.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -989,11 +989,16 @@ void TTableClient::TImpl::SetStatCollector(const NSdkStats::TStatCollector::TCli
SessionRemovedDueBalancing.Set(collector.SessionRemovedDueBalancing);
}

TAsyncBulkUpsertResult TTableClient::TImpl::BulkUpsert(const std::string& table, TValue&& rows, const TBulkUpsertSettings& settings) {
TAsyncBulkUpsertResult TTableClient::TImpl::BulkUpsert(const std::string& table, TValue&& rows, const TBulkUpsertSettings& settings, bool canMove) {
auto request = MakeOperationRequest<Ydb::Table::BulkUpsertRequest>(settings);
request.set_table(TStringType{table});
*request.mutable_rows()->mutable_type() = TProtoAccessor::GetProto(rows.GetType());
*request.mutable_rows()->mutable_value() = rows.GetProto();
if (canMove) {
request.mutable_rows()->mutable_type()->Swap(&rows.GetType().GetProto());
request.mutable_rows()->mutable_value()->Swap(&rows.GetProto());
} else {
*request.mutable_rows()->mutable_type() = TProtoAccessor::GetProto(rows.GetType());
*request.mutable_rows()->mutable_value() = rows.GetProto();
}

auto promise = NewPromise<TBulkUpsertResult>();

Expand Down
2 changes: 1 addition & 1 deletion ydb/public/sdk/cpp/src/client/table/impl/table_client.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -138,7 +138,7 @@ class TTableClient::TImpl: public TClientImplCommon<TTableClient::TImpl>, public

void SetStatCollector(const NSdkStats::TStatCollector::TClientStatCollector& collector);

TAsyncBulkUpsertResult BulkUpsert(const std::string& table, TValue&& rows, const TBulkUpsertSettings& settings);
TAsyncBulkUpsertResult BulkUpsert(const std::string& table, TValue&& rows, const TBulkUpsertSettings& settings, bool canMove);
TAsyncBulkUpsertResult BulkUpsert(const std::string& table, EDataFormat format,
const std::string& data, const std::string& schema, const TBulkUpsertSettings& settings);

Expand Down
2 changes: 1 addition & 1 deletion ydb/public/sdk/cpp/src/client/table/table.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1460,7 +1460,7 @@ NThreading::TFuture<void> TTableClient::Stop() {
TAsyncBulkUpsertResult TTableClient::BulkUpsert(const std::string& table, TValue&& rows,
const TBulkUpsertSettings& settings)
{
return Impl_->BulkUpsert(table, std::move(rows), settings);
return Impl_->BulkUpsert(table, std::move(rows), settings, rows.Impl_.use_count() == 1);
}

TAsyncBulkUpsertResult TTableClient::BulkUpsert(const std::string& table, EDataFormat format,
Expand Down
Loading