Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
拾光师
TDengine
提交
da5b584e
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,发现更多精彩内容 >>
提交
da5b584e
编写于
11月 19, 2020
作者:
P
plum-lihui
浏览文件
操作
浏览文件
下载
差异文件
Merge branch 'release/s106' of
https://github.com/taosdata/TDengine
into release/s106
上级
c3199e6f
143e6011
变更
87
隐藏空白更改
内联
并排
Showing
87 changed file
with
276 addition
and
315 deletion
+276
-315
src/client/inc/tsclient.h
src/client/inc/tsclient.h
+25
-26
src/client/src/tscLocalMerge.c
src/client/src/tscLocalMerge.c
+4
-4
src/client/src/tscServer.c
src/client/src/tscServer.c
+2
-3
src/client/src/tscSql.c
src/client/src/tscSql.c
+3
-44
src/client/src/tscSubquery.c
src/client/src/tscSubquery.c
+7
-7
src/client/src/tscUtil.c
src/client/src/tscUtil.c
+0
-5
src/connector/jdbc/src/main/java/com/taosdata/jdbc/TSDBDriver.java
...ctor/jdbc/src/main/java/com/taosdata/jdbc/TSDBDriver.java
+1
-1
src/connector/jdbc/src/main/java/com/taosdata/jdbc/TSDBResultSetBlockData.java
...c/main/java/com/taosdata/jdbc/TSDBResultSetBlockData.java
+7
-11
src/query/src/qExecutor.c
src/query/src/qExecutor.c
+2
-2
src/query/src/qParserImpl.c
src/query/src/qParserImpl.c
+2
-1
tests/script/general/parser/alter.sim
tests/script/general/parser/alter.sim
+6
-6
tests/script/general/parser/alter1.sim
tests/script/general/parser/alter1.sim
+2
-2
tests/script/general/parser/alter_stable.sim
tests/script/general/parser/alter_stable.sim
+1
-1
tests/script/general/parser/auto_create_tb.sim
tests/script/general/parser/auto_create_tb.sim
+4
-4
tests/script/general/parser/auto_create_tb_drop_tb.sim
tests/script/general/parser/auto_create_tb_drop_tb.sim
+3
-5
tests/script/general/parser/binary_escapeCharacter.sim
tests/script/general/parser/binary_escapeCharacter.sim
+1
-1
tests/script/general/parser/col_arithmetic_operation.sim
tests/script/general/parser/col_arithmetic_operation.sim
+3
-4
tests/script/general/parser/columnValue.sim
tests/script/general/parser/columnValue.sim
+1
-1
tests/script/general/parser/columnValue_bigint.sim
tests/script/general/parser/columnValue_bigint.sim
+1
-1
tests/script/general/parser/columnValue_bool.sim
tests/script/general/parser/columnValue_bool.sim
+1
-1
tests/script/general/parser/columnValue_double.sim
tests/script/general/parser/columnValue_double.sim
+1
-1
tests/script/general/parser/columnValue_float.sim
tests/script/general/parser/columnValue_float.sim
+1
-1
tests/script/general/parser/columnValue_int.sim
tests/script/general/parser/columnValue_int.sim
+1
-1
tests/script/general/parser/columnValue_smallint.sim
tests/script/general/parser/columnValue_smallint.sim
+1
-1
tests/script/general/parser/columnValue_tinyint.sim
tests/script/general/parser/columnValue_tinyint.sim
+1
-1
tests/script/general/parser/commit.sim
tests/script/general/parser/commit.sim
+5
-6
tests/script/general/parser/constCol.sim
tests/script/general/parser/constCol.sim
+2
-2
tests/script/general/parser/create_db.sim
tests/script/general/parser/create_db.sim
+1
-1
tests/script/general/parser/create_mt.sim
tests/script/general/parser/create_mt.sim
+1
-1
tests/script/general/parser/create_tb.sim
tests/script/general/parser/create_tb.sim
+1
-1
tests/script/general/parser/dbtbnameValidate.sim
tests/script/general/parser/dbtbnameValidate.sim
+1
-1
tests/script/general/parser/fill.sim
tests/script/general/parser/fill.sim
+1
-1
tests/script/general/parser/fill_stb.sim
tests/script/general/parser/fill_stb.sim
+1
-1
tests/script/general/parser/fill_us.sim
tests/script/general/parser/fill_us.sim
+1
-1
tests/script/general/parser/first_last.sim
tests/script/general/parser/first_last.sim
+3
-3
tests/script/general/parser/first_last_query.sim
tests/script/general/parser/first_last_query.sim
+1
-1
tests/script/general/parser/groupby.sim
tests/script/general/parser/groupby.sim
+10
-3
tests/script/general/parser/import.sim
tests/script/general/parser/import.sim
+2
-2
tests/script/general/parser/import_commit1.sim
tests/script/general/parser/import_commit1.sim
+2
-2
tests/script/general/parser/import_commit2.sim
tests/script/general/parser/import_commit2.sim
+2
-2
tests/script/general/parser/import_commit3.sim
tests/script/general/parser/import_commit3.sim
+3
-3
tests/script/general/parser/insert_multiTbl.sim
tests/script/general/parser/insert_multiTbl.sim
+1
-1
tests/script/general/parser/insert_tb.sim
tests/script/general/parser/insert_tb.sim
+3
-3
tests/script/general/parser/interp.sim
tests/script/general/parser/interp.sim
+3
-4
tests/script/general/parser/interp_test.sim
tests/script/general/parser/interp_test.sim
+1
-1
tests/script/general/parser/join.sim
tests/script/general/parser/join.sim
+1
-1
tests/script/general/parser/join_multivnode.sim
tests/script/general/parser/join_multivnode.sim
+1
-1
tests/script/general/parser/lastrow.sim
tests/script/general/parser/lastrow.sim
+3
-3
tests/script/general/parser/lastrow_query.sim
tests/script/general/parser/lastrow_query.sim
+1
-1
tests/script/general/parser/limit.sim
tests/script/general/parser/limit.sim
+3
-3
tests/script/general/parser/limit1.sim
tests/script/general/parser/limit1.sim
+3
-4
tests/script/general/parser/limit1_stb.sim
tests/script/general/parser/limit1_stb.sim
+1
-1
tests/script/general/parser/limit1_tb.sim
tests/script/general/parser/limit1_tb.sim
+1
-1
tests/script/general/parser/limit1_tblocks100.sim
tests/script/general/parser/limit1_tblocks100.sim
+3
-4
tests/script/general/parser/limit2.sim
tests/script/general/parser/limit2.sim
+2
-2
tests/script/general/parser/limit2_query.sim
tests/script/general/parser/limit2_query.sim
+1
-1
tests/script/general/parser/limit2_tblocks100.sim
tests/script/general/parser/limit2_tblocks100.sim
+2
-2
tests/script/general/parser/limit_stb.sim
tests/script/general/parser/limit_stb.sim
+1
-1
tests/script/general/parser/limit_tb.sim
tests/script/general/parser/limit_tb.sim
+1
-1
tests/script/general/parser/mixed_blocks.sim
tests/script/general/parser/mixed_blocks.sim
+1
-1
tests/script/general/parser/nchar.sim
tests/script/general/parser/nchar.sim
+1
-1
tests/script/general/parser/null_char.sim
tests/script/general/parser/null_char.sim
+2
-2
tests/script/general/parser/projection_limit_offset.sim
tests/script/general/parser/projection_limit_offset.sim
+2
-2
tests/script/general/parser/selectResNum.sim
tests/script/general/parser/selectResNum.sim
+5
-6
tests/script/general/parser/select_across_vnodes.sim
tests/script/general/parser/select_across_vnodes.sim
+1
-1
tests/script/general/parser/select_from_cache_disk.sim
tests/script/general/parser/select_from_cache_disk.sim
+3
-3
tests/script/general/parser/select_with_tags.sim
tests/script/general/parser/select_with_tags.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
+2
-2
tests/script/general/parser/single_row_in_tb_query.sim
tests/script/general/parser/single_row_in_tb_query.sim
+1
-1
tests/script/general/parser/sliding.sim
tests/script/general/parser/sliding.sim
+1
-1
tests/script/general/parser/slimit.sim
tests/script/general/parser/slimit.sim
+3
-3
tests/script/general/parser/slimit1.sim
tests/script/general/parser/slimit1.sim
+3
-3
tests/script/general/parser/slimit1_query.sim
tests/script/general/parser/slimit1_query.sim
+1
-1
tests/script/general/parser/slimit_alter_tags.sim
tests/script/general/parser/slimit_alter_tags.sim
+3
-3
tests/script/general/parser/slimit_query.sim
tests/script/general/parser/slimit_query.sim
+1
-1
tests/script/general/parser/stream_on_sys.sim
tests/script/general/parser/stream_on_sys.sim
+1
-1
tests/script/general/parser/tags_dynamically_specifiy.sim
tests/script/general/parser/tags_dynamically_specifiy.sim
+2
-2
tests/script/general/parser/tags_filter.sim
tests/script/general/parser/tags_filter.sim
+1
-1
tests/script/general/parser/tbnameIn.sim
tests/script/general/parser/tbnameIn.sim
+3
-4
tests/script/general/parser/tbnameIn_query.sim
tests/script/general/parser/tbnameIn_query.sim
+1
-1
tests/script/general/parser/testSuite.sim
tests/script/general/parser/testSuite.sim
+56
-56
tests/script/general/parser/timestamp.sim
tests/script/general/parser/timestamp.sim
+3
-3
tests/script/general/parser/timestamp_query.sim
tests/script/general/parser/timestamp_query.sim
+1
-1
tests/script/general/parser/topbot.sim
tests/script/general/parser/topbot.sim
+5
-5
tests/script/general/parser/union.sim
tests/script/general/parser/union.sim
+11
-4
tests/script/general/parser/where.sim
tests/script/general/parser/where.sim
+10
-3
未找到文件。
src/client/inc/tsclient.h
浏览文件 @
da5b584e
...
...
@@ -293,33 +293,32 @@ typedef struct SResRec {
}
SResRec
;
typedef
struct
{
int
64_t
numOfRows
;
// num of results in current retrieved
int64_t
numOfRowsGroup
;
// num of results of current group
int64_t
numOfTotal
;
// num of total results
int64_t
numOfClauseTotal
;
// num of total result in current subclause
char
*
pRsp
;
int32_t
rspType
;
int32_t
rspLen
;
uint64_t
qhandle
;
int64_t
uid
;
int64_t
useconds
;
int
64_t
offset
;
// offset value from vnode during projection query of stable
int
32_t
row
;
int16_t
numOfCols
;
int16_t
precision
;
bool
completed
;
int32_t
code
;
int32_t
numOfGroups
;
SResRec
*
pGroupRec
;
char
*
data
;
TAOS_ROW
ts
row
;
TAOS_ROW
urow
;
int32_t
*
length
;
// length for each field for current row
char
**
buffer
;
// Buffer used to put multibytes encoded using unicode (wchar_t)
SColumnIndex
*
pColumnIndex
;
int
32_t
numOfRows
;
// num of results in current retrieval
int64_t
numOfRowsGroup
;
// num of results of current group
int64_t
numOfTotal
;
// num of total results
int64_t
numOfClauseTotal
;
// num of total result in current subclause
char
*
pRsp
;
int32_t
rspType
;
int32_t
rspLen
;
uint64_t
qhandle
;
int64_t
useconds
;
int64_t
offset
;
// offset value from vnode during projection query of stable
int
32_t
row
;
int
16_t
numOfCols
;
int16_t
precision
;
bool
completed
;
int32_t
code
;
int32_t
numOfGroups
;
SResRec
*
pGroupRec
;
char
*
data
;
TAOS_ROW
tsrow
;
TAOS_ROW
u
row
;
int32_t
*
length
;
// length for each field for current row
char
**
buffer
;
// Buffer used to put multibytes encoded using unicode (wchar_t)
SColumnIndex
*
pColumnIndex
;
SArithmeticSupport
*
pArithSup
;
// support the arithmetic expression calculation on agg functions
struct
SLocalReducer
*
pLocalReducer
;
struct
SLocalReducer
*
pLocalReducer
;
}
SSqlRes
;
typedef
struct
STscObj
{
...
...
src/client/src/tscLocalMerge.c
浏览文件 @
da5b584e
...
...
@@ -884,17 +884,17 @@ static void genFinalResWithoutFill(SSqlRes* pRes, SLocalReducer *pLocalReducer,
tFilePage
*
pBeforeFillData
=
pLocalReducer
->
pResultBuf
;
pRes
->
data
=
pLocalReducer
->
pFinalRes
;
pRes
->
numOfRows
=
pBeforeFillData
->
num
;
pRes
->
numOfRows
=
(
int32_t
)
pBeforeFillData
->
num
;
if
(
pQueryInfo
->
limit
.
offset
>
0
)
{
if
(
pQueryInfo
->
limit
.
offset
<
pRes
->
numOfRows
)
{
int32_t
prevSize
=
(
int32_t
)
pBeforeFillData
->
num
;
int32_t
prevSize
=
(
int32_t
)
pBeforeFillData
->
num
;
tColModelErase
(
pLocalReducer
->
finalModel
,
pBeforeFillData
,
prevSize
,
0
,
(
int32_t
)
pQueryInfo
->
limit
.
offset
-
1
);
/* remove the hole in column model */
tColModelCompact
(
pLocalReducer
->
finalModel
,
pBeforeFillData
,
prevSize
);
pRes
->
numOfRows
-=
pQueryInfo
->
limit
.
offset
;
pRes
->
numOfRows
-=
(
int32_t
)
pQueryInfo
->
limit
.
offset
;
pQueryInfo
->
limit
.
offset
=
0
;
}
else
{
pQueryInfo
->
limit
.
offset
-=
pRes
->
numOfRows
;
...
...
@@ -962,7 +962,7 @@ static void doFillResult(SSqlObj *pSql, SLocalReducer *pLocalReducer, bool doneO
}
pRes
->
data
=
pLocalReducer
->
pFinalRes
;
pRes
->
numOfRows
=
newRows
;
pRes
->
numOfRows
=
(
int32_t
)
newRows
;
pQueryInfo
->
limit
.
offset
=
0
;
break
;
...
...
src/client/src/tscServer.c
浏览文件 @
da5b584e
...
...
@@ -789,8 +789,7 @@ int tscBuildQueryMsg(SSqlObj *pSql, SSqlInfo *pInfo) {
size_t
output
=
tscNumOfFields
(
pQueryInfo
);
if
((
tscIsSecondStageQuery
(
pQueryInfo
)
||
UTIL_TABLE_IS_NORMAL_TABLE
(
pTableMetaInfo
)
||
UTIL_TABLE_IS_CHILD_TABLE
(
pTableMetaInfo
)))
{
if
(
tscIsSecondStageQuery
(
pQueryInfo
))
{
pQueryMsg
->
secondStageOutput
=
htonl
((
int32_t
)
output
);
SSqlFuncMsg
*
pSqlFuncExpr1
=
(
SSqlFuncMsg
*
)
pMsg
;
...
...
@@ -2219,7 +2218,7 @@ int tscProcessRetrieveRspFromNode(SSqlObj *pSql) {
}
pRes
->
row
=
0
;
tscDebug
(
"%p numOfRows:%
"
PRId64
"
, offset:%"
PRId64
", complete:%d"
,
pSql
,
pRes
->
numOfRows
,
pRes
->
offset
,
pRes
->
completed
);
tscDebug
(
"%p numOfRows:%
d
, offset:%"
PRId64
", complete:%d"
,
pSql
,
pRes
->
numOfRows
,
pRes
->
offset
,
pRes
->
completed
);
return
0
;
}
...
...
src/client/src/tscSql.c
浏览文件 @
da5b584e
...
...
@@ -394,7 +394,7 @@ int taos_affected_rows(TAOS_RES *tres) {
SSqlObj
*
pSql
=
(
SSqlObj
*
)
tres
;
if
(
pSql
==
NULL
||
pSql
->
signature
!=
pSql
)
return
0
;
return
(
int
)(
pSql
->
res
.
numOfRows
)
;
return
pSql
->
res
.
numOfRows
;
}
TAOS_FIELD
*
taos_fetch_fields
(
TAOS_RES
*
res
)
{
...
...
@@ -440,53 +440,12 @@ int taos_retrieve(TAOS_RES *res) {
tscResetForNextRetrieve
(
pRes
);
if
(
pCmd
->
command
<
TSDB_SQL_LOCAL
)
{
pCmd
->
command
=
(
pCmd
->
command
>
TSDB_SQL_MGMT
)
?
TSDB_SQL_RETRIEVE
:
TSDB_SQL_FETCH
;
}
tscProcessSql
(
pSql
);
return
(
int
)
pRes
->
numOfRows
;
}
int
taos_fetch_block_impl
(
TAOS_RES
*
res
,
TAOS_ROW
*
rows
)
{
SSqlObj
*
pSql
=
(
SSqlObj
*
)
res
;
SSqlCmd
*
pCmd
=
&
pSql
->
cmd
;
SSqlRes
*
pRes
=
&
pSql
->
res
;
if
(
pRes
->
qhandle
==
0
||
pSql
->
signature
!=
pSql
)
{
*
rows
=
NULL
;
return
0
;
}
// Retrieve new block
tscResetForNextRetrieve
(
pRes
);
if
(
pCmd
->
command
<
TSDB_SQL_LOCAL
)
{
pCmd
->
command
=
(
pCmd
->
command
>
TSDB_SQL_MGMT
)
?
TSDB_SQL_RETRIEVE
:
TSDB_SQL_FETCH
;
}
tscProcessSql
(
pSql
);
if
(
pRes
->
numOfRows
==
0
)
{
*
rows
=
NULL
;
return
0
;
}
// secondary merge has handle this situation
if
(
pCmd
->
command
!=
TSDB_SQL_RETRIEVE_LOCALMERGE
)
{
pRes
->
numOfClauseTotal
+=
pRes
->
numOfRows
;
}
SQueryInfo
*
pQueryInfo
=
tscGetQueryInfoDetail
(
pCmd
,
0
);
if
(
pQueryInfo
==
NULL
)
return
0
;
assert
(
0
);
for
(
int
i
=
0
;
i
<
pQueryInfo
->
fieldsInfo
.
numOfOutput
;
++
i
)
{
tscGetResultColumnChr
(
pRes
,
&
pQueryInfo
->
fieldsInfo
,
i
,
0
);
}
*
rows
=
pRes
->
tsrow
;
return
(
int
)((
pQueryInfo
->
order
.
order
==
TSDB_ORDER_DESC
)
?
pRes
->
numOfRows
:
-
pRes
->
numOfRows
);
return
pRes
->
numOfRows
;
}
static
bool
needToFetchNewBlock
(
SSqlObj
*
pSql
)
{
...
...
@@ -573,7 +532,7 @@ int taos_fetch_block(TAOS_RES *res, TAOS_ROW *rows) {
*
rows
=
pRes
->
urow
;
tscClearSqlOwner
(
pSql
);
return
(
int32_t
)
pRes
->
numOfRows
;
return
pRes
->
numOfRows
;
}
int
taos_select_db
(
TAOS
*
taos
,
const
char
*
db
)
{
...
...
src/client/src/tscSubquery.c
浏览文件 @
da5b584e
...
...
@@ -948,7 +948,7 @@ static void tsCompRetrieveCallback(void* param, TAOS_RES* tres, int32_t numOfRow
if
(
!
pRes
->
completed
)
{
taosGetTmpfilePath
(
"ts-join"
,
pSupporter
->
path
);
pSupporter
->
f
=
fopen
(
pSupporter
->
path
,
"w"
);
pRes
->
row
=
(
int32_t
)
pRes
->
numOfRows
;
pRes
->
row
=
pRes
->
numOfRows
;
taos_fetch_rows_a
(
tres
,
tsCompRetrieveCallback
,
param
);
return
;
...
...
@@ -974,7 +974,7 @@ static void tsCompRetrieveCallback(void* param, TAOS_RES* tres, int32_t numOfRow
// TODO check for failure
pSupporter
->
f
=
fopen
(
pSupporter
->
path
,
"w"
);
pRes
->
row
=
(
int32_t
)
pRes
->
numOfRows
;
pRes
->
row
=
pRes
->
numOfRows
;
// set the callback function
pSql
->
fp
=
tscJoinQueryCallback
;
...
...
@@ -1085,7 +1085,7 @@ static void joinRetrieveFinalResCallback(void* param, TAOS_RES* tres, int numOfR
SSqlRes
*
pRes1
=
&
pParentSql
->
pSubs
[
i
]
->
res
;
if
(
pRes1
->
row
>
0
&&
pRes1
->
numOfRows
>
0
)
{
tscDebug
(
"%p sub:%p index:%d numOfRows:%
"
PRId64
"
total:%"
PRId64
" (not retrieve)"
,
pParentSql
,
pParentSql
->
pSubs
[
i
],
i
,
tscDebug
(
"%p sub:%p index:%d numOfRows:%
d
total:%"
PRId64
" (not retrieve)"
,
pParentSql
,
pParentSql
->
pSubs
[
i
],
i
,
pRes1
->
numOfRows
,
pRes1
->
numOfTotal
);
assert
(
pRes1
->
row
<
pRes1
->
numOfRows
);
}
else
{
...
...
@@ -1093,7 +1093,7 @@ static void joinRetrieveFinalResCallback(void* param, TAOS_RES* tres, int numOfR
pRes1
->
numOfClauseTotal
+=
pRes1
->
numOfRows
;
}
tscDebug
(
"%p sub:%p index:%d numOfRows:%
"
PRId64
"
total:%"
PRId64
,
pParentSql
,
pParentSql
->
pSubs
[
i
],
i
,
tscDebug
(
"%p sub:%p index:%d numOfRows:%
d
total:%"
PRId64
,
pParentSql
,
pParentSql
->
pSubs
[
i
],
i
,
pRes1
->
numOfRows
,
pRes1
->
numOfTotal
);
}
}
...
...
@@ -2032,7 +2032,7 @@ static void tscRetrieveFromDnodeCallBack(void *param, TAOS_RES *tres, int numOfR
assert
(
pRes
->
numOfRows
==
numOfRows
);
int64_t
num
=
atomic_add_fetch_64
(
&
pState
->
numOfRetrievedRows
,
numOfRows
);
tscDebug
(
"%p sub:%p retrieve numOfRows:%
"
PRId64
"
totalNumOfRows:%"
PRIu64
" from ep:%s, orderOfSub:%d"
,
pParentSql
,
pSql
,
tscDebug
(
"%p sub:%p retrieve numOfRows:%
d
totalNumOfRows:%"
PRIu64
" from ep:%s, orderOfSub:%d"
,
pParentSql
,
pSql
,
pRes
->
numOfRows
,
pState
->
numOfRetrievedRows
,
pSql
->
epSet
.
fqdn
[
pSql
->
epSet
.
inUse
],
idx
);
if
(
num
>
tsMaxNumOfOrderedResults
&&
tscIsProjectionQueryOnSTable
(
pQueryInfo
,
0
))
{
...
...
@@ -2059,7 +2059,7 @@ static void tscRetrieveFromDnodeCallBack(void *param, TAOS_RES *tres, int numOfR
}
int32_t
ret
=
saveToBuffer
(
trsupport
->
pExtMemBuffer
[
idx
],
pDesc
,
trsupport
->
localBuffer
,
pRes
->
data
,
(
int32_t
)
pRes
->
numOfRows
,
pQueryInfo
->
groupbyExpr
.
orderType
);
pRes
->
numOfRows
,
pQueryInfo
->
groupbyExpr
.
orderType
);
if
(
ret
!=
0
)
{
// set no disk space error info, and abort retry
tscAbortFurtherRetryRetrieval
(
trsupport
,
tres
,
TSDB_CODE_TSC_NO_DISKSPACE
);
}
else
if
(
pRes
->
completed
)
{
...
...
@@ -2171,7 +2171,7 @@ static void multiVnodeInsertFinalize(void* param, TAOS_RES* tres, int numOfRows)
return
;
}
tscDebug
(
"%p Async insertion completed, total inserted:%
"
PRId64
,
pParentObj
,
pParentObj
->
res
.
numOfRows
);
tscDebug
(
"%p Async insertion completed, total inserted:%
d"
,
pParentObj
,
pParentObj
->
res
.
numOfRows
);
// restore user defined fp
pParentObj
->
fp
=
pParentObj
->
fetchFp
;
...
...
src/client/src/tscUtil.c
浏览文件 @
da5b584e
...
...
@@ -220,11 +220,6 @@ bool tscIsPointInterpQuery(SQueryInfo* pQueryInfo) {
}
bool
tscIsSecondStageQuery
(
SQueryInfo
*
pQueryInfo
)
{
STableMetaInfo
*
pTableMetaInfo
=
pQueryInfo
->
pTableMetaInfo
[
0
];
if
(
UTIL_TABLE_IS_SUPER_TABLE
(
pTableMetaInfo
))
{
return
false
;
}
if
(
tscIsProjectionQuery
(
pQueryInfo
))
{
return
false
;
}
...
...
src/connector/jdbc/src/main/java/com/taosdata/jdbc/TSDBDriver.java
浏览文件 @
da5b584e
...
...
@@ -89,7 +89,7 @@ public class TSDBDriver extends AbstractTaosDriver {
/**
* fetch data from native function in a batch model
*/
public
static
final
String
PROPERTY_KEY_BATCH_LOAD
=
"batch"
;
public
static
final
String
PROPERTY_KEY_BATCH_LOAD
=
"batch
fetch
"
;
private
TSDBDatabaseMetaData
dbMetaData
=
null
;
...
...
src/connector/jdbc/src/main/java/com/taosdata/jdbc/TSDBResultSetBlockData.java
浏览文件 @
da5b584e
...
...
@@ -31,8 +31,6 @@ import java.util.List;
public
class
TSDBResultSetBlockData
{
private
int
numOfRows
=
0
;
private
int
numOfCols
=
0
;
private
int
rowIndex
=
0
;
private
List
<
ColumnMetaData
>
columnMetaDataList
;
...
...
@@ -40,22 +38,20 @@ public class TSDBResultSetBlockData {
public
TSDBResultSetBlockData
(
List
<
ColumnMetaData
>
colMeta
,
int
numOfCols
)
{
this
.
columnMetaDataList
=
colMeta
;
this
.
setNumOfCols
(
numOfCols
);
this
.
colData
=
new
ArrayList
<
Object
>
(
numOfCols
);
}
public
TSDBResultSetBlockData
()
{
this
.
colData
=
new
ArrayList
<
Object
>();
this
.
setNumOfCols
(
0
);
}
public
void
clear
()
{
int
size
=
this
.
colData
.
size
();
if
(
this
.
colData
!=
null
)
{
this
.
colData
.
clear
();
}
if
(
this
.
numOfCols
==
0
)
{
return
;
}
setNumOfCols
(
size
);
}
public
int
getNumOfRows
()
{
...
...
@@ -67,12 +63,12 @@ public class TSDBResultSetBlockData {
}
public
int
getNumOfCols
()
{
return
numOfCols
;
return
this
.
colData
.
size
()
;
}
public
void
setNumOfCols
(
int
numOfCols
)
{
this
.
numOfCols
=
numOfCols
;
this
.
c
lear
(
);
this
.
colData
=
new
ArrayList
<
Object
>(
numOfCols
)
;
this
.
c
olData
.
addAll
(
Collections
.
nCopies
(
numOfCols
,
null
)
);
}
public
boolean
hasMore
()
{
...
...
src/query/src/qExecutor.c
浏览文件 @
da5b584e
...
...
@@ -853,9 +853,9 @@ static int32_t getNextQualifiedWindow(SQueryRuntimeEnv *pRuntimeEnv, STimeWindow
int32_t
factor
=
GET_FORWARD_DIRECTION_FACTOR
(
pQuery
->
order
.
order
);
startPos
=
prevPosition
+
factor
;
}
else
{
if
(
startKey
<
pDataBlockInfo
->
window
.
skey
&&
QUERY_IS_ASC_QUERY
(
pQuery
))
{
if
(
startKey
<
=
pDataBlockInfo
->
window
.
skey
&&
QUERY_IS_ASC_QUERY
(
pQuery
))
{
startPos
=
0
;
}
else
if
(
startKey
>
pDataBlockInfo
->
window
.
ekey
&&
!
QUERY_IS_ASC_QUERY
(
pQuery
))
{
}
else
if
(
startKey
>
=
pDataBlockInfo
->
window
.
ekey
&&
!
QUERY_IS_ASC_QUERY
(
pQuery
))
{
startPos
=
pDataBlockInfo
->
rows
-
1
;
}
else
{
startPos
=
searchFn
((
char
*
)
primaryKeys
,
pDataBlockInfo
->
rows
,
startKey
,
pQuery
->
order
.
order
);
...
...
src/query/src/qParserImpl.c
浏览文件 @
da5b584e
...
...
@@ -225,7 +225,8 @@ tSQLExpr *tSQLExprCreate(tSQLExpr *pLeft, tSQLExpr *pRight, int32_t optrType) {
tSQLExprDestroy
(
pLeft
);
tSQLExprDestroy
(
pRight
);
}
else
if
((
pLeft
->
nSQLOptr
==
TK_FLOAT
&&
pRight
->
nSQLOptr
==
TK_INTEGER
)
||
(
pLeft
->
nSQLOptr
==
TK_INTEGER
&&
pRight
->
nSQLOptr
==
TK_FLOAT
))
{
}
else
if
((
pLeft
->
nSQLOptr
==
TK_FLOAT
&&
pRight
->
nSQLOptr
==
TK_INTEGER
)
||
(
pLeft
->
nSQLOptr
==
TK_INTEGER
&&
pRight
->
nSQLOptr
==
TK_FLOAT
)
||
(
pLeft
->
nSQLOptr
==
TK_FLOAT
&&
pRight
->
nSQLOptr
==
TK_FLOAT
))
{
pExpr
->
val
.
nType
=
TSDB_DATA_TYPE_DOUBLE
;
pExpr
->
nSQLOptr
=
TK_FLOAT
;
...
...
tests/script/general/parser/alter.sim
浏览文件 @
da5b584e
...
...
@@ -4,7 +4,7 @@ system sh/deploy.sh -n dnode1 -i 1
system sh/cfg.sh -n dnode1 -c walLevel -v 0
system sh/cfg.sh -n dnode1 -c tableMetaKeepTimer -v 3
system sh/exec.sh -n dnode1 -s start
sleep
10
00
sleep
5
00
sql connect
$dbPrefix = m_alt_db
...
...
@@ -114,7 +114,7 @@ endi
sql drop table tb
sql drop table mt
sleep
10
00
sleep
5
00
### ALTER TABLE WHILE STREAMING [TBASE271]
#sql create table tb1 (ts timestamp, c1 int, c2 nchar(5), c3 int)
#sql create table strm as select count(*), avg(c1), first(c2), sum(c3) from tb1 interval(2s)
...
...
@@ -134,7 +134,7 @@ sleep 1000
# return -1
#endi
#sql alter table tb1 drop column c3
#sleep
6
000
#sleep
3
000
#sql insert into tb1 values (now, 2, 'taos')
#sleep 30000
#sql select * from strm
...
...
@@ -145,9 +145,9 @@ sleep 1000
# return -1
#endi
#sql alter table tb1 add column c3 int
#sleep
6
000
#sleep
3
000
#sql insert into tb1 values (now, 3, 'taos', 3);
#sleep
10
00
#sleep
5
00
#sql select * from strm
#if $rows != 3 then
# return -1
...
...
@@ -186,7 +186,7 @@ sql create database $db
sql use $db
sql create table mt (ts timestamp, c1 int, c2 nchar(7), c3 int) tags (t1 int)
sql create table tb using mt tags(1)
sleep
10
00
sleep
5
00
sql insert into tb values ('2018-11-01 16:30:00.000', 1, 'insert', 1)
sql alter table mt drop column c3
...
...
tests/script/general/parser/alter1.sim
浏览文件 @
da5b584e
...
...
@@ -3,7 +3,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
10
00
sleep
5
00
sql connect
sql reset query cache
...
...
@@ -87,7 +87,7 @@ if $data13 != NULL then
return -1
endi
sleep
10
00
sleep
5
00
print ================== insert values into table
sql insert into car1 values (now, 1, 1,1 ) (now +1s, 2,2,2,) car2 values (now, 1,3,3)
...
...
tests/script/general/parser/alter_stable.sim
浏览文件 @
da5b584e
...
...
@@ -4,7 +4,7 @@ system sh/deploy.sh -n dnode1 -i 1
system sh/cfg.sh -n dnode1 -c walLevel -v 0
system sh/cfg.sh -n dnode1 -c tableMetaKeepTimer -v 3
system sh/exec.sh -n dnode1 -s start
sleep
10
00
sleep
5
00
sql connect
print ========== alter_stable.sim
...
...
tests/script/general/parser/auto_create_tb.sim
浏览文件 @
da5b584e
...
...
@@ -4,7 +4,7 @@ system sh/cfg.sh -n dnode1 -c walLevel -v 0
system sh/cfg.sh -n dnode1 -c maxtablesPerVnode -v 2
system sh/exec.sh -n dnode1 -s start
sleep
10
00
sleep
5
00
sql connect
print ======================== dnode1 start
...
...
@@ -208,11 +208,11 @@ endi
print ================== restart server to commit data into disk
system sh/exec.sh -n dnode1 -s stop -x SIGINT
sleep
5
000
sleep
3
000
system sh/exec.sh -n dnode1 -s start
print ================== server restart completed
sql connect
sleep
10
00
sleep
5
00
sql use $db
#### auto create multiple tables
...
...
@@ -298,7 +298,7 @@ endi
sql create table tu(ts timestamp, k int);
sql_error create table txu using tu tags(0) values(now, 1);
#
[TBASE-675]
print =================>
[TBASE-675]
sql insert into tu values(1565971200000, 1) (1565971200000,2) (1565971200001, 3)(1565971200001, 4)
sql select * from tu
if $rows != 2 then
...
...
tests/script/general/parser/auto_create_tb_drop_tb.sim
浏览文件 @
da5b584e
...
...
@@ -4,7 +4,7 @@ system sh/cfg.sh -n dnode1 -c walLevel -v 1
system sh/cfg.sh -n dnode1 -c maxTablesPerVnode -v 4
system sh/cfg.sh -n dnode1 -c ctime -v 30
system sh/exec.sh -n dnode1 -s start
sleep
10
00
sleep
5
00
sql connect
$dbPrefix = db
...
...
@@ -49,7 +49,7 @@ while $t < $tbNum
endw
print ====== tables created
sleep
600
00
sleep
5
00
sql drop table tb2
$x = 0
...
...
@@ -59,9 +59,7 @@ while $x < $rowNum
$t1 = $t1 . '
sql insert into tb1 using $stb tags( $t1 ) values ( $ts , $x )
$x = $x + 1
endw
sleep 6000
endw
$ts = $ts0 + $delta
$ts = $ts + 1
...
...
tests/script/general/parser/binary_escapeCharacter.sim
浏览文件 @
da5b584e
...
...
@@ -4,7 +4,7 @@ system sh/deploy.sh -n dnode1 -i 1
system sh/cfg.sh -n dnode1 -c walLevel -v 0
system sh/cfg.sh -n dnode1 -c tableMetaKeepTimer -v 3
system sh/exec.sh -n dnode1 -s start
sleep
10
00
sleep
5
00
sql connect
sql drop database if exists ecdb
...
...
tests/script/general/parser/col_arithmetic_operation.sim
浏览文件 @
da5b584e
...
...
@@ -3,7 +3,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
10
00
sleep
5
00
sql connect
$dbPrefix = ca_db
...
...
@@ -34,7 +34,7 @@ while $i < $halfTbNum
$tb1 = $tbPrefix . $tbId
sql create table $tb using $stb tags( $i )
sql create table $tb1 using $stb tags( $tbId )
$x = 0
while $x < $rowNum
$xs = $x * $delta
...
...
@@ -46,8 +46,7 @@ while $i < $halfTbNum
$binary = $binary . '
$nchar = 'nchar . $c
$nchar = $nchar . '
sql insert into $tb values ( $ts , $c , $c , $c , $c , $c , $c , true, $binary , $nchar )
sql insert into $tb1 values ( $ts , NULL , $c , NULL , $c , NULL , $c , NULL, NULL , $nchar )
sql insert into $tb values ( $ts , $c , $c , $c , $c , $c , $c , true, $binary , $nchar ) $tb1 values ( $ts , NULL , $c , NULL , $c , NULL , $c , NULL, NULL , $nchar )
$x = $x + 1
endw
$i = $i + 1
...
...
tests/script/general/parser/columnValue.sim
浏览文件 @
da5b584e
...
...
@@ -5,7 +5,7 @@ system sh/deploy.sh -n dnode1 -i 1
system sh/cfg.sh -n dnode1 -c walLevel -v 0
system sh/cfg.sh -n dnode1 -c tableMetaKeepTimer -v 3
system sh/exec.sh -n dnode1 -s start
sleep
10
00
sleep
5
00
sql connect
print ========== columnValues.sim
...
...
tests/script/general/parser/columnValue_bigint.sim
浏览文件 @
da5b584e
sleep
10
00
sleep
5
00
sql connect
sql create database if not exists db
sql use db
...
...
tests/script/general/parser/columnValue_bool.sim
浏览文件 @
da5b584e
sleep
10
00
sleep
5
00
sql connect
sql create database if not exists db
sql use db
...
...
tests/script/general/parser/columnValue_double.sim
浏览文件 @
da5b584e
####
sleep
10
00
sleep
5
00
sql connect
sql create database if not exists db
sql use db
...
...
tests/script/general/parser/columnValue_float.sim
浏览文件 @
da5b584e
####
sleep
10
00
sleep
5
00
sql connect
sql create database if not exists db
sql use db
...
...
tests/script/general/parser/columnValue_int.sim
浏览文件 @
da5b584e
sleep
10
00
sleep
5
00
sql connect
sql create database if not exists db
sql use db
...
...
tests/script/general/parser/columnValue_smallint.sim
浏览文件 @
da5b584e
sleep
10
00
sleep
5
00
sql connect
sql create database if not exists db
sql use db
...
...
tests/script/general/parser/columnValue_tinyint.sim
浏览文件 @
da5b584e
sleep
10
00
sleep
5
00
sql connect
sql create database if not exists db
sql use db
...
...
tests/script/general/parser/commit.sim
浏览文件 @
da5b584e
...
...
@@ -4,7 +4,7 @@ system sh/deploy.sh -n dnode1 -i 1
system sh/cfg.sh -n dnode1 -c walLevel -v 0
system sh/cfg.sh -n dnode1 -c maxTablesperVnode -v 100
system sh/exec.sh -n dnode1 -s start
sleep
10
00
sleep
5
00
sql connect
$dbPrefix = sc_db
...
...
@@ -50,8 +50,7 @@ while $i < $halfNum
$binary = $binary . '
$nchar = 'nchar . $c
$nchar = $nchar . '
sql insert into $tb values ( $ts , $c , $c , $c , $c , $c , $c , true, $binary , $nchar )
sql insert into $tb1 values ( $ts , $c , NULL , $c , NULL , $c , $c , true, $binary , $nchar )
sql insert into $tb values ( $ts , $c , $c , $c , $c , $c , $c , true, $binary , $nchar ) $tb1 values ( $ts , $c , NULL , $c , NULL , $c , $c , true, $binary , $nchar )
$x = $x + 1
endw
...
...
@@ -83,12 +82,12 @@ endw
print ================== restart server to commit data into disk
system sh/exec.sh -n dnode1 -s stop -x SIGINT
sleep
5
000
sleep
3
000
system sh/exec.sh -n dnode1 -s start
sleep
10
00
sleep
5
00
print ================== server restart completed
sql connect
sleep
10
00
sleep
5
00
print ====== select from table and check num of rows returned
sql use $db
...
...
tests/script/general/parser/constCol.sim
浏览文件 @
da5b584e
...
...
@@ -353,8 +353,8 @@ if $rows != 3 then
endi
print =============================> td-2036
if $data00 != 0.3000000 then
print expect: 0.3000000, actual:$data00
if $data00 != 0.3000000
00
then
print expect: 0.3000000
00
, actual:$data00
return -1
endi
...
...
tests/script/general/parser/create_db.sim
浏览文件 @
da5b584e
...
...
@@ -5,7 +5,7 @@ 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
10
00
sleep
5
00
sql connect
print ======================== dnode1 start
...
...
tests/script/general/parser/create_mt.sim
浏览文件 @
da5b584e
...
...
@@ -5,7 +5,7 @@ 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
10
00
sleep
5
00
sql connect
print ======================== dnode1 start
...
...
tests/script/general/parser/create_tb.sim
浏览文件 @
da5b584e
...
...
@@ -5,7 +5,7 @@ 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
10
00
sleep
5
00
sql connect
print ======================== dnode1 start
...
...
tests/script/general/parser/dbtbnameValidate.sim
浏览文件 @
da5b584e
...
...
@@ -3,7 +3,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
10
00
sleep
5
00
sql connect
print ========== db name and table name check in create and drop, describe
...
...
tests/script/general/parser/fill.sim
浏览文件 @
da5b584e
...
...
@@ -3,7 +3,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
10
00
sleep
5
00
sql connect
$dbPrefix = m_fl_db
...
...
tests/script/general/parser/fill_stb.sim
浏览文件 @
da5b584e
...
...
@@ -3,7 +3,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
10
00
sleep
5
00
sql connect
$dbPrefix = fl1_db
...
...
tests/script/general/parser/fill_us.sim
浏览文件 @
da5b584e
...
...
@@ -3,7 +3,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
10
00
sleep
5
00
sql connect
$dbPrefix = m_fl_db
...
...
tests/script/general/parser/first_last.sim
浏览文件 @
da5b584e
...
...
@@ -4,7 +4,7 @@ system sh/deploy.sh -n dnode1 -i 1
system sh/cfg.sh -n dnode1 -c walLevel -v 0
system sh/cfg.sh -n dnode1 -c maxTablespervnode -v 4
system sh/exec.sh -n dnode1 -s start
sleep
10
00
sleep
5
00
sql connect
$dbPrefix = first_db
...
...
@@ -76,11 +76,11 @@ 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
5
000
sleep
3
000
system sh/exec.sh -n dnode1 -s start
print ================== server restart completed
sql connect
sleep
10
00
sleep
5
00
run general/parser/first_last_query.sim
...
...
tests/script/general/parser/first_last_query.sim
浏览文件 @
da5b584e
sleep
10
00
sleep
5
00
sql connect
$dbPrefix = first_db
...
...
tests/script/general/parser/groupby.sim
浏览文件 @
da5b584e
...
...
@@ -4,7 +4,7 @@ system sh/deploy.sh -n dnode1 -i 1
system sh/cfg.sh -n dnode1 -c walLevel -v 0
system sh/cfg.sh -n dnode1 -c maxtablespervnode -v 4
system sh/exec.sh -n dnode1 -s start
sleep
10
00
sleep
5
00
sql connect
$dbPrefix = group_db
...
...
@@ -33,12 +33,19 @@ sql create database if not exists $db keep 36500
sql use $db
sql create table $mt (ts timestamp, c1 int, c2 float, c3 bigint, c4 smallint, c5 tinyint, c6 double, c7 bool, c8 binary(10), c9 nchar(9)) TAGS(t1 int, t2 binary(12))
$half = $tbNum / 2
$i = 0
while $i < $
tbNum
while $i < $
half
$tb = $tbPrefix . $i
$tg2 = ' . abc
$tg2 = $tg2 . '
$nextSuffix = $i + $half
$tb1 = $tbPrefix . $nextSuffix
sql create table $tb using $mt tags( $i , $tg2 )
sql create table $tb1 using $mt tags( $nextSuffix , $tg2 )
$x = 0
while $x < $rowNum
...
...
@@ -55,7 +62,7 @@ while $i < $tbNum
$nchar = $nchar . $c
$nchar = $nchar . '
sql insert into $tb values ($tstart , $c , $c , $c , $c , $c , $c , $c , $binary , $nchar )
sql insert into $tb values ($tstart , $c , $c , $c , $c , $c , $c , $c , $binary , $nchar )
$tb1 values ($tstart , $c , $c , $c , $c , $c , $c , $c , $binary , $nchar )
$tstart = $tstart + 1
$x = $x + 1
endw
...
...
tests/script/general/parser/import.sim
浏览文件 @
da5b584e
...
...
@@ -3,7 +3,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
10
00
sleep
5
00
sql connect
$dbPrefix = impt_db
...
...
@@ -64,7 +64,7 @@ sleep 2000
system sh/exec.sh -n dnode1 -s start
print ================== server restart completed
sql connect
sleep
10
00
sleep
5
00
sql use $db
sql select * from tb
...
...
tests/script/general/parser/import_commit1.sim
浏览文件 @
da5b584e
...
...
@@ -4,7 +4,7 @@ system sh/deploy.sh -n dnode1 -i 1
system sh/cfg.sh -n dnode1 -c walLevel -v 1
system sh/cfg.sh -n dnode1 -c ctime -v 30
system sh/exec.sh -n dnode1 -s start
sleep
10
00
sleep
5
00
sql connect
$dbPrefix = ic_db
...
...
@@ -40,7 +40,7 @@ while $x < $rowNum
endw
print ====== tables created
sleep
6
000
sleep
3
000
$ts = $ts0 + $delta
$ts = $ts + 1
...
...
tests/script/general/parser/import_commit2.sim
浏览文件 @
da5b584e
...
...
@@ -4,7 +4,7 @@ system sh/deploy.sh -n dnode1 -i 1
system sh/cfg.sh -n dnode1 -c walLevel -v 1
system sh/cfg.sh -n dnode1 -c ctime -v 30
system sh/exec.sh -n dnode1 -s start
sleep
10
00
sleep
5
00
sql connect
$dbPrefix = ic_db
...
...
@@ -39,7 +39,7 @@ while $x < $rowNum
endw
print ====== tables created
sleep
6
000
sleep
3
000
$ts = $ts0 + $delta
$ts = $ts + 1
...
...
tests/script/general/parser/import_commit3.sim
浏览文件 @
da5b584e
...
...
@@ -4,7 +4,7 @@ system sh/deploy.sh -n dnode1 -i 1
system sh/cfg.sh -n dnode1 -c walLevel -v 1
system sh/cfg.sh -n dnode1 -c ctime -v 30
system sh/exec.sh -n dnode1 -s start
sleep
10
00
sleep
5
00
sql connect
$dbPrefix = ic_db
...
...
@@ -39,7 +39,7 @@ while $x < $rowNum
endw
print ====== tables created
sleep
6
000
sleep
3
000
$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
6
000
sleep
3
000
sql show databases
...
...
tests/script/general/parser/insert_multiTbl.sim
浏览文件 @
da5b584e
...
...
@@ -6,7 +6,7 @@ system sh/cfg.sh -n dnode1 -c walLevel -v 0
system sh/exec.sh -n dnode1 -s start
sleep 2000
sql connect
sleep
10
00
sleep
5
00
print ======================== dnode1 start
sql create database mul_db
...
...
tests/script/general/parser/insert_tb.sim
浏览文件 @
da5b584e
...
...
@@ -5,7 +5,7 @@ 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
10
00
sleep
5
00
sql connect
print ======================== dnode1 start
...
...
@@ -103,7 +103,7 @@ if $rows != 1 then
endi
sql drop database $db
sleep
10
00
sleep
5
00
sql create database $db
sql use $db
sql create table stb1 (ts timestamp, c1 int) tags(t1 int)
...
...
@@ -136,7 +136,7 @@ if $data21 != 1.000000000 then
endi
sql drop database $db
sleep
10
00
sleep
5
00
sql create database $db
sql use $db
sql create table stb (ts timestamp, c1 int, c2 bigint, c3 float, c4 double, c5 nchar(10), c6 binary(20)) tags(t1 int, t2 bigint, t3 double, t4 float, t5 nchar(10))
...
...
tests/script/general/parser/interp.sim
浏览文件 @
da5b584e
...
...
@@ -3,7 +3,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
10
00
sleep
5
00
sql connect
$dbPrefix = intp_db
...
...
@@ -47,8 +47,7 @@ while $i < $halfNum
$binary = $binary . '
$nchar = 'nchar . $c
$nchar = $nchar . '
sql insert into $tb values ( $ts , $c , $c , $c , $c , $c , $c , true, $binary , $nchar )
sql insert into $tb1 values ( $ts , $c , NULL , $c , NULL , $c , $c , true, $binary , $nchar )
sql insert into $tb values ( $ts , $c , $c , $c , $c , $c , $c , true, $binary , $nchar ) $tb1 values ( $ts , $c , NULL , $c , NULL , $c , $c , true, $binary , $nchar )
$x = $x + 1
endw
...
...
@@ -60,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
5
000
sleep
3
000
system sh/exec.sh -n dnode1 -s start
print ================== server restart completed
...
...
tests/script/general/parser/interp_test.sim
浏览文件 @
da5b584e
sleep
10
00
sleep
5
00
sql connect
$dbPrefix = intp_db
...
...
tests/script/general/parser/join.sim
浏览文件 @
da5b584e
...
...
@@ -7,7 +7,7 @@ system sh/cfg.sh -n dnode1 -c rpcDebugFlag -v 135
system sh/cfg.sh -n dnode1 -c maxtablespervnode -v 4
system sh/exec.sh -n dnode1 -s start
sleep
10
00
sleep
5
00
sql connect
$dbPrefix = join_db
...
...
tests/script/general/parser/join_multivnode.sim
浏览文件 @
da5b584e
...
...
@@ -6,7 +6,7 @@ system sh/cfg.sh -n dnode1 -c maxtablespervnode -v 4
system sh/exec.sh -n dnode1 -s start
sql connect
sleep
10
00
sleep
5
00
$dbPrefix = join_m_db
$tbPrefix = join_tb
...
...
tests/script/general/parser/lastrow.sim
浏览文件 @
da5b584e
...
...
@@ -4,7 +4,7 @@ system sh/deploy.sh -n dnode1 -i 1
system sh/cfg.sh -n dnode1 -c walLevel -v 0
system sh/cfg.sh -n dnode1 -c maxtablespervnode -v 4
system sh/exec.sh -n dnode1 -s start
sleep
10
00
sleep
5
00
sql connect
$dbPrefix = lr_db
...
...
@@ -62,11 +62,11 @@ 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
5
000
sleep
3
000
system sh/exec.sh -n dnode1 -s start
print ================== server restart completed
sql connect
sleep
10
00
sleep
5
00
run general/parser/lastrow_query.sim
...
...
tests/script/general/parser/lastrow_query.sim
浏览文件 @
da5b584e
sleep
10
00
sleep
5
00
sql connect
$dbPrefix = lr_db
...
...
tests/script/general/parser/limit.sim
浏览文件 @
da5b584e
...
...
@@ -4,7 +4,7 @@ system sh/deploy.sh -n dnode1 -i 1
system sh/cfg.sh -n dnode1 -c walLevel -v 0
system sh/cfg.sh -n dnode1 -c maxVgroupsPerDb -v 1
system sh/exec.sh -n dnode1 -s start
sleep
10
00
sleep
5
00
sql connect
$dbPrefix = lm_db
...
...
@@ -62,11 +62,11 @@ 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
5
000
sleep
3
000
system sh/exec.sh -n dnode1 -s start
print ================== server restart completed
sql connect
sleep
10
00
sleep
5
00
run general/parser/limit_tb.sim
run general/parser/limit_stb.sim
...
...
tests/script/general/parser/limit1.sim
浏览文件 @
da5b584e
...
...
@@ -4,7 +4,7 @@ system sh/deploy.sh -n dnode1 -i 1
system sh/cfg.sh -n dnode1 -c walLevel -v 0
system sh/cfg.sh -n dnode1 -c maxVgroupsPerDb -v 1
system sh/exec.sh -n dnode1 -s start
sleep
10
00
sleep
5
00
sql connect
$dbPrefix = lm1_db
...
...
@@ -48,8 +48,7 @@ while $i < $halfNum
$binary = $binary . '
$nchar = 'nchar . $c
$nchar = $nchar . '
sql insert into $tb values ( $ts , $c , $c , $c , $c , $c , $c , true, $binary , $nchar )
sql insert into $tb1 values ( $ts , $c , NULL , $c , NULL , $c , $c , true, $binary , $nchar )
sql insert into $tb values ( $ts , $c , $c , $c , $c , $c , $c , true, $binary , $nchar ) $tb1 values ( $ts , $c , NULL , $c , NULL , $c , $c , true, $binary , $nchar )
$x = $x + 1
endw
...
...
@@ -62,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
5
000
sleep
3
000
system sh/exec.sh -n dnode1 -s start
print ================== server restart completed
...
...
tests/script/general/parser/limit1_stb.sim
浏览文件 @
da5b584e
sleep
10
00
sleep
5
00
sql connect
$dbPrefix = lm1_db
...
...
tests/script/general/parser/limit1_tb.sim
浏览文件 @
da5b584e
sleep
10
00
sleep
5
00
sql connect
$dbPrefix = lm1_db
...
...
tests/script/general/parser/limit1_tblocks100.sim
浏览文件 @
da5b584e
...
...
@@ -4,7 +4,7 @@ system sh/deploy.sh -n dnode1 -i 1
system sh/cfg.sh -n dnode1 -c walLevel -v 0
system sh/cfg.sh -n dnode1 -c maxVgroupsPerDb -v 1
system sh/exec.sh -n dnode1 -s start
sleep
10
00
sleep
5
00
sql connect
$dbPrefix = lm1_db
...
...
@@ -48,8 +48,7 @@ while $i < $halfNum
$binary = $binary . '
$nchar = 'nchar . $c
$nchar = $nchar . '
sql insert into $tb values ( $ts , $c , $c , $c , $c , $c , $c , true, $binary , $nchar )
sql insert into $tb1 values ( $ts , $c , NULL , $c , NULL , $c , $c , true, $binary , $nchar )
sql insert into $tb values ( $ts , $c , $c , $c , $c , $c , $c , true, $binary , $nchar ) $tb1 values ( $ts , $c , NULL , $c , NULL , $c , $c , true, $binary , $nchar )
$x = $x + 1
endw
...
...
@@ -62,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
5
000
sleep
3
000
system sh/exec.sh -n dnode1 -s start
print ================== server restart completed
...
...
tests/script/general/parser/limit2.sim
浏览文件 @
da5b584e
...
...
@@ -4,7 +4,7 @@ system sh/deploy.sh -n dnode1 -i 1
system sh/cfg.sh -n dnode1 -c walLevel -v 0
system sh/cfg.sh -n dnode1 -c rowsInFileBlock -v 255
system sh/exec.sh -n dnode1 -s start
sleep
10
00
sleep
5
00
sql connect
$dbPrefix = lm2_db
...
...
@@ -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
5
000
sleep
3
000
system sh/exec.sh -n dnode1 -s start
print ================== server restart completed
...
...
tests/script/general/parser/limit2_query.sim
浏览文件 @
da5b584e
sleep
10
00
sleep
5
00
sql connect
$dbPrefix = lm2_db
...
...
tests/script/general/parser/limit2_tblocks100.sim
浏览文件 @
da5b584e
...
...
@@ -4,7 +4,7 @@ system sh/deploy.sh -n dnode1 -i 1
system sh/cfg.sh -n dnode1 -c walLevel -v 0
system sh/cfg.sh -n dnode1 -c rowsInFileBlock -v 255
system sh/exec.sh -n dnode1 -s start
sleep
10
00
sleep
5
00
sql connect
$dbPrefix = lm2_db
...
...
@@ -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
10
00
sleep
5
00
system sh/exec.sh -n dnode1 -s start
print ================== server restart completed
...
...
tests/script/general/parser/limit_stb.sim
浏览文件 @
da5b584e
sleep
10
00
sleep
5
00
sql connect
$dbPrefix = lm_db
...
...
tests/script/general/parser/limit_tb.sim
浏览文件 @
da5b584e
sleep
10
00
sleep
5
00
sql connect
$dbPrefix = lm_db
...
...
tests/script/general/parser/mixed_blocks.sim
浏览文件 @
da5b584e
...
...
@@ -5,7 +5,7 @@ system sh/cfg.sh -n dnode1 -c walLevel -v 0
system sh/cfg.sh -n dnode1 -c maxtablespervnode -v 4
system sh/exec.sh -n dnode1 -s start
sleep
10
00
sleep
5
00
sql connect
$dbPrefix = mb_db
...
...
tests/script/general/parser/nchar.sim
浏览文件 @
da5b584e
...
...
@@ -5,7 +5,7 @@ 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
10
00
sleep
5
00
sql connect
print ======================== dnode1 start
...
...
tests/script/general/parser/null_char.sim
浏览文件 @
da5b584e
...
...
@@ -6,7 +6,7 @@ system sh/cfg.sh -n dnode1 -c walLevel -v 0
system sh/cfg.sh -n dnode1 -c tableMetaKeepTimer -v 3
system sh/exec.sh -n dnode1 -s start
sleep
10
00
sleep
5
00
sql connect
print ========== NULL_char.sim
...
...
@@ -251,7 +251,7 @@ endi
################### nchar
sql alter table st41 set tag tag_nchar = "��˼����"
sql select tag_binary, tag_nchar, tag_int, tag_bool, tag_float, tag_double from st41
#sleep
10
00
#sleep
5
00
#if $data01 != ��˼���� then
# print ==== expect ��˼����, actually $data01
# return -1
...
...
tests/script/general/parser/projection_limit_offset.sim
浏览文件 @
da5b584e
...
...
@@ -4,7 +4,7 @@ system sh/deploy.sh -n dnode1 -i 1
system sh/cfg.sh -n dnode1 -c walLevel -v 0
system sh/cfg.sh -n dnode1 -c maxtablespervnode -v 4
system sh/exec.sh -n dnode1 -s start
sleep
10
00
sleep
5
00
sql connect
$dbPrefix = group_db
...
...
@@ -402,7 +402,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
5
000
sleep
3
000
system sh/exec.sh -n dnode1 -s start
print ================== server restart completed
...
...
tests/script/general/parser/selectResNum.sim
浏览文件 @
da5b584e
...
...
@@ -4,7 +4,7 @@ system sh/deploy.sh -n dnode1 -i 1
system sh/cfg.sh -n dnode1 -c walLevel -v 0
system sh/cfg.sh -n dnode1 -c maxtablespervnode -v 200
system sh/exec.sh -n dnode1 -s start
sleep
10
00
sleep
5
00
sql connect
$dbPrefix = sc_db
...
...
@@ -50,8 +50,7 @@ while $i < $halfNum
$binary = $binary . '
$nchar = 'nchar . $c
$nchar = $nchar . '
sql insert into $tb values ( $ts , $c , $c , $c , $c , $c , $c , true, $binary , $nchar )
sql insert into $tb1 values ( $ts , $c , NULL , $c , NULL , $c , $c , true, $binary , $nchar )
sql insert into $tb values ( $ts , $c , $c , $c , $c , $c , $c , true, $binary , $nchar ) $tb1 values ( $ts , $c , NULL , $c , NULL , $c , $c , true, $binary , $nchar )
$x = $x + 1
endw
...
...
@@ -119,12 +118,12 @@ endw
print ====== restart server to commit data into disk
system sh/exec.sh -n dnode1 -s stop -x SIGINT
sleep
6
000
sleep
3
000
system sh/exec.sh -n dnode1 -s start
print ====== server restart completed
sleep
10
00
sleep
5
00
sql connect
sleep
10
00
sleep
5
00
sql use $db
##### repeat test after server restart
...
...
tests/script/general/parser/select_across_vnodes.sim
浏览文件 @
da5b584e
...
...
@@ -4,7 +4,7 @@ system sh/deploy.sh -n dnode1 -i 1
system sh/cfg.sh -n dnode1 -c walLevel -v 0
system sh/cfg.sh -n dnode1 -c maxtablesPerVnode -v 5
system sh/exec.sh -n dnode1 -s start
sleep
10
00
sleep
5
00
sql connect
$dbPrefix = sav_db
...
...
tests/script/general/parser/select_from_cache_disk.sim
浏览文件 @
da5b584e
...
...
@@ -4,7 +4,7 @@ system sh/deploy.sh -n dnode1 -i 1
system sh/cfg.sh -n dnode1 -c walLevel -v 0
system sh/cfg.sh -n dnode1 -c maxtablesPerVnode -v 2
system sh/exec.sh -n dnode1 -s start
sleep
10
00
sleep
5
00
sql connect
$dbPrefix = scd_db
...
...
@@ -35,11 +35,11 @@ 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
5
000
sleep
3
000
system sh/exec.sh -n dnode1 -s start
print ================== server restart completed
sql connect
sleep
10
00
sleep
5
00
sql use $db
# generate some data in cache
...
...
tests/script/general/parser/select_with_tags.sim
浏览文件 @
da5b584e
...
...
@@ -4,7 +4,7 @@ system sh/deploy.sh -n dnode1 -i 1
system sh/cfg.sh -n dnode1 -c walLevel -v 0
system sh/cfg.sh -n dnode1 -c maxtablespervnode -v 4
system sh/exec.sh -n dnode1 -s start
sleep
10
00
sleep
5
00
sql connect
$dbPrefix = select_tags_db
...
...
tests/script/general/parser/set_tag_vals.sim
浏览文件 @
da5b584e
...
...
@@ -4,7 +4,7 @@ system sh/deploy.sh -n dnode1 -i 1
system sh/cfg.sh -n dnode1 -c walLevel -v 0
system sh/cfg.sh -n dnode1 -c maxVgroupsPerDb -v 1
system sh/exec.sh -n dnode1 -s start
sleep
10
00
sleep
5
00
sql connect
$dbPrefix = db
...
...
tests/script/general/parser/single_row_in_tb.sim
浏览文件 @
da5b584e
...
...
@@ -4,7 +4,7 @@ system sh/deploy.sh -n dnode1 -i 1
system sh/cfg.sh -n dnode1 -c walLevel -v 0
system sh/cfg.sh -n dnode1 -c maxtablespervnode -v 4
system sh/exec.sh -n dnode1 -s start
sleep
10
00
sleep
5
00
sql connect
$dbPrefix = sr_db
...
...
@@ -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
5
000
sleep
3
000
system sh/exec.sh -n dnode1 -s start
print ================== server restart completed
...
...
tests/script/general/parser/single_row_in_tb_query.sim
浏览文件 @
da5b584e
sleep
10
00
sleep
5
00
sql connect
$dbPrefix = sr_db
...
...
tests/script/general/parser/sliding.sim
浏览文件 @
da5b584e
...
...
@@ -6,7 +6,7 @@ system sh/cfg.sh -n dnode1 -c debugFlag -v 135
system sh/cfg.sh -n dnode1 -c rpcDebugFlag -v 135
system sh/cfg.sh -n dnode1 -c maxtablespervnode -v 4
system sh/exec.sh -n dnode1 -s start
sleep
10
00
sleep
5
00
sql connect
$dbPrefix = sliding_db
...
...
tests/script/general/parser/slimit.sim
浏览文件 @
da5b584e
...
...
@@ -4,7 +4,7 @@ system sh/deploy.sh -n dnode1 -i 1
system sh/cfg.sh -n dnode1 -c walLevel -v 0
system sh/cfg.sh -n dnode1 -c maxtablesPerVnode -v 4
system sh/exec.sh -n dnode1 -s start
sleep
10
00
sleep
5
00
sql connect
$dbPrefix = slm_db
...
...
@@ -97,11 +97,11 @@ 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
5
000
sleep
3
000
system sh/exec.sh -n dnode1 -s start
print ================== server restart completed
sql connect
sleep
10
00
sleep
5
00
run general/parser/slimit_query.sim
...
...
tests/script/general/parser/slimit1.sim
浏览文件 @
da5b584e
...
...
@@ -4,7 +4,7 @@ system sh/deploy.sh -n dnode1 -i 1
system sh/cfg.sh -n dnode1 -c walLevel -v 0
system sh/cfg.sh -n dnode1 -c maxtablesPerVnode -v 2
system sh/exec.sh -n dnode1 -s start
sleep
10
00
sleep
5
00
sql connect
$dbPrefix = slm_alt_tg_db
...
...
@@ -56,11 +56,11 @@ 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
5
000
sleep
3
000
system sh/exec.sh -n dnode1 -s start
print ================== server restart completed
sql connect
sleep
10
00
sleep
5
00
run general/parser/slimit1_query.sim
...
...
tests/script/general/parser/slimit1_query.sim
浏览文件 @
da5b584e
sleep
10
00
sleep
5
00
sql connect
$dbPrefix = slm_alt_tg_db
...
...
tests/script/general/parser/slimit_alter_tags.sim
浏览文件 @
da5b584e
...
...
@@ -4,7 +4,7 @@ system sh/deploy.sh -n dnode1 -i 1
system sh/cfg.sh -n dnode1 -c walLevel -v 0
system sh/cfg.sh -n dnode1 -c maxtablesPerVnode -v 2
system sh/exec.sh -n dnode1 -s start
sleep
10
00
sleep
5
00
sql connect
$dbPrefix = slm_alt_tg_db
...
...
@@ -171,11 +171,11 @@ endi
print ================== restart server to commit data into disk
system sh/exec.sh -n dnode1 -s stop -x SIGINT
sleep
5
000
sleep
3
000
system sh/exec.sh -n dnode1 -s start
print ================== server restart completed
sql connect
sleep
10
00
sleep
5
00
sql use $db
### repeat above queries
...
...
tests/script/general/parser/slimit_query.sim
浏览文件 @
da5b584e
sleep
10
00
sleep
5
00
sql connect
$dbPrefix = slm_db
...
...
tests/script/general/parser/stream_on_sys.sim
浏览文件 @
da5b584e
...
...
@@ -6,7 +6,7 @@ system sh/cfg.sh -n dnode1 -c monitor -v 1
system sh/cfg.sh -n dnode1 -c monitorInterval -v 1
system sh/exec.sh -n dnode1 -s start
sleep
10
00
sleep
5
00
sql connect
print ======================== stream_on_sys.sim
...
...
tests/script/general/parser/tags_dynamically_specifiy.sim
浏览文件 @
da5b584e
...
...
@@ -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
10
00
sleep
5
00
sql connect
sleep
10
00
sleep
5
00
$db = dytag_db
$tbNum = 10
...
...
tests/script/general/parser/tags_filter.sim
浏览文件 @
da5b584e
...
...
@@ -3,7 +3,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
10
00
sleep
5
00
sql connect
$db = tf_db
...
...
tests/script/general/parser/tbnameIn.sim
浏览文件 @
da5b584e
...
...
@@ -3,7 +3,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
10
00
sleep
5
00
sql connect
$dbPrefix = ti_db
...
...
@@ -55,8 +55,7 @@ while $i < $halfNum
$binary = $binary . '
$nchar = 'nchar . $c
$nchar = $nchar . '
sql insert into $tb values ( $ts , $c , $c , $c , $c , $c , $c , true, $binary , $nchar )
sql insert into $tb1 values ( $ts , $c , NULL , $c , NULL , $c , $c , true, $binary , $nchar )
sql insert into $tb values ( $ts , $c , $c , $c , $c , $c , $c , true, $binary , $nchar ) $tb1 values ( $ts , $c , NULL , $c , NULL , $c , $c , true, $binary , $nchar )
$x = $x + 1
endw
...
...
@@ -68,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
5
000
sleep
3
000
system sh/exec.sh -n dnode1 -s start
print ================== server restart completed
...
...
tests/script/general/parser/tbnameIn_query.sim
浏览文件 @
da5b584e
sleep
10
00
sleep
5
00
sql connect
$dbPrefix = ti_db
...
...
tests/script/general/parser/testSuite.sim
浏览文件 @
da5b584e
sleep
10
00
sleep
5
00
run general/parser/alter.sim
sleep
10
00
sleep
5
00
run general/parser/alter1.sim
sleep
10
00
sleep
5
00
run general/parser/alter_stable.sim
sleep
10
00
sleep
5
00
run general/parser/auto_create_tb.sim
sleep
10
00
sleep
5
00
run general/parser/auto_create_tb_drop_tb.sim
sleep
10
00
sleep
5
00
run general/parser/col_arithmetic_operation.sim
sleep
10
00
sleep
5
00
run general/parser/columnValue.sim
sleep
10
00
sleep
5
00
run general/parser/commit.sim
sleep
10
00
sleep
5
00
run general/parser/create_db.sim
sleep
10
00
sleep
5
00
run general/parser/create_mt.sim
sleep
10
00
sleep
5
00
run general/parser/create_tb.sim
sleep
10
00
sleep
5
00
run general/parser/dbtbnameValidate.sim
sleep
10
00
sleep
5
00
run general/parser/fill.sim
sleep
10
00
sleep
5
00
run general/parser/fill_stb.sim
sleep
10
00
sleep
5
00
#run general/parser/fill_us.sim #
sleep
10
00
sleep
5
00
run general/parser/first_last.sim
sleep
10
00
sleep
5
00
run general/parser/import_commit1.sim
sleep
10
00
sleep
5
00
run general/parser/import_commit2.sim
sleep
10
00
sleep
5
00
run general/parser/import_commit3.sim
sleep
10
00
sleep
5
00
#run general/parser/import_file.sim
sleep
10
00
sleep
5
00
run general/parser/insert_tb.sim
sleep
10
00
sleep
5
00
run general/parser/tags_dynamically_specifiy.sim
sleep
10
00
sleep
5
00
run general/parser/interp.sim
sleep
10
00
sleep
5
00
run general/parser/lastrow.sim
sleep
10
00
sleep
5
00
run general/parser/limit.sim
sleep
10
00
sleep
5
00
run general/parser/limit1.sim
sleep
10
00
sleep
5
00
run general/parser/limit1_tblocks100.sim
sleep
10
00
sleep
5
00
run general/parser/limit2.sim
sleep
10
00
sleep
5
00
run general/parser/mixed_blocks.sim
sleep
10
00
sleep
5
00
run general/parser/nchar.sim
sleep
10
00
sleep
5
00
run general/parser/null_char.sim
sleep
10
00
sleep
5
00
run general/parser/selectResNum.sim
sleep
10
00
sleep
5
00
run general/parser/select_across_vnodes.sim
sleep
10
00
sleep
5
00
run general/parser/select_from_cache_disk.sim
sleep
10
00
sleep
5
00
run general/parser/set_tag_vals.sim
sleep
10
00
sleep
5
00
run general/parser/single_row_in_tb.sim
sleep
10
00
sleep
5
00
run general/parser/slimit.sim
sleep
10
00
sleep
5
00
run general/parser/slimit1.sim
sleep
10
00
sleep
5
00
run general/parser/slimit_alter_tags.sim
sleep
10
00
sleep
5
00
run general/parser/tbnameIn.sim
sleep
10
00
sleep
5
00
run general/parser/slimit_alter_tags.sim # persistent failed
sleep
10
00
sleep
5
00
run general/parser/join.sim
sleep
10
00
sleep
5
00
run general/parser/join_multivnode.sim
sleep
10
00
sleep
5
00
run general/parser/projection_limit_offset.sim
sleep
10
00
sleep
5
00
run general/parser/select_with_tags.sim
sleep
10
00
sleep
5
00
run general/parser/groupby.sim
sleep
10
00
sleep
5
00
run general/parser/tags_filter.sim
sleep
10
00
sleep
5
00
run general/parser/topbot.sim
sleep
10
00
sleep
5
00
run general/parser/union.sim
sleep
10
00
sleep
5
00
run general/parser/constCol.sim
sleep
10
00
sleep
5
00
run general/parser/where.sim
sleep
10
00
sleep
5
00
run general/parser/timestamp.sim
sleep
10
00
sleep
5
00
run general/parser/sliding.sim
#sleep
10
00
#sleep
5
00
#run general/parser/repeatStream.sim
#sleep
10
00
#sleep
5
00
#run general/parser/stream_on_sys.sim
#sleep
10
00
#sleep
5
00
#run general/parser/stream.sim
\ No newline at end of file
tests/script/general/parser/timestamp.sim
浏览文件 @
da5b584e
...
...
@@ -5,7 +5,7 @@ system sh/cfg.sh -n dnode1 -c walLevel -v 0
system sh/cfg.sh -n dnode1 -c maxtablespervnode -v 4
system sh/exec.sh -n dnode1 -s start
sleep
10
00
sleep
5
00
sql connect
$dbPrefix = ts_db
...
...
@@ -59,10 +59,10 @@ run general/parser/timestamp_query.sim
print ================== restart server to commit data into disk
system sh/exec.sh -n dnode1 -s stop -x SIGINT
sleep
10
00
sleep
5
00
system sh/exec.sh -n dnode1 -s start
print ================== server restart completed
sql connect
sleep
10
00
sleep
5
00
run general/parser/timestamp_query.sim
tests/script/general/parser/timestamp_query.sim
浏览文件 @
da5b584e
sleep
10
00
sleep
5
00
sql connect
$dbPrefix = ts_db
...
...
tests/script/general/parser/topbot.sim
浏览文件 @
da5b584e
...
...
@@ -5,7 +5,7 @@ system sh/cfg.sh -n dnode1 -c walLevel -v 0
system sh/cfg.sh -n dnode1 -c maxtablespervnode -v 200
system sh/exec.sh -n dnode1 -s start
sleep
10
00
sleep
5
00
sql connect
$dbPrefix = tb_db
...
...
@@ -128,11 +128,11 @@ 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
5
000
sleep
3
000
system sh/exec.sh -n dnode1 -s start
print ================== server restart completed
sql connect
sleep
10
00
sleep
5
00
sql select count(*) from t1.test where ts>10000 and ts<90000 interval(5000a)
if $rows != 3 then
...
...
@@ -169,7 +169,7 @@ endw
system sh/exec.sh -n dnode1 -s stop -x SIGINT
system sh/exec.sh -n dnode1 -s start
sql connect
sleep
10
00
sleep
5
00
sql use db;
$ts = 1000
...
...
@@ -221,7 +221,7 @@ sql insert into t2 values('2020-2-2 1:1:1', 1);
system sh/exec.sh -n dnode1 -s stop -x SIGINT
system sh/exec.sh -n dnode1 -s start
sql connect
sleep
10
00
sleep
5
00
sql use db
sql select count(*), first(ts), last(ts) from t2 interval(1d);
...
...
tests/script/general/parser/union.sim
浏览文件 @
da5b584e
...
...
@@ -7,7 +7,7 @@ system sh/cfg.sh -n dnode1 -c rpcDebugFlag -v 135
system sh/cfg.sh -n dnode1 -c maxtablespervnode -v 4
system sh/exec.sh -n dnode1 -s start
sleep
10
00
sleep
5
00
sql connect
$dbPrefix = union_db
...
...
@@ -36,9 +36,16 @@ sql create table $mt (ts timestamp, c1 int, c2 float, c3 bigint, c4 smallint, c5
$i = 0
$t = 1578203484000
while $i < $tbNum
$half = $tbNum / 2
while $i < $half
$tb = $tbPrefix . $i
$nextSuffix = $i + $half
$tb1 = $tbPrefix . $nextSuffix
sql create table $tb using $mt tags( $i )
sql create table $tb1 using $mt tags( $nextSuffix )
$x = 0
while $x < $rowNum
...
...
@@ -54,7 +61,7 @@ while $i < $tbNum
$nchar = $nchar . '
$t1 = $t + $ms
sql insert into $tb values ($t1 , $c , $c , $c , $c , $c , $c , $c , $binary , $nchar )
sql insert into $tb values ($t1 , $c , $c , $c , $c , $c , $c , $c , $binary , $nchar )
$tb1 values ($t1 , $c , $c , $c , $c , $c , $c , $c , $binary , $nchar )
$x = $x + 1
endw
...
...
@@ -96,7 +103,7 @@ while $i < $tbNum
endw
print sleep 1sec.
sleep
10
00
sleep
5
00
$i = 1
$tb = $tbPrefix . $i
...
...
tests/script/general/parser/where.sim
浏览文件 @
da5b584e
...
...
@@ -5,7 +5,7 @@ system sh/cfg.sh -n dnode1 -c walLevel -v 0
system sh/cfg.sh -n dnode1 -c maxtablespervnode -v 4
system sh/exec.sh -n dnode1 -s start
sleep
10
00
sleep
5
00
sql connect
$dbPrefix = wh_db
...
...
@@ -26,10 +26,17 @@ sql create database if not exists $db
sql use $db
sql create table $mt (ts timestamp, c1 int, c2 float, c3 bigint, c4 smallint, c5 tinyint, c6 double, c7 bool, c8 binary(10), c9 nchar(9)) TAGS(t1 int)
$half = $tbNum / 2
$i = 0
while $i < $
tbNum
while $i < $
half
$tb = $tbPrefix . $i
$nextSuffix = $i + $half
$tb1 = $tbPrefix . $nextSuffix
sql create table $tb using $mt tags( $i )
sql create table $tb1 using $mt tags( $nextSuffix )
$x = 0
while $x < $rowNum
...
...
@@ -42,7 +49,7 @@ while $i < $tbNum
$binary = $binary . '
$nchar = 'nchar . $c
$nchar = $nchar . '
sql insert into $tb values ($ms , $c , $c , $c , $c , $c , $c , $c , $binary , $nchar )
sql insert into $tb values ($ms , $c , $c , $c , $c , $c , $c , $c , $binary , $nchar )
$tb1 values ($ms , $c , $c , $c , $c , $c , $c , $c , $binary , $nchar )
$x = $x + 1
endw
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录