xxq250
/
homework-jianmu
1
0
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects Releases Wiki Activity

scripts

This commit is contained in:
slguan 2020-05-08 11:51:34 +08:00
parent ab25f882a2
commit eb30aa35c3
13 changed files with 47 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/dnode/src/dnodePeer.c
View File

@ -133,7 +133,7 @@ int32_t dnodeInitClient() {
return -1; return -1;
} }
dPrint("inter-dndoes rpc client is opened"); dPrint("inter-dnodes rpc client is opened");
return 0; return 0;
} }

12
src/vnode/inc/vnodeLog.h
View File

@ -22,19 +22,19 @@ extern "C" {
#include "tlog.h" #include "tlog.h"
extern int32_t ddebugFlag; extern int32_t dDebugFlag;
#define dError(...) \ #define dError(...) \
if (ddebugFlag & DEBUG_ERROR) { \ if (dDebugFlag & DEBUG_ERROR) { \
taosPrintLog("ERROR DND ", 255, __VA_ARGS__); \ taosPrintLog("ERROR DND ", 255, __VA_ARGS__); \
} }
#define dWarn(...) \ #define dWarn(...) \
if (ddebugFlag & DEBUG_WARN) { \ if (dDebugFlag & DEBUG_WARN) { \
taosPrintLog("WARN DND ", ddebugFlag, __VA_ARGS__); \ taosPrintLog("WARN DND ", dDebugFlag, __VA_ARGS__); \
} }
#define dTrace(...) \ #define dTrace(...) \
if (ddebugFlag & DEBUG_TRACE) { \ if (dDebugFlag & DEBUG_TRACE) { \
taosPrintLog("DND ", ddebugFlag, __VA_ARGS__); \ taosPrintLog("DND ", dDebugFlag, __VA_ARGS__); \
} }
#define dPrint(...) \ #define dPrint(...) \
{ taosPrintLog("DND ", 255, __VA_ARGS__); } { taosPrintLog("DND ", 255, __VA_ARGS__); }

15
tests/script/general/insert/basic.sim
View File

@ -1,6 +1,5 @@
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/exec.sh -n dnode1 -s start system sh/exec.sh -n dnode1 -s start
@ -29,21 +28,23 @@ while $x < 10
endw endw
print =============== step 2 print =============== step 2
sql insert into $tb values (now - 5m , 10) -x error_insert sql insert into $tb values (now - 5m , 10)
sql insert into $tb values (now - 6m , 10) -x error_insert sql insert into $tb values (now - 6m , 10)
sql insert into $tb values (now - 7m , 10) -x error_insert sql insert into $tb values (now - 7m , 10)
sql insert into $tb values (now - 8m , 10) -x error_insert sql insert into $tb values (now - 8m , 10)
error_insert:
sql select * from $tb sql select * from $tb
print $rows points data are retrieved print $rows points data are retrieved
if $rows != 10 then if $rows != 14 then
return -1 return -1
endi endi
sql drop database $db sql drop database $db
sleep 1000
sql show databases sql show databases
if $rows != 0 then if $rows != 0 then
return -1 return -1
endi endi
system sh/exec.sh -n dnode1 -s stop -x SIGINT

2
tests/script/general/insert/insert_drop.sim
View File

@ -75,9 +75,11 @@ sql connect
sleep 3000 sleep 3000
sql use $db sql use $db
sql create table tb5 using $stb tags(5) sql create table tb5 using $stb tags(5)
sql select * from tb5 sql select * from tb5
if $rows != 0 then if $rows != 0 then
return -1 return -1
endi endi
system sh/exec.sh -n dnode1 -s stop -x SIGINT

2
tests/script/general/insert/query_block1_file.sim
View File

@ -193,3 +193,5 @@ sql show databases
if $rows != 0 then if $rows != 0 then
return -1 return -1
endi endi
system sh/exec.sh -n dnode1 -s stop -x SIGINT

1
tests/script/general/insert/query_block1_memory.sim
View File

@ -175,3 +175,4 @@ if $rows != 0 then
return -1 return -1
endi endi
system sh/exec.sh -n dnode1 -s stop -x SIGINT

1
tests/script/general/insert/query_block2_file.sim
View File

@ -208,3 +208,4 @@ if $rows != 0 then
return -1 return -1
endi endi
system sh/exec.sh -n dnode1 -s stop -x SIGINT

2
tests/script/general/insert/query_block2_memory.sim
View File

@ -170,3 +170,5 @@ sql show databases
if $rows != 0 then if $rows != 0 then
return -1 return -1
endi endi
system sh/exec.sh -n dnode1 -s stop -x SIGINT

2
tests/script/general/insert/query_file_memory.sim
View File

@ -206,4 +206,4 @@ if $rows != 0 then
return -1 return -1
endi endi
system sh/exec.sh -n dnode1 -s stop -x SIGINT

1
tests/script/general/insert/query_multi_file.sim
View File

@ -53,3 +53,4 @@ if $rows != 0 then
return -1 return -1
endi endi
system sh/exec.sh -n dnode1 -s stop -x SIGINT

7
tests/script/general/insert/tcp.sim
View File

@ -1,6 +1,5 @@
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/exec.sh -n dnode1 -s start system sh/exec.sh -n dnode1 -s start
@ -20,7 +19,6 @@ sql create database db
sql use db sql use db
sql create table tb (ts timestamp, test binary(1000)) sql create table tb (ts timestamp, test binary(1000))
$x = 0 $x = 0
while $x < 10000 while $x < 10000
$ms = $x . s $ms = $x . s
@ -30,11 +28,10 @@ endw
sql select * from tb sql select * from tb
return
sql drop database $db 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/exec.sh -n dnode1 -s stop -x SIGINT

15
tests/script/general/insert/testSuite.sim
View File

@ -1,8 +1,9 @@
#run general/insert/basic.sim run general/insert/basic.sim
#run general/insert/insert_drop.sim #run general/insert/insert_drop.sim
#run general/insert/query_block1_memory.sim run general/insert/query_block1_memory.sim
#run general/insert/query_block2_memory.sim run general/insert/query_block2_memory.sim
#run general/insert/query_block1_file.sim run general/insert/query_block1_file.sim
#run general/insert/query_block2_file.sim run general/insert/query_block2_file.sim
#run general/insert/query_file_memory.sim run general/insert/query_file_memory.sim
#run general/insert/query_multi_file.sim run general/insert/query_multi_file.sim
run general/insert/tcp.sim

13
tests/script/jenkins/basic.txt
View File

@ -50,7 +50,18 @@ cd ../../../debug; make
#import #import
#insert
./test.sh -f general/insert/basic.sim
#./test.sh -f general/insert/insert_drop.sim
./test.sh -f general/insert/query_block1_memory.sim
./test.sh -f general/insert/query_block2_memory.sim
./test.sh -f general/insert/query_block1_file.sim
./test.sh -f general/insert/query_block2_file.sim
./test.sh -f general/insert/query_file_memory.sim
./test.sh -f general/insert/query_multi_file.sim
./test.sh -f general/insert/tcp.sim
#metrics #metrics
#parser #parser
#stream #stream