Skip to content

Commit

Permalink
fix
Browse files Browse the repository at this point in the history
  • Loading branch information
@Caideyipi
Caideyipi committed Aug 12, 2024
1 parent eafcad6 commit e48461a
Show file tree
Hide file tree
Showing 2 changed files with 19 additions and 19 deletions.
10 changes: 5 additions & 5 deletions ...ava/org/apache/iotdb/db/queryengine/plan/relational/analyzer/LimitOffsetPushDownTest.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,7 @@ public class LimitOffsetPushDownTest {
public void noOrderByTest() {
sql = "SELECT time, tag3, cast(s2 AS double) FROM table1 where s1>1 offset 5 limit 10";
context = new MPPQueryContext(sql, queryId, sessionInfo, null, null);
actualAnalysis = analyzeSQL(sql, metadata);
actualAnalysis = analyzeSQL(sql, metadata, context);
logicalQueryPlan =
new LogicalPlanner(context, metadata, sessionInfo, WarningCollector.NOOP)
.plan(actualAnalysis);
Expand Down Expand Up @@ -109,7 +109,7 @@ public void orderByAllTagsTest() {
sql =
"SELECT time, tag3, cast(s2 AS double) FROM table1 where s1>1 order by tag2 desc, tag1 asc, attr1 desc, tag3 desc, time desc, s1+s3 asc offset 5 limit 10";
context = new MPPQueryContext(sql, queryId, sessionInfo, null, null);
actualAnalysis = analyzeSQL(sql, metadata);
actualAnalysis = analyzeSQL(sql, metadata, context);
logicalQueryPlan =
new LogicalPlanner(context, metadata, sessionInfo, WarningCollector.NOOP)
.plan(actualAnalysis);
Expand Down Expand Up @@ -149,7 +149,7 @@ public void orderBySomeTagsTest() {
sql =
"SELECT time, tag3, cast(s2 AS double) FROM table1 where s1>1 order by tag2 desc, attr1 desc, tag3 desc, time desc, s1+s3 asc offset 5 limit 10";
context = new MPPQueryContext(sql, queryId, sessionInfo, null, null);
actualAnalysis = analyzeSQL(sql, metadata);
actualAnalysis = analyzeSQL(sql, metadata, context);
logicalQueryPlan =
new LogicalPlanner(context, metadata, sessionInfo, WarningCollector.NOOP)
.plan(actualAnalysis);
Expand Down Expand Up @@ -190,7 +190,7 @@ public void orderByTimeTest() {
sql =
"SELECT time, tag3, cast(s2 AS double) FROM table1 where s1>1 order by time desc, tag2 asc, s1+s3 asc offset 5 limit 10";
context = new MPPQueryContext(sql, queryId, sessionInfo, null, null);
actualAnalysis = analyzeSQL(sql, metadata);
actualAnalysis = analyzeSQL(sql, metadata, context);
logicalQueryPlan =
new LogicalPlanner(context, metadata, sessionInfo, WarningCollector.NOOP)
.plan(actualAnalysis);
Expand Down Expand Up @@ -230,7 +230,7 @@ public void orderByOthersTest() {
sql =
"SELECT time, tag3, cast(s2 AS double) FROM table1 where s1>1 order by s1 desc, tag2 desc, attr1 desc, tag3 desc, time desc, s1+s3 asc offset 5 limit 10";
context = new MPPQueryContext(sql, queryId, sessionInfo, null, null);
actualAnalysis = analyzeSQL(sql, metadata);
actualAnalysis = analyzeSQL(sql, metadata, context);
logicalQueryPlan =
new LogicalPlanner(context, metadata, sessionInfo, WarningCollector.NOOP)
.plan(actualAnalysis);
Expand Down
28 changes: 14 additions & 14 deletions ...node/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/analyzer/SortTest.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -100,7 +100,7 @@ public void someIDColumnTimeOthersSortTest() {
"SELECT time, tag3, tag1, cast(s2 as double), s2+s3, attr1 FROM table1 "
+ "where s1>1 and s1+s3>0 and cast(s1 as double)>1.0 order by tag2 desc, tag3 asc, time desc, s1+s2 desc offset 5 limit 10";
context = new MPPQueryContext(sql, queryId, sessionInfo, null, null);
actualAnalysis = analyzeSQL(sql, metadata);
actualAnalysis = analyzeSQL(sql, metadata, context);
logicalQueryPlan =
new LogicalPlanner(context, metadata, sessionInfo, warningCollector).plan(actualAnalysis);
rootNode = logicalQueryPlan.getRootNode();
Expand Down Expand Up @@ -176,7 +176,7 @@ public void someIDColumnTimeOthersSortTest() {

sql = "SELECT * FROM table1 order by tag2 desc, tag3 asc offset 5 limit 10";
context = new MPPQueryContext(sql, queryId, sessionInfo, null, null);
actualAnalysis = analyzeSQL(sql, metadata);
actualAnalysis = analyzeSQL(sql, metadata, context);
logicalQueryPlan =
new LogicalPlanner(context, metadata, sessionInfo, warningCollector).plan(actualAnalysis);
rootNode = logicalQueryPlan.getRootNode();
Expand All @@ -202,7 +202,7 @@ public void allIDColumnTimeSortWithLimitTest() {
"SELECT time, tag3, tag1, cast(s2 as double), s2+s3, attr1 FROM table1 "
+ "where s1>1 and s1+s3>0 and cast(s1 as double)>1.0 order by tag2 desc, tag1 desc, tag3 asc, time desc, s1+s2 desc offset 5 limit 10";
context = new MPPQueryContext(sql, queryId, sessionInfo, null, null);
actualAnalysis = analyzeSQL(sql, metadata);
actualAnalysis = analyzeSQL(sql, metadata, context);
logicalQueryPlan =
new LogicalPlanner(context, metadata, sessionInfo, warningCollector).plan(actualAnalysis);
rootNode = logicalQueryPlan.getRootNode();
Expand Down Expand Up @@ -280,7 +280,7 @@ public void allIDColumnTimeSortNoLimitTest() {
"SELECT time, tag3, tag1, cast(s2 as double), s2+s3, attr1 FROM table1 "
+ "where s1>1 and s1+s3>0 and cast(s1 as double)>1.0 order by tag2 desc, tag1 desc, tag3 asc, time desc, s1+s2 desc";
context = new MPPQueryContext(sql, queryId, sessionInfo, null, null);
actualAnalysis = analyzeSQL(sql, metadata);
actualAnalysis = analyzeSQL(sql, metadata, context);
logicalQueryPlan =
new LogicalPlanner(context, metadata, sessionInfo, warningCollector).plan(actualAnalysis);
rootNode = logicalQueryPlan.getRootNode();
Expand Down Expand Up @@ -348,7 +348,7 @@ public void someIDColumnOthersTimeSortTest() {
"SELECT time, tag3, tag1, cast(s2 as double), s2+s3, attr1 FROM table1 "
+ "where s1>1 and s1+s3>0 and cast(s1 as double)>1.0 order by tag2 desc, tag1 desc, s1+s2 desc, time desc offset 5 limit 10";
context = new MPPQueryContext(sql, queryId, sessionInfo, null, null);
actualAnalysis = analyzeSQL(sql, metadata);
actualAnalysis = analyzeSQL(sql, metadata, context);
logicalQueryPlan =
new LogicalPlanner(context, metadata, sessionInfo, warningCollector).plan(actualAnalysis);
rootNode = logicalQueryPlan.getRootNode();
Expand Down Expand Up @@ -428,7 +428,7 @@ public void allIDColumnOthersTimeSortTest() {
"SELECT time, tag3, tag1, cast(s2 as double), s2+s3, attr1 FROM table1 "
+ "where s1>1 and s1+s3>0 and cast(s1 as double)>1.0 order by tag2 desc, tag1 desc, tag3 asc, s1+s2 desc, time desc offset 5 limit 10";
context = new MPPQueryContext(sql, queryId, sessionInfo, null, null);
actualAnalysis = analyzeSQL(sql, metadata);
actualAnalysis = analyzeSQL(sql, metadata, context);
logicalQueryPlan =
new LogicalPlanner(context, metadata, sessionInfo, warningCollector).plan(actualAnalysis);
rootNode = logicalQueryPlan.getRootNode();
Expand Down Expand Up @@ -506,7 +506,7 @@ public void orderByTimeTest() {
sql =
"SELECT time, tag3, tag1, cast(s2 as double), s2+s3, attr1 FROM table1 order by time desc, tag2 asc, tag3 desc, s1+s2 desc offset 5 limit 10";
context = new MPPQueryContext(sql, queryId, sessionInfo, null, null);
actualAnalysis = analyzeSQL(sql, metadata);
actualAnalysis = analyzeSQL(sql, metadata, context);
logicalQueryPlan =
new LogicalPlanner(context, metadata, sessionInfo, warningCollector).plan(actualAnalysis);
rootNode = logicalQueryPlan.getRootNode();
Expand All @@ -518,7 +518,7 @@ public void orderByTimeTest() {
"SELECT time, tag3, substring(tag1, 1), cast(s2 as double), s2+s3, attr1 FROM table1 "
+ "where s1>1 and s1+s3>0 and cast(s1 as double)>1.0 order by time desc, s1+s2 asc, tag2 asc, tag1 desc offset 5 limit 10";
context = new MPPQueryContext(sql, queryId, sessionInfo, null, null);
actualAnalysis = analyzeSQL(sql, metadata);
actualAnalysis = analyzeSQL(sql, metadata, context);
logicalQueryPlan =
new LogicalPlanner(context, metadata, sessionInfo, warningCollector).plan(actualAnalysis);
rootNode = logicalQueryPlan.getRootNode();
Expand All @@ -529,7 +529,7 @@ public void orderByTimeTest() {
"SELECT time, tag3, tag1, cast(s2 as double), s2+s3, attr1 FROM table1 "
+ "where s1>1 and s1+s3>0 and cast(s1 as double)>1.0 order by time desc, s1+s2 asc, tag2 asc, tag3 desc, tag1 desc offset 5 limit 10";
context = new MPPQueryContext(sql, queryId, sessionInfo, null, null);
actualAnalysis = analyzeSQL(sql, metadata);
actualAnalysis = analyzeSQL(sql, metadata, context);
logicalQueryPlan =
new LogicalPlanner(context, metadata, sessionInfo, warningCollector).plan(actualAnalysis);
rootNode = logicalQueryPlan.getRootNode();
Expand All @@ -540,7 +540,7 @@ public void orderByTimeTest() {
"SELECT time, tag3, tag1, cast(s2 as double), s2+s3, attr1 FROM table1 "
+ "where s1>1 and s1+s3>0 and cast(s1 as double)>1.0 order by time desc, tag2 asc, tag3 desc, tag1 asc, s1+s2 desc offset 5 limit 10";
context = new MPPQueryContext(sql, queryId, sessionInfo, null, null);
actualAnalysis = analyzeSQL(sql, metadata);
actualAnalysis = analyzeSQL(sql, metadata, context);
logicalQueryPlan =
new LogicalPlanner(context, metadata, sessionInfo, warningCollector).plan(actualAnalysis);
rootNode = logicalQueryPlan.getRootNode();
Expand All @@ -555,7 +555,7 @@ public void orderByOthersTest() {
"SELECT time, tag3, tag1, cast(s2 as double), s2+s3, attr1 FROM table1 "
+ "order by s1+s2 desc, tag2 desc, tag1 desc, time desc offset 5 limit 10";
context = new MPPQueryContext(sql, queryId, sessionInfo, null, null);
actualAnalysis = analyzeSQL(sql, metadata);
actualAnalysis = analyzeSQL(sql, metadata, context);
logicalQueryPlan =
new LogicalPlanner(context, metadata, sessionInfo, warningCollector).plan(actualAnalysis);
rootNode = logicalQueryPlan.getRootNode();
Expand All @@ -566,7 +566,7 @@ public void orderByOthersTest() {
"SELECT time, tag3, tag1, cast(s2 as double), s2+s3, attr1 FROM table1 "
+ "where s1>1 and s1+s3>0 and cast(s1 as double)>1.0 order by s1+s2 desc, tag2 desc, tag1 desc, tag3 desc, time asc offset 5 limit 10";
context = new MPPQueryContext(sql, queryId, sessionInfo, null, null);
actualAnalysis = analyzeSQL(sql, metadata);
actualAnalysis = analyzeSQL(sql, metadata, context);
logicalQueryPlan =
new LogicalPlanner(context, metadata, sessionInfo, warningCollector).plan(actualAnalysis);
rootNode = logicalQueryPlan.getRootNode();
Expand All @@ -577,7 +577,7 @@ public void orderByOthersTest() {
"SELECT time, tag3, tag1, cast(s2 as double), s2+s3, attr1 FROM table1 "
+ "where s1>1 and s1+s3>0 and cast(s1 as double)>1.0 order by s1+s2 desc, time desc, tag2 desc, tag1 desc offset 5 limit 10";
context = new MPPQueryContext(sql, queryId, sessionInfo, null, null);
actualAnalysis = analyzeSQL(sql, metadata);
actualAnalysis = analyzeSQL(sql, metadata, context);
logicalQueryPlan =
new LogicalPlanner(context, metadata, sessionInfo, warningCollector).plan(actualAnalysis);
rootNode = logicalQueryPlan.getRootNode();
Expand All @@ -588,7 +588,7 @@ public void orderByOthersTest() {
"SELECT time, tag3, tag1, cast(s2 as double), s2+s3, attr1 FROM table1 "
+ "where s1>1 and s1+s3>0 and cast(s1 as double)>1.0 order by s1+s2 desc, time desc, tag2 desc, tag1 desc, tag3 asc offset 5 limit 10";
context = new MPPQueryContext(sql, queryId, sessionInfo, null, null);
actualAnalysis = analyzeSQL(sql, metadata);
actualAnalysis = analyzeSQL(sql, metadata, context);
logicalQueryPlan =
new LogicalPlanner(context, metadata, sessionInfo, warningCollector).plan(actualAnalysis);
rootNode = logicalQueryPlan.getRootNode();
Expand Down

0 comments on commit e48461a

Please sign in to comment.