Skip to content

T
TDengine

taosdata / TDengine
接近 2 年 前同步成功

通知 1192
Star 22018
Fork 4786
T
TDengine
提交 3dc8eca0 编写于 作者: H Haojun Liao
浏览文件
操作

[td-4754]

上级 bd1b2a84
展开全部 隐藏空白更改
内联 并排
Showing with 324 addition and 1163 deletion
src/client/inc/tscUtil.h
浏览文件 @ 3dc8eca0
...@@ -210,7 +210,8 @@ int32_t createProjectionExpr(SQueryInfo* pQueryInfo, STableMetaInfo* pTableMetaI ...@@ -210,7 +210,8 @@ int32_t createProjectionExpr(SQueryInfo* pQueryInfo, STableMetaInfo* pTableMetaI
void clearAllTableMetaInfo(SQueryInfo* pQueryInfo, bool removeMeta); void clearAllTableMetaInfo(SQueryInfo* pQueryInfo, bool removeMeta);
SColumn* tscColumnClone(const SColumn* src); SColumn* tscColumnClone(const SColumn* src);
bool tscColumnExists(SArray* pColumnList, int32_t columnIndex, uint64_t uid); void tscColumnCopy(SColumn* pDest, const SColumn* pSrc);
int32_t tscColumnExists(SArray* pColumnList, int32_t columnId, uint64_t uid);
SColumn* tscColumnListInsert(SArray* pColumnList, int32_t columnIndex, uint64_t uid, SSchema* pSchema); SColumn* tscColumnListInsert(SArray* pColumnList, int32_t columnIndex, uint64_t uid, SSchema* pSchema);
void tscColumnListDestroy(SArray* pColList); void tscColumnListDestroy(SArray* pColList);
void tscColumnListCopy(SArray* dst, const SArray* src, uint64_t tableUid); void tscColumnListCopy(SArray* dst, const SArray* src, uint64_t tableUid);
......
src/client/src/tscSQLParser.c
浏览文件 @ 3dc8eca0
...@@ -1668,7 +1668,7 @@ static int32_t handleArithmeticExpr(SSqlCmd* pCmd, SQueryInfo* pQueryInfo, int32 ...@@ -1668,7 +1668,7 @@ static int32_t handleArithmeticExpr(SSqlCmd* pCmd, SQueryInfo* pQueryInfo, int32
// arithmetic expression always return result in the format of double float // arithmetic expression always return result in the format of double float
pExprInfo->base.resBytes = sizeof(double); pExprInfo->base.resBytes = sizeof(double);
pExprInfo->base.interBytes = sizeof(double); pExprInfo->base.interBytes = 0;
pExprInfo->base.resType = TSDB_DATA_TYPE_DOUBLE; pExprInfo->base.resType = TSDB_DATA_TYPE_DOUBLE;
pExprInfo->base.functionId = TSDB_FUNC_ARITHM; pExprInfo->base.functionId = TSDB_FUNC_ARITHM;
...@@ -1903,14 +1903,14 @@ SExprInfo* doAddProjectCol(SQueryInfo* pQueryInfo, int32_t colIndex, int32_t tab ...@@ -1903,14 +1903,14 @@ SExprInfo* doAddProjectCol(SQueryInfo* pQueryInfo, int32_t colIndex, int32_t tab
index.columnIndex = colIndex; index.columnIndex = colIndex;
} }
return tscExprAppend(pQueryInfo, functionId, &index, pSchema->type, pSchema->bytes, colId, pSchema->bytes, return tscExprAppend(pQueryInfo, functionId, &index, pSchema->type, pSchema->bytes, colId, 0,
(functionId == TSDB_FUNC_TAGPRJ)); (functionId == TSDB_FUNC_TAGPRJ));
} }
SExprInfo* tscAddFuncInSelectClause(SQueryInfo* pQueryInfo, int32_t outputColIndex, int16_t functionId, SExprInfo* tscAddFuncInSelectClause(SQueryInfo* pQueryInfo, int32_t outputColIndex, int16_t functionId,
SColumnIndex* pIndex, SSchema* pColSchema, int16_t flag, int16_t colId) { SColumnIndex* pIndex, SSchema* pColSchema, int16_t flag, int16_t colId) {
SExprInfo* pExpr = tscExprInsert(pQueryInfo, outputColIndex, functionId, pIndex, pColSchema->type, SExprInfo* pExpr = tscExprInsert(pQueryInfo, outputColIndex, functionId, pIndex, pColSchema->type,
pColSchema->bytes, colId, pColSchema->bytes, TSDB_COL_IS_TAG(flag)); pColSchema->bytes, colId, 0, TSDB_COL_IS_TAG(flag));
tstrncpy(pExpr->base.aliasName, pColSchema->name, sizeof(pExpr->base.aliasName)); tstrncpy(pExpr->base.aliasName, pColSchema->name, sizeof(pExpr->base.aliasName));
tstrncpy(pExpr->base.token, pColSchema->name, sizeof(pExpr->base.token)); tstrncpy(pExpr->base.token, pColSchema->name, sizeof(pExpr->base.token));
...@@ -2065,7 +2065,7 @@ static int32_t setExprInfoForFunctions(SSqlCmd* pCmd, SQueryInfo* pQueryInfo, SS ...@@ -2065,7 +2065,7 @@ static int32_t setExprInfoForFunctions(SSqlCmd* pCmd, SQueryInfo* pQueryInfo, SS
type = pSchema->type; type = pSchema->type;
bytes = pSchema->bytes; bytes = pSchema->bytes;
} }
SExprInfo* pExpr = tscExprAppend(pQueryInfo, functionID, pColIndex, type, bytes, getNewResColId(pCmd), bytes, false); SExprInfo* pExpr = tscExprAppend(pQueryInfo, functionID, pColIndex, type, bytes, getNewResColId(pCmd), bytes, false);
tstrncpy(pExpr->base.aliasName, name, tListLen(pExpr->base.aliasName)); tstrncpy(pExpr->base.aliasName, name, tListLen(pExpr->base.aliasName));
...@@ -2134,6 +2134,17 @@ static void updateLastScanOrderIfNeeded(SQueryInfo* pQueryInfo) { ...@@ -2134,6 +2134,17 @@ static void updateLastScanOrderIfNeeded(SQueryInfo* pQueryInfo) {
} }
} }
static UNUSED_FUNC void updateFunctionInterBuf(SQueryInfo* pQueryInfo, bool superTable) {
size_t numOfExpr = tscNumOfExprs(pQueryInfo);
for (int32_t i = 0; i < numOfExpr; ++i) {
SExprInfo* pExpr = tscExprGet(pQueryInfo, i);
int32_t param = (int32_t)pExpr->base.param[0].i64;
getResultDataInfo(pExpr->base.colType, pExpr->base.colBytes, pExpr->base.functionId, param, &pExpr->base.resType, &pExpr->base.resBytes,
&pExpr->base.interBytes, 0, superTable);
}
}
int32_t addExprAndResultField(SSqlCmd* pCmd, SQueryInfo* pQueryInfo, int32_t colIndex, tSqlExprItem* pItem, bool finalResult) { int32_t addExprAndResultField(SSqlCmd* pCmd, SQueryInfo* pQueryInfo, int32_t colIndex, tSqlExprItem* pItem, bool finalResult) {
STableMetaInfo* pTableMetaInfo = NULL; STableMetaInfo* pTableMetaInfo = NULL;
int32_t functionId = pItem->pNode->functionId; int32_t functionId = pItem->pNode->functionId;
...@@ -2562,7 +2573,7 @@ int32_t addExprAndResultField(SSqlCmd* pCmd, SQueryInfo* pQueryInfo, int32_t col ...@@ -2562,7 +2573,7 @@ int32_t addExprAndResultField(SSqlCmd* pCmd, SQueryInfo* pQueryInfo, int32_t col
// set the first column ts for top/bottom query // set the first column ts for top/bottom query
SColumnIndex index1 = {index.tableIndex, PRIMARYKEY_TIMESTAMP_COL_INDEX}; SColumnIndex index1 = {index.tableIndex, PRIMARYKEY_TIMESTAMP_COL_INDEX};
pExpr = tscExprAppend(pQueryInfo, TSDB_FUNC_TS, &index1, TSDB_DATA_TYPE_TIMESTAMP, TSDB_KEYSIZE, getNewResColId(pCmd), pExpr = tscExprAppend(pQueryInfo, TSDB_FUNC_TS, &index1, TSDB_DATA_TYPE_TIMESTAMP, TSDB_KEYSIZE, getNewResColId(pCmd),
TSDB_KEYSIZE, false); 0, false);
tstrncpy(pExpr->base.aliasName, aAggs[TSDB_FUNC_TS].name, sizeof(pExpr->base.aliasName)); tstrncpy(pExpr->base.aliasName, aAggs[TSDB_FUNC_TS].name, sizeof(pExpr->base.aliasName));
const int32_t TS_COLUMN_INDEX = PRIMARYKEY_TIMESTAMP_COL_INDEX; const int32_t TS_COLUMN_INDEX = PRIMARYKEY_TIMESTAMP_COL_INDEX;
...@@ -3077,15 +3088,10 @@ bool hasUnsupportFunctionsForSTableQuery(SSqlCmd* pCmd, SQueryInfo* pQueryInfo) ...@@ -3077,15 +3088,10 @@ bool hasUnsupportFunctionsForSTableQuery(SSqlCmd* pCmd, SQueryInfo* pQueryInfo)
return true; return true;
} }
if (pQueryInfo->groupbyExpr.numOfGroupCols != 1) { SColIndex* pColIndex = taosArrayGet(pQueryInfo->groupbyExpr.columnInfo, 0);
if (pColIndex->colIndex != TSDB_TBNAME_COLUMN_INDEX) {
invalidOperationMsg(tscGetErrorMsgPayload(pCmd), msg2); invalidOperationMsg(tscGetErrorMsgPayload(pCmd), msg2);
return true; return true;
} else {
SColIndex* pColIndex = taosArrayGet(pQueryInfo->groupbyExpr.columnInfo, 0);
if (pColIndex->colIndex != TSDB_TBNAME_COLUMN_INDEX) {
invalidOperationMsg(tscGetErrorMsgPayload(pCmd), msg2);
return true;
}
} }
} else if (tscIsSessionWindowQuery(pQueryInfo)) { } else if (tscIsSessionWindowQuery(pQueryInfo)) {
invalidOperationMsg(tscGetErrorMsgPayload(pCmd), msg3); invalidOperationMsg(tscGetErrorMsgPayload(pCmd), msg3);
...@@ -3636,7 +3642,7 @@ static int32_t checkAndSetJoinCondInfo(SSqlCmd* pCmd, SQueryInfo* pQueryInfo, tS ...@@ -3636,7 +3642,7 @@ static int32_t checkAndSetJoinCondInfo(SSqlCmd* pCmd, SQueryInfo* pQueryInfo, tS
STableMeta* pTableMeta = pTableMetaInfo->pTableMeta; STableMeta* pTableMeta = pTableMetaInfo->pTableMeta;
index.columnIndex = index.columnIndex - tscGetNumOfColumns(pTableMetaInfo->pTableMeta); index.columnIndex = index.columnIndex - tscGetNumOfColumns(pTableMetaInfo->pTableMeta);
if (!tscColumnExists(pTableMetaInfo->tagColList, index.columnIndex, pTableMetaInfo->pTableMeta->id.uid)) { if (tscColumnExists(pTableMetaInfo->tagColList, pTagSchema1->colId, pTableMetaInfo->pTableMeta->id.uid) < 0) {
tscColumnListInsert(pTableMetaInfo->tagColList, index.columnIndex, pTableMeta->id.uid, pTagSchema1); tscColumnListInsert(pTableMetaInfo->tagColList, index.columnIndex, pTableMeta->id.uid, pTagSchema1);
if (taosArrayGetSize(pTableMetaInfo->tagColList) > 1) { if (taosArrayGetSize(pTableMetaInfo->tagColList) > 1) {
...@@ -3668,7 +3674,7 @@ static int32_t checkAndSetJoinCondInfo(SSqlCmd* pCmd, SQueryInfo* pQueryInfo, tS ...@@ -3668,7 +3674,7 @@ static int32_t checkAndSetJoinCondInfo(SSqlCmd* pCmd, SQueryInfo* pQueryInfo, tS
if (UTIL_TABLE_IS_SUPER_TABLE(pTableMetaInfo)) { if (UTIL_TABLE_IS_SUPER_TABLE(pTableMetaInfo)) {
STableMeta* pTableMeta = pTableMetaInfo->pTableMeta; STableMeta* pTableMeta = pTableMetaInfo->pTableMeta;
index.columnIndex = index.columnIndex - tscGetNumOfColumns(pTableMeta); index.columnIndex = index.columnIndex - tscGetNumOfColumns(pTableMeta);
if (!tscColumnExists(pTableMetaInfo->tagColList, index.columnIndex, pTableMeta->id.uid)) { if (tscColumnExists(pTableMetaInfo->tagColList, pTagSchema2->colId, pTableMeta->id.uid) < 0) {
tscColumnListInsert(pTableMetaInfo->tagColList, index.columnIndex, pTableMeta->id.uid, pTagSchema2); tscColumnListInsert(pTableMetaInfo->tagColList, index.columnIndex, pTableMeta->id.uid, pTagSchema2);
if (taosArrayGetSize(pTableMetaInfo->tagColList) > 1) { if (taosArrayGetSize(pTableMetaInfo->tagColList) > 1) {
...@@ -7830,6 +7836,9 @@ int32_t validateSqlNode(SSqlObj* pSql, SSqlNode* pSqlNode, SQueryInfo* pQueryInf ...@@ -7830,6 +7836,9 @@ int32_t validateSqlNode(SSqlObj* pSql, SSqlNode* pSqlNode, SQueryInfo* pQueryInf
if ((code = doFunctionsCompatibleCheck(pCmd, pQueryInfo, tscGetErrorMsgPayload(pCmd))) != TSDB_CODE_SUCCESS) { if ((code = doFunctionsCompatibleCheck(pCmd, pQueryInfo, tscGetErrorMsgPayload(pCmd))) != TSDB_CODE_SUCCESS) {
return code; return code;
} }
// updateFunctionInterBuf(pQueryInfo, false);
} else { } else {
pQueryInfo->command = TSDB_SQL_SELECT; pQueryInfo->command = TSDB_SQL_SELECT;
...@@ -7958,6 +7967,7 @@ int32_t validateSqlNode(SSqlObj* pSql, SSqlNode* pSqlNode, SQueryInfo* pQueryInf ...@@ -7958,6 +7967,7 @@ int32_t validateSqlNode(SSqlObj* pSql, SSqlNode* pSqlNode, SQueryInfo* pQueryInf
updateLastScanOrderIfNeeded(pQueryInfo); updateLastScanOrderIfNeeded(pQueryInfo);
tscFieldInfoUpdateOffset(pQueryInfo); tscFieldInfoUpdateOffset(pQueryInfo);
// updateFunctionInterBuf(pQueryInfo, isSTable);
if ((code = validateFillNode(pCmd, pQueryInfo, pSqlNode)) != TSDB_CODE_SUCCESS) { if ((code = validateFillNode(pCmd, pQueryInfo, pSqlNode)) != TSDB_CODE_SUCCESS) {
return code; return code;
......
src/client/src/tscServer.c
浏览文件 @ 3dc8eca0
...@@ -795,6 +795,7 @@ static int32_t serializeSqlExpr(SSqlExpr* pExpr, STableMetaInfo* pTableMetaInfo, ...@@ -795,6 +795,7 @@ static int32_t serializeSqlExpr(SSqlExpr* pExpr, STableMetaInfo* pTableMetaInfo,
pSqlExpr->colBytes = htons(pExpr->colBytes); pSqlExpr->colBytes = htons(pExpr->colBytes);
pSqlExpr->resType = htons(pExpr->resType); pSqlExpr->resType = htons(pExpr->resType);
pSqlExpr->resBytes = htons(pExpr->resBytes); pSqlExpr->resBytes = htons(pExpr->resBytes);
pSqlExpr->interBytes = htonl(pExpr->interBytes);
pSqlExpr->functionId = htons(pExpr->functionId); pSqlExpr->functionId = htons(pExpr->functionId);
pSqlExpr->numOfParams = htons(pExpr->numOfParams); pSqlExpr->numOfParams = htons(pExpr->numOfParams);
pSqlExpr->resColId = htons(pExpr->resColId); pSqlExpr->resColId = htons(pExpr->resColId);
......
src/client/src/tscSubquery.c
浏览文件 @ 3dc8eca0
...@@ -103,13 +103,6 @@ bool subAndCheckDone(SSqlObj *pSql, SSqlObj *pParentSql, int idx) { ...@@ -103,13 +103,6 @@ bool subAndCheckDone(SSqlObj *pSql, SSqlObj *pParentSql, int idx) {
pthread_mutex_lock(&subState->mutex); pthread_mutex_lock(&subState->mutex);
// bool done = allSubqueryDone(pParentSql);
// if (done) {
// tscDebug("0x%"PRIx64" subquery:0x%"PRIx64",%d all subs already done", pParentSql->self, pSql->self, idx);
// pthread_mutex_unlock(&subState->mutex);
// return false;
// }
tscDebug("0x%"PRIx64" subquery:0x%"PRIx64", index:%d state set to 1", pParentSql->self, pSql->self, idx); tscDebug("0x%"PRIx64" subquery:0x%"PRIx64", index:%d state set to 1", pParentSql->self, pSql->self, idx);
subState->states[idx] = 1; subState->states[idx] = 1;
...@@ -2389,8 +2382,14 @@ int32_t tscHandleFirstRoundStableQuery(SSqlObj *pSql) { ...@@ -2389,8 +2382,14 @@ int32_t tscHandleFirstRoundStableQuery(SSqlObj *pSql) {
SColumn *pCol = taosArrayGetP(pColList, i); SColumn *pCol = taosArrayGetP(pColList, i);
if (pCol->info.flist.numOfFilters > 0) { // copy to the pNew->cmd.colList if it is filtered. if (pCol->info.flist.numOfFilters > 0) { // copy to the pNew->cmd.colList if it is filtered.
SColumn *p = tscColumnClone(pCol); int32_t index1 = tscColumnExists(pNewQueryInfo->colList, pCol->columnIndex, pCol->tableUid);
taosArrayPush(pNewQueryInfo->colList, &p); if (index1 >= 0) {
SColumn* x = taosArrayGetP(pNewQueryInfo->colList, index1);
tscColumnCopy(x, pCol);
} else {
SColumn *p = tscColumnClone(pCol);
taosArrayPush(pNewQueryInfo->colList, &p);
}
} }
} }
......
src/client/src/tscUtil.c
浏览文件 @ 3dc8eca0
...@@ -2270,18 +2270,14 @@ int32_t tscExprCopyAll(SArray* dst, const SArray* src, bool deepcopy) { ...@@ -2270,18 +2270,14 @@ int32_t tscExprCopyAll(SArray* dst, const SArray* src, bool deepcopy) {
return 0; return 0;
} }
bool tscColumnExists(SArray* pColumnList, int32_t columnIndex, uint64_t uid) { // ignore the tbname columnIndex to be inserted into source list
// ignore the tbname columnIndex to be inserted into source list int32_t tscColumnExists(SArray* pColumnList, int32_t columnId, uint64_t uid) {
if (columnIndex < 0) {
return false;
}
size_t numOfCols = taosArrayGetSize(pColumnList); size_t numOfCols = taosArrayGetSize(pColumnList);
int32_t i = 0; int32_t i = 0;
while (i < numOfCols) { while (i < numOfCols) {
SColumn* pCol = taosArrayGetP(pColumnList, i); SColumn* pCol = taosArrayGetP(pColumnList, i);
if ((pCol->columnIndex != columnIndex) || (pCol->tableUid != uid)) { if ((pCol->info.colId != columnId) || (pCol->tableUid != uid)) {
++i; ++i;
continue; continue;
} else { } else {
...@@ -2290,10 +2286,10 @@ bool tscColumnExists(SArray* pColumnList, int32_t columnIndex, uint64_t uid) { ...@@ -2290,10 +2286,10 @@ bool tscColumnExists(SArray* pColumnList, int32_t columnIndex, uint64_t uid) {
} }
if (i >= numOfCols || numOfCols == 0) { if (i >= numOfCols || numOfCols == 0) {
return false; return -1;
} }
return true; return i;
} }
void tscExprAssign(SExprInfo* dst, const SExprInfo* src) { void tscExprAssign(SExprInfo* dst, const SExprInfo* src) {
...@@ -2379,13 +2375,7 @@ SColumn* tscColumnClone(const SColumn* src) { ...@@ -2379,13 +2375,7 @@ SColumn* tscColumnClone(const SColumn* src) {
return NULL; return NULL;
} }
dst->columnIndex = src->columnIndex; tscColumnCopy(dst, src);
dst->tableUid = src->tableUid;
dst->info.flist.numOfFilters = src->info.flist.numOfFilters;
dst->info.flist.filterInfo = tFilterInfoDup(src->info.flist.filterInfo, src->info.flist.numOfFilters);
dst->info.type = src->info.type;
dst->info.colId = src->info.colId;
dst->info.bytes = src->info.bytes;
return dst; return dst;
} }
...@@ -2394,6 +2384,18 @@ static void tscColumnDestroy(SColumn* pCol) { ...@@ -2394,6 +2384,18 @@ static void tscColumnDestroy(SColumn* pCol) {
free(pCol); free(pCol);
} }
void tscColumnCopy(SColumn* pDest, const SColumn* pSrc) {
destroyFilterInfo(&pDest->info.flist);
pDest->columnIndex = pSrc->columnIndex;
pDest->tableUid = pSrc->tableUid;
pDest->info.flist.numOfFilters = pSrc->info.flist.numOfFilters;
pDest->info.flist.filterInfo = tFilterInfoDup(pSrc->info.flist.filterInfo, pSrc->info.flist.numOfFilters);
pDest->info.type = pSrc->info.type;
pDest->info.colId = pSrc->info.colId;
pDest->info.bytes = pSrc->info.bytes;
}
void tscColumnListCopy(SArray* dst, const SArray* src, uint64_t tableUid) { void tscColumnListCopy(SArray* dst, const SArray* src, uint64_t tableUid) {
assert(src != NULL && dst != NULL); assert(src != NULL && dst != NULL);
......
src/query/inc/qAggMain.h
浏览文件 @ 3dc8eca0
...@@ -204,7 +204,7 @@ typedef struct SAggFunctionInfo { ...@@ -204,7 +204,7 @@ typedef struct SAggFunctionInfo {
bool (*init)(SQLFunctionCtx *pCtx); // setup the execute environment bool (*init)(SQLFunctionCtx *pCtx); // setup the execute environment
void (*xFunction)(SQLFunctionCtx *pCtx); // blocks version function void (*xFunction)(SQLFunctionCtx *pCtx); // blocks version function
void (*xFunctionF)(SQLFunctionCtx *pCtx, int32_t position); // single-row function version, todo merge with blockwise function // void (*xFunctionF)(SQLFunctionCtx *pCtx, int32_t position); // single-row function version, todo merge with blockwise function
// finalizer must be called after all xFunction has been executed to generated final result. // finalizer must be called after all xFunction has been executed to generated final result.
void (*xFinalize)(SQLFunctionCtx *pCtx); void (*xFinalize)(SQLFunctionCtx *pCtx);
......
src/query/inc/qExecutor.h
浏览文件 @ 3dc8eca0
...@@ -295,7 +295,7 @@ enum OPERATOR_TYPE_E { ...@@ -295,7 +295,7 @@ enum OPERATOR_TYPE_E {
OP_MultiTableAggregate = 14, OP_MultiTableAggregate = 14,
OP_MultiTableTimeInterval = 15, OP_MultiTableTimeInterval = 15,
OP_DummyInput = 16, //TODO remove it after fully refactor. OP_DummyInput = 16, //TODO remove it after fully refactor.
OP_MultiwayMergeSort = 17, // multi-way data merge into one input stream. OP_MultiwayMergeSort = 17, // multi-way data merge into one input stream.
OP_GlobalAggregate = 18, // global merge for the multi-way data sources. OP_GlobalAggregate = 18, // global merge for the multi-way data sources.
OP_Filter = 19, OP_Filter = 19,
OP_Distinct = 20, OP_Distinct = 20,
......
src/query/inc/sql.y
浏览文件 @ 3dc8eca0
...@@ -469,7 +469,7 @@ tagitem(A) ::= PLUS(X) FLOAT(Y). { ...@@ -469,7 +469,7 @@ tagitem(A) ::= PLUS(X) FLOAT(Y). {
//////////////////////// The SELECT statement ///////////////////////////////// //////////////////////// The SELECT statement /////////////////////////////////
%type select {SSqlNode*} %type select {SSqlNode*}
%destructor select {destroySqlNode($$);} %destructor select {destroySqlNode($$);}
select(A) ::= SELECT(T) selcollist(W) from(X) where_opt(Y) interval_opt(K) session_option(H) windowstate_option(D) fill_opt(F) sliding_opt(S) groupby_opt(P) orderby_opt(Z) having_opt(N) slimit_opt(G) limit_opt(L). { select(A) ::= SELECT(T) selcollist(W) from(X) where_opt(Y) interval_opt(K) session_option(H) windowstate_option(D) fill_opt(F) sliding_opt(S) groupby_opt(P) having_opt(N) orderby_opt(Z) slimit_opt(G) limit_opt(L). {
A = tSetQuerySqlNode(&T, W, X, Y, P, Z, &K, &H, &D, &S, F, &L, &G, N); A = tSetQuerySqlNode(&T, W, X, Y, P, Z, &K, &H, &D, &S, F, &L, &G, N);
} }
......
src/query/src/qAggMain.c
浏览文件 @ 3dc8eca0
此差异已折叠。
src/query/src/qExecutor.c
浏览文件 @ 3dc8eca0
...@@ -161,7 +161,7 @@ static void setResultOutputBuf(SQueryRuntimeEnv* pRuntimeEnv, SResultRow* pResul ...@@ -161,7 +161,7 @@ static void setResultOutputBuf(SQueryRuntimeEnv* pRuntimeEnv, SResultRow* pResul
int32_t numOfCols, int32_t* rowCellInfoOffset); int32_t numOfCols, int32_t* rowCellInfoOffset);
void setResultRowOutputBufInitCtx(SQueryRuntimeEnv *pRuntimeEnv, SResultRow *pResult, SQLFunctionCtx* pCtx, int32_t numOfOutput, int32_t* rowCellInfoOffset); void setResultRowOutputBufInitCtx(SQueryRuntimeEnv *pRuntimeEnv, SResultRow *pResult, SQLFunctionCtx* pCtx, int32_t numOfOutput, int32_t* rowCellInfoOffset);
static bool functionNeedToExecute(SQueryRuntimeEnv *pRuntimeEnv, SQLFunctionCtx *pCtx, int32_t functionId); static bool functionNeedToExecute(SQueryRuntimeEnv *pRuntimeEnv, SQLFunctionCtx *pCtx);
static void setBlockStatisInfo(SQLFunctionCtx *pCtx, SSDataBlock* pSDataBlock, SColIndex* pColIndex); static void setBlockStatisInfo(SQLFunctionCtx *pCtx, SSDataBlock* pSDataBlock, SColIndex* pColIndex);
...@@ -309,7 +309,7 @@ static bool isProjQuery(SQueryAttr *pQueryAttr) { ...@@ -309,7 +309,7 @@ static bool isProjQuery(SQueryAttr *pQueryAttr) {
return true; return true;
} }
static bool hasNullRv(SColIndex* pColIndex, SDataStatis *pStatis) { static bool hasNull(SColIndex* pColIndex, SDataStatis *pStatis) {
if (TSDB_COL_IS_TAG(pColIndex->flag) || TSDB_COL_IS_UD_COL(pColIndex->flag) || pColIndex->colId == PRIMARYKEY_TIMESTAMP_COL_INDEX) { if (TSDB_COL_IS_TAG(pColIndex->flag) || TSDB_COL_IS_UD_COL(pColIndex->flag) || pColIndex->colId == PRIMARYKEY_TIMESTAMP_COL_INDEX) {
return false; return false;
} }
...@@ -708,12 +708,13 @@ static int32_t getNumOfRowsInTimeWindow(SQueryRuntimeEnv* pRuntimeEnv, SDataBloc ...@@ -708,12 +708,13 @@ static int32_t getNumOfRowsInTimeWindow(SQueryRuntimeEnv* pRuntimeEnv, SDataBloc
static void doApplyFunctions(SQueryRuntimeEnv* pRuntimeEnv, SQLFunctionCtx* pCtx, STimeWindow* pWin, int32_t offset, static void doApplyFunctions(SQueryRuntimeEnv* pRuntimeEnv, SQLFunctionCtx* pCtx, STimeWindow* pWin, int32_t offset,
int32_t forwardStep, TSKEY* tsCol, int32_t numOfTotal, int32_t numOfOutput) { int32_t forwardStep, TSKEY* tsCol, int32_t numOfTotal, int32_t numOfOutput) {
SQueryAttr *pQueryAttr = pRuntimeEnv->pQueryAttr; SQueryAttr *pQueryAttr = pRuntimeEnv->pQueryAttr;
bool hasPrev = pCtx[0].preAggVals.isSet; bool hasAggregates = pCtx[0].preAggVals.isSet;
for (int32_t k = 0; k < numOfOutput; ++k) { for (int32_t k = 0; k < numOfOutput; ++k) {
pCtx[k].size = forwardStep; pCtx[k].size = forwardStep;
pCtx[k].startTs = pWin->skey; pCtx[k].startTs = pWin->skey;
// keep it temprarily
char* start = pCtx[k].pInput; char* start = pCtx[k].pInput;
int32_t pos = (QUERY_IS_ASC_QUERY(pQueryAttr)) ? offset : offset - (forwardStep - 1); int32_t pos = (QUERY_IS_ASC_QUERY(pQueryAttr)) ? offset : offset - (forwardStep - 1);
...@@ -725,20 +726,18 @@ static void doApplyFunctions(SQueryRuntimeEnv* pRuntimeEnv, SQLFunctionCtx* pCtx ...@@ -725,20 +726,18 @@ static void doApplyFunctions(SQueryRuntimeEnv* pRuntimeEnv, SQLFunctionCtx* pCtx
pCtx[k].ptsList = &tsCol[pos]; pCtx[k].ptsList = &tsCol[pos];
} }
int32_t functionId = pCtx[k].functionId;
// not a whole block involved in query processing, statistics data can not be used // not a whole block involved in query processing, statistics data can not be used
// NOTE: the original value of isSet have been changed here // NOTE: the original value of isSet have been changed here
if (pCtx[k].preAggVals.isSet && forwardStep < numOfTotal) { if (pCtx[k].preAggVals.isSet && forwardStep < numOfTotal) {
pCtx[k].preAggVals.isSet = false; pCtx[k].preAggVals.isSet = false;
} }
if (functionNeedToExecute(pRuntimeEnv, &pCtx[k], functionId)) { if (functionNeedToExecute(pRuntimeEnv, &pCtx[k])) {
aAggs[functionId].xFunction(&pCtx[k]); aAggs[pCtx[k].functionId].xFunction(&pCtx[k]);
} }
// restore it // restore it
pCtx[k].preAggVals.isSet = hasPrev; pCtx[k].preAggVals.isSet = hasAggregates;
pCtx[k].pInput = start; pCtx[k].pInput = start;
} }
} }
...@@ -847,9 +846,6 @@ static void setNotInterpoWindowKey(SQLFunctionCtx* pCtx, int32_t numOfOutput, in ...@@ -847,9 +846,6 @@ static void setNotInterpoWindowKey(SQLFunctionCtx* pCtx, int32_t numOfOutput, in
} }
} }
// window start key interpolation
static void saveDataBlockLastRow(SQueryRuntimeEnv* pRuntimeEnv, SDataBlockInfo* pDataBlockInfo, SArray* pDataBlock, static void saveDataBlockLastRow(SQueryRuntimeEnv* pRuntimeEnv, SDataBlockInfo* pDataBlockInfo, SArray* pDataBlock,
int32_t rowIndex) { int32_t rowIndex) {
if (pDataBlock == NULL) { if (pDataBlock == NULL) {
...@@ -975,10 +971,9 @@ static void doAggregateImpl(SOperatorInfo* pOperator, TSKEY startTs, SQLFunction ...@@ -975,10 +971,9 @@ static void doAggregateImpl(SOperatorInfo* pOperator, TSKEY startTs, SQLFunction
SQueryRuntimeEnv* pRuntimeEnv = pOperator->pRuntimeEnv; SQueryRuntimeEnv* pRuntimeEnv = pOperator->pRuntimeEnv;
for (int32_t k = 0; k < pOperator->numOfOutput; ++k) { for (int32_t k = 0; k < pOperator->numOfOutput; ++k) {
int32_t functionId = pCtx[k].functionId; if (functionNeedToExecute(pRuntimeEnv, &pCtx[k])) {
if (functionNeedToExecute(pRuntimeEnv, &pCtx[k], functionId)) {
pCtx[k].startTs = startTs;// this can be set during create the struct pCtx[k].startTs = startTs;// this can be set during create the struct
aAggs[functionId].xFunction(&pCtx[k]); aAggs[pCtx[k].functionId].xFunction(&pCtx[k]);
} }
} }
} }
...@@ -1287,6 +1282,15 @@ static void doHashGroupbyAgg(SOperatorInfo* pOperator, SGroupbyOperatorInfo *pIn ...@@ -1287,6 +1282,15 @@ static void doHashGroupbyAgg(SOperatorInfo* pOperator, SGroupbyOperatorInfo *pIn
return; return;
} }
int64_t* tsList = NULL;
SColumnInfoData* pFirstColData = taosArrayGet(pSDataBlock->pDataBlock, 0);
if (pFirstColData->info.type == TSDB_DATA_TYPE_TIMESTAMP) {
tsList = (int64_t*) pFirstColData->pData;
}
STimeWindow w = TSWINDOW_INITIALIZER;
int32_t num = 0;
for (int32_t j = 0; j < pSDataBlock->info.rows; ++j) { for (int32_t j = 0; j < pSDataBlock->info.rows; ++j) {
char* val = ((char*)pColInfoData->pData) + bytes * j; char* val = ((char*)pColInfoData->pData) + bytes * j;
if (isNull(val, type)) { if (isNull(val, type)) {
...@@ -1294,33 +1298,51 @@ static void doHashGroupbyAgg(SOperatorInfo* pOperator, SGroupbyOperatorInfo *pIn ...@@ -1294,33 +1298,51 @@ static void doHashGroupbyAgg(SOperatorInfo* pOperator, SGroupbyOperatorInfo *pIn
} }
// Compare with the previous row of this column, and do not set the output buffer again if they are identical. // Compare with the previous row of this column, and do not set the output buffer again if they are identical.
if (pInfo->prevData == NULL || (memcmp(pInfo->prevData, val, bytes) != 0)) { if (pInfo->prevData == NULL) {
if (pInfo->prevData == NULL) { pInfo->prevData = malloc(bytes);
pInfo->prevData = malloc(bytes);
}
memcpy(pInfo->prevData, val, bytes); memcpy(pInfo->prevData, val, bytes);
num++;
continue;
}
if (pQueryAttr->stableQuery && pQueryAttr->stabledev && (pRuntimeEnv->prevResult != NULL)) { if (memcmp(pInfo->prevData, val, bytes) == 0) {
setParamForStableStddevByColData(pRuntimeEnv, pInfo->binfo.pCtx, pOperator->numOfOutput, pOperator->pExpr, val, bytes); num++;
} continue;
}
int32_t ret = if (pQueryAttr->stableQuery && pQueryAttr->stabledev && (pRuntimeEnv->prevResult != NULL)) {
setGroupResultOutputBuf(pRuntimeEnv, &(pInfo->binfo), pOperator->numOfOutput, val, type, bytes, item->groupIndex); setParamForStableStddevByColData(pRuntimeEnv, pInfo->binfo.pCtx, pOperator->numOfOutput, pOperator->pExpr, pInfo->prevData,
if (ret != TSDB_CODE_SUCCESS) { // null data, too many state code bytes);
longjmp(pRuntimeEnv->env, TSDB_CODE_QRY_APP_ERROR);
}
} }
int32_t ret = setGroupResultOutputBuf(pRuntimeEnv, &(pInfo->binfo), pOperator->numOfOutput, pInfo->prevData, type, bytes,
item->groupIndex);
if (ret != TSDB_CODE_SUCCESS) { // null data, too many state code
longjmp(pRuntimeEnv->env, TSDB_CODE_QRY_APP_ERROR);
}
// todo opt perf doApplyFunctions(pRuntimeEnv, pInfo->binfo.pCtx, &w, j - num, num, tsList, pSDataBlock->info.rows, pOperator->numOfOutput);
for (int32_t k = 0; k < pOperator->numOfOutput; ++k) {
pInfo->binfo.pCtx[k].size = 1; num = 1;
int32_t functionId = pInfo->binfo.pCtx[k].functionId; memcpy(pInfo->prevData, val, bytes);
if (functionNeedToExecute(pRuntimeEnv, &pInfo->binfo.pCtx[k], functionId)) { }
aAggs[functionId].xFunctionF(&pInfo->binfo.pCtx[k], j);
} if (num > 0) {
char* val = ((char*)pColInfoData->pData) + bytes * (pSDataBlock->info.rows - num);
memcpy(pInfo->prevData, val, bytes);
if (pQueryAttr->stableQuery && pQueryAttr->stabledev && (pRuntimeEnv->prevResult != NULL)) {
setParamForStableStddevByColData(pRuntimeEnv, pInfo->binfo.pCtx, pOperator->numOfOutput, pOperator->pExpr, val,
bytes);
} }
int32_t ret = setGroupResultOutputBuf(pRuntimeEnv, &(pInfo->binfo), pOperator->numOfOutput, val, type, bytes,
item->groupIndex);
if (ret != TSDB_CODE_SUCCESS) { // null data, too many state code
longjmp(pRuntimeEnv->env, TSDB_CODE_QRY_APP_ERROR);
}
doApplyFunctions(pRuntimeEnv, pInfo->binfo.pCtx, &w, pSDataBlock->info.rows - num, num, tsList, pSDataBlock->info.rows, pOperator->numOfOutput);
} }
} }
...@@ -1419,7 +1441,7 @@ static int32_t setGroupResultOutputBuf(SQueryRuntimeEnv *pRuntimeEnv, SOptrBasic ...@@ -1419,7 +1441,7 @@ static int32_t setGroupResultOutputBuf(SQueryRuntimeEnv *pRuntimeEnv, SOptrBasic
// not assign result buffer yet, add new result buffer, TODO remove it // not assign result buffer yet, add new result buffer, TODO remove it
char* d = pData; char* d = pData;
int16_t len = bytes; int16_t len = bytes;
if (type == TSDB_DATA_TYPE_BINARY || type == TSDB_DATA_TYPE_NCHAR) { if (IS_VAR_DATA_TYPE(type)) {
d = varDataVal(pData); d = varDataVal(pData);
len = varDataLen(pData); len = varDataLen(pData);
} }
...@@ -1461,11 +1483,12 @@ static int32_t getGroupbyColumnIndex(SGroupbyExpr *pGroupbyExpr, SSDataBlock* pD ...@@ -1461,11 +1483,12 @@ static int32_t getGroupbyColumnIndex(SGroupbyExpr *pGroupbyExpr, SSDataBlock* pD
return -1; return -1;
} }
static bool functionNeedToExecute(SQueryRuntimeEnv *pRuntimeEnv, SQLFunctionCtx *pCtx, int32_t functionId) { static bool functionNeedToExecute(SQueryRuntimeEnv *pRuntimeEnv, SQLFunctionCtx *pCtx) {
SResultRowCellInfo *pResInfo = GET_RES_INFO(pCtx); SResultRowCellInfo *pResInfo = GET_RES_INFO(pCtx);
SQueryAttr* pQueryAttr = pRuntimeEnv->pQueryAttr; SQueryAttr* pQueryAttr = pRuntimeEnv->pQueryAttr;
// in case of timestamp column, always generated results. // in case of timestamp column, always generated results.
int32_t functionId = pCtx->functionId;
if (functionId == TSDB_FUNC_TS) { if (functionId == TSDB_FUNC_TS) {
return true; return true;
} }
...@@ -1505,7 +1528,7 @@ void setBlockStatisInfo(SQLFunctionCtx *pCtx, SSDataBlock* pSDataBlock, SColInde ...@@ -1505,7 +1528,7 @@ void setBlockStatisInfo(SQLFunctionCtx *pCtx, SSDataBlock* pSDataBlock, SColInde
pCtx->preAggVals.isSet = false; pCtx->preAggVals.isSet = false;
} }
pCtx->hasNull = hasNullRv(pColIndex, pStatis); pCtx->hasNull = hasNull(pColIndex, pStatis);
// set the statistics data for primary time stamp column // set the statistics data for primary time stamp column
if (pCtx->functionId == TSDB_FUNC_SPREAD && pColIndex->colId == PRIMARYKEY_TIMESTAMP_COL_INDEX) { if (pCtx->functionId == TSDB_FUNC_SPREAD && pColIndex->colId == PRIMARYKEY_TIMESTAMP_COL_INDEX) {
...@@ -3470,6 +3493,7 @@ int32_t setTimestampListJoinInfo(SQueryRuntimeEnv* pRuntimeEnv, tVariant* pTag, ...@@ -3470,6 +3493,7 @@ int32_t setTimestampListJoinInfo(SQueryRuntimeEnv* pRuntimeEnv, tVariant* pTag,
return 0; return 0;
} }
// TODO refactor: this funciton should be merged with setparamForStableStddevColumnData function.
void setParamForStableStddev(SQueryRuntimeEnv* pRuntimeEnv, SQLFunctionCtx* pCtx, int32_t numOfOutput, SExprInfo* pExprInfo) { void setParamForStableStddev(SQueryRuntimeEnv* pRuntimeEnv, SQLFunctionCtx* pCtx, int32_t numOfOutput, SExprInfo* pExprInfo) {
SQueryAttr* pQueryAttr = pRuntimeEnv->pQueryAttr; SQueryAttr* pQueryAttr = pRuntimeEnv->pQueryAttr;
...@@ -4675,8 +4699,7 @@ SOperatorInfo* createGlobalAggregateOperatorInfo(SQueryRuntimeEnv* pRuntimeEnv, ...@@ -4675,8 +4699,7 @@ SOperatorInfo* createGlobalAggregateOperatorInfo(SQueryRuntimeEnv* pRuntimeEnv,
SMultiwayMergeInfo* pInfo = calloc(1, sizeof(SMultiwayMergeInfo)); SMultiwayMergeInfo* pInfo = calloc(1, sizeof(SMultiwayMergeInfo));
pInfo->resultRowFactor = pInfo->resultRowFactor =
(int32_t)(GET_ROW_PARAM_FOR_MULTIOUTPUT(pRuntimeEnv->pQueryAttr, pRuntimeEnv->pQueryAttr->topBotQuery, (int32_t)(GET_ROW_PARAM_FOR_MULTIOUTPUT(pRuntimeEnv->pQueryAttr, pRuntimeEnv->pQueryAttr->topBotQuery, false));
false));
pRuntimeEnv->scanFlag = MERGE_STAGE; // TODO init when creating pCtx pRuntimeEnv->scanFlag = MERGE_STAGE; // TODO init when creating pCtx
...@@ -5248,6 +5271,7 @@ static void doStateWindowAggImpl(SOperatorInfo* pOperator, SStateWindowOperatorI ...@@ -5248,6 +5271,7 @@ static void doStateWindowAggImpl(SOperatorInfo* pOperator, SStateWindowOperatorI
doApplyFunctions(pRuntimeEnv, pBInfo->pCtx, &pInfo->curWindow, pInfo->start, pInfo->numOfRows, tsList, doApplyFunctions(pRuntimeEnv, pBInfo->pCtx, &pInfo->curWindow, pInfo->start, pInfo->numOfRows, tsList,
pSDataBlock->info.rows, pOperator->numOfOutput); pSDataBlock->info.rows, pOperator->numOfOutput);
} }
static SSDataBlock* doStateWindowAgg(void *param, bool* newgroup) { static SSDataBlock* doStateWindowAgg(void *param, bool* newgroup) {
SOperatorInfo* pOperator = (SOperatorInfo*) param; SOperatorInfo* pOperator = (SOperatorInfo*) param;
if (pOperator->status == OP_EXEC_DONE) { if (pOperator->status == OP_EXEC_DONE) {
...@@ -6260,7 +6284,7 @@ static bool validateQueryMsg(SQueryTableMsg *pQueryMsg) { ...@@ -6260,7 +6284,7 @@ static bool validateQueryMsg(SQueryTableMsg *pQueryMsg) {
return true; return true;
} }
static UNUSED_FUNC bool validateQueryTableCols(SQueriedTableInfo* pTableInfo, SSqlExpr** pExpr, int32_t numOfOutput, static bool validateQueryTableCols(SQueriedTableInfo* pTableInfo, SSqlExpr** pExpr, int32_t numOfOutput,
SColumnInfo* pTagCols, void* pMsg) { SColumnInfo* pTagCols, void* pMsg) {
int32_t numOfTotal = pTableInfo->numOfCols + pTableInfo->numOfTags; int32_t numOfTotal = pTableInfo->numOfCols + pTableInfo->numOfTags;
if (pTableInfo->numOfCols < 0 || pTableInfo->numOfTags < 0 || numOfTotal > TSDB_MAX_COLUMNS) { if (pTableInfo->numOfCols < 0 || pTableInfo->numOfTags < 0 || numOfTotal > TSDB_MAX_COLUMNS) {
...@@ -6445,6 +6469,7 @@ int32_t convertQueryMsg(SQueryTableMsg *pQueryMsg, SQueryParam* param) { ...@@ -6445,6 +6469,7 @@ int32_t convertQueryMsg(SQueryTableMsg *pQueryMsg, SQueryParam* param) {
pExprMsg->resType = htons(pExprMsg->resType); pExprMsg->resType = htons(pExprMsg->resType);
pExprMsg->resBytes = htons(pExprMsg->resBytes); pExprMsg->resBytes = htons(pExprMsg->resBytes);
pExprMsg->interBytes = htonl(pExprMsg->interBytes);
pExprMsg->functionId = htons(pExprMsg->functionId); pExprMsg->functionId = htons(pExprMsg->functionId);
pExprMsg->numOfParams = htons(pExprMsg->numOfParams); pExprMsg->numOfParams = htons(pExprMsg->numOfParams);
...@@ -6652,41 +6677,41 @@ _cleanup: ...@@ -6652,41 +6677,41 @@ _cleanup:
return code; return code;
} }
int32_t cloneExprFilterInfo(SColumnFilterInfo **dst, SColumnFilterInfo* src, int32_t filterNum) { int32_t cloneExprFilterInfo(SColumnFilterInfo **dst, SColumnFilterInfo* src, int32_t filterNum) {
if (filterNum <= 0) { if (filterNum <= 0) {
return TSDB_CODE_SUCCESS; return TSDB_CODE_SUCCESS;
} }
*dst = calloc(filterNum, sizeof(*src)); *dst = calloc(filterNum, sizeof(*src));
if (*dst == NULL) { if (*dst == NULL) {
return TSDB_CODE_QRY_OUT_OF_MEMORY; return TSDB_CODE_QRY_OUT_OF_MEMORY;
} }
memcpy(*dst, src, sizeof(*src) * filterNum); memcpy(*dst, src, sizeof(*src) * filterNum);
for (int32_t i = 0; i < filterNum; i++) { for (int32_t i = 0; i < filterNum; i++) {
if ((*dst)[i].filterstr && dst[i]->len > 0) { if ((*dst)[i].filterstr && dst[i]->len > 0) {
void *pz = calloc(1, (size_t)(*dst)[i].len + 1); void *pz = calloc(1, (size_t)(*dst)[i].len + 1);
if (pz == NULL) { if (pz == NULL) {
if (i == 0) { if (i == 0) {
free(*dst); free(*dst);
} else { } else {
freeColumnFilterInfo(*dst, i); freeColumnFilterInfo(*dst, i);
}
return TSDB_CODE_QRY_OUT_OF_MEMORY;
} }
memcpy(pz, (void *)src->pz, (size_t)src->len + 1); return TSDB_CODE_QRY_OUT_OF_MEMORY;
(*dst)[i].pz = (int64_t)pz;
} }
}
return TSDB_CODE_SUCCESS; memcpy(pz, (void *)src->pz, (size_t)src->len + 1);
(*dst)[i].pz = (int64_t)pz;
}
} }
return TSDB_CODE_SUCCESS;
}
int32_t buildArithmeticExprFromMsg(SExprInfo *pExprInfo, void *pQueryMsg) { int32_t buildArithmeticExprFromMsg(SExprInfo *pExprInfo, void *pQueryMsg) {
qDebug("qmsg:%p create arithmetic expr from binary", pQueryMsg); qDebug("qmsg:%p create arithmetic expr from binary", pQueryMsg);
...@@ -6745,8 +6770,8 @@ int32_t createQueryFunc(SQueriedTableInfo* pTableInfo, int32_t numOfOutput, SExp ...@@ -6745,8 +6770,8 @@ int32_t createQueryFunc(SQueriedTableInfo* pTableInfo, int32_t numOfOutput, SExp
for (int32_t i = 0; i < numOfOutput; ++i) { for (int32_t i = 0; i < numOfOutput; ++i) {
pExprs[i].base = *pExprMsg[i]; pExprs[i].base = *pExprMsg[i];
memset(pExprs[i].base.param, 0, sizeof(tVariant) * tListLen(pExprs[i].base.param));
memset(pExprs[i].base.param, 0, sizeof(tVariant) * tListLen(pExprs[i].base.param));
for (int32_t j = 0; j < pExprMsg[i]->numOfParams; ++j) { for (int32_t j = 0; j < pExprMsg[i]->numOfParams; ++j) {
tVariantAssign(&pExprs[i].base.param[j], &pExprMsg[i]->param[j]); tVariantAssign(&pExprs[i].base.param[j], &pExprMsg[i]->param[j]);
} }
...@@ -6821,6 +6846,7 @@ int32_t createQueryFunc(SQueriedTableInfo* pTableInfo, int32_t numOfOutput, SExp ...@@ -6821,6 +6846,7 @@ int32_t createQueryFunc(SQueriedTableInfo* pTableInfo, int32_t numOfOutput, SExp
return TSDB_CODE_QRY_INVALID_MSG; return TSDB_CODE_QRY_INVALID_MSG;
} }
// todo remove it
if (getResultDataInfo(type, bytes, pExprs[i].base.functionId, param, &pExprs[i].base.resType, &pExprs[i].base.resBytes, if (getResultDataInfo(type, bytes, pExprs[i].base.functionId, param, &pExprs[i].base.resType, &pExprs[i].base.resBytes,
&pExprs[i].base.interBytes, 0, isSuperTable) != TSDB_CODE_SUCCESS) { &pExprs[i].base.interBytes, 0, isSuperTable) != TSDB_CODE_SUCCESS) {
tfree(pExprs); tfree(pExprs);
......
src/query/src/sql.c
浏览文件 @ 3dc8eca0
...@@ -259,15 +259,15 @@ static const YYACTIONTYPE yy_action[] = { ...@@ -259,15 +259,15 @@ static const YYACTIONTYPE yy_action[] = {
/* 500 */ 1019, 999, 265, 1036, 146, 150, 981, 274, 1035, 163, /* 500 */ 1019, 999, 265, 1036, 146, 150, 981, 274, 1035, 163,
/* 510 */ 142, 269, 164, 157, 979, 733, 165, 224, 789, 263, /* 510 */ 142, 269, 164, 157, 979, 733, 165, 224, 789, 263,
/* 520 */ 166, 153, 894, 283, 290, 43, 191, 271, 39, 299, /* 520 */ 166, 153, 894, 283, 290, 43, 191, 271, 39, 299,
/* 530 */ 890, 306, 73, 278, 1113, 996, 70, 47, 104, 154, /* 530 */ 890, 306, 73, 278, 1113, 996, 70, 154, 104, 47,
/* 540 */ 155, 1112, 281, 1109, 170, 313, 1105, 110, 279, 156, /* 540 */ 155, 1112, 281, 1109, 170, 313, 1105, 110, 279, 156,
/* 550 */ 1104, 277, 158, 275, 273, 1101, 159, 171, 270, 912, /* 550 */ 1104, 277, 158, 275, 273, 1101, 159, 171, 270, 912,
/* 560 */ 40, 37, 44, 192, 878, 120, 876, 122, 123, 874, /* 560 */ 40, 37, 44, 192, 878, 120, 876, 122, 123, 874,
/* 570 */ 873, 250, 182, 871, 870, 869, 868, 867, 866, 185, /* 570 */ 873, 250, 182, 871, 870, 869, 868, 867, 866, 185,
/* 580 */ 187, 863, 861, 859, 857, 189, 854, 190, 46, 79, /* 580 */ 187, 863, 861, 859, 857, 189, 854, 190, 46, 79,
/* 590 */ 84, 272, 331, 1037, 115, 323, 324, 325, 326, 327, /* 590 */ 84, 272, 331, 1037, 115, 323, 324, 325, 326, 327,
/* 600 */ 328, 329, 214, 341, 234, 289, 831, 252, 251, 830, /* 600 */ 328, 329, 214, 234, 289, 341, 831, 252, 251, 830,
/* 610 */ 211, 212, 254, 98, 99, 255, 829, 812, 811, 259, /* 610 */ 211, 212, 254, 98, 99, 255, 829, 259, 812, 811,
/* 620 */ 10, 264, 872, 284, 133, 710, 174, 134, 173, 913, /* 620 */ 10, 264, 872, 284, 133, 710, 174, 134, 173, 913,
/* 630 */ 172, 175, 177, 176, 135, 178, 865, 914, 864, 2, /* 630 */ 172, 175, 177, 176, 135, 178, 865, 914, 864, 2,
/* 640 */ 136, 950, 856, 855, 82, 30, 4, 266, 160, 161, /* 640 */ 136, 950, 856, 855, 82, 30, 4, 266, 160, 161,
...@@ -335,15 +335,15 @@ static const YYCODETYPE yy_lookahead[] = { ...@@ -335,15 +335,15 @@ static const YYCODETYPE yy_lookahead[] = {
/* 500 */ 194, 240, 240, 267, 194, 194, 240, 194, 267, 244, /* 500 */ 194, 240, 240, 267, 194, 194, 240, 194, 267, 244,
/* 510 */ 60, 263, 194, 250, 194, 118, 194, 263, 112, 195, /* 510 */ 60, 263, 194, 250, 194, 118, 194, 263, 112, 195,
/* 520 */ 194, 254, 194, 124, 194, 194, 194, 263, 194, 194, /* 520 */ 194, 254, 194, 124, 194, 194, 194, 263, 194, 194,
/* 530 */ 194, 194, 130, 263, 194, 255, 132, 129, 194, 253, /* 530 */ 194, 194, 130, 263, 194, 255, 132, 253, 194, 129,
/* 540 */ 252, 194, 128, 194, 194, 194, 194, 194, 123, 251, /* 540 */ 252, 194, 128, 194, 194, 194, 194, 194, 123, 251,
/* 550 */ 194, 122, 249, 121, 120, 194, 248, 194, 119, 194, /* 550 */ 194, 122, 249, 121, 120, 194, 248, 194, 119, 194,
/* 560 */ 194, 194, 194, 194, 194, 194, 194, 194, 194, 194, /* 560 */ 194, 194, 194, 194, 194, 194, 194, 194, 194, 194,
/* 570 */ 194, 194, 194, 194, 194, 194, 194, 194, 194, 194, /* 570 */ 194, 194, 194, 194, 194, 194, 194, 194, 194, 194,
/* 580 */ 194, 194, 194, 194, 194, 194, 194, 194, 134, 195, /* 580 */ 194, 194, 194, 194, 194, 194, 194, 194, 134, 195,
/* 590 */ 195, 195, 107, 195, 90, 89, 50, 86, 88, 54, /* 590 */ 195, 195, 107, 195, 90, 89, 50, 86, 88, 54,
/* 600 */ 87, 85, 195, 82, 195, 195, 5, 5, 148, 5, /* 600 */ 87, 85, 195, 195, 195, 82, 5, 5, 148, 5,
/* 610 */ 195, 195, 148, 201, 201, 5, 5, 94, 93, 137, /* 610 */ 195, 195, 148, 201, 201, 5, 5, 137, 94, 93,
/* 620 */ 80, 114, 195, 109, 196, 81, 206, 196, 210, 212, /* 620 */ 80, 114, 195, 109, 196, 81, 206, 196, 210, 212,
/* 630 */ 211, 209, 208, 207, 196, 205, 195, 214, 195, 202, /* 630 */ 211, 209, 208, 207, 196, 205, 195, 214, 195, 202,
/* 640 */ 196, 230, 195, 195, 115, 80, 197, 91, 247, 246, /* 640 */ 196, 230, 195, 195, 115, 80, 197, 91, 247, 246,
...@@ -395,18 +395,18 @@ static const unsigned short int yy_shift_ofst[] = { ...@@ -395,18 +395,18 @@ static const unsigned short int yy_shift_ofst[] = {
/* 120 */ 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, /* 120 */ 9, 9, 9, 9, 9, 9, 9, 9, 9, 9,
/* 130 */ 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, /* 130 */ 9, 9, 9, 9, 9, 9, 9, 9, 9, 9,
/* 140 */ 9, 9, 9, 9, 450, 450, 450, 397, 397, 397, /* 140 */ 9, 9, 9, 9, 450, 450, 450, 397, 397, 397,
/* 150 */ 450, 397, 450, 402, 404, 408, 399, 414, 425, 429, /* 150 */ 450, 397, 450, 402, 404, 399, 410, 414, 425, 429,
/* 160 */ 432, 434, 439, 454, 450, 450, 450, 485, 47, 47, /* 160 */ 432, 434, 439, 454, 450, 450, 450, 485, 47, 47,
/* 170 */ 450, 450, 504, 506, 546, 511, 510, 545, 513, 516, /* 170 */ 450, 450, 504, 506, 546, 511, 510, 545, 513, 516,
/* 180 */ 485, 143, 450, 521, 521, 450, 521, 450, 521, 450, /* 180 */ 485, 143, 450, 523, 523, 450, 523, 450, 523, 450,
/* 190 */ 450, 734, 734, 27, 99, 99, 126, 99, 53, 180, /* 190 */ 450, 734, 734, 27, 99, 99, 126, 99, 53, 180,
/* 200 */ 283, 283, 283, 283, 193, 269, 273, 327, 327, 327, /* 200 */ 283, 283, 283, 283, 193, 269, 273, 327, 327, 327,
/* 210 */ 327, 230, 251, 250, 238, 172, 172, 234, 307, 342, /* 210 */ 327, 230, 251, 250, 238, 172, 172, 234, 307, 342,
/* 220 */ 348, 210, 317, 323, 338, 339, 341, 309, 297, 343, /* 220 */ 348, 210, 317, 323, 338, 339, 341, 309, 297, 343,
/* 230 */ 354, 355, 357, 358, 346, 359, 360, 70, 171, 406, /* 230 */ 354, 355, 357, 358, 346, 359, 360, 70, 171, 406,
/* 240 */ 362, 312, 316, 319, 455, 459, 325, 329, 364, 333, /* 240 */ 362, 312, 316, 319, 455, 459, 325, 329, 364, 333,
/* 250 */ 400, 601, 460, 602, 604, 464, 610, 611, 523, 525, /* 250 */ 400, 601, 460, 602, 604, 464, 610, 611, 524, 526,
/* 260 */ 482, 507, 514, 540, 529, 544, 565, 556, 561, 572, /* 260 */ 480, 507, 514, 540, 529, 544, 565, 556, 561, 572,
/* 270 */ 574, 575, 564, 577, 578, 580, 657, 581, 582, 584, /* 270 */ 574, 575, 564, 577, 578, 580, 657, 581, 582, 584,
/* 280 */ 571, 541, 576, 543, 585, 514, 589, 562, 590, 563, /* 280 */ 571, 541, 576, 543, 585, 514, 589, 562, 590, 563,
/* 290 */ 596, 665, 670, 671, 672, 673, 674, 597, 666, 606, /* 290 */ 596, 665, 670, 671, 672, 673, 674, 597, 666, 606,
...@@ -435,8 +435,8 @@ static const short yy_reduce_ofst[] = { ...@@ -435,8 +435,8 @@ static const short yy_reduce_ofst[] = {
/* 120 */ 370, 371, 372, 373, 374, 375, 376, 377, 378, 379, /* 120 */ 370, 371, 372, 373, 374, 375, 376, 377, 378, 379,
/* 130 */ 380, 381, 382, 383, 384, 385, 386, 387, 388, 389, /* 130 */ 380, 381, 382, 383, 384, 385, 386, 387, 388, 389,
/* 140 */ 390, 391, 392, 393, 324, 394, 395, 248, 254, 264, /* 140 */ 390, 391, 392, 393, 324, 394, 395, 248, 254, 264,
/* 150 */ 396, 270, 398, 280, 267, 286, 288, 298, 263, 303, /* 150 */ 396, 270, 398, 280, 267, 284, 288, 298, 263, 303,
/* 160 */ 308, 401, 403, 405, 407, 409, 410, 411, 412, 413, /* 160 */ 308, 401, 403, 405, 407, 408, 409, 411, 412, 413,
/* 170 */ 415, 416, 417, 419, 418, 420, 422, 426, 424, 430, /* 170 */ 415, 416, 417, 419, 418, 420, 422, 426, 424, 430,
/* 180 */ 421, 423, 427, 428, 431, 441, 438, 443, 444, 447, /* 180 */ 421, 423, 427, 428, 431, 441, 438, 443, 444, 447,
/* 190 */ 448, 437, 449, /* 190 */ 448, 437, 449,
...@@ -457,7 +457,7 @@ static const YYACTIONTYPE yy_default[] = { ...@@ -457,7 +457,7 @@ static const YYACTIONTYPE yy_default[] = {
/* 120 */ 877, 832, 875, 832, 832, 832, 832, 832, 832, 832, /* 120 */ 877, 832, 875, 832, 832, 832, 832, 832, 832, 832,
/* 130 */ 832, 832, 832, 832, 832, 832, 832, 862, 832, 832, /* 130 */ 832, 832, 832, 832, 832, 832, 832, 862, 832, 832,
/* 140 */ 832, 832, 832, 832, 853, 853, 853, 832, 832, 832, /* 140 */ 832, 832, 832, 832, 853, 853, 853, 832, 832, 832,
/* 150 */ 853, 832, 853, 1047, 1051, 1045, 1033, 1041, 1032, 1028, /* 150 */ 853, 832, 853, 1047, 1051, 1033, 1045, 1041, 1032, 1028,
/* 160 */ 1026, 1024, 1023, 1055, 853, 853, 853, 893, 889, 889, /* 160 */ 1026, 1024, 1023, 1055, 853, 853, 853, 893, 889, 889,
/* 170 */ 853, 853, 911, 909, 907, 899, 905, 901, 903, 897, /* 170 */ 853, 853, 911, 909, 907, 899, 905, 901, 903, 897,
/* 180 */ 880, 832, 853, 887, 887, 853, 887, 853, 887, 853, /* 180 */ 880, 832, 853, 887, 887, 853, 887, 853, 887, 853,
...@@ -1024,8 +1024,8 @@ static const char *const yyTokenName[] = { ...@@ -1024,8 +1024,8 @@ static const char *const yyTokenName[] = {
/* 249 */ "fill_opt", /* 249 */ "fill_opt",
/* 250 */ "sliding_opt", /* 250 */ "sliding_opt",
/* 251 */ "groupby_opt", /* 251 */ "groupby_opt",
/* 252 */ "orderby_opt", /* 252 */ "having_opt",
/* 253 */ "having_opt", /* 253 */ "orderby_opt",
/* 254 */ "slimit_opt", /* 254 */ "slimit_opt",
/* 255 */ "limit_opt", /* 255 */ "limit_opt",
/* 256 */ "union", /* 256 */ "union",
...@@ -1210,7 +1210,7 @@ static const char *const yyRuleName[] = { ...@@ -1210,7 +1210,7 @@ static const char *const yyRuleName[] = {
/* 158 */ "tagitem ::= MINUS FLOAT", /* 158 */ "tagitem ::= MINUS FLOAT",
/* 159 */ "tagitem ::= PLUS INTEGER", /* 159 */ "tagitem ::= PLUS INTEGER",
/* 160 */ "tagitem ::= PLUS FLOAT", /* 160 */ "tagitem ::= PLUS FLOAT",
/* 161 */ "select ::= SELECT selcollist from where_opt interval_opt session_option windowstate_option fill_opt sliding_opt groupby_opt orderby_opt having_opt slimit_opt limit_opt", /* 161 */ "select ::= SELECT selcollist from where_opt interval_opt session_option windowstate_option fill_opt sliding_opt groupby_opt having_opt orderby_opt slimit_opt limit_opt",
/* 162 */ "select ::= LP select RP", /* 162 */ "select ::= LP select RP",
/* 163 */ "union ::= select", /* 163 */ "union ::= select",
/* 164 */ "union ::= union UNION ALL select", /* 164 */ "union ::= union UNION ALL select",
...@@ -1467,7 +1467,7 @@ tSqlExprListDestroy((yypminor->yy441)); ...@@ -1467,7 +1467,7 @@ tSqlExprListDestroy((yypminor->yy441));
case 239: /* tagNamelist */ case 239: /* tagNamelist */
case 249: /* fill_opt */ case 249: /* fill_opt */
case 251: /* groupby_opt */ case 251: /* groupby_opt */
case 252: /* orderby_opt */ case 253: /* orderby_opt */
case 264: /* sortlist */ case 264: /* sortlist */
case 268: /* grouplist */ case 268: /* grouplist */
{ {
...@@ -1492,7 +1492,7 @@ destroyRelationInfo((yypminor->yy244)); ...@@ -1492,7 +1492,7 @@ destroyRelationInfo((yypminor->yy244));
} }
break; break;
case 245: /* where_opt */ case 245: /* where_opt */
case 253: /* having_opt */ case 252: /* having_opt */
case 259: /* expr */ case 259: /* expr */
case 269: /* expritem */ case 269: /* expritem */
{ {
...@@ -1961,7 +1961,7 @@ static const struct { ...@@ -1961,7 +1961,7 @@ static const struct {
{ 242, -2 }, /* (158) tagitem ::= MINUS FLOAT */ { 242, -2 }, /* (158) tagitem ::= MINUS FLOAT */
{ 242, -2 }, /* (159) tagitem ::= PLUS INTEGER */ { 242, -2 }, /* (159) tagitem ::= PLUS INTEGER */
{ 242, -2 }, /* (160) tagitem ::= PLUS FLOAT */ { 242, -2 }, /* (160) tagitem ::= PLUS FLOAT */
{ 240, -14 }, /* (161) select ::= SELECT selcollist from where_opt interval_opt session_option windowstate_option fill_opt sliding_opt groupby_opt orderby_opt having_opt slimit_opt limit_opt */ { 240, -14 }, /* (161) select ::= SELECT selcollist from where_opt interval_opt session_option windowstate_option fill_opt sliding_opt groupby_opt having_opt orderby_opt slimit_opt limit_opt */
{ 240, -3 }, /* (162) select ::= LP select RP */ { 240, -3 }, /* (162) select ::= LP select RP */
{ 256, -1 }, /* (163) union ::= select */ { 256, -1 }, /* (163) union ::= select */
{ 256, -4 }, /* (164) union ::= union UNION ALL select */ { 256, -4 }, /* (164) union ::= union UNION ALL select */
...@@ -1998,8 +1998,8 @@ static const struct { ...@@ -1998,8 +1998,8 @@ static const struct {
{ 249, -4 }, /* (195) fill_opt ::= FILL LP ID RP */ { 249, -4 }, /* (195) fill_opt ::= FILL LP ID RP */
{ 250, -4 }, /* (196) sliding_opt ::= SLIDING LP tmvar RP */ { 250, -4 }, /* (196) sliding_opt ::= SLIDING LP tmvar RP */
{ 250, 0 }, /* (197) sliding_opt ::= */ { 250, 0 }, /* (197) sliding_opt ::= */
{ 252, 0 }, /* (198) orderby_opt ::= */ { 253, 0 }, /* (198) orderby_opt ::= */
{ 252, -3 }, /* (199) orderby_opt ::= ORDER BY sortlist */ { 253, -3 }, /* (199) orderby_opt ::= ORDER BY sortlist */
{ 264, -4 }, /* (200) sortlist ::= sortlist COMMA item sortorder */ { 264, -4 }, /* (200) sortlist ::= sortlist COMMA item sortorder */
{ 264, -2 }, /* (201) sortlist ::= item sortorder */ { 264, -2 }, /* (201) sortlist ::= item sortorder */
{ 266, -2 }, /* (202) item ::= ids cpxName */ { 266, -2 }, /* (202) item ::= ids cpxName */
...@@ -2010,8 +2010,8 @@ static const struct { ...@@ -2010,8 +2010,8 @@ static const struct {
{ 251, -3 }, /* (207) groupby_opt ::= GROUP BY grouplist */ { 251, -3 }, /* (207) groupby_opt ::= GROUP BY grouplist */
{ 268, -3 }, /* (208) grouplist ::= grouplist COMMA item */ { 268, -3 }, /* (208) grouplist ::= grouplist COMMA item */
{ 268, -1 }, /* (209) grouplist ::= item */ { 268, -1 }, /* (209) grouplist ::= item */
{ 253, 0 }, /* (210) having_opt ::= */ { 252, 0 }, /* (210) having_opt ::= */
{ 253, -2 }, /* (211) having_opt ::= HAVING expr */ { 252, -2 }, /* (211) having_opt ::= HAVING expr */
{ 255, 0 }, /* (212) limit_opt ::= */ { 255, 0 }, /* (212) limit_opt ::= */
{ 255, -2 }, /* (213) limit_opt ::= LIMIT signed */ { 255, -2 }, /* (213) limit_opt ::= LIMIT signed */
{ 255, -4 }, /* (214) limit_opt ::= LIMIT signed OFFSET signed */ { 255, -4 }, /* (214) limit_opt ::= LIMIT signed OFFSET signed */
...@@ -2677,9 +2677,9 @@ static void yy_reduce( ...@@ -2677,9 +2677,9 @@ static void yy_reduce(
} }
yymsp[-1].minor.yy506 = yylhsminor.yy506; yymsp[-1].minor.yy506 = yylhsminor.yy506;
break; break;
case 161: /* select ::= SELECT selcollist from where_opt interval_opt session_option windowstate_option fill_opt sliding_opt groupby_opt orderby_opt having_opt slimit_opt limit_opt */ case 161: /* select ::= SELECT selcollist from where_opt interval_opt session_option windowstate_option fill_opt sliding_opt groupby_opt having_opt orderby_opt slimit_opt limit_opt */
{ {
yylhsminor.yy236 = tSetQuerySqlNode(&yymsp[-13].minor.yy0, yymsp[-12].minor.yy441, yymsp[-11].minor.yy244, yymsp[-10].minor.yy166, yymsp[-4].minor.yy441, yymsp[-3].minor.yy441, &yymsp[-9].minor.yy340, &yymsp[-8].minor.yy259, &yymsp[-7].minor.yy348, &yymsp[-5].minor.yy0, yymsp[-6].minor.yy441, &yymsp[0].minor.yy414, &yymsp[-1].minor.yy414, yymsp[-2].minor.yy166); yylhsminor.yy236 = tSetQuerySqlNode(&yymsp[-13].minor.yy0, yymsp[-12].minor.yy441, yymsp[-11].minor.yy244, yymsp[-10].minor.yy166, yymsp[-4].minor.yy441, yymsp[-2].minor.yy441, &yymsp[-9].minor.yy340, &yymsp[-8].minor.yy259, &yymsp[-7].minor.yy348, &yymsp[-5].minor.yy0, yymsp[-6].minor.yy441, &yymsp[0].minor.yy414, &yymsp[-1].minor.yy414, yymsp[-3].minor.yy166);
} }
yymsp[-13].minor.yy236 = yylhsminor.yy236; yymsp[-13].minor.yy236 = yylhsminor.yy236;
break; break;
......
tests/script/general/parser/groupby.sim
浏览文件 @ 3dc8eca0
...@@ -654,53 +654,91 @@ if $data31 != @20-03-27 05:10:19.000@ then ...@@ -654,53 +654,91 @@ if $data31 != @20-03-27 05:10:19.000@ then
return -1 return -1
endi endi
#sql select irate(c) from st where t1="1" and ts >= '2020-03-27 04:11:17.732' and ts < '2020-03-27 05:11:17.732' interval(1m) sliding(15s) group by tbname,t1,t2; print ===============>
#if $rows != 40 then sql select stddev(c),c from st where t2=1 or t2=2 group by c;
# return -1 if $rows != 4 then
#endi return -1
# endi
#if $data01 != 1.000000000 then
# return -1 if $data00 != 0.000000000 then
#endi return -1
#if $data02 != t1 then endi
# return -1
#endi if $data01 != 1 then
#if $data03 != 1 then return -1
# return -1 endi
#endi
#if $data04 != 1 then if $data10 != 0.000000000 then
# return -1 return -1
#endi endi
#
#if $data11 != 1.000000000 then if $data11 != 2 then
# return -1 return -1
#endi endi
#if $data12 != t1 then
# return -1 if $data20 != 0.000000000 then
#endi return -1
#if $data13 != 1 then endi
# return -1
#endi if $data21 != 3 then
#if $data14 != 1 then return -1
# return -1 endi
#endi
# if $data30 != 0.000000000 then
#sql select irate(c) from st where t1="1" and ts >= '2020-03-27 04:11:17.732' and ts < '2020-03-27 05:11:17.732' interval(1m) sliding(15s) group by tbname,t1,t2 limit 1; return -1
#if $rows != 2 then endi
# return -1
#endi if $data31 != 4 then
# return -1
#if $data11 != 1.000000000 then endi
# return -1
#endi sql select irate(c) from st where t1="1" and ts >= '2020-03-27 04:11:17.732' and ts < '2020-03-27 05:11:17.732' interval(1m) sliding(15s) group by tbname,t1,t2;
#if $data12 != t2 then if $rows != 40 then
# return -1 return -1
#endi endi
#if $data13 != 1 then
# return -1 if $data01 != 1.000000000 then
#endi return -1
#if $data14 != 2 then endi
# return -1 if $data02 != t1 then
#endi return -1
endi
if $data03 != 1 then
return -1
endi
if $data04 != 1 then
return -1
endi
if $data11 != 1.000000000 then
return -1
endi
if $data12 != t1 then
return -1
endi
if $data13 != 1 then
return -1
endi
if $data14 != 1 then
return -1
endi
sql select irate(c) from st where t1="1" and ts >= '2020-03-27 04:11:17.732' and ts < '2020-03-27 05:11:17.732' interval(1m) sliding(15s) group by tbname,t1,t2 limit 1;
if $rows != 2 then
return -1
endi
if $data11 != 1.000000000 then
return -1
endi
if $data12 != t2 then
return -1
endi
if $data13 != 1 then
return -1
endi
if $data14 != 2 then
return -1
endi
system sh/exec.sh -n dnode1 -s stop -x SIGINT system sh/exec.sh -n dnode1 -s stop -x SIGINT
tests/script/general/parser/having.sim
浏览文件 @ 3dc8eca0
system sh/stop_dnodes.sh system sh/stop_dnodes.sh
system sh/deploy.sh -n dnode1 -i 1 system sh/deploy.sh -n dnode1 -i 1
system sh/cfg.sh -n dnode1 -c walLevel -v 0 system sh/cfg.sh -n dnode1 -c walLevel -v 1
system sh/cfg.sh -n dnode1 -c maxtablesPerVnode -v 2 system sh/cfg.sh -n dnode1 -c maxtablesPerVnode -v 2
system sh/exec.sh -n dnode1 -s start system sh/exec.sh -n dnode1 -s start
......
tests/script/general/parser/testSuite.sim
浏览文件 @ 3dc8eca0
...@@ -63,4 +63,3 @@ run general/parser/between_and.sim ...@@ -63,4 +63,3 @@ run general/parser/between_and.sim
run general/parser/last_cache.sim run general/parser/last_cache.sim
run general/parser/nestquery.sim run general/parser/nestquery.sim
run general/parser/precision_ns.sim run general/parser/precision_ns.sim
Markdown is supported
0% 或 .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑！
想要评论请 注册 或