This is an automated email from the ASF dual-hosted git repository.
hxd pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-iotdb.git
The following commit(s) were added to refs/heads/master by this push:
new da658d7 add/fix shell and bat for
TsFileSketchTool/TsFileResourcePrinter
da658d7 is described below
commit da658d7b33238305a47b41f2b87732bf8b0da15e
Author: Lei Rui <[email protected]>
AuthorDate: Mon Oct 14 22:39:39 2019 +0800
add/fix shell and bat for TsFileSketchTool/TsFileResourcePrinter
---
.../tools/print-tsfile-resource-files.bat | 51 +++-----------------
.../resources/tools/print-tsfile-resource-files.sh | 24 +---------
...-resource-files.bat => print-tsfile-sketch.bat} | 56 ++++------------------
...le-resource-files.sh => print-tsfile-sketch.sh} | 43 +++--------------
.../apache/iotdb/db/tools}/TsFileSketchTool.java | 5 +-
5 files changed, 27 insertions(+), 152 deletions(-)
diff --git
a/server/src/assembly/resources/tools/print-tsfile-resource-files.bat
b/server/src/assembly/resources/tools/print-tsfile-resource-files.bat
index bbc1aca..e76d4b6 100644
--- a/server/src/assembly/resources/tools/print-tsfile-resource-files.bat
+++ b/server/src/assembly/resources/tools/print-tsfile-resource-files.bat
@@ -22,73 +22,36 @@ echo ````````````````````````
echo Starting Printing the TsFileResources
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%
+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.TsFileResourcePrinter
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.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"
-REM For each jar in the IOTDB_HOME lib directory call append to build the
CLASSPATH variable.
+@REM For each jar in the IOTDB_HOME lib directory call append to build the
CLASSPATH variable.
for %%i in ("%IOTDB_HOME%\lib\*.jar") do call :append "%%i"
-set CLASSPATH=%CLASSPATH%
goto okClasspath
:append
set CLASSPATH=%CLASSPATH%;%1
goto :eof
-REM
-----------------------------------------------------------------------------
+@REM
-----------------------------------------------------------------------------
:okClasspath
-rem echo CLASSPATH: %CLASSPATH%
-set IOTDB_DATA=%IOTDB_HOME%\data
+"%JAVA_HOME%\bin\java" -cp "%CLASSPATH%" %MAIN_CLASS% %*
goto finally
+
:err
echo JAVA_HOME environment variable must be set!
pause
@@ -97,6 +60,4 @@ pause
@REM
-----------------------------------------------------------------------------
:finally
-pause
-
-ENDLOCAL
+ENDLOCAL
\ No newline at end of file
diff --git a/server/src/assembly/resources/tools/print-tsfile-resource-files.sh
b/server/src/assembly/resources/tools/print-tsfile-resource-files.sh
index 7de5633..4ba9c3f 100644
--- a/server/src/assembly/resources/tools/print-tsfile-resource-files.sh
+++ b/server/src/assembly/resources/tools/print-tsfile-resource-files.sh
@@ -50,30 +50,10 @@ CLASSPATH=""
for f in ${IOTDB_HOME}/lib/*.jar; do
CLASSPATH=${CLASSPATH}":"$f
done
-classname=org.apache.iotdb.db.tools.TsFileResourcePrinter
-
-launch_service()
-{
- class="$1"
- iotdb_parms="-Dlogback.configurationFile=${IOTDB_CONF}/logback.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 $iotdb_parms -cp "$CLASSPATH"
"$class" "$WALPATH"
- return $?
-}
+MAIN_CLASS=org.apache.iotdb.db.tools.TsFileResourcePrinter
# Start up the service
-#launch_service "$classname"
-
-if [ ! -d ${IOTDB_HOME}/data/wal ]; then
- echo "Can't find wal directory."
- exit 1;
-else
- WALPATH=${IOTDB_HOME}/data/wal
- launch_service "$classname"
-fi
+"$JAVA" -cp "$CLASSPATH" "$MAIN_CLASS" "$@"
exit $?
diff --git
a/server/src/assembly/resources/tools/print-tsfile-resource-files.bat
b/server/src/assembly/resources/tools/print-tsfile-sketch.bat
similarity index 56%
copy from server/src/assembly/resources/tools/print-tsfile-resource-files.bat
copy to server/src/assembly/resources/tools/print-tsfile-sketch.bat
index bbc1aca..8d3e3cd 100644
--- a/server/src/assembly/resources/tools/print-tsfile-resource-files.bat
+++ b/server/src/assembly/resources/tools/print-tsfile-sketch.bat
@@ -17,78 +17,42 @@
@REM under the License.
@REM
+
@echo off
echo ````````````````````````
-echo Starting Printing the TsFileResources
+echo Starting Printing the TsFile Sketch
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%
+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.TsFileResourcePrinter
+if NOT DEFINED MAIN_CLASS set
MAIN_CLASS=org.apache.iotdb.db.tools.TsFileSketchTool
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.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"
-REM For each jar in the IOTDB_HOME lib directory call append to build the
CLASSPATH variable.
+@REM For each jar in the IOTDB_HOME lib directory call append to build the
CLASSPATH variable.
for %%i in ("%IOTDB_HOME%\lib\*.jar") do call :append "%%i"
-set CLASSPATH=%CLASSPATH%
goto okClasspath
:append
set CLASSPATH=%CLASSPATH%;%1
goto :eof
-REM
-----------------------------------------------------------------------------
+@REM
-----------------------------------------------------------------------------
:okClasspath
-rem echo CLASSPATH: %CLASSPATH%
-set IOTDB_DATA=%IOTDB_HOME%\data
+"%JAVA_HOME%\bin\java" -cp "%CLASSPATH%" %MAIN_CLASS% %*
goto finally
+
:err
echo JAVA_HOME environment variable must be set!
pause
@@ -97,6 +61,4 @@ pause
@REM
-----------------------------------------------------------------------------
:finally
-pause
-
-ENDLOCAL
+ENDLOCAL
\ No newline at end of file
diff --git a/server/src/assembly/resources/tools/print-tsfile-resource-files.sh
b/server/src/assembly/resources/tools/print-tsfile-sketch.sh
similarity index 54%
copy from server/src/assembly/resources/tools/print-tsfile-resource-files.sh
copy to server/src/assembly/resources/tools/print-tsfile-sketch.sh
index 7de5633..df3f1a0 100644
--- a/server/src/assembly/resources/tools/print-tsfile-resource-files.sh
+++ b/server/src/assembly/resources/tools/print-tsfile-sketch.sh
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/bin/sh
#
# Licensed to the Apache Software Foundation (ASF) under one
# or more contributor license agreements. See the NOTICE file
@@ -18,18 +18,14 @@
# under the License.
#
-
echo ---------------------
-echo Starting Printing the TsFileResources
+echo Starting Printing the TsFile Sketch
echo ---------------------
if [ -z "${IOTDB_HOME}" ]; then
- export IOTDB_HOME="`dirname "$0"`/.."
+ export IOTDB_HOME="$(cd "`dirname "$0"`"/..; pwd)"
fi
-IOTDB_CONF=${IOTDB_HOME}/conf
-
-
if [ -n "$JAVA_HOME" ]; then
for java in "$JAVA_HOME"/bin/amd64/java "$JAVA_HOME"/bin/java; do
if [ -x "$java" ]; then
@@ -41,39 +37,12 @@ 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.TsFileResourcePrinter
+MAIN_CLASS=org.apache.iotdb.db.tools.TsFileSketchTool
-launch_service()
-{
- class="$1"
- iotdb_parms="-Dlogback.configurationFile=${IOTDB_CONF}/logback.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 $iotdb_parms -cp "$CLASSPATH"
"$class" "$WALPATH"
- return $?
-}
-
-# Start up the service
-#launch_service "$classname"
-
-if [ ! -d ${IOTDB_HOME}/data/wal ]; then
- echo "Can't find wal directory."
- exit 1;
-else
- WALPATH=${IOTDB_HOME}/data/wal
- launch_service "$classname"
-fi
-
-exit $?
+"$JAVA" -cp "$CLASSPATH" "$MAIN_CLASS" "$@"
+exit $?
\ No newline at end of file
diff --git
a/example/tsfile/src/main/java/org/apache/iotdb/tsfile/TsFileSketchTool.java
b/server/src/main/java/org/apache/iotdb/db/tools/TsFileSketchTool.java
similarity index 98%
rename from
example/tsfile/src/main/java/org/apache/iotdb/tsfile/TsFileSketchTool.java
rename to server/src/main/java/org/apache/iotdb/db/tools/TsFileSketchTool.java
index fc20e90..7847c2b 100644
--- a/example/tsfile/src/main/java/org/apache/iotdb/tsfile/TsFileSketchTool.java
+++ b/server/src/main/java/org/apache/iotdb/db/tools/TsFileSketchTool.java
@@ -16,7 +16,8 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.iotdb.tsfile;
+
+package org.apache.iotdb.db.tools;
import java.io.FileWriter;
import java.io.IOException;
@@ -50,6 +51,8 @@ public class TsFileSketchTool {
filename = args[0];
outFile = args[1];
}
+ System.out.println("TsFile path:" + filename);
+ System.out.println("Sketch save path:" + outFile);
PrintWriter pw = new PrintWriter(new FileWriter(outFile));
long length = TSFileFactory.INSTANCE.getFile(filename).length();
printlnBoth(pw,
