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 2015/11/16 03:26:11 UTC
phoenix git commit: PHOENIX-2419 Fix flapping Pig tests
Repository: phoenix
Updated Branches:
refs/heads/4.x-HBase-0.98 34f536252 -> 1e14f4664
PHOENIX-2419 Fix flapping Pig tests
Project: http://git-wip-us.apache.org/repos/asf/phoenix/repo
Commit: http://git-wip-us.apache.org/repos/asf/phoenix/commit/1e14f466
Tree: http://git-wip-us.apache.org/repos/asf/phoenix/tree/1e14f466
Diff: http://git-wip-us.apache.org/repos/asf/phoenix/diff/1e14f466
Branch: refs/heads/4.x-HBase-0.98
Commit: 1e14f466424ca110ec82caf950408dc8d5e334c7
Parents: 34f5362
Author: James Taylor <jt...@salesforce.com>
Authored: Sun Nov 15 18:25:15 2015 -0800
Committer: James Taylor <jt...@salesforce.com>
Committed: Sun Nov 15 18:26:05 2015 -0800
----------------------------------------------------------------------
.../phoenix/pig/PhoenixHBaseLoaderIT.java | 41 +++++++++++----
.../phoenix/pig/PhoenixHBaseStorerIT.java | 54 +++++++++++++-------
2 files changed, 66 insertions(+), 29 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/phoenix/blob/1e14f466/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 6a5923c..b83ad31 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
@@ -33,12 +33,18 @@ import java.sql.SQLException;
import java.util.ArrayList;
import java.util.Iterator;
import java.util.List;
+import java.util.Map;
import java.util.Properties;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
+import org.apache.hadoop.conf.Configuration;
import org.apache.phoenix.end2end.BaseHBaseManagedTimeIT;
+import org.apache.phoenix.end2end.Shadower;
+import org.apache.phoenix.query.QueryServices;
+import org.apache.phoenix.query.QueryServicesOptions;
import org.apache.phoenix.util.PropertiesUtil;
+import org.apache.phoenix.util.ReadOnlyProps;
import org.apache.phoenix.util.SchemaUtil;
import org.apache.pig.ExecType;
import org.apache.pig.PigServer;
@@ -50,9 +56,11 @@ import org.apache.pig.impl.logicalLayer.schema.Schema;
import org.apache.pig.impl.logicalLayer.schema.Schema.FieldSchema;
import org.junit.After;
import org.junit.Before;
+import org.junit.BeforeClass;
import org.junit.Test;
import com.google.common.base.Preconditions;
+import com.google.common.collect.Maps;
/**
*
@@ -71,12 +79,33 @@ public class PhoenixHBaseLoaderIT extends BaseHBaseManagedTimeIT {
private Connection conn;
private PigServer pigServer;
+ @BeforeClass
+ @Shadower(classBeingShadowed = BaseHBaseManagedTimeIT.class)
+ public static void doSetup() throws Exception {
+ Map<String,String> props = Maps.newHashMapWithExpectedSize(3);
+ props.put(QueryServices.EXTRA_JDBC_ARGUMENTS_ATTRIB, QueryServicesOptions.DEFAULT_EXTRA_JDBC_ARGUMENTS);
+ // Must update config before starting server
+ setUpTestDriver(new ReadOnlyProps(props.entrySet().iterator()));
+ }
+
@Before
public void setUp() throws Exception {
+ Configuration conf = getTestClusterConfig();
+ conf.set(QueryServices.EXTRA_JDBC_ARGUMENTS_ATTRIB, QueryServicesOptions.DEFAULT_EXTRA_JDBC_ARGUMENTS);
+ pigServer = new PigServer(ExecType.LOCAL, conf);
Properties props = PropertiesUtil.deepCopy(TEST_PROPERTIES);
conn = DriverManager.getConnection(getUrl(), props);
- zkQuorum = LOCALHOST + JDBC_PROTOCOL_SEPARATOR + getZKClientPort(getTestClusterConfig());
- pigServer = new PigServer(ExecType.LOCAL, getTestClusterConfig());
+ zkQuorum = LOCALHOST + JDBC_PROTOCOL_SEPARATOR + getZKClientPort(conf);
+ }
+
+ @After
+ public void tearDown() throws Exception {
+ if(conn != null) {
+ conn.close();
+ }
+ if (pigServer != null) {
+ pigServer.shutdown();
+ }
}
/**
@@ -717,14 +746,6 @@ public class PhoenixHBaseLoaderIT extends BaseHBaseManagedTimeIT {
assertEquals(expectedList.size(), actualList.size());
}
- @After
- public void tearDown() throws Exception {
- if(conn != null) {
- conn.close();
- }
- pigServer.shutdown();
- }
-
private void dropTable(String tableFullName) throws SQLException {
Preconditions.checkNotNull(conn);
conn.createStatement().execute(String.format("DROP TABLE IF EXISTS %s",tableFullName));
http://git-wip-us.apache.org/repos/asf/phoenix/blob/1e14f466/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 9106cdd..9c04d68 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
@@ -21,6 +21,7 @@ package org.apache.phoenix.pig;
import static org.apache.phoenix.util.PhoenixRuntime.JDBC_PROTOCOL_SEPARATOR;
import static org.apache.phoenix.util.TestUtil.LOCALHOST;
+import static org.apache.phoenix.util.TestUtil.TEST_PROPERTIES;
import static org.junit.Assert.assertArrayEquals;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertTrue;
@@ -30,9 +31,17 @@ import java.sql.DriverManager;
import java.sql.ResultSet;
import java.sql.Statement;
import java.util.Collection;
+import java.util.Map;
+import java.util.Properties;
+import org.apache.hadoop.conf.Configuration;
import org.apache.hadoop.hbase.util.Bytes;
import org.apache.phoenix.end2end.BaseHBaseManagedTimeIT;
+import org.apache.phoenix.end2end.Shadower;
+import org.apache.phoenix.query.QueryServices;
+import org.apache.phoenix.query.QueryServicesOptions;
+import org.apache.phoenix.util.PropertiesUtil;
+import org.apache.phoenix.util.ReadOnlyProps;
import org.apache.phoenix.util.SchemaUtil;
import org.apache.pig.ExecType;
import org.apache.pig.PigServer;
@@ -44,42 +53,49 @@ import org.apache.pig.data.Tuple;
import org.apache.pig.data.TupleFactory;
import org.joda.time.DateTime;
import org.junit.After;
-import org.junit.AfterClass;
import org.junit.Before;
import org.junit.BeforeClass;
import org.junit.Test;
import com.google.common.collect.Lists;
+import com.google.common.collect.Maps;
public class PhoenixHBaseStorerIT extends BaseHBaseManagedTimeIT {
+ private TupleFactory tupleFactory;
+ private String zkQuorum;
+ private Connection conn;
+ private PigServer pigServer;
- private static TupleFactory tupleFactory;
- private static Connection conn;
- private static PigServer pigServer;
- private static String zkQuorum;
-
@BeforeClass
- public static void setUpBeforeClass() throws Exception {
- conn = DriverManager.getConnection(getUrl());
- zkQuorum = LOCALHOST + JDBC_PROTOCOL_SEPARATOR + getZKClientPort(getTestClusterConfig());
- // Pig variables
- tupleFactory = TupleFactory.getInstance();
+ @Shadower(classBeingShadowed = BaseHBaseManagedTimeIT.class)
+ public static void doSetup() throws Exception {
+ Map<String,String> props = Maps.newHashMapWithExpectedSize(3);
+ props.put(QueryServices.EXTRA_JDBC_ARGUMENTS_ATTRIB, QueryServicesOptions.DEFAULT_EXTRA_JDBC_ARGUMENTS);
+ // Must update config before starting server
+ setUpTestDriver(new ReadOnlyProps(props.entrySet().iterator()));
}
@Before
public void setUp() throws Exception {
- pigServer = new PigServer(ExecType.LOCAL, getTestClusterConfig());
+ Configuration conf = getTestClusterConfig();
+ conf.set(QueryServices.EXTRA_JDBC_ARGUMENTS_ATTRIB, QueryServicesOptions.DEFAULT_EXTRA_JDBC_ARGUMENTS);
+ pigServer = new PigServer(ExecType.LOCAL, conf);
+ tupleFactory = TupleFactory.getInstance();
+
+ Properties props = PropertiesUtil.deepCopy(TEST_PROPERTIES);
+ conn = DriverManager.getConnection(getUrl(), props);
+ zkQuorum = LOCALHOST + JDBC_PROTOCOL_SEPARATOR + getZKClientPort(conf);
}
-
+
@After
public void tearDown() throws Exception {
- pigServer.shutdown();
- }
-
- @AfterClass
- public static void tearDownAfterClass() throws Exception {
- conn.close();
+ if(conn != null) {
+ conn.close();
+ }
+ if (pigServer != null) {
+ pigServer.shutdown();
+ }
}
/**