Skip to content

ydb_federated_topic: copy message data #3159

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
Mar 26, 2024
Merged

ydb_federated_topic: copy message data #3159

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
6f01c4d
ydb_federated_topic: copy message data
qyryq Mar 26, 2024
5212c1d
ydb_topic: Drop const from TWriteMessage.Data
qyryq Mar 26, 2024
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
22 changes: 11 additions & 11 deletions ydb/public/sdk/cpp/client/ydb_federated_topic/impl/federated_write_session.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -239,7 +239,7 @@ void TFederatedWriteSession::Write(NTopic::TContinuationToken&& token, TStringBu
}

void TFederatedWriteSession::Write(NTopic::TContinuationToken&& token, NTopic::TWriteMessage&& message) {
return WriteInternal(std::move(token), std::move(message));
return WriteInternal(std::move(token), TWrappedWriteMessage(std::move(message)));
}

void TFederatedWriteSession::WriteEncoded(NTopic::TContinuationToken&& token, TStringBuf data, NTopic::ECodec codec,
Expand All @@ -249,24 +249,24 @@ void TFederatedWriteSession::WriteEncoded(NTopic::TContinuationToken&& token, TS
message.SeqNo(*seqNo);
if (createTimestamp.Defined())
message.CreateTimestamp(*createTimestamp);
return WriteInternal(std::move(token), std::move(message));
return WriteInternal(std::move(token), TWrappedWriteMessage(std::move(message)));
}

void TFederatedWriteSession::WriteEncoded(NTopic::TContinuationToken&& token, NTopic::TWriteMessage&& message) {
return WriteInternal(std::move(token), std::move(message));
return WriteInternal(std::move(token), TWrappedWriteMessage(std::move(message)));
}

void TFederatedWriteSession::WriteInternal(NTopic::TContinuationToken&&, NTopic::TWriteMessage&& message) {
void TFederatedWriteSession::WriteInternal(NTopic::TContinuationToken&&, TWrappedWriteMessage&& wrapped) {
ClientHasToken = false;
if (!message.CreateTimestamp_.Defined()) {
message.CreateTimestamp_ = TInstant::Now();
if (!wrapped.Message.CreateTimestamp_.Defined()) {
wrapped.Message.CreateTimestamp_ = TInstant::Now();
}

{
TDeferredWrite deferred(Subsession);
with_lock(Lock) {
BufferFreeSpace -= message.Data.size();
OriginalMessagesToPassDown.emplace_back(std::move(message));
BufferFreeSpace -= wrapped.Message.Data.size();
OriginalMessagesToPassDown.emplace_back(std::move(wrapped));

PrepareDeferredWrite(deferred);
}
Expand All @@ -285,10 +285,10 @@ bool TFederatedWriteSession::PrepareDeferredWrite(TDeferredWrite& deferred) {
if (OriginalMessagesToPassDown.empty()) {
return false;
}
OriginalMessagesToGetAck.push_back(OriginalMessagesToPassDown.front());
deferred.Token.ConstructInPlace(std::move(*PendingToken));
deferred.Message.ConstructInPlace(std::move(OriginalMessagesToPassDown.front()));
OriginalMessagesToGetAck.push_back(std::move(OriginalMessagesToPassDown.front()));
OriginalMessagesToPassDown.pop_front();
deferred.Token.ConstructInPlace(std::move(*PendingToken));
deferred.Message.ConstructInPlace(std::move(OriginalMessagesToGetAck.back().Message));
PendingToken.Clear();
return true;
}
Expand Down
20 changes: 17 additions & 3 deletions ydb/public/sdk/cpp/client/ydb_federated_topic/impl/federated_write_session.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,6 +62,20 @@ class TFederatedWriteSession : public NTopic::IWriteSession,

inline NTopic::TWriterCounters::TPtr GetCounters() override {Y_ABORT("Unimplemented"); } //ToDo - unimplemented;

private:

class TWrappedWriteMessage {
public:
const TString Data;
NTopic::TWriteMessage Message;
TWrappedWriteMessage(NTopic::TWriteMessage&& message)
: Data(message.Data)
, Message(std::move(message))
{
Message.Data = Data;
}
};

private:
void Start();
void OpenSubSessionImpl(std::shared_ptr<TDbInfo> db);
Expand All @@ -71,7 +85,7 @@ class TFederatedWriteSession : public NTopic::IWriteSession,
void OnFederatedStateUpdateImpl();
void ScheduleFederatedStateUpdateImpl(TDuration delay);

void WriteInternal(NTopic::TContinuationToken&&, NTopic::TWriteMessage&& message);
void WriteInternal(NTopic::TContinuationToken&&, TWrappedWriteMessage&& message);
bool PrepareDeferredWrite(TDeferredWrite& deferred);

void CloseImpl(EStatus statusCode, NYql::TIssues&& issues);
Expand Down Expand Up @@ -105,8 +119,8 @@ class TFederatedWriteSession : public NTopic::IWriteSession,

TMaybe<NTopic::TContinuationToken> PendingToken; // from Subsession
bool ClientHasToken = false;
std::deque<NTopic::TWriteMessage> OriginalMessagesToPassDown;
std::deque<NTopic::TWriteMessage> OriginalMessagesToGetAck;
std::deque<TWrappedWriteMessage> OriginalMessagesToPassDown;
std::deque<TWrappedWriteMessage> OriginalMessagesToGetAck;
i64 BufferFreeSpace;

// Exiting.
Expand Down
2 changes: 1 addition & 1 deletion ydb/public/sdk/cpp/client/ydb_topic/topic.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1602,7 +1602,7 @@ struct TWriteMessage {
}

//! Message body.
const TStringBuf Data;
TStringBuf Data;

//! Codec and original size for compressed message.
//! Do not specify or change these options directly, use CompressedMessage()
Expand Down