HBASE-7752 [snapshot 130201 merge] Fix TestStoreFile failure

Revert change to make it match trunk and pass



git-svn-id: https://svn.apache.org/repos/asf/hbase/branches/hbase-7290v2@1446156 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Jonathan Hsieh 2013-02-14 13:05:31 +00:00
parent 11d986a0ef
commit 851141a357
1 changed files with 5 additions and 4 deletions

View File

@ -175,12 +175,13 @@ public class TestStoreFile extends HBaseTestCase {
public void testHFileLink() throws IOException {
final String columnFamily = "f";
Configuration testConf = new Configuration(this.conf);
FSUtils.setRootDir(testConf, this.testDir);
// force temp data in hbase/target/test-data instead of /tmp/hbase-xxxx/
Configuration testConf = new Configuration(this.conf);
FSUtils.setRootDir(testConf, this.testDir);
HRegionInfo hri = new HRegionInfo(Bytes.toBytes("table-link"));
Path storedir = new Path(new Path(this.testDir,
new Path(hri.getTableNameAsString(), hri.getEncodedName())), columnFamily);
new Path(hri.getTableNameAsString(), hri.getEncodedName())), columnFamily);
// Make a store file and write data to it.
StoreFile.Writer writer = new StoreFile.WriterBuilder(testConf, cacheConf,
@ -197,7 +198,7 @@ public class TestStoreFile extends HBaseTestCase {
HFileLink.createHFileLinkName(hri, storeFilePath.getName()));
// Try to open store file from link
StoreFile hsf = new StoreFile(this.fs, linkFilePath, conf, cacheConf,
StoreFile hsf = new StoreFile(this.fs, linkFilePath, testConf, cacheConf,
BloomType.NONE, NoOpDataBlockEncoder.INSTANCE);
assertTrue(hsf.isLink());