#4672

Committed 14 Aug 2025 01:04PM UTC coverage: 59.715% (+2.2%) from 57.533%

Build # #4672

Build Type

push

travis-ci

Committed by

web-flow

Commit Message

fix(query): fix order by column check of union operator (#32524)

Coverage Stats

137065 of 292055 branches covered (46.93%)

Branch coverage included in aggregate %.

1 of 13 new or added lines in 1 file covered. (7.69%)

20958 existing lines in 205 files now uncovered.

207155 of 284385 relevant lines covered (72.84%)

20501687.34 hits per line

Source File
Press 'n' to go to next uncovered line, 'b' for previous

69.78

/source/libs/nodes/src/nodesToSQLFuncs.c

/*
 * Copyright (c) 2019 TAOS Data, Inc. <jhtao@taosdata.com>
 *
 * This program is free software: you can use, redistribute, and/or modify
 * it under the terms of the GNU Affero General Public License, version 3
 * or later ("AGPL"), as published by the Free Software Foundation.
 *
 * This program is distributed in the hope that it will be useful, but WITHOUT
 * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
 * FITNESS FOR A PARTICULAR PURPOSE.
 *
 * You should have received a copy of the GNU Affero General Public License
 * along with this program. If not, see <http://www.gnu.org/licenses/>.
 */

#include "cmdnodes.h"
#include "nodesUtil.h"
#include "plannodes.h"
#include "querynodes.h"
#include "taos.h"
#include "taoserror.h"
#include "thash.h"

const char *operatorTypeStr(EOperatorType type) {
  switch (type) {
    case OP_TYPE_ADD:
      return "+";
    case OP_TYPE_SUB:
      return "-";
    case OP_TYPE_MULTI:
      return "*";
    case OP_TYPE_DIV:
      return "/";
    case OP_TYPE_REM:
      return "%";
    case OP_TYPE_MINUS:
      return "-";
    case OP_TYPE_BIT_AND:
      return "&";
    case OP_TYPE_BIT_OR:
      return "|";
    case OP_TYPE_GREATER_THAN:
      return ">";
    case OP_TYPE_GREATER_EQUAL:
      return ">=";
    case OP_TYPE_LOWER_THAN:
      return "<";
    case OP_TYPE_LOWER_EQUAL:
      return "<=";
    case OP_TYPE_EQUAL:
      return "=";
    case OP_TYPE_NOT_EQUAL:
      return "<>";
    case OP_TYPE_IN:
      return "IN";
    case OP_TYPE_NOT_IN:
      return "NOT IN";
    case OP_TYPE_LIKE:
      return "LIKE";
    case OP_TYPE_NOT_LIKE:
      return "NOT LIKE";
    case OP_TYPE_MATCH:
      return "MATCH";
    case OP_TYPE_NMATCH:
      return "NMATCH";
    case OP_TYPE_IS_NULL:
      return "IS NULL";
    case OP_TYPE_IS_NOT_NULL:
      return "IS NOT NULL";
    case OP_TYPE_IS_TRUE:
      return "IS TRUE";
    case OP_TYPE_IS_FALSE:
      return "IS FALSE";
    case OP_TYPE_IS_UNKNOWN:
      return "IS UNKNOWN";
    case OP_TYPE_IS_NOT_TRUE:
      return "IS NOT TRUE";
    case OP_TYPE_IS_NOT_FALSE:
      return "IS NOT FALSE";
    case OP_TYPE_IS_NOT_UNKNOWN:
      return "IS NOT UNKNOWN";
    case OP_TYPE_JSON_GET_VALUE:
      return "=>";
    case OP_TYPE_JSON_CONTAINS:
      return "CONTAINS";
    case OP_TYPE_ASSIGN:
      return "=";
    default:
      break;
  }
  return "UNKNOWN";
}

const char *logicConditionTypeStr(ELogicConditionType type) {
  switch (type) {
    case LOGIC_COND_TYPE_AND:
      return "AND";
    case LOGIC_COND_TYPE_OR:
      return "OR";
    case LOGIC_COND_TYPE_NOT:
      return "NOT";
    default:
      break;
  }
  return "UNKNOWN";
}

int32_t nodesNodeToSQL(SNode *pNode, char *buf, int32_t bufSize, int32_t *len) {
  return nodesNodeToSQLFormat(pNode, buf, bufSize, len, false);
}

int32_t nodesNodeToSQLFormat(SNode *pNode, char *buf, int32_t bufSize, int32_t *len, bool longFormat) {
  switch (pNode->type) {
    case QUERY_NODE_COLUMN: {
      SColumnNode *colNode = (SColumnNode *)pNode;
      if (colNode->dbName[0]) {
        *len += tsnprintf(buf + *len, bufSize - *len, "`%s`.", colNode->dbName);
      }

      if (colNode->tableAlias[0]) {
        *len += tsnprintf(buf + *len, bufSize - *len, "`%s`.", colNode->tableAlias);
      } else if (colNode->tableName[0]) {
        *len += tsnprintf(buf + *len, bufSize - *len, "`%s`.", colNode->tableName);
      }

      if (colNode->tableAlias[0]) {
        *len += tsnprintf(buf + *len, bufSize - *len, "`%s`", colNode->node.userAlias);
      } else {
        *len += tsnprintf(buf + *len, bufSize - *len, "%s", colNode->node.userAlias);
      }

      return TSDB_CODE_SUCCESS;
    }
    case QUERY_NODE_VALUE: {
      SValueNode *colNode = (SValueNode *)pNode;
      char       *t = nodesGetStrValueFromNode(colNode);
      if (NULL == t) {
        nodesError("fail to get str value from valueNode");
        NODES_ERR_RET(TSDB_CODE_APP_ERROR);
      }

      int32_t tlen = strlen(t);
      if (longFormat) {
        *len += tsnprintf(buf + *len, bufSize - *len, "%s", t);
      } else {
        if (tlen > 32) {
          *len += tsnprintf(buf + *len, bufSize - *len, "%.*s...%s", 32, t, t + tlen - 1);
        } else {
          *len += tsnprintf(buf + *len, bufSize - *len, "%s", t);
        }
      }

      taosMemoryFree(t);

      return TSDB_CODE_SUCCESS;
    }
    case QUERY_NODE_OPERATOR: {
      SOperatorNode *pOpNode = (SOperatorNode *)pNode;
      *len += tsnprintf(buf + *len, bufSize - *len, "(");
      if (pOpNode->pLeft) {
        NODES_ERR_RET(nodesNodeToSQLFormat(pOpNode->pLeft, buf, bufSize, len, true));
      }

      *len += tsnprintf(buf + *len, bufSize - *len, " %s ", operatorTypeStr(pOpNode->opType));

      if (pOpNode->pRight) {
        NODES_ERR_RET(nodesNodeToSQLFormat(pOpNode->pRight, buf, bufSize, len, true));
      }

      *len += tsnprintf(buf + *len, bufSize - *len, ")");

      return TSDB_CODE_SUCCESS;
    }
    case QUERY_NODE_LOGIC_CONDITION: {
      SLogicConditionNode *pLogicNode = (SLogicConditionNode *)pNode;
      SNode               *node = NULL;
      bool                 first = true;

      *len += tsnprintf(buf + *len, bufSize - *len, "(");

      FOREACH(node, pLogicNode->pParameterList) {
        if (!first) {
          *len += tsnprintf(buf + *len, bufSize - *len, " %s ", logicConditionTypeStr(pLogicNode->condType));
        }
        NODES_ERR_RET(nodesNodeToSQLFormat(node, buf, bufSize, len, true));
        first = false;
      }

      *len += tsnprintf(buf + *len, bufSize - *len, ")");

      return TSDB_CODE_SUCCESS;
    }
    case QUERY_NODE_FUNCTION: {
      SFunctionNode *pFuncNode = (SFunctionNode *)pNode;
      SNode         *node = NULL;
      bool           first = true;

      *len += tsnprintf(buf + *len, bufSize - *len, "%s(", pFuncNode->functionName);

      FOREACH(node, pFuncNode->pParameterList) {
        if (!first) {
          *len += tsnprintf(buf + *len, bufSize - *len, ", ");
        }
        NODES_ERR_RET(nodesNodeToSQLFormat(node, buf, bufSize, len, true));
        first = false;
      }

      *len += tsnprintf(buf + *len, bufSize - *len, ")");

      return TSDB_CODE_SUCCESS;
    }
    case QUERY_NODE_NODE_LIST: {
      SNodeListNode *pListNode = (SNodeListNode *)pNode;
      SNode         *node = NULL;
      bool           first = true;
      int32_t        num = 0;

      *len += tsnprintf(buf + *len, bufSize - *len, "(");

      FOREACH(node, pListNode->pNodeList) {
        if (!first) {
          *len += tsnprintf(buf + *len, bufSize - *len, ", ");
          if (!longFormat) {
            if (++num >= 10) {
              *len += tsnprintf(buf + *len, bufSize - *len, "...");
              break;
            }
          }
        }
        NODES_ERR_RET(nodesNodeToSQLFormat(node, buf, bufSize, len, true));
        first = false;
      }

      *len += tsnprintf(buf + *len, bufSize - *len, ")");

      return TSDB_CODE_SUCCESS;
    }
    default:
      break;
  }

  nodesError("nodesNodeToSQL unknown node = %s", nodesNodeName(pNode->type));
  NODES_RET(TSDB_CODE_APP_ERROR);
}

1	/*
2	* Copyright (c) 2019 TAOS Data, Inc. <jhtao@taosdata.com>
3	*
4	* This program is free software: you can use, redistribute, and/or modify
5	* it under the terms of the GNU Affero General Public License, version 3
6	* or later ("AGPL"), as published by the Free Software Foundation.
7	*
8	* This program is distributed in the hope that it will be useful, but WITHOUT
9	* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
10	* FITNESS FOR A PARTICULAR PURPOSE.
11	*
12	* You should have received a copy of the GNU Affero General Public License
13	* along with this program. If not, see <http://www.gnu.org/licenses/>.
14	*/
15
16	#include "cmdnodes.h"
17	#include "nodesUtil.h"
18	#include "plannodes.h"
19	#include "querynodes.h"
20	#include "taos.h"
21	#include "taoserror.h"
22	#include "thash.h"
23
24	const char *operatorTypeStr(EOperatorType type) {	462,427✔
25	switch (type) {	462,427!
26	case OP_TYPE_ADD:	60✔
27	return "+";	60✔
28	case OP_TYPE_SUB:	16✔
29	return "-";	16✔
30	case OP_TYPE_MULTI:	16✔
31	return "*";	16✔
32	case OP_TYPE_DIV:	14✔
33	return "/";	14✔
34	case OP_TYPE_REM:	14✔
35	return "%";	14✔
36	case OP_TYPE_MINUS:	18✔
37	return "-";	18✔
38	case OP_TYPE_BIT_AND:	16✔
39	return "&";	16✔
40	case OP_TYPE_BIT_OR:	16✔
41	return "\|";	16✔
42	case OP_TYPE_GREATER_THAN:	67,200✔
43	return ">";	67,200✔
44	case OP_TYPE_GREATER_EQUAL:	59,189✔
45	return ">=";	59,189✔
46	case OP_TYPE_LOWER_THAN:	23,166✔
47	return "<";	23,166✔
48	case OP_TYPE_LOWER_EQUAL:	79,064✔
49	return "<=";	79,064✔
50	case OP_TYPE_EQUAL:	101,740✔
51	return "=";	101,740✔
52	case OP_TYPE_NOT_EQUAL:	20✔
53	return "<>";	20✔
54	case OP_TYPE_IN:	1,193✔
55	return "IN";	1,193✔
56	case OP_TYPE_NOT_IN:	×
57	return "NOT IN";	×
58	case OP_TYPE_LIKE:	12,760✔
59	return "LIKE";	12,760✔
60	case OP_TYPE_NOT_LIKE:	10✔
61	return "NOT LIKE";	10✔
62	case OP_TYPE_MATCH:	58,438✔
63	return "MATCH";	58,438✔
64	case OP_TYPE_NMATCH:	3,692✔
65	return "NMATCH";	3,692✔
66	case OP_TYPE_IS_NULL:	3,160✔
67	return "IS NULL";	3,160✔
68	case OP_TYPE_IS_NOT_NULL:	52,620✔
69	return "IS NOT NULL";	52,620✔
70	case OP_TYPE_IS_TRUE:	10✔
71	return "IS TRUE";	10✔
72	case OP_TYPE_IS_FALSE:	×
73	return "IS FALSE";	×
74	case OP_TYPE_IS_UNKNOWN:	×
75	return "IS UNKNOWN";	×
76	case OP_TYPE_IS_NOT_TRUE:	×
77	return "IS NOT TRUE";	×
78	case OP_TYPE_IS_NOT_FALSE:	×
79	return "IS NOT FALSE";	×
80	case OP_TYPE_IS_NOT_UNKNOWN:	×
81	return "IS NOT UNKNOWN";	×
82	case OP_TYPE_JSON_GET_VALUE:	×
83	return "=>";	×
84	case OP_TYPE_JSON_CONTAINS:	×
85	return "CONTAINS";	×
86	case OP_TYPE_ASSIGN:	×
87	return "=";	×
UNCOV 88	default:	×
UNCOV 89	break;	×
90	}
UNCOV 91	return "UNKNOWN";	×
92	}
93
94	const char *logicConditionTypeStr(ELogicConditionType type) {	29✔
95	switch (type) {	29!
96	case LOGIC_COND_TYPE_AND:	20✔
97	return "AND";	20✔
98	case LOGIC_COND_TYPE_OR:	9✔
99	return "OR";	9✔
100	case LOGIC_COND_TYPE_NOT:	×
101	return "NOT";	×
102	default:	×
103	break;	×
104	}
105	return "UNKNOWN";	×
106	}
107
108	int32_t nodesNodeToSQL(SNode pNode, char buf, int32_t bufSize, int32_t *len) {	542✔
109	return nodesNodeToSQLFormat(pNode, buf, bufSize, len, false);	542✔
110	}
111
112	int32_t nodesNodeToSQLFormat(SNode pNode, char buf, int32_t bufSize, int32_t *len, bool longFormat) {	2,033✔
113	switch (pNode->type) {	2,033!
114	case QUERY_NODE_COLUMN: {	1,067✔
115	SColumnNode colNode = (SColumnNode )pNode;	1,067✔
116	if (colNode->dbName[0]) {	1,067✔
117	len += tsnprintf(buf + len, bufSize - *len, "`%s`.", colNode->dbName);	992✔
118	}
119
120	if (colNode->tableAlias[0]) {	1,067✔
121	len += tsnprintf(buf + len, bufSize - *len, "`%s`.", colNode->tableAlias);	1,038✔
122	} else if (colNode->tableName[0]) {	29!
123	len += tsnprintf(buf + len, bufSize - *len, "`%s`.", colNode->tableName);	×
124	}
125
126	if (colNode->tableAlias[0]) {	1,067✔
127	len += tsnprintf(buf + len, bufSize - *len, "`%s`", colNode->node.userAlias);	1,038✔
128	} else {
129	len += tsnprintf(buf + len, bufSize - *len, "%s", colNode->node.userAlias);	29✔
130	}
131
132	return TSDB_CODE_SUCCESS;	1,067✔
133	}
134	case QUERY_NODE_VALUE: {	268✔
135	SValueNode colNode = (SValueNode )pNode;	268✔
136	char *t = nodesGetStrValueFromNode(colNode);	268✔
137	if (NULL == t) {	268!
138	nodesError("fail to get str value from valueNode");	×
139	NODES_ERR_RET(TSDB_CODE_APP_ERROR);	×
140	}
141
142	int32_t tlen = strlen(t);	268✔
143	if (longFormat) {	268!
144	len += tsnprintf(buf + len, bufSize - *len, "%s", t);	268✔
145	} else {
146	if (tlen > 32) {	×
147	len += tsnprintf(buf + len, bufSize - len, "%.s...%s", 32, t, t + tlen - 1);	×
148	} else {
149	len += tsnprintf(buf + len, bufSize - *len, "%s", t);	×
150	}
151	}
152
153	taosMemoryFree(t);	268!
154
155	return TSDB_CODE_SUCCESS;	268✔
156	}
157	case QUERY_NODE_OPERATOR: {	628✔
158	SOperatorNode pOpNode = (SOperatorNode )pNode;	628✔
159	len += tsnprintf(buf + len, bufSize - *len, "(");	628✔
160	if (pOpNode->pLeft) {	628!
161	NODES_ERR_RET(nodesNodeToSQLFormat(pOpNode->pLeft, buf, bufSize, len, true));	628!
162	}
163
164	len += tsnprintf(buf + len, bufSize - *len, " %s ", operatorTypeStr(pOpNode->opType));	628✔
165
166	if (pOpNode->pRight) {	628!
167	NODES_ERR_RET(nodesNodeToSQLFormat(pOpNode->pRight, buf, bufSize, len, true));	628!
168	}
169
170	len += tsnprintf(buf + len, bufSize - *len, ")");	628✔
171
172	return TSDB_CODE_SUCCESS;	628✔
173	}
174	case QUERY_NODE_LOGIC_CONDITION: {	29✔
175	SLogicConditionNode pLogicNode = (SLogicConditionNode )pNode;	29✔
176	SNode *node = NULL;	29✔
177	bool first = true;	29✔
178
179	len += tsnprintf(buf + len, bufSize - *len, "(");	29✔
180
181	FOREACH(node, pLogicNode->pParameterList) {	87!
182	if (!first) {	58✔
183	len += tsnprintf(buf + len, bufSize - *len, " %s ", logicConditionTypeStr(pLogicNode->condType));	29✔
184	}
185	NODES_ERR_RET(nodesNodeToSQLFormat(node, buf, bufSize, len, true));	58!
186	first = false;	58✔
187	}
188
189	len += tsnprintf(buf + len, bufSize - *len, ")");	29✔
190
191	return TSDB_CODE_SUCCESS;	29✔
192	}
193	case QUERY_NODE_FUNCTION: {	36✔
194	SFunctionNode pFuncNode = (SFunctionNode )pNode;	36✔
195	SNode *node = NULL;	36✔
196	bool first = true;	36✔
197
198	len += tsnprintf(buf + len, bufSize - *len, "%s(", pFuncNode->functionName);	36✔
199
200	FOREACH(node, pFuncNode->pParameterList) {	180!
201	if (!first) {	144✔
202	len += tsnprintf(buf + len, bufSize - *len, ", ");	108✔
203	}
204	NODES_ERR_RET(nodesNodeToSQLFormat(node, buf, bufSize, len, true));	144!
205	first = false;	144✔
206	}
207
208	len += tsnprintf(buf + len, bufSize - *len, ")");	36✔
209
210	return TSDB_CODE_SUCCESS;	36✔
211	}
212	case QUERY_NODE_NODE_LIST: {	5✔
213	SNodeListNode pListNode = (SNodeListNode )pNode;	5✔
214	SNode *node = NULL;	5✔
215	bool first = true;	5✔
216	int32_t num = 0;	5✔
217
218	len += tsnprintf(buf + len, bufSize - *len, "(");	5✔
219
220	FOREACH(node, pListNode->pNodeList) {	24!
221	if (!first) {	19✔
222	len += tsnprintf(buf + len, bufSize - *len, ", ");	14✔
223	if (!longFormat) {	14!
224	if (++num >= 10) {	×
225	len += tsnprintf(buf + len, bufSize - *len, "...");	×
226	break;	×
227	}
228	}
229	}
230	NODES_ERR_RET(nodesNodeToSQLFormat(node, buf, bufSize, len, true));	19!
231	first = false;	19✔
232	}
233
234	len += tsnprintf(buf + len, bufSize - *len, ")");	5✔
235
236	return TSDB_CODE_SUCCESS;	5✔
237	}
238	default:	×
239	break;	×
240	}
241
242	nodesError("nodesNodeToSQL unknown node = %s", nodesNodeName(pNode->type));	×
243	NODES_RET(TSDB_CODE_APP_ERROR);	×
244	}

taosdata / TDengine / #4672

Source File Press 'n' to go to next uncovered line, 'b' for previous

Source File
Press 'n' to go to next uncovered line, 'b' for previous