This is an automated email from the ASF dual-hosted git repository. morningman pushed a commit to branch revert-3577-SlotRef_toSql in repository https://gitbox.apache.org/repos/asf/incubator-doris.git
commit 8f9a4b5f8549487aaca5b9e9310fcd88179b296c Author: Mingyu Chen <[email protected]> AuthorDate: Mon May 18 12:47:47 2020 +0800 Revert "[Fix]SlotRef.tosql() is the same as the SQL returned by different sql" --- .../java/org/apache/doris/analysis/SlotRef.java | 9 ----- .../apache/doris/analysis/StmtRewriterTest.java | 39 ++++++---------------- 2 files changed, 10 insertions(+), 38 deletions(-) diff --git a/fe/src/main/java/org/apache/doris/analysis/SlotRef.java b/fe/src/main/java/org/apache/doris/analysis/SlotRef.java index 572be39..8f99bb0 100644 --- a/fe/src/main/java/org/apache/doris/analysis/SlotRef.java +++ b/fe/src/main/java/org/apache/doris/analysis/SlotRef.java @@ -162,15 +162,6 @@ public class SlotRef extends Expr { return tblName.toSql() + "." + label + sb.toString(); } else if (label != null) { return label + sb.toString(); - } else if (desc.getSourceExprs() != null) { - if (desc.getId().asInt() != 1) { - sb.append("<slot " + Integer.toString(desc.getId().asInt()) + ">"); - } - for (Expr expr : desc.getSourceExprs()) { - sb.append(" "); - sb.append(expr.toSql()); - } - return sb.toString(); } else { return "<slot " + Integer.toString(desc.getId().asInt()) + ">" + sb.toString(); } diff --git a/fe/src/test/java/org/apache/doris/analysis/StmtRewriterTest.java b/fe/src/test/java/org/apache/doris/analysis/StmtRewriterTest.java index 039a190..77e1d4b 100644 --- a/fe/src/test/java/org/apache/doris/analysis/StmtRewriterTest.java +++ b/fe/src/test/java/org/apache/doris/analysis/StmtRewriterTest.java @@ -21,8 +21,6 @@ import org.apache.doris.common.FeConstants; import org.apache.doris.utframe.DorisAssert; import org.apache.doris.utframe.UtFrameUtils; -import org.apache.logging.log4j.LogManager; -import org.apache.logging.log4j.Logger; import org.junit.AfterClass; import org.junit.BeforeClass; import org.junit.Test; @@ -30,7 +28,6 @@ import org.junit.Test; import java.util.UUID; public class StmtRewriterTest { - private static final Logger LOG = LogManager.getLogger(StmtRewriterTest.class); private static String baseDir = "fe"; private static String runningDir = baseDir + "/mocked/StmtRewriterTest/" @@ -152,9 +149,7 @@ public class StmtRewriterTest { String subquery = "select avg(salary) from " + TABLE_NAME; String query = "select empid, sum(salary) from " + TABLE_NAME + " group by empid having sum(salary) > (" + subquery + ");"; - LOG.info("EXPLAIN:{}", dorisAssert.query(query).explainQuery()); - dorisAssert.query(query).explainContains("CROSS JOIN", - "predicates: <slot 3> sum(`salary`) > <slot 8> avg(`salary`)"); + dorisAssert.query(query).explainContains("CROSS JOIN", "predicates: <slot 3> > <slot 8>"); } /** @@ -263,10 +258,8 @@ public class StmtRewriterTest { String subquery = "select avg(salary) from " + TABLE_NAME; String query = "select empid a, sum(salary) from " + TABLE_NAME + " group by empid having sum(salary) > (" + subquery + ") order by a;"; - LOG.info("EXPLAIN:{}", dorisAssert.query(query).explainQuery()); - dorisAssert.query(query).explainContains("CROSS JOIN", - "predicates: <slot 3> sum(`salary`) > <slot 8> avg(`salary`)", - "order by: <slot 10> `$a$1`.`$c$1` ASC"); + dorisAssert.query(query).explainContains("CROSS JOIN", "predicates: <slot 3> > <slot 8>", + "order by: <slot 10> ASC"); } /** @@ -375,12 +368,9 @@ public class StmtRewriterTest { String subquery = "select avg(salary) from " + TABLE_NAME; String query = "select empid a from " + TABLE_NAME + " group by empid having sum(salary) > (" + subquery + ") order by sum(salary);"; - LOG.info("EXPLAIN:{}", dorisAssert.query(query).explainQuery()); dorisAssert.query(query).explainContains("group by: `empid`", - "CROSS JOIN", - "predicates: <slot 3> sum(`salary`) > <slot 8> avg(`salary`)", - "order by: <slot 10> `$a$1`.`$c$2` ASC", - "OUTPUT EXPRS:<slot 11> `$a$1`.`$c$1`"); + "CROSS JOIN", "predicates: <slot 3> > <slot 8>", + "order by: <slot 10> ASC", "OUTPUT EXPRS:<slot 11>"); } /** @@ -490,12 +480,9 @@ public class StmtRewriterTest { String subquery = "select avg(salary) from " + TABLE_NAME; String query = "select empid a, sum(salary) b from " + TABLE_NAME + " group by a having b > (" + subquery + ") order by b;"; - LOG.info("EXPLAIN:{}", dorisAssert.query(query).explainQuery()); dorisAssert.query(query).explainContains("group by: `empid`", - "CROSS JOIN", - "predicates: <slot 3> sum(`salary`) > <slot 8> avg(`salary`)", - "order by: <slot 10> `$a$1`.`$c$2` ASC", - "OUTPUT EXPRS:<slot 11> `$a$1`.`$c$1` | <slot 10> `$a$1`.`$c$2`"); + "CROSS JOIN", "predicates: <slot 3> > <slot 8>", + "order by: <slot 10> ASC", "OUTPUT EXPRS:<slot 11> | <slot 10>"); } /** @@ -604,12 +591,9 @@ public class StmtRewriterTest { String subquery = "select avg(salary) from " + TABLE_NAME; String query = "select empid a, sum(salary) b from " + TABLE_NAME + " group by a having b > (" + subquery + ") order by b limit 100;"; - LOG.info("EXPLAIN:{}", dorisAssert.query(query).explainQuery()); dorisAssert.query(query).explainContains("group by: `empid`", - "CROSS JOIN", - "predicates: <slot 3> sum(`salary`) > <slot 8> avg(`salary`)", - "order by: <slot 10> `$a$1`.`$c$2` ASC", - "OUTPUT EXPRS:<slot 11> `$a$1`.`$c$1` | <slot 10> `$a$1`.`$c$2`"); + "CROSS JOIN", "predicates: <slot 3> > <slot 8>", + "order by: <slot 10> ASC", "OUTPUT EXPRS:<slot 11> | <slot 10>", "limit: 100"); } /** @@ -620,11 +604,8 @@ public class StmtRewriterTest { String subquery = "select avg(salary) from " + TABLE_NAME + " where empid between 1 and 2"; String query = "select empid a, sum(salary) b from " + TABLE_NAME + " group by a having b > (" + subquery + ");"; - LOG.info("EXPLAIN:{}", dorisAssert.query(query).explainQuery()); dorisAssert.query(query).explainContains( - "CROSS JOIN", - "predicates: <slot 3> sum(`salary`) > <slot 9> avg(`salary`)", - "PREDICATES: `empid` >= 1, `empid` <= 2"); + "CROSS JOIN", "predicates: <slot 3> > <slot 9>", "`empid` >= 1, `empid` <= 2"); } @AfterClass --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
