diff --git a/tests/perftest-scripts/perftest-daily.sh b/tests/perftest-scripts/perftest-daily.sh
index b44387047ca12d78bd669e9cb098a380b557733c..beac8de15aa2ed6490bae2854b0c9d046d97e134 100755
--- a/tests/perftest-scripts/perftest-daily.sh
+++ b/tests/perftest-scripts/perftest-daily.sh
@@ -1,5 +1,7 @@
 #!/bin/bash
 
+WORK_DIR=/mnt/root
+
 # Coloured Echoes                                                                                                       #
 function red_echo      { echo -e "\033[31m$@\033[0m";   }                                                               #
 function green_echo    { echo -e "\033[32m$@\033[0m";   }                                                               #
@@ -16,6 +18,17 @@ function echoInfo   { local args="$@"; white_brackets $(green_printf "INFO") &&
 function echoWarn   { local args="$@";  echo "$(white_brackets "$(yellow_printf "WARN")" && echo " ${args}";)" 1>&2; }  #
 function echoError  { local args="$@"; echo "$(white_brackets "$(red_printf    "ERROR")" && echo " ${args}";)" 1>&2; }  #
 
+function setMaxTablesPerVnode {
+	echo "/etc/taos/taos.cfg maxTablesPerVnode will be set to $1"
+
+	hasText=`grep "maxTablesPerVnode" /etc/taos/taos.cfg`
+	if [[ -z "$hasText" ]]; then
+		echo "maxTablesPerVnode $1" >> /etc/taos/taos.cfg
+	else
+		sed -i 's/^maxTablesPerVnode.*$/maxTablesPerVnode '"$1"'/g' /etc/taos/taos.cfg
+	fi
+}
+
 function setMaxConnections {
 	echo "/etc/taos/taos.cfg maxConnection will be set to $1"
 
@@ -27,6 +40,28 @@ function setMaxConnections {
 	fi
 }
 
+function setQDebugFlag {
+	echo "/etc/taos/taos.cfg qDebugFlag will be set to $1"
+
+	hasText=`grep -w "qDebugFlag" /etc/taos/taos.cfg`
+	if [[ -z "$hasText" ]]; then
+		echo "qDebugFlag $1" >> /etc/taos/taos.cfg
+	else
+		sed -i 's/^qDebugFlag.*$/qDebugFlag '"$1"'/g' /etc/taos/taos.cfg
+	fi
+}
+
+function setDebugFlag {
+	echo "/etc/taos/taos.cfg DebugFlag will be set to $1"
+
+	hasText=`grep -w "DebugFlag" /etc/taos/taos.cfg`
+	if [[ -z "$hasText" ]]; then
+		echo "DebugFlag $1" >> /etc/taos/taos.cfg
+	else
+		sed -i 's/^DebugFlag.*$/DebugFlag '"$1"'/g' /etc/taos/taos.cfg
+	fi
+}
+
 function setWal {
 	echo "/etc/taos/taos.cfg walLevel will be set to $1"
 
@@ -47,9 +82,10 @@ function collectSysInfo {
 }
 
 function buildTDengine {
-	cd /root/TDengine
+	echoInfo "Build TDengine"
+	cd $WORK_DIR/TDengine
 
-	git remote update
+	git remote update > /dev/null
 	REMOTE_COMMIT=`git rev-parse --short remotes/origin/develop`
 	LOCAL_COMMIT=`git rev-parse --short @`
 
@@ -59,29 +95,17 @@ function buildTDengine {
 		echo "repo up-to-date"
 	else
 		echo "repo need to pull"
-		git pull
+		git pull > /dev/null
 
 		LOCAL_COMMIT=`git rev-parse --short @`
 		cd debug
 		rm -rf *
-		cmake ..
+		cmake .. > /dev/null
 		make > /dev/null
 		make install
 	fi
 }
 
-function restartTaosd {
-	systemctl stop taosd
-	pkill -KILL -x taosd
-	sleep 10
-	
-	rm -rf /mnt/var/log/taos/*
-	rm -rf /mnt/var/lib/taos/*
-	
-	taosd 2>&1 > /dev/null &
-	sleep 10
-}
-
 function sendReport {
 	receiver="sdsang@taosdata.com, sangshuduo@gmail.com"
 	mimebody="MIME-Version: 1.0\nContent-Type: text/html; charset=utf-8\n"
@@ -93,57 +117,90 @@ function sendReport {
 		(cat - && uuencode perftest-13d-wal1-$today.log perftest-13d-wal1-$today.log)| \
 		(cat - && uuencode perftest-13d-wal1-report.csv perftest-13d-wal1-report-$today.csv) | \
 		(cat - && uuencode perftest-13d-wal1-report.png perftest-13d-wal1-report-$today.png) | \
+		(cat - && uuencode perftest-var10k-int10s-wal1-$today.log perftest-var10k-int10s-wal1-$today.log)| \
+		(cat - && uuencode perftest-var10k-int10s-wal1-report.csv perftest-var10k-int10s-wal1-report-$today.csv) | \
+		(cat - && uuencode perftest-var10k-int10s-wal1-report.png perftest-var10k-int10s-wal1-report-$today.png) | \
 		(cat - && uuencode taosdemo-wal1-$today.log taosdemo-wal1-$today.log) | \
 		(cat - && uuencode taosdemo-wal1-report.csv taosdemo-wal1-report-$today.csv) | \
-		(cat - && uuencode taosdemo-rps-wal1-report.csv taosdemo-rps-wal1-report-$today.csv) | \
 		(cat - && uuencode taosdemo-wal1-report.png taosdemo-wal1-report-$today.png) | \
+		(cat - && uuencode taosdemo-rps-wal1-report.csv taosdemo-rps-wal1-report-$today.csv) | \
+		(cat - && uuencode taosdemo-rps-wal1-report.png taosdemo-rps-wal1-report-$today.png) | \
 		(cat - && uuencode perftest-1d-wal2-$today.log perftest-1d-wal2-$today.log)| \
 		(cat - && uuencode perftest-1d-wal2-report.csv perftest-1d-wal2-report-$today.csv) | \
 		(cat - && uuencode perftest-1d-wal2-report.png perftest-1d-wal2-report-$today.png) | \
 		(cat - && uuencode perftest-13d-wal2-$today.log perftest-13d-wal2-$today.log)| \
 		(cat - && uuencode perftest-13d-wal2-report.csv perftest-13d-wal2-report-$today.csv) | \
 		(cat - && uuencode perftest-13d-wal2-report.png perftest-13d-wal2-report-$today.png) | \
+		(cat - && uuencode perftest-var10k-int10s-wal2-$today.log perftest-var10k-int10s-wal2-$today.log)| \
+		(cat - && uuencode perftest-var10k-int10s-wal2-report.csv perftest-var10k-int10s-wal2-report-$today.csv) | \
+		(cat - && uuencode perftest-var10k-int10s-wal2-report.png perftest-var10k-int10s-wal2-report-$today.png) | \
 		(cat - && uuencode taosdemo-wal2-$today.log taosdemo-wal2-$today.log) | \
 		(cat - && uuencode taosdemo-wal2-report.csv taosdemo-wal2-report-$today.csv) | \
+		(cat - && uuencode taosdemo-wal2-report.png taosdemo-wal2-report-$today.png) | \
 		(cat - && uuencode taosdemo-rps-wal2-report.csv taosdemo-rps-wal2-report-$today.csv) | \
+		(cat - && uuencode taosdemo-rps-wal2-report.png taosdemo-rps-wal2-report-$today.png) | \
 		(cat - && uuencode sysinfo.log sysinfo.txt) | \
 		(cat - && uuencode taos.cfg taos-cfg-$today.txt) | \
 		ssmtp "${receiver}"
 }
 
 today=`date +"%Y%m%d"`
-cd /root
-echo -e "cron-ran-at-${today}" >> cron.log
+cd $WORK_DIR
+echo -e "cron-ran-at-${today}" >> $WORK_DIR/cron.log
 
-echoInfo "Build TDengine"
 buildTDengine
 
 ############################
-setMaxConnections 100
+setMaxConnections 1000
+setMaxTablesPerVnode 6000
+setDebugFlag 131
+setQDebugFlag 131
 
 ############################
 setWal "2"
 
-cd /root
-./perftest-tsdb-compare-1d.sh "wal2"
+cd $WORK_DIR
+date >> $WORK_DIR/cron.log
+./perftest-taosdemo.sh "wal2"
+date >> $WORK_DIR/cron.log
 
-cd /root
-./perftest-tsdb-compare-13d.sh "wal2"
+cd $WORK_DIR
+date >> $WORK_DIR/cron.log
+./perftest-tsdb-compare-1d.sh
+date >> $WORK_DIR/cron.log
 
-cd /root
-./perftest-taosdemo.sh "wal2"
+cd $WORK_DIR
+date >> $WORK_DIR/cron.log
+./perftest-tsdb-compare-13d.sh
+date >> $WORK_DIR/cron.log
+
+cd $WORK_DIR
+date >> $WORK_DIR/cron.log
+./perftest-tsdb-compare-var10k-int10s.sh
+date >> $WORK_DIR/cron.log
 
 #############################
 setWal "1"
 
-cd /root
-./perftest-tsdb-compare-1d.sh "wal1"
-
-cd /root
-./perftest-tsdb-compare-13d.sh "wal1"
-
-cd /root
+cd $WORK_DIR
+date >> $WORK_DIR/cron.log
 ./perftest-taosdemo.sh "wal1"
+date >> $WORK_DIR/cron.log
+
+cd $WORK_DIR
+date >> $WORK_DIR/cron.log
+./perftest-tsdb-compare-1d.sh
+date >> $WORK_DIR/cron.log
+
+cd $WORK_DIR
+date >> $WORK_DIR/cron.log
+./perftest-tsdb-compare-13d.sh
+date >> $WORK_DIR/cron.log
+
+cd $WORK_DIR
+date >> $WORK_DIR/cron.log
+./perftest-tsdb-compare-var10k-int10s.sh
+date >> $WORK_DIR/cron.log
 
 #############################
 collectSysInfo
diff --git a/tests/perftest-scripts/perftest-taosdemo.sh b/tests/perftest-scripts/perftest-taosdemo.sh
index 0dd9a0572a5bc296eed10f7179a5b5c64981b8e3..e459769512a5f246a4a0935e1a50f28795b51430 100755
--- a/tests/perftest-scripts/perftest-taosdemo.sh
+++ b/tests/perftest-scripts/perftest-taosdemo.sh
@@ -1,5 +1,20 @@
 #!/bin/bash
 
+WORK_DIR=/mnt/root
+
+walLevel=`grep "^walLevel" /etc/taos/taos.cfg | awk '{print $2}'`
+if [[ "$walLevel" -eq "2" ]]; then
+	walPostfix="wal2"
+elif [[ "$walLevel" -eq "1" ]]; then
+	walPostfix="wal1"
+else
+	echo -e "${RED}wrong walLevel $walLevel found! ${NC}"
+	exit 1
+fi
+
+logDir=`grep "^logDir" /etc/taos/taos.cfg | awk '{print $2}'`
+dataDir=`grep "^dataDir" /etc/taos/taos.cfg | awk '{print $2}'`
+
 # Coloured Echoes 
 function red_echo      { echo -e "\033[31m$@\033[0m";   }
 function green_echo    { echo -e "\033[32m$@\033[0m";   }
@@ -17,13 +32,20 @@ function echoWarn   { local args="$@";  echo "$(white_brackets "$(yellow_printf
 function echoError  { local args="$@"; echo "$(white_brackets "$(red_printf    "ERROR")" && echo " ${args}";)" 1>&2; }
 
 function restartTaosd {
+        echo "Stop taosd"
 	systemctl stop taosd
-	pkill -KILL -x taosd
-	sleep 10
-	
-	rm -rf /mnt/var/log/taos/*
-	rm -rf /mnt/var/lib/taos/*
+	PID=`ps -ef|grep -w taosd | grep -v grep | awk '{print $2}'`
+	while [ -n "$PID" ]
+	do
+		pkill -TERM -x taosd
+		sleep 1
+		PID=`ps -ef|grep -w taosd | grep -v grep | awk '{print $2}'`
+	done
+
+	rm -rf $logDir/*
+	rm -rf $dataDir/*
 	
+        echo "Start taosd"
 	taosd 2>&1 > /dev/null &
 	sleep 10
 }
@@ -32,7 +54,7 @@ function runCreateTableOnly {
 	echoInfo "Restart Taosd"
 	restartTaosd
 
-	/usr/bin/time -f "Total: %e" -o totaltime.out bash -c "yes | taosdemo -n 0 2>&1 | tee taosdemo-$1-$today.log"
+	/usr/bin/time -f "Total: %e" -o totaltime.out bash -c "yes | taosdemo -n 0 2>&1 | tee taosdemo-$walPostfix-$today.log"
 	demoCreateTableOnly=`grep "Total:" totaltime.out|awk '{print $2}'`
 }
 
@@ -40,7 +62,7 @@ function runDeleteTableOnly {
 	echoInfo "Restart Taosd"
 	restartTaosd
 
-	/usr/bin/time -f "Total: %e" -o totaltime.out bash -c "yes | taosdemo -t 0 -D 1 2>&1 | tee taosdemo-$1-$today.log"
+	/usr/bin/time -f "Total: %e" -o totaltime.out bash -c "yes | taosdemo -t 0 -D 1 2>&1 | tee taosdemo-$walPostfix-$today.log"
 	demoDeleteTableOnly=`grep "Total:" totaltime.out|awk '{print $2}'`
 }
 
@@ -48,41 +70,44 @@ function runCreateTableThenInsert {
 	echoInfo "Restart Taosd"
 	restartTaosd
 
-	/usr/bin/time -f "Total: %e" -o totaltime.out bash -c "yes | taosdemo 2>&1 | tee -a taosdemo-$1-$today.log"
+	/usr/bin/time -f "Total: %e" -o totaltime.out bash -c "yes | taosdemo 2>&1 | tee -a taosdemo-$walPostfix-$today.log"
 	demoTableAndInsert=`grep "Total:" totaltime.out|awk '{print $2}'`
-	demoRPS=`grep "records\/second" taosdemo-$1-$today.log | tail -n1 | awk '{print $13}'`
+	demoRPS=`grep "records\/second" taosdemo-$walPostfix-$today.log | tail -n1 | awk '{print $13}'`
 }	
 
 function generateTaosdemoPlot {
-	echo "${today} $1, demoCreateTableOnly: ${demoCreateTableOnly}, demoDeleteTableOnly: ${demoDeleteTableOnly}, demoTableAndInsert: ${demoTableAndInsert}" | tee -a taosdemo-$today.log
-	echo "${today}, ${demoCreateTableOnly}, ${demoDeleteTableOnly}, ${demoTableAndInsert}">> taosdemo-$1-report.csv
-	echo "${today}, ${demoRPS}" >> taosdemo-rps-$1-report.csv
+	echo "${today} $walPostfix, demoCreateTableOnly: ${demoCreateTableOnly}, demoDeleteTableOnly: ${demoDeleteTableOnly}, demoTableAndInsert: ${demoTableAndInsert}" | tee -a taosdemo-$today.log
+	echo "${today}, ${demoCreateTableOnly}, ${demoDeleteTableOnly}, ${demoTableAndInsert}">> taosdemo-$walPostfix-report.csv
+	echo "${today}, ${demoRPS}" >> taosdemo-rps-$walPostfix-report.csv
 	
-	csvLines=`cat taosdemo-$1-report.csv | wc -l`
+	csvLines=`cat taosdemo-$walPostfix-report.csv | wc -l`
 
 	if [ "$csvLines" -gt "10" ]; then
-		sed -i '1d' taosdemo-$1-report.csv
+		sed -i '1d' taosdemo-$walPostfix-report.csv
 	fi
 
-	csvLines=`cat taosdemo-rps-$1-report.csv | wc -l`
+	csvLines=`cat taosdemo-rps-$walPostfix-report.csv | wc -l`
 
 	if [ "$csvLines" -gt "10" ]; then
-		sed -i '1d' taosdemo-rps-$1-report.csv
+		sed -i '1d' taosdemo-rps-$walPostfix-report.csv
 	fi
 
-	gnuplot -e "filename='taosdemo-$1-report'" -p taosdemo-csv2png.gnuplot
-	gnuplot -e "filename='taosdemo-rps-$1-report'" -p taosdemo-rps-csv2png.gnuplot
+	gnuplot -e "filename='taosdemo-$walPostfix-report'" -p taosdemo-csv2png.gnuplot
+	gnuplot -e "filename='taosdemo-rps-$walPostfix-report'" -p taosdemo-rps-csv2png.gnuplot
 }
 
 today=`date +"%Y%m%d"`
 
-cd /root
+cd $WORK_DIR
 echoInfo "Test Create Table Only "
-runCreateTableOnly $1
+runCreateTableOnly
 echoInfo "Test Create Table then Insert data"
-runDeleteTableOnly $1
+runDeleteTableOnly
 echoInfo "Test Create Table then Insert data"
-runCreateTableThenInsert $1
+runCreateTableThenInsert
 echoInfo "Generate plot for taosdemo"
-generateTaosdemoPlot $1
-echoInfo "End of TaosDemo Test"
+generateTaosdemoPlot
+
+tar czf $WORK_DIR/taos-log-taosdemo-$today.tar.gz $logDir/*
+
+echoInfo "End of TaosDemo Test" | tee -a $WORK_DIR/cron.log
diff --git a/tests/perftest-scripts/perftest-tsdb-compare-13d.sh b/tests/perftest-scripts/perftest-tsdb-compare-13d.sh
index 8b326d2d4109d53b455fa825cc3204180fbaeb9e..110ab9e5fa6463db9f55c8320b1fd3e36380d7a1 100755
--- a/tests/perftest-scripts/perftest-tsdb-compare-13d.sh
+++ b/tests/perftest-scripts/perftest-tsdb-compare-13d.sh
@@ -1,5 +1,21 @@
 #!/bin/bash
 
+WORK_DIR=/mnt/root
+TSDB_CMP_DIR=timeseriesdatabase-comparisons/build/tsdbcompare
+
+walLevel=`grep "^walLevel" /etc/taos/taos.cfg | awk '{print $2}'`
+if [[ "$walLevel" -eq "2" ]]; then
+	walPostfix="wal2"
+elif [[ "$walLevel" -eq "1" ]]; then
+	walPostfix="wal1"
+else
+	echo -e "${RED}wrong walLevel $walLevel found! ${NC}"
+	exit 1
+fi
+
+logDir=`grep "^logDir" /etc/taos/taos.cfg | awk '{print $2}'`
+dataDir=`grep "^dataDir" /etc/taos/taos.cfg | awk '{print $2}'`
+
 # Coloured Echoes                                                                                                       #
 function red_echo      { echo -e "\033[31m$@\033[0m";   }                                                               #
 function green_echo    { echo -e "\033[32m$@\033[0m";   }                                                               #
@@ -17,13 +33,20 @@ function echoWarn   { local args="$@";  echo "$(white_brackets "$(yellow_printf
 function echoError  { local args="$@"; echo "$(white_brackets "$(red_printf    "ERROR")" && echo " ${args}";)" 1>&2; }  #
 
 function restartTaosd {
+        echo "Stop taosd"
 	systemctl stop taosd
-	pkill -KILL -x taosd
-	sleep 10
-	
-	rm -rf /mnt/var/log/taos/*
-	rm -rf /mnt/var/lib/taos/*
+	PID=`ps -ef|grep -w taosd | grep -v grep | awk '{print $2}'`
+	while [ -n "$PID" ]
+	do
+		pkill -TERM -x taosd
+		sleep 1
+		PID=`ps -ef|grep -w taosd | grep -v grep | awk '{print $2}'`
+	done
+
+	rm -rf $logDir/*
+	rm -rf $dataDir/*
 	
+        echo "Start taosd"
 	taosd 2>&1 > /dev/null &
 	sleep 10
 }
@@ -32,27 +55,30 @@ function runPerfTest13d {
 	echoInfo "Restart Taosd"
 	restartTaosd
 
-	cd /home/taos/tliu/timeseriesdatabase-comparisons/build/tsdbcompare
-	./runreal-13d-csv.sh $1 2>&1 | tee /root/perftest-13d-$1-$today.log
+	cd $WORK_DIR/$TSDB_CMP_DIR
+	./runTDengine.sh -d 13 -w -q 2>&1 | tee $WORK_DIR/perftest-13d-$walPostfix-$today.log
 }
 
 function generatePerfPlot13d {
-	cd /root
+	cd $WORK_DIR
 
-	csvLines=`cat perftest-13d-$1-report.csv | wc -l`
+	csvLines=`cat perftest-13d-$walPostfix-report.csv | wc -l`
 
 	if [ "$csvLines" -gt "10" ]; then
-		sed -i '1d' perftest-13d-$1-report.csv
+		sed -i '1d' perftest-13d-$walPostfix-report.csv
 	fi
 
-	gnuplot -e "filename='perftest-13d-$1-report'" -p perftest-csv2png.gnuplot
+	gnuplot -e "filename='perftest-13d-$walPostfix-report'" -p perftest-csv2png.gnuplot
 }
 
 today=`date +"%Y%m%d"`
-cd /root
+cd $WORK_DIR
 
 echoInfo "run Performance Test with 13 days data"
 runPerfTest13d $1
 echoInfo "Generate plot of 13 days data"
 generatePerfPlot13d $1
-echoInfo "End of TSDB-Compare 13-days-data Test"
+
+tar czf $WORK_DIR/taos-log-13d-$today.tar.gz $logDir/*
+
+echoInfo "End of TSDB-Compare 13-days-data Test" | tee -a $WORK_DIR/cron.log
diff --git a/tests/perftest-scripts/perftest-tsdb-compare-1d.sh b/tests/perftest-scripts/perftest-tsdb-compare-1d.sh
index 0931480e2150370ad55d673ebfbca06cefb6dd73..9e8bc697bc18e0e5c3a6d5957fed948192c09241 100755
--- a/tests/perftest-scripts/perftest-tsdb-compare-1d.sh
+++ b/tests/perftest-scripts/perftest-tsdb-compare-1d.sh
@@ -1,5 +1,21 @@
 #!/bin/bash
 
+WORK_DIR=/mnt/root
+TSDB_CMP_DIR=timeseriesdatabase-comparisons/build/tsdbcompare
+
+walLevel=`grep "^walLevel" /etc/taos/taos.cfg | awk '{print $2}'`
+if [[ "$walLevel" -eq "2" ]]; then
+	walPostfix="wal2"
+elif [[ "$walLevel" -eq "1" ]]; then
+	walPostfix="wal1"
+else
+	echo -e "${RED}wrong walLevel $walLevel found! ${NC}"
+	exit 1
+fi
+
+logDir=`grep "^logDir" /etc/taos/taos.cfg | awk '{print $2}'`
+dataDir=`grep "^dataDir" /etc/taos/taos.cfg | awk '{print $2}'`
+
 # Coloured Echoes                                                                                                       #
 function red_echo      { echo -e "\033[31m$@\033[0m";   }                                                               #
 function green_echo    { echo -e "\033[32m$@\033[0m";   }                                                               #
@@ -17,13 +33,20 @@ function echoWarn   { local args="$@";  echo "$(white_brackets "$(yellow_printf
 function echoError  { local args="$@"; echo "$(white_brackets "$(red_printf    "ERROR")" && echo " ${args}";)" 1>&2; }  #
 
 function restartTaosd {
+        echo "Stop taosd"
 	systemctl stop taosd
-	pkill -KILL -x taosd
-	sleep 10
-	
-	rm -rf /mnt/var/log/taos/*
-	rm -rf /mnt/var/lib/taos/*
+	PID=`ps -ef|grep -w taosd | grep -v grep | awk '{print $2}'`
+	while [ -n "$PID" ]
+	do
+		pkill -TERM -x taosd
+		sleep 1
+		PID=`ps -ef|grep -w taosd | grep -v grep | awk '{print $2}'`
+	done
+
+	rm -rf $logDir/*
+	rm -rf $dataDir/*
 	
+        echo "Start taosd"
 	taosd 2>&1 > /dev/null &
 	sleep 10
 }
@@ -32,27 +55,30 @@ function runPerfTest1d {
 	echoInfo "Restart Taosd"
 	restartTaosd
 
-	cd /home/taos/tliu/timeseriesdatabase-comparisons/build/tsdbcompare
-	./runreal-1d-csv.sh $1 2>&1 | tee /root/perftest-1d-$1-$today.log
+	cd $WORK_DIR/$TSDB_CMP_DIR
+	./runTDengine.sh -d 1 -w -q 2>&1 | tee $WORK_DIR/perftest-1d-$walPostfix-$today.log
 }
 
 function generatePerfPlot1d {
-	cd /root
+	cd $WORK_DIR
 
-	csvLines=`cat perftest-1d-$1-report.csv | wc -l`
+	csvLines=`cat perftest-1d-$walPostfix-report.csv | wc -l`
 
 	if [ "$csvLines" -gt "10" ]; then
-		sed -i '2d' perftest-1d-$1-report.csv
+		sed -i '1d' perftest-1d-$walPostfix-report.csv
 	fi
 
-	gnuplot -e "filename='perftest-1d-$1-report'" -p perftest-csv2png.gnuplot
+	gnuplot -e "filename='perftest-1d-$walPostfix-report'" -p perftest-csv2png.gnuplot
 }
 
 today=`date +"%Y%m%d"`
-cd /root
+cd $WORK_DIR
 
 echoInfo "run Performance Test with 1 day data"
-runPerfTest1d $1
+runPerfTest1d
 echoInfo "Generate plot of 1 day data"
-generatePerfPlot1d $1
-echoInfo "End of TSDB-Compare 1-day-data Test"
+generatePerfPlot1d
+
+tar czf $WORK_DIR/taos-log-1d-$today.tar.gz $logDir/*
+
+echoInfo "End of TSDB-Compare 1-day-data Test" | tee -a $WORK_DIR/cron.log
diff --git a/tests/perftest-scripts/perftest-tsdb-compare-var10k-int100s.sh b/tests/perftest-scripts/perftest-tsdb-compare-var10k-int100s.sh
new file mode 100755
index 0000000000000000000000000000000000000000..5fc5b9d03a4339263eb07a9af9b76ee2fc324f1b
--- /dev/null
+++ b/tests/perftest-scripts/perftest-tsdb-compare-var10k-int100s.sh
@@ -0,0 +1,84 @@
+#!/bin/bash
+
+WORK_DIR=/mnt/root
+TSDB_CMP_DIR=timeseriesdatabase-comparisons/build/tsdbcompare
+
+walLevel=`grep "^walLevel" /etc/taos/taos.cfg | awk '{print $2}'`
+if [[ "$walLevel" -eq "2" ]]; then
+	walPostfix="wal2"
+elif [[ "$walLevel" -eq "1" ]]; then
+	walPostfix="wal1"
+else
+	echo -e "${RED}wrong walLevel $walLevel found! ${NC}"
+	exit 1
+fi
+
+logDir=`grep "^logDir" /etc/taos/taos.cfg | awk '{print $2}'`
+dataDir=`grep "^dataDir" /etc/taos/taos.cfg | awk '{print $2}'`
+
+# Coloured Echoes                                                                                                       #
+function red_echo      { echo -e "\033[31m$@\033[0m";   }                                                               #
+function green_echo    { echo -e "\033[32m$@\033[0m";   }                                                               #
+function yellow_echo   { echo -e "\033[33m$@\033[0m";   }                                                               #
+function white_echo    { echo -e "\033[1;37m$@\033[0m"; }                                                               #
+# Coloured Printfs                                                                                                      #
+function red_printf    { printf "\033[31m$@\033[0m";    }                                                               #
+function green_printf  { printf "\033[32m$@\033[0m";    }                                                               #
+function yellow_printf { printf "\033[33m$@\033[0m";    }                                                               #
+function white_printf  { printf "\033[1;37m$@\033[0m";  }                                                               #
+# Debugging Outputs                                                                                                     #
+function white_brackets { local args="$@"; white_printf "["; printf "${args}"; white_printf "]"; }                      #
+function echoInfo   { local args="$@"; white_brackets $(green_printf "INFO") && echo " ${args}"; }                      #
+function echoWarn   { local args="$@";  echo "$(white_brackets "$(yellow_printf "WARN")" && echo " ${args}";)" 1>&2; }  #
+function echoError  { local args="$@"; echo "$(white_brackets "$(red_printf    "ERROR")" && echo " ${args}";)" 1>&2; }  #
+
+function restartTaosd {
+        echo "Stop taosd"
+	systemctl stop taosd
+	PID=`ps -ef|grep -w taosd | grep -v grep | awk '{print $2}'`
+	while [ -n "$PID" ]
+	do
+		pkill -TERM -x taosd
+		sleep 1
+		PID=`ps -ef|grep -w taosd | grep -v grep | awk '{print $2}'`
+	done
+
+	rm -rf $logDir/*
+	rm -rf $dataDir/*
+	
+        echo "Start taosd"
+	taosd 2>&1 > /dev/null &
+	sleep 10
+}
+
+function runPerfTestVar10K {
+	echoInfo "Restart Taosd"
+	restartTaosd
+
+	cd $WORK_DIR/$TSDB_CMP_DIR
+	./runTDengine.sh -v 10000 -i 100 -w -q 2>&1 | tee $WORK_DIR/perftest-var10k-int100s-$walPostfix-$today.log
+}
+
+function generatePerfPlotVar10K {
+	cd $WORK_DIR
+
+	csvLines=`cat perftest-var10k-int100s-$walPostfix-report.csv | wc -l`
+
+	if [ "$csvLines" -gt "10" ]; then
+		sed -i '1d' perftest-var10k-int100s-$walPostfix-report.csv
+	fi
+
+	gnuplot -e "filename='perftest-var10k-int100s-$walPostfix-report'" -p perftest-csv2png.gnuplot
+}
+
+today=`date +"%Y%m%d"`
+cd $WORK_DIR
+
+echoInfo "run Performance Test with 10K tables data"
+runPerfTestVar10K
+echoInfo "Generate plot of 10K tables data"
+generatePerfPlotVar10K
+
+tar czf $WORK_DIR/taos-log-var10k-int100s-$today.tar.gz $logDir/*
+
+echoInfo "End of TSDB-Compare var10k-int100s-tables-data Test" | tee -a $WORK_DIR/cron.log
diff --git a/tests/perftest-scripts/perftest-tsdb-compare-var10k-int10s.sh b/tests/perftest-scripts/perftest-tsdb-compare-var10k-int10s.sh
new file mode 100755
index 0000000000000000000000000000000000000000..bafa04f174955d9938810f9b5bc353a0b712c3c3
--- /dev/null
+++ b/tests/perftest-scripts/perftest-tsdb-compare-var10k-int10s.sh
@@ -0,0 +1,84 @@
+#!/bin/bash
+
+WORK_DIR=/mnt/root
+TSDB_CMP_DIR=timeseriesdatabase-comparisons/build/tsdbcompare
+
+walLevel=`grep "^walLevel" /etc/taos/taos.cfg | awk '{print $2}'`
+if [[ "$walLevel" -eq "2" ]]; then
+	walPostfix="wal2"
+elif [[ "$walLevel" -eq "1" ]]; then
+	walPostfix="wal1"
+else
+	echo -e "${RED}wrong walLevel $walLevel found! ${NC}"
+	exit 1
+fi
+
+logDir=`grep "^logDir" /etc/taos/taos.cfg | awk '{print $2}'`
+dataDir=`grep "^dataDir" /etc/taos/taos.cfg | awk '{print $2}'`
+
+# Coloured Echoes                                                                                                       #
+function red_echo      { echo -e "\033[31m$@\033[0m";   }                                                               #
+function green_echo    { echo -e "\033[32m$@\033[0m";   }                                                               #
+function yellow_echo   { echo -e "\033[33m$@\033[0m";   }                                                               #
+function white_echo    { echo -e "\033[1;37m$@\033[0m"; }                                                               #
+# Coloured Printfs                                                                                                      #
+function red_printf    { printf "\033[31m$@\033[0m";    }                                                               #
+function green_printf  { printf "\033[32m$@\033[0m";    }                                                               #
+function yellow_printf { printf "\033[33m$@\033[0m";    }                                                               #
+function white_printf  { printf "\033[1;37m$@\033[0m";  }                                                               #
+# Debugging Outputs                                                                                                     #
+function white_brackets { local args="$@"; white_printf "["; printf "${args}"; white_printf "]"; }                      #
+function echoInfo   { local args="$@"; white_brackets $(green_printf "INFO") && echo " ${args}"; }                      #
+function echoWarn   { local args="$@";  echo "$(white_brackets "$(yellow_printf "WARN")" && echo " ${args}";)" 1>&2; }  #
+function echoError  { local args="$@"; echo "$(white_brackets "$(red_printf    "ERROR")" && echo " ${args}";)" 1>&2; }  #
+
+function restartTaosd {
+        echo "Stop taosd"
+	systemctl stop taosd
+	PID=`ps -ef|grep -w taosd | grep -v grep | awk '{print $2}'`
+	while [ -n "$PID" ]
+	do
+		pkill -TERM -x taosd
+		sleep 1
+		PID=`ps -ef|grep -w taosd | grep -v grep | awk '{print $2}'`
+	done
+
+	rm -rf $logDir/*
+	rm -rf $dataDir/*
+	
+        echo "Start taosd"
+	taosd 2>&1 > /dev/null &
+	sleep 10
+}
+
+function runPerfTestVar10K {
+	echoInfo "Restart Taosd"
+	restartTaosd
+
+	cd $WORK_DIR/$TSDB_CMP_DIR
+	./runTDengine.sh -v 10000 -w -q 2>&1 | tee $WORK_DIR/perftest-var10k-int10s-$walPostfix-$today.log
+}
+
+function generatePerfPlotVar10K {
+	cd $WORK_DIR
+
+	csvLines=`cat perftest-var10k-int10s-$walPostfix-report.csv | wc -l`
+
+	if [ "$csvLines" -gt "10" ]; then
+		sed -i '1d' perftest-var10k-int10s-$walPostfix-report.csv
+	fi
+
+	gnuplot -e "filename='perftest-var10k-int10s-$walPostfix-report'" -p perftest-csv2png.gnuplot
+}
+
+today=`date +"%Y%m%d"`
+cd $WORK_DIR
+
+echoInfo "run Performance Test with 10K tables data"
+runPerfTestVar10K
+echoInfo "Generate plot of 10K tables data"
+generatePerfPlotVar10K
+
+tar czf $WORK_DIR/taos-log-var10k-int10s-$today.tar.gz $logDir/*
+
+echoInfo "End of TSDB-Compare var10k-int10s-tables-data Test" | tee -a $WORK_DIR/cron.log
diff --git a/tests/perftest-scripts/runInfluxdb.sh b/tests/perftest-scripts/runInfluxdb.sh
new file mode 100755
index 0000000000000000000000000000000000000000..e8975b05cf43671c174fb95942da89ef8ae4631b
--- /dev/null
+++ b/tests/perftest-scripts/runInfluxdb.sh
@@ -0,0 +1,251 @@
+#!/bin/bash
+#set -x
+
+WORK_DIR=/mnt/root
+DATA_DIR=/mnt/data
+
+# Color setting
+RED='\033[0;31m'
+GREEN='\033[1;32m'
+GREEN_DARK='\033[0;32m'
+GREEN_UNDERLINE='\033[4;32m'
+NC='\033[0m'
+
+# default value
+DEFAULT_BATCH=5000
+DEFAULT_DAYS=1
+DEFAULT_INTERVAL=1
+DEFAULT_SCALEVAR=10
+DEFAULT_DOPREPARE=false
+DEFAULT_DOWRITE=false
+DEFAULT_DOQUERY=false
+
+# function 
+function do_prepare {
+	echo
+	echo "---------------Generating Data-----------------"
+	echo
+
+	echo 
+	echo "Prepare data for InfluxDB...."
+
+	echo "bin/bulk_data_gen -seed 123 -format influx-bulk -sampling-interval $interval_s \
+		-scale-var $scalevar -use-case devops -timestamp-start $TIME_START \
+		-timestamp-end $TIME_END > $DATA_FILE"
+
+	bin/bulk_data_gen -seed 123 -format influx-bulk -sampling-interval $interval_s \
+		-scale-var $scalevar -use-case devops -timestamp-start $TIME_START \
+		-timestamp-end $TIME_END > $DATA_FILE
+}
+
+function do_write {
+	echo "cat $DATA_FILE | bin/bulk_load_influx \
+		--batch-size=$batch --workers=20 --urls=http://172.15.1.5:8086 | grep loaded"
+	INFLUXRES=`cat $DATA_FILE | bin/bulk_load_influx \
+		--batch-size=$batch --workers=20 --urls="http://172.15.1.5:8086" | grep loaded`
+
+	echo -e "${GREEN}InfluxDB writing result:${NC}"
+	echo -e "${GREEN}$INFLUXRES${NC}"
+	DATA=`echo $INFLUXRES|awk '{print($2)}'`
+	TMP=`echo $INFLUXRES|awk '{print($5)}'`
+	IFWTM=`echo ${TMP%s*}`
+}
+
+function do_query {
+
+	echo
+	echo "------------------Querying Data-----------------"
+	echo
+
+	echo 
+	echo  "start query test, query max from 8 hosts group by 1 hour, InfluxDB"
+	echo
+
+#Test case 1
+#测试用例1，查询所有数据中，用8个hostname标签进行匹配，匹配出这8个hostname对应的模拟服务器CPU数据中的usage_user这个监控数据的最大值。
+#select max(usage_user) from cpu where(hostname='host_a' and hostname='host_b'and hostname='host_c'and hostname='host_d'and hostname='host_e'and hostname='host_f' and hostname='host_g'and hostname='host_h') ;
+# a,b,c,d,e,f,g,h are random 8 numbers.
+	echo "IFQS1=bin/bulk_query_gen  -seed 123 -format influx-http -query-type 8-host-all -scale-var $scalevar -queries 1000 | bin/query_benchmarker_influxdb  -urls="http://172.15.1.5:8086"  -workers 50 -print-interval 0|grep wall"
+
+	IFQS1=`bin/bulk_query_gen  -seed 123 -format influx-http -query-type 8-host-all -scale-var $scalevar -queries 1000 | bin/query_benchmarker_influxdb  -urls="http://172.15.1.5:8086"  -workers 50 -print-interval 0|grep wall`
+	echo -e "${GREEN}InfluxDB query test case 1 result:${NC}"
+	echo -e "${GREEN}$IFQS1${NC}"
+	TMP=`echo $IFQS1|awk '{print($4)}'`
+	IFQ1=`echo ${TMP%s*}`
+
+#Test case 2
+#测试用例2，查询所有数据中，用8个hostname标签进行匹配，匹配出这8个hostname对应的模拟服务器CPU数据中的usage_user这个监控数据，以1小时为粒度，查询每1小时的最大值。
+#select max(usage_user) from cpu where(hostname='host_a' and hostname='host_b'and hostname='host_c'and hostname='host_d'and hostname='host_e'and hostname='host_f' and hostname='host_g'and hostname='host_h') interval(1h);
+# a,b,c,d,e,f,g,h are random 8 numbers
+	echo "IFQS2=bin/bulk_query_gen  -seed 123 -format influx-http -query-type 8-host-allbyhr -scale-var $scalevar -queries 1000 | bin/query_benchmarker_influxdb  -urls=http://172.15.1.5:8086  -workers 50 -print-interval 0|grep wall"
+
+	IFQS2=`bin/bulk_query_gen  -seed 123 -format influx-http -query-type 8-host-allbyhr \
+		-scale-var $scalevar -queries 1000 | bin/query_benchmarker_influxdb  \
+		-urls="http://172.15.1.5:8086"  -workers 50 -print-interval 0|grep wall`
+	echo -e "${GREEN}InfluxDB query test case 2 result:${NC}"
+	echo -e "${GREEN}$IFQS2${NC}"
+	TMP=`echo $IFQS2|awk '{print($4)}'`
+	IFQ2=`echo ${TMP%s*}`
+
+#Test case 3
+#测试用例3，测试用例3，随机查询12个小时的数据，用8个hostname标签进行匹配，匹配出这8个hostname对应的模拟服务器CPU数据中的usage_user这个监控数据，以10分钟为粒度，查询每10分钟的最大值
+#select max(usage_user) from cpu where(hostname='host_a' and hostname='host_b'and hostname='host_c'and hostname='host_d'and hostname='host_e'and hostname='host_f' and hostname='host_g'and hostname='host_h') and time >x and time <y interval(10m);
+# a,b,c,d,e,f,g,h are random 8 numbers, y-x =12 hour
+	echo "IFQS3=bin/bulk_query_gen  -seed 123 -format influx-http -query-type 8-host-12-hr -scale-var $scalevar -queries 1000 | bin/query_benchmarker_influxdb  -urls=http://172.15.1.5:8086  -workers 50 -print-interval 0|grep wall"
+
+	IFQS3=`bin/bulk_query_gen  -seed 123 -format influx-http -query-type 8-host-12-hr \
+		-scale-var $scalevar -queries 1000 | bin/query_benchmarker_influxdb  \
+		-urls="http://172.15.1.5:8086"  -workers 50 -print-interval 0|grep wall`
+	echo -e "${GREEN}InfluxDB query test case 3 result:${NC}"
+	echo -e "${GREEN}$IFQS3${NC}"
+	TMP=`echo $IFQS3|awk '{print($4)}'`
+	IFQ3=`echo ${TMP%s*}`
+
+#Test case 4
+#测试用例4，随机查询1个小时的数据，用8个hostname标签进行匹配，匹配出这8个hostname对应的模拟服务器CPU数据中的usage_user这个监控数据，以1分钟为粒度，查询每1分钟的最大值
+#select max(usage_user) from cpu where(hostname='host_a' and hostname='host_b'and hostname='host_c'and hostname='host_d'and hostname='host_e'and hostname='host_f' and hostname='host_g'and hostname='host_h') and time >x and time <y interval(10m);
+# a,b,c,d,e,f,g,h are random 8 numbers, y-x =1 hours
+	echo "IFQS4=bin/bulk_query_gen  -seed 123 -format influx-http -query-type 8-host-1-hr -scale-var $scalevar -queries 1000 | bin/query_benchmarker_influxdb  -urls=http://172.15.1.5:8086  -workers 50 -print-interval 0|grep wall"
+
+	IFQS4=`bin/bulk_query_gen  -seed 123 -format influx-http -query-type 8-host-1-hr \
+		-scale-var $scalevar -queries 1000 | bin/query_benchmarker_influxdb  \
+		-urls="http://172.15.1.5:8086"  -workers 50 -print-interval 0|grep wall`
+	echo -e "${GREEN}InfluxDB query test case 4 result:${NC}"
+	echo -e "${GREEN}$IFQS4${NC}"
+	TMP=`echo $IFQS4|awk '{print($4)}'`
+	IFQ4=`echo ${TMP%s*}`
+
+}
+
+batch=$DEFAULT_BATCH
+days=$DEFAULT_DAYS
+interval=$DEFAULT_INTERVAL
+scalevar=$DEFAULT_SCALEVAR
+doprepare=$DEFAULT_DOPREPARE
+dowrite=$DEFAULT_DOWRITE
+doquery=$DEFAULT_DOQUERY
+
+help="$(basename "$0") [-h] [-b batchsize] [-d data-of-days] [-i interval] [-v scalevar] [-p false for don't prepare] [-w false for don't do write] [-q false for don't do query]"
+
+while getopts ':b:d:i:v:pwqh' flag; do
+	case "${flag}" in
+		b) batch=${OPTARG};;
+		d) days=${OPTARG};;
+		i) interval=${OPTARG};;
+		v) scalevar=${OPTARG};;
+		p) doprepare=${OPTARG};;
+		w) dowrite=${OPTARG};;
+		q) doquery=${OPTARG};;
+		:) echo -e "{RED}Missing argument!{NC}"
+			echo "$help"
+			exit 1
+			;;
+		h) echo "$help"
+			exit 1
+			;;
+	esac
+done
+
+if [[ $scalevar -eq 10000 ]]
+then
+	TIME_START="2018-01-01T00:00:00Z"
+	TIME_END="2018-01-02T00:00:00Z"
+
+	if [[ $interval -eq 100 ]]
+	then
+		interval_s=100s
+		DATA_FILE=$DATA_DIR/influxdb-var10k-int100s.dat
+		RECORD_CSV_FILE=$WORK_DIR/perftest-influxdb-report-var10k-int100s.csv
+	else
+		interval_s=10s
+		DATA_FILE=$DATA_DIR/influxdb-var10k-int10s.dat
+		RECORD_CSV_FILE=$WORK_DIR/perftest-influxdb-report-var10k-int10s.csv
+	fi
+else
+	if [[ $days -eq 1 ]]
+	then
+		TIME_START="2018-01-01T00:00:00Z"
+		TIME_END="2018-01-02T00:00:00Z"
+		DATA_FILE=$DATA_DIR/influxdb-1d.dat
+		RECORD_CSV_FILE=$WORK_DIR/perftest-influxdb-report-1d.csv
+	elif [[ $days -eq 13 ]]
+	then
+		TIME_START="2018-01-01T00:00:00Z"
+		TIME_END="2018-01-14T00:00:00Z"
+		DATA_FILE=$DATA_DIR/influxdb-13d.dat
+		RECORD_CSV_FILE=$WORK_DIR/perftest-influxdb-report-13d.csv
+	else
+		echo -e "{RED} don't support input $days{NC}"
+		exit 1
+	fi
+	interval_s=${interval}s
+fi
+
+echo "TIME_START: $TIME_START, TIME_END: $TIME_END, DATA_FILE: $DATA_FILE"
+echo "doprepare: $doprepare, dowrite: $dowrite, doquery: $doquery"
+
+if $doprepare;
+then
+	do_prepare
+fi
+
+docker network create --ip-range 172.15.1.255/24 --subnet 172.15.1.1/16 tsdbcomp >>/dev/null 2>&1
+INFLUX=`docker run -d -p 8086:8086 --net tsdbcomp --ip 172.15.1.5 influxdb` >>/dev/null 2>&1
+sleep 10
+
+if $dowrite;
+then
+	echo -e "Start test InfluxDB writting, result in ${GREEN}Green line${NC}"
+	do_write
+fi
+
+if $doquery;
+then
+	echo -e "Start test InfluxDB query, result in ${GREEN}Green line${NC}"
+	do_query
+fi
+
+echo
+echo
+echo    "======================================================"
+echo    "             tsdb performance comparision             "
+echo    "======================================================"
+if $dowrite;
+then
+	echo -e "       Writing $DATA records test takes:          "
+	printf  "       InfluxDB           |       %-4.5f Seconds    \n" $IFWTM
+	echo    "------------------------------------------------------"
+fi
+
+if $doquery;
+then
+	echo    "                   Query test cases:                "
+	echo    " case 1: select the max(value) from all data    "
+	echo    " filtered out 8 hosts                                 "
+	echo    "       Query test case 1 takes:                      "
+	printf  "       InfluxDB           |       %-4.5f Seconds    \n" $IFQ1
+	echo    "------------------------------------------------------"
+	echo    " case 2: select the max(value) from all data          "
+	echo    " filtered out 8 hosts with an interval of 1 hour     "
+	echo    " case 2 takes:                                       "
+	printf  "       InfluxDB           |       %-4.5f Seconds    \n" $IFQ2
+	echo    "------------------------------------------------------"
+	echo    " case 3: select the max(value) from random 12 hours"
+	echo    " data filtered out 8 hosts with an interval of 10 min         "
+	echo    " filtered out 8 hosts interval(1h)                   "
+	echo    " case 3 takes:                                       "
+	printf  "       InfluxDB           |       %-4.5f Seconds    \n" $IFQ3
+	echo    "------------------------------------------------------"
+	echo    " case 4: select the max(value) from random 1 hour data  "
+	echo    " data filtered out 8 hosts with an interval of 1 min         "
+	echo    " case 4 takes:                                        "
+	printf  "       InfluxDB           |       %-4.5f Seconds    \n" $IFQ4
+	echo    "------------------------------------------------------"
+fi
+
+docker stop $INFLUX >>/dev/null 2>&1
+docker container rm -f $INFLUX >>/dev/null 2>&1
+docker network rm tsdbcomp >>/dev/null 2>&1
+
+today=`date +"%Y%m%d"`
+echo "${today}, ${IFWTM}, ${IFQ1}, ${IFQ2}, ${IFQ3}, ${IFQ4}" >> $RECORD_CSV_FILE
diff --git a/tests/perftest-scripts/runTDengine.sh b/tests/perftest-scripts/runTDengine.sh
new file mode 100755
index 0000000000000000000000000000000000000000..6c5cf4e55ecb263501e90a91866d14289de9184b
--- /dev/null
+++ b/tests/perftest-scripts/runTDengine.sh
@@ -0,0 +1,283 @@
+#!/bin/bash
+#set -x
+
+WORK_DIR=/mnt/root
+DATA_DIR=/mnt/data
+
+# Color setting
+RED='\033[0;31m'
+GREEN='\033[1;32m'
+GREEN_DARK='\033[0;32m'
+GREEN_UNDERLINE='\033[4;32m'
+NC='\033[0m'
+
+# default value
+DEFAULT_BATCH=5000
+DEFAULT_DAYS=1
+DEFAULT_INTERVAL=1
+DEFAULT_SCALEVAR=10
+DEFAULT_DOPREPARE=false
+DEFAULT_DOWRITE=false
+DEFAULT_DOQUERY=false
+
+# function 
+function do_prepare {
+	echo
+	echo "---------------Generating Data-----------------"
+	echo
+
+	echo 
+	echo "Prepare data for TDengine...."
+
+	# bin/bulk_data_gen -seed 123 -format tdengine -tdschema-file config/TDengineSchema.toml -scale-var 100 -use-case devops -timestamp-start "2018-01-01T00:00:00Z" -timestamp-end "2018-01-02T00:00:00Z"  > $DATA_DIR/tdengine.dat
+	echo "bin/bulk_data_gen -seed 123 -format tdengine -sampling-interval $interval_s \
+		-tdschema-file config/TDengineSchema.toml -scale-var $scalevar \
+		-use-case devops -timestamp-start $TIME_START \ 
+		-timestamp-end $TIME_END \ 
+	       	> $DATA_FILE"
+
+	bin/bulk_data_gen -seed 123 -format tdengine -sampling-interval $interval_s \
+		-tdschema-file config/TDengineSchema.toml -scale-var $scalevar \
+		-use-case devops -timestamp-start $TIME_START \
+		-timestamp-end $TIME_END  \
+		> $DATA_FILE
+}
+
+function do_write {
+	echo "TDENGINERES=cat $DATA_FILE |bin/bulk_load_tdengine --url 127.0.0.1:0 \
+		--batch-size $batch -do-load -report-tags n1 -workers 20 -fileout=false| grep loaded"
+
+	TDENGINERES=`cat $DATA_FILE |bin/bulk_load_tdengine --url 127.0.0.1:0 \
+		--batch-size $batch -do-load -report-tags n1 -workers 20 -fileout=false| grep loaded`
+
+	echo
+	echo -e "${GREEN}TDengine writing result:${NC}"
+	echo -e "${GREEN}$TDENGINERES${NC}"
+	DATA=`echo $TDENGINERES|awk '{print($2)}'`
+	TMP=`echo $TDENGINERES|awk '{print($5)}'`
+	TDWTM=`echo ${TMP%s*}`
+
+}
+
+function do_query {
+
+	echo
+	echo "------------------Querying Data-----------------"
+	echo
+
+	echo 
+	echo  "start query test, query max from 8 hosts group by 1 hour, TDengine"
+	echo
+
+#Test case 1
+#测试用例1，查询所有数据中，用8个hostname标签进行匹配，匹配出这8个hostname对应的模拟服务器CPU数据中的usage_user这个监控数据的最大值。
+#select max(usage_user) from cpu where(hostname='host_a' and hostname='host_b'and hostname='host_c'and hostname='host_d'and hostname='host_e'and hostname='host_f' and hostname='host_g'and hostname='host_h') ;
+# a,b,c,d,e,f,g,h are random 8 numbers.
+	echo "TDQS1=bin/bulk_query_gen  -seed 123 -format tdengine -query-type 8-host-all \
+		-scale-var $scalevar -queries 1000 | bin/query_benchmarker_tdengine  \
+		-urls=http://127.0.0.1:6020 -workers 50 -print-interval 0|grep wall"
+
+	TDQS1=`bin/bulk_query_gen  -seed 123 -format tdengine -query-type 8-host-all \
+		-scale-var $scalevar -queries 1000 | bin/query_benchmarker_tdengine  \
+		-urls="http://127.0.0.1:6020" -workers 50 -print-interval 0|grep wall`
+	echo
+	echo -e "${GREEN}TDengine query test case 1 result:${NC}"
+	echo -e "${GREEN}$TDQS1${NC}"
+	TMP=`echo $TDQS1|awk '{print($4)}'`
+	TDQ1=`echo ${TMP%s*}`
+
+#Test case 2
+#测试用例2，查询所有数据中，用8个hostname标签进行匹配，匹配出这8个hostname对应的模拟服务器CPU数据中的usage_user这个监控数据，以1小时为粒度，查询每1小时的最大值。
+#select max(usage_user) from cpu where(hostname='host_a' and hostname='host_b'and hostname='host_c'and hostname='host_d'and hostname='host_e'and hostname='host_f' and hostname='host_g'and hostname='host_h') interval(1h);
+# a,b,c,d,e,f,g,h are random 8 numbers
+	echo "TDQS2=bin/bulk_query_gen  -seed 123 -format tdengine -query-type 8-host-allbyhr \
+		-scale-var $scalevar -queries 1000 | bin/query_benchmarker_tdengine  \
+		-urls=http://127.0.0.1:6020 -workers 50 -print-interval 0|grep wall"
+
+	TDQS2=`bin/bulk_query_gen  -seed 123 -format tdengine -query-type 8-host-allbyhr \
+		-scale-var $scalevar -queries 1000 | bin/query_benchmarker_tdengine  \
+		-urls="http://127.0.0.1:6020" -workers 50 -print-interval 0|grep wall`
+
+	echo
+	echo -e "${GREEN}TDengine query test case 2 result:${NC}"
+	echo -e "${GREEN}$TDQS2${NC}"
+	TMP=`echo $TDQS2|awk '{print($4)}'`
+	TDQ2=`echo ${TMP%s*}`
+
+#Test case 3
+#测试用例3，测试用例3，随机查询12个小时的数据，用8个hostname标签进行匹配，匹配出这8个hostname对应的模拟服务器CPU数据中的usage_user这个监控数据，以10分钟为粒度，查询每10分钟的最大值
+#select max(usage_user) from cpu where(hostname='host_a' and hostname='host_b'and hostname='host_c'and hostname='host_d'and hostname='host_e'and hostname='host_f' and hostname='host_g'and hostname='host_h') and time >x and time <y interval(10m);
+# a,b,c,d,e,f,g,h are random 8 numbers, y-x =12 hour
+	echo "TDQS3=bin/bulk_query_gen  -seed 123 -format tdengine -query-type 8-host-12-hr \
+		-scale-var $scalevar -queries 1000 | bin/query_benchmarker_tdengine  \
+		-urls=http://127.0.0.1:6020 -workers 50 -print-interval 0|grep wall"
+
+	TDQS3=`bin/bulk_query_gen  -seed 123 -format tdengine -query-type 8-host-12-hr \
+		-scale-var $scalevar -queries 1000 | bin/query_benchmarker_tdengine  \
+		-urls="http://127.0.0.1:6020" -workers 50 -print-interval 0|grep wall`
+	echo
+	echo -e "${GREEN}TDengine query test case 3 result:${NC}"
+	echo -e "${GREEN}$TDQS3${NC}"
+	TMP=`echo $TDQS3|awk '{print($4)}'`
+	TDQ3=`echo ${TMP%s*}`
+
+#Test case 4
+#测试用例4，随机查询1个小时的数据，用8个hostname标签进行匹配，匹配出这8个hostname对应的模拟服务器CPU数据中的usage_user这个监控数据，以1分钟为粒度，查询每1分钟的最大值
+#select max(usage_user) from cpu where(hostname='host_a' and hostname='host_b'and hostname='host_c'and hostname='host_d'and hostname='host_e'and hostname='host_f' and hostname='host_g'and hostname='host_h') and time >x and time <y interval(10m);
+# a,b,c,d,e,f,g,h are random 8 numbers, y-x =1 hours
+	echo "TDQS4=bin/bulk_query_gen  -seed 123 -format tdengine -query-type 8-host-1-hr \
+		-scale-var $scalevar -queries 1000 | bin/query_benchmarker_tdengine  \
+		-urls=http://127.0.0.1:6020 -workers 50 -print-interval 0|grep wall"
+
+	TDQS4=`bin/bulk_query_gen  -seed 123 -format tdengine -query-type 8-host-1-hr \
+		-scale-var $scalevar -queries 1000 | bin/query_benchmarker_tdengine  \
+		-urls="http://127.0.0.1:6020" -workers 50 -print-interval 0|grep wall`
+	echo
+	echo -e "${GREEN}TDengine query test case 4 result:${NC}"
+	echo -e "${GREEN}$TDQS4${NC}"
+	TMP=`echo $TDQS4|awk '{print($4)}'`
+	TDQ4=`echo ${TMP%s*}`
+
+}
+
+batch=$DEFAULT_BATCH
+days=$DEFAULT_DAYS
+interval=$DEFAULT_INTERVAL
+scalevar=$DEFAULT_SCALEVAR
+doprepare=$DEFAULT_DOPREPARE
+dowrite=$DEFAULT_DOWRITE
+doquery=$DEFAULT_DOQUERY
+
+help="$(basename "$0") [-h] [-b batchsize] [-d data-of-days] [-i interval] [-v scalevar] [-p false for don't prepare] [-w false for don't do write] [-q false for don't do query]"
+
+while getopts ':b:d:i:v:pwqh' flag; do
+	case "${flag}" in
+		b) batch=${OPTARG};;
+		d) days=${OPTARG};;
+		i) interval=${OPTARG};;
+		v) scalevar=${OPTARG};;
+		p) doprepare=${OPTARG};;
+		w) dowrite=${OPTARG};;
+		q) doquery=${OPTARG};;
+		:) echo -e "{RED}Missing argument!{NC}"
+			echo "$help"
+			exit 1
+			;;
+		h) echo "$help"
+			exit 1
+			;;
+	esac
+done
+
+walLevel=`grep "^walLevel" /etc/taos/taos.cfg | awk '{print $2}'`
+if [[ "$walLevel" -eq "2" ]]; then
+	walPostfix="wal2"
+elif [[ "$walLevel" -eq "1" ]]; then
+	walPostfix="wal1"
+else
+	echo -e "${RED}wrong walLevel $walLevel found! ${NC}"
+	exit 1
+fi
+
+echo -e "${GREEN} $walPostfix found! ${NC}"
+
+if [[ $scalevar -eq 10000 ]]
+then
+	TIME_START="2018-01-01T00:00:00Z"
+	TIME_END="2018-01-02T00:00:00Z"
+
+	if [[ $interval -eq 100 ]]
+	then
+		interval_s=100s
+		DATA_FILE=$DATA_DIR/tdengine-var10k-int100s.dat
+		RECORD_CSV_FILE=$WORK_DIR/perftest-var10k-int100s-$walPostfix-report.csv
+	else
+		interval_s=10s
+		DATA_FILE=$DATA_DIR/tdengine-var10k-int10s.dat
+		RECORD_CSV_FILE=$WORK_DIR/perftest-var10k-int10s-$walPostfix-report.csv
+	fi
+else
+	if [[ $days -eq 1 ]]
+	then
+		TIME_START="2018-01-01T00:00:00Z"
+		TIME_END="2018-01-02T00:00:00Z"
+		DATA_FILE=$DATA_DIR/tdengine-1d.dat
+		RECORD_CSV_FILE=$WORK_DIR/perftest-1d-$walPostfix-report.csv
+	elif [[ $days -eq 13 ]]
+	then
+		TIME_START="2018-01-01T00:00:00Z"
+		TIME_END="2018-01-14T00:00:00Z"
+		DATA_FILE=$DATA_DIR/tdengine-13d.dat
+		RECORD_CSV_FILE=$WORK_DIR/perftest-13d-$walPostfix-report.csv
+	else
+		echo -e "{RED} don't support input $days{NC}"
+		exit 1
+	fi
+
+	interval_s=${interval}s
+fi
+
+echo "TIME_START: $TIME_START, TIME_END: $TIME_END, DATA_FILE: $DATA_FILE"
+echo "doprepare: $doprepare, dowrite: $dowrite, doquery: $doquery"
+
+if $doprepare;
+then
+	do_prepare
+fi
+
+echo
+
+if $dowrite;
+then
+	echo -e "Start test TDengine writting, result in ${GREEN}Green line${NC}"
+	do_write
+fi
+
+if $doquery;
+then
+	echo -e "Start test TDengine query, result in ${GREEN}Green line${NC}"
+	do_query
+fi
+
+echo
+echo
+echo    "======================================================"
+echo    "             tsdb performance comparision             "
+echo    "======================================================"
+if $dowrite;
+then
+	echo -e "       Writing $DATA records test takes:          "
+	printf  "       TDengine           |       %-4.5f Seconds    \n" $TDWTM
+	echo    "------------------------------------------------------"
+fi
+
+if $doquery;
+then
+	echo    "                   Query test cases:                "
+	echo    " case 1: select the max(value) from all data    "
+	echo    " filtered out 8 hosts                                 "
+	echo    "       Query test case 1 takes:                      "
+	printf  "       TDengine           |       %-4.5f Seconds    \n" $TDQ1
+	echo    "------------------------------------------------------"
+	echo    " case 2: select the max(value) from all data          "
+	echo    " filtered out 8 hosts with an interval of 1 hour     "
+	echo    " case 2 takes:                                       "
+	printf  "       TDengine           |       %-4.5f Seconds    \n" $TDQ2
+	echo    "------------------------------------------------------"
+	echo    " case 3: select the max(value) from random 12 hours"
+	echo    " data filtered out 8 hosts with an interval of 10 min         "
+	echo    " filtered out 8 hosts interval(1h)                   "
+	echo    " case 3 takes:                                       "
+	printf  "       TDengine           |       %-4.5f Seconds    \n" $TDQ3
+	echo    "------------------------------------------------------"
+	echo    " case 4: select the max(value) from random 1 hour data  "
+	echo    " data filtered out 8 hosts with an interval of 1 min         "
+	echo    " case 4 takes:                                        "
+	printf  "       TDengine           |       %-4.5f Seconds    \n" $TDQ4
+	echo    "------------------------------------------------------"
+fi
+
+#bulk_query_gen/bulk_query_gen  -format influx-http -query-type 1-host-1-hr -scale-var 10 -queries 1000 | query_benchmarker_influxdb/query_benchmarker_influxdb  -urls="http://172.26.89.231:8086" 
+#bulk_query_gen/bulk_query_gen  -format tdengine -query-type 1-host-1-hr -scale-var 10 -queries 1000 | query_benchmarker_tdengine/query_benchmarker_tdengine  -urls="http://172.26.89.231:6020" 
+today=`date +"%Y%m%d"`
+echo "${today}, ${TDWTM}, ${TDQ1}, ${TDQ2}, ${TDQ3}, ${TDQ4}" >> $RECORD_CSV_FILE
diff --git a/tests/perftest-scripts/taosdemo-rps-csv2png.gnuplot b/tests/perftest-scripts/taosdemo-rps-csv2png.gnuplot
new file mode 100644
index 0000000000000000000000000000000000000000..a7fcb4bd43b17a03f92a432446971412dcfcc54c
--- /dev/null
+++ b/tests/perftest-scripts/taosdemo-rps-csv2png.gnuplot
@@ -0,0 +1,24 @@
+#!/user/bin/gnuplot
+reset
+set terminal png
+
+set title filename font ",20"
+
+set ylabel "Time in Seconds"
+
+set xdata time
+set timefmt "%Y%m%d"
+set format x "%Y-%m-%d"
+set xlabel "Date"
+
+set style data linespoints
+
+set terminal pngcairo size 1024,768 enhanced font 'Segoe UI, 10'
+set output filename . '.png'
+set datafile separator ','
+
+set key reverse Left outside
+set grid
+
+
+plot filename . '.csv' 	using 1:2  title "Request Per Second"
diff --git a/tests/pytest/query/queryJoin.py b/tests/pytest/query/queryJoin.py
index bfc493580e00640c344d57047e606aa45bffa243..6d135e1006ba705d348bf2417605c0defd6b31a8 100644
--- a/tests/pytest/query/queryJoin.py
+++ b/tests/pytest/query/queryJoin.py
@@ -112,8 +112,7 @@ class TDTestCase:
         tdSql.query("select stb_t.ts, stb_t.dscrption, stb_t.temperature, stb_t.id, stb_p.dscrption, stb_p.pressure from stb_p, stb_t where stb_p.ts=stb_t.ts and stb_p.id = stb_t.id")
         tdSql.checkRows(6)
 
-        tdSql.query("select stb_t.ts, stb_t.dscrption, stb_t.temperature, stb_t.pid, stb_p.id, stb_p.dscrption, stb_p.pressure,stb_v.velocity from stb_p, stb_t, stb_v where stb_p.ts=stb_t.ts and stb_p.ts=stb_v.ts and stb_p.id = stb_t.id")
-        tdSql.checkRows(2)
+        tdSql.error("select stb_t.ts, stb_t.dscrption, stb_t.temperature, stb_t.pid, stb_p.id, stb_p.dscrption, stb_p.pressure,stb_v.velocity from stb_p, stb_t, stb_v where stb_p.ts=stb_t.ts and stb_p.ts=stb_v.ts and stb_p.id = stb_t.id")
 
     def stop(self):
         tdSql.close()
diff --git a/tests/pytest/query/queryMetaData.py b/tests/pytest/query/queryMetaData.py
index 01c63c3f4a2702f19ccfd19d60dfebbc03671f7a..8fb9d9bf3a7a1648607f7943ac807a2ed69d8222 100755
--- a/tests/pytest/query/queryMetaData.py
+++ b/tests/pytest/query/queryMetaData.py
@@ -58,7 +58,7 @@ class MetadataQuery:
         cursor.execute("use test")
         base = threadID * self.tables
 
-        tablesPerThread = (int) self.tables / self.numOfTherads
+        tablesPerThread = int (self.tables / self.numOfTherads)
         for i in range(tablesPerThread):
             cursor.execute(
                 '''create table t%d using meters tags(