From d285618aa70442ee333d40af53f85c1029e561c8 Mon Sep 17 00:00:00 2001 From: David Sisson Date: Wed, 21 Jun 2023 00:14:05 -0700 Subject: [PATCH] Minor fixes. --- src/substrait/textplan/converter/CMakeLists.txt | 9 +++------ .../converter/tests/BinaryToTextPlanConversionTest.cpp | 8 ++++---- src/substrait/textplan/tests/RoundtripTest.cpp | 4 +--- 3 files changed, 8 insertions(+), 13 deletions(-) diff --git a/src/substrait/textplan/converter/CMakeLists.txt b/src/substrait/textplan/converter/CMakeLists.txt index 86caf620..41f3b9ce 100644 --- a/src/substrait/textplan/converter/CMakeLists.txt +++ b/src/substrait/textplan/converter/CMakeLists.txt @@ -33,12 +33,9 @@ add_executable(planconverter Tool.cpp) target_link_libraries(planconverter substrait_textplan_converter) -set(NORMALIZER_SRCS - ReferenceNormalizer.cpp - ReferenceNormalizer.h) +set(NORMALIZER_SRCS ReferenceNormalizer.cpp ReferenceNormalizer.h) add_library(substrait_textplan_normalizer ${NORMALIZER_SRCS}) -target_link_libraries( - substrait_textplan_normalizer - substrait_textplan_converter) +target_link_libraries(substrait_textplan_normalizer + substrait_textplan_converter) diff --git a/src/substrait/textplan/converter/tests/BinaryToTextPlanConversionTest.cpp b/src/substrait/textplan/converter/tests/BinaryToTextPlanConversionTest.cpp index 9bc1f689..8bcf1cca 100644 --- a/src/substrait/textplan/converter/tests/BinaryToTextPlanConversionTest.cpp +++ b/src/substrait/textplan/converter/tests/BinaryToTextPlanConversionTest.cpp @@ -119,13 +119,13 @@ std::vector getTestCases() { })", WhenSerialized(EqSquashingWhitespace( R"(extension_space { - function lte:fp64_fp64 as lte; - function sum:fp64_fp64 as sum; - function lt:fp64_fp64 as lt; - function is_not_null:fp64 as is_not_null; function and:bool_bool as and; function gte:fp64_fp64 as gte; + function is_not_null:fp64 as is_not_null; + function lt:fp64_fp64 as lt; + function lte:fp64_fp64 as lte; function multiply:opt_fp64_fp64 as multiply; + function sum:fp64_fp64 as sum; })")), }, { diff --git a/src/substrait/textplan/tests/RoundtripTest.cpp b/src/substrait/textplan/tests/RoundtripTest.cpp index c5190b65..1766e132 100644 --- a/src/substrait/textplan/tests/RoundtripTest.cpp +++ b/src/substrait/textplan/tests/RoundtripTest.cpp @@ -86,9 +86,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);