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

Merge pull request #20253 from taosdata/fix/TD-22952 

fix: taosc crash caused of ordering by string
This commit is contained in:
Shengliang Guan 2023-03-03 15:12:20 +08:00 committed by GitHub
parent f2d4138161 dd493d3ee4
commit 3d49dd670e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 5 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
source/libs/parser/src/parTranslater.c
View File

@ -2797,6 +2797,10 @@ static int32_t translateOrderBy(STranslateContext* pCxt, SSelectStmt* pSelect) {
bool other; bool other;
int32_t code = translateOrderByPosition(pCxt, pSelect->pProjectionList, pSelect->pOrderByList, &other); int32_t code = translateOrderByPosition(pCxt, pSelect->pProjectionList, pSelect->pOrderByList, &other);
if (TSDB_CODE_SUCCESS == code) { if (TSDB_CODE_SUCCESS == code) {
if (0 == LIST_LENGTH(pSelect->pOrderByList)) {
NODES_DESTORY_LIST(pSelect->pOrderByList);
return TSDB_CODE_SUCCESS;
}
if (!other) { if (!other) {
return TSDB_CODE_SUCCESS; return TSDB_CODE_SUCCESS;
} }

1
tests/system-test/2-query/projectionDesc.py
View File

@ -38,6 +38,7 @@ class TDTestCase:
#tdSql.checkData(0,0,1537146000000) #tdSql.checkData(0,0,1537146000000)
tdSql.checkData(0,1,10) tdSql.checkData(0,1,10)
tdSql.query(f"select * from {dbname}.stb_1 order by 'aaa' desc")
def stop(self): def stop(self):
tdSql.close() tdSql.close()