You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hive.apache.org by kg...@apache.org on 2020/04/21 09:59:53 UTC
[hive] branch master updated (a41e99a -> cd1ab41)
This is an automated email from the ASF dual-hosted git repository.
kgyrtkirk pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/hive.git.
from a41e99a HIVE-23210: Fix shortestjobcomparator when jobs submitted have 1 task their vertices (Panagiotis Garefalakis via Rajesh Balamohan)
new 82139aa HIVE-23248: avro-mapred should not pull in org.mortbay.jetty (Zoltan Haindrich reviewed by Peter Vary)
new cd1ab41 HIVE-23247: Increase timeout for some tez tests (Zoltan Haindrich reviewed by Peter Vary)
The 2 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:
.../llap/daemon/services/impl/TestLlapWebServices.java | 16 ++++++++++++++++
pom.xml | 10 ++++++++++
.../hive/ql/exec/tez/TestCustomPartitionVertex.java | 2 +-
.../hive/ql/exec/tez/TestDynamicPartitionPruner.java | 18 +++++++++---------
4 files changed, 36 insertions(+), 10 deletions(-)
[hive] 02/02: HIVE-23247: Increase timeout for some tez tests
(Zoltan Haindrich reviewed by Peter Vary)
Posted by kg...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
kgyrtkirk pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/hive.git
commit cd1ab41b3e17df761a7bda665ac64fba594647a0
Author: Zoltan Haindrich <ki...@rxd.hu>
AuthorDate: Tue Apr 21 09:59:14 2020 +0000
HIVE-23247: Increase timeout for some tez tests (Zoltan Haindrich reviewed by Peter Vary)
Signed-off-by: Zoltan Haindrich <zh...@cloudera.com>
---
.../hive/ql/exec/tez/TestCustomPartitionVertex.java | 2 +-
.../hive/ql/exec/tez/TestDynamicPartitionPruner.java | 18 +++++++++---------
2 files changed, 10 insertions(+), 10 deletions(-)
diff --git a/ql/src/test/org/apache/hadoop/hive/ql/exec/tez/TestCustomPartitionVertex.java b/ql/src/test/org/apache/hadoop/hive/ql/exec/tez/TestCustomPartitionVertex.java
index 183073a..2be7fbc 100644
--- a/ql/src/test/org/apache/hadoop/hive/ql/exec/tez/TestCustomPartitionVertex.java
+++ b/ql/src/test/org/apache/hadoop/hive/ql/exec/tez/TestCustomPartitionVertex.java
@@ -33,7 +33,7 @@ import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.when;
public class TestCustomPartitionVertex {
- @Test(timeout = 5000)
+ @Test(timeout = 20000)
public void testGetBytePayload() throws IOException {
int numBuckets = 10;
VertexManagerPluginContext context = mock(VertexManagerPluginContext.class);
diff --git a/ql/src/test/org/apache/hadoop/hive/ql/exec/tez/TestDynamicPartitionPruner.java b/ql/src/test/org/apache/hadoop/hive/ql/exec/tez/TestDynamicPartitionPruner.java
index 080ee11..d38691e 100644
--- a/ql/src/test/org/apache/hadoop/hive/ql/exec/tez/TestDynamicPartitionPruner.java
+++ b/ql/src/test/org/apache/hadoop/hive/ql/exec/tez/TestDynamicPartitionPruner.java
@@ -40,7 +40,7 @@ import org.junit.Test;
public class TestDynamicPartitionPruner {
- @Test(timeout = 5000)
+ @Test(timeout = 20000)
public void testNoPruning() throws InterruptedException, IOException, HiveException,
SerDeException {
InputInitializerContext mockInitContext = mock(InputInitializerContext.class);
@@ -61,7 +61,7 @@ public class TestDynamicPartitionPruner {
}
}
- @Test(timeout = 5000)
+ @Test(timeout = 20000)
public void testSingleSourceOrdering1() throws InterruptedException, IOException, HiveException,
SerDeException {
InputInitializerContext mockInitContext = mock(InputInitializerContext.class);
@@ -93,7 +93,7 @@ public class TestDynamicPartitionPruner {
}
}
- @Test(timeout = 5000)
+ @Test(timeout = 20000)
public void testSingleSourceOrdering2() throws InterruptedException, IOException, HiveException,
SerDeException {
InputInitializerContext mockInitContext = mock(InputInitializerContext.class);
@@ -125,7 +125,7 @@ public class TestDynamicPartitionPruner {
}
}
- @Test(timeout = 5000)
+ @Test(timeout = 20000)
public void testSingleSourceMultipleFiltersOrdering1() throws InterruptedException, SerDeException {
InputInitializerContext mockInitContext = mock(InputInitializerContext.class);
doReturn(2).when(mockInitContext).getVertexNumTasks("v1");
@@ -158,7 +158,7 @@ public class TestDynamicPartitionPruner {
}
}
- @Test(timeout = 5000)
+ @Test(timeout = 20000)
public void testSingleSourceMultipleFiltersOrdering2() throws InterruptedException, SerDeException {
InputInitializerContext mockInitContext = mock(InputInitializerContext.class);
doReturn(2).when(mockInitContext).getVertexNumTasks("v1");
@@ -191,7 +191,7 @@ public class TestDynamicPartitionPruner {
}
}
- @Test(timeout = 5000)
+ @Test(timeout = 20000)
public void testMultipleSourcesOrdering1() throws InterruptedException, SerDeException {
InputInitializerContext mockInitContext = mock(InputInitializerContext.class);
doReturn(2).when(mockInitContext).getVertexNumTasks("v1");
@@ -235,7 +235,7 @@ public class TestDynamicPartitionPruner {
}
}
- @Test(timeout = 5000)
+ @Test(timeout = 20000)
public void testMultipleSourcesOrdering2() throws InterruptedException, SerDeException {
InputInitializerContext mockInitContext = mock(InputInitializerContext.class);
doReturn(2).when(mockInitContext).getVertexNumTasks("v1");
@@ -279,7 +279,7 @@ public class TestDynamicPartitionPruner {
}
}
- @Test(timeout = 5000)
+ @Test(timeout = 20000)
public void testMultipleSourcesOrdering3() throws InterruptedException, SerDeException {
InputInitializerContext mockInitContext = mock(InputInitializerContext.class);
doReturn(2).when(mockInitContext).getVertexNumTasks("v1");
@@ -322,7 +322,7 @@ public class TestDynamicPartitionPruner {
}
}
- @Test(timeout = 5000, expected = IllegalStateException.class)
+ @Test(timeout = 20000, expected = IllegalStateException.class)
public void testExtraEvents() throws InterruptedException, IOException, HiveException,
SerDeException {
InputInitializerContext mockInitContext = mock(InputInitializerContext.class);
[hive] 01/02: HIVE-23248: avro-mapred should not pull in
org.mortbay.jetty (Zoltan Haindrich reviewed by Peter Vary)
Posted by kg...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
kgyrtkirk pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/hive.git
commit 82139aaad08dd6627e8e7d9ea3d34ee9a5b7f8e7
Author: Zoltan Haindrich <ki...@rxd.hu>
AuthorDate: Tue Apr 21 09:59:11 2020 +0000
HIVE-23248: avro-mapred should not pull in org.mortbay.jetty (Zoltan Haindrich reviewed by Peter Vary)
Signed-off-by: Zoltan Haindrich <zh...@cloudera.com>
---
.../llap/daemon/services/impl/TestLlapWebServices.java | 16 ++++++++++++++++
pom.xml | 10 ++++++++++
2 files changed, 26 insertions(+)
diff --git a/llap-server/src/test/org/apache/hadoop/hive/llap/daemon/services/impl/TestLlapWebServices.java b/llap-server/src/test/org/apache/hadoop/hive/llap/daemon/services/impl/TestLlapWebServices.java
index 5df6ea8..f000dad 100644
--- a/llap-server/src/test/org/apache/hadoop/hive/llap/daemon/services/impl/TestLlapWebServices.java
+++ b/llap-server/src/test/org/apache/hadoop/hive/llap/daemon/services/impl/TestLlapWebServices.java
@@ -26,6 +26,9 @@ import java.io.IOException;
import java.io.StringWriter;
import java.net.HttpURLConnection;
import java.net.URL;
+import java.util.ArrayList;
+import java.util.Enumeration;
+import java.util.List;
import com.google.common.collect.ImmutableSet;
@@ -46,6 +49,19 @@ public class TestLlapWebServices {
llapWS.init(new HiveConf());
llapWS.start();
Thread.sleep(5000);
+ ensureUniqueInClasspath("javax/servlet/http/HttpServletRequest.class");
+ ensureUniqueInClasspath("javax/servlet/http/HttpServlet.class");
+ }
+
+ private static void ensureUniqueInClasspath(String name) throws IOException {
+ Enumeration<URL> rr = TestLlapWebServices.class.getClassLoader().getResources(name);
+ List<URL> found = new ArrayList<>();
+ while (rr.hasMoreElements()) {
+ found.add(rr.nextElement());
+ }
+ if (found.size() != 1) {
+ throw new RuntimeException(name + " unexpected number of occurences on the classpath:" + found.toString());
+ }
}
@Test
diff --git a/pom.xml b/pom.xml
index 2322957..b29c06c 100644
--- a/pom.xml
+++ b/pom.xml
@@ -485,6 +485,16 @@
<artifactId>avro-mapred</artifactId>
<classifier>hadoop2</classifier>
<version>${avro.version}</version>
+ <exclusions>
+ <exclusion>
+ <groupId>org.mortbay.jetty</groupId>
+ <artifactId>jetty-util</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.mortbay.jetty</groupId>
+ <artifactId>servlet-api</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
<groupId>org.apache.derby</groupId>