crunch-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From gr...@apache.org
Subject crunch git commit: CRUNCH-475 Remove unecessary handling of ~/hbase
Date Mon, 25 May 2015 15:31:58 GMT
Repository: crunch
Updated Branches:
  refs/heads/master 5bd258d1c -> aaaec816c


CRUNCH-475 Remove unecessary handling of ~/hbase

Signed-off-by: Gabriel Reid <greid@apache.org>


Project: http://git-wip-us.apache.org/repos/asf/crunch/repo
Commit: http://git-wip-us.apache.org/repos/asf/crunch/commit/aaaec816
Tree: http://git-wip-us.apache.org/repos/asf/crunch/tree/aaaec816
Diff: http://git-wip-us.apache.org/repos/asf/crunch/diff/aaaec816

Branch: refs/heads/master
Commit: aaaec816c0cc75855a8b8f7f0e2367d682b67ac1
Parents: 5bd258d
Author: Sean Owen <sowen@cloudera.com>
Authored: Sun May 24 21:21:04 2015 +0100
Committer: Gabriel Reid <greid@apache.org>
Committed: Mon May 25 17:31:43 2015 +0200

----------------------------------------------------------------------
 .../apache/crunch/io/hbase/WordCountHBaseIT.java  | 18 ------------------
 1 file changed, 18 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/crunch/blob/aaaec816/crunch-hbase/src/it/java/org/apache/crunch/io/hbase/WordCountHBaseIT.java
----------------------------------------------------------------------
diff --git a/crunch-hbase/src/it/java/org/apache/crunch/io/hbase/WordCountHBaseIT.java b/crunch-hbase/src/it/java/org/apache/crunch/io/hbase/WordCountHBaseIT.java
index ead2aea..dd48352 100644
--- a/crunch-hbase/src/it/java/org/apache/crunch/io/hbase/WordCountHBaseIT.java
+++ b/crunch-hbase/src/it/java/org/apache/crunch/io/hbase/WordCountHBaseIT.java
@@ -19,7 +19,6 @@ package org.apache.crunch.io.hbase;
 
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertFalse;
 import static org.junit.Assert.assertTrue;
 
 import java.io.IOException;
@@ -40,8 +39,6 @@ import org.apache.crunch.test.TemporaryPath;
 import org.apache.crunch.test.TemporaryPaths;
 import org.apache.crunch.types.writable.Writables;
 import org.apache.hadoop.conf.Configuration;
-import org.apache.hadoop.fs.FileSystem;
-import org.apache.hadoop.fs.Path;
 import org.apache.hadoop.hbase.HBaseConfiguration;
 import org.apache.hadoop.hbase.HBaseTestingUtility;
 import org.apache.hadoop.hbase.client.Delete;
@@ -122,18 +119,6 @@ public class WordCountHBaseIT {
   @Before
   public void setUp() throws Exception {
     Configuration conf = HBaseConfiguration.create(tmpDir.getDefaultConfiguration());
-
-    // HBase 0.98 HBaseTestingUtility hard-codes ~/hbase as its temp directory and leaves
-    // it lying around after this test. It's easy to delete, but to be sure it's safe to
-    // delete, we need to be sure that it doesn't exist already. The test probably won't
-    // work anyway if it does. If it doesn't exist, then deleting it later doesn't matter
-    // even if a future HBase is used (which doesn't have this problem) and this test
-    // isn't updated.
-    FileSystem fs = FileSystem.get(conf);
-    Path hbaseTestPath = new Path(fs.makeQualified(fs.getHomeDirectory()),"hbase");
-    assertFalse("The hbase directory in your home directory already exists. This test deletes
this directory " +
-            "on exit, so it will not run unless you delete the directory yourself", fs.exists(hbaseTestPath));
-
     hbaseTestUtil = new HBaseTestingUtility(conf);
     hbaseTestUtil.startMiniZKCluster();
     hbaseTestUtil.startMiniHBaseCluster(1, 1);
@@ -148,9 +133,6 @@ public class WordCountHBaseIT {
   public void tearDown() throws Exception {
     hbaseTestUtil.shutdownMiniHBaseCluster();
     hbaseTestUtil.shutdownMiniZKCluster();
-    FileSystem fs = FileSystem.get(hbaseTestUtil.getConfiguration());
-    Path hbaseTestPath = new Path(fs.makeQualified(fs.getHomeDirectory()),"hbase");
-    fs.delete(hbaseTestPath, true);
   }
 
   public void run(Pipeline pipeline) throws Exception {


Mime
View raw message