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

Merge pull request #1409 from metamx/convertTaskMerger 

Converter to use TaskMerger not TaskMaker
This commit is contained in:
Xavier Léauté 2015-06-10 11:58:52 -07:00
parent f6b336ac3e 6230ac90ae
commit 7fd9dcff48
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
indexing-hadoop/src/main/java/io/druid/indexer/updater/HadoopConverterJob.java
View File

@ -33,7 +33,7 @@ import com.metamx.common.ISE;
import com.metamx.common.logger.Logger;
import io.druid.indexer.JobHelper;
import io.druid.segment.IndexIO;
import io.druid.segment.IndexMaker;
import io.druid.segment.IndexMerger;
import io.druid.timeline.DataSegment;
import org.apache.commons.io.FileUtils;
import org.apache.hadoop.conf.Configuration;
@ -508,7 +508,7 @@ public class HadoopConverterJob
if (!outDir.mkdir() && (!outDir.exists() || !outDir.isDirectory())) {
throw new IOException(String.format("Could not create output directory [%s]", outDir));
}
IndexMaker.convert(
IndexMerger.convert(
inDir,
outDir,
config.getIndexSpec(),

2
processing/src/main/java/io/druid/segment/IndexIO.java
View File

@ -229,7 +229,7 @@ public class IndexIO
return true;
default:
if (forceIfCurrent) {
IndexMaker.convert(toConvert, converted, indexSpec);
IndexMerger.convert(toConvert, converted, indexSpec);
if(validate){
DefaultIndexIOHandler.validateTwoSegments(toConvert, converted);
}