This is an automated email from the ASF dual-hosted git repository. hxd pushed a commit to branch rel/0.8 in repository https://gitbox.apache.org/repos/asf/incubator-iotdb.git
commit f9c219ca35475348928137168ef9fd367a12989a Author: xiangdong huang <[email protected]> AuthorDate: Sun Sep 29 21:17:43 2019 +0800 remove jdk version constrain for jdk8 and 11. (now only jdk<1.8u40 is forbidden) --- README.md | 15 +++++++++------ server/src/assembly/resources/conf/iotdb-env.sh | 6 +----- 2 files changed, 10 insertions(+), 11 deletions(-) diff --git a/README.md b/README.md index 11074c8..6a35654 100644 --- a/README.md +++ b/README.md @@ -50,13 +50,16 @@ For the latest information about IoTDB, please visit our [IoTDB official website # Prerequisites -IoTDB requires Java (>= 1.8). -To use IoTDB, JRE should be installed. To compile IoTDB, JDK should be installed. +1. Java >= 1.8 (1.8, 11, and 13 are verified. Please make sure the environment path has been set.) -If you want to compile and install IoTDB from source code, JDK and Maven (>= 3.1) are required. -While Maven is not mandatory to be installed standalone, you can use the provided Maven wrapper, `./mvnw.sh` on Linux/OS X or `.\mvnw.cmd` on Windows, to facilitate development. + * To use IoTDB, JRE should be installed. To compile IoTDB, JDK should be installed. + +2. Maven >= 3.1 (If you want to compile and install IoTDB from source code) + + * While Maven is not mandatory to be installed standalone, you can use the provided Maven wrapper, `./mvnw.sh` on Linux/OS X or `.\mvnw.cmd` on Windows, to facilitate development. + +3. Set the max open files num as 65535 to avoid "too many open files" problem. -If you want to use Hadoop or Spark to analyze IoTDB data file (called as TsFile), you need to compile the hadoop and spark modules. # Quick Start @@ -314,4 +317,4 @@ CREATE TIMESERIES root.fit.p.s1 WITH DATATYPE=INT32,ENCODING=RLE; # Windows > $IOTDB_CLI_HOME\tools\export-csv.bat -h <ip> -p <port> -u <username> -pw > <password> -td <xxx.csv> [-tf <time-format>] -``` \ No newline at end of file +``` diff --git a/server/src/assembly/resources/conf/iotdb-env.sh b/server/src/assembly/resources/conf/iotdb-env.sh index 80069cc..df4a574 100755 --- a/server/src/assembly/resources/conf/iotdb-env.sh +++ b/server/src/assembly/resources/conf/iotdb-env.sh @@ -117,10 +117,6 @@ else IOTDB_JMX_OPTS="$IOTDB_JMX_OPTS -Xloggc:${IOTDB_HOME}/gc.log" fi -if [ "$MAJOR_VERSION" -ne "8" ] && [ "$MAJOR_VERSION" -ne "11" ] ; then - echo "IoTDB only supports jdk8 or jdk11, please check your java version." - exit 1; -fi calculate_heap_sizes @@ -147,4 +143,4 @@ IOTDB_JMX_OPTS="$IOTDB_JMX_OPTS -Xms${HEAP_NEWSIZE}" IOTDB_JMX_OPTS="$IOTDB_JMX_OPTS -Xmx${MAX_HEAP_SIZE}" echo "Maximum memory allocation pool = ${MAX_HEAP_SIZE}B, initial memory allocation pool = ${HEAP_NEWSIZE}B" -echo "If you want to change this configuration, please check conf/iotdb-env.sh(Unix or OS X, if you use Windows, check conf/iotdb-env.bat)." \ No newline at end of file +echo "If you want to change this configuration, please check conf/iotdb-env.sh(Unix or OS X, if you use Windows, check conf/iotdb-env.bat)."
