fix: join order by not work issue

source/libs/planner/src/planOptimizer.c

@@ -1455,28 +1455,25 @@ static int32_t sortForJoinOptimizeImpl(SOptimizeContext* pCxt, SLogicSubplan* pL
   SLogicNode* pLeft = (SLogicNode*)nodesListGetNode(pJoin->node.pChildren, 0);
   SLogicNode* pRight = (SLogicNode*)nodesListGetNode(pJoin->node.pChildren, 1);
   SScanLogicNode* pScan = NULL;
+  SLogicNode* pChild = NULL;
+  SNode** pChildPos = NULL;
+  EOrder targetOrder = 0;
+  SSHashObj* pTables = NULL;
   
   if (QUERY_NODE_LOGIC_PLAN_SCAN == nodeType(pLeft) && ((SScanLogicNode*)pLeft)->node.outputTsOrder != SCAN_ORDER_BOTH) {
     pScan = (SScanLogicNode*)pLeft;
+    pChild = pRight;
+    pChildPos = &pJoin->node.pChildren->pTail->pNode;
+    targetOrder = pScan->node.outputTsOrder;
   } else if (QUERY_NODE_LOGIC_PLAN_SCAN == nodeType(pRight) && ((SScanLogicNode*)pRight)->node.outputTsOrder != SCAN_ORDER_BOTH) {
     pScan = (SScanLogicNode*)pRight;
-  }
+    pChild = pLeft;
-
+    pChildPos = &pJoin->node.pChildren->pHead->pNode;
-  if (NULL != pScan) {
+    targetOrder = pScan->node.outputTsOrder;
-    switch (pScan->node.outputTsOrder) {
+  } else {
-      case SCAN_ORDER_ASC:
+    pChild = pRight;
-        pScan->scanSeq[0] = 0;
+    pChildPos = &pJoin->node.pChildren->pTail->pNode;
-        pScan->scanSeq[1] = 1;
+    targetOrder = pLeft->outputTsOrder;
-        pScan->node.outputTsOrder = ORDER_DESC;
-        goto _return;
-      case SCAN_ORDER_DESC:
-        pScan->scanSeq[0] = 1;
-        pScan->scanSeq[1] = 0;
-        pScan->node.outputTsOrder = ORDER_ASC;
-        goto _return;
-      default:
-        break;
-    }
   }
 
   if (QUERY_NODE_OPERATOR != nodeType(pJoin->pPrimKeyEqCond)) {
@@ -1490,16 +1487,15 @@ static int32_t sortForJoinOptimizeImpl(SOptimizeContext* pCxt, SLogicSubplan* pL
   }
 
   SNode* pOrderByNode = NULL;
-  SSHashObj* pLeftTables = NULL;
+
-  collectTableAliasFromNodes(nodesListGetNode(pJoin->node.pChildren, 0), &pLeftTables);
+  collectTableAliasFromNodes((SNode*)pChild, &pTables);  
-  
+  if (NULL != tSimpleHashGet(pTables, ((SColumnNode*)pOp->pLeft)->tableAlias, strlen(((SColumnNode*)pOp->pLeft)->tableAlias))) {
-  if (NULL != tSimpleHashGet(pLeftTables, ((SColumnNode*)pOp->pLeft)->tableAlias, strlen(((SColumnNode*)pOp->pLeft)->tableAlias))) {
     pOrderByNode = pOp->pLeft;
-  } else if (NULL != tSimpleHashGet(pLeftTables, ((SColumnNode*)pOp->pRight)->tableAlias, strlen(((SColumnNode*)pOp->pRight)->tableAlias))) {
+  } else if (NULL != tSimpleHashGet(pTables, ((SColumnNode*)pOp->pRight)->tableAlias, strlen(((SColumnNode*)pOp->pRight)->tableAlias))) {
     pOrderByNode = pOp->pRight;
   }
 
-  tSimpleHashCleanup(pLeftTables);
+  tSimpleHashCleanup(pTables);
 
   if (NULL == pOrderByNode) {
     return TSDB_CODE_PLAN_INTERNAL_ERROR;
@@ -1510,7 +1506,13 @@ static int32_t sortForJoinOptimizeImpl(SOptimizeContext* pCxt, SLogicSubplan* pL
     return TSDB_CODE_OUT_OF_MEMORY;
   }
 
-  pSort->node.outputTsOrder = (ORDER_ASC == pLeft->outputTsOrder) ? ORDER_DESC : ORDER_ASC;
+  pSort->node.outputTsOrder = targetOrder;
+  pSort->node.pTargets = nodesCloneList(pChild->pTargets);
+  if (NULL == pSort->node.pTargets) {
+    nodesDestroyNode((SNode *)pSort);
+    return TSDB_CODE_OUT_OF_MEMORY;
+  }
+  
   pSort->groupSort = false;
   SOrderByExprNode* pOrder = (SOrderByExprNode*)nodesMakeNode(QUERY_NODE_ORDER_BY_EXPR);
   if (NULL == pOrder) {
@@ -1519,7 +1521,7 @@ static int32_t sortForJoinOptimizeImpl(SOptimizeContext* pCxt, SLogicSubplan* pL
   }
 
   nodesListMakeAppend(&pSort->pSortKeys, (SNode*)pOrder);
-  pOrder->order = (ORDER_ASC == pLeft->outputTsOrder) ? ORDER_DESC : ORDER_ASC;
+  pOrder->order = targetOrder;
   pOrder->pExpr = nodesCloneNode(pOrderByNode);
   pOrder->nullOrder = (ORDER_ASC == pOrder->order) ? NULL_ORDER_FIRST : NULL_ORDER_LAST;
   if (!pOrder->pExpr) {
@@ -1527,9 +1529,9 @@ static int32_t sortForJoinOptimizeImpl(SOptimizeContext* pCxt, SLogicSubplan* pL
     return TSDB_CODE_OUT_OF_MEMORY;
   }
 
-  pLeft->pParent = (SLogicNode*)pSort;
+  pChild->pParent = (SLogicNode*)pSort;
-  nodesListMakeAppend(&pSort->node.pChildren, (SNode*)pLeft);
+  nodesListMakeAppend(&pSort->node.pChildren, (SNode*)pChild);
-  pJoin->node.pChildren->pHead->pNode = (SNode*)pSort;
+  *pChildPos = (SNode*)pSort;
   pSort->node.pParent = (SLogicNode*)pJoin;;
 
 _return:

tests/script/tsim/query/join_order.sim

@@ -47,5 +47,90 @@ sql select a.*,b.* from (select * from tba1 order by ts desc) a, (select * from
 if $rows != 4 then
   return -1
 endi
+sql select a.*,b.* from (select * from tba1 order by ts desc) a, (select * from tba1 order by ts) b where a.ts=b.ts order by a.ts;
+if $rows != 4 then
+  return -1
+endi
+if $data00 != @23-11-17 16:29:00.000@ then
+  return -1
+endi
+sql select a.*,b.* from (select * from tba1 order by ts desc) a, (select * from tba1 order by ts) b where a.ts=b.ts order by a.ts desc;
+if $rows != 4 then
+  return -1
+endi
+if $data00 != @23-11-17 16:29:04.000@ then
+  return -1
+endi
+sql select a.*,b.* from (select * from tba1 order by ts) a, (select * from tba1 order by ts) b where a.ts=b.ts order by a.ts;
+if $rows != 4 then
+  return -1
+endi
+if $data00 != @23-11-17 16:29:00.000@ then
+  return -1
+endi
+sql select a.*,b.* from (select * from tba1 order by ts) a, (select * from tba1 order by ts) b where a.ts=b.ts order by a.ts desc;
+if $rows != 4 then
+  return -1
+endi
+if $data00 != @23-11-17 16:29:04.000@ then
+  return -1
+endi
+sql select a.*,b.* from (select * from tba1 order by ts limit 2) a, (select * from tba1 order by ts desc limit 2) b where a.ts=b.ts order by a.ts desc;
+if $rows != 0 then
+  return -1
+endi
+sql select a.*,b.* from (select * from tba1 order by ts limit 3) a, (select * from tba1 order by ts desc limit 3) b where a.ts=b.ts order by a.ts desc;
+if $rows != 2 then
+  return -1
+endi
+if $data00 != @23-11-17 16:29:03.000@ then
+  return -1
+endi
+
+sql select a.*,b.* from (select * from tba1 order by ts limit 3) a, (select * from tba1 order by ts desc limit 3) b where a.ts=b.ts order by a.ts;
+if $rows != 2 then
+  return -1
+endi
+if $data00 != @23-11-17 16:29:02.000@ then
+  return -1
+endi
+
+sql select a.*,b.* from tba1 a, (select * from tba1 order by ts desc limit 3) b where a.ts=b.ts order by a.ts;
+if $rows != 3 then
+  return -1
+endi
+if $data00 != @23-11-17 16:29:02.000@ then
+  return -1
+endi
+sql select a.*,b.* from tba1 a, (select * from tba1 order by ts limit 3) b where a.ts=b.ts order by a.ts desc limit 2;
+if $rows != 2 then
+  return -1
+endi
+if $data00 != @23-11-17 16:29:03.000@ then
+  return -1
+endi
+
+sql select a.*,b.* from (select * from tba1 order by ts limit 3) a, tba1 b where a.ts=b.ts order by a.ts desc;
+if $rows != 3 then
+  return -1
+endi
+if $data00 != @23-11-17 16:29:03.000@ then
+  return -1
+endi
+sql select a.*,b.* from (select * from tba1 order by ts desc limit 3) a, tba1 b where a.ts=b.ts order by a.ts desc;
+if $rows != 3 then
+  return -1
+endi
+if $data00 != @23-11-17 16:29:04.000@ then
+  return -1
+endi
+
+sql select a.*,b.* from (select * from tba1 order by ts desc limit 3) a, tba1 b where a.ts=b.ts order by a.ts;
+if $rows != 3 then
+  return -1
+endi
+if $data00 != @23-11-17 16:29:02.000@ then
+  return -1
+endi
 
 system sh/exec.sh -n dnode1 -s stop -x SIGINT