function.xml is perceivable

thulab · Jan 3, 2024 · c724aab · c724aab
1 parent 26171ba
commit c724aab
Show file tree

Hide file tree

Showing 22 changed files with 96 additions and 4 deletions.
diff --git a/configuration/bin/startup.sh b/configuration/bin/startup.sh
@@ -80,11 +80,11 @@ fi
 
 # check BENCHMARK_HOME
 if [ -z "${BENCHMARK_HOME}" ]; then
-  export BENCHMARK_HOME="$(cd "`dirname "$0"`"/.. && pwd)"
+  export BENCHMARK_HOME="$(cd "$(dirname "$0")" && pwd)"
 fi
 
 # check $benchmark_conf
-if [ -z $benchmark_conf ] ; then
+if [ -z "${benchmark_conf}" ] ; then
   benchmark_conf=${BENCHMARK_HOME}/conf/config.properties
 else
   benchmark_conf="$(cd "$(dirname "$benchmark_conf")" && pwd)/$(basename "$benchmark_conf")"
@@ -93,7 +93,7 @@ else
     exit 1
   fi
 fi
-echo Using configuration file: $benchmark_conf
+echo Using configuration file: "${benchmark_conf}"
 
 # set MAIN_CLASS
 MAIN_CLASS=cn.edu.tsinghua.iot.benchmark.App
@@ -106,6 +106,7 @@ done
 # set benchmark_parms
 benchmark_parms="$benchmark_parms -Duser.timezone=GMT+8"
 benchmark_parms="$benchmark_parms -Dlogback.configurationFile=${BENCHMARK_HOME}/conf/logback.xml"
+benchmark_parms="$benchmark_parms -DBENCHMARK_HOME=${BENCHMARK_HOME}"
 if [ -n "$MAX_HEAP_SIZE" ]; then
   echo Set MAX_HEAP_SIZE=$MAX_HEAP_SIZE
   benchmark_parms="$benchmark_parms -Xmx${MAX_HEAP_SIZE}"

diff --git a/core/src/main/java/cn/edu/tsinghua/iot/benchmark/conf/Config.java b/core/src/main/java/cn/edu/tsinghua/iot/benchmark/conf/Config.java
@@ -35,6 +35,8 @@
 import javax.xml.bind.Unmarshaller;
 
 import java.io.InputStream;
+import java.nio.file.Files;
+import java.nio.file.Paths;
 import java.util.*;
 import java.util.concurrent.atomic.AtomicLong;
 
@@ -402,11 +404,22 @@ public class Config {
   /** Sensor function */
   private Map<String, FunctionParam> SENSOR_FUNCTION = new HashMap<>();
 
+  public String getHomeDir() {
+    // When start benchmark with the script, the environment variables will be set.
+    // But in developer mode it will return another dir to find resources.
+    return System.getProperty(Constants.BENCHMARK_HOME, null);
+  }
+
   /** init inner functions */
   public void initInnerFunction() {
     FunctionXml xml = null;
     try {
-      InputStream input = Function.class.getResourceAsStream("/function.xml");
+      InputStream input;
+      if (getHomeDir() == null) {
+        input = Function.class.getResourceAsStream("/function.xml");
+      } else {
+        input = Files.newInputStream(Paths.get(getHomeDir() + "/resources/function.xml"));
+      }
       JAXBContext context = JAXBContext.newInstance(FunctionXml.class, FunctionParam.class);
       Unmarshaller unmarshaller = context.createUnmarshaller();
       xml = (FunctionXml) unmarshaller.unmarshal(input);

diff --git a/core/src/main/java/cn/edu/tsinghua/iot/benchmark/conf/Constants.java b/core/src/main/java/cn/edu/tsinghua/iot/benchmark/conf/Constants.java
@@ -27,6 +27,8 @@ public class Constants {
   public static final long START_TIMESTAMP =
       TimeUtils.convertDateStrToTimestamp(config.getSTART_TIME());
   public static final String CONSOLE_PREFIX = "iot-benchmark>";
+
+  public static final String BENCHMARK_HOME = "BENCHMARK_HOME";
   public static final String BENCHMARK_CONF = "benchmark-conf";
 
   public static final String MYSQL_DRIVENAME = "com.mysql.jdbc.Driver";

diff --git a/iginx/src/assembly/assembly.xml b/iginx/src/assembly/assembly.xml
@@ -40,6 +40,10 @@
             <directory>${maven.multiModuleProjectDirectory}/configuration/conf/</directory>
             <outputDirectory>conf</outputDirectory>
         </fileSet>
+        <fileSet>
+            <directory>${maven.multiModuleProjectDirectory}/core/src/main/resources</directory>
+            <outputDirectory>resources</outputDirectory>
+        </fileSet>
     </fileSets>
     <files>
         <file>

diff --git a/influxdb-2.0/src/assembly/assembly.xml b/influxdb-2.0/src/assembly/assembly.xml
@@ -40,6 +40,10 @@
             <directory>${maven.multiModuleProjectDirectory}/configuration/conf/</directory>
             <outputDirectory>conf</outputDirectory>
         </fileSet>
+        <fileSet>
+            <directory>${maven.multiModuleProjectDirectory}/core/src/main/resources</directory>
+            <outputDirectory>resources</outputDirectory>
+        </fileSet>
     </fileSets>
     <files>
         <file>

diff --git a/influxdb/src/assembly/assembly.xml b/influxdb/src/assembly/assembly.xml
@@ -40,6 +40,10 @@
             <directory>${maven.multiModuleProjectDirectory}/configuration/conf/</directory>
             <outputDirectory>conf</outputDirectory>
         </fileSet>
+        <fileSet>
+            <directory>${maven.multiModuleProjectDirectory}/core/src/main/resources</directory>
+            <outputDirectory>resources</outputDirectory>
+        </fileSet>
     </fileSets>
     <files>
         <file>

diff --git a/iotdb-0.12/src/assembly/assembly.xml b/iotdb-0.12/src/assembly/assembly.xml
@@ -40,6 +40,10 @@
             <directory>${maven.multiModuleProjectDirectory}/configuration/conf/</directory>
             <outputDirectory>conf</outputDirectory>
         </fileSet>
+        <fileSet>
+            <directory>${maven.multiModuleProjectDirectory}/core/src/main/resources</directory>
+            <outputDirectory>resources</outputDirectory>
+        </fileSet>
     </fileSets>
     <files>
         <file>

diff --git a/iotdb-0.13/src/assembly/assembly.xml b/iotdb-0.13/src/assembly/assembly.xml
@@ -40,6 +40,10 @@
             <directory>${maven.multiModuleProjectDirectory}/configuration/conf/</directory>
             <outputDirectory>conf</outputDirectory>
         </fileSet>
+        <fileSet>
+            <directory>${maven.multiModuleProjectDirectory}/core/src/main/resources</directory>
+            <outputDirectory>resources</outputDirectory>
+        </fileSet>
     </fileSets>
     <files>
         <file>

diff --git a/iotdb-1.0/src/assembly/assembly.xml b/iotdb-1.0/src/assembly/assembly.xml
@@ -40,6 +40,10 @@
             <directory>${maven.multiModuleProjectDirectory}/configuration/conf/</directory>
             <outputDirectory>conf</outputDirectory>
         </fileSet>
+        <fileSet>
+            <directory>${maven.multiModuleProjectDirectory}/core/src/main/resources</directory>
+            <outputDirectory>resources</outputDirectory>
+        </fileSet>
     </fileSets>
     <files>
         <file>

diff --git a/iotdb-1.1/src/assembly/assembly.xml b/iotdb-1.1/src/assembly/assembly.xml
@@ -40,6 +40,10 @@
             <directory>${maven.multiModuleProjectDirectory}/configuration/conf/</directory>
             <outputDirectory>conf</outputDirectory>
         </fileSet>
+        <fileSet>
+            <directory>${maven.multiModuleProjectDirectory}/core/src/main/resources</directory>
+            <outputDirectory>resources</outputDirectory>
+        </fileSet>
     </fileSets>
     <files>
         <file>

diff --git a/kairosdb/src/assembly/assembly.xml b/kairosdb/src/assembly/assembly.xml
@@ -40,6 +40,10 @@
             <directory>${maven.multiModuleProjectDirectory}/configuration/conf/</directory>
             <outputDirectory>conf</outputDirectory>
         </fileSet>
+        <fileSet>
+            <directory>${maven.multiModuleProjectDirectory}/core/src/main/resources</directory>
+            <outputDirectory>resources</outputDirectory>
+        </fileSet>
     </fileSets>
     <files>
         <file>

diff --git a/mssqlserver/src/assembly/assembly.xml b/mssqlserver/src/assembly/assembly.xml
@@ -40,6 +40,10 @@
             <directory>${maven.multiModuleProjectDirectory}/configuration/conf/</directory>
             <outputDirectory>conf</outputDirectory>
         </fileSet>
+        <fileSet>
+            <directory>${maven.multiModuleProjectDirectory}/core/src/main/resources</directory>
+            <outputDirectory>resources</outputDirectory>
+        </fileSet>
     </fileSets>
     <files>
         <file>

diff --git a/opentsdb/src/assembly/assembly.xml b/opentsdb/src/assembly/assembly.xml
@@ -40,6 +40,10 @@
             <directory>${maven.multiModuleProjectDirectory}/configuration/conf/</directory>
             <outputDirectory>conf</outputDirectory>
         </fileSet>
+        <fileSet>
+            <directory>${maven.multiModuleProjectDirectory}/core/src/main/resources</directory>
+            <outputDirectory>resources</outputDirectory>
+        </fileSet>
     </fileSets>
     <files>
         <file>

diff --git a/pi/src/assembly/assembly.xml b/pi/src/assembly/assembly.xml
@@ -40,6 +40,10 @@
             <directory>${maven.multiModuleProjectDirectory}/configuration/conf/</directory>
             <outputDirectory>conf</outputDirectory>
         </fileSet>
+        <fileSet>
+            <directory>${maven.multiModuleProjectDirectory}/core/src/main/resources</directory>
+            <outputDirectory>resources</outputDirectory>
+        </fileSet>
     </fileSets>
     <files>
         <file>

diff --git a/questdb/src/assembly/assembly.xml b/questdb/src/assembly/assembly.xml
@@ -40,6 +40,10 @@
             <directory>${maven.multiModuleProjectDirectory}/configuration/conf/</directory>
             <outputDirectory>conf</outputDirectory>
         </fileSet>
+        <fileSet>
+            <directory>${maven.multiModuleProjectDirectory}/core/src/main/resources</directory>
+            <outputDirectory>resources</outputDirectory>
+        </fileSet>
     </fileSets>
     <files>
         <file>

diff --git a/sqlite/src/assembly/assembly.xml b/sqlite/src/assembly/assembly.xml
@@ -40,6 +40,10 @@
             <directory>${maven.multiModuleProjectDirectory}/configuration/conf/</directory>
             <outputDirectory>conf</outputDirectory>
         </fileSet>
+        <fileSet>
+            <directory>${maven.multiModuleProjectDirectory}/core/src/main/resources</directory>
+            <outputDirectory>resources</outputDirectory>
+        </fileSet>
     </fileSets>
     <files>
         <file>

diff --git a/tdengine-3.0/src/assembly/assembly.xml b/tdengine-3.0/src/assembly/assembly.xml
@@ -40,6 +40,10 @@
             <directory>${maven.multiModuleProjectDirectory}/configuration/conf/</directory>
             <outputDirectory>conf</outputDirectory>
         </fileSet>
+        <fileSet>
+            <directory>${maven.multiModuleProjectDirectory}/core/src/main/resources</directory>
+            <outputDirectory>resources</outputDirectory>
+        </fileSet>
     </fileSets>
     <files>
         <file>

diff --git a/tdengine/src/assembly/assembly.xml b/tdengine/src/assembly/assembly.xml
@@ -40,6 +40,10 @@
             <directory>${maven.multiModuleProjectDirectory}/configuration/conf/</directory>
             <outputDirectory>conf</outputDirectory>
         </fileSet>
+        <fileSet>
+            <directory>${maven.multiModuleProjectDirectory}/core/src/main/resources</directory>
+            <outputDirectory>resources</outputDirectory>
+        </fileSet>
     </fileSets>
     <files>
         <file>

diff --git a/timescaledb-cluster/src/assembly/assembly.xml b/timescaledb-cluster/src/assembly/assembly.xml
@@ -40,6 +40,10 @@
             <directory>${maven.multiModuleProjectDirectory}/configuration/conf/</directory>
             <outputDirectory>conf</outputDirectory>
         </fileSet>
+        <fileSet>
+            <directory>${maven.multiModuleProjectDirectory}/core/src/main/resources</directory>
+            <outputDirectory>resources</outputDirectory>
+        </fileSet>
     </fileSets>
     <files>
         <file>

diff --git a/timescaledb/src/assembly/assembly.xml b/timescaledb/src/assembly/assembly.xml
@@ -40,6 +40,10 @@
             <directory>${maven.multiModuleProjectDirectory}/configuration/conf/</directory>
             <outputDirectory>conf</outputDirectory>
         </fileSet>
+        <fileSet>
+            <directory>${maven.multiModuleProjectDirectory}/core/src/main/resources</directory>
+            <outputDirectory>resources</outputDirectory>
+        </fileSet>
     </fileSets>
     <files>
         <file>

diff --git a/verification/src/assembly/assembly.xml b/verification/src/assembly/assembly.xml
@@ -40,6 +40,10 @@
             <directory>${maven.multiModuleProjectDirectory}/configuration/conf/</directory>
             <outputDirectory>conf</outputDirectory>
         </fileSet>
+        <fileSet>
+            <directory>${maven.multiModuleProjectDirectory}/core/src/main/resources</directory>
+            <outputDirectory>resources</outputDirectory>
+        </fileSet>
     </fileSets>
     <files>
         <file>

diff --git a/victoriametrics/src/assembly/assembly.xml b/victoriametrics/src/assembly/assembly.xml
@@ -40,6 +40,10 @@
             <directory>${maven.multiModuleProjectDirectory}/configuration/conf/</directory>
             <outputDirectory>conf</outputDirectory>
         </fileSet>
+        <fileSet>
+            <directory>${maven.multiModuleProjectDirectory}/core/src/main/resources</directory>
+            <outputDirectory>resources</outputDirectory>
+        </fileSet>
     </fileSets>
     <files>
         <file>