From 5d0e14907c11d3dcb367b17e31dae016af50bc94 Mon Sep 17 00:00:00 2001 From: David Sisson Date: Wed, 13 Mar 2024 17:14:39 -0700 Subject: [PATCH] Rejiggered dependencies. --- src/substrait/textplan/CMakeLists.txt | 6 +++-- .../{converter => }/PlanPrinterVisitor.cpp | 2 +- .../{converter => }/PlanPrinterVisitor.h | 0 src/substrait/textplan/SymbolTablePrinter.cpp | 2 +- .../textplan/converter/CMakeLists.txt | 22 +++++++++++++------ .../textplan/converter/ParseBinary.cpp | 2 +- src/substrait/textplan/tests/CMakeLists.txt | 2 +- 7 files changed, 23 insertions(+), 13 deletions(-) rename src/substrait/textplan/{converter => }/PlanPrinterVisitor.cpp (99%) rename src/substrait/textplan/{converter => }/PlanPrinterVisitor.h (100%) diff --git a/src/substrait/textplan/CMakeLists.txt b/src/substrait/textplan/CMakeLists.txt index adf01edb..cd11f4e8 100644 --- a/src/substrait/textplan/CMakeLists.txt +++ b/src/substrait/textplan/CMakeLists.txt @@ -7,6 +7,8 @@ add_library( symbol_table Location.cpp Location.h + PlanPrinterVisitor.cpp + PlanPrinterVisitor.h StringManipulation.cpp StringManipulation.h SymbolTable.cpp @@ -23,8 +25,8 @@ add_library(parse_result ParseResult.cpp ParseResult.h) add_dependencies(symbol_table substrait_proto substrait_common absl::strings fmt::fmt-header-only) -target_link_libraries(symbol_table substrait_proto substrait_common - absl::strings fmt::fmt-header-only ) +target_link_libraries(symbol_table substrait_base_proto_visitor substrait_proto substrait_common substrait_expression + absl::strings fmt::fmt-header-only date::date) # Provide access to the generated protobuffer headers hierarchy. target_include_directories(symbol_table diff --git a/src/substrait/textplan/converter/PlanPrinterVisitor.cpp b/src/substrait/textplan/PlanPrinterVisitor.cpp similarity index 99% rename from src/substrait/textplan/converter/PlanPrinterVisitor.cpp rename to src/substrait/textplan/PlanPrinterVisitor.cpp index 8187c067..e94e0eff 100644 --- a/src/substrait/textplan/converter/PlanPrinterVisitor.cpp +++ b/src/substrait/textplan/PlanPrinterVisitor.cpp @@ -1,6 +1,6 @@ /* SPDX-License-Identifier: Apache-2.0 */ -#include "substrait/textplan/converter/PlanPrinterVisitor.h" +#include "substrait/textplan/PlanPrinterVisitor.h" #include #include diff --git a/src/substrait/textplan/converter/PlanPrinterVisitor.h b/src/substrait/textplan/PlanPrinterVisitor.h similarity index 100% rename from src/substrait/textplan/converter/PlanPrinterVisitor.h rename to src/substrait/textplan/PlanPrinterVisitor.h diff --git a/src/substrait/textplan/SymbolTablePrinter.cpp b/src/substrait/textplan/SymbolTablePrinter.cpp index 71beb275..cdd3e8c9 100644 --- a/src/substrait/textplan/SymbolTablePrinter.cpp +++ b/src/substrait/textplan/SymbolTablePrinter.cpp @@ -8,9 +8,9 @@ #include "substrait/common/Exceptions.h" #include "substrait/proto/algebra.pb.h" #include "substrait/textplan/Any.h" +#include "substrait/textplan/PlanPrinterVisitor.h" #include "substrait/textplan/StructuredSymbolData.h" #include "substrait/textplan/SymbolTable.h" -#include "substrait/textplan/converter/PlanPrinterVisitor.h" namespace io::substrait::textplan { diff --git a/src/substrait/textplan/converter/CMakeLists.txt b/src/substrait/textplan/converter/CMakeLists.txt index f328f81d..d9a18316 100644 --- a/src/substrait/textplan/converter/CMakeLists.txt +++ b/src/substrait/textplan/converter/CMakeLists.txt @@ -5,12 +5,8 @@ include(../../../../third_party/datetime.cmake) set(TEXTPLAN_SRCS InitialPlanProtoVisitor.cpp InitialPlanProtoVisitor.h - BasePlanProtoVisitor.cpp - BasePlanProtoVisitor.h PipelineVisitor.cpp PipelineVisitor.h - PlanPrinterVisitor.cpp - PlanPrinterVisitor.h LoadBinary.cpp LoadBinary.h SaveBinary.cpp @@ -18,16 +14,28 @@ set(TEXTPLAN_SRCS ParseBinary.cpp ParseBinary.h) +add_library(substrait_base_proto_visitor + BasePlanProtoVisitor.cpp + BasePlanProtoVisitor.h) + +target_link_libraries( + substrait_base_proto_visitor + substrait_common + substrait_proto + error_listener + fmt::fmt-header-only + absl::status + absl::statusor) + add_library(substrait_textplan_converter ${TEXTPLAN_SRCS}) target_link_libraries( substrait_textplan_converter + substrait_base_proto_visitor substrait_common - substrait_expression substrait_proto symbol_table error_listener - date::date fmt::fmt-header-only absl::status absl::statusor) @@ -38,7 +46,7 @@ endif() add_executable(planconverter Tool.cpp) -target_link_libraries(planconverter substrait_textplan_converter) +target_link_libraries(planconverter substrait_textplan_converter substrait_io) set(NORMALIZER_SRCS ReferenceNormalizer.cpp ReferenceNormalizer.h) diff --git a/src/substrait/textplan/converter/ParseBinary.cpp b/src/substrait/textplan/converter/ParseBinary.cpp index 0611757c..b5e9242f 100644 --- a/src/substrait/textplan/converter/ParseBinary.cpp +++ b/src/substrait/textplan/converter/ParseBinary.cpp @@ -3,9 +3,9 @@ #include "substrait/textplan/converter/ParseBinary.h" #include "substrait/proto/plan.pb.h" +#include "substrait/textplan/PlanPrinterVisitor.h" #include "substrait/textplan/converter/InitialPlanProtoVisitor.h" #include "substrait/textplan/converter/PipelineVisitor.h" -#include "substrait/textplan/converter/PlanPrinterVisitor.h" namespace io::substrait::textplan { diff --git a/src/substrait/textplan/tests/CMakeLists.txt b/src/substrait/textplan/tests/CMakeLists.txt index 116ec4e7..a3325421 100644 --- a/src/substrait/textplan/tests/CMakeLists.txt +++ b/src/substrait/textplan/tests/CMakeLists.txt @@ -4,7 +4,7 @@ add_library(parse_result_matchers ParseResultMatchers.cpp ParseResultMatchers.h) add_dependencies(parse_result_matchers parse_result) -target_link_libraries(parse_result_matchers parse_result substrait_proto gmock) +target_link_libraries(parse_result_matchers parse_result symbol_table substrait_proto gmock) add_test_case( symbol_table_test