feat: fields, schemas, and sources binary output for the textplan par…

…ser (#66)

* Fields are now emitted in expressions completing expression handling.
    * Schemas and sources are also now implemented.
* Removes projection as a relation detail in favor of expression for
project relations.

src/substrait/textplan/Location.cpp

@@ -52,16 +52,16 @@ bool std::less<::io::substrait::textplan::Location>::operator()(
  const ::io::substrait::textplan::Location& rhs) const noexcept {
  if (std::holds_alternative<antlr4::ParserRuleContext*>(lhs.loc_)) {
  if (!std::holds_alternative<antlr4::ParserRuleContext*>(rhs.loc_)) {
- // This alternative is always less than the remaining choices.
+ // This alternative is always less than the other location types.
  return true;
  }
  return std::get<antlr4::ParserRuleContext*>(lhs.loc_) <
  std::get<antlr4::ParserRuleContext*>(rhs.loc_);
  } else if (std::holds_alternative<const google::protobuf::Message*>(
  lhs.loc_)) {
  if (!std::holds_alternative<const google::protobuf::Message*>(rhs.loc_)) {
- // This alternative is always less than the remaining (zero) choices.
- return true;
+ // This alternative is always more than the other location types.
+ return false;
  }
  return std::get<const google::protobuf::Message*>(lhs.loc_) <
  std::get<const google::protobuf::Message*>(rhs.loc_);

src/substrait/textplan/Location.h

@@ -31,6 +31,10 @@ class Location {
  protected:
  friend bool operator==(const Location& c1, const Location& c2);
 
+ friend bool operator!=(const Location& c1, const Location& c2) {
+ return !(c1 == c2);
+ }
+
  private:
  friend std::hash<Location>;
  friend std::less<Location>;

src/substrait/textplan/StructuredSymbolData.h

@@ -6,7 +6,6 @@
 #include <optional>
 
 #include "substrait/proto/algebra.pb.h"
-#include "substrait/textplan/Location.h"
 
 namespace io::substrait::textplan {
 

src/substrait/textplan/converter/tests/BinaryToTextPlanConversionTest.cpp

@@ -2,13 +2,17 @@
 
 #include <gmock/gmock-matchers.h>
 #include <gtest/gtest.h>
+#include <protobuf-matchers/protocol-buffer-matchers.h>
 
 #include "substrait/textplan/converter/LoadBinary.h"
 #include "substrait/textplan/converter/ParseBinary.h"
 #include "substrait/textplan/tests/ParseResultMatchers.h"
 
 namespace io::substrait::textplan {
 
+using ::protobuf_matchers::EqualsProto;
+using ::protobuf_matchers::Partially;
+using ::testing::AllOf;
 using ::testing::Eq;
 
 namespace {
@@ -158,7 +162,13 @@ std::vector<TestCase> getTestCases() {
  items = [
  {uri_file: "/mock_lineitem.orc" start: 0 length: 3719 orc: {}}
  ]
- })"))),
+ })")),
+ AsBinaryPlan(EqualsProto<::substrait::proto::Plan>(
+ R"(relations { root { input { read {
+ local_files
+ { items { uri_file: "/mock_lineitem.orc" length: 3719 orc { } } }
+ }
+ } } })"))),
  },
  {
  "read named table",

src/substrait/textplan/converter/tests/CMakeLists.txt

@@ -8,6 +8,7 @@ add_test_case(
  substrait_textplan_converter
  substrait_common
  parse_result_matchers
+ protobuf-matchers
  gmock
  gtest
  gtest_main)

src/substrait/textplan/parser/SubstraitPlanPipelineVisitor.cpp

@@ -36,7 +36,7 @@ bool continuingPipelineContains(
 void SubstraitPlanPipelineVisitor::updateRelationSymbol(
  SubstraitPlanParser::PipelineContext* ctx,
  const std::string& relationName) {
- const auto& symbol = symbolTable_->lookupSymbolByName(relationName);
+ const auto* symbol = symbolTable_->lookupSymbolByName(relationName);
  if (symbol == nullptr) {
  // This is a reference to a missing relation so we create a stub for it.
  auto relationData = std::make_shared<RelationData>();
@@ -78,7 +78,7 @@ std::any SubstraitPlanPipelineVisitor::visitPipeline(
  }
 
  // Refetch our symbol table entry to make sure we have the latest version.
- auto symbol = symbolTable_->lookupSymbolByName(relationName);
+ auto* symbol = symbolTable_->lookupSymbolByName(relationName);
  auto relationData = ANY_CAST(std::shared_ptr<RelationData>, symbol->blob);
 
  // Check for accidental cross-pipeline use.