From 38fbff09e05ec642d37b9717bb11078ac47040b5 Mon Sep 17 00:00:00 2001 From: dapan1121 <89396746@qq.com> Date: Tue, 1 Jun 2021 16:45:54 +0800 Subject: [PATCH 1/3] fix bug --- src/client/src/tscSQLParser.c | 1 - 1 file changed, 1 deletion(-) diff --git a/src/client/src/tscSQLParser.c b/src/client/src/tscSQLParser.c index f1a514bc87..546760f37f 100644 --- a/src/client/src/tscSQLParser.c +++ b/src/client/src/tscSQLParser.c @@ -7697,7 +7697,6 @@ static int32_t doValidateSubquery(SSqlNode* pSqlNode, int32_t index, SSqlObj* pS tscInitQueryInfo(pSub); int32_t code = validateSqlNode(pSql, p, pSub); - assert(code != TSDB_CODE_TSC_ACTION_IN_PROGRESS); if (code != TSDB_CODE_SUCCESS) { return code; } From d3f6277a1e614c24fe9231c1ee75d92c656514f0 Mon Sep 17 00:00:00 2001 From: dapan1121 <89396746@qq.com> Date: Wed, 2 Jun 2021 14:01:31 +0800 Subject: [PATCH 2/3] fix ts precision issue --- src/client/src/tscUtil.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/client/src/tscUtil.c b/src/client/src/tscUtil.c index 15a8a9f678..507783e3cf 100644 --- a/src/client/src/tscUtil.c +++ b/src/client/src/tscUtil.c @@ -1170,7 +1170,8 @@ void handleDownstreamOperator(SSqlObj** pSqlObjList, int32_t numOfUpstream, SQue int32_t numOfFilterCols1 = 0; SSingleColumnFilterInfo* pFilterInfo1 = NULL; createInputDataFilterInfo(px, numOfCol1, &numOfFilterCols1, &pFilterInfo1); - + + pOutput->precision = pSqlObjList[i]->res.precision; p[i] = createDummyInputOperator(pSqlObjList[i], pSchema1, n, pFilterInfo1, numOfFilterCols1); memcpy(&schema[offset], pSchema1, n * sizeof(SSchema)); offset += n; @@ -4570,4 +4571,4 @@ SNewVgroupInfo createNewVgroupInfo(SVgroupMsg *pVgroupMsg) { } return info; -} \ No newline at end of file +} From 9726427adf0fdbcef554e8b1e0528abb0eea4b25 Mon Sep 17 00:00:00 2001 From: dapan1121 <89396746@qq.com> Date: Wed, 2 Jun 2021 14:19:50 +0800 Subject: [PATCH 3/3] fix issue --- src/client/src/tscUtil.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/client/src/tscUtil.c b/src/client/src/tscUtil.c index 507783e3cf..264985c2e0 100644 --- a/src/client/src/tscUtil.c +++ b/src/client/src/tscUtil.c @@ -1150,6 +1150,8 @@ void handleDownstreamOperator(SSqlObj** pSqlObjList, int32_t numOfUpstream, SQue SOperatorInfo* pSourceOperator = createDummyInputOperator(pSqlObjList[0], pSchema, numOfCol1, pFilterInfo, numOfFilterCols); + pOutput->precision = pSqlObjList[0]->res.precision; + SSchema* schema = NULL; if (px->numOfTables > 1) { SOperatorInfo** p = calloc(px->numOfTables, POINTER_BYTES); @@ -1171,7 +1173,6 @@ void handleDownstreamOperator(SSqlObj** pSqlObjList, int32_t numOfUpstream, SQue SSingleColumnFilterInfo* pFilterInfo1 = NULL; createInputDataFilterInfo(px, numOfCol1, &numOfFilterCols1, &pFilterInfo1); - pOutput->precision = pSqlObjList[i]->res.precision; p[i] = createDummyInputOperator(pSqlObjList[i], pSchema1, n, pFilterInfo1, numOfFilterCols1); memcpy(&schema[offset], pSchema1, n * sizeof(SSchema)); offset += n;