Skip to content
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

YQ-3838 Skip filtering if already processed #11734

Merged
merged 2 commits into from
Nov 20, 2024
+9 −5
Merged

YQ-3838 Skip filtering if already processed #11734

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
faf2ee1
Skip filtering
kardymonds Nov 19, 2024
b010a58
remove trace
kardymonds Nov 19, 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
6 changes: 5 additions & 1 deletion ydb/core/fq/libs/row_dispatcher/topic_session.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -672,9 +672,13 @@ void TTopicSession::DoFiltering(ui64 rowsOffset, ui64 numberRows, const TVector<
Y_ENSURE(rowsOffset < offsets.size(), "Invalid first row ofset");
Y_ENSURE(numberRows, "Expected non empty parsed batch");
Y_ENSURE(parsedValues, "Expected non empty schema");
LOG_ROW_DISPATCHER_TRACE("SendToFiltering, first offset: " << offsets[rowsOffset] << ", last offset: " << offsets[rowsOffset + numberRows - 1]);
auto lastOffset = offsets[rowsOffset + numberRows - 1];
LOG_ROW_DISPATCHER_TRACE("SendToFiltering, first offset: " << offsets[rowsOffset] << ", last offset: " << lastOffset);

for (auto& [actorId, info] : Clients) {
if (info.NextMessageOffset && lastOffset < info.NextMessageOffset) { // the batch has already been processed
continue;
}
try {
if (info.Filter) {
info.Filter->Push(offsets, RebuildJson(info, parsedValues), rowsOffset, numberRows);
Expand Down
8 changes: 4 additions & 4 deletions ydb/core/fq/libs/row_dispatcher/ut/topic_session_ut.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -332,7 +332,7 @@ Y_UNIT_TEST_SUITE(TopicSessionTests) {
auto source = BuildSource(topicName);
StartSession(ReadActorId1, source);

const std::vector<TString> data = { Json1, Json2 }; // offset 0, 1
const std::vector<TString> data = { Json1, Json2, Json3 }; // offset 0, 1, 2
PQWrite(data, topicName);
ExpectNewDataArrived({ReadActorId1});
ExpectMessageBatch(ReadActorId1, data);
Expand All @@ -341,11 +341,11 @@ Y_UNIT_TEST_SUITE(TopicSessionTests) {
StartSession(ReadActorId2, source, 1);
ExpectNewDataArrived({ReadActorId2});

PQWrite({ Json3 }, topicName);
PQWrite({ Json4 }, topicName);
ExpectNewDataArrived({ReadActorId1});

ExpectMessageBatch(ReadActorId1, { Json3 });
ExpectMessageBatch(ReadActorId2, { Json2, Json3 });
ExpectMessageBatch(ReadActorId1, { Json4 });
ExpectMessageBatch(ReadActorId2, { Json2, Json3, Json4 });

StopSession(ReadActorId1, source);
StopSession(ReadActorId2, source);
Expand Down
Loading