Skip to content

Commit 69e9910

Browse files
committed
remove optional from read_session_id field
1 parent e07d7bf commit 69e9910

File tree

2 files changed

+5
-5
lines changed

2 files changed

+5
-5
lines changed

ydb/public/api/protos/ydb_topic.proto

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -754,8 +754,8 @@ message CommitOffsetRequest {
754754
string consumer = 4;
755755
// Processed offset.
756756
int64 offset = 5;
757-
// Read session identifier.
758-
optional string read_session_id = 6;
757+
// Read session identifier from StreamRead RPC.
758+
string read_session_id = 6;
759759
}
760760

761761
// Commit offset response sent from server to client.

ydb/services/persqueue_v1/actors/commit_offset_actor.cpp

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -106,7 +106,7 @@ void TCommitOffsetActor::Handle(TEvPQProxy::TEvAuthResultOk::TPtr& ev, const TAc
106106
if (partitionNode->AllParents.size() == 0 && partitionNode->DirectChildren.size() == 0) {
107107
SendCommit(topicInitInfo, commitRequest, ctx);
108108
} else {
109-
auto killReadSession = !(commitRequest->has_read_session_id() && !commitRequest->read_session_id().empty());
109+
auto killReadSession = commitRequest->read_session_id().empty();
110110
std::vector<TDistributedCommitHelper::TCommitInfo> commits;
111111

112112
for (auto& parent: partitionNode->AllParents) {
@@ -121,7 +121,7 @@ void TCommitOffsetActor::Handle(TEvPQProxy::TEvAuthResultOk::TPtr& ev, const TAc
121121

122122
TDistributedCommitHelper::TCommitInfo commit {.PartitionId = partitionNode->Id, .Offset = commitRequest->offset(), .KillReadSession = killReadSession, .OnlyCheckCommitedToFinish = false};
123123

124-
if (commitRequest->has_read_session_id() && !commitRequest->read_session_id().empty()) {
124+
if (!commitRequest->read_session_id().empty()) {
125125
commit.ReadSessionId = commitRequest->read_session_id();
126126
}
127127
commits.push_back(commit);
@@ -200,7 +200,7 @@ void TCommitOffsetActor::SendCommit(const TTopicInitInfo& topic, const Ydb::Topi
200200
commit->SetClientId(ClientId);
201201
commit->SetOffset(commitRequest->offset());
202202
commit->SetStrict(true);
203-
if (commitRequest->has_read_session_id() && !commitRequest->read_session_id().empty()) {
203+
if (!commitRequest->read_session_id().empty()) {
204204
commit->SetSessionId(commitRequest->read_session_id());
205205
}
206206

0 commit comments

Comments
 (0)