@@ -508,17 +508,53 @@ public void testUpdateUnique() throws Exception {
508508
509509 @ Test
510510 public void testPushSortToOlapScan () throws Exception {
511- // Push sort successfully
512- String sql1 = "explain select k1 from db1.tbl1 order by k1, k2" ;
511+ // Push sort fail without limit
512+ String sql1 = "explain select k1 from db1.tbl3 order by k1, k2" ;
513513 StmtExecutor stmtExecutor1 = new StmtExecutor (connectContext , sql1 );
514514 stmtExecutor1 .execute ();
515515 Planner planner1 = stmtExecutor1 .planner ();
516516 String plan1 = planner1 .getExplainString (new ExplainOptions (false , false ));
517+ Assertions .assertFalse (plan1 .contains ("SORT INFO:\n `k1`\n `k2`" ));
518+ Assertions .assertFalse (plan1 .contains ("SORT LIMIT:" ));
519+ Assertions .assertFalse (plan1 .contains ("TOPN OPT" ));
520+
521+ // Push sort fail limit > topnOptLimitThreshold
522+ sql1 = "explain select k1 from db1.tbl3 order by k1, k2 limit "
523+ + (connectContext .getSessionVariable ().topnOptLimitThreshold + 1 );
524+ stmtExecutor1 = new StmtExecutor (connectContext , sql1 );
525+ stmtExecutor1 .execute ();
526+ planner1 = stmtExecutor1 .planner ();
527+ plan1 = planner1 .getExplainString (new ExplainOptions (false , false ));
528+ Assertions .assertFalse (plan1 .contains ("SORT INFO:\n `k1`\n `k2`" ));
529+ Assertions .assertFalse (plan1 .contains ("SORT LIMIT:" ));
530+ Assertions .assertFalse (plan1 .contains ("TOPN OPT" ));
531+
532+ // Push sort success limit = topnOptLimitThreshold
533+ sql1 = "explain select k1 from db1.tbl3 order by k1, k2 limit "
534+ + (connectContext .getSessionVariable ().topnOptLimitThreshold );
535+ stmtExecutor1 = new StmtExecutor (connectContext , sql1 );
536+ stmtExecutor1 .execute ();
537+ planner1 = stmtExecutor1 .planner ();
538+ plan1 = planner1 .getExplainString (new ExplainOptions (false , false ));
517539 Assertions .assertTrue (plan1 .contains ("SORT INFO:\n `k1`\n `k2`" ));
518540 Assertions .assertTrue (plan1 .contains ("SORT LIMIT:" ));
541+ Assertions .assertTrue (plan1 .contains ("TOPN OPT" ));
542+
543+ // Push sort success limit < topnOptLimitThreshold
544+ if (connectContext .getSessionVariable ().topnOptLimitThreshold > 1 ) {
545+ sql1 = "explain select k1 from db1.tbl3 order by k1, k2 limit "
546+ + (connectContext .getSessionVariable ().topnOptLimitThreshold - 1 );
547+ stmtExecutor1 = new StmtExecutor (connectContext , sql1 );
548+ stmtExecutor1 .execute ();
549+ planner1 = stmtExecutor1 .planner ();
550+ plan1 = planner1 .getExplainString (new ExplainOptions (false , false ));
551+ Assertions .assertTrue (plan1 .contains ("SORT INFO:\n `k1`\n `k2`" ));
552+ Assertions .assertTrue (plan1 .contains ("SORT LIMIT:" ));
553+ Assertions .assertTrue (plan1 .contains ("TOPN OPT" ));
554+ }
519555
520556 // Push sort failed
521- String sql2 = "explain select k1, k2, k3 from db1.tbl1 order by k1, k3, k2" ;
557+ String sql2 = "explain select k1, k2, k3 from db1.tbl3 order by k1, k3, k2" ;
522558 StmtExecutor stmtExecutor2 = new StmtExecutor (connectContext , sql2 );
523559 stmtExecutor2 .execute ();
524560 Planner planner2 = stmtExecutor2 .planner ();
@@ -529,9 +565,10 @@ public void testPushSortToOlapScan() throws Exception {
529565
530566 @ Test
531567 public void testEliminatingSortNode () throws Exception {
532- // fail case 1
568+ // success case 1
533569 {
534- String sql1 = "explain select k1 from db1.tbl1 where k1 = 1 order by k1, k2" ;
570+ String sql1 = "explain select k1 from db1.tbl1 where k1 = 1 order by k1, k2 limit "
571+ + connectContext .getSessionVariable ().topnOptLimitThreshold ;
535572 StmtExecutor stmtExecutor1 = new StmtExecutor (connectContext , sql1 );
536573 stmtExecutor1 .execute ();
537574 Planner planner1 = stmtExecutor1 .planner ();
@@ -542,7 +579,8 @@ public void testEliminatingSortNode() throws Exception {
542579
543580 // fail case 2
544581 {
545- String sql1 = "explain select k1 from db1.tbl1 where k1 = 1 and k3 = 2 order by k1, k2" ;
582+ String sql1 = "explain select k1 from db1.tbl1 where k1 = 1 and k3 = 2 order by k1, k2 limit "
583+ + connectContext .getSessionVariable ().topnOptLimitThreshold ;
546584 StmtExecutor stmtExecutor1 = new StmtExecutor (connectContext , sql1 );
547585 stmtExecutor1 .execute ();
548586 Planner planner1 = stmtExecutor1 .planner ();
@@ -553,7 +591,8 @@ public void testEliminatingSortNode() throws Exception {
553591
554592 // fail case 3
555593 {
556- String sql1 = "explain select k1 from db1.tbl1 where k1 = 1 and k2 != 2 order by k1, k2" ;
594+ String sql1 = "explain select k1 from db1.tbl1 where k1 = 1 and k2 != 2 order by k1, k2 limit "
595+ + connectContext .getSessionVariable ().topnOptLimitThreshold ;
557596 StmtExecutor stmtExecutor1 = new StmtExecutor (connectContext , sql1 );
558597 stmtExecutor1 .execute ();
559598 Planner planner1 = stmtExecutor1 .planner ();
@@ -564,7 +603,8 @@ public void testEliminatingSortNode() throws Exception {
564603
565604 // fail case 4
566605 {
567- String sql1 = "explain select k1 from db1.tbl1 where k1 = 1 or k2 = 2 order by k1, k2" ;
606+ String sql1 = "explain select k1 from db1.tbl1 where k1 = 1 or k2 = 2 order by k1, k2 limit "
607+ + connectContext .getSessionVariable ().topnOptLimitThreshold ;
568608 StmtExecutor stmtExecutor1 = new StmtExecutor (connectContext , sql1 );
569609 stmtExecutor1 .execute ();
570610 Planner planner1 = stmtExecutor1 .planner ();
@@ -575,7 +615,8 @@ public void testEliminatingSortNode() throws Exception {
575615
576616 // fail case 5
577617 {
578- String sql1 = "explain select k1 from db1.tbl1 where k1 = 1 and k2 = 2 or k3 = 3 order by k1, k2" ;
618+ String sql1 = "explain select k1 from db1.tbl1 where k1 = 1 and k2 = 2 or k3 = 3 order by k1, k2 limit "
619+ + connectContext .getSessionVariable ().topnOptLimitThreshold ;
579620 StmtExecutor stmtExecutor1 = new StmtExecutor (connectContext , sql1 );
580621 stmtExecutor1 .execute ();
581622 Planner planner1 = stmtExecutor1 .planner ();
@@ -587,7 +628,8 @@ public void testEliminatingSortNode() throws Exception {
587628 // fail case 6
588629 // TODO, support: in (select 1)
589630 {
590- String sql1 = "explain select k1 from db1.tbl1 where k1 in (select 1) and k2 = 2 order by k1, k2" ;
631+ String sql1 = "explain select k1 from db1.tbl1 where k1 in (select 1) and k2 = 2 order by k1, k2 limit "
632+ + connectContext .getSessionVariable ().topnOptLimitThreshold ;
591633 StmtExecutor stmtExecutor1 = new StmtExecutor (connectContext , sql1 );
592634 stmtExecutor1 .execute ();
593635 Planner planner1 = stmtExecutor1 .planner ();
@@ -597,7 +639,8 @@ public void testEliminatingSortNode() throws Exception {
597639
598640 // fail case 7
599641 {
600- String sql1 = "explain select k1 from db1.tbl1 where k1 not in (1) and k2 = 2 order by k1, k2" ;
642+ String sql1 = "explain select k1 from db1.tbl1 where k1 not in (1) and k2 = 2 order by k1, k2 limit "
643+ + connectContext .getSessionVariable ().topnOptLimitThreshold ;
601644 StmtExecutor stmtExecutor1 = new StmtExecutor (connectContext , sql1 );
602645 stmtExecutor1 .execute ();
603646 Planner planner1 = stmtExecutor1 .planner ();
@@ -607,7 +650,8 @@ public void testEliminatingSortNode() throws Exception {
607650
608651 // success case 1
609652 {
610- String sql1 = "explain select k1 from db1.tbl1 where k1 = 1 and k2 = 2 order by k1, k2" ;
653+ String sql1 = "explain select k1 from db1.tbl1 where k1 = 1 and k2 = 2 order by k1, k2 limit "
654+ + connectContext .getSessionVariable ().topnOptLimitThreshold ;
611655 StmtExecutor stmtExecutor1 = new StmtExecutor (connectContext , sql1 );
612656 stmtExecutor1 .execute ();
613657 Planner planner1 = stmtExecutor1 .planner ();
@@ -618,7 +662,8 @@ public void testEliminatingSortNode() throws Exception {
618662
619663 // success case 2
620664 {
621- String sql1 = "explain select k1 from db1.tbl1 where k3 = 3 and k2 = 2 and k1 = 1 order by k1, k2" ;
665+ String sql1 = "explain select k1 from db1.tbl1 where k3 = 3 and k2 = 2 and k1 = 1 order by k1, k2 limit "
666+ + connectContext .getSessionVariable ().topnOptLimitThreshold ;
622667 StmtExecutor stmtExecutor1 = new StmtExecutor (connectContext , sql1 );
623668 stmtExecutor1 .execute ();
624669 Planner planner1 = stmtExecutor1 .planner ();
@@ -629,7 +674,8 @@ public void testEliminatingSortNode() throws Exception {
629674
630675 // success case 3
631676 {
632- String sql1 = "explain select k1 from db1.tbl1 where k1 in (1) and k2 in (2) and k2 !=2 order by k1, k2" ;
677+ String sql1 = "explain select k1 from db1.tbl1 where k1 in (1) and k2 in (2) and k2 !=2 order by k1, k2 limit "
678+ + connectContext .getSessionVariable ().topnOptLimitThreshold ;
633679 StmtExecutor stmtExecutor1 = new StmtExecutor (connectContext , sql1 );
634680 stmtExecutor1 .execute ();
635681 Planner planner1 = stmtExecutor1 .planner ();
@@ -640,7 +686,8 @@ public void testEliminatingSortNode() throws Exception {
640686
641687 // success case 4
642688 {
643- String sql1 = "explain select k1 from db1.tbl1 where k1 in (concat('1','2')) and k2 = 2 order by k1, k2" ;
689+ String sql1 = "explain select k1 from db1.tbl1 where k1 in (concat('1','2')) and k2 = 2 order by k1, k2 limit "
690+ + connectContext .getSessionVariable ().topnOptLimitThreshold ;
644691 StmtExecutor stmtExecutor1 = new StmtExecutor (connectContext , sql1 );
645692 stmtExecutor1 .execute ();
646693 Planner planner1 = stmtExecutor1 .planner ();
@@ -652,7 +699,8 @@ public void testEliminatingSortNode() throws Exception {
652699 // success case 5
653700 {
654701 String sql1 = "explain select tbl1.k1 from db1.tbl1 join db1.tbl2 on tbl1.k1 = tbl2.k1"
655- + " where tbl1.k1 = 1 and tbl2.k1 = 2 and tbl1.k2 = 3 order by tbl1.k1, tbl2.k1" ;
702+ + " where tbl1.k1 = 1 and tbl2.k1 = 2 and tbl1.k2 = 3 order by tbl1.k1, tbl2.k1 limit "
703+ + connectContext .getSessionVariable ().topnOptLimitThreshold ;
656704 StmtExecutor stmtExecutor1 = new StmtExecutor (connectContext , sql1 );
657705 stmtExecutor1 .execute ();
658706 Planner planner1 = stmtExecutor1 .planner ();
0 commit comments