Merge pull request #2773 from taosdata/feature/sangshuduo/perftest-script-improve

Feature/sangshuduo/perftest script improve

tests/perftest-scripts/cassandraTestWriteLoop.sh

@@ -3,7 +3,6 @@
 DATA_DIR=/mnt/root/testdata
 NUM_LOOP=1
 NUM_OF_FILES=100
-OUT_FILE=cassandraWrite.out
 
 rowsPerRequest=(1 10 50 100 500 1000 2000)
 
@@ -14,46 +13,56 @@ function printTo {
 }
 
 function runTest {
-  for c in `seq 1 $clients`; do
-    avgRPR[$c]=0
-  done
+  declare -A avgRPR
 
-  printf "R/R, "
-  for c in `seq 1 $clients`; do
-    if [ "$c" == "1" ]; then
-      printf "$c client, "
-    else
-      printf "$c clients, "
-    fi
+  for r in ${!rowsPerRequest[@]}; do
+    for c in `seq 1 $clients`; do
+      avgRPR[$r, $c]=0
+    done
   done
-  printf "\n"
 
-  for r in ${rowsPerRequest[@]}; do
-    printf "$r, "
+  for r in ${!rowsPerRequest[@]}; do
     for c in `seq 1 $clients`; do
       totalRPR=0
+      OUT_FILE=cassandraWrite-rows${rowsPerRequest[$r]}-clients$c.out
       for i in `seq 1 $NUM_LOOP`; do
         printTo "loop i:$i, java -jar $CAS_TEST_DIR/cassandratest/target/cassandratest-1.0-SNAPSHOT-jar-with-dependencies.jar \
             -datadir $DATA_DIR \
             -numofFiles $NUM_OF_FILES \
-            -rowsperrequest $r \
+            -rowsperrequest ${rowsPerRequest[$r]} \
             -writeclients $c \
             -conf $CAS_TEST_DIR/application.conf"
         java -jar $CAS_TEST_DIR/cassandratest/target/cassandratest-1.0-SNAPSHOT-jar-with-dependencies.jar \
             -datadir $DATA_DIR \
             -numofFiles $NUM_OF_FILES \
-            -rowsperrequest $r \
+            -rowsperrequest ${rowsPerRequest[$r]} \
             -writeclients $c \
             -conf $CAS_TEST_DIR/application.conf \
-            2>&1 > $OUT_FILE
+            2>&1 | tee $OUT_FILE
         RPR=`cat $OUT_FILE | grep "insertation speed:" | awk '{print $(NF-1)}'`
         totalRPR=`echo "scale=4; $totalRPR + $RPR" | bc`
-        printTo "rows:$r, clients:$c, i:$i RPR:$RPR"
+        printTo "r:$r rows:${rowsPerRequest[$r]}, clients:$c, i:$i RPR:$RPR"
       done
-      avgRPR[$c]=`echo "scale=4; $totalRPR / $NUM_LOOP" | bc`
+      avgRPR[$r,$c]=`echo "scale=4; $totalRPR / $NUM_LOOP" | bc`
+      printTo "r:$r c:$c avgRPR:${avgRPR[$r,$c]}"
     done
+
+  done
+
+  printf "R/R, "
+  for c in `seq 1 $clients`; do
+    if [ "$c" == "1" ]; then
+      printf "$c client, "
+    else
+      printf "$c clients, "
+    fi
+  done
+  printf "\n"
+
+  for r in ${!rowsPerRequest[@]}; do
+    printf "${rowsPerRequest[$r]}, "
     for c in `seq 1 $clients`; do
-      printf "${avgRPR[$c]}, "
+      printf "${avgRPR[$r,$c]}, "
     done
     printf "\n"
   done