Skip to content

scan compilation has been fixed #15097

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 5 commits into from
Mar 8, 2025
Merged

scan compilation has been fixed #15097

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
79ee673
scan compilation has been fixed
dorooleg Feb 26, 2025
d5f1b22
cleanup
dorooleg Feb 28, 2025
a76e916
cleanup
dorooleg Mar 7, 2025
e0a9cdd
cleanup 2
dorooleg Mar 7, 2025
cb3f38a
one more useless improvement
dorooleg Mar 8, 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
16 changes: 11 additions & 5 deletions ydb/core/tx/program/program.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ const THashSet<ui32>& TProgramContainer::GetEarlyFilterColumns() const {
return Program->GetFilterColumns();
}

TConclusionStatus TProgramContainer::Init(const NArrow::NSSA::IColumnResolver& columnResolver, const NKikimrSSA::TProgram& programProto) {
TConclusionStatus TProgramContainer::Init(const NArrow::NSSA::IColumnResolver& columnResolver, const NKikimrSSA::TProgram& programProto) noexcept {
ProgramProto = programProto;
if (IS_DEBUG_LOG_ENABLED(NKikimrServices::TX_COLUMNSHARD)) {
TString out;
Expand All @@ -33,20 +33,26 @@ TConclusionStatus TProgramContainer::Init(const NArrow::NSSA::IColumnResolver& c
}

if (programProto.HasKernels()) {
KernelsRegistry.Parse(programProto.GetKernels());
try {
if (!KernelsRegistry.Parse(programProto.GetKernels())) {
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

если эта функция бросает exception, то оберни только ее в try catch, пожалуйста

return TConclusionStatus::Fail("Can't parse kernels");
}
} catch (...) {
AFL_ERROR(NKikimrServices::TX_COLUMNSHARD)("event", "program_parsed_error")("result", CurrentExceptionMessage());
return TConclusionStatus::Fail(TStringBuilder() << "Can't initialize program, exception thrown: " << CurrentExceptionMessage());
}
}

auto parseStatus = ParseProgram(columnResolver, programProto);
if (parseStatus.IsFail()) {
return parseStatus;
}
AFL_DEBUG(NKikimrServices::TX_COLUMNSHARD)("event", "program_parsed")("result", DebugString());

return TConclusionStatus::Success();
}

TConclusionStatus TProgramContainer::Init(
const NArrow::NSSA::IColumnResolver& columnResolver, const NKikimrSSA::TOlapProgram& olapProgramProto) {
const NArrow::NSSA::IColumnResolver& columnResolver, const NKikimrSSA::TOlapProgram& olapProgramProto) noexcept {
NKikimrSSA::TProgram programProto;
if (!programProto.ParseFromString(olapProgramProto.GetProgram())) {
return TConclusionStatus::Fail("Can't parse TProgram protobuf");
Expand Down Expand Up @@ -76,7 +82,7 @@ TConclusionStatus TProgramContainer::Init(
}

TConclusionStatus TProgramContainer::Init(
const NArrow::NSSA::IColumnResolver& columnResolver, NKikimrSchemeOp::EOlapProgramType programType, TString serializedProgram) {
const NArrow::NSSA::IColumnResolver& columnResolver, NKikimrSchemeOp::EOlapProgramType programType, TString serializedProgram) noexcept {
Y_ABORT_UNLESS(serializedProgram);
Y_ABORT_UNLESS(!OverrideProcessingColumnsVector);

Expand Down
6 changes: 3 additions & 3 deletions ydb/core/tx/program/program.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -74,9 +74,9 @@ class TProgramContainer {
}

[[nodiscard]] TConclusionStatus Init(
const NArrow::NSSA::IColumnResolver& columnResolver, NKikimrSchemeOp::EOlapProgramType programType, TString serializedProgram);
[[nodiscard]] TConclusionStatus Init(const NArrow::NSSA::IColumnResolver& columnResolver, const NKikimrSSA::TOlapProgram& olapProgramProto);
[[nodiscard]] TConclusionStatus Init(const NArrow::NSSA::IColumnResolver& columnResolver, const NKikimrSSA::TProgram& programProto);
const NArrow::NSSA::IColumnResolver& columnResolver, NKikimrSchemeOp::EOlapProgramType programType, TString serializedProgram) noexcept;
[[nodiscard]] TConclusionStatus Init(const NArrow::NSSA::IColumnResolver& columnResolver, const NKikimrSSA::TOlapProgram& olapProgramProto) noexcept;
[[nodiscard]] TConclusionStatus Init(const NArrow::NSSA::IColumnResolver& columnResolver, const NKikimrSSA::TProgram& programProto) noexcept;

const std::shared_ptr<NArrow::NSSA::TProgramChain>& GetChainVerified() const {
AFL_VERIFY(!!Program);
Expand Down
Loading