Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
~笨蛋陪你哭
TDengine
提交
87942820
T
TDengine
项目概览
~笨蛋陪你哭
/
TDengine
与 Fork 源项目一致
Fork自
taosdata / TDengine
通知
1
Star
1
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
T
TDengine
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
提交
Issue看板
体验新版 GitCode,发现更多精彩内容 >>
提交
87942820
编写于
1月 21, 2021
作者:
S
Shengliang Guan
浏览文件
操作
浏览文件
下载
差异文件
Merge remote-tracking branch 'origin/develop' into feature/sim
上级
63a6d230
0abdadce
变更
12
隐藏空白更改
内联
并排
Showing
12 changed file
with
52 addition
and
44 deletion
+52
-44
src/kit/taosdemox/taosdemox.c
src/kit/taosdemox/taosdemox.c
+1
-0
src/mnode/src/mnodeRead.c
src/mnode/src/mnodeRead.c
+3
-0
src/plugins/http/inc/httpInt.h
src/plugins/http/inc/httpInt.h
+3
-2
src/plugins/http/src/httpAuth.c
src/plugins/http/src/httpAuth.c
+4
-4
src/plugins/http/src/httpGcHandle.c
src/plugins/http/src/httpGcHandle.c
+2
-2
src/plugins/http/src/httpRestHandle.c
src/plugins/http/src/httpRestHandle.c
+2
-2
src/plugins/http/src/httpTgHandle.c
src/plugins/http/src/httpTgHandle.c
+1
-1
tests/script/general/db/alter_option.sim
tests/script/general/db/alter_option.sim
+2
-15
tests/script/jenkins/basic_2.txt
tests/script/jenkins/basic_2.txt
+1
-2
tests/script/unique/dnode/offline2.sim
tests/script/unique/dnode/offline2.sim
+1
-1
tests/script/unique/migrate/mn2_vn2_repl2_rmVnodeDir.sim
tests/script/unique/migrate/mn2_vn2_repl2_rmVnodeDir.sim
+2
-2
tests/test-all.sh
tests/test-all.sh
+30
-13
未找到文件。
src/kit/taosdemox/taosdemox.c
浏览文件 @
87942820
...
...
@@ -4507,6 +4507,7 @@ void setParaFromArg(){
strncpy
(
g_Dbs
.
db
[
0
].
superTbls
[
0
].
sTblName
,
"meters"
,
MAX_TB_NAME_SIZE
);
g_Dbs
.
db
[
0
].
superTbls
[
0
].
childTblCount
=
g_args
.
num_of_tables
;
g_Dbs
.
threadCount
=
g_args
.
num_of_threads
;
g_Dbs
.
threadCountByCreateTbl
=
1
;
g_Dbs
.
queryMode
=
g_args
.
mode
;
g_Dbs
.
db
[
0
].
superTbls
[
0
].
autoCreateTable
=
PRE_CREATE_SUBTBL
;
...
...
src/mnode/src/mnodeRead.c
浏览文件 @
87942820
...
...
@@ -50,6 +50,9 @@ int32_t mnodeProcessRead(SMnodeMsg *pMsg) {
if
(
!
sdbIsMaster
())
{
SMnodeRsp
*
rpcRsp
=
&
pMsg
->
rpcRsp
;
SRpcEpSet
*
epSet
=
rpcMallocCont
(
sizeof
(
SRpcEpSet
));
if
(
!
epSet
)
{
return
TSDB_CODE_MND_OUT_OF_MEMORY
;
}
mnodeGetMnodeEpSetForShell
(
epSet
,
true
);
rpcRsp
->
rsp
=
epSet
;
rpcRsp
->
len
=
sizeof
(
SRpcEpSet
);
...
...
src/plugins/http/inc/httpInt.h
浏览文件 @
87942820
...
...
@@ -39,7 +39,8 @@
#define HTTP_GC_TARGET_SIZE 512
#define HTTP_WRITE_RETRY_TIMES 500
#define HTTP_WRITE_WAIT_TIME_MS 5
#define HTTP_SESSION_ID_LEN (TSDB_USER_LEN + TSDB_KEY_LEN)
#define HTTP_PASSWORD_LEN TSDB_UNI_LEN
#define HTTP_SESSION_ID_LEN (TSDB_USER_LEN + HTTP_PASSWORD_LEN)
typedef
enum
HttpReqType
{
HTTP_REQTYPE_OTHERS
=
0
,
...
...
@@ -147,7 +148,7 @@ typedef struct HttpContext {
uint8_t
parsed
;
char
ipstr
[
22
];
char
user
[
TSDB_USER_LEN
];
// parsed from auth token or login message
char
pass
[
TSDB_KEY
_LEN
];
char
pass
[
HTTP_PASSWORD
_LEN
];
TAOS
*
taos
;
void
*
ppContext
;
HttpSession
*
session
;
...
...
src/plugins/http/src/httpAuth.c
浏览文件 @
87942820
...
...
@@ -51,7 +51,7 @@ int32_t httpParseBasicAuthToken(HttpContext *pContext, char *token, int32_t len)
char
*
password
=
user
+
1
;
int32_t
pass_len
=
(
int32_t
)((
base64
+
outlen
)
-
password
);
if
(
pass_len
<
1
||
pass_len
>=
TSDB_KEY
_LEN
)
{
if
(
pass_len
<
1
||
pass_len
>=
HTTP_PASSWORD
_LEN
)
{
httpError
(
"context:%p, fd:%d, basic token:%s parse password error"
,
pContext
,
pContext
->
fd
,
token
);
free
(
base64
);
return
-
1
;
...
...
@@ -73,7 +73,7 @@ int32_t httpParseTaosdAuthToken(HttpContext *pContext, char *token, int32_t len)
if
(
base64
)
free
(
base64
);
return
01
;
}
if
(
outlen
!=
(
TSDB_USER_LEN
+
TSDB_KEY
_LEN
))
{
if
(
outlen
!=
(
TSDB_USER_LEN
+
HTTP_PASSWORD
_LEN
))
{
httpError
(
"context:%p, fd:%d, taosd token:%s length error"
,
pContext
,
pContext
->
fd
,
token
);
free
(
base64
);
return
-
1
;
...
...
@@ -103,8 +103,8 @@ int32_t httpGenTaosdAuthToken(HttpContext *pContext, char *token, int32_t maxLen
size
=
sizeof
(
pContext
->
pass
);
tstrncpy
(
buffer
+
sizeof
(
pContext
->
user
),
pContext
->
pass
,
size
);
char
*
encrypt
=
taosDesEncode
(
KEY_DES_4
,
buffer
,
TSDB_USER_LEN
+
TSDB_KEY
_LEN
);
char
*
base64
=
base64_encode
((
const
unsigned
char
*
)
encrypt
,
TSDB_USER_LEN
+
TSDB_KEY
_LEN
);
char
*
encrypt
=
taosDesEncode
(
KEY_DES_4
,
buffer
,
TSDB_USER_LEN
+
HTTP_PASSWORD
_LEN
);
char
*
base64
=
base64_encode
((
const
unsigned
char
*
)
encrypt
,
TSDB_USER_LEN
+
HTTP_PASSWORD
_LEN
);
size_t
len
=
strlen
(
base64
);
tstrncpy
(
token
,
base64
,
len
+
1
);
...
...
src/plugins/http/src/httpGcHandle.c
浏览文件 @
87942820
...
...
@@ -59,11 +59,11 @@ bool gcGetUserFromUrl(HttpContext* pContext) {
bool
gcGetPassFromUrl
(
HttpContext
*
pContext
)
{
HttpParser
*
pParser
=
pContext
->
parser
;
if
(
pParser
->
path
[
GC_PASS_URL_POS
].
pos
>=
TSDB_KEY
_LEN
||
pParser
->
path
[
GC_PASS_URL_POS
].
pos
<=
0
)
{
if
(
pParser
->
path
[
GC_PASS_URL_POS
].
pos
>=
HTTP_PASSWORD
_LEN
||
pParser
->
path
[
GC_PASS_URL_POS
].
pos
<=
0
)
{
return
false
;
}
tstrncpy
(
pContext
->
pass
,
pParser
->
path
[
GC_PASS_URL_POS
].
str
,
TSDB_KEY
_LEN
);
tstrncpy
(
pContext
->
pass
,
pParser
->
path
[
GC_PASS_URL_POS
].
str
,
HTTP_PASSWORD
_LEN
);
return
true
;
}
...
...
src/plugins/http/src/httpRestHandle.c
浏览文件 @
87942820
...
...
@@ -72,11 +72,11 @@ bool restGetUserFromUrl(HttpContext* pContext) {
bool
restGetPassFromUrl
(
HttpContext
*
pContext
)
{
HttpParser
*
pParser
=
pContext
->
parser
;
if
(
pParser
->
path
[
REST_PASS_URL_POS
].
pos
>=
TSDB_KEY
_LEN
||
pParser
->
path
[
REST_PASS_URL_POS
].
pos
<=
0
)
{
if
(
pParser
->
path
[
REST_PASS_URL_POS
].
pos
>=
HTTP_PASSWORD
_LEN
||
pParser
->
path
[
REST_PASS_URL_POS
].
pos
<=
0
)
{
return
false
;
}
tstrncpy
(
pContext
->
pass
,
pParser
->
path
[
REST_PASS_URL_POS
].
str
,
TSDB_KEY
_LEN
);
tstrncpy
(
pContext
->
pass
,
pParser
->
path
[
REST_PASS_URL_POS
].
str
,
HTTP_PASSWORD
_LEN
);
return
true
;
}
...
...
src/plugins/http/src/httpTgHandle.c
浏览文件 @
87942820
...
...
@@ -324,7 +324,7 @@ bool tgGetUserFromUrl(HttpContext *pContext) {
bool
tgGetPassFromUrl
(
HttpContext
*
pContext
)
{
HttpParser
*
pParser
=
pContext
->
parser
;
if
(
pParser
->
path
[
TG_PASS_URL_POS
].
pos
>=
TSDB_KEY
_LEN
||
pParser
->
path
[
TG_PASS_URL_POS
].
pos
<=
0
)
{
if
(
pParser
->
path
[
TG_PASS_URL_POS
].
pos
>=
HTTP_PASSWORD
_LEN
||
pParser
->
path
[
TG_PASS_URL_POS
].
pos
<=
0
)
{
return
false
;
}
...
...
tests/script/general/db/alter_option.sim
浏览文件 @
87942820
...
...
@@ -78,23 +78,10 @@ if $data5_db != 1 then
return -1
endi
sql alter database db quorum 2
sql show databases
print quorum $data5_db
if $data5_db != 2 then
return -1
endi
sql_error alter database db quorum 2
sql alter database db quorum 3
sql show databases
print quorum $data5_db
if $data5_db != 3 then
return -1
endi
sql_error alter database db quorum 3
sql alter database db quorum 3
sql alter database db quorum 2
sql alter database db quorum 1
sql_error alter database db quorum 0
sql_error alter database db quorum 4
sql_error alter database db quorum 5
...
...
tests/script/jenkins/basic_2.txt
浏览文件 @
87942820
...
...
@@ -10,7 +10,7 @@ cd ../../../debug; make
./test.sh -f general/tag/binary_binary.sim
./test.sh -f general/tag/binary.sim
./test.sh -f general/tag/bool_binary.sim
./test.sh -f general/tag/bool_int.sim
#
./test.sh -f general/tag/bool_int.sim
./test.sh -f general/tag/bool.sim
./test.sh -f general/tag/change.sim
./test.sh -f general/tag/column.sim
...
...
@@ -99,6 +99,5 @@ cd ../../../debug; make
./test.sh -f unique/dnode/m2.sim
./test.sh -f unique/dnode/m3.sim
./test.sh -f unique/dnode/offline3.sim
./test.sh -f general/wal/sync.sim
./test.sh -f general/wal/kill.sim
./test.sh -f general/wal/maxtables.sim
\ No newline at end of file
tests/script/unique/dnode/offline2.sim
浏览文件 @
87942820
...
...
@@ -60,7 +60,7 @@ print dnode1 $data4_2
if $data4_1 != ready then
return -1
endi
if $data4_2
!= offline
then
if $data4_2
== ready
then
return -1
endi
...
...
tests/script/unique/migrate/mn2_vn2_repl2_rmVnodeDir.sim
浏览文件 @
87942820
...
...
@@ -159,7 +159,7 @@ if $loopCnt == 20 then
endi
sql show dnodes -x wait_dnode1_ready
if $rows !=
2
then
if $rows !=
3
then
sleep 2000
goto wait_dnode1_ready
endi
...
...
@@ -232,7 +232,7 @@ if $loopCnt == 10 then
endi
sql show dnodes
if $rows !=
2
then
if $rows !=
3
then
sleep 2000
goto wait_dnode2_offline
endi
...
...
tests/test-all.sh
浏览文件 @
87942820
...
...
@@ -20,11 +20,22 @@ function runSimCaseOneByOne {
while
read
-r
line
;
do
if
[[
$line
=
~ ^./test.sh
*
]]
||
[[
$line
=
~ ^run
*
]]
;
then
case
=
`
echo
$line
|
grep
sim
$
|awk
'{print $NF}'
`
IN_TDINTERNAL
=
"community"
start_time
=
`
date
+%s
`
./test.sh
-f
$case
>
/dev/null 2>&1
&&
\
echo
-e
"
${
GREEN
}
$case
success
${
NC
}
"
|
tee
-a
out.log
||
\
echo
-e
"
${
RED
}
$case
failed
${
NC
}
"
|
tee
-a
out.log
IN_TDINTERNAL
=
"community"
if
[[
"
$tests_dir
"
==
*
"
$IN_TDINTERNAL
"
*
]]
;
then
echo
-n
$case
./test.sh
-f
$case
>
/dev/null 2>&1
&&
\
(
grep
-q
'script.*'
$case
'.*failed.*, err.*lineNum'
../../../sim/tsim/log/taoslog0.0
&&
echo
-e
"
${
RED
}
failed
${
NC
}
"
|
tee
-a
out.log
||
echo
-e
"
${
GREEN
}
success
${
NC
}
"
|
tee
-a
out.log
)
||
\
(
grep
-q
'script.*success.*m$'
../../../sim/tsim/log/taoslog0.0
&&
echo
-e
"
${
GREEN
}
success
${
NC
}
"
|
tee
-a
out.log
)
||
\
echo
-e
"
${
RED
}
failed
${
NC
}
"
|
tee
-a
out.log
else
echo
-n
$case
./test.sh
-f
$case
>
/dev/null 2>&1
&&
\
(
grep
-q
'script.*'
$case
'.*failed.*, err.*lineNum'
../../sim/tsim/log/taoslog0.0
&&
echo
-e
"
${
RED
}
failed
${
NC
}
"
|
tee
-a
out.log
||
echo
-e
"
${
GREEN
}
success
${
NC
}
"
|
tee
-a
out.log
)||
\
(
grep
-q
'script.*success.*m$'
../../sim/tsim/log/taoslog0.0
&&
echo
-e
"
${
GREEN
}
success
${
NC
}
"
|
tee
-a
out.log
)
||
\
echo
-e
"
${
RED
}
failed
${
NC
}
"
|
tee
-a
out.log
fi
out_log
=
`
tail
-1
out.log
`
# if [[ $out_log =~ 'failed' ]];then
# exit 8
...
...
@@ -42,13 +53,17 @@ function runSimCaseOneByOnefq {
start_time
=
`
date
+%s
`
IN_TDINTERNAL
=
"community"
if
[[
"
$tests_dir
"
==
*
"
$IN_TDINTERNAL
"
*
]]
;
then
echo
-n
$case
./test.sh
-f
$case
>
/dev/null 2>&1
&&
\
echo
-e
"
${
GREEN
}
$case
success
${
NC
}
"
|
tee
-a
out.log
||
\
(
grep
'script.*success.*m$'
../../../sim/tsim/log/taoslog0.0
&&
echo
-e
"
${
GREEN
}
$case
success
${
NC
}
"
|
tee
-a
out.log
)
||
echo
-e
"
${
RED
}
$case
failed
${
NC
}
"
|
tee
-a
out.log
(
grep
-q
'script.*'
$case
'.*failed.*, err.*lineNum'
../../../sim/tsim/log/taoslog0.0
&&
echo
-e
"
${
RED
}
failed
${
NC
}
"
|
tee
-a
out.log
||
echo
-e
"
${
GREEN
}
success
${
NC
}
"
|
tee
-a
out.log
)
||
\
(
grep
-q
'script.*success.*m$'
../../../sim/tsim/log/taoslog0.0
&&
echo
-e
"
${
GREEN
}
success
${
NC
}
"
|
tee
-a
out.log
)
||
\
echo
-e
"
${
RED
}
failed
${
NC
}
"
|
tee
-a
out.log
else
echo
-n
$case
./test.sh
-f
$case
>
/dev/null 2>&1
&&
\
echo
-e
"
${
GREEN
}
$case
success
${
NC
}
"
|
tee
-a
out.log
||
\
(
grep
'script.*success.*m$'
../../sim/tsim/log/taoslog0.0
&&
echo
-e
"
${
GREEN
}
$case
success
${
NC
}
"
|
tee
-a
out.log
)
||
echo
-e
"
${
RED
}
$case
failed
${
NC
}
"
|
tee
-a
out.log
(
grep
-q
'script.*'
$case
'.*failed.*, err.*lineNum'
../../sim/tsim/log/taoslog0.0
&&
echo
-e
"
${
RED
}
failed
${
NC
}
"
|
tee
-a
out.log
||
echo
-e
"
${
GREEN
}
success
${
NC
}
"
|
tee
-a
out.log
)||
\
(
grep
-q
'script.*success.*m$'
../../sim/tsim/log/taoslog0.0
&&
echo
-e
"
${
GREEN
}
success
${
NC
}
"
|
tee
-a
out.log
)
||
\
echo
-e
"
${
RED
}
failed
${
NC
}
"
|
tee
-a
out.log
fi
out_log
=
`
tail
-1
out.log
`
...
...
@@ -77,9 +92,10 @@ function runPyCaseOneByOne {
case
=
`
echo
$line
|awk
'{print $NF}'
`
fi
start_time
=
`
date
+%s
`
echo
-n
$case
$line
>
/dev/null 2>&1
&&
\
echo
-e
"
${
GREEN
}
$case
success
${
NC
}
"
|
tee
-a
pytest-out.log
||
\
echo
-e
"
${
RED
}
$case
failed
${
NC
}
"
|
tee
-a
pytest-out.log
echo
-e
"
${
GREEN
}
success
${
NC
}
"
|
tee
-a
pytest-out.log
||
\
echo
-e
"
${
RED
}
failed
${
NC
}
"
|
tee
-a
pytest-out.log
end_time
=
`
date
+%s
`
out_log
=
`
tail
-1
pytest-out.log
`
# if [[ $out_log =~ 'failed' ]];then
...
...
@@ -103,9 +119,10 @@ function runPyCaseOneByOnefq {
case
=
`
echo
$line
|awk
'{print $NF}'
`
fi
start_time
=
`
date
+%s
`
echo
-n
$case
$line
>
/dev/null 2>&1
&&
\
echo
-e
"
${
GREEN
}
$case
success
${
NC
}
"
|
tee
-a
pytest-out.log
||
\
echo
-e
"
${
RED
}
$case
failed
${
NC
}
"
|
tee
-a
pytest-out.log
echo
-e
"
${
GREEN
}
success
${
NC
}
"
|
tee
-a
pytest-out.log
||
\
echo
-e
"
${
RED
}
failed
${
NC
}
"
|
tee
-a
pytest-out.log
end_time
=
`
date
+%s
`
out_log
=
`
tail
-1
pytest-out.log
`
if
[[
$out_log
=
~
'failed'
]]
;
then
...
...
@@ -138,7 +155,7 @@ if [ "$2" != "python" ]; then
elif
[
"
$1
"
==
"b1"
]
;
then
echo
"### run TSIM b1 test ###"
runSimCaseOneByOne jenkins/basic_1.txt
runSimCaseOneByOne jenkins/basic_4.txt
#
runSimCaseOneByOne jenkins/basic_4.txt
elif
[
"
$1
"
==
"b2"
]
;
then
echo
"### run TSIM b2 test ###"
runSimCaseOneByOne jenkins/basic_2.txt
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录