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

[td-2819] refactor codes.

This commit is contained in:
Haojun Liao 2021-03-30 18:08:00 +08:00
parent 80c5a16c28
commit 1f1d494657
3 changed files with 49 additions and 47 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/client/src/tscSubquery.c
View File

@ -723,7 +723,9 @@ static void issueTsCompQuery(SSqlObj* pSql, SJoinSupporter* pSupporter, SSqlObj*
if (UTIL_TABLE_IS_SUPER_TABLE(pTableMetaInfo)) { if (UTIL_TABLE_IS_SUPER_TABLE(pTableMetaInfo)) {
SExprInfo *pExpr = tscSqlExprGet(pQueryInfo, 0); SExprInfo *pExpr = tscSqlExprGet(pQueryInfo, 0);
int16_t tagColId = tscGetJoinTagColIdByUid(&pSupporter->tagCond, pTableMetaInfo->pTableMeta->id.uid); int16_t tagColId = tscGetJoinTagColIdByUid(&pSupporter->tagCond, pTableMetaInfo->pTableMeta->id.uid);
pExpr->base.param->i64 = tagColId; pExpr->base.param[0].i64 = tagColId;
pExpr->base.param[0].nLen = sizeof(int64_t);
pExpr->base.param[0].nType = TSDB_DATA_TYPE_BIGINT;
pExpr->base.numOfParams = 1; pExpr->base.numOfParams = 1;
} }

2
src/client/src/tscUtil.c
View File

@ -460,7 +460,7 @@ void tscSetResRawPtr(SSqlRes* pRes, SQueryInfo* pQueryInfo) {
int32_t offset = 0; int32_t offset = 0;
for (int32_t i = 0; i < pRes->numOfCols; ++i) { for (int32_t i = 0; i < pQueryInfo->fieldsInfo.numOfOutput; ++i) {
SInternalField* pInfo = (SInternalField*)TARRAY_GET_ELEM(pQueryInfo->fieldsInfo.internalField, i); SInternalField* pInfo = (SInternalField*)TARRAY_GET_ELEM(pQueryInfo->fieldsInfo.internalField, i);
pRes->urow[i] = pRes->data + offset * pRes->numOfRows; pRes->urow[i] = pRes->data + offset * pRes->numOfRows;

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

@ -1,50 +1,50 @@
#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/slimit_alter_tags.sim # persistent failed run general/parser/slimit_alter_tags.sim # persistent failed
#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/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