From 07fc31658e4b2a1469a7e39d7b6f5d8ab94f0a6e Mon Sep 17 00:00:00 2001 From: David Sisson Date: Wed, 5 Jul 2023 00:44:54 -0700 Subject: [PATCH] Ran clang tidy. --- src/substrait/textplan/StringManipulation.cpp | 2 +- src/substrait/textplan/StringManipulation.h | 2 +- src/substrait/textplan/converter/PlanPrinterVisitor.cpp | 9 +++++---- src/substrait/textplan/parser/SubstraitPlanVisitor.cpp | 6 +++++- src/substrait/textplan/tests/RoundtripTest.cpp | 5 +---- 5 files changed, 13 insertions(+), 11 deletions(-) diff --git a/src/substrait/textplan/StringManipulation.cpp b/src/substrait/textplan/StringManipulation.cpp index b0d30ed3..eac3c56a 100644 --- a/src/substrait/textplan/StringManipulation.cpp +++ b/src/substrait/textplan/StringManipulation.cpp @@ -16,4 +16,4 @@ bool endsWith(std::string_view haystack, std::string_view needle) { haystack.substr(haystack.size() - needle.size(), needle.size()) == needle; } -} // namespace io::substrait::textplan +} // namespace io::substrait::textplan diff --git a/src/substrait/textplan/StringManipulation.h b/src/substrait/textplan/StringManipulation.h index e91f42f5..9c24418f 100644 --- a/src/substrait/textplan/StringManipulation.h +++ b/src/substrait/textplan/StringManipulation.h @@ -12,4 +12,4 @@ bool startsWith(std::string_view haystack, std::string_view needle); // Returns true if the string 'haystack' ends with the string 'needle'. bool endsWith(std::string_view haystack, std::string_view needle); -} // namespace io::substrait::textplan +} // namespace io::substrait::textplan diff --git a/src/substrait/textplan/converter/PlanPrinterVisitor.cpp b/src/substrait/textplan/converter/PlanPrinterVisitor.cpp index a6b6c156..c95eb90f 100644 --- a/src/substrait/textplan/converter/PlanPrinterVisitor.cpp +++ b/src/substrait/textplan/converter/PlanPrinterVisitor.cpp @@ -760,10 +760,10 @@ std::any PlanPrinterVisitor::visitReadRelation( return ""; } - auto mainSymbol = symbolTable_->lookupSymbolByLocationAndType(PROTO_LOCATION(relation), SymbolType::kRelation); + auto mainSymbol = symbolTable_->lookupSymbolByLocationAndType( + PROTO_LOCATION(relation), SymbolType::kRelation); - auto symbols = symbolTable_->lookupSymbolsByLocation( - PROTO_LOCATION(*msg)); + auto symbols = symbolTable_->lookupSymbolsByLocation(PROTO_LOCATION(*msg)); if (!symbols.empty()) { text << " source " << symbols[0]->name << ";\n"; } @@ -826,7 +826,8 @@ std::any PlanPrinterVisitor::visitAggregateRelation( } for (const auto& measure : relation.measures()) { if (!measure.has_measure()) { - errorListener_->addError("Encountered aggregate measure without a measure function."); + errorListener_->addError( + "Encountered aggregate measure without a measure function."); continue; } text << " measure {\n"; diff --git a/src/substrait/textplan/parser/SubstraitPlanVisitor.cpp b/src/substrait/textplan/parser/SubstraitPlanVisitor.cpp index 740de74f..a5a756a6 100644 --- a/src/substrait/textplan/parser/SubstraitPlanVisitor.cpp +++ b/src/substrait/textplan/parser/SubstraitPlanVisitor.cpp @@ -254,7 +254,11 @@ std::any SubstraitPlanVisitor::visitRoot_relation( names.push_back(id->getText()); } symbolTable_->defineSymbol( - kRootNames, Location(ctx), SymbolType::kRoot, SourceType::kUnknown, names); + kRootNames, + Location(ctx), + SymbolType::kRoot, + SourceType::kUnknown, + names); return nullptr; } diff --git a/src/substrait/textplan/tests/RoundtripTest.cpp b/src/substrait/textplan/tests/RoundtripTest.cpp index e8ebd128..d1d71685 100644 --- a/src/substrait/textplan/tests/RoundtripTest.cpp +++ b/src/substrait/textplan/tests/RoundtripTest.cpp @@ -97,10 +97,7 @@ TEST_P(RoundTripBinaryToTextFixture, RoundTrip) { ASSERT_THAT( result, ::testing::AllOf( - ParsesOk(), - HasErrors({}), - AsBinaryPlan( - EqualsProto(normalizedPlan)))) + ParsesOk(), HasErrors({}), AsBinaryPlan(EqualsProto(normalizedPlan)))) << std::endl << "Intermediate result:" << std::endl << addLineNumbers(outputText) << std::endl