You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@drill.apache.org by pr...@apache.org on 2017/10/30 21:14:07 UTC

[1/5] drill git commit: DRILL-5895: Add logging mongod exception when failed to close all mongod processes during provided timeout

Repository: drill
Updated Branches:
  refs/heads/master 5a215144d -> 4a718a0bd


DRILL-5895: Add logging mongod exception when failed to close all mongod processes during provided timeout

closes #1006


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

Branch: refs/heads/master
Commit: c8d01b3141b0b755d4311340c3e5823214332c70
Parents: 5a21514
Author: Volodymyr Tkach <vo...@gmail.com>
Authored: Mon Oct 23 09:10:57 2017 +0000
Committer: Paul Rogers <pr...@maprtech.com>
Committed: Mon Oct 30 13:23:09 2017 -0700

----------------------------------------------------------------------
 .../drill/exec/store/mongo/MongoTestSuit.java      | 17 +++++++++++------
 1 file changed, 11 insertions(+), 6 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/drill/blob/c8d01b31/contrib/storage-mongo/src/test/java/org/apache/drill/exec/store/mongo/MongoTestSuit.java
----------------------------------------------------------------------
diff --git a/contrib/storage-mongo/src/test/java/org/apache/drill/exec/store/mongo/MongoTestSuit.java b/contrib/storage-mongo/src/test/java/org/apache/drill/exec/store/mongo/MongoTestSuit.java
index 122d52a..7e2782c 100644
--- a/contrib/storage-mongo/src/test/java/org/apache/drill/exec/store/mongo/MongoTestSuit.java
+++ b/contrib/storage-mongo/src/test/java/org/apache/drill/exec/store/mongo/MongoTestSuit.java
@@ -1,4 +1,4 @@
-/**
+/*
  * 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
@@ -87,14 +87,14 @@ public class MongoTestSuit implements MongoTestConstants {
 
     private static void setup() throws Exception {
       // creating configServers
-      List<IMongodConfig> configServers = new ArrayList<IMongodConfig>(1);
+      List<IMongodConfig> configServers = new ArrayList<>(1);
       IMongodConfig configIMongodConfig = crateConfigServerConfig(
           CONFIG_SERVER_PORT, true);
       configServers.add(configIMongodConfig);
 
       // creating replicaSets
-      Map<String, List<IMongodConfig>> replicaSets = new HashMap<String, List<IMongodConfig>>();
-      List<IMongodConfig> replicaSet1 = new ArrayList<IMongodConfig>();
+      Map<String, List<IMongodConfig>> replicaSets = new HashMap<>();
+      List<IMongodConfig> replicaSet1 = new ArrayList<>();
       replicaSet1.add(crateIMongodConfig(MONGOD_1_PORT, false,
           REPLICA_SET_1_NAME));
       replicaSet1.add(crateIMongodConfig(MONGOD_2_PORT, false,
@@ -102,7 +102,7 @@ public class MongoTestSuit implements MongoTestConstants {
       replicaSet1.add(crateIMongodConfig(MONGOD_3_PORT, false,
           REPLICA_SET_1_NAME));
       replicaSets.put(REPLICA_SET_1_NAME, replicaSet1);
-      List<IMongodConfig> replicaSet2 = new ArrayList<IMongodConfig>();
+      List<IMongodConfig> replicaSet2 = new ArrayList<>();
       replicaSet2.add(crateIMongodConfig(MONGOD_4_PORT, false,
           REPLICA_SET_2_NAME));
       replicaSet2.add(crateIMongodConfig(MONGOD_5_PORT, false,
@@ -170,7 +170,12 @@ public class MongoTestSuit implements MongoTestConstants {
 
     private static void cleanup() {
       if (mongosTestFactory != null) {
-        mongosTestFactory.stop();
+        // ignoring exception because sometimes provided time isn't enough to stop mongod processes
+        try {
+            mongosTestFactory.stop();
+          } catch (IllegalStateException e) {
+            logger.warn("Failed to close all mongod processes during provided timeout", e);
+          }
       }
     }
 


[3/5] drill git commit: DRILL-5906: java.lang.NullPointerException while quering Hive ORC tables on MapR cluster

Posted by pr...@apache.org.
DRILL-5906: java.lang.NullPointerException while quering Hive ORC tables on MapR cluster

- Upgrade drill to 1.2.0-mapr-1707 hive.version.

closes #1010


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

Branch: refs/heads/master
Commit: a4712c24101e7131a1161a5e79a619326e330890
Parents: fd58e29
Author: Vitalii Diravka <vi...@gmail.com>
Authored: Wed Oct 25 17:59:09 2017 +0000
Committer: Paul Rogers <pr...@maprtech.com>
Committed: Mon Oct 30 13:23:36 2017 -0700

----------------------------------------------------------------------
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/drill/blob/a4712c24/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 71dc99b..31f0f69 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1774,7 +1774,7 @@
       <properties>
         <alt-hadoop>mapr</alt-hadoop>
         <rat.excludeSubprojects>true</rat.excludeSubprojects>
-        <hive.version>1.2.0-mapr-1608</hive.version>
+        <hive.version>1.2.0-mapr-1707</hive.version>
         <hbase.version>1.1.1-mapr-1602-m7-5.2.0</hbase.version>
         <hadoop.version>2.7.0-mapr-1607</hadoop.version>
       </properties>


[5/5] drill git commit: DRILL-5911: Upgrade esri-geometry-api version to 2.0.0 to avoid dependency on org.json library

Posted by pr...@apache.org.
DRILL-5911: Upgrade esri-geometry-api version to 2.0.0 to avoid dependency on org.json library

closes #1012


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

Branch: refs/heads/master
Commit: 4a718a0bd728ae02b502ac93620d132f0f6e1b6c
Parents: b0b7df1
Author: Volodymyr Vysotskyi <vv...@gmail.com>
Authored: Fri Oct 27 14:45:17 2017 +0000
Committer: Paul Rogers <pr...@maprtech.com>
Committed: Mon Oct 30 13:24:09 2017 -0700

----------------------------------------------------------------------
 contrib/gis/pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/drill/blob/4a718a0b/contrib/gis/pom.xml
----------------------------------------------------------------------
diff --git a/contrib/gis/pom.xml b/contrib/gis/pom.xml
index fbd7a60..e29a8b1 100644
--- a/contrib/gis/pom.xml
+++ b/contrib/gis/pom.xml
@@ -40,7 +40,7 @@
 		<dependency>
 			<groupId>com.esri.geometry</groupId>
 			<artifactId>esri-geometry-api</artifactId>
-			<version>1.2.1</version>
+			<version>2.0.0</version>
 		</dependency>
 
 		<!-- Test dependencies -->


[4/5] drill git commit: DRILL-5910: Logging exception when custom AuthenticatorFactory not found

Posted by pr...@apache.org.
DRILL-5910: Logging exception when custom AuthenticatorFactory not found

closes #1013


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

Branch: refs/heads/master
Commit: b0b7df10da14ab94cd657f0c1e3a0c3ff242bedd
Parents: a4712c2
Author: vladimir <vt...@rightandabove.com>
Authored: Fri Oct 27 11:32:32 2017 +0300
Committer: Paul Rogers <pr...@maprtech.com>
Committed: Mon Oct 30 13:24:00 2017 -0700

----------------------------------------------------------------------
 .../exec/rpc/security/ClientAuthenticatorProvider.java    | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/drill/blob/b0b7df10/exec/java-exec/src/main/java/org/apache/drill/exec/rpc/security/ClientAuthenticatorProvider.java
----------------------------------------------------------------------
diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/rpc/security/ClientAuthenticatorProvider.java b/exec/java-exec/src/main/java/org/apache/drill/exec/rpc/security/ClientAuthenticatorProvider.java
index 5cac208..697fb5a 100644
--- a/exec/java-exec/src/main/java/org/apache/drill/exec/rpc/security/ClientAuthenticatorProvider.java
+++ b/exec/java-exec/src/main/java/org/apache/drill/exec/rpc/security/ClientAuthenticatorProvider.java
@@ -57,17 +57,17 @@ public class ClientAuthenticatorProvider implements AuthenticatorProvider {
 
     // then, custom factories
     if (customFactories != null) {
-      try {
-        final String[] factories = customFactories.split(",");
-        for (final String factory : factories) {
+      final String[] factories = customFactories.split(",");
+      for (final String factory : factories) {
+        try {
           final Class<?> clazz = Class.forName(factory);
           if (AuthenticatorFactory.class.isAssignableFrom(clazz)) {
             final AuthenticatorFactory instance = (AuthenticatorFactory) clazz.newInstance();
             authFactories.put(instance.getSimpleName(), instance);
           }
+        } catch (final ReflectiveOperationException e) {
+          logger.error("Failed to create auth factory {}", factory, e);
         }
-      } catch (final ClassNotFoundException | IllegalAccessException | InstantiationException e) {
-        throw new DrillRuntimeException("Failed to create auth factory.", e);
       }
     }
 


[2/5] drill git commit: DRILL-5905: Exclude jdk-tools from project dependencies

Posted by pr...@apache.org.
DRILL-5905: Exclude jdk-tools from project dependencies

closes #1009


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

Branch: refs/heads/master
Commit: fd58e2944b4d03538ed981359940ef486279b626
Parents: c8d01b3
Author: Vlad Rozov <vr...@apache.org>
Authored: Tue Oct 24 19:10:37 2017 -0700
Committer: Paul Rogers <pr...@maprtech.com>
Committed: Mon Oct 30 13:23:18 2017 -0700

----------------------------------------------------------------------
 contrib/storage-hbase/pom.xml |  4 ++--
 pom.xml                       | 35 +++++++++++++++++++++++++++++++++++
 2 files changed, 37 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/drill/blob/fd58e294/contrib/storage-hbase/pom.xml
----------------------------------------------------------------------
diff --git a/contrib/storage-hbase/pom.xml b/contrib/storage-hbase/pom.xml
index b0dcac5..46ca150 100644
--- a/contrib/storage-hbase/pom.xml
+++ b/contrib/storage-hbase/pom.xml
@@ -39,7 +39,7 @@
       <version>3.20.0-GA</version>
       <scope>test</scope>
     </dependency>
-  
+
     <dependency>
       <groupId>org.apache.drill.exec</groupId>
       <artifactId>drill-java-exec</artifactId>
@@ -147,7 +147,7 @@
             <goals>
               <goal>enforce</goal>
             </goals>
-            <configuration combine.self="override">
+            <configuration>
               <rules>
                 <bannedDependencies>
                   <includes>

http://git-wip-us.apache.org/repos/asf/drill/blob/fd58e294/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 2d3a0ac..71dc99b 100644
--- a/pom.xml
+++ b/pom.xml
@@ -360,6 +360,7 @@
                     <exclude>org.mortbay.jetty:servlet-api</exclude>
                     <exclude>org.mortbay.jetty:servlet-api-2.5</exclude>
                     <exclude>log4j:log4j</exclude>
+                    <exclude>jdk.tools:jdk.tools</exclude>
                   </excludes>
                 </bannedDependencies>
               </rules>
@@ -697,6 +698,17 @@
       </dependency>
       <dependency>
         <groupId>org.apache.hadoop</groupId>
+        <artifactId>hadoop-annotations</artifactId>
+        <version>${hadoop.version}</version>
+        <exclusions>
+          <exclusion>
+            <groupId>jdk.tools</groupId>
+            <artifactId>jdk.tools</artifactId>
+          </exclusion>
+        </exclusions>
+      </dependency>
+      <dependency>
+        <groupId>org.apache.hadoop</groupId>
         <artifactId>hadoop-aws</artifactId>
         <version>${hadoop.version}</version>
         <scope>test</scope>
@@ -728,6 +740,17 @@
         </exclusions>
       </dependency>
       <dependency>
+        <groupId>org.apache.hbase</groupId>
+        <artifactId>hbase-annotations</artifactId>
+        <version>${hbase.version}</version>
+        <exclusions>
+          <exclusion>
+            <groupId>jdk.tools</groupId>
+            <artifactId>jdk.tools</artifactId>
+          </exclusion>
+        </exclusions>
+      </dependency>
+      <dependency>
         <groupId>org.apache.hive</groupId>
         <artifactId>hive-exec</artifactId>
         <version>${hive.version}</version>
@@ -1596,6 +1619,10 @@
                 <artifactId>asm</artifactId>
                 <groupId>asm</groupId>
               </exclusion>
+              <exclusion>
+                <groupId>org.apache.hbase</groupId>
+                <artifactId>hbase-annotations</artifactId>
+              </exclusion>
             </exclusions>
           </dependency>
           <dependency>
@@ -2201,6 +2228,10 @@
                 <artifactId>asm</artifactId>
                 <groupId>asm</groupId>
               </exclusion>
+              <exclusion>
+                <groupId>org.apache.hbase</groupId>
+                <artifactId>hbase-annotations</artifactId>
+              </exclusion>
             </exclusions>
           </dependency>
           <dependency>
@@ -2212,6 +2243,10 @@
                 <artifactId>log4j</artifactId>
                 <groupId>log4j</groupId>
               </exclusion>
+              <exclusion>
+                <groupId>jdk.tools</groupId>
+                <artifactId>jdk.tools</artifactId>
+              </exclusion>
             </exclusions>
           </dependency>
           <dependency>