Rename rootnames to root.names to ensure naming conflicts with user-s…

…pace variables do not happen.
substrait-io · Jun 24, 2023 · 6756799 · 6756799
1 parent d732de6
commit 6756799
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 10 deletions.
diff --git a/src/substrait/textplan/converter/InitialPlanProtoVisitor.cpp b/src/substrait/textplan/converter/InitialPlanProtoVisitor.cpp
@@ -19,7 +19,7 @@ namespace io::substrait::textplan {
 
 namespace {
 
-const std::string kRootNames{"rootnames"};
+const std::string kRootNames{"root.names"};
 
 std::string shortName(std::string str) {
  auto loc = str.find(':');

diff --git a/src/substrait/textplan/converter/tests/BinaryToTextPlanConversionTest.cpp b/src/substrait/textplan/converter/tests/BinaryToTextPlanConversionTest.cpp
@@ -148,7 +148,7 @@ std::vector<TestCase> getTestCases() {
  }
  })",
  AllOf(
- HasSymbols({"rootnames", "local", "read", "root"}),
+ HasSymbols({"root.names", "local", "read", "root"}),
  WhenSerialized(EqSquashingWhitespace(
  R"(pipelines {
  read -> root;
@@ -190,7 +190,7 @@ std::vector<TestCase> getTestCases() {
  })",
  AllOf(
  HasSymbols(
- {"rootnames",
+ {"root.names",
  "schema",
  "cost",
  "count",
@@ -408,7 +408,7 @@ std::vector<TestCase> getTestCases() {
  }
  })",
  AllOf(
- HasSymbols({"rootnames", "filter", "root"}),
+ HasSymbols({"root.names", "filter", "root"}),
  WhenSerialized(EqSquashingWhitespace(
  R"(pipelines {
  filter -> root;
@@ -461,7 +461,7 @@ std::vector<TestCase> getTestCases() {
  }
  })",
  AllOf(
- HasSymbols({"rootnames", "filter", "root"}),
+ HasSymbols({"root.names", "filter", "root"}),
  WhenSerialized(EqSquashingWhitespace(
  R"(pipelines {
  filter -> root;
@@ -533,7 +533,7 @@ std::vector<TestCase> getTestCases() {
  }
  })",
  AllOf(
- HasSymbols({"rootnames", "filter", "root"}),
+ HasSymbols({"root.names", "filter", "root"}),
  WhenSerialized(EqSquashingWhitespace(
  R"(pipelines {
  filter -> root;
@@ -546,20 +546,20 @@ std::vector<TestCase> getTestCases() {
  {
  "single three node pipeline",
  "relations: { root: { input: { project: { input { read: { local_files {} } } } } } }",
- HasSymbols({"rootnames", "local", "read", "project", "root"}),
+ HasSymbols({"root.names", "local", "read", "project", "root"}),
  },
  {
  "two identical three node pipelines",
  "relations: { root: { input: { project: { input { read: { local_files {} } } } } } }"
  "relations: { root: { input: { project: { input { read: { local_files {} } } } } } }",
  AllOf(
  HasSymbols(
- {"rootnames",
+ {"root.names",
  "local",
  "read",
  "project",
  "root",
- "rootnames2",
+ "root.names2",
  "local2",
  "read2",
  "project2",
@@ -575,7 +575,7 @@ std::vector<TestCase> getTestCases() {
  "relations: { root: { input: { hash_join: { left { read: { local_files {} } } right { read: { local_files {} } } } } } }",
  AllOf(
  HasSymbols(
- {"rootnames",
+ {"root.names",
  "local",
  "read",
  "local2",