Move type in BulkUpsert conditionally, independent of value (#25673)

Author: pnv1

.github/last_commit.txt

@@ -1 +1 @@
-ccb159ff5e6a49d325f2342fea08f07e9bd30a83
+7a9abfb04d596ae64b42a4c2af5d196b0c9f57fb

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

@@ -18,9 +18,17 @@ namespace NYdb::inline V3 {
 
 class TResultSetParser;
 
+// Forward declarations for friend access
+namespace NTable {
+
+class TTableClient;
+
+} // namespace NTable
+
 //! Representation of YDB type.
 class TType {
     friend class TProtoAccessor;
+    friend class NTable::TTableClient;
 public:
     TType(const Ydb::Type& typeProto);
     TType(Ydb::Type&& typeProto);
@@ -264,12 +272,6 @@ struct TUuidValue {
     } Buf_;
 };
 
-namespace NTable {
-
-class TTableClient;
-
-} // namespace NTable
-
 //! Representation of YDB value.
 class TValue {
     friend class TValueParser;

src/client/table/impl/table_client.cpp

@@ -1019,7 +1019,7 @@ 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, bool canMove) {
+TAsyncBulkUpsertResult TTableClient::TImpl::BulkUpsert(const std::string& table, TValue&& rows, const TBulkUpsertSettings& settings) {
     Ydb::Table::BulkUpsertRequest* request = nullptr;
     std::unique_ptr<Ydb::Table::BulkUpsertRequest> holder;
 
@@ -1031,11 +1031,16 @@ TAsyncBulkUpsertResult TTableClient::TImpl::BulkUpsert(const std::string& table,
     }
 
     request->set_table(TStringType{table});
-    if (canMove) {
+
+    if (rows.GetType().Impl_.use_count() == 1) {
         request->mutable_rows()->mutable_type()->Swap(&rows.GetType().GetProto());
+    } else {
+        *request->mutable_rows()->mutable_type() = rows.GetType().GetProto();
+    }
+
+    if (rows.Impl_.use_count() == 1) {
         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();
     }
 

src/client/table/impl/table_client.h

@@ -139,7 +139,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, bool canMove);
+    TAsyncBulkUpsertResult BulkUpsert(const std::string& table, TValue&& rows, const TBulkUpsertSettings& settings);
     TAsyncBulkUpsertResult BulkUpsert(const std::string& table, EDataFormat format,
         const std::string& data, const std::string& schema, const TBulkUpsertSettings& settings);
 

src/client/table/table.cpp

@@ -1496,7 +1496,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, rows.Impl_.use_count() == 1);
+    return Impl_->BulkUpsert(table, std::move(rows), settings);
 }
 
 TAsyncBulkUpsertResult TTableClient::BulkUpsert(const std::string& table, EDataFormat format,