You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@drill.apache.org by ja...@apache.org on 2014/04/24 09:08:28 UTC
[10/10] git commit: Fixes for DRILL-514,
increase HashJoin timeout and cleanup PopUnitTestBase
Fixes for DRILL-514, increase HashJoin timeout and cleanup PopUnitTestBase
Project: http://git-wip-us.apache.org/repos/asf/incubator-drill/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-drill/commit/9906e06e
Tree: http://git-wip-us.apache.org/repos/asf/incubator-drill/tree/9906e06e
Diff: http://git-wip-us.apache.org/repos/asf/incubator-drill/diff/9906e06e
Branch: refs/heads/master
Commit: 9906e06e0ded610059226f1934025611063bcfaf
Parents: c10ece0
Author: Jacques Nadeau <ja...@apache.org>
Authored: Thu Apr 24 00:06:59 2014 -0700
Committer: Jacques Nadeau <ja...@apache.org>
Committed: Thu Apr 24 00:07:41 2014 -0700
----------------------------------------------------------------------
contrib/storage-hbase/pom.xml | 9 +++++++++
.../apache/drill/exec/physical/impl/join/TestHashJoin.java | 8 ++++++++
.../java/org/apache/drill/exec/pop/PopUnitTestBase.java | 5 -----
3 files changed, 17 insertions(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-drill/blob/9906e06e/contrib/storage-hbase/pom.xml
----------------------------------------------------------------------
diff --git a/contrib/storage-hbase/pom.xml b/contrib/storage-hbase/pom.xml
index 928ad4b..38f8a1a 100644
--- a/contrib/storage-hbase/pom.xml
+++ b/contrib/storage-hbase/pom.xml
@@ -77,6 +77,11 @@
<profiles>
<profile>
<id>default-hadoop</id>
+ <activation>
+ <property>
+ <name>!alt-hadoop</name>
+ </property>
+ </activation>
<dependencies>
<dependency>
<groupId>org.apache.hbase</groupId>
@@ -140,6 +145,10 @@
</profile>
<profile>
<id>mapr</id>
+ <properties>
+ <alt-hadoop>mapr</alt-hadoop>
+ <rat.excludeSubprojects>true</rat.excludeSubprojects>
+ </properties>
<dependencies>
<dependency>
<groupId>org.apache.hbase</groupId>
http://git-wip-us.apache.org/repos/asf/incubator-drill/blob/9906e06e/exec/java-exec/src/test/java/org/apache/drill/exec/physical/impl/join/TestHashJoin.java
----------------------------------------------------------------------
diff --git a/exec/java-exec/src/test/java/org/apache/drill/exec/physical/impl/join/TestHashJoin.java b/exec/java-exec/src/test/java/org/apache/drill/exec/physical/impl/join/TestHashJoin.java
index 529563a..ba067e2 100644
--- a/exec/java-exec/src/test/java/org/apache/drill/exec/physical/impl/join/TestHashJoin.java
+++ b/exec/java-exec/src/test/java/org/apache/drill/exec/physical/impl/join/TestHashJoin.java
@@ -28,6 +28,7 @@ import mockit.NonStrictExpectations;
import org.apache.drill.common.config.DrillConfig;
import org.apache.drill.common.util.FileUtils;
+import org.apache.drill.common.util.TestTools;
import org.apache.drill.exec.expr.fn.FunctionImplementationRegistry;
import org.apache.drill.exec.memory.BufferAllocator;
import org.apache.drill.exec.memory.TopLevelAllocator;
@@ -47,12 +48,14 @@ import org.apache.drill.exec.server.DrillbitContext;
import org.apache.drill.exec.store.StoragePluginRegistry;
import org.apache.drill.exec.vector.ValueVector;
import org.junit.AfterClass;
+import org.junit.Rule;
import org.junit.Test;
import com.beust.jcommander.internal.Lists;
import com.google.common.base.Charsets;
import com.google.common.io.Files;
import com.codahale.metrics.MetricRegistry;
+
import static org.junit.Assert.assertArrayEquals;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertTrue;
@@ -75,6 +78,9 @@ import org.apache.drill.exec.vector.VarCharVector;
import org.apache.drill.exec.vector.IntVector;
import org.junit.Ignore;
import org.junit.Test;
+import org.junit.rules.TestName;
+import org.junit.rules.TestRule;
+import org.junit.rules.Timeout;
import com.google.common.base.Charsets;
import com.google.common.io.Files;
@@ -83,6 +89,8 @@ import com.google.common.io.Files;
public class TestHashJoin extends PopUnitTestBase{
static final org.slf4j.Logger logger = org.slf4j.LoggerFactory.getLogger(TestMergeJoin.class);
+ @Rule public final TestRule TIMEOUT = TestTools.getTimeoutRule(100000);
+
DrillConfig c = DrillConfig.create();
private void testHJMockScanCommon(final DrillbitContext bitContext, UserServer.UserClientConnection connection, String physicalPlan, int expectedRows) throws Throwable {
http://git-wip-us.apache.org/repos/asf/incubator-drill/blob/9906e06e/exec/java-exec/src/test/java/org/apache/drill/exec/pop/PopUnitTestBase.java
----------------------------------------------------------------------
diff --git a/exec/java-exec/src/test/java/org/apache/drill/exec/pop/PopUnitTestBase.java b/exec/java-exec/src/test/java/org/apache/drill/exec/pop/PopUnitTestBase.java
index 79bdbae..f19d616 100644
--- a/exec/java-exec/src/test/java/org/apache/drill/exec/pop/PopUnitTestBase.java
+++ b/exec/java-exec/src/test/java/org/apache/drill/exec/pop/PopUnitTestBase.java
@@ -41,13 +41,8 @@ import com.google.common.io.Files;
public abstract class PopUnitTestBase extends ExecTest{
static final org.slf4j.Logger logger = org.slf4j.LoggerFactory.getLogger(PopUnitTestBase.class);
- // Determine if we are in Eclipse Debug mode.
- static final boolean IS_DEBUG = java.lang.management.ManagementFactory.getRuntimeMXBean().getInputArguments().toString().indexOf("-agentlib:jdwp") > 0;
protected static DrillConfig CONFIG;
- // Set a timeout unless we're debugging.
- @Rule public TestRule globalTimeout = IS_DEBUG ? new TestName() : new Timeout(500000);
-
@BeforeClass
public static void setup() {
CONFIG = DrillConfig.create();