xxq250
/
homework-jianmu
1
0
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects Releases Wiki Activity

fix: table version release issue

This commit is contained in:
dapan1121 2023-08-22 13:55:45 +08:00
parent aeb098c7d0
commit 5faf7d967d
3 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
source/libs/planner/src/planOptimizer.c
View File

@ -3192,7 +3192,7 @@ static bool stbJoinOptShouldBeOptimized(SLogicNode* pNode) {
}
SJoinLogicNode* pJoin = (SJoinLogicNode*)pNode;
if (pJoin->isSingleTableJoin || NULL == pJoin->pTagEqCond || pNode->pChildren->length != 2
if (pJoin->isSingleTableJoin || NULL == pJoin->pTagEqCond || NULL != pJoin->pTagOnCond || pNode->pChildren->length != 2
|| pJoin->hasSubQuery || pJoin->joinAlgo != JOIN_ALGO_UNKNOWN || pJoin->isLowLevelJoin) {
if (pJoin->joinAlgo == JOIN_ALGO_UNKNOWN) {
pJoin->joinAlgo = JOIN_ALGO_MERGE;

2
source/libs/qworker/src/qwUtil.c
View File

@ -314,7 +314,6 @@ void qwFreeTaskCtx(SQWTaskCtx *ctx) {
}
taosArrayDestroy(ctx->tbInfo);
ctx->tbInfo = NULL;
}
int32_t qwDropTaskCtx(QW_FPARAMS_DEF) {
@ -341,6 +340,7 @@ int32_t qwDropTaskCtx(QW_FPARAMS_DEF) {
}
qwFreeTaskCtx(&octx);
ctx->tbInfo = NULL;
QW_TASK_DLOG_E("task ctx dropped");

2
tests/system-test/2-query/stbJoin.py
View File

@ -103,6 +103,8 @@ class TDTestCase:
tdSql.query(f"select /*+ no_batch_scan() */ count(*) from sta a, stb b where a.tg1=b.tg1 and a.ts=b.ts and b.tg2 > 'a' interval(1a);")
tdSql.checkRows(3)
tdSql.query(f"select a.ts, b.ts from sta a, stb b where a.ts=b.ts and (a.t0=b.t0 and a.t0 > b.t0);")
tdSql.checkRows(0)
# tdSql.checkData(0,1,10)