Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
慢慢CG
TDengine
提交
68bf22a9
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看板
提交
68bf22a9
编写于
5月 07, 2020
作者:
H
hjxilinx
浏览文件
操作
浏览文件
下载
差异文件
merge develop
上级
309076cd
2706bfc7
变更
165
展开全部
隐藏空白更改
内联
并排
Showing
165 changed file
with
1074 addition
and
735 deletion
+1074
-735
src/common/inc/tdataformat.h
src/common/inc/tdataformat.h
+5
-5
src/common/src/tdataformat.c
src/common/src/tdataformat.c
+11
-11
src/mnode/src/mgmtSdb.c
src/mnode/src/mgmtSdb.c
+0
-1
src/rpc/src/rpcMain.c
src/rpc/src/rpcMain.c
+1
-0
src/tsdb/inc/tsdbMain.h
src/tsdb/inc/tsdbMain.h
+1
-0
src/tsdb/src/tsdbFile.c
src/tsdb/src/tsdbFile.c
+1
-1
src/tsdb/src/tsdbMeta.c
src/tsdb/src/tsdbMeta.c
+1
-1
src/util/inc/tcoding.h
src/util/inc/tcoding.h
+133
-43
src/util/inc/tutil.h
src/util/inc/tutil.h
+1
-1
src/util/src/tqueue.c
src/util/src/tqueue.c
+3
-7
src/util/tests/codingTests.cpp
src/util/tests/codingTests.cpp
+116
-0
tests/script/basicSuite.sim
tests/script/basicSuite.sim
+18
-1
tests/script/general/agg/stream.sim
tests/script/general/agg/stream.sim
+1
-1
tests/script/general/alter/cached_schema_after_alter.sim
tests/script/general/alter/cached_schema_after_alter.sim
+1
-1
tests/script/general/alter/count.sim
tests/script/general/alter/count.sim
+1
-1
tests/script/general/alter/import.sim
tests/script/general/alter/import.sim
+1
-1
tests/script/general/alter/insert1.sim
tests/script/general/alter/insert1.sim
+1
-1
tests/script/general/alter/insert2.sim
tests/script/general/alter/insert2.sim
+1
-1
tests/script/general/column/stream.sim
tests/script/general/column/stream.sim
+1
-1
tests/script/general/column/testSuite.sim
tests/script/general/column/testSuite.sim
+4
-4
tests/script/general/compress/commitlog.sim
tests/script/general/compress/commitlog.sim
+0
-1
tests/script/general/compress/compress.sim
tests/script/general/compress/compress.sim
+0
-1
tests/script/general/compress/compress2.sim
tests/script/general/compress/compress2.sim
+0
-1
tests/script/general/compress/uncompress.sim
tests/script/general/compress/uncompress.sim
+0
-1
tests/script/general/db/back_insert.sim
tests/script/general/db/back_insert.sim
+2
-0
tests/script/general/db/basic.sim
tests/script/general/db/basic.sim
+2
-2
tests/script/general/db/delete_reuse1.sim
tests/script/general/db/delete_reuse1.sim
+4
-5
tests/script/general/db/delete_reuse2.sim
tests/script/general/db/delete_reuse2.sim
+5
-5
tests/script/general/db/delete_reusevnode.sim
tests/script/general/db/delete_reusevnode.sim
+7
-17
tests/script/general/db/delete_reusevnode2.sim
tests/script/general/db/delete_reusevnode2.sim
+3
-10
tests/script/general/db/delete_writing1.sim
tests/script/general/db/delete_writing1.sim
+1
-6
tests/script/general/db/delete_writing2.sim
tests/script/general/db/delete_writing2.sim
+2
-4
tests/script/general/db/len.sim
tests/script/general/db/len.sim
+1
-1
tests/script/general/db/repeat.sim
tests/script/general/db/repeat.sim
+2
-2
tests/script/general/db/tables.sim
tests/script/general/db/tables.sim
+26
-11
tests/script/general/db/testSuite.sim
tests/script/general/db/testSuite.sim
+10
-7
tests/script/general/http/restful.sim
tests/script/general/http/restful.sim
+1
-1
tests/script/general/http/restful_full.sim
tests/script/general/http/restful_full.sim
+1
-1
tests/script/general/import/basic.sim
tests/script/general/import/basic.sim
+4
-4
tests/script/general/import/commit.sim
tests/script/general/import/commit.sim
+4
-4
tests/script/general/import/large.sim
tests/script/general/import/large.sim
+4
-4
tests/script/general/import/replica1.sim
tests/script/general/import/replica1.sim
+4
-4
tests/script/general/insert/insert_drop.sim
tests/script/general/insert/insert_drop.sim
+1
-1
tests/script/general/metrics/disk.sim
tests/script/general/metrics/disk.sim
+2
-2
tests/script/general/metrics/metrics.sim
tests/script/general/metrics/metrics.sim
+1
-1
tests/script/general/metrics/values.sim
tests/script/general/metrics/values.sim
+1
-1
tests/script/general/metrics/vnode3.sim
tests/script/general/metrics/vnode3.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/auto_create_tb_drop_tb.sim
tests/script/general/parser/auto_create_tb_drop_tb.sim
+1
-1
tests/script/general/parser/create_db.sim
tests/script/general/parser/create_db.sim
+1
-1
tests/script/general/parser/first_last.sim
tests/script/general/parser/first_last.sim
+3
-3
tests/script/general/parser/groupby.sim
tests/script/general/parser/groupby.sim
+1
-1
tests/script/general/parser/interp.sim
tests/script/general/parser/interp.sim
+2
-2
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/limit.sim
tests/script/general/parser/limit.sim
+4
-4
tests/script/general/parser/limit1.sim
tests/script/general/parser/limit1.sim
+4
-4
tests/script/general/parser/limit1_tblocks100.sim
tests/script/general/parser/limit1_tblocks100.sim
+4
-4
tests/script/general/parser/limit2.sim
tests/script/general/parser/limit2.sim
+2
-2
tests/script/general/parser/limit2_tblocks100.sim
tests/script/general/parser/limit2_tblocks100.sim
+2
-2
tests/script/general/parser/mixed_blocks.sim
tests/script/general/parser/mixed_blocks.sim
+1
-1
tests/script/general/parser/projection_limit_offset.sim
tests/script/general/parser/projection_limit_offset.sim
+1
-1
tests/script/general/parser/repeatAlter.sim
tests/script/general/parser/repeatAlter.sim
+1
-1
tests/script/general/parser/repeatStream.sim
tests/script/general/parser/repeatStream.sim
+1
-1
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
+1
-1
tests/script/general/parser/select_with_tags.sim
tests/script/general/parser/select_with_tags.sim
+1
-1
tests/script/general/parser/single_row_in_tb.sim
tests/script/general/parser/single_row_in_tb.sim
+3
-3
tests/script/general/parser/slimit.sim
tests/script/general/parser/slimit.sim
+4
-4
tests/script/general/parser/slimit1.sim
tests/script/general/parser/slimit1.sim
+3
-3
tests/script/general/parser/slimit_alter_tags.sim
tests/script/general/parser/slimit_alter_tags.sim
+1
-1
tests/script/general/parser/tbnameIn.sim
tests/script/general/parser/tbnameIn.sim
+2
-2
tests/script/general/parser/timestamp.sim
tests/script/general/parser/timestamp.sim
+3
-3
tests/script/general/parser/where.sim
tests/script/general/parser/where.sim
+1
-1
tests/script/general/stream/metrics_del.sim
tests/script/general/stream/metrics_del.sim
+0
-3
tests/script/general/stream/metrics_replica1_vnoden.sim
tests/script/general/stream/metrics_replica1_vnoden.sim
+1
-1
tests/script/general/stream/stream_3.sim
tests/script/general/stream/stream_3.sim
+0
-3
tests/script/general/stream/table_del.sim
tests/script/general/stream/table_del.sim
+0
-3
tests/script/general/stream/table_replica1_vnoden.sim
tests/script/general/stream/table_replica1_vnoden.sim
+1
-1
tests/script/general/table/delete_writing.sim
tests/script/general/table/delete_writing.sim
+1
-1
tests/script/general/table/limit.sim
tests/script/general/table/limit.sim
+2
-2
tests/script/general/table/vgroup.sim
tests/script/general/table/vgroup.sim
+1
-1
tests/script/general/user/monitor.sim
tests/script/general/user/monitor.sim
+1
-1
tests/script/general/user/pass_alter.sim
tests/script/general/user/pass_alter.sim
+1
-1
tests/script/general/user/pass_len.sim
tests/script/general/user/pass_len.sim
+1
-1
tests/script/general/user/user_create.sim
tests/script/general/user/user_create.sim
+1
-1
tests/script/general/user/user_len.sim
tests/script/general/user/user_len.sim
+1
-1
tests/script/jenkins/basic.txt
tests/script/jenkins/basic.txt
+43
-0
tests/script/unique/account/account_create.sim
tests/script/unique/account/account_create.sim
+2
-2
tests/script/unique/account/account_delete.sim
tests/script/unique/account/account_delete.sim
+4
-2
tests/script/unique/account/account_len.sim
tests/script/unique/account/account_len.sim
+3
-1
tests/script/unique/account/authority.sim
tests/script/unique/account/authority.sim
+3
-1
tests/script/unique/account/basic.sim
tests/script/unique/account/basic.sim
+1
-1
tests/script/unique/account/paras.sim
tests/script/unique/account/paras.sim
+2
-0
tests/script/unique/account/pass_alter.sim
tests/script/unique/account/pass_alter.sim
+3
-1
tests/script/unique/account/pass_len.sim
tests/script/unique/account/pass_len.sim
+2
-2
tests/script/unique/account/usage.sim
tests/script/unique/account/usage.sim
+3
-1
tests/script/unique/account/user_create.sim
tests/script/unique/account/user_create.sim
+2
-5
tests/script/unique/account/user_len.sim
tests/script/unique/account/user_len.sim
+3
-1
tests/script/unique/big/balance.sim
tests/script/unique/big/balance.sim
+5
-5
tests/script/unique/big/maxvnodes.sim
tests/script/unique/big/maxvnodes.sim
+4
-4
tests/script/unique/big/tcp.sim
tests/script/unique/big/tcp.sim
+1
-1
tests/script/unique/cluster/balance1.sim
tests/script/unique/cluster/balance1.sim
+25
-24
tests/script/unique/cluster/balance2.sim
tests/script/unique/cluster/balance2.sim
+22
-76
tests/script/unique/cluster/balance3.sim
tests/script/unique/cluster/balance3.sim
+64
-96
tests/script/unique/column/replica3.sim
tests/script/unique/column/replica3.sim
+11
-8
tests/script/unique/db/delete.sim
tests/script/unique/db/delete.sim
+4
-7
tests/script/unique/db/delete_part.sim
tests/script/unique/db/delete_part.sim
+8
-8
tests/script/unique/db/replica_add12.sim
tests/script/unique/db/replica_add12.sim
+14
-5
tests/script/unique/db/replica_add13.sim
tests/script/unique/db/replica_add13.sim
+14
-5
tests/script/unique/db/replica_add23.sim
tests/script/unique/db/replica_add23.sim
+14
-5
tests/script/unique/db/replica_part.sim
tests/script/unique/db/replica_part.sim
+12
-3
tests/script/unique/db/replica_reduce21.sim
tests/script/unique/db/replica_reduce21.sim
+12
-3
tests/script/unique/db/replica_reduce31.sim
tests/script/unique/db/replica_reduce31.sim
+12
-3
tests/script/unique/db/replica_reduce32.sim
tests/script/unique/db/replica_reduce32.sim
+12
-3
tests/script/unique/dnode/balance1.sim
tests/script/unique/dnode/balance1.sim
+21
-12
tests/script/unique/dnode/balance2.sim
tests/script/unique/dnode/balance2.sim
+17
-8
tests/script/unique/dnode/balance3.sim
tests/script/unique/dnode/balance3.sim
+17
-9
tests/script/unique/dnode/balancex.sim
tests/script/unique/dnode/balancex.sim
+15
-7
tests/script/unique/dnode/monitor_bug.sim
tests/script/unique/dnode/monitor_bug.sim
+2
-2
tests/script/unique/dnode/offline1.sim
tests/script/unique/dnode/offline1.sim
+11
-3
tests/script/unique/dnode/offline2.sim
tests/script/unique/dnode/offline2.sim
+12
-4
tests/script/unique/dnode/remove1.sim
tests/script/unique/dnode/remove1.sim
+7
-7
tests/script/unique/dnode/remove2.sim
tests/script/unique/dnode/remove2.sim
+7
-7
tests/script/unique/dnode/vnode_clean.sim
tests/script/unique/dnode/vnode_clean.sim
+8
-8
tests/script/unique/http/admin.sim
tests/script/unique/http/admin.sim
+11
-2
tests/script/unique/http/opentsdb.sim
tests/script/unique/http/opentsdb.sim
+1
-1
tests/script/unique/import/replica2.sim
tests/script/unique/import/replica2.sim
+4
-4
tests/script/unique/import/replica3.sim
tests/script/unique/import/replica3.sim
+4
-4
tests/script/unique/metrics/balance_replica1.sim
tests/script/unique/metrics/balance_replica1.sim
+3
-3
tests/script/unique/metrics/dnode2.sim
tests/script/unique/metrics/dnode2.sim
+3
-3
tests/script/unique/metrics/dnode2_stop.sim
tests/script/unique/metrics/dnode2_stop.sim
+3
-3
tests/script/unique/metrics/dnode3.sim
tests/script/unique/metrics/dnode3.sim
+4
-4
tests/script/unique/metrics/replica2_dnode4.sim
tests/script/unique/metrics/replica2_dnode4.sim
+5
-5
tests/script/unique/metrics/replica2_vnode3.sim
tests/script/unique/metrics/replica2_vnode3.sim
+3
-3
tests/script/unique/metrics/replica3_dnode6.sim
tests/script/unique/metrics/replica3_dnode6.sim
+7
-7
tests/script/unique/metrics/replica3_vnode3.sim
tests/script/unique/metrics/replica3_vnode3.sim
+5
-5
tests/script/unique/mnode/mgmt22.sim
tests/script/unique/mnode/mgmt22.sim
+8
-3
tests/script/unique/mnode/mgmt23.sim
tests/script/unique/mnode/mgmt23.sim
+8
-3
tests/script/unique/mnode/mgmt24.sim
tests/script/unique/mnode/mgmt24.sim
+8
-3
tests/script/unique/mnode/mgmt25.sim
tests/script/unique/mnode/mgmt25.sim
+8
-3
tests/script/unique/mnode/mgmt26.sim
tests/script/unique/mnode/mgmt26.sim
+8
-3
tests/script/unique/mnode/mgmt33.sim
tests/script/unique/mnode/mgmt33.sim
+8
-3
tests/script/unique/mnode/mgmt34.sim
tests/script/unique/mnode/mgmt34.sim
+8
-4
tests/script/unique/stream/metrics_balance.sim
tests/script/unique/stream/metrics_balance.sim
+3
-3
tests/script/unique/stream/metrics_replica1_dnode2.sim
tests/script/unique/stream/metrics_replica1_dnode2.sim
+2
-2
tests/script/unique/stream/metrics_replica2_dnode2_vnoden.sim
...s/script/unique/stream/metrics_replica2_dnode2_vnoden.sim
+2
-2
tests/script/unique/stream/metrics_replica2_dnode3.sim
tests/script/unique/stream/metrics_replica2_dnode3.sim
+3
-3
tests/script/unique/stream/metrics_replica3_dnode4.sim
tests/script/unique/stream/metrics_replica3_dnode4.sim
+4
-4
tests/script/unique/stream/table_balance.sim
tests/script/unique/stream/table_balance.sim
+3
-3
tests/script/unique/stream/table_move.sim
tests/script/unique/stream/table_move.sim
+9
-9
tests/script/unique/stream/table_replica1_dnode2.sim
tests/script/unique/stream/table_replica1_dnode2.sim
+2
-2
tests/script/unique/stream/table_replica2_dnode2_vnoden.sim
tests/script/unique/stream/table_replica2_dnode2_vnoden.sim
+2
-2
tests/script/unique/stream/table_replica2_dnode3.sim
tests/script/unique/stream/table_replica2_dnode3.sim
+3
-3
tests/script/unique/stream/table_replica3_dnode4.sim
tests/script/unique/stream/table_replica3_dnode4.sim
+4
-4
tests/script/unique/table/delete_part.sim
tests/script/unique/table/delete_part.sim
+4
-4
tests/script/unique/vnode/commit.sim
tests/script/unique/vnode/commit.sim
+2
-2
tests/script/unique/vnode/many.sim
tests/script/unique/vnode/many.sim
+4
-4
tests/script/unique/vnode/replica2_basic.sim
tests/script/unique/vnode/replica2_basic.sim
+2
-2
tests/script/unique/vnode/replica2_basic2.sim
tests/script/unique/vnode/replica2_basic2.sim
+14
-5
tests/script/unique/vnode/replica2_repeat.sim
tests/script/unique/vnode/replica2_repeat.sim
+4
-4
tests/script/unique/vnode/replica3_basic.sim
tests/script/unique/vnode/replica3_basic.sim
+11
-8
tests/script/unique/vnode/replica3_repeat.sim
tests/script/unique/vnode/replica3_repeat.sim
+4
-4
tests/script/unique/vnode/replica3_vgroup.sim
tests/script/unique/vnode/replica3_vgroup.sim
+4
-4
未找到文件。
src/common/inc/tdataformat.h
浏览文件 @
68bf22a9
...
@@ -97,7 +97,7 @@ typedef void *SDataRow;
...
@@ -97,7 +97,7 @@ typedef void *SDataRow;
#define TD_DATA_ROW_HEAD_SIZE sizeof(int32_t)
#define TD_DATA_ROW_HEAD_SIZE sizeof(int32_t)
#define dataRowLen(r) (*(int32_t *)(r))
#define dataRowLen(r) (*(int32_t *)(r))
#define dataRowTuple(r) POINTER_
DR
IFT(r, TD_DATA_ROW_HEAD_SIZE)
#define dataRowTuple(r) POINTER_
SH
IFT(r, TD_DATA_ROW_HEAD_SIZE)
#define dataRowKey(r) (*(TSKEY *)(dataRowTuple(r)))
#define dataRowKey(r) (*(TSKEY *)(dataRowTuple(r)))
#define dataRowSetLen(r, l) (dataRowLen(r) = (l))
#define dataRowSetLen(r, l) (dataRowLen(r) = (l))
#define dataRowCpy(dst, r) memcpy((dst), (r), dataRowLen(r))
#define dataRowCpy(dst, r) memcpy((dst), (r), dataRowLen(r))
...
@@ -114,10 +114,10 @@ static FORCE_INLINE void *tdGetRowDataOfCol(SDataRow row, int8_t type, int32_t o
...
@@ -114,10 +114,10 @@ static FORCE_INLINE void *tdGetRowDataOfCol(SDataRow row, int8_t type, int32_t o
switch
(
type
)
{
switch
(
type
)
{
case
TSDB_DATA_TYPE_BINARY
:
case
TSDB_DATA_TYPE_BINARY
:
case
TSDB_DATA_TYPE_NCHAR
:
case
TSDB_DATA_TYPE_NCHAR
:
return
POINTER_
DRIFT
(
row
,
*
(
VarDataOffsetT
*
)
POINTER_DR
IFT
(
row
,
offset
));
return
POINTER_
SHIFT
(
row
,
*
(
VarDataOffsetT
*
)
POINTER_SH
IFT
(
row
,
offset
));
break
;
break
;
default:
default:
return
POINTER_
DR
IFT
(
row
,
offset
);
return
POINTER_
SH
IFT
(
row
,
offset
);
break
;
break
;
}
}
}
}
...
@@ -149,11 +149,11 @@ static FORCE_INLINE void *tdGetColDataOfRow(SDataCol *pCol, int row) {
...
@@ -149,11 +149,11 @@ static FORCE_INLINE void *tdGetColDataOfRow(SDataCol *pCol, int row) {
switch
(
pCol
->
type
)
{
switch
(
pCol
->
type
)
{
case
TSDB_DATA_TYPE_BINARY
:
case
TSDB_DATA_TYPE_BINARY
:
case
TSDB_DATA_TYPE_NCHAR
:
case
TSDB_DATA_TYPE_NCHAR
:
return
POINTER_
DR
IFT
(
pCol
->
pData
,
pCol
->
dataOff
[
row
]);
return
POINTER_
SH
IFT
(
pCol
->
pData
,
pCol
->
dataOff
[
row
]);
break
;
break
;
default:
default:
return
POINTER_
DR
IFT
(
pCol
->
pData
,
TYPE_BYTES
[
pCol
->
type
]
*
row
);
return
POINTER_
SH
IFT
(
pCol
->
pData
,
TYPE_BYTES
[
pCol
->
type
]
*
row
);
break
;
break
;
}
}
}
}
...
...
src/common/src/tdataformat.c
浏览文件 @
68bf22a9
...
@@ -167,17 +167,17 @@ void tdFreeDataRow(SDataRow row) {
...
@@ -167,17 +167,17 @@ void tdFreeDataRow(SDataRow row) {
int
tdAppendColVal
(
SDataRow
row
,
void
*
value
,
int8_t
type
,
int32_t
bytes
,
int32_t
offset
)
{
int
tdAppendColVal
(
SDataRow
row
,
void
*
value
,
int8_t
type
,
int32_t
bytes
,
int32_t
offset
)
{
ASSERT
(
value
!=
NULL
);
ASSERT
(
value
!=
NULL
);
int32_t
toffset
=
offset
+
TD_DATA_ROW_HEAD_SIZE
;
int32_t
toffset
=
offset
+
TD_DATA_ROW_HEAD_SIZE
;
char
*
ptr
=
POINTER_
DR
IFT
(
row
,
dataRowLen
(
row
));
char
*
ptr
=
POINTER_
SH
IFT
(
row
,
dataRowLen
(
row
));
switch
(
type
)
{
switch
(
type
)
{
case
TSDB_DATA_TYPE_BINARY
:
case
TSDB_DATA_TYPE_BINARY
:
case
TSDB_DATA_TYPE_NCHAR
:
case
TSDB_DATA_TYPE_NCHAR
:
*
(
VarDataOffsetT
*
)
POINTER_
DR
IFT
(
row
,
toffset
)
=
dataRowLen
(
row
);
*
(
VarDataOffsetT
*
)
POINTER_
SH
IFT
(
row
,
toffset
)
=
dataRowLen
(
row
);
memcpy
(
ptr
,
value
,
varDataTLen
(
value
));
memcpy
(
ptr
,
value
,
varDataTLen
(
value
));
dataRowLen
(
row
)
+=
varDataTLen
(
value
);
dataRowLen
(
row
)
+=
varDataTLen
(
value
);
break
;
break
;
default:
default:
memcpy
(
POINTER_
DR
IFT
(
row
,
toffset
),
value
,
TYPE_BYTES
[
type
]);
memcpy
(
POINTER_
SH
IFT
(
row
,
toffset
),
value
,
TYPE_BYTES
[
type
]);
break
;
break
;
}
}
...
@@ -202,13 +202,13 @@ void dataColInit(SDataCol *pDataCol, STColumn *pCol, void **pBuf, int maxPoints)
...
@@ -202,13 +202,13 @@ void dataColInit(SDataCol *pDataCol, STColumn *pCol, void **pBuf, int maxPoints)
if
(
pDataCol
->
type
==
TSDB_DATA_TYPE_BINARY
||
pDataCol
->
type
==
TSDB_DATA_TYPE_NCHAR
)
{
if
(
pDataCol
->
type
==
TSDB_DATA_TYPE_BINARY
||
pDataCol
->
type
==
TSDB_DATA_TYPE_NCHAR
)
{
pDataCol
->
spaceSize
=
(
sizeof
(
VarDataLenT
)
+
pDataCol
->
bytes
)
*
maxPoints
;
pDataCol
->
spaceSize
=
(
sizeof
(
VarDataLenT
)
+
pDataCol
->
bytes
)
*
maxPoints
;
pDataCol
->
dataOff
=
(
VarDataOffsetT
*
)(
*
pBuf
);
pDataCol
->
dataOff
=
(
VarDataOffsetT
*
)(
*
pBuf
);
pDataCol
->
pData
=
POINTER_
DR
IFT
(
*
pBuf
,
TYPE_BYTES
[
pDataCol
->
type
]
*
maxPoints
);
pDataCol
->
pData
=
POINTER_
SH
IFT
(
*
pBuf
,
TYPE_BYTES
[
pDataCol
->
type
]
*
maxPoints
);
*
pBuf
=
POINTER_
DR
IFT
(
*
pBuf
,
pDataCol
->
spaceSize
+
TYPE_BYTES
[
pDataCol
->
type
]
*
maxPoints
);
*
pBuf
=
POINTER_
SH
IFT
(
*
pBuf
,
pDataCol
->
spaceSize
+
TYPE_BYTES
[
pDataCol
->
type
]
*
maxPoints
);
}
else
{
}
else
{
pDataCol
->
spaceSize
=
pDataCol
->
bytes
*
maxPoints
;
pDataCol
->
spaceSize
=
pDataCol
->
bytes
*
maxPoints
;
pDataCol
->
dataOff
=
NULL
;
pDataCol
->
dataOff
=
NULL
;
pDataCol
->
pData
=
*
pBuf
;
pDataCol
->
pData
=
*
pBuf
;
*
pBuf
=
POINTER_
DR
IFT
(
*
pBuf
,
pDataCol
->
spaceSize
);
*
pBuf
=
POINTER_
SH
IFT
(
*
pBuf
,
pDataCol
->
spaceSize
);
}
}
}
}
...
@@ -222,13 +222,13 @@ void dataColAppendVal(SDataCol *pCol, void *value, int numOfPoints, int maxPoint
...
@@ -222,13 +222,13 @@ void dataColAppendVal(SDataCol *pCol, void *value, int numOfPoints, int maxPoint
// set offset
// set offset
pCol
->
dataOff
[
numOfPoints
]
=
pCol
->
len
;
pCol
->
dataOff
[
numOfPoints
]
=
pCol
->
len
;
// Copy data
// Copy data
memcpy
(
POINTER_
DR
IFT
(
pCol
->
pData
,
pCol
->
len
),
value
,
varDataTLen
(
value
));
memcpy
(
POINTER_
SH
IFT
(
pCol
->
pData
,
pCol
->
len
),
value
,
varDataTLen
(
value
));
// Update the length
// Update the length
pCol
->
len
+=
varDataTLen
(
value
);
pCol
->
len
+=
varDataTLen
(
value
);
break
;
break
;
default:
default:
ASSERT
(
pCol
->
len
==
TYPE_BYTES
[
pCol
->
type
]
*
numOfPoints
);
ASSERT
(
pCol
->
len
==
TYPE_BYTES
[
pCol
->
type
]
*
numOfPoints
);
memcpy
(
POINTER_
DR
IFT
(
pCol
->
pData
,
pCol
->
len
),
value
,
pCol
->
bytes
);
memcpy
(
POINTER_
SH
IFT
(
pCol
->
pData
,
pCol
->
len
),
value
,
pCol
->
bytes
);
pCol
->
len
+=
pCol
->
bytes
;
pCol
->
len
+=
pCol
->
bytes
;
break
;
break
;
}
}
...
@@ -244,12 +244,12 @@ void dataColPopPoints(SDataCol *pCol, int pointsToPop, int numOfPoints) {
...
@@ -244,12 +244,12 @@ void dataColPopPoints(SDataCol *pCol, int pointsToPop, int numOfPoints) {
VarDataOffsetT
toffset
=
pCol
->
dataOff
[
pointsToPop
];
VarDataOffsetT
toffset
=
pCol
->
dataOff
[
pointsToPop
];
pCol
->
len
=
pCol
->
len
-
toffset
;
pCol
->
len
=
pCol
->
len
-
toffset
;
ASSERT
(
pCol
->
len
>
0
);
ASSERT
(
pCol
->
len
>
0
);
memmove
(
pCol
->
pData
,
POINTER_
DR
IFT
(
pCol
->
pData
,
toffset
),
pCol
->
len
);
memmove
(
pCol
->
pData
,
POINTER_
SH
IFT
(
pCol
->
pData
,
toffset
),
pCol
->
len
);
dataColSetOffset
(
pCol
,
pointsLeft
);
dataColSetOffset
(
pCol
,
pointsLeft
);
}
else
{
}
else
{
ASSERT
(
pCol
->
len
==
TYPE_BYTES
[
pCol
->
type
]
*
numOfPoints
);
ASSERT
(
pCol
->
len
==
TYPE_BYTES
[
pCol
->
type
]
*
numOfPoints
);
pCol
->
len
=
TYPE_BYTES
[
pCol
->
type
]
*
pointsLeft
;
pCol
->
len
=
TYPE_BYTES
[
pCol
->
type
]
*
pointsLeft
;
memmove
(
pCol
->
pData
,
POINTER_
DR
IFT
(
pCol
->
pData
,
TYPE_BYTES
[
pCol
->
type
]
*
pointsToPop
),
pCol
->
len
);
memmove
(
pCol
->
pData
,
POINTER_
SH
IFT
(
pCol
->
pData
,
TYPE_BYTES
[
pCol
->
type
]
*
pointsToPop
),
pCol
->
len
);
}
}
}
}
...
@@ -301,7 +301,7 @@ void dataColSetOffset(SDataCol *pCol, int nEle) {
...
@@ -301,7 +301,7 @@ void dataColSetOffset(SDataCol *pCol, int nEle) {
for
(
int
i
=
0
;
i
<
nEle
;
i
++
)
{
for
(
int
i
=
0
;
i
<
nEle
;
i
++
)
{
pCol
->
dataOff
[
i
]
=
offset
;
pCol
->
dataOff
[
i
]
=
offset
;
offset
+=
varDataTLen
(
tptr
);
offset
+=
varDataTLen
(
tptr
);
tptr
=
POINTER_
DR
IFT
(
tptr
,
varDataTLen
(
tptr
));
tptr
=
POINTER_
SH
IFT
(
tptr
,
varDataTLen
(
tptr
));
}
}
}
}
...
...
src/mnode/src/mgmtSdb.c
浏览文件 @
68bf22a9
...
@@ -324,7 +324,6 @@ void sdbCleanUp() {
...
@@ -324,7 +324,6 @@ void sdbCleanUp() {
tsSdbObj
.
status
=
SDB_STATUS_CLOSING
;
tsSdbObj
.
status
=
SDB_STATUS_CLOSING
;
syncStop
(
tsSdbObj
.
sync
);
syncStop
(
tsSdbObj
.
sync
);
free
(
tsSdbObj
.
sync
);
walClose
(
tsSdbObj
.
wal
);
walClose
(
tsSdbObj
.
wal
);
sem_destroy
(
&
tsSdbObj
.
sem
);
sem_destroy
(
&
tsSdbObj
.
sem
);
pthread_mutex_destroy
(
&
tsSdbObj
.
mutex
);
pthread_mutex_destroy
(
&
tsSdbObj
.
mutex
);
...
...
src/rpc/src/rpcMain.c
浏览文件 @
68bf22a9
...
@@ -1083,6 +1083,7 @@ static void rpcSendMsgToPeer(SRpcConn *pConn, void *msg, int msgLen) {
...
@@ -1083,6 +1083,7 @@ static void rpcSendMsgToPeer(SRpcConn *pConn, void *msg, int msgLen) {
pRpc
->
label
,
pConn
,
taosMsg
[
pHead
->
msgType
],
pConn
->
peerFqdn
,
pRpc
->
label
,
pConn
,
taosMsg
[
pHead
->
msgType
],
pConn
->
peerFqdn
,
pConn
->
peerPort
,
msgLen
,
pHead
->
sourceId
,
pHead
->
destId
,
pHead
->
tranId
);
pConn
->
peerPort
,
msgLen
,
pHead
->
sourceId
,
pHead
->
destId
,
pHead
->
tranId
);
}
else
{
}
else
{
if
(
pHead
->
code
==
0
)
pConn
->
secured
=
1
;
// for success response, set link as secured
if
(
pHead
->
msgType
<
TSDB_MSG_TYPE_CM_HEARTBEAT
||
(
rpcDebugFlag
&
16
))
if
(
pHead
->
msgType
<
TSDB_MSG_TYPE_CM_HEARTBEAT
||
(
rpcDebugFlag
&
16
))
tTrace
(
"%s %p, %s is sent to %s:%hu, code:0x%x len:%d sig:0x%08x:0x%08x:%d"
,
tTrace
(
"%s %p, %s is sent to %s:%hu, code:0x%x len:%d sig:0x%08x:0x%08x:%d"
,
pRpc
->
label
,
pConn
,
taosMsg
[
pHead
->
msgType
],
pConn
->
peerFqdn
,
pConn
->
peerPort
,
pRpc
->
label
,
pConn
,
taosMsg
[
pHead
->
msgType
],
pConn
->
peerFqdn
,
pConn
->
peerPort
,
...
...
src/tsdb/inc/tsdbMain.h
浏览文件 @
68bf22a9
...
@@ -21,6 +21,7 @@
...
@@ -21,6 +21,7 @@
#include "tskiplist.h"
#include "tskiplist.h"
#include "tutil.h"
#include "tutil.h"
#include "tlog.h"
#include "tlog.h"
#include "tcoding.h"
#ifdef __cplusplus
#ifdef __cplusplus
extern
"C"
{
extern
"C"
{
...
...
src/tsdb/src/tsdbFile.c
浏览文件 @
68bf22a9
...
@@ -178,7 +178,7 @@ void tsdbFitRetention(STsdbRepo *pRepo) {
...
@@ -178,7 +178,7 @@ void tsdbFitRetention(STsdbRepo *pRepo) {
SFileGroup
*
pGroup
=
pFileH
->
fGroup
;
SFileGroup
*
pGroup
=
pFileH
->
fGroup
;
int
mfid
=
int
mfid
=
tsdbGetKeyFileId
(
taosGetTimestamp
(
pRepo
->
config
.
precision
),
pRepo
->
config
.
daysPerFile
,
pRepo
->
config
.
precision
);
tsdbGetKeyFileId
(
taosGetTimestamp
(
pRepo
->
config
.
precision
),
pRepo
->
config
.
daysPerFile
,
pRepo
->
config
.
precision
)
-
pFileH
->
maxFGroups
+
3
;
while
(
pFileH
->
numOfFGroups
>
0
&&
pGroup
[
0
].
fileId
<
mfid
)
{
while
(
pFileH
->
numOfFGroups
>
0
&&
pGroup
[
0
].
fileId
<
mfid
)
{
tsdbRemoveFileGroup
(
pFileH
,
pGroup
[
0
].
fileId
);
tsdbRemoveFileGroup
(
pFileH
,
pGroup
[
0
].
fileId
);
...
...
src/tsdb/src/tsdbMeta.c
浏览文件 @
68bf22a9
...
@@ -535,5 +535,5 @@ static int tsdbEstimateTableEncodeSize(STable *pTable) {
...
@@ -535,5 +535,5 @@ static int tsdbEstimateTableEncodeSize(STable *pTable) {
char
*
getTupleKey
(
const
void
*
data
)
{
char
*
getTupleKey
(
const
void
*
data
)
{
SDataRow
row
=
(
SDataRow
)
data
;
SDataRow
row
=
(
SDataRow
)
data
;
return
POINTER_
DR
IFT
(
row
,
TD_DATA_ROW_HEAD_SIZE
);
return
POINTER_
SH
IFT
(
row
,
TD_DATA_ROW_HEAD_SIZE
);
}
}
\ No newline at end of file
src/util/inc/tcoding.h
浏览文件 @
68bf22a9
...
@@ -24,98 +24,188 @@ extern "C" {
...
@@ -24,98 +24,188 @@ extern "C" {
#include "tutil.h"
#include "tutil.h"
const
int
TNUMBER
=
1
;
// TODO: move this to a platform file
#define IS_LITTLE_ENDIAN() (*(char *)(&TNUMBER) != 0)
#define ENCODE_LIMIT (((uint8_t)1) << 7)
static
const
int32_t
TNUMBER
=
1
;
#define IS_LITTLE_ENDIAN() (*(uint8_t *)(&TNUMBER) != 0)
static
FORCE_INLINE
void
*
taosEncodeFixed16
(
void
*
buf
,
uint16_t
value
)
{
static
FORCE_INLINE
void
*
taosEncodeFixed16
(
void
*
buf
,
uint16_t
value
)
{
if
(
IS_LITTLE_ENDIAN
())
{
if
(
IS_LITTLE_ENDIAN
())
{
memcpy
(
buf
,
&
value
,
sizeof
(
value
));
memcpy
(
buf
,
&
value
,
sizeof
(
value
));
}
else
{
}
else
{
((
char
*
)
buf
)[
0
]
=
value
&
0xff
;
((
uint8_t
*
)
buf
)[
0
]
=
value
&
0xff
;
((
char
*
)
buf
)[
1
]
=
(
value
>>
8
)
&
0xff
;
((
uint8_t
*
)
buf
)[
1
]
=
(
value
>>
8
)
&
0xff
;
}
}
return
POINTER_
DR
IFT
(
buf
,
sizeof
(
value
));
return
POINTER_
SH
IFT
(
buf
,
sizeof
(
value
));
}
}
static
FORCE_INLINE
void
*
taosEncodeFixed32
(
void
*
buf
,
uint32_t
value
)
{
static
FORCE_INLINE
void
*
taosEncodeFixed32
(
void
*
buf
,
uint32_t
value
)
{
if
(
IS_LITTLE_ENDIAN
())
{
if
(
IS_LITTLE_ENDIAN
())
{
memcpy
(
buf
,
&
value
,
sizeof
(
value
));
memcpy
(
buf
,
&
value
,
sizeof
(
value
));
}
else
{
}
else
{
((
char
*
)
buf
)[
0
]
=
value
&
0xff
;
((
uint8_t
*
)
buf
)[
0
]
=
value
&
0xff
;
((
char
*
)
buf
)[
1
]
=
(
value
>>
8
)
&
0xff
;
((
uint8_t
*
)
buf
)[
1
]
=
(
value
>>
8
)
&
0xff
;
((
char
*
)
buf
)[
2
]
=
(
value
>>
16
)
&
0xff
;
((
uint8_t
*
)
buf
)[
2
]
=
(
value
>>
16
)
&
0xff
;
((
char
*
)
buf
)[
3
]
=
(
value
>>
24
)
&
0xff
;
((
uint8_t
*
)
buf
)[
3
]
=
(
value
>>
24
)
&
0xff
;
}
}
return
POINTER_
DR
IFT
(
buf
,
sizeof
(
value
));
return
POINTER_
SH
IFT
(
buf
,
sizeof
(
value
));
}
}
static
FORCE_INLINE
void
*
taosEncodeFixed64
(
void
*
buf
,
uint64_t
value
)
{
static
FORCE_INLINE
void
*
taosEncodeFixed64
(
void
*
buf
,
uint64_t
value
)
{
if
(
IS_LITTLE_ENDIAN
())
{
if
(
IS_LITTLE_ENDIAN
())
{
memcpy
(
buf
,
&
value
,
sizeof
(
value
));
memcpy
(
buf
,
&
value
,
sizeof
(
value
));
}
else
{
}
else
{
((
char
*
)
buf
)[
0
]
=
value
&
0xff
;
((
uint8_t
*
)
buf
)[
0
]
=
value
&
0xff
;
((
char
*
)
buf
)[
1
]
=
(
value
>>
8
)
&
0xff
;
((
uint8_t
*
)
buf
)[
1
]
=
(
value
>>
8
)
&
0xff
;
((
char
*
)
buf
)[
2
]
=
(
value
>>
16
)
&
0xff
;
((
uint8_t
*
)
buf
)[
2
]
=
(
value
>>
16
)
&
0xff
;
((
char
*
)
buf
)[
3
]
=
(
value
>>
24
)
&
0xff
;
((
uint8_t
*
)
buf
)[
3
]
=
(
value
>>
24
)
&
0xff
;
((
char
*
)
buf
)[
4
]
=
(
value
>>
32
)
&
0xff
;
((
uint8_t
*
)
buf
)[
4
]
=
(
value
>>
32
)
&
0xff
;
((
char
*
)
buf
)[
5
]
=
(
value
>>
40
)
&
0xff
;
((
uint8_t
*
)
buf
)[
5
]
=
(
value
>>
40
)
&
0xff
;
((
char
*
)
buf
)[
6
]
=
(
value
>>
48
)
&
0xff
;
((
uint8_t
*
)
buf
)[
6
]
=
(
value
>>
48
)
&
0xff
;
((
char
*
)
buf
)[
7
]
=
(
value
>>
56
)
&
0xff
;
((
uint8_t
*
)
buf
)[
7
]
=
(
value
>>
56
)
&
0xff
;
}
}
return
POINTER_
DR
IFT
(
buf
,
sizeof
(
value
));
return
POINTER_
SH
IFT
(
buf
,
sizeof
(
value
));
}
}
static
FORCE_INLINE
void
*
taosDecodeFixed16
(
void
*
buf
,
uint16_t
*
value
)
{
static
FORCE_INLINE
void
*
taosDecodeFixed16
(
void
*
buf
,
uint16_t
*
value
)
{
if
(
IS_LITTLE_ENDIAN
())
{
if
(
IS_LITTLE_ENDIAN
())
{
memcpy
(
value
,
buf
,
sizeof
(
*
value
));
memcpy
(
value
,
buf
,
sizeof
(
*
value
));
}
else
{
}
else
{
((
char
*
)
value
)[
1
]
=
((
char
*
)
buf
)[
0
];
((
uint8_t
*
)
value
)[
1
]
=
((
uint8_t
*
)
buf
)[
0
];
((
char
*
)
value
)[
0
]
=
((
char
*
)
buf
)[
1
];
((
uint8_t
*
)
value
)[
0
]
=
((
uint8_t
*
)
buf
)[
1
];
}
}
return
POINTER_
DR
IFT
(
buf
,
sizeof
(
*
value
));
return
POINTER_
SH
IFT
(
buf
,
sizeof
(
*
value
));
}
}
static
FORCE_INLINE
void
*
taosDecodeFixed32
(
void
*
buf
,
uint32_t
*
value
)
{
static
FORCE_INLINE
void
*
taosDecodeFixed32
(
void
*
buf
,
uint32_t
*
value
)
{
if
(
IS_LITTLE_ENDIAN
())
{
if
(
IS_LITTLE_ENDIAN
())
{
memcpy
(
value
,
buf
,
sizeof
(
*
value
));
memcpy
(
value
,
buf
,
sizeof
(
*
value
));
}
else
{
}
else
{
((
char
*
)
value
)[
3
]
=
((
char
*
)
buf
)[
0
];
((
uint8_t
*
)
value
)[
3
]
=
((
uint8_t
*
)
buf
)[
0
];
((
char
*
)
value
)[
2
]
=
((
char
*
)
buf
)[
1
];
((
uint8_t
*
)
value
)[
2
]
=
((
uint8_t
*
)
buf
)[
1
];
((
char
*
)
value
)[
1
]
=
((
char
*
)
buf
)[
2
];
((
uint8_t
*
)
value
)[
1
]
=
((
uint8_t
*
)
buf
)[
2
];
((
char
*
)
value
)[
0
]
=
((
char
*
)
buf
)[
3
];
((
uint8_t
*
)
value
)[
0
]
=
((
uint8_t
*
)
buf
)[
3
];
}
}
return
POINTER_
DR
IFT
(
buf
,
sizeof
(
*
value
));
return
POINTER_
SH
IFT
(
buf
,
sizeof
(
*
value
));
}
}
static
FORCE_INLINE
void
*
taosDecodeFixed64
(
void
*
buf
,
uint64_t
*
value
)
{
static
FORCE_INLINE
void
*
taosDecodeFixed64
(
void
*
buf
,
uint64_t
*
value
)
{
if
(
IS_LITTLE_ENDIAN
())
{
if
(
IS_LITTLE_ENDIAN
())
{
memcpy
(
value
,
buf
,
sizeof
(
*
value
));
memcpy
(
value
,
buf
,
sizeof
(
*
value
));
}
else
{
}
else
{
((
char
*
)
value
)[
7
]
=
((
char
*
)
buf
)[
0
];
((
uint8_t
*
)
value
)[
7
]
=
((
uint8_t
*
)
buf
)[
0
];
((
char
*
)
value
)[
6
]
=
((
char
*
)
buf
)[
1
];
((
uint8_t
*
)
value
)[
6
]
=
((
uint8_t
*
)
buf
)[
1
];
((
char
*
)
value
)[
5
]
=
((
char
*
)
buf
)[
2
];
((
uint8_t
*
)
value
)[
5
]
=
((
uint8_t
*
)
buf
)[
2
];
((
char
*
)
value
)[
4
]
=
((
char
*
)
buf
)[
3
];
((
uint8_t
*
)
value
)[
4
]
=
((
uint8_t
*
)
buf
)[
3
];
((
char
*
)
value
)[
3
]
=
((
char
*
)
buf
)[
4
];
((
uint8_t
*
)
value
)[
3
]
=
((
uint8_t
*
)
buf
)[
4
];
((
char
*
)
value
)[
2
]
=
((
char
*
)
buf
)[
5
];
((
uint8_t
*
)
value
)[
2
]
=
((
uint8_t
*
)
buf
)[
5
];
((
char
*
)
value
)[
1
]
=
((
char
*
)
buf
)[
6
];
((
uint8_t
*
)
value
)[
1
]
=
((
uint8_t
*
)
buf
)[
6
];
((
char
*
)
value
)[
0
]
=
((
char
*
)
buf
)[
7
];
((
uint8_t
*
)
value
)[
0
]
=
((
uint8_t
*
)
buf
)[
7
];
}
}
return
POINTER_
DR
IFT
(
buf
,
sizeof
(
*
value
));
return
POINTER_
SH
IFT
(
buf
,
sizeof
(
*
value
));
}
}
// TODO
static
FORCE_INLINE
void
*
taosEncodeVariant16
(
void
*
buf
,
uint16_t
value
)
{
static
FORCE_INLINE
void
*
taosEncodeVariant16
(
void
*
buf
,
uint16_t
value
)
{}
int
i
=
0
;
static
FORCE_INLINE
void
*
taosEncodeVariant32
(
void
*
buf
,
uint32_t
value
)
{}
while
(
value
>=
ENCODE_LIMIT
)
{
static
FORCE_INLINE
void
*
taosEncodeVariant64
(
void
*
buf
,
uint64_t
value
)
{}
((
uint8_t
*
)
buf
)[
i
]
=
(
value
|
ENCODE_LIMIT
);
static
FORCE_INLINE
void
*
taosDecodeVariant16
(
void
*
buf
,
uint16_t
*
value
)
{}
value
>>=
7
;
static
FORCE_INLINE
void
*
taosDecodeVariant32
(
void
*
buf
,
uint32_t
*
value
)
{}
i
++
;
static
FORCE_INLINE
void
*
taosDecodeVariant64
(
void
*
buf
,
uint64_t
*
value
)
{}
ASSERT
(
i
<
3
);
}
((
uint8_t
*
)
buf
)[
i
]
=
value
;
return
POINTER_SHIFT
(
buf
,
i
+
1
);
}
static
FORCE_INLINE
void
*
taosEncodeVariant32
(
void
*
buf
,
uint32_t
value
)
{
int
i
=
0
;
while
(
value
>=
ENCODE_LIMIT
)
{
((
uint8_t
*
)
buf
)[
i
]
=
(
value
|
ENCODE_LIMIT
);
value
>>=
7
;
i
++
;
ASSERT
(
i
<
5
);
}
((
uint8_t
*
)
buf
)[
i
]
=
value
;
return
POINTER_SHIFT
(
buf
,
i
+
1
);
}
static
FORCE_INLINE
void
*
taosEncodeVariant64
(
void
*
buf
,
uint64_t
value
)
{
int
i
=
0
;
while
(
value
>=
ENCODE_LIMIT
)
{
((
uint8_t
*
)
buf
)[
i
]
=
(
value
|
ENCODE_LIMIT
);
value
>>=
7
;
i
++
;
ASSERT
(
i
<
10
);
}
((
uint8_t
*
)
buf
)[
i
]
=
value
;
return
POINTER_SHIFT
(
buf
,
i
+
1
);
}
static
FORCE_INLINE
void
*
taosDecodeVariant16
(
void
*
buf
,
uint16_t
*
value
)
{
int
i
=
0
;
uint16_t
tval
=
0
;
*
value
=
0
;
while
(
i
<
3
)
{
tval
=
(
uint16_t
)(((
uint8_t
*
)
buf
)[
i
]);
if
(
tval
<
ENCODE_LIMIT
)
{
(
*
value
)
|=
(
tval
<<
(
7
*
i
));
return
POINTER_SHIFT
(
buf
,
i
+
1
);
}
else
{
(
*
value
)
|=
((
tval
&
(
ENCODE_LIMIT
-
1
))
<<
(
7
*
i
));
i
++
;
}
}
return
NULL
;
// error happened
}
static
FORCE_INLINE
void
*
taosDecodeVariant32
(
void
*
buf
,
uint32_t
*
value
)
{
int
i
=
0
;
uint32_t
tval
=
0
;
*
value
=
0
;
while
(
i
<
5
)
{
tval
=
(
uint32_t
)(((
uint8_t
*
)
buf
)[
i
]);
if
(
tval
<
ENCODE_LIMIT
)
{
(
*
value
)
|=
(
tval
<<
(
7
*
i
));
return
POINTER_SHIFT
(
buf
,
i
+
1
);
}
else
{
(
*
value
)
|=
((
tval
&
(
ENCODE_LIMIT
-
1
))
<<
(
7
*
i
));
i
++
;
}
}
return
NULL
;
// error happened
}
static
FORCE_INLINE
void
*
taosDecodeVariant64
(
void
*
buf
,
uint64_t
*
value
)
{
int
i
=
0
;
uint64_t
tval
=
0
;
*
value
=
0
;
while
(
i
<
10
)
{
tval
=
(
uint64_t
)(((
uint8_t
*
)
buf
)[
i
]);
if
(
tval
<
ENCODE_LIMIT
)
{
(
*
value
)
|=
(
tval
<<
(
7
*
i
));
return
POINTER_SHIFT
(
buf
,
i
+
1
);
}
else
{
(
*
value
)
|=
((
tval
&
(
ENCODE_LIMIT
-
1
))
<<
(
7
*
i
));
i
++
;
}
}
return
NULL
;
// error happened
}
#ifdef __cplusplus
#ifdef __cplusplus
}
}
...
...
src/util/inc/tutil.h
浏览文件 @
68bf22a9
...
@@ -45,7 +45,7 @@ extern "C" {
...
@@ -45,7 +45,7 @@ extern "C" {
#define tclose(x) taosCloseSocket(x)
#define tclose(x) taosCloseSocket(x)
// Pointer p drift right by b bytes
// Pointer p drift right by b bytes
#define POINTER_
DR
IFT(p, b) ((void *)((char *)(p) + (b)))
#define POINTER_
SH
IFT(p, b) ((void *)((char *)(p) + (b)))
#ifndef NDEBUG
#ifndef NDEBUG
#define ASSERT(x) assert(x)
#define ASSERT(x) assert(x)
...
...
src/util/src/tqueue.c
浏览文件 @
68bf22a9
...
@@ -94,8 +94,6 @@ void *taosAllocateQitem(int size) {
...
@@ -94,8 +94,6 @@ void *taosAllocateQitem(int size) {
void
taosFreeQitem
(
void
*
param
)
{
void
taosFreeQitem
(
void
*
param
)
{
if
(
param
==
NULL
)
return
;
if
(
param
==
NULL
)
return
;
uTrace
(
"item:%p is freed"
,
param
);
char
*
temp
=
(
char
*
)
param
;
char
*
temp
=
(
char
*
)
param
;
temp
-=
sizeof
(
STaosQnode
);
temp
-=
sizeof
(
STaosQnode
);
free
(
temp
);
free
(
temp
);
...
@@ -144,7 +142,7 @@ int taosReadQitem(taos_queue param, int *type, void **pitem) {
...
@@ -144,7 +142,7 @@ int taosReadQitem(taos_queue param, int *type, void **pitem) {
queue
->
numOfItems
--
;
queue
->
numOfItems
--
;
if
(
queue
->
qset
)
atomic_sub_fetch_32
(
&
queue
->
qset
->
numOfItems
,
1
);
if
(
queue
->
qset
)
atomic_sub_fetch_32
(
&
queue
->
qset
->
numOfItems
,
1
);
code
=
1
;
code
=
1
;
//
uTrace("item:%p is read out from queue, items:%d", *pitem, queue->numOfItems);
uTrace
(
"item:%p is read out from queue, items:%d"
,
*
pitem
,
queue
->
numOfItems
);
}
}
pthread_mutex_unlock
(
&
queue
->
mutex
);
pthread_mutex_unlock
(
&
queue
->
mutex
);
...
@@ -309,13 +307,12 @@ int taosReadQitemFromQset(taos_qset param, int *type, void **pitem, void **phand
...
@@ -309,13 +307,12 @@ int taosReadQitemFromQset(taos_qset param, int *type, void **pitem, void **phand
pthread_mutex_lock
(
&
qset
->
mutex
);
pthread_mutex_lock
(
&
qset
->
mutex
);
for
(
int
i
=
0
;
i
<
qset
->
numOfQueues
;
++
i
)
{
for
(
int
i
=
0
;
i
<
qset
->
numOfQueues
;
++
i
)
{
//pthread_mutex_lock(&qset->mutex);
if
(
qset
->
current
==
NULL
)
if
(
qset
->
current
==
NULL
)
qset
->
current
=
qset
->
head
;
qset
->
current
=
qset
->
head
;
STaosQueue
*
queue
=
qset
->
current
;
STaosQueue
*
queue
=
qset
->
current
;
if
(
queue
)
qset
->
current
=
queue
->
next
;
if
(
queue
)
qset
->
current
=
queue
->
next
;
//pthread_mutex_unlock(&qset->mutex);
if
(
queue
==
NULL
)
break
;
if
(
queue
==
NULL
)
break
;
if
(
queue
->
head
==
NULL
)
continue
;
pthread_mutex_lock
(
&
queue
->
mutex
);
pthread_mutex_lock
(
&
queue
->
mutex
);
...
@@ -351,13 +348,12 @@ int taosReadAllQitemsFromQset(taos_qset param, taos_qall p2, void **phandle) {
...
@@ -351,13 +348,12 @@ int taosReadAllQitemsFromQset(taos_qset param, taos_qall p2, void **phandle) {
pthread_mutex_lock
(
&
qset
->
mutex
);
pthread_mutex_lock
(
&
qset
->
mutex
);
for
(
int
i
=
0
;
i
<
qset
->
numOfQueues
;
++
i
)
{
for
(
int
i
=
0
;
i
<
qset
->
numOfQueues
;
++
i
)
{
// pthread_mutex_lock(&qset->mutex);
if
(
qset
->
current
==
NULL
)
if
(
qset
->
current
==
NULL
)
qset
->
current
=
qset
->
head
;
qset
->
current
=
qset
->
head
;
queue
=
qset
->
current
;
queue
=
qset
->
current
;
if
(
queue
)
qset
->
current
=
queue
->
next
;
if
(
queue
)
qset
->
current
=
queue
->
next
;
// pthread_mutex_unlock(&qset->mutex);
if
(
queue
==
NULL
)
break
;
if
(
queue
==
NULL
)
break
;
if
(
queue
->
head
==
NULL
)
continue
;
pthread_mutex_lock
(
&
queue
->
mutex
);
pthread_mutex_lock
(
&
queue
->
mutex
);
...
...
src/util/tests/codingTests.cpp
0 → 100644
浏览文件 @
68bf22a9
#include <gtest/gtest.h>
#include <stdlib.h>
#include <time.h>
#include <random>
#include "tcoding.h"
static
bool
test_fixed_uint16
(
uint16_t
value
)
{
char
buf
[
20
]
=
"
\0
"
;
uint16_t
value_check
=
0
;
void
*
ptr1
=
taosEncodeFixed16
(
static_cast
<
void
*>
(
buf
),
value
);
void
*
ptr2
=
taosDecodeFixed16
(
static_cast
<
void
*>
(
buf
),
&
value_check
);
return
((
ptr2
!=
NULL
)
&&
(
value
==
value_check
)
&&
(
ptr1
==
ptr2
));
}
static
bool
test_fixed_uint32
(
uint32_t
value
)
{
char
buf
[
20
]
=
"
\0
"
;
uint32_t
value_check
=
0
;
void
*
ptr1
=
taosEncodeFixed32
(
static_cast
<
void
*>
(
buf
),
value
);
void
*
ptr2
=
taosDecodeFixed32
(
static_cast
<
void
*>
(
buf
),
&
value_check
);
return
((
ptr2
!=
NULL
)
&&
(
value
==
value_check
)
&&
(
ptr1
==
ptr2
));
}
static
bool
test_fixed_uint64
(
uint64_t
value
)
{
char
buf
[
20
]
=
"
\0
"
;
uint64_t
value_check
=
0
;
void
*
ptr1
=
taosEncodeFixed64
(
static_cast
<
void
*>
(
buf
),
value
);
void
*
ptr2
=
taosDecodeFixed64
(
static_cast
<
void
*>
(
buf
),
&
value_check
);
return
((
ptr2
!=
NULL
)
&&
(
value
==
value_check
)
&&
(
ptr1
==
ptr2
));
}
static
bool
test_variant_uint16
(
uint16_t
value
)
{
char
buf
[
20
]
=
"
\0
"
;
uint16_t
value_check
=
0
;
void
*
ptr1
=
taosEncodeVariant16
(
static_cast
<
void
*>
(
buf
),
value
);
void
*
ptr2
=
taosDecodeVariant16
(
static_cast
<
void
*>
(
buf
),
&
value_check
);
return
((
ptr2
!=
NULL
)
&&
(
value
==
value_check
)
&&
(
ptr1
==
ptr2
));
}
static
bool
test_variant_uint32
(
uint32_t
value
)
{
char
buf
[
20
]
=
"
\0
"
;
uint32_t
value_check
=
0
;
void
*
ptr1
=
taosEncodeVariant32
(
static_cast
<
void
*>
(
buf
),
value
);
void
*
ptr2
=
taosDecodeVariant32
(
static_cast
<
void
*>
(
buf
),
&
value_check
);
return
((
ptr2
!=
NULL
)
&&
(
value
==
value_check
)
&&
(
ptr1
==
ptr2
));
}
static
bool
test_variant_uint64
(
uint64_t
value
)
{
char
buf
[
20
]
=
"
\0
"
;
uint64_t
value_check
=
0
;
void
*
ptr1
=
taosEncodeVariant64
(
static_cast
<
void
*>
(
buf
),
value
);
void
*
ptr2
=
taosDecodeVariant64
(
static_cast
<
void
*>
(
buf
),
&
value_check
);
return
((
ptr2
!=
NULL
)
&&
(
value
==
value_check
)
&&
(
ptr1
==
ptr2
));
}
TEST
(
codingTest
,
fixed_encode_decode
)
{
srand
(
time
(
0
));
for
(
uint16_t
value
=
0
;
value
<=
UINT16_MAX
;
value
++
)
{
ASSERT_TRUE
(
test_fixed_uint16
(
value
));
if
(
value
==
UINT16_MAX
)
break
;
}
ASSERT_TRUE
(
test_fixed_uint32
(
0
));
ASSERT_TRUE
(
test_fixed_uint32
(
UINT32_MAX
));
for
(
int
i
=
0
;
i
<
1000000
;
i
++
)
{
ASSERT_TRUE
(
test_fixed_uint32
(
rand
()));
}
std
::
mt19937_64
gen
(
std
::
random_device
{}());
ASSERT_TRUE
(
test_fixed_uint64
(
0
));
ASSERT_TRUE
(
test_fixed_uint64
(
UINT64_MAX
));
for
(
int
i
=
0
;
i
<
1000000
;
i
++
)
{
ASSERT_TRUE
(
test_fixed_uint64
(
gen
()));
}
}
TEST
(
codingTest
,
variant_encode_decode
)
{
srand
(
time
(
0
));
for
(
uint16_t
value
=
0
;
value
<=
UINT16_MAX
;
value
++
)
{
ASSERT_TRUE
(
test_variant_uint16
(
value
));
if
(
value
==
UINT16_MAX
)
break
;
}
ASSERT_TRUE
(
test_variant_uint32
(
0
));
ASSERT_TRUE
(
test_variant_uint32
(
UINT32_MAX
));
for
(
int
i
=
0
;
i
<
5000000
;
i
++
)
{
ASSERT_TRUE
(
test_variant_uint32
(
rand
()));
}
std
::
mt19937_64
gen
(
std
::
random_device
{}());
ASSERT_TRUE
(
test_variant_uint64
(
0
));
ASSERT_TRUE
(
test_variant_uint64
(
UINT64_MAX
));
for
(
int
i
=
0
;
i
<
5000000
;
i
++
)
{
uint64_t
value
=
gen
();
// printf("%ull\n", value);
ASSERT_TRUE
(
test_variant_uint64
(
value
));
}
}
\ No newline at end of file
tests/script/basicSuite.sim
浏览文件 @
68bf22a9
...
@@ -20,9 +20,26 @@ run general/table/tinyint.sim
...
@@ -20,9 +20,26 @@ run general/table/tinyint.sim
run general/table/db.table.sim
run general/table/db.table.sim
run general/user/basic1.sim
run general/user/basic1.sim
#
run general/user/pass_alter.sim
run general/user/pass_alter.sim
run general/user/pass_len.sim
run general/user/pass_len.sim
run general/user/user_create.sim
run general/user/user_create.sim
run general/user/user_len.sim
run general/user/user_len.sim
# run general/compute/count.sim
# run general/compute/avg.sim
# run general/compute/sum.sim
# run general/compute/min.sim
# run general/compute/max.sim
# run general/compute/first.sim
# run general/compute/last.sim
run general/compute/stddev.sim
# run general/compute/leastsquare.sim
run general/compute/top.sim
run general/compute/bottom.sim
run general/compute/percentile.sim
run general/compute/diff.sim
# run general/compute/interval.sim
run general/compute/null.sim
# run general/compute/diff2.sim
##################################
##################################
tests/script/general/agg/stream.sim
浏览文件 @
68bf22a9
...
@@ -2,7 +2,7 @@ system sh/stop_dnodes.sh
...
@@ -2,7 +2,7 @@ system sh/stop_dnodes.sh
system sh/deploy.sh -n dnode1 -i 1
system sh/deploy.sh -n dnode1 -i 1
system sh/cfg.sh -n dnode1 -c
clog
-v 0
system sh/cfg.sh -n dnode1 -c
wallevel
-v 0
print ========== step1
print ========== step1
system sh/cfg.sh -n dnode1 -c monitor -v 1
system sh/cfg.sh -n dnode1 -c monitor -v 1
...
...
tests/script/general/alter/cached_schema_after_alter.sim
浏览文件 @
68bf22a9
system sh/stop_dnodes.sh
system sh/stop_dnodes.sh
system sh/deploy.sh -n dnode1 -i 1
system sh/deploy.sh -n dnode1 -i 1
system sh/cfg.sh -n dnode1 -c
clog
-v 0
system sh/cfg.sh -n dnode1 -c
wallevel
-v 0
system sh/exec.sh -n dnode1 -s start
system sh/exec.sh -n dnode1 -s start
sleep 3000
sleep 3000
sql connect
sql connect
...
...
tests/script/general/alter/count.sim
浏览文件 @
68bf22a9
...
@@ -2,7 +2,7 @@ system sh/stop_dnodes.sh
...
@@ -2,7 +2,7 @@ system sh/stop_dnodes.sh
system sh/deploy.sh -n dnode1 -i 1
system sh/deploy.sh -n dnode1 -i 1
system sh/cfg.sh -n dnode1 -c
clog
-v 0
system sh/cfg.sh -n dnode1 -c
wallevel
-v 0
system sh/cfg.sh -n dnode1 -c numOfMPeers -v 1
system sh/cfg.sh -n dnode1 -c numOfMPeers -v 1
system sh/cfg.sh -n dnode1 -c mgmtEqualVnodeNum -v 4
system sh/cfg.sh -n dnode1 -c mgmtEqualVnodeNum -v 4
...
...
tests/script/general/alter/import.sim
浏览文件 @
68bf22a9
...
@@ -2,7 +2,7 @@ system sh/stop_dnodes.sh
...
@@ -2,7 +2,7 @@ system sh/stop_dnodes.sh
system sh/deploy.sh -n dnode1 -i 1
system sh/deploy.sh -n dnode1 -i 1
system sh/cfg.sh -n dnode1 -c
clog
-v 0
system sh/cfg.sh -n dnode1 -c
wallevel
-v 0
system sh/cfg.sh -n dnode1 -c numOfMPeers -v 1
system sh/cfg.sh -n dnode1 -c numOfMPeers -v 1
system sh/cfg.sh -n dnode1 -c mgmtEqualVnodeNum -v 4
system sh/cfg.sh -n dnode1 -c mgmtEqualVnodeNum -v 4
...
...
tests/script/general/alter/insert1.sim
浏览文件 @
68bf22a9
...
@@ -2,7 +2,7 @@ system sh/stop_dnodes.sh
...
@@ -2,7 +2,7 @@ system sh/stop_dnodes.sh
system sh/deploy.sh -n dnode1 -i 1
system sh/deploy.sh -n dnode1 -i 1
system sh/cfg.sh -n dnode1 -c
clog
-v 0
system sh/cfg.sh -n dnode1 -c
wallevel
-v 0
system sh/exec.sh -n dnode1 -s start
system sh/exec.sh -n dnode1 -s start
sleep 3000
sleep 3000
...
...
tests/script/general/alter/insert2.sim
浏览文件 @
68bf22a9
...
@@ -2,7 +2,7 @@ system sh/stop_dnodes.sh
...
@@ -2,7 +2,7 @@ system sh/stop_dnodes.sh
system sh/deploy.sh -n dnode1 -i 1
system sh/deploy.sh -n dnode1 -i 1
system sh/cfg.sh -n dnode1 -c
clog
-v 0
system sh/cfg.sh -n dnode1 -c
wallevel
-v 0
system sh/exec.sh -n dnode1 -s start
system sh/exec.sh -n dnode1 -s start
sleep 3000
sleep 3000
...
...
tests/script/general/column/stream.sim
浏览文件 @
68bf22a9
...
@@ -2,7 +2,7 @@ system sh/stop_dnodes.sh
...
@@ -2,7 +2,7 @@ system sh/stop_dnodes.sh
system sh/deploy.sh -n dnode1 -i 1
system sh/deploy.sh -n dnode1 -i 1
system sh/cfg.sh -n dnode1 -c
clog
-v 0
system sh/cfg.sh -n dnode1 -c
wallevel
-v 0
print ========== step1
print ========== step1
system sh/cfg.sh -n dnode1 -c monitor -v 1
system sh/cfg.sh -n dnode1 -c monitor -v 1
...
...
tests/script/general/column/testSuite.sim
浏览文件 @
68bf22a9
run
lite
/column/table.sim
run
general
/column/table.sim
run
lite
/column/metrics.sim
run
general
/column/metrics.sim
run
lite
/column/stream.sim
run
general
/column/stream.sim
run
lite
/column/commit.sim
run
general
/column/commit.sim
tests/script/general/compress/commitlog.sim
浏览文件 @
68bf22a9
...
@@ -3,7 +3,6 @@ system sh/stop_dnodes.sh
...
@@ -3,7 +3,6 @@ system sh/stop_dnodes.sh
system sh/deploy.sh -n dnode1 -i 1
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 walLevel -v 1
system sh/cfg.sh -n dnode1 -c cacheBlockSize -v 1024
system sh/cfg.sh -n dnode1 -c compression -v 1
system sh/cfg.sh -n dnode1 -c compression -v 1
system sh/exec.sh -n dnode1 -s start
system sh/exec.sh -n dnode1 -s start
...
...
tests/script/general/compress/compress.sim
浏览文件 @
68bf22a9
...
@@ -3,7 +3,6 @@ system sh/stop_dnodes.sh
...
@@ -3,7 +3,6 @@ system sh/stop_dnodes.sh
system sh/deploy.sh -n dnode1 -i 1
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 walLevel -v 0
system sh/cfg.sh -n dnode1 -c cacheBlockSize -v 1024
system sh/cfg.sh -n dnode1 -c compression -v 1
system sh/cfg.sh -n dnode1 -c compression -v 1
system sh/exec.sh -n dnode1 -s start
system sh/exec.sh -n dnode1 -s start
...
...
tests/script/general/compress/compress2.sim
浏览文件 @
68bf22a9
...
@@ -3,7 +3,6 @@ system sh/stop_dnodes.sh
...
@@ -3,7 +3,6 @@ system sh/stop_dnodes.sh
system sh/deploy.sh -n dnode1 -i 1
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 walLevel -v 0
system sh/cfg.sh -n dnode1 -c cacheBlockSize -v 1024
system sh/cfg.sh -n dnode1 -c compression -v 2
system sh/cfg.sh -n dnode1 -c compression -v 2
system sh/exec.sh -n dnode1 -s start
system sh/exec.sh -n dnode1 -s start
...
...
tests/script/general/compress/uncompress.sim
浏览文件 @
68bf22a9
...
@@ -3,7 +3,6 @@ system sh/stop_dnodes.sh
...
@@ -3,7 +3,6 @@ system sh/stop_dnodes.sh
system sh/deploy.sh -n dnode1 -i 1
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 walLevel -v 0
system sh/cfg.sh -n dnode1 -c cacheBlockSize -v 1024
system sh/cfg.sh -n dnode1 -c compression -v 1
system sh/cfg.sh -n dnode1 -c compression -v 1
system sh/exec.sh -n dnode1 -s start
system sh/exec.sh -n dnode1 -s start
...
...
tests/script/general/db/back_insert.sim
浏览文件 @
68bf22a9
sql connect
sql connect
$x = 1
$x = 1
begin:
begin:
sql reset query cache
sleep 1000
sql insert into db.tb values(now, $x ) -x begin
sql insert into db.tb values(now, $x ) -x begin
#print ===> insert successed $x
#print ===> insert successed $x
$x = $x + 1
$x = $x + 1
...
...
tests/script/general/db/basic.sim
浏览文件 @
68bf22a9
...
@@ -2,9 +2,9 @@ system sh/stop_dnodes.sh
...
@@ -2,9 +2,9 @@ system sh/stop_dnodes.sh
system sh/deploy.sh -n dnode1 -i 1
system sh/deploy.sh -n dnode1 -i 1
system sh/cfg.sh -n dnode1 -c
clog
-v 0
system sh/cfg.sh -n dnode1 -c
wallevel
-v 0
system sh/cfg.sh -n dnode1 -c numOfTotalVnodes -v 4
system sh/cfg.sh -n dnode1 -c numOfTotalVnodes -v 4
system sh/cfg.sh -n dnode1 -c
tables
-v 1000
system sh/cfg.sh -n dnode1 -c
maxtablesPerVnode
-v 1000
system sh/exec.sh -n dnode1 -s start
system sh/exec.sh -n dnode1 -s start
...
...
tests/script/general/db/delete_reuse1.sim
浏览文件 @
68bf22a9
system sh/stop_dnodes.sh
system sh/stop_dnodes.sh
system sh/deploy.sh -n dnode1 -i 1
system sh/deploy.sh -n dnode1 -i 1
system sh/deploy.sh -n dnode2 -i 2
system sh/deploy.sh -n dnode2 -i 2
system sh/deploy.sh -n dnode3 -i 3
system sh/deploy.sh -n dnode3 -i 3
...
@@ -31,7 +27,6 @@ system sh/cfg.sh -n dnode4 -c numOfTotalVnodes -v 4
...
@@ -31,7 +27,6 @@ system sh/cfg.sh -n dnode4 -c numOfTotalVnodes -v 4
print ========= start dnodes
print ========= start dnodes
system sh/exec.sh -n dnode1 -s start
system sh/exec.sh -n dnode1 -s start
sleep 3000
sql connect
sql connect
print ======== step1
print ======== step1
...
@@ -78,6 +73,8 @@ sql insert into d1.t1 values(now, 2) -x step2
...
@@ -78,6 +73,8 @@ sql insert into d1.t1 values(now, 2) -x step2
step2:
step2:
print ========= step3
print ========= step3
sql reset query cache
sleep 1000
sql create database d1 replica 1
sql create database d1 replica 1
sql create table d1.t1 (ts timestamp, i int)
sql create table d1.t1 (ts timestamp, i int)
sql insert into d1.t1 values(now, 2)
sql insert into d1.t1 values(now, 2)
...
@@ -97,6 +94,8 @@ while $x < 20
...
@@ -97,6 +94,8 @@ while $x < 20
step4:
step4:
sql create database d1 replica 1
sql create database d1 replica 1
sql reset query cache
sleep 1000
sql create table d1.t1 (ts timestamp, i int)
sql create table d1.t1 (ts timestamp, i int)
sql insert into d1.t1 values(now, $x )
sql insert into d1.t1 values(now, $x )
sql select * from d1.t1
sql select * from d1.t1
...
...
tests/script/general/db/delete_reuse2.sim
浏览文件 @
68bf22a9
system sh/stop_dnodes.sh
system sh/stop_dnodes.sh
system sh/deploy.sh -n dnode1 -i 1
system sh/deploy.sh -n dnode1 -i 1
system sh/deploy.sh -n dnode2 -i 2
system sh/deploy.sh -n dnode2 -i 2
system sh/deploy.sh -n dnode3 -i 3
system sh/deploy.sh -n dnode3 -i 3
...
@@ -31,7 +27,6 @@ system sh/cfg.sh -n dnode4 -c numOfTotalVnodes -v 4
...
@@ -31,7 +27,6 @@ system sh/cfg.sh -n dnode4 -c numOfTotalVnodes -v 4
print ========= start dnodes
print ========= start dnodes
system sh/exec.sh -n dnode1 -s start
system sh/exec.sh -n dnode1 -s start
sleep 3000
sql connect
sql connect
print ======== step1
print ======== step1
...
@@ -79,6 +74,8 @@ step2:
...
@@ -79,6 +74,8 @@ step2:
print ========= step3
print ========= step3
sql create database db1 replica 1
sql create database db1 replica 1
sql reset query cache
sleep 1000
sql create table db1.tb1 (ts timestamp, i int)
sql create table db1.tb1 (ts timestamp, i int)
sql insert into db1.tb1 values(now, 2)
sql insert into db1.tb1 values(now, 2)
sql select * from db1.tb1
sql select * from db1.tb1
...
@@ -104,6 +101,9 @@ while $x < 20
...
@@ -104,6 +101,9 @@ while $x < 20
$db = db . $x
$db = db . $x
$tb = tb . $x
$tb = tb . $x
sql reset query cache
sleep 1000
sql create database $db replica 1
sql create database $db replica 1
sql use $db
sql use $db
sql create table $tb (ts timestamp, i int)
sql create table $tb (ts timestamp, i int)
...
...
tests/script/general/db/delete_reusevnode.sim
浏览文件 @
68bf22a9
...
@@ -5,19 +5,16 @@ system sh/deploy.sh -n dnode1 -i 1
...
@@ -5,19 +5,16 @@ system sh/deploy.sh -n dnode1 -i 1
system sh/cfg.sh -n dnode1 -c numOfTotalVnodes -v 10
system sh/cfg.sh -n dnode1 -c numOfTotalVnodes -v 10
system sh/cfg.sh -n dnode2 -c numOfTotalVnodes -v 10
system sh/cfg.sh -n dnode2 -c numOfTotalVnodes -v 10
system sh/cfg.sh -n dnode3 -c numOfTotalVnodes -v 10
system sh/cfg.sh -n dnode3 -c numOfTotalVnodes -v 10
system sh/cfg.sh -n dnode1 -c cacheBlockSize -v 200
system sh/cfg.sh -n dnode2 -c cacheBlockSize -v 200
system sh/cfg.sh -n dnode3 -c cacheBlockSize -v 200
print ========= start dnodes
print ========= start dnodes
system sh/exec.sh -n dnode1 -s start
system sh/exec.sh -n dnode1 -s start
s
leep 3000
s
ql connect
print ======== step1
print ======== step1
$tbPrefix = t
$tbPrefix = t
$i = 0
$i = 0
while $i <
100
0
while $i <
3
0
$db = db . $i
$db = db . $i
sql create database $db
sql create database $db
sql use $db
sql use $db
...
@@ -37,38 +34,32 @@ endw
...
@@ -37,38 +34,32 @@ endw
print ======== step2
print ======== step2
sleep 1000
sleep 1000
sql drop database $db
sql show databases
sql show databases
if $rows != 0 then
if $rows != 0 then
return -1
return -1
endi
endi
system sh/stop_dnodes.sh
system sh/stop_dnodes.sh
sleep 3000
system sh/deploy.sh -n dnode1 -i 1
system sh/deploy.sh -n dnode1 -i 1
system sh/cfg.sh -n dnode1 -c numOfTotalVnodes -v 10
system sh/cfg.sh -n dnode1 -c numOfTotalVnodes -v 10
system sh/cfg.sh -n dnode2 -c numOfTotalVnodes -v 10
system sh/cfg.sh -n dnode2 -c numOfTotalVnodes -v 10
system sh/cfg.sh -n dnode3 -c numOfTotalVnodes -v 10
system sh/cfg.sh -n dnode3 -c numOfTotalVnodes -v 10
system sh/cfg.sh -n dnode1 -c cacheBlockSize -v 200
system sh/cfg.sh -n dnode2 -c cacheBlockSize -v 200
system sh/cfg.sh -n dnode3 -c cacheBlockSize -v 200
print ========= start dnodes
print ========= start dnodes
system sh/exec.sh -n dnode1 -s start
system sh/exec.sh -n dnode1 -s start
s
leep 3000
s
ql connect
print ======== step1
print ======== step1
$tbPrefix = t
$tbPrefix = t
$i = 0
$i = 0
while $i < 10
00
while $i < 10
$db = db . $i
$db = db . $i
sql create database $db
t
ables 4
sql create database $db
maxT
ables 4
sql use $db
sql use $db
sql create table st (ts times
e
tamp, i int) tags(j int);
sql create table st (ts timestamp, i int) tags(j int);
$tb = $tbPrefix . $i
$tb = $tbPrefix . $i
$tb = $tb . a
$tb = $tb . a
...
@@ -114,7 +105,6 @@ endw
...
@@ -114,7 +105,6 @@ endw
print ======== step2
print ======== step2
sleep 1000
sleep 1000
sql drop database $db
sql show databases
sql show databases
if $rows != 0 then
if $rows != 0 then
return -1
return -1
...
...
tests/script/general/db/delete_reusevnode2.sim
浏览文件 @
68bf22a9
...
@@ -5,26 +5,19 @@ system sh/deploy.sh -n dnode1 -i 1
...
@@ -5,26 +5,19 @@ system sh/deploy.sh -n dnode1 -i 1
system sh/cfg.sh -n dnode1 -c numOfTotalVnodes -v 10
system sh/cfg.sh -n dnode1 -c numOfTotalVnodes -v 10
system sh/cfg.sh -n dnode2 -c numOfTotalVnodes -v 10
system sh/cfg.sh -n dnode2 -c numOfTotalVnodes -v 10
system sh/cfg.sh -n dnode3 -c numOfTotalVnodes -v 10
system sh/cfg.sh -n dnode3 -c numOfTotalVnodes -v 10
system sh/cfg.sh -n dnode1 -c cacheBlockSize -v 200
system sh/cfg.sh -n dnode2 -c cacheBlockSize -v 200
system sh/cfg.sh -n dnode3 -c cacheBlockSize -v 200
print ========= start dnodes
print ========= start dnodes
system sh/exec.sh -n dnode1 -s start
system sh/exec.sh -n dnode1 -s start
sql connect
sleep 3000
print ======== step1
print ======== step1
sql create database db maxTables 4;
sql create database db tables 4;
sql use db
sql use db
$tbPrefix = t
$tbPrefix = t
$i = 0
$i = 0
while $i < 1000
while $i < 10
sql create table st (ts timestamp, i int) tags(j int);
sql create table st (ts timestamp, i int) tags(j int);
$tb = $tbPrefix . $i
$tb = $tbPrefix . $i
...
...
tests/script/general/db/delete_writing1.sim
浏览文件 @
68bf22a9
system sh/stop_dnodes.sh
system sh/stop_dnodes.sh
system sh/deploy.sh -n dnode1 -i 1
system sh/deploy.sh -n dnode1 -i 1
system sh/deploy.sh -n dnode2 -i 2
system sh/deploy.sh -n dnode2 -i 2
system sh/deploy.sh -n dnode3 -i 3
system sh/deploy.sh -n dnode3 -i 3
...
@@ -31,7 +27,6 @@ system sh/cfg.sh -n dnode4 -c numOfTotalVnodes -v 4
...
@@ -31,7 +27,6 @@ system sh/cfg.sh -n dnode4 -c numOfTotalVnodes -v 4
print ========= start dnodes
print ========= start dnodes
system sh/exec.sh -n dnode1 -s start
system sh/exec.sh -n dnode1 -s start
sleep 3000
sql connect
sql connect
sql create database db
sql create database db
...
@@ -39,7 +34,7 @@ sql create table db.tb (ts timestamp, i int)
...
@@ -39,7 +34,7 @@ sql create table db.tb (ts timestamp, i int)
sql insert into db.tb values(now, 1)
sql insert into db.tb values(now, 1)
print ======== start back
print ======== start back
run_back
lite
/db/back_insert.sim
run_back
general
/db/back_insert.sim
sleep 1000
sleep 1000
print ======== step1
print ======== step1
...
...
tests/script/general/db/delete_writing2.sim
浏览文件 @
68bf22a9
system sh/stop_dnodes.sh
system sh/stop_dnodes.sh
system sh/deploy.sh -n dnode1 -i 1
system sh/deploy.sh -n dnode1 -i 1
system sh/cfg.sh -n dnode1 -c
clog
-v 0
system sh/cfg.sh -n dnode1 -c
wallevel
-v 0
system sh/cfg.sh -n dnode1 -c numOfTotalVnodes -v 4
system sh/cfg.sh -n dnode1 -c numOfTotalVnodes -v 4
print ========= start dnodes
print ========= start dnodes
system sh/exec.sh -n dnode1 -s start
system sh/exec.sh -n dnode1 -s start
sleep 3000
sql connect
sql connect
sql create database db
sql create database db
...
@@ -27,7 +25,7 @@ sql create table db4.tb4 (ts timestamp, i int)
...
@@ -27,7 +25,7 @@ sql create table db4.tb4 (ts timestamp, i int)
sql insert into db4.tb4 values(now, 1)
sql insert into db4.tb4 values(now, 1)
print ======== start back
print ======== start back
run_back
lite
/db/back_insert.sim
run_back
general
/db/back_insert.sim
sleep 1000
sleep 1000
print ======== step1
print ======== step1
...
...
tests/script/general/db/len.sim
浏览文件 @
68bf22a9
...
@@ -4,7 +4,7 @@ system sh/stop_dnodes.sh
...
@@ -4,7 +4,7 @@ system sh/stop_dnodes.sh
system sh/deploy.sh -n dnode1 -i 1
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 walLevel -v 0
system sh/cfg.sh -n dnode1 -c numOfTotalVnodes -v 4
system sh/cfg.sh -n dnode1 -c numOfTotalVnodes -v 4
system sh/cfg.sh -n dnode1 -c
session
sPerVnode -v 2000
system sh/cfg.sh -n dnode1 -c
maxtable
sPerVnode -v 2000
system sh/exec.sh -n dnode1 -s start
system sh/exec.sh -n dnode1 -s start
sleep 3000
sleep 3000
...
...
tests/script/general/db/repeat.sim
浏览文件 @
68bf22a9
...
@@ -2,9 +2,9 @@ system sh/stop_dnodes.sh
...
@@ -2,9 +2,9 @@ system sh/stop_dnodes.sh
system sh/deploy.sh -n dnode1 -i 1
system sh/deploy.sh -n dnode1 -i 1
system sh/cfg.sh -n dnode1 -c
clog
-v 0
system sh/cfg.sh -n dnode1 -c
wallevel
-v 0
system sh/cfg.sh -n dnode1 -c numOfTotalVnodes -v 4
system sh/cfg.sh -n dnode1 -c numOfTotalVnodes -v 4
system sh/cfg.sh -n dnode1 -c
tables
-v 4
system sh/cfg.sh -n dnode1 -c
maxtablesPerVnode
-v 4
system sh/exec.sh -n dnode1 -s start
system sh/exec.sh -n dnode1 -s start
...
...
tests/script/general/db/tables.sim
浏览文件 @
68bf22a9
system sh/stop_dnodes.sh
system sh/stop_dnodes.sh
system sh/deploy.sh -n dnode1 -i 1
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 walLevel -v 0
system sh/cfg.sh -n dnode1 -c numOfTotalVnodes -v 4
system sh/cfg.sh -n dnode1 -c numOfTotalVnodes -v 4
system sh/cfg.sh -n dnode1 -c
session
sPerVnode -v 2000
system sh/cfg.sh -n dnode1 -c
maxtable
sPerVnode -v 2000
system sh/exec.sh -n dnode1 -s start
system sh/exec.sh -n dnode1 -s start
sleep 3000
sleep 3000
sql connect
sql connect
print =============== step2
print =============== step2
sql create database db
tables 2
sql create database db
maxtables 4
sql show databases
sql show databases
print $rows $data07
print $rows $data07
...
@@ -19,7 +18,7 @@ if $rows != 1 then
...
@@ -19,7 +18,7 @@ if $rows != 1 then
return -1
return -1
endi
endi
if $data07 !=
2
then
if $data07 !=
4
then
return -1
return -1
endi
endi
...
@@ -30,9 +29,17 @@ sql create table t2 (ts timestamp, i int)
...
@@ -30,9 +29,17 @@ sql create table t2 (ts timestamp, i int)
sql create table t3 (ts timestamp, i int)
sql create table t3 (ts timestamp, i int)
sql create table t4 (ts timestamp, i int)
sql create table t4 (ts timestamp, i int)
sql create table t11 (ts timestamp, i int)
sql create table t11 (ts timestamp, i int)
sql create table t12 (ts timestamp, i int)
sql create table t13 (ts timestamp, i int)
sql create table t14 (ts timestamp, i int)
sql create table t21 (ts timestamp, i int)
sql create table t22 (ts timestamp, i int)
sql create table t22 (ts timestamp, i int)
sql create table t23 (ts timestamp, i int)
sql create table t24 (ts timestamp, i int)
sql create table t31 (ts timestamp, i int)
sql create table t32 (ts timestamp, i int)
sql create table t33 (ts timestamp, i int)
sql create table t33 (ts timestamp, i int)
sql create table t
4
4 (ts timestamp, i int)
sql create table t
3
4 (ts timestamp, i int)
print =============== step4
print =============== step4
sql insert into t1 values(now, 1)
sql insert into t1 values(now, 1)
...
@@ -42,7 +49,7 @@ sql insert into t4 values(now, 4)
...
@@ -42,7 +49,7 @@ sql insert into t4 values(now, 4)
sql insert into t11 values(now, 1)
sql insert into t11 values(now, 1)
sql insert into t22 values(now, 2)
sql insert into t22 values(now, 2)
sql insert into t33 values(now, 3)
sql insert into t33 values(now, 3)
sql insert into t
4
4 values(now, 4)
sql insert into t
3
4 values(now, 4)
print =============== step5
print =============== step5
sql select * from t1
sql select * from t1
...
@@ -68,10 +75,10 @@ endi
...
@@ -68,10 +75,10 @@ endi
print =============== step6
print =============== step6
sql drop database db
sql drop database db
sql reset query cache
sql reset query cache
sleep
20
000
sleep
4
000
print =============== step7
print =============== step7
sql create database db
tables 2
sql create database db
maxtables 4
sql show databases
sql show databases
print $rows $data07
print $rows $data07
...
@@ -79,7 +86,7 @@ if $rows != 1 then
...
@@ -79,7 +86,7 @@ if $rows != 1 then
return -1
return -1
endi
endi
if $data07 !=
2
then
if $data07 !=
4
then
return -1
return -1
endi
endi
...
@@ -90,9 +97,17 @@ sql create table t2 (ts timestamp, i int)
...
@@ -90,9 +97,17 @@ sql create table t2 (ts timestamp, i int)
sql create table t3 (ts timestamp, i int)
sql create table t3 (ts timestamp, i int)
sql create table t4 (ts timestamp, i int)
sql create table t4 (ts timestamp, i int)
sql create table t11 (ts timestamp, i int)
sql create table t11 (ts timestamp, i int)
sql create table t12 (ts timestamp, i int)
sql create table t13 (ts timestamp, i int)
sql create table t14 (ts timestamp, i int)
sql create table t21 (ts timestamp, i int)
sql create table t22 (ts timestamp, i int)
sql create table t22 (ts timestamp, i int)
sql create table t23 (ts timestamp, i int)
sql create table t24 (ts timestamp, i int)
sql create table t31 (ts timestamp, i int)
sql create table t32 (ts timestamp, i int)
sql create table t33 (ts timestamp, i int)
sql create table t33 (ts timestamp, i int)
sql create table t
4
4 (ts timestamp, i int)
sql create table t
3
4 (ts timestamp, i int)
print =============== step9
print =============== step9
sql insert into t1 values(now, 1)
sql insert into t1 values(now, 1)
...
@@ -102,7 +117,7 @@ sql insert into t4 values(now, 4)
...
@@ -102,7 +117,7 @@ sql insert into t4 values(now, 4)
sql insert into t11 values(now, 1)
sql insert into t11 values(now, 1)
sql insert into t22 values(now, 2)
sql insert into t22 values(now, 2)
sql insert into t33 values(now, 3)
sql insert into t33 values(now, 3)
sql insert into t
4
4 values(now, 4)
sql insert into t
3
4 values(now, 4)
print =============== step10
print =============== step10
sql select * from t1
sql select * from t1
...
...
tests/script/general/db/testSuite.sim
浏览文件 @
68bf22a9
run general//db/basic.sim
run general/db/basic1.sim
run general/db/basic1.sim
run general/db/basic2.sim
run general/db/basic2.sim
run general/db/basic3.sim
run general/db/basic3.sim
run general/db/basic4.sim
run general/db/basic4.sim
run general/db/basic5.sim
run general/db/basic5.sim
#run general//db/tables.sim
run general/db/delete_reuse1.sim
#run general//db/basic.sim
run general/db/delete_reuse2.sim
#run general//db/len.sim
run general/db/delete_reusevnode.sim
#run general//db/delete_reuse1.sim
#run general/db/delete_reusevnode2.sim
#run general//db/delete_reuse2.sim
run general/db/delete_writing1.sim
#run general//db/delete_writing1.sim
run general/db/delete_writing2.sim
#run general//db/delete_writing2.sim
run general/db/len.sim
run general/db/repeat.sim
run general/db/tables.sim
tests/script/general/http/restful.sim
浏览文件 @
68bf22a9
system sh/stop_dnodes.sh
system sh/stop_dnodes.sh
sleep 5000
sleep 5000
system sh/deploy.sh -n dnode1 -i 1
system sh/deploy.sh -n dnode1 -i 1
system sh/cfg.sh -n dnode1 -c
clog
-v 0
system sh/cfg.sh -n dnode1 -c
wallevel
-v 0
system sh/cfg.sh -n dnode1 -c http -v 1
system sh/cfg.sh -n dnode1 -c http -v 1
system sh/cfg.sh -n dnode1 -c httpEnableRecordSql -v 1
system sh/cfg.sh -n dnode1 -c httpEnableRecordSql -v 1
system sh/exec.sh -n dnode1 -s start
system sh/exec.sh -n dnode1 -s start
...
...
tests/script/general/http/restful_full.sim
浏览文件 @
68bf22a9
system sh/stop_dnodes.sh
system sh/stop_dnodes.sh
sleep 5000
sleep 5000
system sh/deploy.sh -n dnode1 -i 1
system sh/deploy.sh -n dnode1 -i 1
system sh/cfg.sh -n dnode1 -c
clog
-v 0
system sh/cfg.sh -n dnode1 -c
wallevel
-v 0
system sh/cfg.sh -n dnode1 -c http -v 1
system sh/cfg.sh -n dnode1 -c http -v 1
system sh/exec.sh -n dnode1 -s start
system sh/exec.sh -n dnode1 -s start
...
...
tests/script/general/import/basic.sim
浏览文件 @
68bf22a9
...
@@ -20,10 +20,10 @@ system sh/cfg.sh -n dnode2 -c mgmtEqualVnodeNum -v 10
...
@@ -20,10 +20,10 @@ system sh/cfg.sh -n dnode2 -c mgmtEqualVnodeNum -v 10
system sh/cfg.sh -n dnode3 -c mgmtEqualVnodeNum -v 10
system sh/cfg.sh -n dnode3 -c mgmtEqualVnodeNum -v 10
system sh/cfg.sh -n dnode4 -c mgmtEqualVnodeNum -v 10
system sh/cfg.sh -n dnode4 -c mgmtEqualVnodeNum -v 10
system sh/cfg.sh -n dnode1 -c
session
sPerVnode -v 2000
system sh/cfg.sh -n dnode1 -c
maxtable
sPerVnode -v 2000
system sh/cfg.sh -n dnode2 -c
session
sPerVnode -v 2000
system sh/cfg.sh -n dnode2 -c
maxtable
sPerVnode -v 2000
system sh/cfg.sh -n dnode3 -c
session
sPerVnode -v 2000
system sh/cfg.sh -n dnode3 -c
maxtable
sPerVnode -v 2000
system sh/cfg.sh -n dnode4 -c
session
sPerVnode -v 2000
system sh/cfg.sh -n dnode4 -c
maxtable
sPerVnode -v 2000
system sh/cfg.sh -n dnode1 -c commitlog -v 0
system sh/cfg.sh -n dnode1 -c commitlog -v 0
system sh/cfg.sh -n dnode2 -c commitlog -v 0
system sh/cfg.sh -n dnode2 -c commitlog -v 0
...
...
tests/script/general/import/commit.sim
浏览文件 @
68bf22a9
...
@@ -20,10 +20,10 @@ system sh/cfg.sh -n dnode2 -c mgmtEqualVnodeNum -v 10
...
@@ -20,10 +20,10 @@ system sh/cfg.sh -n dnode2 -c mgmtEqualVnodeNum -v 10
system sh/cfg.sh -n dnode3 -c mgmtEqualVnodeNum -v 10
system sh/cfg.sh -n dnode3 -c mgmtEqualVnodeNum -v 10
system sh/cfg.sh -n dnode4 -c mgmtEqualVnodeNum -v 10
system sh/cfg.sh -n dnode4 -c mgmtEqualVnodeNum -v 10
system sh/cfg.sh -n dnode1 -c
session
sPerVnode -v 2000
system sh/cfg.sh -n dnode1 -c
maxtable
sPerVnode -v 2000
system sh/cfg.sh -n dnode2 -c
session
sPerVnode -v 2000
system sh/cfg.sh -n dnode2 -c
maxtable
sPerVnode -v 2000
system sh/cfg.sh -n dnode3 -c
session
sPerVnode -v 2000
system sh/cfg.sh -n dnode3 -c
maxtable
sPerVnode -v 2000
system sh/cfg.sh -n dnode4 -c
session
sPerVnode -v 2000
system sh/cfg.sh -n dnode4 -c
maxtable
sPerVnode -v 2000
system sh/cfg.sh -n dnode1 -c commitlog -v 0
system sh/cfg.sh -n dnode1 -c commitlog -v 0
system sh/cfg.sh -n dnode2 -c commitlog -v 0
system sh/cfg.sh -n dnode2 -c commitlog -v 0
...
...
tests/script/general/import/large.sim
浏览文件 @
68bf22a9
...
@@ -20,10 +20,10 @@ system sh/cfg.sh -n dnode2 -c mgmtEqualVnodeNum -v 10
...
@@ -20,10 +20,10 @@ system sh/cfg.sh -n dnode2 -c mgmtEqualVnodeNum -v 10
system sh/cfg.sh -n dnode3 -c mgmtEqualVnodeNum -v 10
system sh/cfg.sh -n dnode3 -c mgmtEqualVnodeNum -v 10
system sh/cfg.sh -n dnode4 -c mgmtEqualVnodeNum -v 10
system sh/cfg.sh -n dnode4 -c mgmtEqualVnodeNum -v 10
system sh/cfg.sh -n dnode1 -c
session
sPerVnode -v 2000
system sh/cfg.sh -n dnode1 -c
maxtable
sPerVnode -v 2000
system sh/cfg.sh -n dnode2 -c
session
sPerVnode -v 2000
system sh/cfg.sh -n dnode2 -c
maxtable
sPerVnode -v 2000
system sh/cfg.sh -n dnode3 -c
session
sPerVnode -v 2000
system sh/cfg.sh -n dnode3 -c
maxtable
sPerVnode -v 2000
system sh/cfg.sh -n dnode4 -c
session
sPerVnode -v 2000
system sh/cfg.sh -n dnode4 -c
maxtable
sPerVnode -v 2000
system sh/cfg.sh -n dnode1 -c commitlog -v 0
system sh/cfg.sh -n dnode1 -c commitlog -v 0
system sh/cfg.sh -n dnode2 -c commitlog -v 0
system sh/cfg.sh -n dnode2 -c commitlog -v 0
...
...
tests/script/general/import/replica1.sim
浏览文件 @
68bf22a9
...
@@ -20,10 +20,10 @@ system sh/cfg.sh -n dnode2 -c mgmtEqualVnodeNum -v 10
...
@@ -20,10 +20,10 @@ system sh/cfg.sh -n dnode2 -c mgmtEqualVnodeNum -v 10
system sh/cfg.sh -n dnode3 -c mgmtEqualVnodeNum -v 10
system sh/cfg.sh -n dnode3 -c mgmtEqualVnodeNum -v 10
system sh/cfg.sh -n dnode4 -c mgmtEqualVnodeNum -v 10
system sh/cfg.sh -n dnode4 -c mgmtEqualVnodeNum -v 10
system sh/cfg.sh -n dnode1 -c
session
sPerVnode -v 2000
system sh/cfg.sh -n dnode1 -c
maxtable
sPerVnode -v 2000
system sh/cfg.sh -n dnode2 -c
session
sPerVnode -v 2000
system sh/cfg.sh -n dnode2 -c
maxtable
sPerVnode -v 2000
system sh/cfg.sh -n dnode3 -c
session
sPerVnode -v 2000
system sh/cfg.sh -n dnode3 -c
maxtable
sPerVnode -v 2000
system sh/cfg.sh -n dnode4 -c
session
sPerVnode -v 2000
system sh/cfg.sh -n dnode4 -c
maxtable
sPerVnode -v 2000
system sh/cfg.sh -n dnode1 -c commitlog -v 0
system sh/cfg.sh -n dnode1 -c commitlog -v 0
system sh/cfg.sh -n dnode2 -c commitlog -v 0
system sh/cfg.sh -n dnode2 -c commitlog -v 0
...
...
tests/script/general/insert/insert_drop.sim
浏览文件 @
68bf22a9
...
@@ -19,7 +19,7 @@ $stb = stb
...
@@ -19,7 +19,7 @@ $stb = stb
sql drop database $db -x step1
sql drop database $db -x step1
step1:
step1:
sql create database $db tables 10 ctime 30
sql create database $db
max
tables 10 ctime 30
print ====== create tables
print ====== create tables
sql use $db
sql use $db
sql create table $stb (ts timestamp, c1 int) tags(t1 int)
sql create table $stb (ts timestamp, c1 int) tags(t1 int)
...
...
tests/script/general/metrics/disk.sim
浏览文件 @
68bf22a9
...
@@ -4,7 +4,7 @@ system sh/stop_dnodes.sh
...
@@ -4,7 +4,7 @@ system sh/stop_dnodes.sh
system sh/deploy.sh -n dnode1 -i 1
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 walLevel -v 0
system sh/cfg.sh -n dnode1 -c numOfTotalVnodes -v 4
system sh/cfg.sh -n dnode1 -c numOfTotalVnodes -v 4
system sh/cfg.sh -n dnode1 -c
session
sPerVnode -v 4
system sh/cfg.sh -n dnode1 -c
maxtable
sPerVnode -v 4
system sh/exec.sh -n dnode1 -s start
system sh/exec.sh -n dnode1 -s start
sleep 3000
sleep 3000
...
@@ -24,7 +24,7 @@ $i = 0
...
@@ -24,7 +24,7 @@ $i = 0
$db = $dbPrefix . $i
$db = $dbPrefix . $i
$mt = $mtPrefix . $i
$mt = $mtPrefix . $i
sql create database $db
t
ables 4
sql create database $db
maxT
ables 4
sql use $db
sql use $db
sql create table $mt (ts timestamp, tbcol int) TAGS(tgcol int)
sql create table $mt (ts timestamp, tbcol int) TAGS(tgcol int)
...
...
tests/script/general/metrics/metrics.sim
浏览文件 @
68bf22a9
...
@@ -4,7 +4,7 @@ system sh/stop_dnodes.sh
...
@@ -4,7 +4,7 @@ system sh/stop_dnodes.sh
system sh/deploy.sh -n dnode1 -i 1
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 walLevel -v 0
system sh/cfg.sh -n dnode1 -c numOfTotalVnodes -v 4
system sh/cfg.sh -n dnode1 -c numOfTotalVnodes -v 4
system sh/cfg.sh -n dnode1 -c
session
sPerVnode -v 4
system sh/cfg.sh -n dnode1 -c
maxtable
sPerVnode -v 4
system sh/exec.sh -n dnode1 -s start
system sh/exec.sh -n dnode1 -s start
sleep 3000
sleep 3000
...
...
tests/script/general/metrics/values.sim
浏览文件 @
68bf22a9
...
@@ -4,7 +4,7 @@ system sh/stop_dnodes.sh
...
@@ -4,7 +4,7 @@ system sh/stop_dnodes.sh
system sh/deploy.sh -n dnode1 -i 1
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 walLevel -v 0
system sh/cfg.sh -n dnode1 -c numOfTotalVnodes -v 4
system sh/cfg.sh -n dnode1 -c numOfTotalVnodes -v 4
system sh/cfg.sh -n dnode1 -c
session
sPerVnode -v 4
system sh/cfg.sh -n dnode1 -c
maxtable
sPerVnode -v 4
system sh/exec.sh -n dnode1 -s start
system sh/exec.sh -n dnode1 -s start
sleep 3000
sleep 3000
...
...
tests/script/general/metrics/vnode3.sim
浏览文件 @
68bf22a9
...
@@ -4,7 +4,7 @@ system sh/stop_dnodes.sh
...
@@ -4,7 +4,7 @@ system sh/stop_dnodes.sh
system sh/deploy.sh -n dnode1 -i 1
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 walLevel -v 0
system sh/cfg.sh -n dnode1 -c numOfTotalVnodes -v 4
system sh/cfg.sh -n dnode1 -c numOfTotalVnodes -v 4
system sh/cfg.sh -n dnode1 -c
session
sPerVnode -v 4
system sh/cfg.sh -n dnode1 -c
maxtable
sPerVnode -v 4
system sh/exec.sh -n dnode1 -s start
system sh/exec.sh -n dnode1 -s start
sleep 3000
sleep 3000
...
@@ -24,7 +24,7 @@ $i = 0
...
@@ -24,7 +24,7 @@ $i = 0
$db = $dbPrefix . $i
$db = $dbPrefix . $i
$mt = $mtPrefix . $i
$mt = $mtPrefix . $i
sql create database $db
t
ables 4
sql create database $db
maxT
ables 4
sql use $db
sql use $db
sql create table $mt (ts timestamp, tbcol int) TAGS(tgcol int)
sql create table $mt (ts timestamp, tbcol int) TAGS(tgcol int)
...
...
tests/script/general/parser/auto_create_tb.sim
浏览文件 @
68bf22a9
...
@@ -3,7 +3,7 @@ system sh/stop_dnodes.sh
...
@@ -3,7 +3,7 @@ system sh/stop_dnodes.sh
system sh/deploy.sh -n dnode1 -i 1
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 walLevel -v 0
system sh/cfg.sh -n dnode1 -c
session
sPerVnode -v 2
system sh/cfg.sh -n dnode1 -c
maxtable
sPerVnode -v 2
system sh/exec.sh -n dnode1 -s start
system sh/exec.sh -n dnode1 -s start
sleep 3000
sleep 3000
...
...
tests/script/general/parser/auto_create_tb_drop_tb.sim
浏览文件 @
68bf22a9
...
@@ -22,7 +22,7 @@ $stb = $stbPrefix . $i
...
@@ -22,7 +22,7 @@ $stb = $stbPrefix . $i
sql drop database $db -x step1
sql drop database $db -x step1
step1:
step1:
sql create database $db rows 200 cache 2048
t
ables 4
sql create database $db rows 200 cache 2048
maxT
ables 4
print ====== create tables
print ====== create tables
sql use $db
sql use $db
...
...
tests/script/general/parser/create_db.sim
浏览文件 @
68bf22a9
...
@@ -163,7 +163,7 @@ sql_error create database $db rows 199
...
@@ -163,7 +163,7 @@ sql_error create database $db rows 199
sql_error create database $db cache 99
sql_error create database $db cache 99
#sql_error create database $db cache 10485761
#sql_error create database $db cache 10485761
# ablocks [overwriten by 4*
session
sPerVnode, 409600]
# ablocks [overwriten by 4*
maxtable
sPerVnode, 409600]
sql_error create database $db ablocks -1
sql_error create database $db ablocks -1
#sql_error create database $db ablocks 409601
#sql_error create database $db ablocks 409601
...
...
tests/script/general/parser/first_last.sim
浏览文件 @
68bf22a9
...
@@ -21,7 +21,7 @@ $stb = $stbPrefix . $i
...
@@ -21,7 +21,7 @@ $stb = $stbPrefix . $i
sql drop database $db -x step1
sql drop database $db -x step1
step1:
step1:
sql create database $db rows 400 cache 4096
t
ables 4
sql create database $db rows 400 cache 4096
maxT
ables 4
sql use $db
sql use $db
sql create table $stb (ts timestamp, c1 int, c2 bigint, c3 float, c4 double, c5 smallint, c6 tinyint, c7 bool, c8 binary(10), c9 nchar(10)) tags(t1 int)
sql create table $stb (ts timestamp, c1 int, c2 bigint, c3 float, c4 double, c5 smallint, c6 tinyint, c7 bool, c8 binary(10), c9 nchar(10)) tags(t1 int)
...
@@ -69,7 +69,7 @@ sql import into $tb (ts) values ( $ts )
...
@@ -69,7 +69,7 @@ sql import into $tb (ts) values ( $ts )
print ====== test data created
print ====== test data created
run
lite
/parser/first_last_query.sim
run
general
/parser/first_last_query.sim
print ================== restart server to commit data into disk
print ================== restart server to commit data into disk
system sh/exec.sh -n dnode1 -s stop -x SIGINT
system sh/exec.sh -n dnode1 -s stop -x SIGINT
...
@@ -79,5 +79,5 @@ print ================== server restart completed
...
@@ -79,5 +79,5 @@ print ================== server restart completed
sql connect
sql connect
sleep 3000
sleep 3000
run
lite
/parser/first_last_query.sim
run
general
/parser/first_last_query.sim
tests/script/general/parser/groupby.sim
浏览文件 @
68bf22a9
...
@@ -28,7 +28,7 @@ $tstart = 100000
...
@@ -28,7 +28,7 @@ $tstart = 100000
sql drop database if exits $db -x step1
sql drop database if exits $db -x step1
step1:
step1:
sql create database if not exists $db
t
ables 4 keep 36500
sql create database if not exists $db
maxT
ables 4 keep 36500
sql use $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, t2 binary(12))
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))
...
...
tests/script/general/parser/interp.sim
浏览文件 @
68bf22a9
...
@@ -56,7 +56,7 @@ while $i < $halfNum
...
@@ -56,7 +56,7 @@ while $i < $halfNum
endw
endw
print ====== tables created
print ====== tables created
run
lite
/parser/interp_test.sim
run
general
/parser/interp_test.sim
print ================== restart server to commit data into disk
print ================== restart server to commit data into disk
system sh/exec.sh -n dnode1 -s stop -x SIGINT
system sh/exec.sh -n dnode1 -s stop -x SIGINT
...
@@ -64,4 +64,4 @@ sleep 2000
...
@@ -64,4 +64,4 @@ sleep 2000
system sh/exec.sh -n dnode1 -s start
system sh/exec.sh -n dnode1 -s start
print ================== server restart completed
print ================== server restart completed
run
lite
/parser/interp_test.sim
run
general
/parser/interp_test.sim
tests/script/general/parser/join.sim
浏览文件 @
68bf22a9
...
@@ -24,7 +24,7 @@ $tstart = 100000
...
@@ -24,7 +24,7 @@ $tstart = 100000
sql drop database if exits $db -x step1
sql drop database if exits $db -x step1
step1:
step1:
sql create database if not exists $db
t
ables 4 keep 36500
sql create database if not exists $db
maxT
ables 4 keep 36500
sql use $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, t2 binary(12))
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))
...
...
tests/script/general/parser/join_multivnode.sim
浏览文件 @
68bf22a9
...
@@ -22,7 +22,7 @@ $tstart = 100000
...
@@ -22,7 +22,7 @@ $tstart = 100000
sql drop database if exits $db -x step1
sql drop database if exits $db -x step1
step1:
step1:
sql create database if not exists $db
t
ables 4 keep 36500
sql create database if not exists $db
maxT
ables 4 keep 36500
sql use $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, t2 binary(12))
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))
...
...
tests/script/general/parser/lastrow.sim
浏览文件 @
68bf22a9
...
@@ -21,7 +21,7 @@ $stb = $stbPrefix . $i
...
@@ -21,7 +21,7 @@ $stb = $stbPrefix . $i
sql drop database $db -x step1
sql drop database $db -x step1
step1:
step1:
sql create database $db
t
ables 4
sql create database $db
maxT
ables 4
sql use $db
sql use $db
sql create table $stb (ts timestamp, c1 int, c2 bigint, c3 float, c4 double, c5 smallint, c6 tinyint, c7 bool, c8 binary(10), c9 nchar(10)) tags(t1 int)
sql create table $stb (ts timestamp, c1 int, c2 bigint, c3 float, c4 double, c5 smallint, c6 tinyint, c7 bool, c8 binary(10), c9 nchar(10)) tags(t1 int)
...
@@ -57,7 +57,7 @@ endw
...
@@ -57,7 +57,7 @@ endw
print ====== test data created
print ====== test data created
run
lite
/parser/lastrow_query.sim
run
general
/parser/lastrow_query.sim
print ================== restart server to commit data into disk
print ================== restart server to commit data into disk
system sh/exec.sh -n dnode1 -s stop -x SIGINT
system sh/exec.sh -n dnode1 -s stop -x SIGINT
...
@@ -67,4 +67,4 @@ print ================== server restart completed
...
@@ -67,4 +67,4 @@ print ================== server restart completed
sql connect
sql connect
sleep 3000
sleep 3000
run
lite
/parser/lastrow_query.sim
run
general
/parser/lastrow_query.sim
tests/script/general/parser/limit.sim
浏览文件 @
68bf22a9
...
@@ -56,8 +56,8 @@ while $i < $halfNum
...
@@ -56,8 +56,8 @@ while $i < $halfNum
endw
endw
print ====== tables created
print ====== tables created
run
lite
/parser/limit_tb.sim
run
general
/parser/limit_tb.sim
run
lite
/parser/limit_stb.sim
run
general
/parser/limit_stb.sim
print ================== restart server to commit data into disk
print ================== restart server to commit data into disk
system sh/exec.sh -n dnode1 -s stop -x SIGINT
system sh/exec.sh -n dnode1 -s stop -x SIGINT
...
@@ -67,5 +67,5 @@ print ================== server restart completed
...
@@ -67,5 +67,5 @@ print ================== server restart completed
sql connect
sql connect
sleep 3000
sleep 3000
run
lite
/parser/limit_tb.sim
run
general
/parser/limit_tb.sim
run
lite
/parser/limit_stb.sim
run
general
/parser/limit_stb.sim
tests/script/general/parser/limit1.sim
浏览文件 @
68bf22a9
...
@@ -56,8 +56,8 @@ while $i < $halfNum
...
@@ -56,8 +56,8 @@ while $i < $halfNum
endw
endw
print ====== tables created
print ====== tables created
run
lite
/parser/limit1_tb.sim
run
general
/parser/limit1_tb.sim
run
lite
/parser/limit1_stb.sim
run
general
/parser/limit1_stb.sim
print ================== restart server to commit data into disk
print ================== restart server to commit data into disk
system sh/exec.sh -n dnode1 -s stop -x SIGINT
system sh/exec.sh -n dnode1 -s stop -x SIGINT
...
@@ -65,5 +65,5 @@ sleep 2000
...
@@ -65,5 +65,5 @@ sleep 2000
system sh/exec.sh -n dnode1 -s start
system sh/exec.sh -n dnode1 -s start
print ================== server restart completed
print ================== server restart completed
run
lite
/parser/limit1_tb.sim
run
general
/parser/limit1_tb.sim
run
lite
/parser/limit1_stb.sim
run
general
/parser/limit1_stb.sim
tests/script/general/parser/limit1_tblocks100.sim
浏览文件 @
68bf22a9
...
@@ -56,8 +56,8 @@ while $i < $halfNum
...
@@ -56,8 +56,8 @@ while $i < $halfNum
endw
endw
print ====== tables created
print ====== tables created
run
lite
/parser/limit1_tb.sim
run
general
/parser/limit1_tb.sim
run
lite
/parser/limit1_stb.sim
run
general
/parser/limit1_stb.sim
print ================== restart server to commit data into disk
print ================== restart server to commit data into disk
system sh/exec.sh -n dnode1 -s stop -x SIGINT
system sh/exec.sh -n dnode1 -s stop -x SIGINT
...
@@ -65,5 +65,5 @@ sleep 2000
...
@@ -65,5 +65,5 @@ sleep 2000
system sh/exec.sh -n dnode1 -s start
system sh/exec.sh -n dnode1 -s start
print ================== server restart completed
print ================== server restart completed
run
lite
/parser/limit1_tb.sim
run
general
/parser/limit1_tb.sim
run
lite
/parser/limit1_stb.sim
run
general
/parser/limit1_stb.sim
tests/script/general/parser/limit2.sim
浏览文件 @
68bf22a9
...
@@ -65,7 +65,7 @@ while $i < $halfNum
...
@@ -65,7 +65,7 @@ while $i < $halfNum
endw
endw
print ====== tables created
print ====== tables created
#run
lite
/parser/limit2_query.sim
#run
general
/parser/limit2_query.sim
print ================== restart server to commit data into disk
print ================== restart server to commit data into disk
system sh/exec.sh -n dnode1 -s stop -x SIGINT
system sh/exec.sh -n dnode1 -s stop -x SIGINT
...
@@ -73,4 +73,4 @@ sleep 3000
...
@@ -73,4 +73,4 @@ sleep 3000
system sh/exec.sh -n dnode1 -s start
system sh/exec.sh -n dnode1 -s start
print ================== server restart completed
print ================== server restart completed
run
lite
/parser/limit2_query.sim
run
general
/parser/limit2_query.sim
tests/script/general/parser/limit2_tblocks100.sim
浏览文件 @
68bf22a9
...
@@ -65,7 +65,7 @@ while $i < $halfNum
...
@@ -65,7 +65,7 @@ while $i < $halfNum
endw
endw
print ====== tables created
print ====== tables created
#run
lite
/parser/limit2_query.sim
#run
general
/parser/limit2_query.sim
print ================== restart server to commit data into disk
print ================== restart server to commit data into disk
system sh/exec.sh -n dnode1 -s stop -x SIGINT
system sh/exec.sh -n dnode1 -s stop -x SIGINT
...
@@ -73,4 +73,4 @@ sleep 3000
...
@@ -73,4 +73,4 @@ sleep 3000
system sh/exec.sh -n dnode1 -s start
system sh/exec.sh -n dnode1 -s start
print ================== server restart completed
print ================== server restart completed
run
lite
/parser/limit2_query.sim
run
general
/parser/limit2_query.sim
tests/script/general/parser/mixed_blocks.sim
浏览文件 @
68bf22a9
...
@@ -22,7 +22,7 @@ sql drop database if exists $db
...
@@ -22,7 +22,7 @@ sql drop database if exists $db
$paramRows = 200
$paramRows = 200
$rowNum = $paramRows * 4
$rowNum = $paramRows * 4
$rowNum = $rowNum / 5
$rowNum = $rowNum / 5
sql create database $db rows $paramRows
t
ables 4
sql create database $db rows $paramRows
maxT
ables 4
print ====== create tables
print ====== create tables
sql use $db
sql use $db
sql create table $stb (ts timestamp, c1 int, c2 bigint, c3 float, c4 double, c5 bool, c6 binary(10), c7 nchar(10)) tags(t1 int)
sql create table $stb (ts timestamp, c1 int, c2 bigint, c3 float, c4 double, c5 bool, c6 binary(10), c7 nchar(10)) tags(t1 int)
...
...
tests/script/general/parser/projection_limit_offset.sim
浏览文件 @
68bf22a9
...
@@ -22,7 +22,7 @@ $tstart = 100000
...
@@ -22,7 +22,7 @@ $tstart = 100000
sql drop database if exits $db -x step1
sql drop database if exits $db -x step1
step1:
step1:
sql create database if not exists $db
t
ables 4 keep 36500
sql create database if not exists $db
maxT
ables 4 keep 36500
sql use $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, t2 binary(12))
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))
...
...
tests/script/general/parser/repeatAlter.sim
浏览文件 @
68bf22a9
...
@@ -2,6 +2,6 @@ $i = 1
...
@@ -2,6 +2,6 @@ $i = 1
$loops = 10
$loops = 10
while $i <= $loops
while $i <= $loops
print ====== repeat: $i
print ====== repeat: $i
run
lite
/parser/alter.sim
run
general
/parser/alter.sim
$i = $i + 1
$i = $i + 1
endw
endw
tests/script/general/parser/repeatStream.sim
浏览文件 @
68bf22a9
...
@@ -2,6 +2,6 @@ $i = 1
...
@@ -2,6 +2,6 @@ $i = 1
$repeats = 5
$repeats = 5
while $i <= $repeats
while $i <= $repeats
print ====== repeat: $i
print ====== repeat: $i
run
lite
/parser/stream.sim
run
general
/parser/stream.sim
$i = $i + 1
$i = $i + 1
endw
endw
tests/script/general/parser/select_across_vnodes.sim
浏览文件 @
68bf22a9
...
@@ -2,7 +2,7 @@ system sh/stop_dnodes.sh
...
@@ -2,7 +2,7 @@ system sh/stop_dnodes.sh
system sh/deploy.sh -n dnode1 -i 1
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 walLevel -v 0
system sh/cfg.sh -n dnode1 -c
session
sPerVnode -v 5
system sh/cfg.sh -n dnode1 -c
maxtable
sPerVnode -v 5
system sh/cfg.sh -n dnode1 -c numOfTotalVnodes -v 8
system sh/cfg.sh -n dnode1 -c numOfTotalVnodes -v 8
system sh/exec.sh -n dnode1 -s start
system sh/exec.sh -n dnode1 -s start
sleep 3000
sleep 3000
...
...
tests/script/general/parser/select_from_cache_disk.sim
浏览文件 @
68bf22a9
...
@@ -2,7 +2,7 @@ system sh/stop_dnodes.sh
...
@@ -2,7 +2,7 @@ system sh/stop_dnodes.sh
system sh/deploy.sh -n dnode1 -i 1
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 walLevel -v 0
system sh/cfg.sh -n dnode1 -c
session
sPerVnode -v 2
system sh/cfg.sh -n dnode1 -c
maxtable
sPerVnode -v 2
system sh/cfg.sh -n dnode1 -c numOfTotalVnodes -v 8
system sh/cfg.sh -n dnode1 -c numOfTotalVnodes -v 8
system sh/exec.sh -n dnode1 -s start
system sh/exec.sh -n dnode1 -s start
sleep 3000
sleep 3000
...
...
tests/script/general/parser/select_with_tags.sim
浏览文件 @
68bf22a9
...
@@ -23,7 +23,7 @@ $tstart = 100000
...
@@ -23,7 +23,7 @@ $tstart = 100000
sql drop database if exists $db -x step1
sql drop database if exists $db -x step1
step1:
step1:
sql create database if not exists $db
t
ables 4 keep 36500
sql create database if not exists $db
maxT
ables 4 keep 36500
sql use $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, t2 binary(12))
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))
...
...
tests/script/general/parser/single_row_in_tb.sim
浏览文件 @
68bf22a9
...
@@ -15,7 +15,7 @@ $db = $dbPrefix
...
@@ -15,7 +15,7 @@ $db = $dbPrefix
$stb = $stbPrefix
$stb = $stbPrefix
sql drop database if exists $db
sql drop database if exists $db
sql create database $db rows 200
t
ables 4
sql create database $db rows 200
maxT
ables 4
print ====== create tables
print ====== create tables
sql use $db
sql use $db
sql create table $stb (ts timestamp, c1 int, c2 bigint, c3 float, c4 double, c5 bool, c6 binary(10), c7 nchar(10)) tags(t1 int)
sql create table $stb (ts timestamp, c1 int, c2 bigint, c3 float, c4 double, c5 bool, c6 binary(10), c7 nchar(10)) tags(t1 int)
...
@@ -27,7 +27,7 @@ sql create table $tb1 using $stb tags( 1 )
...
@@ -27,7 +27,7 @@ sql create table $tb1 using $stb tags( 1 )
sql insert into $tb1 values ( $ts0 , 1, 2, 3, 4, true, 'binay10', '涛思nchar10' )
sql insert into $tb1 values ( $ts0 , 1, 2, 3, 4, true, 'binay10', '涛思nchar10' )
print ====== tables created
print ====== tables created
run
lite
/parser/single_row_in_tb_query.sim
run
general
/parser/single_row_in_tb_query.sim
print ================== restart server to commit data into disk
print ================== restart server to commit data into disk
system sh/exec.sh -n dnode1 -s stop -x SIGINT
system sh/exec.sh -n dnode1 -s stop -x SIGINT
...
@@ -35,4 +35,4 @@ sleep 2000
...
@@ -35,4 +35,4 @@ sleep 2000
system sh/exec.sh -n dnode1 -s start
system sh/exec.sh -n dnode1 -s start
print ================== server restart completed
print ================== server restart completed
run
lite
/parser/single_row_in_tb_query.sim
run
general
/parser/single_row_in_tb_query.sim
tests/script/general/parser/slimit.sim
浏览文件 @
68bf22a9
...
@@ -2,7 +2,7 @@ system sh/stop_dnodes.sh
...
@@ -2,7 +2,7 @@ system sh/stop_dnodes.sh
system sh/deploy.sh -n dnode1 -i 1
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 walLevel -v 0
system sh/cfg.sh -n dnode1 -c
session
sPerVnode -v 4
system sh/cfg.sh -n dnode1 -c
maxtable
sPerVnode -v 4
system sh/cfg.sh -n dnode1 -c numOfTotalVnodes -v 8
system sh/cfg.sh -n dnode1 -c numOfTotalVnodes -v 8
system sh/exec.sh -n dnode1 -s start
system sh/exec.sh -n dnode1 -s start
sleep 3000
sleep 3000
...
@@ -22,7 +22,7 @@ $db = $dbPrefix . $i
...
@@ -22,7 +22,7 @@ $db = $dbPrefix . $i
$stb = $stbPrefix . $i
$stb = $stbPrefix . $i
sql drop database if exists $db
sql drop database if exists $db
sql create database $db rows 200 cache 1024 tblocks 200
t
ables 4
sql create database $db rows 200 cache 1024 tblocks 200
maxT
ables 4
print ====== create tables
print ====== create tables
sql use $db
sql use $db
sql create table $stb (ts timestamp, c1 int, c2 bigint, c3 float, c4 double, c5 smallint, c6 tinyint, c7 bool, c8 binary(10), c9 nchar(10)) tags(t1 binary(15), t2 int, t3 bigint, t4 nchar(10), t5 double, t6 bool)
sql create table $stb (ts timestamp, c1 int, c2 bigint, c3 float, c4 double, c5 smallint, c6 tinyint, c7 bool, c8 binary(10), c9 nchar(10)) tags(t1 binary(15), t2 int, t3 bigint, t4 nchar(10), t5 double, t6 bool)
...
@@ -94,7 +94,7 @@ while $i < $tbNum
...
@@ -94,7 +94,7 @@ while $i < $tbNum
endw
endw
print ====== $db tables created
print ====== $db tables created
run
lite
/parser/slimit_query.sim
run
general
/parser/slimit_query.sim
print ================== restart server to commit data into disk
print ================== restart server to commit data into disk
system sh/exec.sh -n dnode1 -s stop -x SIGINT
system sh/exec.sh -n dnode1 -s stop -x SIGINT
...
@@ -104,4 +104,4 @@ print ================== server restart completed
...
@@ -104,4 +104,4 @@ print ================== server restart completed
sql connect
sql connect
sleep 3000
sleep 3000
run
lite
/parser/slimit_query.sim
run
general
/parser/slimit_query.sim
tests/script/general/parser/slimit1.sim
浏览文件 @
68bf22a9
...
@@ -2,7 +2,7 @@ system sh/stop_dnodes.sh
...
@@ -2,7 +2,7 @@ system sh/stop_dnodes.sh
system sh/deploy.sh -n dnode1 -i 1
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 walLevel -v 0
system sh/cfg.sh -n dnode1 -c
session
sPerVnode -v 2
system sh/cfg.sh -n dnode1 -c
maxtable
sPerVnode -v 2
system sh/cfg.sh -n dnode1 -c numOfTotalVnodes -v 10
system sh/cfg.sh -n dnode1 -c numOfTotalVnodes -v 10
system sh/exec.sh -n dnode1 -s start
system sh/exec.sh -n dnode1 -s start
sleep 3000
sleep 3000
...
@@ -53,7 +53,7 @@ endw
...
@@ -53,7 +53,7 @@ endw
print ================== tables and data created
print ================== tables and data created
run
lite
/parser/slimit1_query.sim
run
general
/parser/slimit1_query.sim
print ================== restart server to commit data into disk
print ================== restart server to commit data into disk
system sh/exec.sh -n dnode1 -s stop -x SIGINT
system sh/exec.sh -n dnode1 -s stop -x SIGINT
...
@@ -63,4 +63,4 @@ print ================== server restart completed
...
@@ -63,4 +63,4 @@ print ================== server restart completed
sql connect
sql connect
sleep 3000
sleep 3000
run
lite
/parser/slimit1_query.sim
run
general
/parser/slimit1_query.sim
tests/script/general/parser/slimit_alter_tags.sim
浏览文件 @
68bf22a9
...
@@ -2,7 +2,7 @@ system sh/stop_dnodes.sh
...
@@ -2,7 +2,7 @@ system sh/stop_dnodes.sh
system sh/deploy.sh -n dnode1 -i 1
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 walLevel -v 0
system sh/cfg.sh -n dnode1 -c
session
sPerVnode -v 2
system sh/cfg.sh -n dnode1 -c
maxtable
sPerVnode -v 2
system sh/cfg.sh -n dnode1 -c numOfTotalVnodes -v 10
system sh/cfg.sh -n dnode1 -c numOfTotalVnodes -v 10
system sh/exec.sh -n dnode1 -s start
system sh/exec.sh -n dnode1 -s start
sleep 3000
sleep 3000
...
...
tests/script/general/parser/tbnameIn.sim
浏览文件 @
68bf22a9
...
@@ -64,7 +64,7 @@ while $i < $halfNum
...
@@ -64,7 +64,7 @@ while $i < $halfNum
endw
endw
print ====== tables created
print ====== tables created
run
lite
/parser/tbnameIn_query.sim
run
general
/parser/tbnameIn_query.sim
print ================== restart server to commit data into disk
print ================== restart server to commit data into disk
system sh/exec.sh -n dnode1 -s stop -x SIGINT
system sh/exec.sh -n dnode1 -s stop -x SIGINT
...
@@ -72,4 +72,4 @@ sleep 2000
...
@@ -72,4 +72,4 @@ sleep 2000
system sh/exec.sh -n dnode1 -s start
system sh/exec.sh -n dnode1 -s start
print ================== server restart completed
print ================== server restart completed
run
lite
/parser/tbnameIn_query.sim
run
general
/parser/tbnameIn_query.sim
tests/script/general/parser/timestamp.sim
浏览文件 @
68bf22a9
...
@@ -21,7 +21,7 @@ $db = $dbPrefix . $i
...
@@ -21,7 +21,7 @@ $db = $dbPrefix . $i
$stb = $stbPrefix . $i
$stb = $stbPrefix . $i
sql drop database if exists $db
sql drop database if exists $db
sql create database $db rows 200 cache 1024 tblocks 200
t
ables 4
sql create database $db rows 200 cache 1024 tblocks 200
maxT
ables 4
print ====== create tables
print ====== create tables
sql use $db
sql use $db
sql create table $stb (ts timestamp, c1 timestamp, c2 int) tags(t1 binary(20))
sql create table $stb (ts timestamp, c1 timestamp, c2 int) tags(t1 binary(20))
...
@@ -54,7 +54,7 @@ while $i < $tbNum
...
@@ -54,7 +54,7 @@ while $i < $tbNum
endw
endw
print ====== $db tables created
print ====== $db tables created
run
lite
/parser/timestamp_query.sim
run
general
/parser/timestamp_query.sim
print ================== restart server to commit data into disk
print ================== restart server to commit data into disk
system sh/exec.sh -n dnode1 -s stop -x SIGINT
system sh/exec.sh -n dnode1 -s stop -x SIGINT
...
@@ -64,4 +64,4 @@ print ================== server restart completed
...
@@ -64,4 +64,4 @@ print ================== server restart completed
sql connect
sql connect
sleep 3000
sleep 3000
run
lite
/parser/timestamp_query.sim
run
general
/parser/timestamp_query.sim
tests/script/general/parser/where.sim
浏览文件 @
68bf22a9
...
@@ -21,7 +21,7 @@ $mt = $mtPrefix . $i
...
@@ -21,7 +21,7 @@ $mt = $mtPrefix . $i
sql drop database if exits $db -x step1
sql drop database if exits $db -x step1
step1:
step1:
sql create database if not exists $db
t
ables 4
sql create database if not exists $db
maxT
ables 4
sql use $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)
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)
...
...
tests/script/general/stream/metrics_del.sim
浏览文件 @
68bf22a9
...
@@ -2,9 +2,6 @@ system sh/stop_dnodes.sh
...
@@ -2,9 +2,6 @@ system sh/stop_dnodes.sh
system sh/deploy.sh -n dnode1 -i 1
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 walLevel -v 0
system sh/cfg.sh -n dnode1 -c numOfBlocksPerMeter -v 4
system sh/cfg.sh -n dnode1 -c pointsPerCompBlock -v 100
system sh/cfg.sh -n dnode1 -c cacheBlockSize -v 1024
system sh/exec.sh -n dnode1 -s start
system sh/exec.sh -n dnode1 -s start
sleep 3000
sleep 3000
...
...
tests/script/general/stream/metrics_replica1_vnoden.sim
浏览文件 @
68bf22a9
...
@@ -4,7 +4,7 @@ system sh/stop_dnodes.sh
...
@@ -4,7 +4,7 @@ system sh/stop_dnodes.sh
system sh/deploy.sh -n dnode1 -i 1
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 walLevel -v 0
system sh/cfg.sh -n dnode1 -c numOfTotalVnodes -v 8
system sh/cfg.sh -n dnode1 -c numOfTotalVnodes -v 8
system sh/cfg.sh -n dnode1 -c
session
sPerVnode -v 4
system sh/cfg.sh -n dnode1 -c
maxtable
sPerVnode -v 4
system sh/exec.sh -n dnode1 -s start
system sh/exec.sh -n dnode1 -s start
sleep 3000
sleep 3000
...
...
tests/script/general/stream/stream_3.sim
浏览文件 @
68bf22a9
...
@@ -109,9 +109,6 @@ print =============== step7
...
@@ -109,9 +109,6 @@ print =============== step7
system sh/exec.sh -n dnode1 -s stop
system sh/exec.sh -n dnode1 -s stop
system sh/deploy.sh -n dnode1 -i 1
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 walLevel -v 0
system sh/cfg.sh -n dnode1 -c numOfBlocksPerMeter -v 4
system sh/cfg.sh -n dnode1 -c pointsPerCompBlock -v 100
system sh/cfg.sh -n dnode1 -c cacheBlockSize -v 1024
system sh/exec.sh -n dnode1 -s start
system sh/exec.sh -n dnode1 -s start
sleep 4000
sleep 4000
...
...
tests/script/general/stream/table_del.sim
浏览文件 @
68bf22a9
...
@@ -2,9 +2,6 @@ system sh/stop_dnodes.sh
...
@@ -2,9 +2,6 @@ system sh/stop_dnodes.sh
system sh/deploy.sh -n dnode1 -i 1
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 walLevel -v 0
system sh/cfg.sh -n dnode1 -c numOfBlocksPerMeter -v 4
system sh/cfg.sh -n dnode1 -c pointsPerCompBlock -v 100
system sh/cfg.sh -n dnode1 -c cacheBlockSize -v 1024
system sh/exec.sh -n dnode1 -s start
system sh/exec.sh -n dnode1 -s start
sleep 3000
sleep 3000
...
...
tests/script/general/stream/table_replica1_vnoden.sim
浏览文件 @
68bf22a9
...
@@ -4,7 +4,7 @@ system sh/stop_dnodes.sh
...
@@ -4,7 +4,7 @@ system sh/stop_dnodes.sh
system sh/deploy.sh -n dnode1 -i 1
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 walLevel -v 0
system sh/cfg.sh -n dnode1 -c numOfTotalVnodes -v 8
system sh/cfg.sh -n dnode1 -c numOfTotalVnodes -v 8
system sh/cfg.sh -n dnode1 -c
session
sPerVnode -v 4
system sh/cfg.sh -n dnode1 -c
maxtable
sPerVnode -v 4
system sh/exec.sh -n dnode1 -s start
system sh/exec.sh -n dnode1 -s start
sleep 3000
sleep 3000
...
...
tests/script/general/table/delete_writing.sim
浏览文件 @
68bf22a9
...
@@ -40,7 +40,7 @@ sql create table db.tb (ts timestamp, i int)
...
@@ -40,7 +40,7 @@ sql create table db.tb (ts timestamp, i int)
sql insert into db.tb values(now, 1)
sql insert into db.tb values(now, 1)
print ======== start back
print ======== start back
run_back
lite
/table/back_insert.sim
run_back
general
/table/back_insert.sim
sleep 1000
sleep 1000
print ======== step1
print ======== step1
...
...
tests/script/general/table/limit.sim
浏览文件 @
68bf22a9
...
@@ -4,7 +4,7 @@ system sh/stop_dnodes.sh
...
@@ -4,7 +4,7 @@ system sh/stop_dnodes.sh
system sh/deploy.sh -n dnode1 -i 1
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 walLevel -v 0
system sh/cfg.sh -n dnode1 -c numOfTotalVnodes -v 8
system sh/cfg.sh -n dnode1 -c numOfTotalVnodes -v 8
system sh/cfg.sh -n dnode1 -c
session
sPerVnode -v 129
system sh/cfg.sh -n dnode1 -c
maxtable
sPerVnode -v 129
system sh/exec.sh -n dnode1 -s start
system sh/exec.sh -n dnode1 -s start
sleep 3000
sleep 3000
...
@@ -19,7 +19,7 @@ $db = $dbPrefix . $i
...
@@ -19,7 +19,7 @@ $db = $dbPrefix . $i
$tb = $tbPrefix . $i
$tb = $tbPrefix . $i
print =================== step 0
print =================== step 0
sql create database $db tables 129
sql create database $db
max
tables 129
sql use $db
sql use $db
sql show vgroups
sql show vgroups
if $rows != 0 then
if $rows != 0 then
...
...
tests/script/general/table/vgroup.sim
浏览文件 @
68bf22a9
...
@@ -17,7 +17,7 @@ $db = $dbPrefix . $i
...
@@ -17,7 +17,7 @@ $db = $dbPrefix . $i
$tb = $tbPrefix . $i
$tb = $tbPrefix . $i
print =================== step 1
print =================== step 1
sql create database $db
t
ables 4
sql create database $db
maxT
ables 4
sql use $db
sql use $db
sql show vgroups
sql show vgroups
if $rows != 0 then
if $rows != 0 then
...
...
tests/script/general/user/monitor.sim
浏览文件 @
68bf22a9
...
@@ -4,7 +4,7 @@ system sh/stop_dnodes.sh
...
@@ -4,7 +4,7 @@ system sh/stop_dnodes.sh
system sh/deploy.sh -n dnode1 -i 1
system sh/deploy.sh -n dnode1 -i 1
print ========== step1
print ========== step1
system sh/cfg.sh -n dnode1 -c
clog
-v 0
system sh/cfg.sh -n dnode1 -c
walLevel
-v 0
system sh/cfg.sh -n dnode1 -c monitor -v 1
system sh/cfg.sh -n dnode1 -c monitor -v 1
system sh/cfg.sh -n dnode1 -c monitorInterval -v 1
system sh/cfg.sh -n dnode1 -c monitorInterval -v 1
system sh/exec.sh -n dnode1 -s start
system sh/exec.sh -n dnode1 -s start
...
...
tests/script/general/user/pass_alter.sim
浏览文件 @
68bf22a9
...
@@ -2,7 +2,7 @@ system sh/stop_dnodes.sh
...
@@ -2,7 +2,7 @@ system sh/stop_dnodes.sh
system sh/deploy.sh -n dnode1 -i 1
system sh/deploy.sh -n dnode1 -i 1
system sh/cfg.sh -n dnode1 -c
clog
-v 0
system sh/cfg.sh -n dnode1 -c
wallevel
-v 0
system sh/exec.sh -n dnode1 -s start
system sh/exec.sh -n dnode1 -s start
sleep 3000
sleep 3000
sql connect
sql connect
...
...
tests/script/general/user/pass_len.sim
浏览文件 @
68bf22a9
...
@@ -2,7 +2,7 @@ system sh/stop_dnodes.sh
...
@@ -2,7 +2,7 @@ system sh/stop_dnodes.sh
system sh/deploy.sh -n dnode1 -i 1
system sh/deploy.sh -n dnode1 -i 1
system sh/cfg.sh -n dnode1 -c
clog
-v 0
system sh/cfg.sh -n dnode1 -c
wallevel
-v 0
system sh/exec.sh -n dnode1 -s start
system sh/exec.sh -n dnode1 -s start
sleep 3000
sleep 3000
...
...
tests/script/general/user/user_create.sim
浏览文件 @
68bf22a9
...
@@ -2,7 +2,7 @@ system sh/stop_dnodes.sh
...
@@ -2,7 +2,7 @@ system sh/stop_dnodes.sh
system sh/deploy.sh -n dnode1 -i 1
system sh/deploy.sh -n dnode1 -i 1
system sh/cfg.sh -n dnode1 -c
clog
-v 0
system sh/cfg.sh -n dnode1 -c
wallevel
-v 0
system sh/exec.sh -n dnode1 -s start
system sh/exec.sh -n dnode1 -s start
sql connect
sql connect
...
...
tests/script/general/user/user_len.sim
浏览文件 @
68bf22a9
...
@@ -2,7 +2,7 @@ system sh/stop_dnodes.sh
...
@@ -2,7 +2,7 @@ system sh/stop_dnodes.sh
system sh/deploy.sh -n dnode1 -i 1
system sh/deploy.sh -n dnode1 -i 1
system sh/cfg.sh -n dnode1 -c
clog
-v 0
system sh/cfg.sh -n dnode1 -c
wallevel
-v 0
system sh/exec.sh -n dnode1 -s start
system sh/exec.sh -n dnode1 -s start
sleep 3000
sleep 3000
...
...
tests/script/jenkins/basic.txt
浏览文件 @
68bf22a9
...
@@ -6,6 +6,49 @@ cd ../../../debug; cmake ..
...
@@ -6,6 +6,49 @@ cd ../../../debug; cmake ..
#cd ../../../debug; make clean
#cd ../../../debug; make clean
cd ../../../debug; make
cd ../../../debug; make
#general
./test.sh -f general//db/basic.sim
./test.sh -f general/db/basic1.sim
./test.sh -f general/db/basic2.sim
./test.sh -f general/db/basic3.sim
./test.sh -f general/db/basic4.sim
./test.sh -f general/db/basic5.sim
./test.sh -f general/db/delete_reuse1.sim
./test.sh -f general/db/delete_reuse2.sim
./test.sh -f general/db/delete_reusevnode.sim
#./test.sh -f general/db/delete_reusevnode2.sim
./test.sh -f general/db/delete_writing1.sim
./test.sh -f general/db/delete_writing2.sim
./test.sh -f general/db/len.sim
./test.sh -f general/db/repeat.sim
./test.sh -f general/db/tables.sim
./test.sh -f general/table/autocreate.sim
./test.sh -f general/table/basic1.sim
./test.sh -f general/table/basic2.sim
./test.sh -f general/table/basic3.sim
./test.sh -f general/table/bigint.sim
./test.sh -f general/table/bool.sim
./test.sh -f general/table/column_name.sim
./test.sh -f general/table/column_num.sim
./test.sh -f general/table/db.table.sim
./test.sh -f general/table/double.sim
./test.sh -f general/table/float.sim
./test.sh -f general/table/int.sim
./test.sh -f general/table/smallint.sim
./test.sh -f general/table/tinyint.sim
./test.sh -f general/user/basic1.sim
./test.sh -f general/user/pass_alter.sim
./test.sh -f general/user/pass_len.sim
./test.sh -f general/user/user_create.sim
./test.sh -f general/user/user_len.sim
# unique
./test.sh -u -f unique/account/account_create.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_delete.sim
./test.sh -u -f unique/account/account_len.sim
./test.sh -u -f unique/account/account_len.sim
...
...
tests/script/unique/account/account_create.sim
浏览文件 @
68bf22a9
system sh/stop_dnodes.sh
system sh/stop_dnodes.sh
system sh/deploy.sh -n dnode1 -i 1
system sh/deploy.sh -n dnode1 -i 1
system sh/cfg.sh -n dnode1 -c
clog
-v 0
system sh/cfg.sh -n dnode1 -c
wallevel
-v 0
system sh/exec_up.sh -n dnode1 -s start
system sh/exec_up.sh -n dnode1 -s start
sql connect
sql connect
...
@@ -76,4 +76,4 @@ if $rows != 1 then
...
@@ -76,4 +76,4 @@ if $rows != 1 then
return -1
return -1
endi
endi
system sh/exec_up.sh -n dnode1 -s stop -x SIGINT
\ No newline at end of file
tests/script/unique/account/account_delete.sim
浏览文件 @
68bf22a9
system sh/stop_dnodes.sh
system sh/stop_dnodes.sh
system sh/deploy.sh -n dnode1 -i 1
system sh/deploy.sh -n dnode1 -i 1
system sh/cfg.sh -n dnode1 -c
clog
-v 0
system sh/cfg.sh -n dnode1 -c
wallevel
-v 0
system sh/exec_up.sh -n dnode1 -s start
system sh/exec_up.sh -n dnode1 -s start
sql connect
sql connect
...
@@ -94,4 +94,6 @@ sql drop account oroot
...
@@ -94,4 +94,6 @@ sql drop account oroot
sql show accounts
sql show accounts
if $rows != 1 then
if $rows != 1 then
return -1
return -1
endi
endi
\ No newline at end of file
system sh/exec_up.sh -n dnode1 -s stop -x SIGINT
\ No newline at end of file
tests/script/unique/account/account_len.sim
浏览文件 @
68bf22a9
system sh/stop_dnodes.sh
system sh/stop_dnodes.sh
system sh/deploy.sh -n dnode1 -i 1
system sh/deploy.sh -n dnode1 -i 1
system sh/cfg.sh -n dnode1 -c
clog
-v 0
system sh/cfg.sh -n dnode1 -c
wallevel
-v 0
system sh/exec_up.sh -n dnode1 -s start
system sh/exec_up.sh -n dnode1 -s start
sql connect
sql connect
...
@@ -88,3 +88,5 @@ sql show users
...
@@ -88,3 +88,5 @@ sql show users
if $rows != 3 then
if $rows != 3 then
return -1
return -1
endi
endi
system sh/exec_up.sh -n dnode1 -s stop -x SIGINT
\ No newline at end of file
tests/script/unique/account/authority.sim
浏览文件 @
68bf22a9
system sh/stop_dnodes.sh
system sh/stop_dnodes.sh
system sh/deploy.sh -n dnode1 -i 1
system sh/deploy.sh -n dnode1 -i 1
system sh/cfg.sh -n dnode1 -c
clog
-v 0
system sh/cfg.sh -n dnode1 -c
wallevel
-v 0
system sh/cfg.sh -n dnode1 -c numOfTotalVnodes -v 8
system sh/cfg.sh -n dnode1 -c numOfTotalVnodes -v 8
system sh/exec_up.sh -n dnode1 -s start
system sh/exec_up.sh -n dnode1 -s start
...
@@ -343,3 +343,5 @@ sql drop database d1
...
@@ -343,3 +343,5 @@ sql drop database d1
sql drop database d2
sql drop database d2
sql drop database d3
sql drop database d3
sql drop database d4
sql drop database d4
system sh/exec_up.sh -n dnode1 -s stop -x SIGINT
\ No newline at end of file
tests/script/unique/account/basic.sim
浏览文件 @
68bf22a9
...
@@ -42,4 +42,4 @@ endi
...
@@ -42,4 +42,4 @@ endi
print $data00 $data01 $data02
print $data00 $data01 $data02
print $data10 $data11 $data22
print $data10 $data11 $data22
system sh/exec_up.sh -n dnode1 -s stop -x SIGINT
\ No newline at end of file
tests/script/unique/account/paras.sim
浏览文件 @
68bf22a9
...
@@ -109,3 +109,5 @@ endi
...
@@ -109,3 +109,5 @@ endi
if $data16 != 0.000/10.000 then
if $data16 != 0.000/10.000 then
return -1
return -1
endi
endi
system sh/exec_up.sh -n dnode1 -s stop -x SIGINT
\ No newline at end of file
tests/script/unique/account/pass_alter.sim
浏览文件 @
68bf22a9
system sh/stop_dnodes.sh
system sh/stop_dnodes.sh
system sh/deploy.sh -n dnode1 -i 1
system sh/deploy.sh -n dnode1 -i 1
system sh/cfg.sh -n dnode1 -c
clog
-v 0
system sh/cfg.sh -n dnode1 -c
wallevel
-v 0
system sh/exec_up.sh -n dnode1 -s start
system sh/exec_up.sh -n dnode1 -s start
sql connect
sql connect
...
@@ -112,3 +112,5 @@ sql alter user oroot pass 'taosdata'
...
@@ -112,3 +112,5 @@ sql alter user oroot pass 'taosdata'
sql drop account oroot
sql drop account oroot
sql drop user read
sql drop user read
sql drop user write
sql drop user write
system sh/exec_up.sh -n dnode1 -s stop -x SIGINT
\ No newline at end of file
tests/script/unique/account/pass_len.sim
浏览文件 @
68bf22a9
system sh/stop_dnodes.sh
system sh/stop_dnodes.sh
system sh/deploy.sh -n dnode1 -i 1
system sh/deploy.sh -n dnode1 -i 1
system sh/cfg.sh -n dnode1 -c
clog
-v 0
system sh/cfg.sh -n dnode1 -c
wallevel
-v 0
system sh/exec_up.sh -n dnode1 -s start
system sh/exec_up.sh -n dnode1 -s start
sql connect
sql connect
...
@@ -78,4 +78,4 @@ if $rows != 3 then
...
@@ -78,4 +78,4 @@ if $rows != 3 then
return -1
return -1
endi
endi
system sh/exec_up.sh -n dnode1 -s stop -x SIGINT
\ No newline at end of file
tests/script/unique/account/usage.sim
浏览文件 @
68bf22a9
...
@@ -54,4 +54,6 @@ if $data05 != 0/10 then
...
@@ -54,4 +54,6 @@ if $data05 != 0/10 then
endi
endi
print =============== check grant
print =============== check grant
sql_error create database d6
sql_error create database d6
\ No newline at end of file
system sh/exec_up.sh -n dnode1 -s stop -x SIGINT
\ No newline at end of file
tests/script/unique/account/user_create.sim
浏览文件 @
68bf22a9
system sh/stop_dnodes.sh
system sh/stop_dnodes.sh
system sh/deploy.sh -n dnode1 -i 1
system sh/deploy.sh -n dnode1 -i 1
system sh/cfg.sh -n dnode1 -c
clog
-v 0
system sh/cfg.sh -n dnode1 -c
wallevel
-v 0
system sh/exec_up.sh -n dnode1 -s start
system sh/exec_up.sh -n dnode1 -s start
sql connect
sql connect
...
@@ -81,7 +81,4 @@ step42:
...
@@ -81,7 +81,4 @@ step42:
sql drop user read
sql drop user read
system sh/exec_up.sh -n dnode1 -s stop -x SIGINT
\ No newline at end of file
tests/script/unique/account/user_len.sim
浏览文件 @
68bf22a9
system sh/stop_dnodes.sh
system sh/stop_dnodes.sh
system sh/deploy.sh -n dnode1 -i 1
system sh/deploy.sh -n dnode1 -i 1
system sh/cfg.sh -n dnode1 -c
clog
-v 0
system sh/cfg.sh -n dnode1 -c
wallevel
-v 0
system sh/exec_up.sh -n dnode1 -s start
system sh/exec_up.sh -n dnode1 -s start
sql connect
sql connect
...
@@ -89,3 +89,5 @@ sql show accounts
...
@@ -89,3 +89,5 @@ sql show accounts
if $rows != 1 then
if $rows != 1 then
return -1
return -1
endi
endi
system sh/exec_up.sh -n dnode1 -s stop -x SIGINT
\ No newline at end of file
tests/script/unique/big/balance.sim
浏览文件 @
68bf22a9
此差异已折叠。
点击以展开。
tests/script/unique/big/maxvnodes.sim
浏览文件 @
68bf22a9
此差异已折叠。
点击以展开。
tests/script/unique/big/tcp.sim
浏览文件 @
68bf22a9
此差异已折叠。
点击以展开。
tests/script/unique/cluster/balance1.sim
浏览文件 @
68bf22a9
此差异已折叠。
点击以展开。
tests/script/unique/cluster/balance2.sim
浏览文件 @
68bf22a9
此差异已折叠。
点击以展开。
tests/script/unique/cluster/balance3.sim
浏览文件 @
68bf22a9
此差异已折叠。
点击以展开。
tests/script/unique/column/replica3.sim
浏览文件 @
68bf22a9
此差异已折叠。
点击以展开。
tests/script/unique/db/delete.sim
浏览文件 @
68bf22a9
此差异已折叠。
点击以展开。
tests/script/unique/db/delete_part.sim
浏览文件 @
68bf22a9
此差异已折叠。
点击以展开。
tests/script/unique/db/replica_add12.sim
浏览文件 @
68bf22a9
此差异已折叠。
点击以展开。
tests/script/unique/db/replica_add13.sim
浏览文件 @
68bf22a9
此差异已折叠。
点击以展开。
tests/script/unique/db/replica_add23.sim
浏览文件 @
68bf22a9
此差异已折叠。
点击以展开。
tests/script/unique/db/replica_part.sim
浏览文件 @
68bf22a9
此差异已折叠。
点击以展开。
tests/script/unique/db/replica_reduce21.sim
浏览文件 @
68bf22a9
此差异已折叠。
点击以展开。
tests/script/unique/db/replica_reduce31.sim
浏览文件 @
68bf22a9
此差异已折叠。
点击以展开。
tests/script/unique/db/replica_reduce32.sim
浏览文件 @
68bf22a9
此差异已折叠。
点击以展开。
tests/script/unique/dnode/balance1.sim
浏览文件 @
68bf22a9
此差异已折叠。
点击以展开。
tests/script/unique/dnode/balance2.sim
浏览文件 @
68bf22a9
此差异已折叠。
点击以展开。
tests/script/unique/dnode/balance3.sim
浏览文件 @
68bf22a9
此差异已折叠。
点击以展开。
tests/script/unique/dnode/balancex.sim
浏览文件 @
68bf22a9
此差异已折叠。
点击以展开。
tests/script/unique/dnode/monitor_bug.sim
浏览文件 @
68bf22a9
此差异已折叠。
点击以展开。
tests/script/unique/dnode/offline1.sim
浏览文件 @
68bf22a9
此差异已折叠。
点击以展开。
tests/script/unique/dnode/offline2.sim
浏览文件 @
68bf22a9
此差异已折叠。
点击以展开。
tests/script/unique/dnode/remove1.sim
浏览文件 @
68bf22a9
此差异已折叠。
点击以展开。
tests/script/unique/dnode/remove2.sim
浏览文件 @
68bf22a9
此差异已折叠。
点击以展开。
tests/script/unique/dnode/vnode_clean.sim
浏览文件 @
68bf22a9
此差异已折叠。
点击以展开。
tests/script/unique/http/admin.sim
浏览文件 @
68bf22a9
此差异已折叠。
点击以展开。
tests/script/unique/http/opentsdb.sim
浏览文件 @
68bf22a9
此差异已折叠。
点击以展开。
tests/script/unique/import/replica2.sim
浏览文件 @
68bf22a9
此差异已折叠。
点击以展开。
tests/script/unique/import/replica3.sim
浏览文件 @
68bf22a9
此差异已折叠。
点击以展开。
tests/script/unique/metrics/balance_replica1.sim
浏览文件 @
68bf22a9
此差异已折叠。
点击以展开。
tests/script/unique/metrics/dnode2.sim
浏览文件 @
68bf22a9
此差异已折叠。
点击以展开。
tests/script/unique/metrics/dnode2_stop.sim
浏览文件 @
68bf22a9
此差异已折叠。
点击以展开。
tests/script/unique/metrics/dnode3.sim
浏览文件 @
68bf22a9
此差异已折叠。
点击以展开。
tests/script/unique/metrics/replica2_dnode4.sim
浏览文件 @
68bf22a9
此差异已折叠。
点击以展开。
tests/script/unique/metrics/replica2_vnode3.sim
浏览文件 @
68bf22a9
此差异已折叠。
点击以展开。
tests/script/unique/metrics/replica3_dnode6.sim
浏览文件 @
68bf22a9
此差异已折叠。
点击以展开。
tests/script/unique/metrics/replica3_vnode3.sim
浏览文件 @
68bf22a9
此差异已折叠。
点击以展开。
tests/script/unique/mnode/mgmt22.sim
浏览文件 @
68bf22a9
此差异已折叠。
点击以展开。
tests/script/unique/mnode/mgmt23.sim
浏览文件 @
68bf22a9
此差异已折叠。
点击以展开。
tests/script/unique/mnode/mgmt24.sim
浏览文件 @
68bf22a9
此差异已折叠。
点击以展开。
tests/script/unique/mnode/mgmt25.sim
浏览文件 @
68bf22a9
此差异已折叠。
点击以展开。
tests/script/unique/mnode/mgmt26.sim
浏览文件 @
68bf22a9
此差异已折叠。
点击以展开。
tests/script/unique/mnode/mgmt33.sim
浏览文件 @
68bf22a9
此差异已折叠。
点击以展开。
tests/script/unique/mnode/mgmt34.sim
浏览文件 @
68bf22a9
此差异已折叠。
点击以展开。
tests/script/unique/stream/metrics_balance.sim
浏览文件 @
68bf22a9
此差异已折叠。
点击以展开。
tests/script/unique/stream/metrics_replica1_dnode2.sim
浏览文件 @
68bf22a9
此差异已折叠。
点击以展开。
tests/script/unique/stream/metrics_replica2_dnode2_vnoden.sim
浏览文件 @
68bf22a9
此差异已折叠。
点击以展开。
tests/script/unique/stream/metrics_replica2_dnode3.sim
浏览文件 @
68bf22a9
此差异已折叠。
点击以展开。
tests/script/unique/stream/metrics_replica3_dnode4.sim
浏览文件 @
68bf22a9
此差异已折叠。
点击以展开。
tests/script/unique/stream/table_balance.sim
浏览文件 @
68bf22a9
此差异已折叠。
点击以展开。
tests/script/unique/stream/table_move.sim
浏览文件 @
68bf22a9
此差异已折叠。
点击以展开。
tests/script/unique/stream/table_replica1_dnode2.sim
浏览文件 @
68bf22a9
此差异已折叠。
点击以展开。
tests/script/unique/stream/table_replica2_dnode2_vnoden.sim
浏览文件 @
68bf22a9
此差异已折叠。
点击以展开。
tests/script/unique/stream/table_replica2_dnode3.sim
浏览文件 @
68bf22a9
此差异已折叠。
点击以展开。
tests/script/unique/stream/table_replica3_dnode4.sim
浏览文件 @
68bf22a9
此差异已折叠。
点击以展开。
tests/script/unique/table/delete_part.sim
浏览文件 @
68bf22a9
此差异已折叠。
点击以展开。
tests/script/unique/vnode/commit.sim
浏览文件 @
68bf22a9
此差异已折叠。
点击以展开。
tests/script/unique/vnode/many.sim
浏览文件 @
68bf22a9
此差异已折叠。
点击以展开。
tests/script/unique/vnode/replica2_basic.sim
浏览文件 @
68bf22a9
此差异已折叠。
点击以展开。
tests/script/unique/vnode/replica2_basic2.sim
浏览文件 @
68bf22a9
此差异已折叠。
点击以展开。
tests/script/unique/vnode/replica2_repeat.sim
浏览文件 @
68bf22a9
此差异已折叠。
点击以展开。
tests/script/unique/vnode/replica3_basic.sim
浏览文件 @
68bf22a9
此差异已折叠。
点击以展开。
tests/script/unique/vnode/replica3_repeat.sim
浏览文件 @
68bf22a9
此差异已折叠。
点击以展开。
tests/script/unique/vnode/replica3_vgroup.sim
浏览文件 @
68bf22a9
此差异已折叠。
点击以展开。
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录