Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
哥们要飞
TDengine
提交
270e7fc9
T
TDengine
项目概览
哥们要飞
/
TDengine
与 Fork 源项目一致
Fork自
taosdata / TDengine
通知
1
Star
1
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
T
TDengine
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
提交
Issue看板
体验新版 GitCode,发现更多精彩内容 >>
提交
270e7fc9
编写于
5月 11, 2020
作者:
S
Shengliang Guan
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
[TD-271]
上级
88b08a67
变更
4
隐藏空白更改
内联
并排
Showing
4 changed file
with
27 addition
and
38 deletion
+27
-38
src/mnode/src/mgmtTable.c
src/mnode/src/mgmtTable.c
+6
-8
tests/script/general/parser/auto_create_tb.sim
tests/script/general/parser/auto_create_tb.sim
+15
-15
tests/script/general/table/fill.sim
tests/script/general/table/fill.sim
+1
-1
tests/script/jenkins/basic.txt
tests/script/jenkins/basic.txt
+5
-14
未找到文件。
src/mnode/src/mgmtTable.c
浏览文件 @
270e7fc9
...
...
@@ -1242,14 +1242,11 @@ static void mgmtProcessSuperTableVgroupMsg(SQueuedMsg *pMsg) {
int32_t
numOfTable
=
htonl
(
pInfo
->
numOfTables
);
SCMSTableVgroupRspMsg
*
pRsp
=
NULL
;
int32_t
contLen
=
sizeof
(
SCMSTableVgroupRspMsg
);
int32_t
contLen
=
sizeof
(
SCMSTableVgroupRspMsg
)
+
32
*
sizeof
(
SCMVgroupInfo
)
+
sizeof
(
SVgroupsInfo
);
//reserve space
for
(
int32_t
i
=
0
;
i
<
numOfTable
;
++
i
)
{
char
*
stableName
=
(
char
*
)
pInfo
+
sizeof
(
SCMSTableVgroupMsg
)
+
(
TSDB_TABLE_ID_LEN
)
*
i
;
SSuperTableObj
*
pTable
=
mgmtGetSuperTable
(
stableName
);
if
(
pTable
!=
NULL
)
{
stableName
=
(
char
*
)
pTable
;
//hack way
}
if
(
pTable
->
vgHash
!=
NULL
)
{
contLen
+=
(
taosHashGetSize
(
pTable
->
vgHash
)
*
sizeof
(
SCMVgroupInfo
)
+
sizeof
(
SVgroupsInfo
));
}
...
...
@@ -1263,11 +1260,12 @@ static void mgmtProcessSuperTableVgroupMsg(SQueuedMsg *pMsg) {
}
pRsp
->
numOfTables
=
htonl
(
numOfTable
);
char
*
msg
=
(
char
*
)
pRsp
+
sizeof
(
SCMSTableVgroupRspMsg
);
char
*
msg
=
(
char
*
)
pRsp
+
sizeof
(
SCMSTableVgroupRspMsg
);
for
(
int32_t
i
=
0
;
i
<
numOfTable
;
++
i
)
{
SSuperTableObj
*
pTable
=
(
SSuperTableObj
*
)((
char
*
)
pInfo
+
sizeof
(
SCMSTableVgroupMsg
)
+
(
TSDB_TABLE_ID_LEN
)
*
i
);
SVgroupsInfo
*
pVgroup
=
(
SVgroupsInfo
*
)
msg
;
char
*
stableName
=
(
char
*
)
pInfo
+
sizeof
(
SCMSTableVgroupMsg
)
+
(
TSDB_TABLE_ID_LEN
)
*
i
;
SSuperTableObj
*
pTable
=
mgmtGetSuperTable
(
stableName
);
SVgroupsInfo
*
pVgroup
=
(
SVgroupsInfo
*
)
msg
;
SHashMutableIterator
*
pIter
=
taosHashCreateIter
(
pTable
->
vgHash
);
int32_t
vgSize
=
0
;
...
...
tests/script/general/parser/auto_create_tb.sim
浏览文件 @
270e7fc9
...
...
@@ -96,25 +96,25 @@ $ts1 = $ts0 + 1000
$ts2 = $ts0 + 2000
sql insert into tb_1 using $stb tags (-1) values ( $ts1 , 1,1,1,1,'bin',1,1,1,'涛思数据') ( $ts2 , 2,2,2,2,'binar', 1,1,1,'nchar')
sql select * from $stb
if $rows !=
3
then
if $rows !=
5
then
return -1
endi
if $data
1
9 != 涛思数据 then
if $data
0
9 != 涛思数据 then
return -1
endi
if $data
1
1 != 1 then
if $data
0
1 != 1 then
return -1
endi
if $data
2
2 != 2 then
if $data
4
2 != 2 then
return -2
endi
if $data
2
3 != 2.00000 then
if $data
4
3 != 2.00000 then
return -1
endi
if $data
2
5 != binar then
if $data
4
5 != binar then
return -1
endi
if $data
2
9 != nchar then
if $data
4
9 != nchar then
return -1
endi
sql drop table tb_1
...
...
@@ -127,22 +127,22 @@ sql select * from $stb
if $rows != 5 then
return -1
endi
if $data
1
9 != 涛思数据 then
if $data
0
9 != 涛思数据 then
return -1
endi
if $data
1
1 != 1 then
if $data
0
1 != 1 then
return -1
endi
if $data
2
2 != 2 then
if $data
4
2 != 2 then
return -2
endi
if $data
2
3 != 2.00000 then
if $data
4
3 != 2.00000 then
return -1
endi
if $data
2
5 != binar then
if $data
4
5 != binar then
return -1
endi
if $data
2
9 != nchar then
if $data
4
9 != nchar then
return -1
endi
...
...
@@ -154,13 +154,13 @@ sql show tables
if $rows != 3 then
return -1
endi
if $data00 != tb
3
then
if $data00 != tb
1
then
return -1
endi
if $data10 != tb2 then
return -1
endi
if $data20 != tb
1
then
if $data20 != tb
3
then
return -1
endi
...
...
tests/script/general/table/fill.sim
浏览文件 @
270e7fc9
...
...
@@ -42,7 +42,7 @@ sql select count(*), last(ts), min(k), max(k), avg(k) from db.mt where a=0 and t
print =================== step2
system sh/exec.sh -n dnode1 -s stop -x SIGINT
sleep
10
000
sleep
5
000
system sh/exec.sh -n dnode1 -s start
sleep 3000
...
...
tests/script/jenkins/basic.txt
浏览文件 @
270e7fc9
cd ../../debug; cmake ..
#cd ../../debug; make clean
cd ../../debug; make
cd ../../../debug; cmake ..
#cd ../../../debug; make clean
cd ../../../debug; make
#./test.sh -f general/alter/cached_schema_after_alter.sim
...
...
@@ -161,8 +158,6 @@ cd ../../../debug; make
#./test.sh -f general/stable/values.sim
#./test.sh -f general/stable/vnode3.sim
#stream
./test.sh -f general/table/autocreate.sim
./test.sh -f general/table/basic1.sim
./test.sh -f general/table/basic2.sim
...
...
@@ -176,12 +171,12 @@ cd ../../../debug; make
./test.sh -f general/table/column2.sim
./test.sh -f general/table/date.sim
./test.sh -f general/table/db.table.sim
#
./test.sh -f general/table/delete_reuse1.sim
#
./test.sh -f general/table/delete_reuse2.sim
#./test.sh -f general/table/delete_writing.sim
#
./test.sh -f general/table/describe.sim
./test.sh -f general/table/delete_reuse1.sim
./test.sh -f general/table/delete_reuse2.sim
#
hongze
./test.sh -f general/table/delete_writing.sim
./test.sh -f general/table/describe.sim
./test.sh -f general/table/double.sim
#
./test.sh -f general/table/fill.sim
./test.sh -f general/table/fill.sim
./test.sh -f general/table/float.sim
./test.sh -f general/table/int.sim
./test.sh -f general/table/limit.sim
...
...
@@ -236,8 +231,6 @@ cd ../../../debug; make
./test.sh -f general/vector/table_query.sim
./test.sh -f general/vector/table_time.sim
#################################
./test.sh -u -f unique/account/account_create.sim
./test.sh -u -f unique/account/account_delete.sim
./test.sh -u -f unique/account/account_len.sim
...
...
@@ -307,8 +300,6 @@ cd ../../../debug; make
#./test.sh -u -f unique/mnode/mgmtr2.sim
#./test.sh -u -f unique/mnode/secondIp.sim
#stream
##./test.sh -u -f unique/table/delete_part.sim
#./test.sh -u -f unique/vnode/commit.sim
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录