代码脚本重新整理

.gitignore

@@ -12,3 +12,5 @@ log.log.*
 */target/
 .idea/
 */*.iml
+.DS_Store
+lib/

common/pom.xml

@@ -1,26 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-  xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-  <modelVersion>4.0.0</modelVersion>
-  <parent>
-      <artifactId>tsdb-benchmark</artifactId>
-      <groupId>giannischen.nuaa.edu.cn</groupId>
-      <version>0.0.1-SNAPSHOT</version>
-      <relativePath>../pom.xml</relativePath>  <!-- 若无该相对路径，导入Maven项目时，可能该模块pom依赖无法加载 -->
-  </parent>
-
-  <artifactId>common</artifactId>
-  <name>common</name>
-  <packaging>jar</packaging>
-
-  <dependencies>
-      <dependency>
-          <groupId>junit</groupId>
-          <artifactId>junit</artifactId>
-          <version>4.11</version>
-          <scope>test</scope>
-      </dependency>
-
-  </dependencies>
-</project>

common/src/main/java/giannischen/nuaa/edu/cn/App.java

@@ -1,13 +0,0 @@
-package giannischen.nuaa.edu.cn;
-
-/**
- * Hello world!
- *
- */
-public class App 
-{
-    public static void main( String[] args )
-    {
-        System.out.println( "Hello World!" );
-    }
-}

common/src/test/java/giannischen/nuaa/edu/cn/AppTest.java

@@ -1,20 +0,0 @@
-package giannischen.nuaa.edu.cn;
-
-import static org.junit.Assert.assertTrue;
-
-import org.junit.Test;
-
-/**
- * Unit test for simple App.
- */
-public class AppTest 
-{
-    /**
-     * Rigorous Test :-)
-     */
-    @Test
-    public void shouldAnswerWithTrue()
-    {
-        assertTrue( true );
-    }
-}

influxdb/pom.xml

@@ -65,26 +65,60 @@
       </dependency>
 
 
-      <dependency>
-          <groupId>org.jetbrains.kotlin</groupId>
-          <artifactId>kotlin-stdlib</artifactId>
-          <version>${kotlin.version}</version>
-      </dependency>
-      <dependency>
-          <groupId>org.jetbrains.kotlin</groupId>
-          <artifactId>kotlin-stdlib-common</artifactId>
-          <version>${kotlin.version}</version>
-      </dependency>
-      <dependency>
-          <groupId>org.jetbrains.kotlin</groupId>
-          <artifactId>kotlin-stdlib-jdk8</artifactId>
-          <version>${kotlin.version}</version>
-      </dependency>
-      <dependency>
-          <groupId>org.jetbrains.kotlin</groupId>
-          <artifactId>kotlin-stdlib-jdk7</artifactId>
-          <version>${kotlin.version}</version>
-      </dependency>
+<!--      <dependency>-->
+<!--          <groupId>org.jetbrains.kotlin</groupId>-->
+<!--          <artifactId>kotlin-stdlib</artifactId>-->
+<!--          <version>${kotlin.version}</version>-->
+<!--      </dependency>-->
+<!--      <dependency>-->
+<!--          <groupId>org.jetbrains.kotlin</groupId>-->
+<!--          <artifactId>kotlin-stdlib-common</artifactId>-->
+<!--          <version>${kotlin.version}</version>-->
+<!--      </dependency>-->
+<!--      <dependency>-->
+<!--          <groupId>org.jetbrains.kotlin</groupId>-->
+<!--          <artifactId>kotlin-stdlib-jdk8</artifactId>-->
+<!--          <version>${kotlin.version}</version>-->
+<!--      </dependency>-->
+<!--      <dependency>-->
+<!--          <groupId>org.jetbrains.kotlin</groupId>-->
+<!--          <artifactId>kotlin-stdlib-jdk7</artifactId>-->
+<!--          <version>${kotlin.version}</version>-->
+<!--      </dependency>-->
   </dependencies>
-
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-surefire-plugin</artifactId>
+                <configuration>
+                    <skip>true</skip>
+                </configuration>
+            </plugin>
+            <plugin>
+                <artifactId>maven-assembly-plugin</artifactId>
+                <version>3.4.2</version>
+                <configuration>
+                    <archive>
+                        <manifest>
+                            <!--这里指定要运行的main类-->
+                            <mainClass>demo.allInsert.InsertHistoricalRandomData</mainClass>
+                        </manifest>
+                    </archive>
+                    <descriptorRefs>
+                        <descriptorRef>jar-with-dependencies</descriptorRef>
+                    </descriptorRefs>
+                </configuration>
+                <executions>
+                    <execution>
+                        <id>make-assembly</id>
+                        <phase>package</phase>
+                        <goals>
+                            <goal>single</goal>
+                        </goals>
+                    </execution>
+                </executions>
+            </plugin>
+        </plugins>
+    </build>
 </project>

iotdb/pom.xml

@@ -14,8 +14,6 @@
     <name>iotdb</name>
     <packaging>jar</packaging>
 
-
-
     <dependencies>
         <dependency>
             <groupId>org.apache.iotdb</groupId>
@@ -32,8 +30,6 @@
             <artifactId>commons-cli</artifactId>
             <version>1.3.1</version>
         </dependency>
-
-
         <dependency>
             <groupId>junit</groupId>
             <artifactId>junit</artifactId>
@@ -42,5 +38,39 @@
         </dependency>
 
     </dependencies>
-
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-surefire-plugin</artifactId>
+                <configuration>
+                    <skip>true</skip>
+                </configuration>
+            </plugin>
+            <plugin>
+                <artifactId>maven-assembly-plugin</artifactId>
+                <version>3.4.2</version>
+                <configuration>
+                    <archive>
+                        <manifest>
+                            <!--这里指定要运行的main类-->
+                            <mainClass>demo.insert.InsertHistoricalRandomData</mainClass>
+                        </manifest>
+                    </archive>
+                    <descriptorRefs>
+                        <descriptorRef>jar-with-dependencies</descriptorRef>
+                    </descriptorRefs>
+                </configuration>
+                <executions>
+                    <execution>
+                        <id>make-assembly</id>
+                        <phase>package</phase>
+                        <goals>
+                            <goal>single</goal>
+                        </goals>
+                    </execution>
+                </executions>
+            </plugin>
+        </plugins>
+    </build>
 </project>

package.sh

@@ -0,0 +1,33 @@
+#!/bin/bash
+cur_date="`date +%Y-%m-%d`"
+ROOT=$(cd `dirname $0`; pwd)
+
+mkdir -p $ROOT/tmp
+rm -rf $ROOT/tmp/*
+
+mkdir -p $ROOT/tmp/lib
+
+mkdir -p $ROOT/tmp/log
+mkdir -p $ROOT/tmp/log/influxdb
+mkdir -p $ROOT/tmp/log/iotdb
+mkdir -p $ROOT/tmp/log/tsdb
+
+cp -rf $ROOT/influxdb/target/influxdb-0.0.1-SNAPSHOT-jar-with-dependencies $ROOT/tmp/lib/influxdb.jar
+cp -rf $ROOT/iotdb/target/iotdb-0.0.1-SNAPSHOT-jar-with-dependencies $ROOT/tmp/lib/iotdb.jar
+cp -rf $ROOT/tsdb/target/tsdb-0.0.1-SNAPSHOT-jar-with-dependencies $ROOT/tmp/lib/tsdb.jar
+cp -rf $ROOT/shell $ROOT/tmp/
+chmod -R +x $ROOT/shell/
+
+cd $ROOT
+if [ ! -d "release" ]; then
+        mkdir -p release
+fi
+
+mv $ROOT/tmp $ROOT/tsdb-benchmark
+cd $ROOT
+tar -zcf $ROOT/release/tsdb-benchmark-v${cur_date}.tar.gz ./tsdb-benchmark
+
+rm -rf $ROOT/tsdb-benchmark/*
+rmdir $ROOT/tsdb-benchmark
+
+echo "打包成功"

pom.xml

@@ -14,11 +14,12 @@
   <modules>
       <module>tsdb</module>
       <module>influxdb</module>
-      <module>common</module>
       <module>iotdb</module>
   </modules>
 
   <properties>
+    <maven.compiler.source>8</maven.compiler.source>
+    <maven.compiler.target>8</maven.compiler.target>
     <java.version>1.8</java.version>
     <influxdb.version>0.0.1-SNAPSHOT</influxdb.version>
     <tsdb.version>0.0.1-SNAPSHOT</tsdb.version>
@@ -30,11 +31,6 @@
 
   <dependencyManagement>
     <dependencies>
-      <dependency>
-        <groupId>giannischen.nuaa.edu.cn</groupId>
-        <artifactId>common</artifactId>
-        <version>${common.version}</version>
-      </dependency>
       <dependency>
         <groupId>giannischen.nuaa.edu.cn</groupId>
         <artifactId>tsdb</artifactId>
@@ -50,8 +46,6 @@
         <artifactId>iotdb</artifactId>
         <version>${iotdb.version}</version>
       </dependency>
-
-
     </dependencies>
   </dependencyManagement>
 

shell/influxdb/mt/flow/queryMultiplePointHistData.sh

@@ -1,6 +1,8 @@
 #!/usr/bin/env bash
 
-host=39.104.80.229
+#host=39.104.80.229
+host=127.0.0.1
+
 days=1
 pointIndex=1
 pointCount=10

shell/influxdb/mt/flow/querySinglePointHistData.sh

@@ -1,6 +1,8 @@
 #!/usr/bin/env bash
 
-host=39.104.80.229
+#host=39.104.80.229
+host=127.0.0.1
+
 days=1
 pointIndex=1
 

shell/influxdb/mt/histData/queryMultiplePointHistData.sh

@@ -1,6 +1,8 @@
 #!/usr/bin/env bash
 
-host=39.104.80.229
+#host=39.104.80.229
+host=127.0.0.1
+
 days=1
 pointIndex=1
 pointCount=(1)

shell/influxdb/mt/histData/querySinglePointHistData.sh

@@ -1,6 +1,8 @@
 #!/usr/bin/env bash
 
-host=39.104.80.229
+#host=39.104.80.229
+host=127.0.0.1
+
 days=1
 pointIndex=1
 

shell/influxdb/mt/insert/insertHistoricalRandomDataInertPerPoint.sh

@@ -1,8 +1,8 @@
 #!/usr/bin/env bash
 
-host=127.0.0.1
 #host=39.104.80.229
-#host=192.168.1.135
+host=127.0.0.1
+
 dataCountPerPoint=35040
 pointCount=300000
 

shell/influxdb/mt/insert/insertHistoricalRandomDataMultiPoint.sh

@@ -1,6 +1,8 @@
 #!/usr/bin/env bash
 
-host=39.104.80.229
+#host=39.104.80.229
+host=127.0.0.1
+
 dataCountPerPoint=1000
 pointCount=100
 

shell/influxdb/mt/lastData/queryMultiPointLastData.sh

@@ -1,6 +1,8 @@
 #!/usr/bin/env bash
 
-host=39.104.80.229
+#host=39.104.80.229
+host=127.0.0.1
+
 pointIndex=1
 pointCount=10
 echo "----test query points last data pointIndex:${pointIndex} pointCount:${pointCount}"

shell/influxdb/mt/lastData/querySinglePointLastData.sh

@@ -1,6 +1,8 @@
 #!/usr/bin/env bash
 
-host=39.104.80.229
+#host=39.104.80.229
+host=127.0.0.1
+
 pointIndex=1
 echo "----test query point last data pointIndex:${pointIndex}"
 java -cp ./lib/influxdb.jar demo.query.last.QuerySinglePointLastData \

shell/influxdb/test/aggHistDataOverTime.sh

@@ -1,6 +1,8 @@
 #!/usr/bin/env bash
 
-host=39.104.80.229
+#host=39.104.80.229
+host=127.0.0.1
+
 for days in 360
 do
   echo "----test query range days:$days"

shell/influxdb/test/insertHistoricalRandomData.sh

@@ -1,6 +1,8 @@
 #!/usr/bin/env bash
 
-host=39.104.80.229
+#host=39.104.80.229
+host=127.0.0.1
+
 #dataCountPerPointArray=(1000 2000 3000 5000 10000 20000 30000 50000 100000)
 dataCountPerPointArray=(1000)
 #pointCountArray=(2 3 5 10)

shell/influxdb/test/insertRealtimeRandomData.sh

@@ -1,6 +1,8 @@
 #!/usr/bin/env bash
 
-host=39.104.80.229
+#host=39.104.80.229
+host=127.0.0.1
+
 clear
 for pointCount in 1000 2000 3000 5000 10000 20000 30000 50000 100000 200000
 #for pointCount in 1000 2000 5000

shell/influxdb/test/queryDataAtNow.sh

@@ -1,6 +1,8 @@
 #!/usr/bin/env bash
 
-host=39.104.80.229
+#host=39.104.80.229
+host=127.0.0.1
+
 #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)
 pointIndex=1

shell/influxdb/test/queryDataAtTime.sh

@@ -1,6 +1,8 @@
 #!/usr/bin/env bash
 
-host=39.104.80.229
+#host=39.104.80.229
+host=127.0.0.1
+
 pointCountArray=(1000 2000 3000)
 
 for(( i=0;i<${#pointCountArray[@]};i++))

shell/influxdb/test/queryFlowHistData.sh

@@ -1,6 +1,8 @@
 #!/usr/bin/env bash
 
-host=39.104.80.229
+#host=39.104.80.229
+host=127.0.0.1
+
 pointCount=10
 pointIndex=1
 

shell/influxdb/test/queryHistData.sh

@@ -1,6 +1,8 @@
 #!/usr/bin/env bash
 
-host=39.104.80.229
+#host=39.104.80.229
+host=127.0.0.1
+
 pointCount=10
 pointIndex=1
 

shell/iotdb/histData/QueryMultiPointHistData

@@ -1,6 +1,7 @@
 #!/usr/bin/env bash
 
-host=39.104.80.229
+#host=39.104.80.229
+host=127.0.0.1
 storagePath="root.test1.wf01.wt01"
 days=1
 pointIndex=1

shell/iotdb/histData/QuerySinglePointHistData

@@ -1,6 +1,7 @@
 #!/usr/bin/env bash
 
-host=39.104.80.229
+#host=39.104.80.229
+host=127.0.0.1
 storagePath="root.test1.wf01.wt01"
 days=1
 pointIndex=1

shell/iotdb/insert/insertHistoricalRandomDataPerPoint

@@ -1,8 +1,8 @@
 #!/usr/bin/env bash
 
-#host=192.168.116.128
-host=39.104.80.229
-#host=192.168.1.135
+#host=39.104.80.229
+host=127.0.0.1
+
 dataCountPerPoint=1
 pointCount=1
 

shell/iotdb/insert/insertRealtimeRandomData

@@ -1,6 +1,7 @@
 #!/usr/bin/env bash
 
-host=39.104.80.229
+#host=39.104.80.229
+host=127.0.0.1
 storagePath="root.test1.wf01.wt01"
 
 clear

shell/iotdb/lastData/queryMultiPointLastData

@@ -1,6 +1,7 @@
 #!/usr/bin/env bash
 
-host=39.104.80.229
+#host=39.104.80.229
+host=127.0.0.1
 storagePath="root.test1.wf01.wt01";
 pointIndex=1
 pointCount=10

shell/iotdb/lastData/querySinglePointLastData

@@ -1,6 +1,8 @@
 #!/usr/bin/env bash
 
-host=39.104.80.229
+#host=39.104.80.229
+host=127.0.0.1
+
 pointIndex=1
 storagePath="root.test1.wf01.wt01";
 echo "----test query point last data pointIndex:${pointIndex}"

shell/tsdb/abtask/otherAWithTwoStep.sh

@@ -1,3 +0,0 @@
-#!/usr/bin/env bash
-
-java -cp ./lib/tsdb.jar demo.query.abtask.OtherAWithTwoStep

shell/tsdb/abtask/sumBInA.sh

@@ -1,3 +0,0 @@
-#!/usr/bin/env bash
-
-java -cp ./lib/tsdb.jar demo.query.abtask.SumBInA

shell/tsdb/abtask/topkATaskInTimeRange.sh

@@ -1,3 +0,0 @@
-#!/usr/bin/env bash
-
-java -cp ./lib/tsdb.jar demo.query.abtask.TopkATaskInTimeRange

shell/tsdb/abtask/topkBTaskInTimeRange.sh

@@ -1,3 +0,0 @@
-#!/usr/bin/env bash
-
-java -cp ./lib/tsdb.jar demo.query.abtask.TopkBTaskInTimeRange

shell/tsdb/compressTest/insertHistoricalRandomData.sh

@@ -1,6 +1,9 @@
 #!/usr/bin/env bash
 
-dbDataDir=/home/sourcedb/SourceDB/lib/sourcedb-data
+#host=39.104.80.229
+host=127.0.0.1
+
+dbDataDir=/home/sudb/sudb/lib/sudb-data
 resultFile=./log/tsdb/out.log
 
 for dataCount in 1000000 2000000 3000000 5000000 10000000 20000000 30000000
@@ -11,7 +14,7 @@ do
   diskSize=`du -sh ${dbDataDir}`
   echo before insert dataCountPerPoint:${dataCount} diskSize:${diskSize} | tee -a ${resultFile}
   java -cp ./lib/tsdb.jar demo.allInsert.InsertHistoricalRandomData \
-  --host=39.104.80.229 --pointNamePrefix=pointName_ --pointCount=1  --dataCountPerPoint=$dataCount \
+  --host=$host --pointNamePrefix=pointName_ --pointCount=1  --dataCountPerPoint=$dataCount \
   --beginDate="2020-03-01 00:00:00" --period=1000 \
   --seed=1 --mean=10 --variance=0.1 --debug=0 2>&1 | tee -a ${resultFile}
   systemctl stop sourcedb

shell/tsdb/concurTest/insertRealtimeRandomData.sh

@@ -1,11 +1,14 @@
 #!/usr/bin/env bash
 
+#host=39.104.80.229
+host=127.0.0.1
+
 pointCountArray=(50000 50000 50000)
 pointNamePrefixArray=("prefix1_" "prefix2_" "prefix3_")
 for(( i=0;i<${#pointCountArray[@]};i++))
 do
   echo "----client:${i+1} insert dataCountPerPoint:${pointCountArray[i]}"
   java -cp ./lib/tsdb.jar demo.allInsert.InsertRealtimeRandomData \
-  --host=39.104.80.229 --pointNamePrefix=${pointNamePrefixArray[i]} --pointCount=${pointCountArray[i]} --seed=1 \
+  --host=$host --pointNamePrefix=${pointNamePrefixArray[i]} --pointCount=${pointCountArray[i]} --seed=1 \
   --mean=10 --variance=1 --debug=0 2>&1 | tee -a ./log/tsdb/out.log &
 done

shell/tsdb/concurTest/insertRealtimeRandomDataMultiClient.sh

@@ -1,5 +1,8 @@
 #!/usr/bin/env bash
 
+#host=39.104.80.229
+host=127.0.0.1
+
 clientCount=2
 for(( i=0;i<${clientCount};i++))
 do
@@ -15,7 +18,7 @@ do
     resultFile=${i}.log
     echo "----test concurrent insert clientIndex:${i} dataCountPerPoint:${pointCount}"  | tee -a ${resultFile}
     java -cp ./lib/tsdb.jar demo.allInsert.InsertRealtimeRandomData \
-    --host=39.104.80.229 --pointNamePrefix=${pointNamePrefixArray[i]} --pointCount=$pointCount --seed=1 \
+    --host=$host --pointNamePrefix=${pointNamePrefixArray[i]} --pointCount=$pointCount --seed=1 \
     --mean=10 --variance=1 --debug=0 1>> ${resultFile} 2>> ${resultFile}  &
   done
   echo sleep 13

shell/tsdb/concurTest/queryDataAtNowMultiClient.sh

@@ -1,6 +1,9 @@
 #!/usr/bin/env bash
 
 
+#host=39.104.80.229
+host=127.0.0.1
+
 clientCount=3
 
 pointCountArray=(1 2 3 5 10 20 30 50 100 200 300 500 1000 2000 3000 5000 10000 20000 30000 50000 100000)
@@ -11,7 +14,7 @@ do
   do
     echo "----test concurrent realtime query clientIndex:${i} pointCount:${pointCountArray[j]}"
     java -cp ./lib/tsdb.jar demo.query.QueryDataAtTime \
-    --host=39.104.80.229 --pointNamePrefix=pointName_ --pointCount=${pointCountArray[j]} \
+    --host=$host --pointNamePrefix=pointName_ --pointCount=${pointCountArray[j]} \
     --showQueryResult=3 2>> ${i}.log &
   done
 

shell/tsdb/indepTest/aggHistDataOverTime.sh

@@ -1,5 +1,8 @@
 #!/usr/bin/env bash
 
+#host=39.104.80.229
+host=127.0.0.1
+
 for days in 1 7 15 30 60 90 180 360
 do
   echo "----test query range days:$days"
@@ -8,7 +11,7 @@ do
   endDate=$(date -d "${beginDate} ${days} days" +"%Y-%m-%d %H:%M:%S")
   echo endDate:$endDate
   java -cp ./lib/tsdb.jar demo.query.histQuery.AggHistDataOverTime \
-  --host=39.104.80.229 --pointNamePrefix=pointName_ --pointCount=1 \
+  --host=$host --pointNamePrefix=pointName_ --pointCount=1 \
   --beginDate="$beginDate" --endDate="$endDate" --aggMethod=max \
   --showQueryResult=10000 2>&1 | tee -a ./log/tsdb/out.log
 done

shell/tsdb/indepTest/insertHistoricalRandomData.sh

@@ -1,6 +1,9 @@
 #!/usr/bin/env bash
 
 
+#host=39.104.80.229
+host=127.0.0.1
+
 pointCountArray=(1000 2000 3000 5000 10000 20000 30000 50000 100000 200000 300000 500000 1000000)
 for(( i=0;i<${#pointCountArray[@]};i++))
 do
@@ -11,7 +14,7 @@ for(( i=0;i<${#pointCountArray[@]};i++))
 do
   echo "----test insert dataCountPerPoint:${pointCountArray[i]}"
   java -cp ./lib/tsdb.jar demo.allInsert.InsertHistoricalRandomData \
-  --host=39.104.80.229 --pointNamePrefix=${pointNamePrefixArray[i]} --pointCount=${pointCountArray[i]}  \
+  --host=$host --pointNamePrefix=${pointNamePrefixArray[i]} --pointCount=${pointCountArray[i]}  \
   --dataCountPerPoint=${pointCountArray[i]} --beginDate="2021-03-01 00:00:00" --period=1000 \
   --seed=1 --mean=10 --variance=1 --debug=0 2>&1 | tee -a ./log/tsdb/out.log
   sleep 1 #1 second

shell/tsdb/indepTest/insertRealtimeRandomData.sh

@@ -1,6 +1,9 @@
 #!/usr/bin/env bash
 
 
+#host=39.104.80.229
+host=127.0.0.1
+
 pointCountArray=(1000 2000 3000 5000 10000 20000 30000 50000 100000 200000 300000 500000 1000000)
 for(( i=0;i<${#pointCountArray[@]};i++))
 do
@@ -11,7 +14,7 @@ for(( i=0;i<${#pointCountArray[@]};i++))
 do
   echo "----test insert dataCountPerPoint:${pointCountArray[i]}"
   java -cp ./lib/tsdb.jar demo.allInsert.InsertRealtimeRandomData \
-  --host=39.104.80.229 --pointNamePrefix=${pointNamePrefixArray[i]} --pointCount=${pointCountArray[i]} --seed=1 \
+  --host=$host --pointNamePrefix=${pointNamePrefixArray[i]} --pointCount=${pointCountArray[i]} --seed=1 \
   --mean=10 --variance=1 --debug=0 2>&1 | tee -a ./log/tsdb/out.log
   sleep 1 #1 second
 done

shell/tsdb/indepTest/queryHistData.sh

@@ -1,6 +1,9 @@
 #!/usr/bin/env bash
 
 
+#host=39.104.80.229
+host=127.0.0.1
+
 for days in 1 2 3 4 7 15 30 60 90 180 360
 do
   echo "----test query range days:$days"
@@ -9,7 +12,7 @@ do
   endDate=$(date -d "${beginDate} ${days} days" +"%Y-%m-%d %H:%M:%S")
   echo endDate:$endDate
   java -cp ./lib/tsdb.jar demo.query.histQuery.QueryHistData \
-  --host=39.104.80.229 --pointNamePrefix=pointName_ --pointCount=1 \
+  --host=$host --pointNamePrefix=pointName_ --pointCount=1 \
   --beginDate="$beginDate" --endDate="$endDate" \
   --showQueryResult=10000 2>&1 | tee -a ./log/tsdb/out.log
 done

shell/tsdb/newData/queryNewData.sh

@@ -1,3 +1,6 @@
 #!/usr/bin/env bash
 
+#host=39.104.80.229
+host=127.0.0.1
+
 java -cp ./lib/tsdb.jar demo.query.newData.QueryNewData

shell/tsdb/randomData/aggHistDataOverTime.sh

@@ -1,23 +1,25 @@
 #!/usr/bin/env bash
 
+#host=39.104.80.229
+host=127.0.0.1
 
 java -cp ./lib/tsdb.jar demo.query.histQuery.AggHistDataOverTime \
---host=39.104.80.229 --pointNamePrefix=pointName_ --pointCount=1 \
+--host=$host --pointNamePrefix=pointName_ --pointCount=1 \
 --beginDate="2021-03-01 00:00:00" --endDate="2021-03-01 00:16:38" --aggMethod=max \
  --showQueryResult=10000
 
 #java -cp ./lib/tsdb.jar demo.query.histQuery.AggHistDataOverTime \
-#--host=39.104.80.229 --pointNamePrefix=pointName_ --pointCount=1 \
+#--host=$host --pointNamePrefix=pointName_ --pointCount=1 \
 #--beginDate="2021-03-01 00:00:00" --endDate="2021-03-01 00:16:38" --aggMethod=min \
 # --showQueryResult=10000
 
 #java -cp ./lib/tsdb.jar demo.query.histQuery.AggHistDataOverTime \
-#--host=39.104.80.229 --pointNamePrefix=pointName_ --pointCount=1 \
+#--host=$host --pointNamePrefix=pointName_ --pointCount=1 \
 #--beginDate="2021-03-01 00:00:00" --endDate="2021-03-01 00:16:38" --aggMethod=avg \
 # --showQueryResult=10000
 
 #java -cp ./lib/tsdb.jar demo.query.histQuery.AggHistDataOverTime \
-#--host=39.104.80.229 --pointNamePrefix=pointName_ --pointCount=1 \
+#--host=$host --pointNamePrefix=pointName_ --pointCount=1 \
 #--beginDate="2021-03-01 00:00:00" --endDate="2021-03-01 00:16:38" --aggMethod=count \
 # --showQueryResult=10000
 

shell/tsdb/randomData/insertHistoricalRandomData.sh

@@ -1,12 +1,15 @@
 #!/usr/bin/env bash
 
+#host=39.104.80.229
+host=127.0.0.1
+
 
 java -cp ./lib/tsdb.jar demo.allInsert.InsertHistoricalRandomData \
---host=39.104.80.229 --pointNamePrefix=pointName_ --pointCount=100000  --dataCountPerPoint=100 \
+--host=$host --pointNamePrefix=pointName_ --pointCount=100000  --dataCountPerPoint=100 \
 --beginDate="2021-03-01 00:00:00" --period=1000 \
 --seed=1 --mean=10 --variance=0.1 --debug=0 2>&1 | tee -a ./log/tsdb/out.log
 
 #java -cp ./lib/tsdb.jar demo.allInsert.InsertHistoricalRandomData \
-#--host=39.104.80.229 --pointNamePrefix=pointName_ --pointCount=1  --dataCountPerPoint=100000 \
+#--host=$host --pointNamePrefix=pointName_ --pointCount=1  --dataCountPerPoint=100000 \
 #--beginDate="2021-05-01 00:00:00" --endDate="2021-05-04 00:00:00" \
 #--seed=1 --mean=10 --variance=1 --debug=0

shell/tsdb/randomData/insertHistoricalRandomDataAPointAYear.sh

@@ -1,12 +1,15 @@
 #!/usr/bin/env bash
 
+#host=39.104.80.229
+host=127.0.0.1
+
 
 java -cp ./lib/tsdb.jar demo.allInsert.InsertHistoricalRandomData \
---host=39.104.80.229 --pointNamePrefix=pointName_ --pointCount=1  --dataCountPerPoint=31536000 \
+--host=$host --pointNamePrefix=pointName_ --pointCount=1  --dataCountPerPoint=31536000 \
 --beginDate="2020-07-01 00:00:00" --period=1000 \
 --seed=1 --mean=10 --variance=0.1 --debug=0 2>&1 | tee -a ./log/tsdb/out.log
 
 #java -cp ./lib/tsdb.jar demo.allInsert.InsertHistoricalRandomData \
-#--host=39.104.80.229 --pointNamePrefix=pointName_ --pointCount=1  --dataCountPerPoint=100000 \
+#--host=$host --pointNamePrefix=pointName_ --pointCount=1  --dataCountPerPoint=100000 \
 #--beginDate="2021-05-01 00:00:00" --endDate="2021-05-04 00:00:00" \
 #--seed=1 --mean=10 --variance=1 --debug=0 2>&1 | tee -a ./log/tsdb/out.log

shell/tsdb/randomData/insertRealtimeRandomData.sh

@@ -1,5 +1,9 @@
 #!/usr/bin/env bash
 
+#host=39.104.80.229
+host=127.0.0.1
+
+
 java -cp ./lib/tsdb.jar demo.allInsert.InsertRealtimeRandomData \
---host=39.104.80.229 --pointNamePrefix=pointName_ --pointCount=10000 --seed=1 \
+--host=$host --pointNamePrefix=pointName_ --pointCount=10000 --seed=1 \
 --mean=10 --variance=1 --debug=0

shell/tsdb/randomData/insertRealtimeRandomDataInCycle.sh

@@ -1,5 +1,8 @@
 #!/usr/bin/env bash
 
+#host=39.104.80.229
+host=127.0.0.1
+
 java -cp ./lib/tsdb.jar demo.allInsert.InsertRealtimeRandomDataInCycle \
---host=39.104.80.229 --pointNamePrefix=pointName_ --pointCount=100000 --seed=1 \
+--host=$host --pointNamePrefix=pointName_ --pointCount=100000 --seed=1 \
 --mean=10 --variance=1 --period=1000 --debug=0

shell/tsdb/randomData/insertRealtimeRandomDataInCycleNohup.sh

@@ -1,5 +1,8 @@
 #!/usr/bin/env bash
 
+#host=39.104.80.229
+host=127.0.0.1
+
 nohup java -cp ./lib/tsdb.jar demo.allInsert.InsertRealtimeRandomDataInCycle \
---host=39.104.80.229 --pointNamePrefix=pointName_ --pointCount=100000 --seed=1 \
+--host=$host --pointNamePrefix=pointName_ --pointCount=100000 --seed=1 \
 --mean=10 --variance=1 --period=1000 --debug=0 &

shell/tsdb/randomData/queryDataAtNow.sh

@@ -1,6 +1,9 @@
 #!/usr/bin/env bash
 
 
+#host=39.104.80.229
+host=127.0.0.1
+
 java -cp ./lib/tsdb.jar demo.query.QueryDataAtTime \
---host=39.104.80.229 --pointNamePrefix=pointName_ --pointCount=1 \
+--host=$host --pointNamePrefix=pointName_ --pointCount=1 \
  --showQueryResult=10000

shell/tsdb/randomData/queryDataAtNowInCycle.sh

@@ -1,6 +1,8 @@
 #!/usr/bin/env bash
 
+#host=39.104.80.229
+host=127.0.0.1
 
 java -cp ./lib/tsdb.jar demo.query.QueryDataAtTimeInCycle \
---host=39.104.80.229 --pointNamePrefix=pointName_ --pointCount=10000 \
+--host=$host --pointNamePrefix=pointName_ --pointCount=10000 \
    --period=1000 --showQueryResult=3

shell/tsdb/randomData/queryDataAtTime.sh

@@ -1,6 +1,9 @@
 #!/usr/bin/env bash
 
 
+#host=39.104.80.229
+host=127.0.0.1
+
 java -cp ./lib/tsdb.jar demo.query.QueryDataAtTime \
---host=39.104.80.229 --pointNamePrefix=pointName_ --pointCount=1 \
+--host=$host --pointNamePrefix=pointName_ --pointCount=1 \
 --time="2021-03-01 00:00:01" --showQueryResult=10000

shell/tsdb/randomData/queryDataAtTimeInCycle.sh

@@ -1,6 +1,8 @@
 #!/usr/bin/env bash
 
+#host=39.104.80.229
+host=127.0.0.1
 
 java -cp ./lib/tsdb.jar demo.query.QueryDataAtTimeInCycle \
---host=39.104.80.229 --pointNamePrefix=pointName_ --pointCount=1 \
+--host=$host --pointNamePrefix=pointName_ --pointCount=1 \
 --time="2021-03-01 00:00:01"  --period=1000 --showQueryResult=10000

shell/tsdb/randomData/queryHistData.sh

@@ -1,6 +1,8 @@
 #!/usr/bin/env bash
 
+#host=39.104.80.229
+host=127.0.0.1
 
 java -cp ./lib/tsdb.jar demo.query.histQuery.QueryHistData \
---host=39.104.80.229 --pointNamePrefix=pointName_ --pointCount=1 \
+--host=$host --pointNamePrefix=pointName_ --pointCount=1 \
 --beginDate="2020-07-01 00:00:00" --endDate="2020-07-01 00:01:00" --showQueryResult=10000

shell/tsdb/test/aggHistDataOverTime.sh

@@ -1,5 +1,8 @@
 #!/usr/bin/env bash
 
+#host=39.104.80.229
+host=127.0.0.1
+
 for days in 1 2 3 4 5 6 7 15 30 60 90 180 360
 do
   echo "----test query range days:$days"
@@ -8,7 +11,7 @@ do
   endDate=$(date -d "${beginDate} ${days} days" +"%Y-%m-%d %H:%M:%S")
   echo endDate:$endDate
   java -cp ./lib/tsdb.jar demo.query.histQuery.AggHistDataOverTime \
-  --host=39.104.80.229 --pointNamePrefix=pointName_ --pointCount=1 \
+  --host=$host --pointNamePrefix=pointName_ --pointCount=1 \
   --beginDate="$beginDate" --endDate="$endDate" --aggMethod=max \
   --showQueryResult=3  2>&1 | tee -a ./log/tsdb/out.log
 done

shell/tsdb/test/insertHistoricalRandomData.sh

@@ -1,12 +1,15 @@
 #!/usr/bin/env bash
 
 
+#host=39.104.80.229
+host=127.0.0.1
+
 #for dataCount in 1000 2000 3000 5000 10000 20000 30000 50000 100000 200000 300000 500000 1000000
 for dataCount in 1036800
 do
   echo "----test insert dataCountPerPoint:${dataCount}"
   java -cp ./lib/tsdb.jar demo.allInsert.InsertHistoricalRandomData \
-  --host=39.104.80.229 --pointNamePrefix=pointName_ --pointCount=1  --dataCountPerPoint=$dataCount \
+  --host=$host --pointNamePrefix=pointName_ --pointCount=1  --dataCountPerPoint=$dataCount \
   --beginDate="2017-01-01 00:00:00" --period=15000 \
   --seed=1 --mean=10 --variance=0.1 --debug=0 2>&1 | tee -a ./log/tsdb/out.log
 done

shell/tsdb/test/insertHistoricalRandomDataMultiPoint.sh

@@ -1,5 +1,8 @@
 #!/usr/bin/env bash
 
+#host=39.104.80.229
+host=127.0.0.1
+
 #多点历史数据插入
 dataCountPerPointArray=(1000 2000 3000 5000 10000 20000 30000 50000 100000)
 pointCountArray=(2 3 5 10)
@@ -25,7 +28,7 @@ do
     pointNamePrefix="pointName${index}_"
     echo "----test insert pointCount:${pointCount} dataCountPerPoint:${dataCountPerPoint}"
     java -cp ./lib/tsdb.jar demo.allInsert.InsertHistoricalRandomData \
-    --host=39.104.80.229 --pointNamePrefix=${pointNamePrefix} --pointCount=${pointCount}  \
+    --host=$host --pointNamePrefix=${pointNamePrefix} --pointCount=${pointCount}  \
     --dataCountPerPoint=${dataCountPerPoint} --beginDate="2021-03-01 00:00:00" --period=7000 \
     --seed=1 --mean=10 --variance=1 --debug=0 2>&1 | tee -a ./log/tsdb/out.log
   done

shell/tsdb/test/insertRealtimeRandomData.sh

@@ -1,11 +1,14 @@
 #!/usr/bin/env bash
 
+#host=39.104.80.229
+host=127.0.0.1
+
 #for pointCount in 1000 2000 3000 5000 10000 20000 30000 50000 100000 200000 300000
 for pointCount in 30000
 do
   echo "----test insert dataCountPerPoint:${pointCount}"
   java -cp ./lib/tsdb.jar demo.allInsert.InsertRealtimeRandomData \
-  --host=39.104.80.229 --pointNamePrefix=pointName_ --pointCount=$pointCount --seed=1 \
+  --host=$host --pointNamePrefix=pointName_ --pointCount=$pointCount --seed=1 \
   --mean=10 --variance=1 --debug=0 2>&1 | tee -a ./log/tsdb/out.log
   sleep 1 #1 second
 done

shell/tsdb/test/queryDataAtNow.sh

@@ -1,6 +1,9 @@
 #!/usr/bin/env bash
 
 
+#host=39.104.80.229
+host=127.0.0.1
+
 pointCountArray=(1 2 3 5 10 20 30 50 100 200 300 500 1000 2000 3000 5000 10000 20000 30000 50000 100000)
 #pointCountArray=(30000)
 
@@ -8,6 +11,6 @@ for(( i=0;i<${#pointCountArray[@]};i++))
 do
   echo "----test query realtime data pointCount:${pointCountArray[i]}"
   java -cp ./lib/tsdb.jar demo.query.QueryDataAtTime \
-  --host=39.104.80.229 --pointNamePrefix=pointName_ --pointCount=${pointCountArray[i]} \
+  --host=$host --pointNamePrefix=pointName_ --pointCount=${pointCountArray[i]} \
   --showQueryResult=0 2>&1 | tee -a ./log/tsdb/out.log
 done

shell/tsdb/test/queryDataAtTime.sh

@@ -1,5 +1,8 @@
 #!/usr/bin/env bash
 
+#host=39.104.80.229
+host=127.0.0.1
+
 # 查询某历史数据时修改，先调用函数插入，再进一步查询
 pointName=pointName0_
 # pointCountArray=(1000 2000 3000 5000 10000 20000 50000 100000)
@@ -9,6 +12,6 @@ for(( i=0;i<${#pointCountArray[@]};i++))
 do
   echo "----test query realtime data pointCount:${pointCountArray[i]}"
   java -cp ./lib/tsdb.jar demo.query.QueryDataAtTime \
-  --host=39.104.80.229 --pointNamePrefix=${pointName} --pointCount=${pointCountArray[i]} \
+  --host=$host --pointNamePrefix=${pointName} --pointCount=${pointCountArray[i]} \
   --time="2021-03-01 00:00:00" --showQueryResult=0 2>&1 | tee -a ./log/tsdb/out.log
 done

shell/tsdb/test/queryHistData.sh

@@ -1,6 +1,9 @@
 #!/usr/bin/env bash
 
 
+#host=39.104.80.229
+host=127.0.0.1
+
 for days in 1 2 3 4 7 15 30 60 90 180
 do
   echo "----test query range days:$days"
@@ -9,7 +12,7 @@ do
   endDate=$(date -d "${beginDate} ${days} days" +"%Y-%m-%d %H:%M:%S")
   echo endDate:$endDate
   java -cp ./lib/tsdb.jar demo.query.histQuery.QueryHistData \
-  --host=39.104.80.229 --pointNamePrefix=pointName_ --pointCount=1 \
+  --host=$host --pointNamePrefix=pointName_ --pointCount=1 \
   --beginDate="$beginDate" --endDate="$endDate" \
   --showQueryResult=0 2>&1 | tee -a ./log/tsdb/out.log
 done

shell/tsdb/tools/calSourceDBDiskSize.sh

@@ -1,5 +1,5 @@
 #!/usr/bin/env bash
 
-dbDataDir=/home/sourcedb/SourceDB/lib/sourcedb-data
+dbDataDir=/home/sudb/sudb/lib/sudb-data
 diskSize=`du -sh ${dbDataDir}`
 echo diskSize:${diskSize}

shell/tsdb/tools/deleteAllDBData.sh

@@ -1,8 +1,8 @@
 #!/usr/bin/env bash
 
-echo stop soucedb
-systemctl stop sourcedb
+echo stop sudb
+systemctl stop sudb
 sleep 4
-rm -rf /home/sourcedb/SourceDB/lib/sourcedb-data/*
-systemctl start sourcedb
+rm -rf /home/sudb/sudb/lib/sudb-data/*
+systemctl start sudb
 

shell/tsdb/topkValueChange/topkValueChange.sh

@@ -1,3 +0,0 @@
-#!/usr/bin/env bash
-
-java -cp ./lib/tsdb.jar demo.query.topkValueChange.TopkValueChange

tsdb/pom.xml

@@ -24,6 +24,37 @@
                     <target>1.8</target>
                 </configuration>
             </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-surefire-plugin</artifactId>
+                <configuration>
+                    <skip>true</skip>
+                </configuration>
+            </plugin>
+            <plugin>
+                <artifactId>maven-assembly-plugin</artifactId>
+                <version>3.4.2</version>
+                <configuration>
+                    <archive>
+                        <manifest>
+                            <!--这里指定要运行的main类-->
+                            <mainClass>demo.allInsert.InsertHistoricalRandomData</mainClass>
+                        </manifest>
+                    </archive>
+                    <descriptorRefs>
+                        <descriptorRef>jar-with-dependencies</descriptorRef>
+                    </descriptorRefs>
+                </configuration>
+                <executions>
+                    <execution>
+                        <id>make-assembly</id>
+                        <phase>package</phase>
+                        <goals>
+                            <goal>single</goal>
+                        </goals>
+                    </execution>
+                </executions>
+            </plugin>
         </plugins>
     </build>