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

fix conflict

This commit is contained in:
Ganlin Zhao 2022-07-15 16:45:30 +08:00
parent 85da616ae1
commit 0377f865db
3 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
source/libs/scalar/src/scalar.c
View File

@ -700,9 +700,9 @@ EDealRes sclRewriteNonConstOperator(SNode** pNode, SScalarCtx *ctx) {
EDealRes sclRewriteFunction(SNode** pNode, SScalarCtx *ctx) { EDealRes sclRewriteFunction(SNode** pNode, SScalarCtx *ctx) {
SFunctionNode *node = (SFunctionNode *)*pNode; SFunctionNode *node = (SFunctionNode *)*pNode;
SNode* tnode = NULL; SNode* tnode = NULL;
if (!fmIsScalarFunc(node->funcId)) { //if (!fmIsScalarFunc(node->funcId)) {
return DEAL_RES_CONTINUE; // return DEAL_RES_CONTINUE;
} //}
FOREACH(tnode, node->pParameterList) { FOREACH(tnode, node->pParameterList) {
if (!SCL_IS_CONST_NODE(tnode)) { if (!SCL_IS_CONST_NODE(tnode)) {

2
tools/taos-tools

@ -1 +1 @@
Subproject commit bd496f76b64931c66da2f8b0f24143a98a881cde Subproject commit 1163c0f60aa65d6cc58283247c8bf8c56ba43b92

2
tools/taosadapter

@ -1 +1 @@
Subproject commit df8678f070e3f707faf59baebec90065f6e1268b Subproject commit c3815951fc80617ecd171f3743b8b4a4d0bc712e