Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
慢慢CG
TDengine
提交
2ee22867
T
TDengine
项目概览
慢慢CG
/
TDengine
与 Fork 源项目一致
Fork自
taosdata / TDengine
通知
1
Star
0
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看板
提交
2ee22867
编写于
2月 04, 2021
作者:
H
Haojun Liao
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
[TD-225]update the sim
上级
0070e7f1
变更
31
显示空白变更内容
内联
并排
Showing
31 changed file
with
47 addition
and
46 deletion
+47
-46
src/client/src/tscServer.c
src/client/src/tscServer.c
+1
-0
tests/script/general/parser/alter.sim
tests/script/general/parser/alter.sim
+2
-2
tests/script/general/parser/auto_create_tb.sim
tests/script/general/parser/auto_create_tb.sim
+1
-1
tests/script/general/parser/col_arithmetic_operation.sim
tests/script/general/parser/col_arithmetic_operation.sim
+1
-1
tests/script/general/parser/commit.sim
tests/script/general/parser/commit.sim
+1
-1
tests/script/general/parser/first_last.sim
tests/script/general/parser/first_last.sim
+1
-1
tests/script/general/parser/import.sim
tests/script/general/parser/import.sim
+6
-6
tests/script/general/parser/import_commit1.sim
tests/script/general/parser/import_commit1.sim
+1
-1
tests/script/general/parser/import_commit2.sim
tests/script/general/parser/import_commit2.sim
+1
-1
tests/script/general/parser/import_commit3.sim
tests/script/general/parser/import_commit3.sim
+2
-2
tests/script/general/parser/import_file.sim
tests/script/general/parser/import_file.sim
+2
-2
tests/script/general/parser/insert_multiTbl.sim
tests/script/general/parser/insert_multiTbl.sim
+1
-1
tests/script/general/parser/interp.sim
tests/script/general/parser/interp.sim
+1
-1
tests/script/general/parser/lastrow.sim
tests/script/general/parser/lastrow.sim
+1
-1
tests/script/general/parser/limit.sim
tests/script/general/parser/limit.sim
+1
-1
tests/script/general/parser/limit1.sim
tests/script/general/parser/limit1.sim
+1
-1
tests/script/general/parser/limit1_tblocks100.sim
tests/script/general/parser/limit1_tblocks100.sim
+1
-1
tests/script/general/parser/limit2.sim
tests/script/general/parser/limit2.sim
+1
-1
tests/script/general/parser/mixed_blocks.sim
tests/script/general/parser/mixed_blocks.sim
+2
-2
tests/script/general/parser/projection_limit_offset.sim
tests/script/general/parser/projection_limit_offset.sim
+1
-1
tests/script/general/parser/selectResNum.sim
tests/script/general/parser/selectResNum.sim
+1
-1
tests/script/general/parser/select_from_cache_disk.sim
tests/script/general/parser/select_from_cache_disk.sim
+1
-1
tests/script/general/parser/set_tag_vals.sim
tests/script/general/parser/set_tag_vals.sim
+1
-1
tests/script/general/parser/single_row_in_tb.sim
tests/script/general/parser/single_row_in_tb.sim
+1
-1
tests/script/general/parser/slimit.sim
tests/script/general/parser/slimit.sim
+1
-1
tests/script/general/parser/slimit1.sim
tests/script/general/parser/slimit1.sim
+1
-1
tests/script/general/parser/slimit_alter_tags.sim
tests/script/general/parser/slimit_alter_tags.sim
+2
-2
tests/script/general/parser/tbnameIn.sim
tests/script/general/parser/tbnameIn.sim
+1
-1
tests/script/general/parser/testSuite.sim
tests/script/general/parser/testSuite.sim
+7
-7
tests/script/general/parser/topbot.sim
tests/script/general/parser/topbot.sim
+1
-1
tests/script/general/parser/where.sim
tests/script/general/parser/where.sim
+1
-1
未找到文件。
src/client/src/tscServer.c
浏览文件 @
2ee22867
...
...
@@ -770,6 +770,7 @@ int tscBuildQueryMsg(SSqlObj *pSql, SSqlInfo *pInfo) {
char
n
[
TSDB_TABLE_FNAME_LEN
]
=
{
0
};
tNameExtractFullName
(
&
pTableMetaInfo
->
name
,
n
);
tscError
(
"%p tid:%d uid:%"
PRIu64
" id:%s, column index out of range, numOfColumns:%d, index:%d, column name:%s"
,
pSql
,
pTableMeta
->
id
.
tid
,
pTableMeta
->
id
.
uid
,
n
,
tscGetNumOfColumns
(
pTableMeta
),
pCol
->
colIndex
.
columnIndex
,
pColSchema
->
name
);
...
...
tests/script/general/parser/alter.sim
浏览文件 @
2ee22867
...
...
@@ -133,7 +133,7 @@ sleep 100
# return -1
#endi
#sql alter table tb1 drop column c3
#sleep
20
00
#sleep
5
00
#sql insert into tb1 values (now, 2, 'taos')
#sleep 30000
#sql select * from strm
...
...
@@ -144,7 +144,7 @@ sleep 100
# return -1
#endi
#sql alter table tb1 add column c3 int
#sleep
20
00
#sleep
5
00
#sql insert into tb1 values (now, 3, 'taos', 3);
#sleep 100
#sql select * from strm
...
...
tests/script/general/parser/auto_create_tb.sim
浏览文件 @
2ee22867
...
...
@@ -208,7 +208,7 @@ endi
print ================== restart server to commit data into disk
system sh/exec.sh -n dnode1 -s stop -x SIGINT
sleep
20
00
sleep
5
00
system sh/exec.sh -n dnode1 -s start
print ================== server restart completed
sql connect
...
...
tests/script/general/parser/col_arithmetic_operation.sim
浏览文件 @
2ee22867
...
...
@@ -105,7 +105,7 @@ run general/parser/col_arithmetic_query.sim
#======================================= all in files query =======================================
print ================== restart server to commit data into disk
system sh/exec.sh -n dnode1 -s stop -x SIGINT
sleep
20
00
sleep
5
00
system sh/exec.sh -n dnode1 -s start
print ================== server restart completed
...
...
tests/script/general/parser/commit.sim
浏览文件 @
2ee22867
...
...
@@ -82,7 +82,7 @@ endw
print ================== restart server to commit data into disk
system sh/exec.sh -n dnode1 -s stop -x SIGINT
sleep
20
00
sleep
5
00
system sh/exec.sh -n dnode1 -s start
sleep 100
print ================== server restart completed
...
...
tests/script/general/parser/first_last.sim
浏览文件 @
2ee22867
...
...
@@ -77,7 +77,7 @@ run general/parser/first_last_query.sim
print ================== restart server to commit data into disk
system sh/exec.sh -n dnode1 -s stop -x SIGINT
sleep
20
00
sleep
5
00
system sh/exec.sh -n dnode1 -s start
print ================== server restart completed
sql connect
...
...
tests/script/general/parser/import.sim
浏览文件 @
2ee22867
...
...
@@ -25,15 +25,15 @@ sql use $db
sql create table tb (ts timestamp, c1 int, c2 timestamp)
sql insert into tb values ('2019-05-05 11:30:00.000', 1, now)
sql insert into tb values ('2019-05-05 12:00:00.000', 1, now)
sleep
20
00
sleep
5
00
sql import into tb values ('2019-05-05 11:00:00.000', -1, now)
sleep
20
00
sleep
5
00
sql import into tb values ('2019-05-05 11:59:00.000', -1, now)
sleep
20
00
sleep
5
00
sql import into tb values ('2019-05-04 08:00:00.000', -1, now)
sleep
20
00
sleep
5
00
sql import into tb values ('2019-05-04 07:59:00.000', -1, now)
sleep
20
00
sleep
5
00
sql select * from tb
if $rows != 6 then
...
...
@@ -60,7 +60,7 @@ endi
print ================== restart server to commit data into disk
system sh/exec.sh -n dnode1 -s stop -x SIGINT
sleep
20
00
sleep
5
00
system sh/exec.sh -n dnode1 -s start
print ================== server restart completed
sql connect
...
...
tests/script/general/parser/import_commit1.sim
浏览文件 @
2ee22867
...
...
@@ -40,7 +40,7 @@ while $x < $rowNum
endw
print ====== tables created
sleep
20
00
sleep
5
00
$ts = $ts0 + $delta
$ts = $ts + 1
...
...
tests/script/general/parser/import_commit2.sim
浏览文件 @
2ee22867
...
...
@@ -39,7 +39,7 @@ while $x < $rowNum
endw
print ====== tables created
sleep
20
00
sleep
5
00
$ts = $ts0 + $delta
$ts = $ts + 1
...
...
tests/script/general/parser/import_commit3.sim
浏览文件 @
2ee22867
...
...
@@ -39,7 +39,7 @@ while $x < $rowNum
endw
print ====== tables created
sleep
20
00
sleep
5
00
$ts = $ts + 1
sql insert into $tb values ( $ts , -1, -1, -1, -1, -1)
...
...
@@ -47,7 +47,7 @@ $ts = $ts0 + $delta
$ts = $ts + 1
sql import into $tb values ( $ts , -2, -2, -2, -2, -2)
sleep
20
00
sleep
5
00
sql show databases
...
...
tests/script/general/parser/import_file.sim
浏览文件 @
2ee22867
...
...
@@ -3,9 +3,9 @@ system sh/stop_dnodes.sh
system sh/deploy.sh -n dnode1 -i 1
system sh/cfg.sh -n dnode1 -c walLevel -v 0
system sh/exec.sh -n dnode1 -s start
sleep
20
00
sleep
5
00
sql connect
sleep
20
00
sleep
5
00
sql drop database if exists indb
...
...
tests/script/general/parser/insert_multiTbl.sim
浏览文件 @
2ee22867
...
...
@@ -4,7 +4,7 @@ system sh/stop_dnodes.sh
system sh/deploy.sh -n dnode1 -i 1
system sh/cfg.sh -n dnode1 -c walLevel -v 0
system sh/exec.sh -n dnode1 -s start
sleep
20
00
sleep
5
00
sql connect
sleep 100
print ======================== dnode1 start
...
...
tests/script/general/parser/interp.sim
浏览文件 @
2ee22867
...
...
@@ -59,7 +59,7 @@ run general/parser/interp_test.sim
print ================== restart server to commit data into disk
system sh/exec.sh -n dnode1 -s stop -x SIGINT
sleep
20
00
sleep
5
00
system sh/exec.sh -n dnode1 -s start
print ================== server restart completed
...
...
tests/script/general/parser/lastrow.sim
浏览文件 @
2ee22867
...
...
@@ -62,7 +62,7 @@ run general/parser/lastrow_query.sim
print ================== restart server to commit data into disk
system sh/exec.sh -n dnode1 -s stop -x SIGINT
sleep
20
00
sleep
5
00
system sh/exec.sh -n dnode1 -s start
print ================== server restart completed
sql connect
...
...
tests/script/general/parser/limit.sim
浏览文件 @
2ee22867
...
...
@@ -66,7 +66,7 @@ run general/parser/limit_stb.sim
print ================== restart server to commit data into disk
system sh/exec.sh -n dnode1 -s stop -x SIGINT
sleep
20
00
sleep
5
00
system sh/exec.sh -n dnode1 -s start
print ================== server restart completed
sql connect
...
...
tests/script/general/parser/limit1.sim
浏览文件 @
2ee22867
...
...
@@ -61,7 +61,7 @@ run general/parser/limit1_stb.sim
print ================== restart server to commit data into disk
system sh/exec.sh -n dnode1 -s stop -x SIGINT
sleep
20
00
sleep
5
00
system sh/exec.sh -n dnode1 -s start
print ================== server restart completed
...
...
tests/script/general/parser/limit1_tblocks100.sim
浏览文件 @
2ee22867
...
...
@@ -61,7 +61,7 @@ run general/parser/limit1_stb.sim
print ================== restart server to commit data into disk
system sh/exec.sh -n dnode1 -s stop -x SIGINT
sleep
20
00
sleep
5
00
system sh/exec.sh -n dnode1 -s start
print ================== server restart completed
...
...
tests/script/general/parser/limit2.sim
浏览文件 @
2ee22867
...
...
@@ -69,7 +69,7 @@ print ====== tables created
print ================== restart server to commit data into disk
system sh/exec.sh -n dnode1 -s stop -x SIGINT
sleep
20
00
sleep
5
00
system sh/exec.sh -n dnode1 -s start
print ================== server restart completed
...
...
tests/script/general/parser/mixed_blocks.sim
浏览文件 @
2ee22867
...
...
@@ -59,7 +59,7 @@ sql show databases
print ================== restart server to commit data into disk
system sh/exec.sh -n dnode1 -s stop -x SIGINT
sleep
20
00
sleep
5
00
system sh/exec.sh -n dnode1 -s start
print ================== server restart completed
...
...
@@ -154,7 +154,7 @@ sql insert into t2 values('2020-1-1 1:5:1', 99);
print ================== restart server to commit data into disk
system sh/exec.sh -n dnode1 -s stop -x SIGINT
sleep
20
00
sleep
5
00
system sh/exec.sh -n dnode1 -s start
print ================== server restart completed
sql select ts from m1 where ts='2020-1-1 1:5:1'
...
...
tests/script/general/parser/projection_limit_offset.sim
浏览文件 @
2ee22867
...
...
@@ -412,7 +412,7 @@ sql_error select k, sum(k)+1 from tm0;
print ================== restart server to commit data into disk
system sh/exec.sh -n dnode1 -s stop -x SIGINT
sleep
20
00
sleep
5
00
system sh/exec.sh -n dnode1 -s start
print ================== server restart completed
...
...
tests/script/general/parser/selectResNum.sim
浏览文件 @
2ee22867
...
...
@@ -118,7 +118,7 @@ endw
print ====== restart server to commit data into disk
system sh/exec.sh -n dnode1 -s stop -x SIGINT
sleep
20
00
sleep
5
00
system sh/exec.sh -n dnode1 -s start
print ====== server restart completed
sleep 100
...
...
tests/script/general/parser/select_from_cache_disk.sim
浏览文件 @
2ee22867
...
...
@@ -35,7 +35,7 @@ sql insert into $tb values ('2018-09-17 09:00:00.030', 3)
print ================== restart server to commit data into disk
system sh/exec.sh -n dnode1 -s stop -x SIGINT
sleep
20
00
sleep
5
00
system sh/exec.sh -n dnode1 -s start
print ================== server restart completed
sql connect
...
...
tests/script/general/parser/set_tag_vals.sim
浏览文件 @
2ee22867
...
...
@@ -61,7 +61,7 @@ while $i < $tbNum
endw
print ====== tables created
sleep
20
00
sleep
5
00
sql show tables
if $rows != $tbNum then
...
...
tests/script/general/parser/single_row_in_tb.sim
浏览文件 @
2ee22867
...
...
@@ -32,7 +32,7 @@ run general/parser/single_row_in_tb_query.sim
print ================== restart server to commit data into disk
system sh/exec.sh -n dnode1 -s stop -x SIGINT
sleep
20
00
sleep
5
00
system sh/exec.sh -n dnode1 -s start
print ================== server restart completed
...
...
tests/script/general/parser/slimit.sim
浏览文件 @
2ee22867
...
...
@@ -97,7 +97,7 @@ run general/parser/slimit_query.sim
print ================== restart server to commit data into disk
system sh/exec.sh -n dnode1 -s stop -x SIGINT
sleep
20
00
sleep
5
00
system sh/exec.sh -n dnode1 -s start
print ================== server restart completed
sql connect
...
...
tests/script/general/parser/slimit1.sim
浏览文件 @
2ee22867
...
...
@@ -56,7 +56,7 @@ run general/parser/slimit1_query.sim
print ================== restart server to commit data into disk
system sh/exec.sh -n dnode1 -s stop -x SIGINT
sleep
20
00
sleep
5
00
system sh/exec.sh -n dnode1 -s start
print ================== server restart completed
sql connect
...
...
tests/script/general/parser/slimit_alter_tags.sim
浏览文件 @
2ee22867
...
...
@@ -93,7 +93,7 @@ if $data02 != tb0 then
return -1
endi
sleep
20
00
sleep
5
00
sql reset query cache
sql select count(*), first(ts) from stb group by tg_added order by tg_added asc slimit 5 soffset 3
if $rows != 5 then
...
...
@@ -171,7 +171,7 @@ endi
print ================== restart server to commit data into disk
system sh/exec.sh -n dnode1 -s stop -x SIGINT
sleep
20
00
sleep
5
00
system sh/exec.sh -n dnode1 -s start
print ================== server restart completed
sql connect
...
...
tests/script/general/parser/tbnameIn.sim
浏览文件 @
2ee22867
...
...
@@ -67,7 +67,7 @@ run general/parser/tbnameIn_query.sim
print ================== restart server to commit data into disk
system sh/exec.sh -n dnode1 -s stop -x SIGINT
sleep
20
00
sleep
5
00
system sh/exec.sh -n dnode1 -s start
print ================== server restart completed
...
...
tests/script/general/parser/testSuite.sim
浏览文件 @
2ee22867
...
...
@@ -46,13 +46,13 @@
#sleep 100
#run general/parser/lastrow.sim
#sleep 100
#
run general/parser/limit.sim
#
sleep 100
#
run general/parser/limit1.sim
#
sleep 100
#
run general/parser/limit1_tblocks100.sim
#
sleep 100
#
run general/parser/limit2.sim
run general/parser/limit.sim
sleep 100
run general/parser/limit1.sim
sleep 100
run general/parser/limit1_tblocks100.sim
sleep 100
run general/parser/limit2.sim
sleep 100
run general/parser/mixed_blocks.sim
sleep 100
...
...
tests/script/general/parser/topbot.sim
浏览文件 @
2ee22867
...
...
@@ -128,7 +128,7 @@ sql insert into test values(29999, 1)(70000, 2)(80000, 3)
print ================== restart server to commit data into disk
system sh/exec.sh -n dnode1 -s stop -x SIGINT
sleep
20
00
sleep
5
00
system sh/exec.sh -n dnode1 -s start
print ================== server restart completed
sql connect
...
...
tests/script/general/parser/where.sim
浏览文件 @
2ee22867
...
...
@@ -324,7 +324,7 @@ while $i < 1
endw
system sh/exec.sh -n dnode1 -s stop -x SIGINT
sleep
20
00
sleep
5
00
system sh/exec.sh -n dnode1 -s start
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录