You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@iotdb.apache.org by ha...@apache.org on 2022/11/21 09:54:08 UTC
[iotdb] branch Update_distribution created (now b643629c1f)
This is an automated email from the ASF dual-hosted git repository.
haonan pushed a change to branch Update_distribution
in repository https://gitbox.apache.org/repos/asf/iotdb.git
at b643629c1f Update distribution package structure
This branch includes the following new commits:
new b643629c1f Update distribution package structure
The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
[iotdb] 01/01: Update distribution package structure
Posted by ha...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
haonan pushed a commit to branch Update_distribution
in repository https://gitbox.apache.org/repos/asf/iotdb.git
commit b643629c1f8d26a1412591615e38dd8fb100690e
Author: HTHou <hh...@outlook.com>
AuthorDate: Mon Nov 21 17:53:37 2022 +0800
Update distribution package structure
---
distribution/src/assembly/all.xml | 4 -
distribution/src/assembly/datanode.xml | 4 -
.../GrafanaPlugin/iotdb/conf/iotdb-rest.properties | 61 -----------
.../Ecosystem-Integration/Grafana-Plugin.md | 2 +-
docs/zh/UserGuide/API/RestService.md | 2 +-
.../resources/conf/iotdb-common.properties | 47 +++++++++
.../assembly/resources/conf/iotdb-rest.properties | 64 ------------
.../assembly/resources/tools/detect-watermark.bat | 65 ------------
.../assembly/resources/tools/detect-watermark.sh | 47 ---------
.../assembly/resources/tools/start-WalChecker.bat | 111 ---------------------
.../assembly/resources/tools/start-WalChecker.sh | 91 -----------------
.../print-iotdb-data-dir.bat | 0
.../print-iotdb-data-dir.sh | 0
.../print-tsfile-resource-files.bat | 0
.../print-tsfile-resource-files.sh | 0
.../print-tsfile-sketch.bat | 0
.../print-tsfile-sketch.sh | 0
.../print-tsfile-visdata.bat | 0
.../print-tsfile-visdata.sh | 0
.../split-tsfile-tool.bat | 0
.../{tsfileToolSet => tsfile}/split-tsfile-tool.sh | 0
.../{tsfileToolSet => tsfile}/validate-tsfile.bat | 0
.../{tsfileToolSet => tsfile}/validate-tsfile.sh | 0
.../resources/tools/tsfileToolSet/settle.bat | 62 ------------
.../resources/tools/tsfileToolSet/settle.sh | 51 ----------
.../iotdb/db/conf/rest/IoTDBRestServiceConfig.java | 2 +-
.../resources/datanode1conf/iotdb-rest.properties | 18 ----
.../resources/datanode2conf/iotdb-rest.properties | 18 ----
.../resources/datanode3conf/iotdb-rest.properties | 18 ----
...tdb-rest.properties => iotdb-common.properties} | 0
...tdb-rest.properties => iotdb-common.properties} | 0
site/src/main/.vuepress/config.js | 2 -
32 files changed, 50 insertions(+), 619 deletions(-)
diff --git a/distribution/src/assembly/all.xml b/distribution/src/assembly/all.xml
index 40499010f4..99c039ec5b 100644
--- a/distribution/src/assembly/all.xml
+++ b/distribution/src/assembly/all.xml
@@ -108,10 +108,6 @@
<!-- <outputDirectory>confignode</outputDirectory>-->
<!-- <directory>${maven.multiModuleProjectDirectory}/distribution/target/apache-iotdb-${project.version}-all-bin/apache-iotdb-${project.version}-all-bin/confignode</directory>-->
<!-- </fileSet>-->
- <fileSet>
- <directory>${maven.multiModuleProjectDirectory}/docs</directory>
- <outputDirectory>docs</outputDirectory>
- </fileSet>
</fileSets>
<!-- <files>-->
<!-- <file>-->
diff --git a/distribution/src/assembly/datanode.xml b/distribution/src/assembly/datanode.xml
index 865272278e..c7f07f271a 100644
--- a/distribution/src/assembly/datanode.xml
+++ b/distribution/src/assembly/datanode.xml
@@ -75,10 +75,6 @@
<directory>${maven.multiModuleProjectDirectory}/cli/src/assembly/resources/tools</directory>
<fileMode>0755</fileMode>
</fileSet>
- <fileSet>
- <directory>${maven.multiModuleProjectDirectory}/docs</directory>
- <outputDirectory>docs</outputDirectory>
- </fileSet>
</fileSets>
<files>
<file>
diff --git a/docker/src/main/DockerCompose/GrafanaPlugin/iotdb/conf/iotdb-rest.properties b/docker/src/main/DockerCompose/GrafanaPlugin/iotdb/conf/iotdb-rest.properties
deleted file mode 100644
index 6c608984df..0000000000
--- a/docker/src/main/DockerCompose/GrafanaPlugin/iotdb/conf/iotdb-rest.properties
+++ /dev/null
@@ -1,61 +0,0 @@
-#
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements. See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership. The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License. You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the License for the
-# specific language governing permissions and limitations
-# under the License.
-#
-
-####################
-### REST Service Configuration
-####################
-
-# Is the REST service enabled
-enable_rest_service=true
-
-# the binding port of the REST service
-# rest_service_port=18080
-
-# Whether to display rest service interface information through swagger. eg: http://ip:port/swagger.json
-# enable_swagger=false
-
-# the default row limit to a REST query response when the rowSize parameter is not given in request
-# rest_query_default_row_size_limit=10000
-
-# the expiration time of the user login information cache (in seconds)
-# cache_expire_in_seconds=28800
-
-# maximum number of users can be stored in the user login cache.
-# cache_max_num=100
-
-# init capacity of users can be stored in the user login cache.
-# cache_init_num=10
-
-# is SSL enabled
-# enable_https=false
-
-# SSL key store path
-# key_store_path=
-
-# SSL key store password
-# key_store_pwd=
-
-# SSL trust store path
-# trust_store_path=
-
-# SSL trust store password.
-# trust_store_pwd=
-
-# SSL timeout (in seconds)
-# idle_timeout_in_seconds=50000
diff --git a/docs/UserGuide/Ecosystem-Integration/Grafana-Plugin.md b/docs/UserGuide/Ecosystem-Integration/Grafana-Plugin.md
index 928befd068..03afa016b2 100644
--- a/docs/UserGuide/Ecosystem-Integration/Grafana-Plugin.md
+++ b/docs/UserGuide/Ecosystem-Integration/Grafana-Plugin.md
@@ -143,7 +143,7 @@ For more details，please click [here](https://grafana.com/docs/grafana/latest/i
#### Configure IoTDB REST Service
-* Modify `{iotdb directory}/conf/iotdb-rest.properties` as following:
+* Modify `{iotdb directory}/conf/iotdb-common.properties` as following:
```properties
# Is the REST service enabled
diff --git a/docs/zh/UserGuide/API/RestService.md b/docs/zh/UserGuide/API/RestService.md
index d7ef565302..5316653003 100644
--- a/docs/zh/UserGuide/API/RestService.md
+++ b/docs/zh/UserGuide/API/RestService.md
@@ -30,7 +30,7 @@ RESTful 服务默认情况是关闭的
* 使用者
- 找到IoTDB安装目录下面的`conf/iotdb-rest.properties`文件，将 `enable_rest_service` 设置为 `true` 以启用该模块。
+ 找到IoTDB安装目录下面的`conf/iotdb-common.properties`文件，将 `enable_rest_service` 设置为 `true` 以启用该模块。
```properties
enable_rest_service=true
diff --git a/node-commons/src/assembly/resources/conf/iotdb-common.properties b/node-commons/src/assembly/resources/conf/iotdb-common.properties
index afcae7d273..dc2f2b7125 100644
--- a/node-commons/src/assembly/resources/conf/iotdb-common.properties
+++ b/node-commons/src/assembly/resources/conf/iotdb-common.properties
@@ -1090,6 +1090,53 @@
# Datatype: int
# mqtt_max_message_size=1048576
+####################
+### REST Service Configuration
+####################
+
+# Is the REST service enabled
+# enable_rest_service=false
+
+# the binding port of the REST service
+# rest_service_port=18080
+
+# Whether to display rest service interface information through swagger. eg: http://ip:port/swagger.json
+# enable_swagger=false
+
+# the default row limit to a REST query response when the rowSize parameter is not given in request
+# rest_query_default_row_size_limit=10000
+
+# the expiration time of the user login information cache (in seconds)
+# cache_expire_in_seconds=28800
+
+# maximum number of users can be stored in the user login cache.
+# cache_max_num=100
+
+# init capacity of users can be stored in the user login cache.
+# cache_init_num=10
+
+# is SSL enabled
+# enable_https=false
+
+# SSL key store path
+# key_store_path=
+
+# SSL key store password
+# key_store_pwd=
+
+# Is client authentication required
+# client_auth=false
+
+# SSL trust store path
+# trust_store_path=
+
+# SSL trust store password.
+# trust_store_pwd=
+
+# SSL timeout (in seconds)
+# idle_timeout_in_seconds=50000
+
+
####################
### InfluxDB RPC Service Configuration
####################
diff --git a/server/src/assembly/resources/conf/iotdb-rest.properties b/server/src/assembly/resources/conf/iotdb-rest.properties
deleted file mode 100644
index 53b418dab3..0000000000
--- a/server/src/assembly/resources/conf/iotdb-rest.properties
+++ /dev/null
@@ -1,64 +0,0 @@
-#
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements. See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership. The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License. You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the License for the
-# specific language governing permissions and limitations
-# under the License.
-#
-
-####################
-### REST Service Configuration
-####################
-
-# Is the REST service enabled
-# enable_rest_service=false
-
-# the binding port of the REST service
-# rest_service_port=18080
-
-# Whether to display rest service interface information through swagger. eg: http://ip:port/swagger.json
-# enable_swagger=false
-
-# the default row limit to a REST query response when the rowSize parameter is not given in request
-# rest_query_default_row_size_limit=10000
-
-# the expiration time of the user login information cache (in seconds)
-# cache_expire_in_seconds=28800
-
-# maximum number of users can be stored in the user login cache.
-# cache_max_num=100
-
-# init capacity of users can be stored in the user login cache.
-# cache_init_num=10
-
-# is SSL enabled
-# enable_https=false
-
-# SSL key store path
-# key_store_path=
-
-# SSL key store password
-# key_store_pwd=
-
-# Is client authentication required
-# client_auth=false
-
-# SSL trust store path
-# trust_store_path=
-
-# SSL trust store password.
-# trust_store_pwd=
-
-# SSL timeout (in seconds)
-# idle_timeout_in_seconds=50000
diff --git a/server/src/assembly/resources/tools/detect-watermark.bat b/server/src/assembly/resources/tools/detect-watermark.bat
deleted file mode 100644
index f428aacd9c..0000000000
--- a/server/src/assembly/resources/tools/detect-watermark.bat
+++ /dev/null
@@ -1,65 +0,0 @@
-@REM
-@REM Licensed to the Apache Software Foundation (ASF) under one
-@REM or more contributor license agreements. See the NOTICE file
-@REM distributed with this work for additional information
-@REM regarding copyright ownership. The ASF licenses this file
-@REM to you under the Apache License, Version 2.0 (the
-@REM "License"); you may not use this file except in compliance
-@REM with the License. You may obtain a copy of the License at
-@REM
-@REM http://www.apache.org/licenses/LICENSE-2.0
-@REM
-@REM Unless required by applicable law or agreed to in writing,
-@REM software distributed under the License is distributed on an
-@REM "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-@REM KIND, either express or implied. See the License for the
-@REM specific language governing permissions and limitations
-@REM under the License.
-@REM
-
-
-@echo off
-if "%OS%" == "Windows_NT" setlocal
-
-pushd %~dp0..
-if NOT DEFINED IOTDB_HOME set IOTDB_HOME=%CD%
-popd
-
-set IOTDB_CONF=%IOTDB_HOME%\conf
-
-if NOT DEFINED MAIN_CLASS set MAIN_CLASS=org.apache.iotdb.db.tools.watermark.WatermarkDetector
-if NOT DEFINED JAVA_HOME goto :err
-
-@REM -----------------------------------------------------------------------------
-@REM JVM Opts we'll use in legacy run or installation
-set JAVA_OPTS=-ea^
- -Dlogback.configurationFile="%IOTDB_CONF%\logback-tool.xml"^
- -DIOTDB_HOME=%IOTDB_HOME%
-
-@REM ***** CLASSPATH library setting *****
-@REM Ensure that any user defined CLASSPATH variables are not used on startup
-set CLASSPATH="%IOTDB_HOME%\lib\*"
-
-goto okClasspath
-
-:append
-set CLASSPATH=%CLASSPATH%;%1
-goto :eof
-
-@REM -----------------------------------------------------------------------------
-:okClasspath
-
-"%JAVA_HOME%\bin\java" %JAVA_OPTS% %JAVA_OPTS% -cp "%CLASSPATH%" %MAIN_CLASS% %*
-
-goto finally
-
-
-:err
-echo JAVA_HOME environment variable must be set!
-pause
-
-
-@REM -----------------------------------------------------------------------------
-:finally
-
-ENDLOCAL
\ No newline at end of file
diff --git a/server/src/assembly/resources/tools/detect-watermark.sh b/server/src/assembly/resources/tools/detect-watermark.sh
deleted file mode 100644
index a231d334df..0000000000
--- a/server/src/assembly/resources/tools/detect-watermark.sh
+++ /dev/null
@@ -1,47 +0,0 @@
-#!/bin/sh
-#
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements. See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership. The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License. You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the License for the
-# specific language governing permissions and limitations
-# under the License.
-#
-
-source "$(dirname "$0")/../sbin/iotdb-common.sh"
-#get_iotdb_include and checkAllVariables is in iotdb-common.sh
-VARS=$(get_iotdb_include "$*")
-checkAllVariables
-eval set -- "$VARS"
-
-
-if [ -n "$JAVA_HOME" ]; then
- for java in "$JAVA_HOME"/bin/amd64/java "$JAVA_HOME"/bin/java; do
- if [ -x "$java" ]; then
- JAVA="$java"
- break
- fi
- done
-else
- JAVA=java
-fi
-
-CLASSPATH=""
-for f in ${IOTDB_HOME}/lib/*.jar; do
- CLASSPATH=${CLASSPATH}":"$f
-done
-
-MAIN_CLASS=org.apache.iotdb.db.tools.watermark.WatermarkDetector
-
-"$JAVA" -DIOTDB_HOME=${IOTDB_HOME} -cp "$CLASSPATH" "$MAIN_CLASS" "$@"
-exit $?
\ No newline at end of file
diff --git a/server/src/assembly/resources/tools/start-WalChecker.bat b/server/src/assembly/resources/tools/start-WalChecker.bat
deleted file mode 100644
index 42a18afd8e..0000000000
--- a/server/src/assembly/resources/tools/start-WalChecker.bat
+++ /dev/null
@@ -1,111 +0,0 @@
-@REM
-@REM Licensed to the Apache Software Foundation (ASF) under one
-@REM or more contributor license agreements. See the NOTICE file
-@REM distributed with this work for additional information
-@REM regarding copyright ownership. The ASF licenses this file
-@REM to you under the Apache License, Version 2.0 (the
-@REM "License"); you may not use this file except in compliance
-@REM with the License. You may obtain a copy of the License at
-@REM
-@REM http://www.apache.org/licenses/LICENSE-2.0
-@REM
-@REM Unless required by applicable law or agreed to in writing,
-@REM software distributed under the License is distributed on an
-@REM "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-@REM KIND, either express or implied. See the License for the
-@REM specific language governing permissions and limitations
-@REM under the License.
-@REM
-
-@echo off
-echo ````````````````````````
-echo Starting WalChecker
-echo ````````````````````````
-
-PATH %PATH%;%JAVA_HOME%\bin\
-set "FULL_VERSION="
-set "MAJOR_VERSION="
-set "MINOR_VERSION="
-
-
-for /f tokens^=2-5^ delims^=.-_+^" %%j in ('java -fullversion 2^>^&1') do (
- set "FULL_VERSION=%%j-%%k-%%l-%%m"
- IF "%%j" == "1" (
- set "MAJOR_VERSION=%%k"
- set "MINOR_VERSION=%%l"
- ) else (
- set "MAJOR_VERSION=%%j"
- set "MINOR_VERSION=%%k"
- )
-)
-
-set JAVA_VERSION=%MAJOR_VERSION%
-
-IF NOT %JAVA_VERSION% == 8 (
- IF NOT %JAVA_VERSION% == 11 (
- echo IoTDB only supports jdk8 or jdk11, please check your java version.
- goto finally
- )
-)
-
-if "%OS%" == "Windows_NT" setlocal
-
-pushd %~dp0..
-if NOT DEFINED IOTDB_HOME set IOTDB_HOME=%cd%
-popd
-
-set IOTDB_CONF=%IOTDB_HOME%\conf
-set IOTDB_LOGS=%IOTDB_HOME%\logs
-
-if NOT DEFINED MAIN_CLASS set MAIN_CLASS=org.apache.iotdb.db.tools.WalChecker
-if NOT DEFINED JAVA_HOME goto :err
-
-@REM -----------------------------------------------------------------------------
-@REM JVM Opts we'll use in legacy run or installation
-set JAVA_OPTS=-ea^
- -Dlogback.configurationFile="%IOTDB_CONF%\logback-datanode.xml"^
- -DIOTDB_HOME="%IOTDB_HOME%"^
- -DTSFILE_HOME="%IOTDB_HOME%"^
- -DIOTDB_CONF="%IOTDB_CONF%"
-
-@REM ***** CLASSPATH library setting *****
-@REM Ensure that any user defined CLASSPATH variables are not used on startup
-set CLASSPATH="%IOTDB_HOME%\lib\*"
-
-goto okClasspath
-
-:append
-set CLASSPATH=%CLASSPATH%;%1
-goto :eof
-
-REM -----------------------------------------------------------------------------
-:okClasspath
-
-rem echo CLASSPATH: %CLASSPATH%
-set IOTDB_WAL=%1
-
-IF "%IOTDB_WAL%"=="" (
- echo "please input the wal folder."
- goto finally
- )
-
-IF EXIST "%IOTDB_WAL%" (
- "%JAVA_HOME%\bin\java" %JAVA_OPTS% %IOTDB_HEAP_OPTS% -cp %CLASSPATH% %IOTDB_JMX_OPTS% %MAIN_CLASS% %IOTDB_WAL%
- ) ELSE (
- echo "can't find %IOTDB_WAL%"
- )
-
-
-goto finally
-
-:err
-echo JAVA_HOME environment variable must be set!
-pause
-
-
-@REM -----------------------------------------------------------------------------
-:finally
-
-pause
-
-ENDLOCAL
diff --git a/server/src/assembly/resources/tools/start-WalChecker.sh b/server/src/assembly/resources/tools/start-WalChecker.sh
deleted file mode 100755
index ccef41c9e0..0000000000
--- a/server/src/assembly/resources/tools/start-WalChecker.sh
+++ /dev/null
@@ -1,91 +0,0 @@
-#!/bin/bash
-#
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements. See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership. The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License. You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the License for the
-# specific language governing permissions and limitations
-# under the License.
-#
-
-
-echo ---------------------
-echo Starting WalChecker
-echo ---------------------
-
-source "$(dirname "$0")/../sbin/iotdb-common.sh"
-#get_iotdb_include and checkAllVariables is in iotdb-common.sh
-VARS=$(get_iotdb_include "$*")
-checkAllVariables
-eval set -- "$VARS"
-
-# IOTDB_LOGS=${IOTDB_HOME}/logs
-
-#if [ -f "$IOTDB_CONF/datanode-env.sh" ]; then
-# . "$IOTDB_CONF/datanode-env.sh"
-#else
-# echo "can't find $IOTDB_CONF/datanode-env.sh"
-#fi
-
-if [ -n "$JAVA_HOME" ]; then
- for java in "$JAVA_HOME"/bin/amd64/java "$JAVA_HOME"/bin/java; do
- if [ -x "$java" ]; then
- JAVA="$java"
- break
- fi
- done
-else
- JAVA=java
-fi
-
-if [ -z $JAVA ] ; then
- echo Unable to find java executable. Check JAVA_HOME and PATH environment variables. > /dev/stderr
- exit 1;
-fi
-
-CLASSPATH=""
-for f in ${IOTDB_HOME}/lib/*.jar; do
- CLASSPATH=${CLASSPATH}":"$f
-done
-classname=org.apache.iotdb.db.tools.WalChecker
-
-
-launch_service()
-{
- class="$1"
- iotdb_parms="-Dlogback.configurationFile=${IOTDB_CONF}/logback-datanode.xml"
- iotdb_parms="$iotdb_parms -DIOTDB_HOME=${IOTDB_HOME}"
- iotdb_parms="$iotdb_parms -DTSFILE_HOME=${IOTDB_HOME}"
- iotdb_parms="$iotdb_parms -DIOTDB_CONF=${IOTDB_CONF}"
-# iotdb_parms="$iotdb_parms -Dname=iotdb\.IoTDB"
- exec "$JAVA" $iotdb_parms $IOTDB_JMX_OPTS -cp "$CLASSPATH" "$class" "$WALPATH"
- return $?
-}
-
-# Start up the service
-#launch_service "$classname"
-
-if [ $# -ne 1 ]; then
- echo "please input the wal folder."
-exit 1;
-fi
-
-if [ ! -d ${1} ]; then
- echo "Can't find wal directory. ${1}"
- exit 1;
-else
- WALPATH=${1}
- launch_service "$classname"
-fi
-
-exit $?
diff --git a/server/src/assembly/resources/tools/tsfileToolSet/print-iotdb-data-dir.bat b/server/src/assembly/resources/tools/tsfile/print-iotdb-data-dir.bat
similarity index 100%
rename from server/src/assembly/resources/tools/tsfileToolSet/print-iotdb-data-dir.bat
rename to server/src/assembly/resources/tools/tsfile/print-iotdb-data-dir.bat
diff --git a/server/src/assembly/resources/tools/tsfileToolSet/print-iotdb-data-dir.sh b/server/src/assembly/resources/tools/tsfile/print-iotdb-data-dir.sh
similarity index 100%
rename from server/src/assembly/resources/tools/tsfileToolSet/print-iotdb-data-dir.sh
rename to server/src/assembly/resources/tools/tsfile/print-iotdb-data-dir.sh
diff --git a/server/src/assembly/resources/tools/tsfileToolSet/print-tsfile-resource-files.bat b/server/src/assembly/resources/tools/tsfile/print-tsfile-resource-files.bat
similarity index 100%
rename from server/src/assembly/resources/tools/tsfileToolSet/print-tsfile-resource-files.bat
rename to server/src/assembly/resources/tools/tsfile/print-tsfile-resource-files.bat
diff --git a/server/src/assembly/resources/tools/tsfileToolSet/print-tsfile-resource-files.sh b/server/src/assembly/resources/tools/tsfile/print-tsfile-resource-files.sh
similarity index 100%
rename from server/src/assembly/resources/tools/tsfileToolSet/print-tsfile-resource-files.sh
rename to server/src/assembly/resources/tools/tsfile/print-tsfile-resource-files.sh
diff --git a/server/src/assembly/resources/tools/tsfileToolSet/print-tsfile-sketch.bat b/server/src/assembly/resources/tools/tsfile/print-tsfile-sketch.bat
similarity index 100%
rename from server/src/assembly/resources/tools/tsfileToolSet/print-tsfile-sketch.bat
rename to server/src/assembly/resources/tools/tsfile/print-tsfile-sketch.bat
diff --git a/server/src/assembly/resources/tools/tsfileToolSet/print-tsfile-sketch.sh b/server/src/assembly/resources/tools/tsfile/print-tsfile-sketch.sh
similarity index 100%
rename from server/src/assembly/resources/tools/tsfileToolSet/print-tsfile-sketch.sh
rename to server/src/assembly/resources/tools/tsfile/print-tsfile-sketch.sh
diff --git a/server/src/assembly/resources/tools/tsfileToolSet/print-tsfile-visdata.bat b/server/src/assembly/resources/tools/tsfile/print-tsfile-visdata.bat
similarity index 100%
rename from server/src/assembly/resources/tools/tsfileToolSet/print-tsfile-visdata.bat
rename to server/src/assembly/resources/tools/tsfile/print-tsfile-visdata.bat
diff --git a/server/src/assembly/resources/tools/tsfileToolSet/print-tsfile-visdata.sh b/server/src/assembly/resources/tools/tsfile/print-tsfile-visdata.sh
similarity index 100%
rename from server/src/assembly/resources/tools/tsfileToolSet/print-tsfile-visdata.sh
rename to server/src/assembly/resources/tools/tsfile/print-tsfile-visdata.sh
diff --git a/server/src/assembly/resources/tools/tsfileToolSet/split-tsfile-tool.bat b/server/src/assembly/resources/tools/tsfile/split-tsfile-tool.bat
similarity index 100%
rename from server/src/assembly/resources/tools/tsfileToolSet/split-tsfile-tool.bat
rename to server/src/assembly/resources/tools/tsfile/split-tsfile-tool.bat
diff --git a/server/src/assembly/resources/tools/tsfileToolSet/split-tsfile-tool.sh b/server/src/assembly/resources/tools/tsfile/split-tsfile-tool.sh
similarity index 100%
rename from server/src/assembly/resources/tools/tsfileToolSet/split-tsfile-tool.sh
rename to server/src/assembly/resources/tools/tsfile/split-tsfile-tool.sh
diff --git a/server/src/assembly/resources/tools/tsfileToolSet/validate-tsfile.bat b/server/src/assembly/resources/tools/tsfile/validate-tsfile.bat
similarity index 100%
rename from server/src/assembly/resources/tools/tsfileToolSet/validate-tsfile.bat
rename to server/src/assembly/resources/tools/tsfile/validate-tsfile.bat
diff --git a/server/src/assembly/resources/tools/tsfileToolSet/validate-tsfile.sh b/server/src/assembly/resources/tools/tsfile/validate-tsfile.sh
similarity index 100%
rename from server/src/assembly/resources/tools/tsfileToolSet/validate-tsfile.sh
rename to server/src/assembly/resources/tools/tsfile/validate-tsfile.sh
diff --git a/server/src/assembly/resources/tools/tsfileToolSet/settle.bat b/server/src/assembly/resources/tools/tsfileToolSet/settle.bat
deleted file mode 100644
index 43cb976534..0000000000
--- a/server/src/assembly/resources/tools/tsfileToolSet/settle.bat
+++ /dev/null
@@ -1,62 +0,0 @@
-@REM
-@REM Licensed to the Apache Software Foundation (ASF) under one
-@REM or more contributor license agreements. See the NOTICE file
-@REM distributed with this work for additional information
-@REM regarding copyright ownership. The ASF licenses this file
-@REM to you under the Apache License, Version 2.0 (the
-@REM "License"); you may not use this file except in compliance
-@REM with the License. You may obtain a copy of the License at
-@REM
-@REM http://www.apache.org/licenses/LICENSE-2.0
-@REM
-@REM Unless required by applicable law or agreed to in writing,
-@REM software distributed under the License is distributed on an
-@REM "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-@REM KIND, either express or implied. See the License for the
-@REM specific language governing permissions and limitations
-@REM under the License.
-@REM
-
-
-@echo off
-echo ````````````````````````
-echo Starting Settling the TsFile
-echo ````````````````````````
-
-if "%OS%" == "Windows_NT" setlocal
-
-pushd %~dp0..\..
-if NOT DEFINED IOTDB_HOME set IOTDB_HOME=%CD%
-popd
-
-if NOT DEFINED MAIN_CLASS set MAIN_CLASS=org.apache.iotdb.db.tools.settle.TsFileAndModSettleTool
-if NOT DEFINED JAVA_HOME goto :err
-
-@REM -----------------------------------------------------------------------------
-@REM ***** CLASSPATH library setting *****
-@REM Ensure that any user defined CLASSPATH variables are not used on startup
-set CLASSPATH="%IOTDB_HOME%\lib\*"
-
-goto okClasspath
-
-:append
-set CLASSPATH=%CLASSPATH%;%1
-goto :eof
-
-@REM -----------------------------------------------------------------------------
-:okClasspath
-
-"%JAVA_HOME%\bin\java" -cp "%CLASSPATH%" %MAIN_CLASS% %*
-
-goto finally
-
-
-:err
-echo JAVA_HOME environment variable must be set!
-pause
-
-
-@REM -----------------------------------------------------------------------------
-:finally
-
-ENDLOCAL
diff --git a/server/src/assembly/resources/tools/tsfileToolSet/settle.sh b/server/src/assembly/resources/tools/tsfileToolSet/settle.sh
deleted file mode 100644
index f122f13e69..0000000000
--- a/server/src/assembly/resources/tools/tsfileToolSet/settle.sh
+++ /dev/null
@@ -1,51 +0,0 @@
-#!/bin/sh
-#
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements. See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership. The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License. You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the License for the
-# specific language governing permissions and limitations
-# under the License.
-#
-
-echo ---------------------
-echo Starting Settling the TsFile
-echo ---------------------
-
-source "$(dirname "$0")/../../sbin/iotdb-common.sh"
-#get_iotdb_include and checkAllVariables is in iotdb-common.sh
-VARS=$(get_iotdb_include "$*")
-checkAllVariables
-export IOTDB_HOME="${IOTDB_HOME}/.."
-eval set -- "$VARS"
-
-if [ -n "$JAVA_HOME" ]; then
- for java in "$JAVA_HOME"/bin/amd64/java "$JAVA_HOME"/bin/java; do
- if [ -x "$java" ]; then
- JAVA="$java"
- break
- fi
- done
-else
- JAVA=java
-fi
-
-CLASSPATH=""
-for f in ${IOTDB_HOME}/lib/*.jar; do
- CLASSPATH=${CLASSPATH}":"$f
-done
-
-MAIN_CLASS=org.apache.iotdb.db.tools.settle.TsFileAndModSettleTool
-
-"$JAVA" -cp "$CLASSPATH" "$MAIN_CLASS" "$@"
-exit $?
diff --git a/server/src/main/java/org/apache/iotdb/db/conf/rest/IoTDBRestServiceConfig.java b/server/src/main/java/org/apache/iotdb/db/conf/rest/IoTDBRestServiceConfig.java
index fdaca31851..eb4af414c6 100644
--- a/server/src/main/java/org/apache/iotdb/db/conf/rest/IoTDBRestServiceConfig.java
+++ b/server/src/main/java/org/apache/iotdb/db/conf/rest/IoTDBRestServiceConfig.java
@@ -19,7 +19,7 @@
package org.apache.iotdb.db.conf.rest;
public class IoTDBRestServiceConfig {
- static final String CONFIG_NAME = "iotdb-rest.properties";
+ static final String CONFIG_NAME = "iotdb-common.properties";
/** if the enableRestService is true, we will start REST Service */
private boolean enableRestService = false;
diff --git a/server/src/test/resources/datanode1conf/iotdb-rest.properties b/server/src/test/resources/datanode1conf/iotdb-rest.properties
deleted file mode 100644
index 797783f2b3..0000000000
--- a/server/src/test/resources/datanode1conf/iotdb-rest.properties
+++ /dev/null
@@ -1,18 +0,0 @@
-#
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements. See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership. The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License. You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the License for the
-# specific language governing permissions and limitations
-# under the License.
-#
\ No newline at end of file
diff --git a/server/src/test/resources/datanode2conf/iotdb-rest.properties b/server/src/test/resources/datanode2conf/iotdb-rest.properties
deleted file mode 100644
index 585be9602f..0000000000
--- a/server/src/test/resources/datanode2conf/iotdb-rest.properties
+++ /dev/null
@@ -1,18 +0,0 @@
-#
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements. See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership. The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License. You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the License for the
-# specific language governing permissions and limitations
-# under the License.
-#
diff --git a/server/src/test/resources/datanode3conf/iotdb-rest.properties b/server/src/test/resources/datanode3conf/iotdb-rest.properties
deleted file mode 100644
index 797783f2b3..0000000000
--- a/server/src/test/resources/datanode3conf/iotdb-rest.properties
+++ /dev/null
@@ -1,18 +0,0 @@
-#
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements. See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership. The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License. You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the License for the
-# specific language governing permissions and limitations
-# under the License.
-#
\ No newline at end of file
diff --git a/server/src/test/resources/iotdb-rest.properties b/server/src/test/resources/iotdb-common.properties
similarity index 100%
rename from server/src/test/resources/iotdb-rest.properties
rename to server/src/test/resources/iotdb-common.properties
diff --git a/session/src/test/resources/iotdb-rest.properties b/session/src/test/resources/iotdb-common.properties
similarity index 100%
rename from session/src/test/resources/iotdb-rest.properties
rename to session/src/test/resources/iotdb-common.properties
diff --git a/site/src/main/.vuepress/config.js b/site/src/main/.vuepress/config.js
index c60dddbc63..29b4ef8b4d 100644
--- a/site/src/main/.vuepress/config.js
+++ b/site/src/main/.vuepress/config.js
@@ -960,7 +960,6 @@ var config = {
['Maintenance-Tools/JMX-Tool','JMX Tool'],
['Maintenance-Tools/MLogParser-Tool','MLogParser Tool'],
['Maintenance-Tools/NodeTool','Node Tool'],
- ['Maintenance-Tools/Watermark-Tool','Watermark Tool'],
['Maintenance-Tools/TsFile-Split-Tool','TsFile Split Tool']
]
},
@@ -1937,7 +1936,6 @@ var config = {
['Maintenance-Tools/JMX-Tool','JMX 工具'],
['Maintenance-Tools/MLogParser-Tool','Mlog解析工具'],
['Maintenance-Tools/NodeTool','节点工具'],
- ['Maintenance-Tools/Watermark-Tool','水印工具'],
['Maintenance-Tools/TsFile-Split-Tool','TsFile 拆分工具']
]
},