From eb30aa35c3de03620aea8d635ae17f21c47bce53 Mon Sep 17 00:00:00 2001
From: slguan <slguan@taosdata.com>
Date: Fri, 8 May 2020 11:51:34 +0800
Subject: [PATCH] scripts

---
 src/dnode/src/dnodePeer.c                         |  2 +-
 src/vnode/inc/vnodeLog.h                          | 12 ++++++------
 tests/script/general/insert/basic.sim             | 15 ++++++++-------
 tests/script/general/insert/insert_drop.sim       |  2 ++
 tests/script/general/insert/query_block1_file.sim |  2 ++
 .../script/general/insert/query_block1_memory.sim |  1 +
 tests/script/general/insert/query_block2_file.sim |  1 +
 .../script/general/insert/query_block2_memory.sim |  2 ++
 tests/script/general/insert/query_file_memory.sim |  2 +-
 tests/script/general/insert/query_multi_file.sim  |  1 +
 tests/script/general/insert/tcp.sim               |  7 ++-----
 tests/script/general/insert/testSuite.sim         | 15 ++++++++-------
 tests/script/jenkins/basic.txt                    | 13 ++++++++++++-
 13 files changed, 47 insertions(+), 28 deletions(-)

diff --git a/src/dnode/src/dnodePeer.c b/src/dnode/src/dnodePeer.c
index 2d80917aca..b1e5d9fd38 100644
--- a/src/dnode/src/dnodePeer.c
+++ b/src/dnode/src/dnodePeer.c
@@ -133,7 +133,7 @@ int32_t dnodeInitClient() {
     return -1;
   }
 
-  dPrint("inter-dndoes rpc client is opened");
+  dPrint("inter-dnodes rpc client is opened");
   return 0;
 }
 
diff --git a/src/vnode/inc/vnodeLog.h b/src/vnode/inc/vnodeLog.h
index 450220e17f..bd8daae0b6 100644
--- a/src/vnode/inc/vnodeLog.h
+++ b/src/vnode/inc/vnodeLog.h
@@ -22,19 +22,19 @@ extern "C" {
 
 #include "tlog.h"
 
-extern int32_t ddebugFlag;
+extern int32_t dDebugFlag;
 
 #define dError(...)                          \
-  if (ddebugFlag & DEBUG_ERROR) {            \
+  if (dDebugFlag & DEBUG_ERROR) {            \
     taosPrintLog("ERROR DND ", 255, __VA_ARGS__); \
   }
 #define dWarn(...)                                  \
-  if (ddebugFlag & DEBUG_WARN) {                    \
-    taosPrintLog("WARN  DND ", ddebugFlag, __VA_ARGS__); \
+  if (dDebugFlag & DEBUG_WARN) {                    \
+    taosPrintLog("WARN  DND ", dDebugFlag, __VA_ARGS__); \
   }
 #define dTrace(...)                           \
-  if (ddebugFlag & DEBUG_TRACE) {             \
-    taosPrintLog("DND ", ddebugFlag, __VA_ARGS__); \
+  if (dDebugFlag & DEBUG_TRACE) {             \
+    taosPrintLog("DND ", dDebugFlag, __VA_ARGS__); \
   }
 #define dPrint(...) \
   { taosPrintLog("DND ", 255, __VA_ARGS__); }
diff --git a/tests/script/general/insert/basic.sim b/tests/script/general/insert/basic.sim
index ef8d71fd25..ba8cff83fa 100644
--- a/tests/script/general/insert/basic.sim
+++ b/tests/script/general/insert/basic.sim
@@ -1,6 +1,5 @@
 system sh/stop_dnodes.sh
 
-
 system sh/deploy.sh -n dnode1 -i 1
 system sh/cfg.sh -n dnode1 -c walLevel -v 0
 system sh/exec.sh -n dnode1 -s start
@@ -29,21 +28,23 @@ while $x < 10
 endw 
 
 print =============== step 2
-sql insert into $tb values (now - 5m , 10) -x error_insert
-sql insert into $tb values (now - 6m , 10) -x error_insert
-sql insert into $tb values (now - 7m , 10) -x error_insert
-sql insert into $tb values (now - 8m , 10) -x error_insert
-error_insert:
+sql insert into $tb values (now - 5m , 10)
+sql insert into $tb values (now - 6m , 10)
+sql insert into $tb values (now - 7m , 10)
+sql insert into $tb values (now - 8m , 10)
 
 sql select * from $tb
 
 print $rows points data are retrieved
-if $rows != 10 then 
+if $rows != 14 then 
   return -1
 endi
 
 sql drop database $db
+sleep 1000
 sql show databases
 if $rows != 0 then 
   return -1
 endi
+
+system sh/exec.sh -n dnode1 -s stop -x SIGINT
\ No newline at end of file
diff --git a/tests/script/general/insert/insert_drop.sim b/tests/script/general/insert/insert_drop.sim
index 04f9415e2f..087b9f6aa9 100644
--- a/tests/script/general/insert/insert_drop.sim
+++ b/tests/script/general/insert/insert_drop.sim
@@ -75,9 +75,11 @@ sql connect
 sleep 3000
 
 sql use $db
+
 sql create table tb5 using $stb tags(5)
 sql select * from tb5
 if $rows != 0 then
   return -1
 endi
 
+system sh/exec.sh -n dnode1 -s stop -x SIGINT
\ No newline at end of file
diff --git a/tests/script/general/insert/query_block1_file.sim b/tests/script/general/insert/query_block1_file.sim
index 5a1298bfdf..6d6daca7b5 100644
--- a/tests/script/general/insert/query_block1_file.sim
+++ b/tests/script/general/insert/query_block1_file.sim
@@ -193,3 +193,5 @@ sql show databases
 if $rows != 0 then 
   return -1
 endi
+
+system sh/exec.sh -n dnode1 -s stop -x SIGINT
\ No newline at end of file
diff --git a/tests/script/general/insert/query_block1_memory.sim b/tests/script/general/insert/query_block1_memory.sim
index 30af2579bc..83509ad5b0 100644
--- a/tests/script/general/insert/query_block1_memory.sim
+++ b/tests/script/general/insert/query_block1_memory.sim
@@ -175,3 +175,4 @@ if $rows != 0 then
   return -1
 endi
 
+system sh/exec.sh -n dnode1 -s stop -x SIGINT
\ No newline at end of file
diff --git a/tests/script/general/insert/query_block2_file.sim b/tests/script/general/insert/query_block2_file.sim
index 773602ceb6..34da170a9e 100644
--- a/tests/script/general/insert/query_block2_file.sim
+++ b/tests/script/general/insert/query_block2_file.sim
@@ -208,3 +208,4 @@ if $rows != 0 then
   return -1
 endi
 
+system sh/exec.sh -n dnode1 -s stop -x SIGINT
\ No newline at end of file
diff --git a/tests/script/general/insert/query_block2_memory.sim b/tests/script/general/insert/query_block2_memory.sim
index 2c90fe5d12..3f2c97a098 100644
--- a/tests/script/general/insert/query_block2_memory.sim
+++ b/tests/script/general/insert/query_block2_memory.sim
@@ -170,3 +170,5 @@ sql show databases
 if $rows != 0 then 
   return -1
 endi
+
+system sh/exec.sh -n dnode1 -s stop -x SIGINT
\ No newline at end of file
diff --git a/tests/script/general/insert/query_file_memory.sim b/tests/script/general/insert/query_file_memory.sim
index f8de8f5fd6..f923ebed13 100644
--- a/tests/script/general/insert/query_file_memory.sim
+++ b/tests/script/general/insert/query_file_memory.sim
@@ -206,4 +206,4 @@ if $rows != 0 then
   return -1
 endi
 
-
+system sh/exec.sh -n dnode1 -s stop -x SIGINT
\ No newline at end of file
diff --git a/tests/script/general/insert/query_multi_file.sim b/tests/script/general/insert/query_multi_file.sim
index 81809b51b8..8622fa6f9b 100644
--- a/tests/script/general/insert/query_multi_file.sim
+++ b/tests/script/general/insert/query_multi_file.sim
@@ -53,3 +53,4 @@ if $rows != 0 then
   return -1
 endi
 
+system sh/exec.sh -n dnode1 -s stop -x SIGINT
\ No newline at end of file
diff --git a/tests/script/general/insert/tcp.sim b/tests/script/general/insert/tcp.sim
index 9cea0d6866..0bc4c123b8 100644
--- a/tests/script/general/insert/tcp.sim
+++ b/tests/script/general/insert/tcp.sim
@@ -1,6 +1,5 @@
 system sh/stop_dnodes.sh
 
-
 system sh/deploy.sh -n dnode1 -i 1
 system sh/cfg.sh -n dnode1 -c walLevel -v 0
 system sh/exec.sh -n dnode1 -s start
@@ -20,7 +19,6 @@ sql create database db
 sql use db
 sql create table tb (ts timestamp, test binary(1000))
 
-
 $x = 0
 while $x < 10000
   $ms = $x . s
@@ -30,11 +28,10 @@ endw
 
 sql select * from tb
 
-
-return
-
 sql drop database $db
 sql show databases
 if $rows != 0 then 
   return -1
 endi
+
+system sh/exec.sh -n dnode1 -s stop -x SIGINT
\ No newline at end of file
diff --git a/tests/script/general/insert/testSuite.sim b/tests/script/general/insert/testSuite.sim
index 582351a218..72e4c057c1 100644
--- a/tests/script/general/insert/testSuite.sim
+++ b/tests/script/general/insert/testSuite.sim
@@ -1,8 +1,9 @@
-#run general/insert/basic.sim
+run general/insert/basic.sim
 #run general/insert/insert_drop.sim
-#run general/insert/query_block1_memory.sim
-#run general/insert/query_block2_memory.sim
-#run general/insert/query_block1_file.sim
-#run general/insert/query_block2_file.sim
-#run general/insert/query_file_memory.sim
-#run general/insert/query_multi_file.sim
+run general/insert/query_block1_memory.sim
+run general/insert/query_block2_memory.sim
+run general/insert/query_block1_file.sim
+run general/insert/query_block2_file.sim
+run general/insert/query_file_memory.sim
+run general/insert/query_multi_file.sim
+run general/insert/tcp.sim
diff --git a/tests/script/jenkins/basic.txt b/tests/script/jenkins/basic.txt
index a9175dab35..c5f8cdcd06 100644
--- a/tests/script/jenkins/basic.txt
+++ b/tests/script/jenkins/basic.txt
@@ -50,7 +50,18 @@ cd ../../../debug; make
 
 
 #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
 #parser
 #stream
-- 
GitLab