提交 5cbb2da4 编写于 作者: S shenglian zhou

Merge branch 'szhou/feature/support-math-functions' of...

Merge branch 'szhou/feature/support-math-functions' of github.com:taosdata/TDengine into szhou/feature/support-math-functions
...@@ -75,7 +75,7 @@ int32_t exprTreeValidateFunctionNode(tExprNode *pExpr) { ...@@ -75,7 +75,7 @@ int32_t exprTreeValidateFunctionNode(tExprNode *pExpr) {
if (!IS_VAR_DATA_TYPE(child2->pVal->nType)) { if (!IS_VAR_DATA_TYPE(child2->pVal->nType)) {
return TSDB_CODE_TSC_INVALID_OPERATION; return TSDB_CODE_TSC_INVALID_OPERATION;
} }
tVariantTypeSetType(child2->pVal, child1->resultType); tVariantTypeSetType(child2->pVal, (char)(child1->resultType));
child2->resultType = (int16_t)child2->pVal->nType; child2->resultType = (int16_t)child2->pVal->nType;
child2->resultBytes = (int16_t)(child2->pVal->nLen + VARSTR_HEADER_SIZE); child2->resultBytes = (int16_t)(child2->pVal->nLen + VARSTR_HEADER_SIZE);
} }
...@@ -959,4 +959,4 @@ tScalarFunctionInfo aScalarFunctions[] = { ...@@ -959,4 +959,4 @@ tScalarFunctionInfo aScalarFunctions[] = {
"concat", "concat",
vectorConcat vectorConcat
}, },
}; };
\ No newline at end of file
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册