Apache
/
hbase
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

HBASE-12375 LoadIncrementalHFiles fails to load data in table when CF name starts with '_' 

Signed-off-by: stack <stack@apache.org>
This commit is contained in:
Ashish Singhi 2014-10-30 12:33:07 +05:30 committed by stack
parent c466c61976
commit d8874fbc21
2 changed files with 28 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
hbase-server/src/main/java/org/apache/hadoop/hbase/mapreduce/LoadIncrementalHFiles.java
View File

@ -203,8 +203,6 @@ public class LoadIncrementalHFiles extends Configured implements Tool {
continue; continue;
} }
Path familyDir = stat.getPath(); Path familyDir = stat.getPath();
// Skip _logs, etc
if (familyDir.getName().startsWith("_")) continue;
byte[] family = familyDir.getName().getBytes(); byte[] family = familyDir.getName().getBytes();
Path[] hfiles = FileUtil.stat2Paths(fs.listStatus(familyDir)); Path[] hfiles = FileUtil.stat2Paths(fs.listStatus(familyDir));
for (Path hfile : hfiles) { for (Path hfile : hfiles) {
@ -850,8 +848,6 @@ public class LoadIncrementalHFiles extends Configured implements Tool {
continue; continue;
} }
Path familyDir = stat.getPath(); Path familyDir = stat.getPath();
// Skip _logs, etc
if (familyDir.getName().startsWith("_")) continue;
byte[] family = familyDir.getName().getBytes(); byte[] family = familyDir.getName().getBytes();
hcd = new HColumnDescriptor(family); hcd = new HColumnDescriptor(family);

28
hbase-server/src/test/java/org/apache/hadoop/hbase/mapreduce/TestLoadIncrementalHFiles.java
View File

@ -431,5 +431,33 @@ public class TestLoadIncrementalHFiles {
String[] args = { "directory", "nonExistingTable" }; String[] args = { "directory", "nonExistingTable" };
loader.run(args); loader.run(args);
} }
@Test
public void testTableWithCFNameStartWithUnderScore() throws Exception {
Path dir = util.getDataTestDirOnTestFS("cfNameStartWithUnderScore");
FileSystem fs = util.getTestFileSystem();
dir = dir.makeQualified(fs.getUri(), fs.getWorkingDirectory());
String family = "_cf";
Path familyDir = new Path(dir, family);
byte[] from = Bytes.toBytes("begin");
byte[] to = Bytes.toBytes("end");
Configuration conf = util.getConfiguration();
String tableName = "mytable_cfNameStartWithUnderScore";
Table table = util.createTable(TableName.valueOf(tableName), family);
HFileTestUtil.createHFile(conf, fs, new Path(familyDir, "hfile"), Bytes.toBytes(family),
QUALIFIER, from, to, 1000);
LoadIncrementalHFiles loader = new LoadIncrementalHFiles(conf);
String[] args = { dir.toString(), tableName };
try {
loader.run(args);
assertEquals(1000, util.countRows(table));
} finally {
if (null != table) {
table.close();
}
}
}
} }