Merge pull request apache#1409 from metamx/convertTaskMerger

Converter to use TaskMerger not TaskMaker
jbnote · Jun 10, 2015 · 7fd9dcf · 7fd9dcf
2 parents f6b336a + 6230ac9
commit 7fd9dcf
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/indexing-hadoop/src/main/java/io/druid/indexer/updater/HadoopConverterJob.java b/indexing-hadoop/src/main/java/io/druid/indexer/updater/HadoopConverterJob.java
@@ -33,7 +33,7 @@
 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 @@ protected void map(
       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(),

diff --git a/processing/src/main/java/io/druid/segment/IndexIO.java b/processing/src/main/java/io/druid/segment/IndexIO.java
@@ -229,7 +229,7 @@ public static boolean convertSegment(File toConvert, File converted, IndexSpec i
         return true;
       default:
         if (forceIfCurrent) {
-          IndexMaker.convert(toConvert, converted, indexSpec);
+          IndexMerger.convert(toConvert, converted, indexSpec);
           if(validate){
             DefaultIndexIOHandler.validateTwoSegments(toConvert, converted);
           }