From 6230ac90ae823839c8009bb4f554b77f0ecacfcc Mon Sep 17 00:00:00 2001
From: Charles Allen <charles@allen-net.com>
Date: Mon, 1 Jun 2015 14:44:20 -0700
Subject: [PATCH] Use IndexMerger for conversion

---
 .../java/io/druid/indexer/updater/HadoopConverterJob.java     | 4 ++--
 processing/src/main/java/io/druid/segment/IndexIO.java        | 2 +-
 2 files changed, 3 insertions(+), 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
index c961031a685..fb3c63eae0f 100644
--- 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.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(),
diff --git a/processing/src/main/java/io/druid/segment/IndexIO.java b/processing/src/main/java/io/druid/segment/IndexIO.java
index d46d0f9937b..6f24f10abc5 100644
--- 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 class IndexIO
         return true;
       default:
         if (forceIfCurrent) {
-          IndexMaker.convert(toConvert, converted, indexSpec);
+          IndexMerger.convert(toConvert, converted, indexSpec);
           if(validate){
             DefaultIndexIOHandler.validateTwoSegments(toConvert, converted);
           }