三个数据库的参数一致

conf/influxdb/log.properties

@@ -15,12 +15,12 @@ handlers= java.util.logging.FileHandler, java.util.logging.ConsoleHandler
 # default file output is in user's home directory.
 java.util.logging.FileHandler.pattern = log/influxdb/log.log
 java.util.logging.FileHandler.count = 100
-java.util.logging.FileHandler.level = FINE
+java.util.logging.FileHandler.level = INFO
 #java.util.logging.FileHandler.level = WARNING
 java.util.logging.FileHandler.formatter = java.util.logging.SimpleFormatter
 
 # Limit the message that are printed on the console to INFO and above.
-java.util.logging.ConsoleHandler.level = FINE
+java.util.logging.ConsoleHandler.level = INFO
 #java.util.logging.ConsoleHandler.level = WARNING
 java.util.logging.ConsoleHandler.formatter = java.util.logging.SimpleFormatter
 

conf/iotdb/log.properties

@@ -15,12 +15,12 @@ handlers= java.util.logging.FileHandler, java.util.logging.ConsoleHandler
 # default file output is in user's home directory.
 java.util.logging.FileHandler.pattern = log/iotdb/log.log
 java.util.logging.FileHandler.count = 100
-java.util.logging.FileHandler.level = FINE
+java.util.logging.FileHandler.level = INFO
 #java.util.logging.FileHandler.level = WARNING
 java.util.logging.FileHandler.formatter = java.util.logging.SimpleFormatter
 
 # Limit the message that are printed on the console to INFO and above.
-java.util.logging.ConsoleHandler.level = FINE
+java.util.logging.ConsoleHandler.level = INFO
 #java.util.logging.ConsoleHandler.level = WARNING
 java.util.logging.ConsoleHandler.formatter = java.util.logging.SimpleFormatter
 

conf/tsdb/log.properties

@@ -15,12 +15,12 @@ handlers= java.util.logging.FileHandler, java.util.logging.ConsoleHandler
 # default file output is in user's home directory.
 java.util.logging.FileHandler.pattern = log/tsdb/log.log
 java.util.logging.FileHandler.count = 100
-java.util.logging.FileHandler.level = FINE
+java.util.logging.FileHandler.level = INFO
 #java.util.logging.FileHandler.level = WARNING
 java.util.logging.FileHandler.formatter = java.util.logging.SimpleFormatter
 
 # Limit the message that are printed on the console to INFO and above.
-java.util.logging.ConsoleHandler.level = FINE
+java.util.logging.ConsoleHandler.level = INFO
 #java.util.logging.ConsoleHandler.level = WARNING
 java.util.logging.ConsoleHandler.formatter = java.util.logging.SimpleFormatter
 

shell/influxdb/common.sh

@@ -0,0 +1,5 @@
+#!/usr/bin/env bash
+
+#host=39.104.80.229
+host=127.0.0.1
+#host=172.24.217.33

shell/influxdb/test/aggHistDataOverTime.sh

@@ -2,9 +2,7 @@
 
 ROOT=$(cd `dirname $0`/../../../; pwd)
 cd $ROOT
-
-#host=39.104.80.229
-host=127.0.0.1
+source $ROOT/shell/influxdb/common.sh
 
 for days in 360
 do

shell/influxdb/test/insertHistoricalRandomData.sh

@@ -3,8 +3,7 @@
 ROOT=$(cd `dirname $0`/../../../; pwd)
 cd $ROOT
 
-#host=39.104.80.229
-host=127.0.0.1
+source $ROOT/shell/influxdb/common.sh
 
 #dataCountPerPointArray=(1000 2000 3000 5000 10000 20000 30000 50000 100000)
 dataCountPerPointArray=(1000)
@@ -12,7 +11,7 @@ dataCountPerPointArray=(1000)
 pointCountArray=(1)
 
 index=1
-beginDate="2021-06-01 00:00:00"
+beginDate="2017-06-01 00:00:00"
 echo beginDate:beginDate
 
 for(( i=0;i<${#pointCountArray[@]};i++))
@@ -25,9 +24,9 @@ do
     dataCountPerPoint=${dataCountPerPointArray[j]}
     pointNamePrefix="pointName${index}_"
     echo "----test insert pointCount:${pointCount} dataCountPerPoint:${dataCountPerPoint}"
-    java -cp ./lib/influxdb.jar demo.allInsert.InsertHistoricalRandomData \
+    java -cp ./lib/influxdb.jar -Xmx8000m demo.allInsert.InsertHistoricalRandomData \
     --host $host --pointNamePrefix ${pointNamePrefix} --pointCount ${pointCount}  \
-    --dataCountPerPoint ${dataCountPerPoint} --beginDate "$beginDate" --period 15000 \
+    --dataCountPerPoint ${dataCountPerPoint} --beginDate "$beginDate" --period 1000 \
     --seed 1 --mean 10 --variance 1 --debug 0 2>&1 | tee -a ./log/influxdb/out.log
   done
 done

shell/influxdb/test/insertRealtimeRandomData.sh

@@ -3,8 +3,7 @@
 ROOT=$(cd `dirname $0`/../../../; pwd)
 cd $ROOT
 
-#host=39.104.80.229
-host=127.0.0.1
+source $ROOT/shell/influxdb/common.sh
 
 clear
 #for pointCount in 1000 2000 3000 5000 10000 20000 30000 50000 100000 200000

shell/influxdb/test/queryDataAtNow.sh

@@ -3,8 +3,7 @@
 ROOT=$(cd `dirname $0`/../../../; pwd)
 cd $ROOT
 
-#host=39.104.80.229
-host=127.0.0.1
+source $ROOT/shell/influxdb/common.sh
 
 #pointCountArray=(1 2 3 5 10 20 30 50 100 200 300 500 1000 2000 3000 5000 10000 20000 30000 50000 100000 200000)
 pointCountArray=(1 2 3 5 10 20 30 50 100 200 300 500 1000 2000 3000 5000 10000 20000)

shell/influxdb/test/queryDataAtTime.sh

@@ -3,8 +3,7 @@
 ROOT=$(cd `dirname $0`/../../../; pwd)
 cd $ROOT
 
-#host=39.104.80.229
-host=127.0.0.1
+source $ROOT/shell/influxdb/common.sh
 
 pointCountArray=(1 2 3 5 10 20 30 50 100 200 300 500 1000 2000 3000 5000 10000 20000)
 for(( i=0;i<${#pointCountArray[@]};i++))
@@ -12,5 +11,5 @@ do
   echo "----test query realtime data pointCount:${pointCountArray[i]}"
   java -cp ./lib/influxdb.jar demo.query.QueryDataAtTime \
   --host $host --pointNamePrefix pointName1_ --pointCount ${pointCountArray[i]} \
-  --time "2021-03-01 00:00:01" --showQueryResult 3 2>&1 | tee -a ./log/influxdb/out.log
+  --time "2017-06-01 00:00:00" --showQueryResult 3 2>&1 | tee -a ./log/influxdb/out.log
 done

shell/influxdb/test/queryFlowHistData.sh

@@ -3,8 +3,7 @@
 ROOT=$(cd `dirname $0`/../../../; pwd)
 cd $ROOT
 
-#host=39.104.80.229
-host=127.0.0.1
+source $ROOT/shell/influxdb/common.sh
 
 pointCount=10
 pointIndex=1

shell/influxdb/test/queryHistData.sh

@@ -3,8 +3,7 @@
 ROOT=$(cd `dirname $0`/../../../; pwd)
 cd $ROOT
 
-#host=39.104.80.229
-host=127.0.0.1
+source $ROOT/shell/influxdb/common.sh
 
 pointCount=1
 pointIndex=1
@@ -12,7 +11,7 @@ pointIndex=1
 for days in 1 2 3 4 7 15 30 60 90 180
 do
   echo "----test query range days:$days"
-  beginDate="2022-11-27 00:00:00"
+  beginDate="2018-01-01 00:00:00"
   echo beginDate:beginDate
   endDate=$(date -d "${beginDate} ${days} days" +"%Y-%m-%d %H:%M:%S")
   echo endDate:$endDate

shell/iotdb/common.sh

@@ -0,0 +1,5 @@
+#!/usr/bin/env bash
+
+#host=39.104.80.229
+#host=127.0.0.1
+host=172.24.217.33

shell/iotdb/test/QueryMultiPointHistData.sh

@@ -3,8 +3,8 @@
 ROOT=$(cd `dirname $0`/../../../; pwd)
 cd $ROOT
 
-#host=39.104.80.229
-host=127.0.0.1
+source $ROOT/shell/iotdb/common.sh
+
 storagePath="root.test1.wf01.wt01"
 days=1
 pointIndex=1

shell/iotdb/test/QuerySinglePointHistData.sh

@@ -3,14 +3,14 @@
 ROOT=$(cd `dirname $0`/../../../; pwd)
 cd $ROOT
 
-#host=39.104.80.229
-host=127.0.0.1
+source $ROOT/shell/iotdb/common.sh
+
 storagePath="root.test1.wf01.wt01"
 days=1
 pointIndex=1
 
 echo "----test query range days:$days"
-beginDate="2018-06-01 00:00:00"
+beginDate="2018-01-01 00:00:00"
 echo beginDate:beginDate
 for days in 1 2 3 4 7 15 30 60 90
 do

shell/iotdb/test/insertHistoricalRandomDataPerPoint.sh

@@ -3,11 +3,7 @@
 ROOT=$(cd `dirname $0`/../../../; pwd)
 cd $ROOT
 
-#host=39.104.80.229
-host=127.0.0.1
-
-dataCountPerPoint=1
-pointCount=1
+source $ROOT/shell/iotdb/common.sh
 
 index=1
 
@@ -25,7 +21,7 @@ for dataCount in 1000 2000 3000 5000 10000 20000 30000 50000 100000 200000 30000
 do
 echo "----test insert pointCount:${pointCount} dataCountPerPoint:${dataCountPerPoint}"
 nohup java -cp ./lib/iotdb.jar -Xmx8000m demo.insert.InsertHistoricalRandomData \
---host ${host} --storagePath ${storagePath} --pointNamePrefix ${pointNamePrefix} --pointCount ${pointCount} \
---dataCountPerPoint ${dataCountPerPoint} --beginDate "$beginDate" --period 7000 \
+--host ${host} --storagePath ${storagePath} --pointNamePrefix ${pointNamePrefix} --pointCount 1 \
+--dataCountPerPoint ${dataCount} --beginDate "$beginDate" --period 1000 \
 --seed 1 --mean 10 --variance 1 --debug 0 2>&1 | tee -a ./log/iotdb/out.log
 done

shell/iotdb/test/insertRealtimeRandomData.sh

@@ -3,8 +3,8 @@
 ROOT=$(cd `dirname $0`/../../../; pwd)
 cd $ROOT
 
-#host=39.104.80.229
-host=127.0.0.1
+source $ROOT/shell/iotdb/common.sh
+
 storagePath="root.test1.wf01.wt01"
 
 clear

shell/iotdb/test/queryMultiPointLastData.sh

@@ -3,8 +3,8 @@
 ROOT=$(cd `dirname $0`/../../../; pwd)
 cd $ROOT
 
-#host=39.104.80.229
-host=127.0.0.1
+source $ROOT/shell/iotdb/common.sh
+
 storagePath="root.test1.wf01.wt01";
 pointIndex=1
 pointCount=10

shell/iotdb/test/querySinglePointLastData.sh

@@ -3,8 +3,7 @@
 ROOT=$(cd `dirname $0`/../../../; pwd)
 cd $ROOT
 
-#host=39.104.80.229
-host=127.0.0.1
+source $ROOT/shell/iotdb/common.sh
 
 pointIndex=1
 storagePath="root.test1.wf01.wt01";

shell/tsdb/common.sh

@@ -0,0 +1,5 @@
+#!/usr/bin/env bash
+
+#host=39.104.80.229
+host=127.0.0.1
+#host=172.24.217.33

shell/tsdb/test/aggHistDataOverTime.sh

@@ -3,8 +3,7 @@
 ROOT=$(cd `dirname $0`/../../../; pwd)
 cd $ROOT
 
-#host=39.104.80.229
-host=127.0.0.1
+source $ROOT/shell/tsdb/common.sh
 
 for days in 1 2 3 4 5 6 7 15 30 60 90 180 360
 do

shell/tsdb/test/insertHistoricalRandomData.sh

@@ -3,15 +3,14 @@
 ROOT=$(cd `dirname $0`/../../../; pwd)
 cd $ROOT
 
-#host=39.104.80.229
-host=127.0.0.1
+source $ROOT/shell/tsdb/common.sh
 
 #for dataCount in 1000 2000 3000 5000 10000 20000 30000 50000 100000 200000 300000 500000 1000000
 for dataCount in 1000 2000 3000 5000 10000 20000 30000 50000 100000 200000 300000 500000
 do
   echo "----test insert dataCountPerPoint:${dataCount}"
-  java -cp ./lib/tsdb.jar demo.allInsert.InsertHistoricalRandomData \
+  java -cp ./lib/tsdb.jar -Xmx8000m  demo.allInsert.InsertHistoricalRandomData \
   --host=$host --pointNamePrefix=pointName_ --pointCount=1  --dataCountPerPoint=$dataCount \
-  --beginDate="2017-01-01 00:00:00" --period=15000 \
+  --beginDate="2017-06-01 00:00:00" --period=1000 \
   --seed=1 --mean=10 --variance=0.1 --debug=0 2>&1 | tee -a ./log/tsdb/out.log
 done

shell/tsdb/test/insertHistoricalRandomDataMultiPoint.sh

@@ -3,8 +3,7 @@
 ROOT=$(cd `dirname $0`/../../../; pwd)
 cd $ROOT
 
-#host=39.104.80.229
-host=127.0.0.1
+source $ROOT/shell/tsdb/common.sh
 
 #多点历史数据插入
 dataCountPerPointArray=(1000 2000 3000 5000 10000 20000 30000 50000 100000)

shell/tsdb/test/insertRealtimeRandomData.sh

@@ -3,8 +3,7 @@
 ROOT=$(cd `dirname $0`/../../../; pwd)
 cd $ROOT
 
-#host=39.104.80.229
-host=127.0.0.1
+source $ROOT/shell/tsdb/common.sh
 
 #for pointCount in 1000 2000 3000 5000 10000 20000 30000 50000 100000 200000 300000
 for pointCount in 1000 2000 3000 5000 10000 20000 30000 50000 100000

shell/tsdb/test/queryDataAtNow.sh

@@ -3,8 +3,7 @@
 ROOT=$(cd `dirname $0`/../../../; pwd)
 cd $ROOT
 
-#host=39.104.80.229
-host=127.0.0.1
+source $ROOT/shell/tsdb/common.sh
 
 #pointCountArray=(1 2 3 5 10 20 30 50 100 200 300 500 1000 2000 3000 5000 10000 20000 30000 50000 100000)
 pointCountArray=(1 2 3 5 10 20 30 50 100 200 300 500 1000 2000 3000 5000 10000 20000)

shell/tsdb/test/queryDataAtTime.sh

@@ -3,8 +3,7 @@
 ROOT=$(cd `dirname $0`/../../../; pwd)
 cd $ROOT
 
-#host=39.104.80.229
-host=127.0.0.1
+source $ROOT/shell/tsdb/common.sh
 
 # 查询某历史数据时修改，先调用函数插入，再进一步查询
 pointName=pointName0_
@@ -17,5 +16,5 @@ do
   echo "----test query realtime data pointCount:${pointCountArray[i]}"
   java -cp ./lib/tsdb.jar demo.query.QueryDataAtTime \
   --host=$host --pointNamePrefix=${pointName} --pointCount=${pointCountArray[i]} \
-  --time="2021-03-01 00:00:00" --showQueryResult=0 2>&1 | tee -a ./log/tsdb/out.log
+  --time="2017-06-01 00:00:00" --showQueryResult=0 2>&1 | tee -a ./log/tsdb/out.log
 done

shell/tsdb/test/queryHistData.sh

@@ -3,8 +3,7 @@
 ROOT=$(cd `dirname $0`/../../../; pwd)
 cd $ROOT
 
-#host=39.104.80.229
-host=127.0.0.1
+source $ROOT/shell/tsdb/common.sh
 
 pointCount=1
 pointIndex=1
@@ -12,7 +11,7 @@ pointIndex=1
 for days in 1 2 3 4 7 15 30 60 90 180
 do
   echo "----test query range days:$days"
-  beginDate="2017-01-01 00:00:00"
+  beginDate="2018-01-01 00:00:00"
   echo beginDate:beginDate
   endDate=$(date -d "${beginDate} ${days} days" +"%Y-%m-%d %H:%M:%S")
   echo endDate:$endDate