database/doris
2
0
Fork 0
Code Issues Pull Requests Actions 3 Packages Projects Releases Wiki Activity

Revert "[Fix]SlotRef.tosql() is the same as the SQL returned by different sql" (#3610)

Browse Source 
This revert is used to correct the mess of the commit
timeline caused by the wrong merge method.
This commit is contained in:
Mingyu Chen
2020-05-18 13:07:21 +08:00
committed by GitHub
parent 20f20239f2
commit 539efb3532
2 changed files with 10 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files

39
fe/src/test/java/org/apache/doris/analysis/StmtRewriterTest.java
View File

@ -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