Index: src/java/org/apache/hcatalog/cli/SemanticAnalysis/AlterTableFileFormatHook.java =================================================================== --- src/java/org/apache/hcatalog/cli/SemanticAnalysis/AlterTableFileFormatHook.java (revision 1227787) +++ src/java/org/apache/hcatalog/cli/SemanticAnalysis/AlterTableFileFormatHook.java (working copy) @@ -40,7 +40,6 @@ import org.apache.hcatalog.common.HCatConstants; import org.apache.hcatalog.rcfile.RCFileInputDriver; import org.apache.hcatalog.rcfile.RCFileOutputDriver; -import org.apache.pig.builtin.PigStorage; public class AlterTableFileFormatHook extends AbstractSemanticAnalyzerHook { @@ -70,8 +69,8 @@ outputFormat = org.apache.hadoop.hive.ql.io.IgnoreKeyTextOutputFormat.class.getName(); inDriver = org.apache.hcatalog.pig.drivers.LoadFuncBasedInputDriver.class.getName(); outDriver = org.apache.hcatalog.pig.drivers.StoreFuncBasedOutputDriver.class.getName(); - loader = PigStorage.class.getName(); - storer = PigStorage.class.getName(); + loader = HCatConstants.HCAT_PIG_STORAGE_CLASS; + storer = HCatConstants.HCAT_PIG_STORAGE_CLASS; break; case HiveParser.TOK_TBLRCFILE: Index: src/java/org/apache/hcatalog/cli/SemanticAnalysis/CreateTableHook.java =================================================================== --- src/java/org/apache/hcatalog/cli/SemanticAnalysis/CreateTableHook.java (revision 1227787) +++ src/java/org/apache/hcatalog/cli/SemanticAnalysis/CreateTableHook.java (working copy) @@ -52,7 +52,6 @@ import org.apache.hcatalog.rcfile.RCFileInputDriver; import org.apache.hcatalog.rcfile.RCFileOutputDriver; import org.apache.hcatalog.storagehandler.HCatStorageHandler; -import org.apache.pig.builtin.PigStorage; final class CreateTableHook extends AbstractSemanticAnalyzerHook { @@ -104,8 +103,8 @@ outputFormat = org.apache.hadoop.hive.ql.io.IgnoreKeyTextOutputFormat.class.getName(); inStorageDriver = org.apache.hcatalog.pig.drivers.LoadFuncBasedInputDriver.class.getName(); outStorageDriver = org.apache.hcatalog.pig.drivers.StoreFuncBasedOutputDriver.class.getName(); - loader = PigStorage.class.getName(); - storer = PigStorage.class.getName(); + loader = HCatConstants.HCAT_PIG_STORAGE_CLASS; + storer = HCatConstants.HCAT_PIG_STORAGE_CLASS; break; Index: src/java/org/apache/hcatalog/common/HCatConstants.java =================================================================== --- src/java/org/apache/hcatalog/common/HCatConstants.java (revision 1227787) +++ src/java/org/apache/hcatalog/common/HCatConstants.java (working copy) @@ -30,6 +30,7 @@ public static final String HCAT_RCFILE_ISD_CLASS = "org.apache.hcatalog.rcfile.RCFileInputDriver"; public static final String HCAT_RCFILE_OSD_CLASS = "org.apache.hcatalog.rcfile.RCFileOutputDriver"; + public static final String HCAT_PIG_STORAGE_CLASS = "org.apache.pig.builtin.PigStorage"; public static final String HCAT_PIG_LOADER = "hcat.pig.loader"; public static final String HCAT_PIG_LOADER_ARGS = "hcat.pig.loader.args"; public static final String HCAT_PIG_STORER = "hcat.pig.storer";