Skip to content

row dispatcher/format_handler: restore compatibility #27705

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
Oct 28, 2025
Merged

row dispatcher/format_handler: restore compatibility #27705

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
278e7d6
row dispatcher/format_handler: restore compatibility
yumkam Oct 27, 2025
ebaf7e2
fix review
yumkam Oct 28, 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
6 changes: 5 additions & 1 deletion ydb/core/fq/libs/row_dispatcher/format_handler/filters/purecalc_filter.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -432,14 +432,18 @@ class TProgramRunHandler final : public IProgramRunHandler, public TNonCopyable
static constexpr std::string_view LogPrefix = "GenerateSql: ";

const auto& settings = consumer-> GetPurecalcSettings();
const auto& filterExpr = consumer->GetFilterExpr();
auto filterExpr = TStringBuf(consumer->GetFilterExpr());
const auto& watermarkExpr = consumer->GetWatermarkExpr();

if (!filterExpr && !watermarkExpr) {
LOG_ROW_DISPATCHER_TRACE("No sql was generated");
return {};
}

if (filterExpr.starts_with("WHERE "sv)) { // workaround for YQ-4827
filterExpr = filterExpr.substr("WHERE "sv.size());
}

using namespace fmt::literals;
auto result = fmt::format(
R"sql(
Expand Down
2 changes: 1 addition & 1 deletion ydb/core/fq/libs/row_dispatcher/format_handler/ut/topic_filter_ut.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -329,7 +329,7 @@ Y_UNIT_TEST_SUITE(TestPurecalcFilter) {
auto consumer = MakeConsumer(
{{"a1", "[DataType; String]"}, {"a2", "[DataType; Uint64]"}, {"a@3", "[OptionalType; [DataType; String]]"}},
"",
"a2 > 100",
"WHERE a2 > 100", // combined test for backward compatibility YQ-4827
[&](ui64 offset, bool filter, TMaybe<ui64> watermark) {
offsets.push_back(offset);
filters.push_back(filter);
Expand Down
Loading