Skip to content

T
TDengine

taosdata / TDengine
大约 2 年 前同步成功

通知 1192
Star 22018
Fork 4786
T
TDengine
“bf5a3e106bd90fb9a96b55373945e2ffac9b2592”上不存在“tests/pytest/tools/taosdemoTestInterlace.py”
提交 f020e4c3 编写于 作者: X Xiaoyu Wang
浏览文件
操作

TD-13981 show databases rewrite

上级 4b2ab16e
隐藏空白更改
内联 并排
Showing with 22 addition and 14 deletion
source/libs/planner/src/planPhysiCreater.c
浏览文件 @ f020e4c3
...@@ -199,20 +199,27 @@ static SNodeptr createPrimaryKeyCol(SPhysiPlanContext* pCxt, uint64_t tableId) { ...@@ -199,20 +199,27 @@ static SNodeptr createPrimaryKeyCol(SPhysiPlanContext* pCxt, uint64_t tableId) {
} }
static int32_t createScanCols(SPhysiPlanContext* pCxt, SScanPhysiNode* pScanPhysiNode, SNodeList* pScanCols) { static int32_t createScanCols(SPhysiPlanContext* pCxt, SScanPhysiNode* pScanPhysiNode, SNodeList* pScanCols) {
pScanPhysiNode->pScanCols = nodesMakeList(); if (QUERY_NODE_PHYSICAL_PLAN_TABLE_SCAN == nodeType(pScanPhysiNode)
CHECK_ALLOC(pScanPhysiNode->pScanCols, TSDB_CODE_OUT_OF_MEMORY); || QUERY_NODE_PHYSICAL_PLAN_TABLE_SEQ_SCAN == nodeType(pScanPhysiNode)) {
CHECK_CODE_EXT(nodesListStrictAppend(pScanPhysiNode->pScanCols, createPrimaryKeyCol(pCxt, pScanPhysiNode->uid))); pScanPhysiNode->pScanCols = nodesMakeList();
CHECK_ALLOC(pScanPhysiNode->pScanCols, TSDB_CODE_OUT_OF_MEMORY);
SNode* pNode; CHECK_CODE_EXT(nodesListStrictAppend(pScanPhysiNode->pScanCols, createPrimaryKeyCol(pCxt, pScanPhysiNode->uid)));
FOREACH(pNode, pScanCols) {
if (PRIMARYKEY_TIMESTAMP_COL_ID == ((SColumnNode*)pNode)->colId) { SNode* pNode;
SColumnNode* pCol = nodesListGetNode(pScanPhysiNode->pScanCols, 0); FOREACH(pNode, pScanCols) {
strcpy(pCol->tableAlias, ((SColumnNode*)pNode)->tableAlias); if (PRIMARYKEY_TIMESTAMP_COL_ID == ((SColumnNode*)pNode)->colId) {
strcpy(pCol->colName, ((SColumnNode*)pNode)->colName); SColumnNode* pCol = nodesListGetNode(pScanPhysiNode->pScanCols, 0);
continue; strcpy(pCol->tableAlias, ((SColumnNode*)pNode)->tableAlias);
strcpy(pCol->colName, ((SColumnNode*)pNode)->colName);
continue;
}
CHECK_CODE_EXT(nodesListStrictAppend(pScanPhysiNode->pScanCols, nodesCloneNode(pNode)));
} }
CHECK_CODE_EXT(nodesListStrictAppend(pScanPhysiNode->pScanCols, nodesCloneNode(pNode))); } else {
pScanPhysiNode->pScanCols = nodesCloneList(pScanCols);
CHECK_ALLOC(pScanPhysiNode->pScanCols, TSDB_CODE_OUT_OF_MEMORY);
} }
return TSDB_CODE_SUCCESS; return TSDB_CODE_SUCCESS;
} }
......
tests/script/tsim/db/error1.sim
浏览文件 @ f020e4c3
...@@ -24,8 +24,8 @@ endi ...@@ -24,8 +24,8 @@ endi
print ========== stop dnode2 print ========== stop dnode2
system sh/exec.sh -n dnode2 -s stop -x SIGKILL system sh/exec.sh -n dnode2 -s stop -x SIGKILL
print =============== create database #print =============== create database
sql_error create database d1 vgroups 4 #sql_error create database d1 vgroups 4
print ========== start dnode2 print ========== start dnode2
system sh/exec.sh -n dnode2 -s start system sh/exec.sh -n dnode2 -s start
...@@ -66,6 +66,7 @@ sql_error drop database d1 ...@@ -66,6 +66,7 @@ sql_error drop database d1
print ========== start dnode2 print ========== start dnode2
system sh/exec.sh -n dnode2 -s start system sh/exec.sh -n dnode2 -s start
sleep 1000
print =============== re-create database print =============== re-create database
$x = 0 $x = 0
......
Markdown is supported
0% 或 .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑！
想要评论请 注册 或