fixes

Author: MBkkt

axiom/optimizer/DerivedTablePrinter.cpp

@@ -66,7 +66,7 @@ std::string tableName(PlanObjectCP table) {
 std::string visitBaseTable(const BaseTable& table) {
   std::stringstream out;
   out << table.cname << ": " << columnNames(table.columns) << std::endl;
-  out << "  table: " << table.schemaTable->name << std::endl;
+  out << "  table: " << table.schemaTable->name() << std::endl;
   if (!table.columnFilters.empty()) {
     out << "  single-column filters: " << conjunctsToString(table.columnFilters)
         << std::endl;

axiom/optimizer/OptimizerOptions.h

@@ -63,7 +63,7 @@ struct OptimizerOptions {
   /// TODO Make this work for non-inner joins.
   bool syntacticJoinOrder = false;
 
-  bool isMapAsStruct(const char* table, const char* column) const {
+  bool isMapAsStruct(std::string_view table, std::string_view column) const {
     if (allMapsAsStruct) {
       return true;
     }

axiom/optimizer/QueryGraph.cpp

@@ -204,7 +204,7 @@ BitSet BaseTable::columnSubfields(
 std::string BaseTable::toString() const {
   std::stringstream out;
   out << "{" << PlanObject::toString();
-  out << schemaTable->name << " " << cname << "}";
+  out << schemaTable->name() << " " << cname << "}";
   return out.str();
 }
 
@@ -285,9 +285,9 @@ std::pair<std::string, bool> JoinEdge::sampleKey() const {
     return leftString[l] < leftString[r];
   });
   auto left =
-      fmt::format("{} ", leftTable_->as<BaseTable>()->schemaTable->name);
+      fmt::format("{} ", leftTable_->as<BaseTable>()->schemaTable->name());
   auto right =
-      fmt::format("{} ", rightTable_->as<BaseTable>()->schemaTable->name);
+      fmt::format("{} ", rightTable_->as<BaseTable>()->schemaTable->name());
   for (auto i : indices) {
     left += leftKeys_[i]->toString() + " ";
     right += rightKeys_[i]->toString() + " ";

axiom/optimizer/RelationOp.cpp

@@ -257,7 +257,7 @@ const QGString& TableScan::historyKey() const {
     return key_;
   }
   std::stringstream out;
-  out << "scan " << baseTable->schemaTable->name << "(";
+  out << "scan " << baseTable->schemaTable->name() << "(";
   auto* opt = queryCtx()->optimization();
   velox::ScopedVarSetter cnames(&opt->cnamesInExpr(), false);
   for (auto& key : keys) {
@@ -285,7 +285,7 @@ std::string TableScan::toString(bool /*recursive*/, bool detail) const {
     out << input()->toString(true, detail);
     out << " *I " << joinTypeLabel(joinType);
   }
-  out << baseTable->schemaTable->name << " " << baseTable->cname;
+  out << baseTable->schemaTable->name() << " " << baseTable->cname;
   if (detail) {
     printCost(detail, out);
     if (!input()) {

axiom/optimizer/Schema.cpp

@@ -83,7 +83,7 @@ SchemaTableCP Schema::findTable(
     return nullptr;
   }
 
-  auto* schemaTable = make<SchemaTable>(*connectorTable, internedName);
+  auto* schemaTable = make<SchemaTable>(*connectorTable);
   auto& schemaColumns = schemaTable->columns;
 
   auto& tableColumns = connectorTable->columnMap();

axiom/optimizer/Schema.h

@@ -258,9 +258,8 @@ float baseSelectivity(PlanObjectCP object);
 /// partitioned physical representations (ColumnGroups). Not all ColumnGroups
 /// (aka indices) need to contain all columns.
 struct SchemaTable {
-  explicit SchemaTable(const connector::Table& connectorTable, Name name)
+  explicit SchemaTable(const connector::Table& connectorTable)
       : connectorTable{&connectorTable},
-        name{name},
         cardinality{static_cast<float>(connectorTable.numRows())} {}
 
   ColumnGroupCP addIndex(
@@ -281,11 +280,14 @@ struct SchemaTable {
   /// equality constraint.
   IndexInfo indexByColumns(CPSpan<Column> columns) const;
 
+  const std::string& name() const {
+    return connectorTable->name();
+  }
+
   // Table description from external schema.
   // This is the source-dependent representation from which 'this' was created.
-  const connector::Table* connectorTable;
+  const connector::Table* const connectorTable;
 
-  const Name name;
   const float cardinality;
 
   // Lookup from name to column.

axiom/optimizer/ToGraph.cpp

@@ -1325,7 +1325,7 @@ PlanObjectP ToGraph::makeBaseTable(const lp::TableScanNode& tableScan) {
         if (!allPaths.empty()) {
           trace(OptimizerOptions::kPreprocess, [&]() {
             std::cout << "Subfields: " << baseTable->cname << "."
-                      << baseTable->schemaTable->name << " " << column->name()
+                      << baseTable->schemaTable->name() << " " << column->name()
                       << ":" << allPaths.size() << std::endl;
           });
           makeSubfieldColumns(baseTable, column, allPaths);

axiom/optimizer/ToVelox.cpp

@@ -89,7 +89,7 @@ std::vector<velox::common::Subfield> columnSubfields(
           }
           if (first &&
               optimization->options().isMapAsStruct(
-                  table->schemaTable->name, columnName)) {
+                  table->schemaTable->name(), columnName)) {
             elements.push_back(
                 std::make_unique<velox::common::Subfield::NestedField>(
                     step.field ? std::string(step.field)
@@ -394,7 +394,7 @@ velox::core::TypedExprPtr ToVelox::pathToGetter(
     auto* rel = column->relation();
     if (rel->is(PlanType::kTableNode) &&
         isMapAsStruct(
-            rel->as<BaseTable>()->schemaTable->name, column->name())) {
+            rel->as<BaseTable>()->schemaTable->name(), column->name())) {
       // This column is a map to project out as struct.
       newStep.kind = StepKind::kField;
       if (step.field) {
@@ -935,7 +935,7 @@ velox::RowTypePtr ToVelox::subfieldPushdownScanType(
       top.add(topColumn);
       topColumns.push_back(topColumn);
       names.push_back(topColumn->name());
-      if (isMapAsStruct(baseTable->schemaTable->name, topColumn->name())) {
+      if (isMapAsStruct(baseTable->schemaTable->name(), topColumn->name())) {
         types.push_back(skylineStruct(baseTable, topColumn));
         typeMap[topColumn] = types.back();
       } else {

axiom/optimizer/ToVelox.h

@@ -103,7 +103,7 @@ class ToVelox {
 
   /// True if a scan should expose 'column' of 'table' as a struct only
   /// containing the accessed keys. 'column' must be a top level map column.
-  bool isMapAsStruct(Name table, Name column) {
+  bool isMapAsStruct(std::string_view table, std::string_view column) {
     return optimizerOptions_.isMapAsStruct(table, column);
   }