From 6c35a930bb5aa85fea6628e3d384df8a51507e6f Mon Sep 17 00:00:00 2001 From: Minglei Jin Date: Fri, 6 May 2022 08:44:30 +0800 Subject: [PATCH] fix: backport last expr fix from develop branch --- src/client/src/tscSQLParser.c | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) diff --git a/src/client/src/tscSQLParser.c b/src/client/src/tscSQLParser.c index 8060bfc899..4dd0327a82 100644 --- a/src/client/src/tscSQLParser.c +++ b/src/client/src/tscSQLParser.c @@ -2934,7 +2934,7 @@ int32_t addExprAndResultField(SSqlCmd* pCmd, SQueryInfo* pQueryInfo, int32_t col case TSDB_FUNC_LAST: case TSDB_FUNC_SPREAD: case TSDB_FUNC_LAST_ROW: - case TSDB_FUNC_INTERP: { + case TSDB_FUNC_INTERP: { // link to TD-14196, if add FUNC in this place, please search TD-14196, because there are connection in exprTreeFromSql bool requireAllFields = (pItem->pNode->Expr.paramList == NULL); // NOTE: has time range condition or normal column filter condition, the last_row query will be transferred to last query @@ -10366,7 +10366,17 @@ int32_t exprTreeFromSqlExpr(SSqlCmd* pCmd, tExprNode **pExpr, const tSqlExpr* pS *pExpr = calloc(1, sizeof(tExprNode)); (*pExpr)->nodeType = TSQL_NODE_COL; (*pExpr)->pSchema = calloc(1, sizeof(SSchema)); - strncpy((*pExpr)->pSchema->name, pSqlExpr->exprToken.z, pSqlExpr->exprToken.n); + if (tsKeepOriginalColumnName && // TD-14196, tsKeepOriginalColumnName params makes logic special + (pSqlExpr->functionId == TSDB_FUNC_FIRST || + pSqlExpr->functionId == TSDB_FUNC_LAST || + pSqlExpr->functionId == TSDB_FUNC_SPREAD || + pSqlExpr->functionId == TSDB_FUNC_LAST_ROW || + pSqlExpr->functionId == TSDB_FUNC_INTERP)) { + tSqlExprItem* pParamElem = taosArrayGet(pSqlExpr->Expr.paramList, 0); + strncpy((*pExpr)->pSchema->name, pParamElem->pNode->columnName.z, pParamElem->pNode->columnName.n); + }else{ + strncpy((*pExpr)->pSchema->name, pSqlExpr->exprToken.z, pSqlExpr->exprToken.n); + } // set the input column data byte and type. size_t size = taosArrayGetSize(pQueryInfo->exprList); -- GitLab