Apache
/
druid
mirror of https://github.com/apache/druid.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

split hadoop glob path before adding it to MultipleInputs 

This can be safely reverted once https://issues.apache.org/jira/browse/MAPREDUCE-5061 is fixed
This commit is contained in:
Himanshu Gupta 2015-08-20 17:02:43 -05:00
parent a603bd9547
commit 85e3ce9096
1 changed files with 16 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
indexing-hadoop/src/main/java/io/druid/indexer/path/StaticPathSpec.java
View File

@ -85,14 +85,25 @@ public class StaticPathSpec implements PathSpec
Class<? extends InputFormat> inputFormatClass Class<? extends InputFormat> inputFormatClass
) )
{ {
if (inputFormatClass == null) { if (path == null) {
return;
}
Class<? extends InputFormat> inputFormatClassToUse = inputFormatClass;
if (inputFormatClassToUse == null) {
if (config.isCombineText()) { if (config.isCombineText()) {
MultipleInputs.addInputPath(job, new Path(path), CombineTextInputFormat.class); inputFormatClassToUse = CombineTextInputFormat.class;
} else { } else {
MultipleInputs.addInputPath(job, new Path(path), TextInputFormat.class); inputFormatClassToUse = TextInputFormat.class;
} }
} else { }
MultipleInputs.addInputPath(job, new Path(path), inputFormatClass);
// Due to https://issues.apache.org/jira/browse/MAPREDUCE-5061 we can't directly do
// MultipleInputs.addInputPath(job, path, inputFormatClassToUse)
// but have to handle hadoop glob path ourselves correctly
// This change and HadoopGlobPathSplitter.java can be removed once the hadoop issue is fixed
for (StringBuilder sb : HadoopGlobPathSplitter.splitGlob(path)) {
MultipleInputs.addInputPath(job, new Path(sb.toString()), inputFormatClassToUse);
} }
} }