svn commit: r1393923 - /hbase/trunk/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestStoreFile.java

[st...@apache.org]

Author: stack
Date: Thu Oct  4 05:46:51 2012
New Revision: 1393923

URL: http://svn.apache.org/viewvc?rev=1393923&view=rev
Log:
HBASE-6928 TestStoreFile sometimes fails with 'Column family prefix used twice' -- ATTEMPTED FIX

Modified:
    hbase/trunk/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestStoreFile.java

Modified: hbase/trunk/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestStoreFile.java
URL: http://svn.apache.org/viewvc/hbase/trunk/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestStoreFile.java?rev=1393923&r1=1393922&r2=1393923&view=diff
==============================================================================
--- hbase/trunk/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestStoreFile.java (original)
+++ hbase/trunk/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestStoreFile.java Thu Oct  4 05:46:51 2012
@@ -176,9 +176,10 @@ public class TestStoreFile extends HBase
   }
 
   public void testHFileLink() throws IOException {
+    final String columnFamily = "f";
     HRegionInfo hri = new HRegionInfo(Bytes.toBytes("table-link"));
     Path storedir = new Path(new Path(FSUtils.getRootDir(conf),
-                             new Path(hri.getTableNameAsString(), hri.getEncodedName())), "cf");
+      new Path(hri.getTableNameAsString(), hri.getEncodedName())), columnFamily);
 
     // Make a store file and write data to it.
     StoreFile.Writer writer = new StoreFile.WriterBuilder(conf, cacheConf,
@@ -189,7 +190,7 @@ public class TestStoreFile extends HBase
     writeStoreFile(writer);
     writer.close();
 
-    Path dstPath = new Path(FSUtils.getRootDir(conf), new Path("test-region", "cf"));
+    Path dstPath = new Path(FSUtils.getRootDir(conf), new Path("test-region", columnFamily));
     HFileLink.create(conf, this.fs, dstPath, hri, storeFilePath.getName());
     Path linkFilePath = new Path(dstPath,
                   HFileLink.createHFileLinkName(hri, storeFilePath.getName()));