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

Merge pull request #22514 from taosdata/enh/TD-25794 

fix: table version release issue
This commit is contained in:
dapan1121 2023-08-22 17:31:12 +08:00 committed by GitHub
parent e069d72229 8181c91219
commit cbf198317e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
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; 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) { || pJoin->hasSubQuery || pJoin->joinAlgo != JOIN_ALGO_UNKNOWN || pJoin->isLowLevelJoin) {
if (pJoin->joinAlgo == JOIN_ALGO_UNKNOWN) { if (pJoin->joinAlgo == JOIN_ALGO_UNKNOWN) {
pJoin->joinAlgo = JOIN_ALGO_MERGE; 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); taosArrayDestroy(ctx->tbInfo);
ctx->tbInfo = NULL;
} }
int32_t qwDropTaskCtx(QW_FPARAMS_DEF) { int32_t qwDropTaskCtx(QW_FPARAMS_DEF) {
@ -341,6 +340,7 @@ int32_t qwDropTaskCtx(QW_FPARAMS_DEF) {
} }
qwFreeTaskCtx(&octx); qwFreeTaskCtx(&octx);
ctx->tbInfo = NULL;
QW_TASK_DLOG_E("task ctx dropped"); 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.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.checkRows(3)
tdSql.query(f"select a.ts, b.ts from sta a, stb b where a.ts=b.ts and (a.tg1=b.tg1 and a.tg1 > b.tg1);")
tdSql.checkRows(0)
# tdSql.checkData(0,1,10) # tdSql.checkData(0,1,10)