drill-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From par...@apache.org
Subject [1/5] drill git commit: DRILL-1491: Support for JDK 8
Date Mon, 12 Mar 2018 11:54:34 GMT
Repository: drill
Updated Branches:
  refs/heads/master d09efb931 -> cac2882d5


DRILL-1491: Support for JDK 8

Changed jdk version from 7 to 8 in pom.xml travis and drill-config.sh

This closes #1143


Project: http://git-wip-us.apache.org/repos/asf/drill/repo
Commit: http://git-wip-us.apache.org/repos/asf/drill/commit/dbc95a65
Tree: http://git-wip-us.apache.org/repos/asf/drill/tree/dbc95a65
Diff: http://git-wip-us.apache.org/repos/asf/drill/diff/dbc95a65

Branch: refs/heads/master
Commit: dbc95a659c3325e263340f3ec2b913a048163671
Parents: d09efb9
Author: vladimir tkach <vovatkach75@gmail.com>
Authored: Mon Mar 5 12:07:54 2018 +0200
Committer: Parth Chandra <parthc@apache.org>
Committed: Sun Mar 11 11:31:13 2018 +0530

----------------------------------------------------------------------
 .travis.yml                                     |  2 +-
 distribution/src/resources/drill-config.sh      | 28 ++++++++------------
 distribution/src/resources/drill-env.sh         | 10 +++----
 .../exec/server/TestDrillbitResilience.java     |  2 ++
 exec/jdbc-all/pom.xml                           |  2 +-
 pom.xml                                         |  6 ++---
 6 files changed, 21 insertions(+), 29 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/drill/blob/dbc95a65/.travis.yml
----------------------------------------------------------------------
diff --git a/.travis.yml b/.travis.yml
index 44ad501..a3d22a6 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -17,7 +17,7 @@ before_install: git fetch --unshallow
 sudo: required
 language: java
 jdk:
-  - openjdk7
+  - openjdk8
 cache:
   directories:
   - "$HOME/.m2"

http://git-wip-us.apache.org/repos/asf/drill/blob/dbc95a65/distribution/src/resources/drill-config.sh
----------------------------------------------------------------------
diff --git a/distribution/src/resources/drill-config.sh b/distribution/src/resources/drill-config.sh
index d92031f..55d032d 100644
--- a/distribution/src/resources/drill-config.sh
+++ b/distribution/src/resources/drill-config.sh
@@ -77,6 +77,14 @@ else
   JAVA_BIN="java"
 fi
 
+# Standardize error messages
+
+fatal_error() {
+  echo "ERROR: $@" 1>&2
+  exit 1
+}
+
+
 # Test for or find JAVA_HOME
 
 if [ -z "$JAVA_HOME" ]; then
@@ -116,9 +124,9 @@ if [ ! -e "$JAVA" ]; then
 fi
 
 # Ensure that Java version is at least 1.7
-"$JAVA" -version 2>&1 | grep "version" | egrep -e "1\.4|1\.5|1\.6" > /dev/null
+"$JAVA" -version 2>&1 | grep "version" | egrep -e "1\.4|1\.5|1\.6|1\.7" > /dev/null
 if [ $? -eq 0 ]; then
-  fatal_error "Java 1.7 or later is required to run Apache Drill."
+  fatal_error "Java 1.8 or later is required to run Apache Drill."
 fi
 
 # Check if a file exists and has relevant lines for execution
@@ -144,12 +152,6 @@ this="$home/bin/$script"
 # the root of the drill installation
 DRILL_HOME=${DRILL_HOME:-$home}
 
-# Standardize error messages
-
-fatal_error() {
-  echo "ERROR: $@" 1>&2
-  exit 1
-}
 
 # Check to see if the conf dir or drill home are given as an optional arguments
 # Arguments may appear anywhere on the command line. --site is an alias, better
@@ -210,7 +212,7 @@ fi
 
 # The SQLline client does not need the code cache.
 
-export SQLLINE_JAVA_OPTS=${SQLLINE_JAVA_OPTS:-"-XX:MaxPermSize=512M"}
+export SQLLINE_JAVA_OPTS=${SQLLINE_JAVA_OPTS:-""}
 
 # Class unloading is disabled by default in Java 7
 # http://hg.openjdk.java.net/jdk7u/jdk7u60/hotspot/file/tip/src/share/vm/runtime/globals.hpp#l1622
@@ -294,18 +296,10 @@ fi
 export DRILL_MAX_DIRECT_MEMORY=${DRILL_MAX_DIRECT_MEMORY:-"8G"}
 export DRILL_HEAP=${DRILL_HEAP:-"4G"}
 export DRILLBIT_CODE_CACHE_SIZE=${DRILLBIT_CODE_CACHE_SIZE:-"1G"}
-export DRILLBIT_MAX_PERM=${DRILLBIT_MAX_PERM:-"512M"}
 
 export DRILLBIT_OPTS="-Xms$DRILL_HEAP -Xmx$DRILL_HEAP -XX:MaxDirectMemorySize=$DRILL_MAX_DIRECT_MEMORY"
 export DRILLBIT_OPTS="$DRILLBIT_OPTS -XX:ReservedCodeCacheSize=$DRILLBIT_CODE_CACHE_SIZE
-Ddrill.exec.enable-epoll=false"
 
-# Remove MaxPermSize for JVM version >= 1.8.0
-jvmVersion=`"$JAVA" -version 2>&1 | grep "version" | tr '"_' '\n' | grep '[0-9].[0.9]'`
-if [[ $jvmVersion < "1.8.0" ]]; then
-  export DRILLBIT_OPTS="$DRILLBIT_OPTS -XX:MaxPermSize=$DRILLBIT_MAX_PERM"
-else
-  unset DRILLBIT_MAX_PERM
-fi
 
 # Under YARN, the log directory is usually YARN-provided. Replace any
 # value that may have been set in drill-env.sh.

http://git-wip-us.apache.org/repos/asf/drill/blob/dbc95a65/distribution/src/resources/drill-env.sh
----------------------------------------------------------------------
diff --git a/distribution/src/resources/drill-env.sh b/distribution/src/resources/drill-env.sh
index 02f1b2d..351d867 100755
--- a/distribution/src/resources/drill-env.sh
+++ b/distribution/src/resources/drill-env.sh
@@ -57,10 +57,6 @@
 
 #export DRILL_MAX_DIRECT_MEMORY=${DRILL_MAX_DIRECT_MEMORY:-"8G"}
 
-# Value for the JVM -XX:MaxPermSize option for the Drillbit. Default is 512M.
-
-#export DRILLBIT_MAX_PERM=${DRILLBIT_MAX_PERM:-"512M"}
-
 # Native library path passed to Java. Note: use this form instead
 # of the old form of DRILLBIT_JAVA_OPTS="-Djava.library.path=<dir>"
 # The old form is not compatible with Drill-on-YARN.
@@ -141,12 +137,12 @@
 
 #export SERVER_LOG_GC=${SERVER_LOG_GC:-1}
 
-# JVM options when running the sqlline Drill client. For example, adjust the
-# JVM heap memory here. These are used ONLY in non-embedded mode; these
+# JVM options when running the sqlline Drill client.
+# These are used ONLY in non-embedded mode; these
 # are client-only settings. (The Drillbit settings are used when Drill
 # is embedded.)
 
-#export SQLLINE_JAVA_OPTS="-XX:MaxPermSize=512M"
+#export SQLLINE_JAVA_OPTS=""
 
 # Arguments passed to sqlline (the Drill shell) at all times: whether
 # Drill is embedded in Sqlline or not.

http://git-wip-us.apache.org/repos/asf/drill/blob/dbc95a65/exec/java-exec/src/test/java/org/apache/drill/exec/server/TestDrillbitResilience.java
----------------------------------------------------------------------
diff --git a/exec/java-exec/src/test/java/org/apache/drill/exec/server/TestDrillbitResilience.java
b/exec/java-exec/src/test/java/org/apache/drill/exec/server/TestDrillbitResilience.java
index ec101d8..34f75f4 100644
--- a/exec/java-exec/src/test/java/org/apache/drill/exec/server/TestDrillbitResilience.java
+++ b/exec/java-exec/src/test/java/org/apache/drill/exec/server/TestDrillbitResilience.java
@@ -620,6 +620,7 @@ public class TestDrillbitResilience extends DrillTest {
 
   @Test // DRILL-2383: Cancellation TC 2: cancel in the middle of fetching result set
   @Repeat(count = NUM_RUNS)
+  @Ignore("DRILL-6228")
   public void cancelInMiddleOfFetchingResults() {
     final long before = countAllocatedMemory();
 
@@ -650,6 +651,7 @@ public class TestDrillbitResilience extends DrillTest {
 
   @Test // DRILL-2383: Cancellation TC 3: cancel after all result set are produced but not
all are fetched
   @Repeat(count = NUM_RUNS)
+  @Ignore("DRILL-6228")
   public void cancelAfterAllResultsProduced() {
     final long before = countAllocatedMemory();
 

http://git-wip-us.apache.org/repos/asf/drill/blob/dbc95a65/exec/jdbc-all/pom.xml
----------------------------------------------------------------------
diff --git a/exec/jdbc-all/pom.xml b/exec/jdbc-all/pom.xml
index 5b3486c..60505e9 100644
--- a/exec/jdbc-all/pom.xml
+++ b/exec/jdbc-all/pom.xml
@@ -252,7 +252,7 @@
           <argLine>-Xms512m -Xmx3g -Ddrill.exec.http.enabled=false -Djava.net.preferIPv4Stack=true
             -Ddrill.exec.sys.store.provider.local.write=false
             -Dorg.apache.drill.exec.server.Drillbit.system_options="org.apache.drill.exec.compile.ClassTransformer.scalar_replacement=on"
-            -XX:MaxPermSize=256M -XX:MaxDirectMemorySize=3072M
+            -XX:MaxDirectMemorySize=3072M
             -XX:+CMSClassUnloadingEnabled -ea</argLine>
           <additionalClasspathElements>
             <additionalClasspathElements>${settings.localRepository}/junit/junit/${junit.version}/junit-${junit.version}.jar</additionalClasspathElements>

http://git-wip-us.apache.org/repos/asf/drill/blob/dbc95a65/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 09d0814..bda71d7 100644
--- a/pom.xml
+++ b/pom.xml
@@ -327,8 +327,8 @@
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-compiler-plugin</artifactId>
         <configuration>
-          <source>1.7</source>
-          <target>1.7</target>
+          <source>1.8</source>
+          <target>1.8</target>
           <maxmem>2048m</maxmem>
           <useIncrementalCompilation>false</useIncrementalCompilation>
           <fork>true</fork>
@@ -469,7 +469,7 @@
               -Dorg.apache.drill.exec.server.Drillbit.system_options="org.apache.drill.exec.compile.ClassTransformer.scalar_replacement=on"
               -Ddrill.test.query.printing.silent=true
               -Ddrill.catastrophic_to_standard_out=true
-              -XX:MaxPermSize=512M -XX:MaxDirectMemorySize=${directMemoryMb}M
+              -XX:MaxDirectMemorySize=${directMemoryMb}M
               -Djava.net.preferIPv4Stack=true
               -Djava.awt.headless=true
               -XX:+CMSClassUnloadingEnabled -ea


Mime
View raw message