You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@phoenix.apache.org by ja...@apache.org on 2014/04/30 00:28:18 UTC
git commit: PHOENIX-674 Make unit test suite run faster (SamarthJain)
Repository: incubator-phoenix
Updated Branches:
refs/heads/master 2c97b7b64 -> ca0d8d7e7
PHOENIX-674 Make unit test suite run faster (SamarthJain)
Project: http://git-wip-us.apache.org/repos/asf/incubator-phoenix/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-phoenix/commit/ca0d8d7e
Tree: http://git-wip-us.apache.org/repos/asf/incubator-phoenix/tree/ca0d8d7e
Diff: http://git-wip-us.apache.org/repos/asf/incubator-phoenix/diff/ca0d8d7e
Branch: refs/heads/master
Commit: ca0d8d7e7822833e7f2e1c2abdc2c08de8201bdf
Parents: 2c97b7b
Author: James Taylor <ja...@apache.org>
Authored: Tue Apr 29 15:28:35 2014 -0700
Committer: James Taylor <ja...@apache.org>
Committed: Tue Apr 29 15:28:35 2014 -0700
----------------------------------------------------------------------
.../org/apache/phoenix/pig/PhoenixHBaseLoaderIT.java | 9 +++++----
.../org/apache/phoenix/pig/PhoenixHBaseStorerIT.java | 7 +++++--
pom.xml | 13 +++++++++++--
3 files changed, 21 insertions(+), 8 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-phoenix/blob/ca0d8d7e/phoenix-pig/src/it/java/org/apache/phoenix/pig/PhoenixHBaseLoaderIT.java
----------------------------------------------------------------------
diff --git a/phoenix-pig/src/it/java/org/apache/phoenix/pig/PhoenixHBaseLoaderIT.java b/phoenix-pig/src/it/java/org/apache/phoenix/pig/PhoenixHBaseLoaderIT.java
index d441ed9..2bb47c8 100644
--- a/phoenix-pig/src/it/java/org/apache/phoenix/pig/PhoenixHBaseLoaderIT.java
+++ b/phoenix-pig/src/it/java/org/apache/phoenix/pig/PhoenixHBaseLoaderIT.java
@@ -78,8 +78,11 @@ public class PhoenixHBaseLoaderIT {
@BeforeClass
public static void setUpBeforeClass() throws Exception {
hbaseTestUtil = new HBaseTestingUtility();
- ConfigUtil.setReplicationConfigIfAbsent(hbaseTestUtil.getConfiguration());
- hbaseTestUtil.getConfiguration().set(QueryServices.DROP_METADATA_ATTRIB, Boolean.toString(true));
+ conf = hbaseTestUtil.getConfiguration();
+ ConfigUtil.setReplicationConfigIfAbsent(conf);
+ conf.set(QueryServices.DROP_METADATA_ATTRIB, Boolean.toString(true));
+ conf.setInt(QueryServices.MASTER_INFO_PORT_ATTRIB, -1);
+ conf.setInt(QueryServices.REGIONSERVER_INFO_PORT_ATTRIB, -1);
hbaseTestUtil.startMiniCluster();
Class.forName(PhoenixDriver.class.getName());
@@ -88,8 +91,6 @@ public class PhoenixHBaseLoaderIT {
props.put(QueryServices.DROP_METADATA_ATTRIB, Boolean.toString(true));
conn = DriverManager.getConnection(PhoenixRuntime.JDBC_PROTOCOL +
PhoenixRuntime.JDBC_PROTOCOL_SEPARATOR + zkQuorum,props);
-
- conf = hbaseTestUtil.getConfiguration();
}
@Before
http://git-wip-us.apache.org/repos/asf/incubator-phoenix/blob/ca0d8d7e/phoenix-pig/src/it/java/org/apache/phoenix/pig/PhoenixHBaseStorerIT.java
----------------------------------------------------------------------
diff --git a/phoenix-pig/src/it/java/org/apache/phoenix/pig/PhoenixHBaseStorerIT.java b/phoenix-pig/src/it/java/org/apache/phoenix/pig/PhoenixHBaseStorerIT.java
index 43d9247..acfa5e6 100644
--- a/phoenix-pig/src/it/java/org/apache/phoenix/pig/PhoenixHBaseStorerIT.java
+++ b/phoenix-pig/src/it/java/org/apache/phoenix/pig/PhoenixHBaseStorerIT.java
@@ -31,6 +31,7 @@ import java.util.Collection;
import org.apache.hadoop.conf.Configuration;
import org.apache.hadoop.hbase.HBaseTestingUtility;
import org.apache.phoenix.jdbc.PhoenixDriver;
+import org.apache.phoenix.query.QueryServices;
import org.apache.phoenix.util.ConfigUtil;
import org.apache.phoenix.util.PhoenixRuntime;
import org.apache.pig.ExecType;
@@ -61,14 +62,16 @@ public class PhoenixHBaseStorerIT {
@BeforeClass
public static void setUpBeforeClass() throws Exception {
hbaseTestUtil = new HBaseTestingUtility();
- ConfigUtil.setReplicationConfigIfAbsent(hbaseTestUtil.getConfiguration());
+ conf = hbaseTestUtil.getConfiguration();
+ ConfigUtil.setReplicationConfigIfAbsent(conf);
+ conf.setInt(QueryServices.MASTER_INFO_PORT_ATTRIB, -1);
+ conf.setInt(QueryServices.REGIONSERVER_INFO_PORT_ATTRIB, -1);
hbaseTestUtil.startMiniCluster();
Class.forName(PhoenixDriver.class.getName());
zkQuorum = "localhost:" + hbaseTestUtil.getZkCluster().getClientPort();
conn = DriverManager.getConnection(PhoenixRuntime.JDBC_PROTOCOL +
PhoenixRuntime.JDBC_PROTOCOL_SEPARATOR + zkQuorum);
- conf = hbaseTestUtil.getConfiguration();
// Pig variables
tupleFactory = TupleFactory.getInstance();
}
http://git-wip-us.apache.org/repos/asf/incubator-phoenix/blob/ca0d8d7e/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 4424a14..c31a643 100644
--- a/pom.xml
+++ b/pom.xml
@@ -107,11 +107,16 @@
<maven-eclipse-plugin.version>2.8</maven-eclipse-plugin.version>
<maven-build-helper-plugin.version>1.7</maven-build-helper-plugin.version>
<maven-surefire-plugin.version>2.16</maven-surefire-plugin.version>
- <maven-failsafe-plugin.version>2.12</maven-failsafe-plugin.version>
+ <maven-failsafe-plugin.version>2.17</maven-failsafe-plugin.version>
+
<maven-dependency-plugin.version>2.1</maven-dependency-plugin.version>
<maven.assembly.version>2.4</maven.assembly.version>
<maven.rat.version>0.8</maven.rat.version>
-
+
+ <!-- Plugin options -->
+ <numForkedIT>3</numForkedIT>
+ <numForkedUT>3</numForkedUT>
+
<!-- Set default encoding so multi-byte tests work correctly on the Mac -->
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
@@ -240,6 +245,8 @@
<version>${maven-failsafe-plugin.version}</version>
<configuration>
<encoding>UTF-8</encoding>
+ <forkCount>${numForkedIT}</forkCount>
+ <reuseForks>true</reuseForks>
<argLine>-enableassertions -Xmx3000m -XX:MaxPermSize=128m -Djava.security.egd=file:/dev/./urandom</argLine>
<redirectTestOutputToFile>${test.output.tofile}</redirectTestOutputToFile>
<testSourceDirectory>${basedir}/src/it/java</testSourceDirectory>
@@ -296,6 +303,8 @@
<artifactId>maven-surefire-plugin</artifactId>
<version>${maven-surefire-plugin.version}</version>
<configuration>
+ <forkCount>${numForkedUT}</forkCount>
+ <reuseForks>true</reuseForks>
<argLine>-enableassertions -Xmx2250m -XX:MaxPermSize=128m
-Djava.security.egd=file:/dev/./urandom</argLine>
<redirectTestOutputToFile>${test.output.tofile}</redirectTestOutputToFile>