pig-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From da...@apache.org
Subject svn commit: r1605904 - in /pig/trunk: CHANGES.txt test/org/apache/pig/backend/hadoop/accumulo/TestAccumuloPigCluster.java test/org/apache/pig/test/TestHBaseStorage.java
Date Thu, 26 Jun 2014 20:37:59 GMT
Author: daijy
Date: Thu Jun 26 20:37:59 2014
New Revision: 1605904

URL: http://svn.apache.org/r1605904
Log:
PIG-4037: TestHBaseStorage, TestAccumuloPigCluster has failures with hadoopversion=23

Modified:
    pig/trunk/CHANGES.txt
    pig/trunk/test/org/apache/pig/backend/hadoop/accumulo/TestAccumuloPigCluster.java
    pig/trunk/test/org/apache/pig/test/TestHBaseStorage.java

Modified: pig/trunk/CHANGES.txt
URL: http://svn.apache.org/viewvc/pig/trunk/CHANGES.txt?rev=1605904&r1=1605903&r2=1605904&view=diff
==============================================================================
--- pig/trunk/CHANGES.txt (original)
+++ pig/trunk/CHANGES.txt Thu Jun 26 20:37:59 2014
@@ -238,6 +238,8 @@ PIG-3882: Multiquery off mode execution 
  
 BUG FIXES
 
+PIG-4037: TestHBaseStorage, TestAccumuloPigCluster has failures with hadoopversion=23 (daijy)
+
 PIG-4005: depend on hbase-hadoop2-compat rather than hbase-hadoop1-compat when hbaseversion
is 95 (daijy)
 
 PIG-4021: Fix TestHBaseStorage failure after auto local mode change (PIG-3463) (daijy)

Modified: pig/trunk/test/org/apache/pig/backend/hadoop/accumulo/TestAccumuloPigCluster.java
URL: http://svn.apache.org/viewvc/pig/trunk/test/org/apache/pig/backend/hadoop/accumulo/TestAccumuloPigCluster.java?rev=1605904&r1=1605903&r2=1605904&view=diff
==============================================================================
--- pig/trunk/test/org/apache/pig/backend/hadoop/accumulo/TestAccumuloPigCluster.java (original)
+++ pig/trunk/test/org/apache/pig/backend/hadoop/accumulo/TestAccumuloPigCluster.java Thu
Jun 26 20:37:59 2014
@@ -76,8 +76,6 @@ public class TestAccumuloPigCluster {
             .getLogger(TestAccumuloPigCluster.class);
     private static final File tmpdir = Files.createTempDir();
     private static MiniAccumuloCluster accumuloCluster;
-    private static MiniCluster cluster;
-    private static Configuration conf;
     private PigServer pig;
 
     @BeforeClass
@@ -87,20 +85,15 @@ public class TestAccumuloPigCluster {
 
         accumuloCluster = new MiniAccumuloCluster(macConf);
         accumuloCluster.start();
-
-        // This is needed by Pig
-        cluster = MiniCluster.buildCluster();
-        conf = cluster.getConfiguration();
     }
 
     @Before
     public void beforeTest() throws Exception {
-        pig = new PigServer(ExecType.LOCAL, conf);
+        pig = new PigServer(ExecType.LOCAL);
     }
 
     @AfterClass
     public static void stopClusters() throws Exception {
-        cluster.shutDown();
         accumuloCluster.stop();
         FileUtils.deleteDirectory(tmpdir);
     }

Modified: pig/trunk/test/org/apache/pig/test/TestHBaseStorage.java
URL: http://svn.apache.org/viewvc/pig/trunk/test/org/apache/pig/test/TestHBaseStorage.java?rev=1605904&r1=1605903&r2=1605904&view=diff
==============================================================================
--- pig/trunk/test/org/apache/pig/test/TestHBaseStorage.java (original)
+++ pig/trunk/test/org/apache/pig/test/TestHBaseStorage.java Thu Jun 26 20:37:59 2014
@@ -58,7 +58,6 @@ public class TestHBaseStorage {
     private static final Log LOG = LogFactory.getLog(TestHBaseStorage.class);
     private static HBaseTestingUtility util;
     private static Configuration conf;
-    private static MiniCluster cluster;
     private static PigServer pig;
 
     enum DataFormat {
@@ -78,8 +77,7 @@ public class TestHBaseStorage {
     @BeforeClass
     public static void setUp() throws Exception {
         // This is needed by Pig
-        cluster = MiniCluster.buildCluster();
-        conf = HBaseConfiguration.create(cluster.getConfiguration());
+        conf = HBaseConfiguration.create(new Configuration());
 
         util = new HBaseTestingUtility(conf);
         util.startMiniZKCluster();
@@ -96,7 +94,6 @@ public class TestHBaseStorage {
             hbc.join();
         }
         util.shutdownMiniZKCluster();
-        cluster.shutDown();
     }
 
 



Mime
View raw message