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

[td-225] merge develop

This commit is contained in:
Haojun Liao 2021-04-27 17:18:39 +08:00
parent dc95f7b811
commit fdfb7b58f1
4 changed files with 55 additions and 54 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/query/inc/qExecutor.h
View File

@ -541,7 +541,7 @@ int32_t createIndirectQueryFuncExprFromMsg(SQueryTableMsg *pQueryMsg, int32_t nu
SSqlGroupbyExpr *createGroupbyExprFromMsg(SQueryTableMsg *pQueryMsg, SColIndex *pColIndex, int32_t *code); SSqlGroupbyExpr *createGroupbyExprFromMsg(SQueryTableMsg *pQueryMsg, SColIndex *pColIndex, int32_t *code);
SQInfo *createQInfoImpl(SQueryTableMsg *pQueryMsg, SSqlGroupbyExpr *pGroupbyExpr, SExprInfo *pExprs, SQInfo *createQInfoImpl(SQueryTableMsg *pQueryMsg, SSqlGroupbyExpr *pGroupbyExpr, SExprInfo *pExprs,
SExprInfo *pSecExprs, STableGroupInfo *pTableGroupInfo, SColumnInfo* pTagCols, bool stableQuery, char* sql, uint64_t *qId, SUdfInfo* pUdfInfo); SExprInfo *pSecExprs, STableGroupInfo *pTableGroupInfo, SColumnInfo* pTagCols, bool stableQuery, char* sql, uint64_t *qId, int32_t vgId, SUdfInfo* pUdfInfo);
int32_t initQInfo(STsBufInfo* pTsBufInfo, void* tsdb, void* sourceOptr, SQInfo* pQInfo, SQueryParam* param, char* start, int32_t initQInfo(STsBufInfo* pTsBufInfo, void* tsdb, void* sourceOptr, SQInfo* pQInfo, SQueryParam* param, char* start,
int32_t prevResultLen, void* merger); int32_t prevResultLen, void* merger);

3
src/query/src/qExecutor.c
View File

@ -7034,7 +7034,7 @@ FORCE_INLINE bool checkQIdEqual(void *qHandle, uint64_t qId) {
SQInfo* createQInfoImpl(SQueryTableMsg* pQueryMsg, SSqlGroupbyExpr* pGroupbyExpr, SExprInfo* pExprs, SQInfo* createQInfoImpl(SQueryTableMsg* pQueryMsg, SSqlGroupbyExpr* pGroupbyExpr, SExprInfo* pExprs,
SExprInfo* pSecExprs, STableGroupInfo* pTableGroupInfo, SColumnInfo* pTagCols, bool stableQuery, SExprInfo* pSecExprs, STableGroupInfo* pTableGroupInfo, SColumnInfo* pTagCols, bool stableQuery,
char* sql, uint64_t *qId, SUdfInfo* pUdfInfo) { char* sql, uint64_t *qId, int32_t vgId, SUdfInfo* pUdfInfo) {
int16_t numOfCols = pQueryMsg->numOfCols; int16_t numOfCols = pQueryMsg->numOfCols;
int16_t numOfOutput = pQueryMsg->numOfOutput; int16_t numOfOutput = pQueryMsg->numOfOutput;
@ -7070,6 +7070,7 @@ SQInfo* createQInfoImpl(SQueryTableMsg* pQueryMsg, SSqlGroupbyExpr* pGroupbyExpr
pQueryAttr->prjInfo.vgroupLimit = pQueryMsg->vgroupLimit; pQueryAttr->prjInfo.vgroupLimit = pQueryMsg->vgroupLimit;
pQueryAttr->prjInfo.ts = (pQueryMsg->order == TSDB_ORDER_ASC)? INT64_MIN:INT64_MAX; pQueryAttr->prjInfo.ts = (pQueryMsg->order == TSDB_ORDER_ASC)? INT64_MIN:INT64_MAX;
pQueryAttr->sw = pQueryMsg->sw; pQueryAttr->sw = pQueryMsg->sw;
pQueryAttr->vgId = vgId;
pQueryAttr->stableQuery = pQueryMsg->stableQuery; pQueryAttr->stableQuery = pQueryMsg->stableQuery;
pQueryAttr->topBotQuery = pQueryMsg->topBotQuery; pQueryAttr->topBotQuery = pQueryMsg->topBotQuery;

2
src/query/src/queryMain.c
View File

@ -162,7 +162,7 @@ int32_t qCreateQueryInfo(void* tsdb, int32_t vgId, SQueryTableMsg* pQueryMsg, qi
assert(pQueryMsg->stableQuery == isSTableQuery); assert(pQueryMsg->stableQuery == isSTableQuery);
(*pQInfo) = createQInfoImpl(pQueryMsg, param.pGroupbyExpr, param.pExprs, param.pSecExprs, &tableGroupInfo, (*pQInfo) = createQInfoImpl(pQueryMsg, param.pGroupbyExpr, param.pExprs, param.pSecExprs, &tableGroupInfo,
param.pTagColumnInfo, vgId, param.sql, qId, param.pUdfInfo); param.pTagColumnInfo, isSTableQuery, param.sql, qId, vgId, param.pUdfInfo);
if ((*pQInfo) == NULL) { if ((*pQInfo) == NULL) {
code = TSDB_CODE_QRY_OUT_OF_MEMORY; code = TSDB_CODE_QRY_OUT_OF_MEMORY;

102
tests/script/general/parser/testSuite.sim
View File

@ -1,54 +1,54 @@
#run general/parser/alter.sim run general/parser/alter.sim
#run general/parser/alter1.sim run general/parser/alter1.sim
#run general/parser/alter_stable.sim run general/parser/alter_stable.sim
#run general/parser/auto_create_tb.sim run general/parser/auto_create_tb.sim
#run general/parser/auto_create_tb_drop_tb.sim run general/parser/auto_create_tb_drop_tb.sim
#run general/parser/col_arithmetic_operation.sim run general/parser/col_arithmetic_operation.sim
#run general/parser/columnValue.sim run general/parser/columnValue.sim
#run general/parser/commit.sim run general/parser/commit.sim
#run general/parser/create_db.sim run general/parser/create_db.sim
#run general/parser/create_mt.sim run general/parser/create_mt.sim
#run general/parser/create_tb.sim run general/parser/create_tb.sim
#run general/parser/dbtbnameValidate.sim run general/parser/dbtbnameValidate.sim
#run general/parser/fill.sim run general/parser/fill.sim
#run general/parser/fill_stb.sim run general/parser/fill_stb.sim
##run general/parser/fill_us.sim # #run general/parser/fill_us.sim #
#run general/parser/first_last.sim run general/parser/first_last.sim
#run general/parser/import_commit1.sim run general/parser/import_commit1.sim
#run general/parser/import_commit2.sim run general/parser/import_commit2.sim
#run general/parser/import_commit3.sim run general/parser/import_commit3.sim
#run general/parser/import_file.sim run general/parser/import_file.sim
#run general/parser/insert_tb.sim run general/parser/insert_tb.sim
#run general/parser/tags_dynamically_specifiy.sim run general/parser/tags_dynamically_specifiy.sim
#run general/parser/interp.sim run general/parser/interp.sim
#run general/parser/lastrow.sim run general/parser/lastrow.sim
#run general/parser/limit.sim run general/parser/limit.sim
#run general/parser/limit1.sim run general/parser/limit1.sim
#run general/parser/limit1_tblocks100.sim run general/parser/limit1_tblocks100.sim
#run general/parser/limit2.sim run general/parser/limit2.sim
#run general/parser/mixed_blocks.sim run general/parser/mixed_blocks.sim
#run general/parser/nchar.sim run general/parser/nchar.sim
#run general/parser/null_char.sim run general/parser/null_char.sim
#run general/parser/selectResNum.sim run general/parser/selectResNum.sim
#run general/parser/select_across_vnodes.sim run general/parser/select_across_vnodes.sim
#run general/parser/select_from_cache_disk.sim run general/parser/select_from_cache_disk.sim
#run general/parser/set_tag_vals.sim run general/parser/set_tag_vals.sim
#run general/parser/single_row_in_tb.sim run general/parser/single_row_in_tb.sim
#run general/parser/slimit.sim run general/parser/slimit.sim
#run general/parser/slimit1.sim run general/parser/slimit1.sim
#run general/parser/slimit_alter_tags.sim run general/parser/slimit_alter_tags.sim
#run general/parser/tbnameIn.sim run general/parser/tbnameIn.sim
#run general/parser/join.sim run general/parser/join.sim
#run general/parser/join_multivnode.sim run general/parser/join_multivnode.sim
#run general/parser/join_manyblocks.sim run general/parser/join_manyblocks.sim
#run general/parser/projection_limit_offset.sim run general/parser/projection_limit_offset.sim
#run general/parser/select_with_tags.sim run general/parser/select_with_tags.sim
#run general/parser/select_distinct_tag.sim run general/parser/select_distinct_tag.sim
#run general/parser/groupby.sim run general/parser/groupby.sim
#run general/parser/tags_filter.sim run general/parser/tags_filter.sim
#run general/parser/topbot.sim run general/parser/topbot.sim
#run general/parser/union.sim run general/parser/union.sim
#run general/parser/constCol.sim run general/parser/constCol.sim
run general/parser/where.sim run general/parser/where.sim
run general/parser/timestamp.sim run general/parser/timestamp.sim
run general/parser/sliding.sim run general/parser/sliding.sim