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 2021/07/01 02:39:17 UTC

[iotdb] branch windowsbat updated (e44b91f -> f91d33b)

This is an automated email from the ASF dual-hosted git repository.

haonan pushed a change to branch windowsbat
in repository https://gitbox.apache.org/repos/asf/iotdb.git.


 discard e44b91f  Merge branch 'master' of https://github.com/apache/iotdb into windowsbat
 discard 7141637  Fix Windows shell error with JDK11
     new f91d33b  Fix Windows shell error with JDK11

This update added new revisions after undoing existing revisions.
That is to say, some revisions that were in the old version of the
branch are not in the new version.  This situation occurs
when a user --force pushes a change and generates a repository
containing something like this:

 * -- * -- B -- O -- O -- O   (e44b91f)
            \
             N -- N -- N   refs/heads/windowsbat (f91d33b)

You should already have received notification emails for all of the O
revisions, and so the following emails describe only the N revisions
from the common base, B.

Any revisions marked "omit" are not gone; other references still
refer to them.  Any revisions marked "discard" are gone forever.

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.


Summary of changes:
 server/src/assembly/resources/conf/iotdb-env.bat | 252 +++++++++++------------
 1 file changed, 126 insertions(+), 126 deletions(-)

[iotdb] 01/01: Fix Windows shell error with JDK11

Posted by ha...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

haonan pushed a commit to branch windowsbat
in repository https://gitbox.apache.org/repos/asf/iotdb.git

commit f91d33bbfec3565b2297ce260266d0376b806a48
Author: HTHou <hh...@outlook.com>
AuthorDate: Thu Jul 1 10:38:08 2021 +0800

    Fix Windows shell error with JDK11
---
 server/src/assembly/resources/conf/iotdb-env.bat | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/server/src/assembly/resources/conf/iotdb-env.bat b/server/src/assembly/resources/conf/iotdb-env.bat
index 5e66aaf..618a152 100644
--- a/server/src/assembly/resources/conf/iotdb-env.bat
+++ b/server/src/assembly/resources/conf/iotdb-env.bat
@@ -77,6 +77,11 @@ if %desired_yg_in_mb% GTR %max_sensible_yg_in_mb% (
 	set HEAP_NEWSIZE=%max_sensible_yg_in_mb%M
 ) else set HEAP_NEWSIZE=%desired_yg_in_mb%M
 
+@REM Maximum heap size
+@REM MAX_HEAP_SIZE="2G"
+@REM Minimum heap size
+@REM HEAP_NEWSIZE="2G"
+
 IF ["%IOTDB_HEAP_OPTS%"] EQU [""] (
 	rem detect Java 8 or 11
 	IF "%JAVA_VERSION%" == "8" (
@@ -99,7 +104,7 @@ for /f "tokens=1-3" %%j in ('java -version 2^>^&1') do (
 @REM maximum direct memory size
 set MAX_DIRECT_MEMORY_SIZE=%MAX_HEAP_SIZE%
 
-set IOTDB_HEAP_OPTS=-Xmx%MAX_HEAP_SIZE% -Xms%HEAP_NEWSIZE% -Xloggc:"%IOTDB_HOME%\gc.log" -XX:+PrintGCDateStamps -XX:+PrintGCDetails
+set IOTDB_HEAP_OPTS=-Xmx%MAX_HEAP_SIZE% -Xms%HEAP_NEWSIZE% -Xlog:gc:"..\gc.log"
 set IOTDB_HEAP_OPTS=%IOTDB_HEAP_OPTS% -XX:MaxDirectMemorySize=%MAX_DIRECT_MEMORY_SIZE%
 
 @REM You can put your env variable here
@@ -118,7 +123,5 @@ IF "%1" equ "printgc" (
 )
 
 
-@REM Maximum heap size
-@REM set MAX_HEAP_SIZE=2G
 echo Maximum memory allocation pool = %MAX_HEAP_SIZE%, initial memory allocation pool = %HEAP_NEWSIZE%
 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