Rename __row_number__ for chart to _row_number_chart_

yuancu · yuancu · commit befede183b63 · 2025-11-04T14:15:29.000+08:00
Signed-off-by: Yuanchun Shen &lt;yuanchu@amazon.com&gt;
diff --git a/core/src/main/java/org/opensearch/sql/calcite/CalciteRelNodeVisitor.java b/core/src/main/java/org/opensearch/sql/calcite/CalciteRelNodeVisitor.java
@@ -2459,7 +2459,6 @@ public RelNode visitChart(Chart node, CalcitePlanContext context) {
 
     // Always set it to null last so that it does not interfere with top / bottom calculation
     grandTotal = relBuilder.nullsLast(grandTotal);
-    final String ROW_NUM_COL = "__row_number__";
     RexNode rowNum =
         PlanUtils.makeOver(
             context,
@@ -2469,7 +2468,7 @@ public RelNode visitChart(Chart node, CalcitePlanContext context) {
             List.of(),
             List.of(grandTotal),
             WindowFrame.toCurrentRow());
-    relBuilder.projectPlus(relBuilder.alias(rowNum, ROW_NUM_COL));
+    relBuilder.projectPlus(relBuilder.alias(rowNum, PlanUtils.ROW_NUMBER_COLUMN_FOR_CHART));
     RelNode ranked = relBuilder.build();
 
     relBuilder.push(aggregated);
@@ -2483,7 +2482,7 @@ public RelNode visitChart(Chart node, CalcitePlanContext context) {
     RexNode lteCondition =
         relBuilder.call(
             SqlStdOperatorTable.LESS_THAN_OR_EQUAL,
-            relBuilder.field(ROW_NUM_COL),
+            relBuilder.field(PlanUtils.ROW_NUMBER_COLUMN_FOR_CHART),
             relBuilder.literal(limit));
     if (!config.useOther) {
       relBuilder.filter(lteCondition);
diff --git a/core/src/main/java/org/opensearch/sql/calcite/utils/PlanUtils.java b/core/src/main/java/org/opensearch/sql/calcite/utils/PlanUtils.java
@@ -66,6 +66,7 @@ public interface PlanUtils {
   String ROW_NUMBER_COLUMN_FOR_MAIN = "_row_number_main_";
   String ROW_NUMBER_COLUMN_FOR_SUBSEARCH = "_row_number_subsearch_";
   String ROW_NUMBER_COLUMN_FOR_STREAMSTATS = "__stream_seq__";
+  String ROW_NUMBER_COLUMN_FOR_CHART = "_row_number_chart_";
 
   static SpanUnit intervalUnitToSpanUnit(IntervalUnit unit) {
     return switch (unit) {
diff --git a/integ-test/src/test/resources/expectedOutput/calcite/explain_chart_multiple_group_keys.yaml b/integ-test/src/test/resources/expectedOutput/calcite/explain_chart_multiple_group_keys.yaml
@@ -8,7 +8,7 @@ calcite:
               LogicalAggregate(group=[{0, 1}], avg(balance)=[AVG($2)])
                 LogicalProject(gender=[$4], age=[$10], balance=[$7])
                   CalciteLogicalIndexScan(table=[[OpenSearch, opensearch-sql_test_index_bank]])
-            LogicalProject(age=[$0], __grand_total__=[$1], __row_number__=[ROW_NUMBER() OVER (ORDER BY $1 DESC NULLS LAST)])
+            LogicalProject(age=[$0], __grand_total__=[$1], _row_number_chart_=[ROW_NUMBER() OVER (ORDER BY $1 DESC NULLS LAST)])
               LogicalAggregate(group=[{0}], __grand_total__=[AVG($1)])
                 LogicalFilter(condition=[IS NOT NULL($0)])
                   LogicalProject(age=[SAFE_CAST($1)], avg(balance)=[$2])
diff --git a/integ-test/src/test/resources/expectedOutput/calcite/explain_chart_null_str.yaml b/integ-test/src/test/resources/expectedOutput/calcite/explain_chart_null_str.yaml
@@ -8,7 +8,7 @@ calcite:
               LogicalAggregate(group=[{0, 2}], avg(balance)=[AVG($1)])
                 LogicalProject(gender=[$4], balance=[$3], age0=[SPAN($5, 10, null:NULL)])
                   CalciteLogicalIndexScan(table=[[OpenSearch, opensearch-sql_test_index_bank_with_null_values]])
-            LogicalProject(age=[$0], __grand_total__=[$1], __row_number__=[ROW_NUMBER() OVER (ORDER BY $1 DESC NULLS LAST)])
+            LogicalProject(age=[$0], __grand_total__=[$1], _row_number_chart_=[ROW_NUMBER() OVER (ORDER BY $1 DESC NULLS LAST)])
               LogicalAggregate(group=[{0}], __grand_total__=[AVG($1)])
                 LogicalFilter(condition=[IS NOT NULL($0)])
                   LogicalProject(age=[SAFE_CAST($1)], avg(balance)=[$2])
diff --git a/integ-test/src/test/resources/expectedOutput/calcite/explain_chart_timestamp_span.yaml b/integ-test/src/test/resources/expectedOutput/calcite/explain_chart_timestamp_span.yaml
@@ -8,7 +8,7 @@ calcite:
               LogicalAggregate(group=[{0, 2}], max(value)=[MAX($1)])
                 LogicalProject(category=[$1], value=[$2], timestamp0=[SPAN($3, 1, 'w')])
                   CalciteLogicalIndexScan(table=[[OpenSearch, opensearch-sql_test_index_time_data]])
-            LogicalProject(category=[$0], __grand_total__=[$1], __row_number__=[ROW_NUMBER() OVER (ORDER BY $1 DESC NULLS LAST)])
+            LogicalProject(category=[$0], __grand_total__=[$1], _row_number_chart_=[ROW_NUMBER() OVER (ORDER BY $1 DESC NULLS LAST)])
               LogicalAggregate(group=[{0}], __grand_total__=[MAX($1)])
                 LogicalFilter(condition=[IS NOT NULL($0)])
                   LogicalProject(category=[$0], max(value)=[$2])
diff --git a/integ-test/src/test/resources/expectedOutput/calcite/explain_chart_use_other.yaml b/integ-test/src/test/resources/expectedOutput/calcite/explain_chart_use_other.yaml
@@ -7,7 +7,7 @@ calcite:
             LogicalAggregate(group=[{0, 1}], max(severityNumber)=[MAX($2)])
               LogicalProject(flags=[$23], severityText=[$7], severityNumber=[$163])
                 CalciteLogicalIndexScan(table=[[OpenSearch, opensearch-sql_test_index_otel_logs]])
-            LogicalProject(severityText=[$0], __grand_total__=[$1], __row_number__=[ROW_NUMBER() OVER (ORDER BY $1 DESC NULLS LAST)])
+            LogicalProject(severityText=[$0], __grand_total__=[$1], _row_number_chart_=[ROW_NUMBER() OVER (ORDER BY $1 DESC NULLS LAST)])
               LogicalAggregate(group=[{0}], __grand_total__=[MAX($1)])
                 LogicalFilter(condition=[IS NOT NULL($0)])
                   LogicalProject(severityText=[$1], max(severityNumber)=[$2])
diff --git a/integ-test/src/test/resources/expectedOutput/calcite_no_pushdown/explain_chart_multiple_group_keys.yaml b/integ-test/src/test/resources/expectedOutput/calcite_no_pushdown/explain_chart_multiple_group_keys.yaml
@@ -8,7 +8,7 @@ calcite:
               LogicalAggregate(group=[{0, 1}], avg(balance)=[AVG($2)])
                 LogicalProject(gender=[$4], age=[$10], balance=[$7])
                   CalciteLogicalIndexScan(table=[[OpenSearch, opensearch-sql_test_index_bank]])
-            LogicalProject(age=[$0], __grand_total__=[$1], __row_number__=[ROW_NUMBER() OVER (ORDER BY $1 DESC NULLS LAST)])
+            LogicalProject(age=[$0], __grand_total__=[$1], _row_number_chart_=[ROW_NUMBER() OVER (ORDER BY $1 DESC NULLS LAST)])
               LogicalAggregate(group=[{0}], __grand_total__=[AVG($1)])
                 LogicalFilter(condition=[IS NOT NULL($0)])
                   LogicalProject(age=[SAFE_CAST($1)], avg(balance)=[$2])
diff --git a/integ-test/src/test/resources/expectedOutput/calcite_no_pushdown/explain_chart_multiple_groups.yaml b/integ-test/src/test/resources/expectedOutput/calcite_no_pushdown/explain_chart_multiple_groups.yaml
@@ -7,7 +7,7 @@ logical: |
             LogicalAggregate(group=[{0, 1}], avg(balance)=[AVG($2)])
               LogicalProject(gender=[$4], age=[$10], balance=[$7])
                 CalciteLogicalIndexScan(table=[[OpenSearch, opensearch-sql_test_index_bank]])
-          LogicalProject(age=[$0], __grand_total__=[$1], __row_number__=[ROW_NUMBER() OVER (ORDER BY $1 DESC NULLS LAST)])
+          LogicalProject(age=[$0], __grand_total__=[$1], _row_number_chart_=[ROW_NUMBER() OVER (ORDER BY $1 DESC NULLS LAST)])
             LogicalAggregate(group=[{1}], __grand_total__=[AVG($0)])
               LogicalProject(avg(balance)=[$2], age=[SAFE_CAST($1)])
                 LogicalAggregate(group=[{0, 1}], avg(balance)=[AVG($2)])
diff --git a/integ-test/src/test/resources/expectedOutput/calcite_no_pushdown/explain_chart_null_str.yaml b/integ-test/src/test/resources/expectedOutput/calcite_no_pushdown/explain_chart_null_str.yaml
@@ -8,7 +8,7 @@ calcite:
               LogicalAggregate(group=[{0, 2}], avg(balance)=[AVG($1)])
                 LogicalProject(gender=[$4], balance=[$3], age0=[SPAN($5, 10, null:NULL)])
                   CalciteLogicalIndexScan(table=[[OpenSearch, opensearch-sql_test_index_bank_with_null_values]])
-            LogicalProject(age=[$0], __grand_total__=[$1], __row_number__=[ROW_NUMBER() OVER (ORDER BY $1 DESC NULLS LAST)])
+            LogicalProject(age=[$0], __grand_total__=[$1], _row_number_chart_=[ROW_NUMBER() OVER (ORDER BY $1 DESC NULLS LAST)])
               LogicalAggregate(group=[{0}], __grand_total__=[AVG($1)])
                 LogicalFilter(condition=[IS NOT NULL($0)])
                   LogicalProject(age=[SAFE_CAST($1)], avg(balance)=[$2])
diff --git a/integ-test/src/test/resources/expectedOutput/calcite_no_pushdown/explain_chart_timestamp_span.yaml b/integ-test/src/test/resources/expectedOutput/calcite_no_pushdown/explain_chart_timestamp_span.yaml
@@ -8,7 +8,7 @@ calcite:
               LogicalAggregate(group=[{0, 2}], max(value)=[MAX($1)])
                 LogicalProject(category=[$1], value=[$2], timestamp0=[SPAN($3, 1, 'w')])
                   CalciteLogicalIndexScan(table=[[OpenSearch, opensearch-sql_test_index_time_data]])
-            LogicalProject(category=[$0], __grand_total__=[$1], __row_number__=[ROW_NUMBER() OVER (ORDER BY $1 DESC NULLS LAST)])
+            LogicalProject(category=[$0], __grand_total__=[$1], _row_number_chart_=[ROW_NUMBER() OVER (ORDER BY $1 DESC NULLS LAST)])
               LogicalAggregate(group=[{0}], __grand_total__=[MAX($1)])
                 LogicalFilter(condition=[IS NOT NULL($0)])
                   LogicalProject(category=[$0], max(value)=[$2])
diff --git a/integ-test/src/test/resources/expectedOutput/calcite_no_pushdown/explain_chart_use_other.yaml b/integ-test/src/test/resources/expectedOutput/calcite_no_pushdown/explain_chart_use_other.yaml
@@ -7,7 +7,7 @@ calcite:
             LogicalAggregate(group=[{0, 1}], max(severityNumber)=[MAX($2)])
               LogicalProject(flags=[$23], severityText=[$7], severityNumber=[$163])
                 CalciteLogicalIndexScan(table=[[OpenSearch, opensearch-sql_test_index_otel_logs]])
-            LogicalProject(severityText=[$0], __grand_total__=[$1], __row_number__=[ROW_NUMBER() OVER (ORDER BY $1 DESC NULLS LAST)])
+            LogicalProject(severityText=[$0], __grand_total__=[$1], _row_number_chart_=[ROW_NUMBER() OVER (ORDER BY $1 DESC NULLS LAST)])
               LogicalAggregate(group=[{0}], __grand_total__=[MAX($1)])
                 LogicalFilter(condition=[IS NOT NULL($0)])
                   LogicalProject(severityText=[$1], max(severityNumber)=[$2])
diff --git a/integ-test/src/test/resources/expectedOutput/calcite_no_pushdown/explain_timechart.yaml b/integ-test/src/test/resources/expectedOutput/calcite_no_pushdown/explain_timechart.yaml
@@ -2,15 +2,15 @@ calcite:
   logical: |
     LogicalSystemLimit(sort0=[$0], sort1=[$1], dir0=[ASC], dir1=[ASC], fetch=[10000], type=[QUERY_SIZE_LIMIT])
       LogicalSort(sort0=[$0], sort1=[$1], dir0=[ASC], dir1=[ASC])
-        LogicalAggregate(group=[{0, 1}], avg(cpu_usage)=[SUM($2)])
+        LogicalAggregate(group=[{0, 1}], avg(cpu_usage)=[AVG($2)])
           LogicalProject(@timestamp=[$0], host=[CASE(IS NOT NULL($3), $1, CASE(IS NULL($1), null:NULL, 'OTHER'))], avg(cpu_usage)=[$2])
             LogicalJoin(condition=[=($1, $3)], joinType=[left])
               LogicalProject(@timestamp=[$1], host=[$0], $f2=[$2])
                 LogicalAggregate(group=[{0, 2}], agg#0=[AVG($1)])
                   LogicalProject(host=[$4], cpu_usage=[$7], $f3=[SPAN($1, 1, 'm')])
                     CalciteLogicalIndexScan(table=[[OpenSearch, events]])
               LogicalSort(sort0=[$1], dir0=[DESC], fetch=[10])
-                LogicalAggregate(group=[{1}], grand_total=[SUM($2)])
+                LogicalAggregate(group=[{1}], grand_total=[AVG($2)])
                   LogicalFilter(condition=[IS NOT NULL($1)])
                     LogicalProject(@timestamp=[$1], host=[$0], $f2=[$2])
                       LogicalAggregate(group=[{0, 2}], agg#0=[AVG($1)])
@@ -19,19 +19,21 @@ calcite:
   physical: |
     EnumerableLimit(fetch=[10000])
       EnumerableSort(sort0=[$0], sort1=[$1], dir0=[ASC], dir1=[ASC])
-        EnumerableAggregate(group=[{0, 1}], avg(cpu_usage)=[SUM($2)])
-          EnumerableCalc(expr#0..4=[{inputs}], expr#5=[IS NOT NULL($t3)], expr#6=[IS NULL($t1)], expr#7=[null:NULL], expr#8=['OTHER'], expr#9=[CASE($t6, $t7, $t8)], expr#10=[CASE($t5, $t1, $t9)], @timestamp=[$t0], host=[$t10], avg(cpu_usage)=[$t2])
-            EnumerableMergeJoin(condition=[=($1, $3)], joinType=[left])
-              EnumerableSort(sort0=[$1], dir0=[ASC])
-                EnumerableCalc(expr#0..3=[{inputs}], expr#4=[0], expr#5=[=($t3, $t4)], expr#6=[null:DOUBLE], expr#7=[CASE($t5, $t6, $t2)], expr#8=[/($t7, $t3)], @timestamp=[$t1], host=[$t0], $f2=[$t8])
-                  EnumerableAggregate(group=[{0, 2}], agg#0=[$SUM0($1)], agg#1=[COUNT($1)])
-                    EnumerableCalc(expr#0..15=[{inputs}], expr#16=[1], expr#17=['m'], expr#18=[SPAN($t1, $t16, $t17)], host=[$t4], cpu_usage=[$t7], $f3=[$t18])
-                      CalciteEnumerableIndexScan(table=[[OpenSearch, events]])
-              EnumerableSort(sort0=[$0], dir0=[ASC])
-                EnumerableLimit(fetch=[10])
-                  EnumerableSort(sort0=[$1], dir0=[DESC])
-                    EnumerableAggregate(group=[{0}], grand_total=[SUM($2)])
-                      EnumerableCalc(expr#0..3=[{inputs}], expr#4=[0], expr#5=[=($t3, $t4)], expr#6=[null:DOUBLE], expr#7=[CASE($t5, $t6, $t2)], expr#8=[/($t7, $t3)], expr#9=[IS NOT NULL($t0)], proj#0..1=[{exprs}], $f2=[$t8], $condition=[$t9])
-                        EnumerableAggregate(group=[{0, 2}], agg#0=[$SUM0($1)], agg#1=[COUNT($1)])
-                          EnumerableCalc(expr#0..15=[{inputs}], expr#16=[1], expr#17=['m'], expr#18=[SPAN($t1, $t16, $t17)], host=[$t4], cpu_usage=[$t7], $f3=[$t18])
-                            CalciteEnumerableIndexScan(table=[[OpenSearch, events]])
+        EnumerableCalc(expr#0..3=[{inputs}], expr#4=[0], expr#5=[=($t3, $t4)], expr#6=[null:DOUBLE], expr#7=[CASE($t5, $t6, $t2)], expr#8=[/($t7, $t3)], proj#0..1=[{exprs}], avg(cpu_usage)=[$t8])
+          EnumerableAggregate(group=[{0, 1}], agg#0=[$SUM0($2)], agg#1=[COUNT($2)])
+            EnumerableCalc(expr#0..4=[{inputs}], expr#5=[IS NOT NULL($t3)], expr#6=[IS NULL($t1)], expr#7=[null:NULL], expr#8=['OTHER'], expr#9=[CASE($t6, $t7, $t8)], expr#10=[CASE($t5, $t1, $t9)], @timestamp=[$t0], host=[$t10], avg(cpu_usage)=[$t2])
+              EnumerableMergeJoin(condition=[=($1, $3)], joinType=[left])
+                EnumerableSort(sort0=[$1], dir0=[ASC])
+                  EnumerableCalc(expr#0..3=[{inputs}], expr#4=[0], expr#5=[=($t3, $t4)], expr#6=[null:DOUBLE], expr#7=[CASE($t5, $t6, $t2)], expr#8=[/($t7, $t3)], @timestamp=[$t1], host=[$t0], $f2=[$t8])
+                    EnumerableAggregate(group=[{0, 2}], agg#0=[$SUM0($1)], agg#1=[COUNT($1)])
+                      EnumerableCalc(expr#0..15=[{inputs}], expr#16=[1], expr#17=['m'], expr#18=[SPAN($t1, $t16, $t17)], host=[$t4], cpu_usage=[$t7], $f3=[$t18])
+                        CalciteEnumerableIndexScan(table=[[OpenSearch, events]])
+                EnumerableSort(sort0=[$0], dir0=[ASC])
+                  EnumerableLimit(fetch=[10])
+                    EnumerableSort(sort0=[$1], dir0=[DESC])
+                      EnumerableCalc(expr#0..2=[{inputs}], expr#3=[0], expr#4=[=($t2, $t3)], expr#5=[null:DOUBLE], expr#6=[CASE($t4, $t5, $t1)], expr#7=[/($t6, $t2)], host=[$t0], grand_total=[$t7])
+                        EnumerableAggregate(group=[{0}], agg#0=[$SUM0($2)], agg#1=[COUNT($2)])
+                          EnumerableCalc(expr#0..3=[{inputs}], expr#4=[0], expr#5=[=($t3, $t4)], expr#6=[null:DOUBLE], expr#7=[CASE($t5, $t6, $t2)], expr#8=[/($t7, $t3)], expr#9=[IS NOT NULL($t0)], proj#0..1=[{exprs}], $f2=[$t8], $condition=[$t9])
+                            EnumerableAggregate(group=[{0, 2}], agg#0=[$SUM0($1)], agg#1=[COUNT($1)])
+                              EnumerableCalc(expr#0..15=[{inputs}], expr#16=[1], expr#17=['m'], expr#18=[SPAN($t1, $t16, $t17)], host=[$t4], cpu_usage=[$t7], $f3=[$t18])
+                                CalciteEnumerableIndexScan(table=[[OpenSearch, events]])
diff --git a/ppl/src/test/java/org/opensearch/sql/ppl/calcite/CalcitePPLChartTest.java b/ppl/src/test/java/org/opensearch/sql/ppl/calcite/CalcitePPLChartTest.java
@@ -104,22 +104,22 @@ public void testChartWithMultipleGroupKeys() {
 
     RelNode root = getRelNode(ppl);
     String expectedSparkSql =
-        "SELECT `t1`.`gender`, CASE WHEN `t1`.`age` IS NULL THEN 'NULL' WHEN `t7`.`__row_number__`"
-            + " <= 10 THEN `t1`.`age` ELSE 'OTHER' END `age`, AVG(`t1`.`avg(balance)`)"
-            + " `avg(balance)`\n"
+        "SELECT `t1`.`gender`, CASE WHEN `t1`.`age` IS NULL THEN 'NULL' WHEN"
+            + " `t7`.`_row_number_chart_` <= 10 THEN `t1`.`age` ELSE 'OTHER' END `age`,"
+            + " AVG(`t1`.`avg(balance)`) `avg(balance)`\n"
             + "FROM (SELECT `gender`, SAFE_CAST(`age` AS STRING) `age`, AVG(`balance`)"
             + " `avg(balance)`\n"
             + "FROM `scott`.`bank`\n"
             + "GROUP BY `gender`, `age`) `t1`\n"
             + "LEFT JOIN (SELECT `age`, AVG(`avg(balance)`) `__grand_total__`, ROW_NUMBER() OVER"
-            + " (ORDER BY AVG(`avg(balance)`) DESC) `__row_number__`\n"
+            + " (ORDER BY AVG(`avg(balance)`) DESC) `_row_number_chart_`\n"
             + "FROM (SELECT SAFE_CAST(`age` AS STRING) `age`, AVG(`balance`) `avg(balance)`\n"
             + "FROM `scott`.`bank`\n"
             + "GROUP BY `gender`, `age`) `t4`\n"
             + "WHERE `age` IS NOT NULL\n"
             + "GROUP BY `age`) `t7` ON `t1`.`age` = `t7`.`age`\n"
             + "GROUP BY `t1`.`gender`, CASE WHEN `t1`.`age` IS NULL THEN 'NULL' WHEN"
-            + " `t7`.`__row_number__` <= 10 THEN `t1`.`age` ELSE 'OTHER' END";
+            + " `t7`.`_row_number_chart_` <= 10 THEN `t1`.`age` ELSE 'OTHER' END";
     verifyPPLToSparkSQL(root, expectedSparkSql);
   }
 
@@ -129,22 +129,22 @@ public void testChartWithMultipleGroupKeysAlternativeSyntax() {
 
     RelNode root = getRelNode(ppl);
     String expectedSparkSql =
-        "SELECT `t1`.`gender`, CASE WHEN `t1`.`age` IS NULL THEN 'NULL' WHEN `t7`.`__row_number__`"
-            + " <= 10 THEN `t1`.`age` ELSE 'OTHER' END `age`, AVG(`t1`.`avg(balance)`)"
-            + " `avg(balance)`\n"
+        "SELECT `t1`.`gender`, CASE WHEN `t1`.`age` IS NULL THEN 'NULL' WHEN"
+            + " `t7`.`_row_number_chart_` <= 10 THEN `t1`.`age` ELSE 'OTHER' END `age`,"
+            + " AVG(`t1`.`avg(balance)`) `avg(balance)`\n"
             + "FROM (SELECT `gender`, SAFE_CAST(`age` AS STRING) `age`, AVG(`balance`)"
             + " `avg(balance)`\n"
             + "FROM `scott`.`bank`\n"
             + "GROUP BY `gender`, `age`) `t1`\n"
             + "LEFT JOIN (SELECT `age`, AVG(`avg(balance)`) `__grand_total__`, ROW_NUMBER() OVER"
-            + " (ORDER BY AVG(`avg(balance)`) DESC) `__row_number__`\n"
+            + " (ORDER BY AVG(`avg(balance)`) DESC) `_row_number_chart_`\n"
             + "FROM (SELECT SAFE_CAST(`age` AS STRING) `age`, AVG(`balance`) `avg(balance)`\n"
             + "FROM `scott`.`bank`\n"
             + "GROUP BY `gender`, `age`) `t4`\n"
             + "WHERE `age` IS NOT NULL\n"
             + "GROUP BY `age`) `t7` ON `t1`.`age` = `t7`.`age`\n"
             + "GROUP BY `t1`.`gender`, CASE WHEN `t1`.`age` IS NULL THEN 'NULL' WHEN"
-            + " `t7`.`__row_number__` <= 10 THEN `t1`.`age` ELSE 'OTHER' END";
+            + " `t7`.`_row_number_chart_` <= 10 THEN `t1`.`age` ELSE 'OTHER' END";
     verifyPPLToSparkSQL(root, expectedSparkSql);
   }
 
@@ -191,21 +191,21 @@ public void testChartWithTimeSpan() {
     RelNode root = getRelNode(ppl);
     String expectedSparkSql =
         "SELECT `t1`.`timestamp`, CASE WHEN `t1`.`category` IS NULL THEN 'NULL' WHEN"
-            + " `t7`.`__row_number__` <= 10 THEN `t1`.`category` ELSE 'OTHER' END `category`,"
+            + " `t7`.`_row_number_chart_` <= 10 THEN `t1`.`category` ELSE 'OTHER' END `category`,"
             + " MAX(`t1`.`max(value)`) `max(value)`\n"
             + "FROM (SELECT `SPAN`(`timestamp`, 1, 'w') `timestamp`, `category`, MAX(`value`)"
             + " `max(value)`\n"
             + "FROM `scott`.`time_data`\n"
             + "GROUP BY `category`, `SPAN`(`timestamp`, 1, 'w')) `t1`\n"
             + "LEFT JOIN (SELECT `category`, MAX(`max(value)`) `__grand_total__`, ROW_NUMBER() OVER"
-            + " (ORDER BY MAX(`max(value)`) DESC) `__row_number__`\n"
+            + " (ORDER BY MAX(`max(value)`) DESC) `_row_number_chart_`\n"
             + "FROM (SELECT `category`, MAX(`value`) `max(value)`\n"
             + "FROM `scott`.`time_data`\n"
             + "GROUP BY `category`, `SPAN`(`timestamp`, 1, 'w')) `t4`\n"
             + "WHERE `category` IS NOT NULL\n"
             + "GROUP BY `category`) `t7` ON `t1`.`category` = `t7`.`category`\n"
             + "GROUP BY `t1`.`timestamp`, CASE WHEN `t1`.`category` IS NULL THEN 'NULL' WHEN"
-            + " `t7`.`__row_number__` <= 10 THEN `t1`.`category` ELSE 'OTHER' END";
+            + " `t7`.`_row_number_chart_` <= 10 THEN `t1`.`category` ELSE 'OTHER' END";
     verifyPPLToSparkSQL(root, expectedSparkSql);
   }
 
