svn commit: r1227904 - in /incubator/hcatalog/trunk: ./ src/java/org/apache/hcatalog/cli/SemanticAnalysis/ src/java/org/apache/hcatalog/common/

[khorgath]

Author: khorgath
Date: Fri Jan  6 00:08:08 2012
New Revision: 1227904

URL: http://svn.apache.org/viewvc?rev=1227904&view=rev
Log:
HCATALOG-196 Remove dependency on pig.jar for hcatalog server (daijy via 
khorgath)

Modified:
    incubator/hcatalog/trunk/CHANGES.txt
    
incubator/hcatalog/trunk/src/java/org/apache/hcatalog/cli/SemanticAnalysis/AlterTableFileFormatHook.java
    
incubator/hcatalog/trunk/src/java/org/apache/hcatalog/cli/SemanticAnalysis/CreateTableHook.java
    
incubator/hcatalog/trunk/src/java/org/apache/hcatalog/common/HCatConstants.java

Modified: incubator/hcatalog/trunk/CHANGES.txt
URL: 
http://svn.apache.org/viewvc/incubator/hcatalog/trunk/CHANGES.txt?rev=1227904&r1=1227903&r2=1227904&view=diff
==============================================================================
--- incubator/hcatalog/trunk/CHANGES.txt (original)
+++ incubator/hcatalog/trunk/CHANGES.txt Fri Jan  6 00:08:08 2012
@@ -91,6 +91,8 @@ Trunk (unreleased changes)
   OPTIMIZATIONS
 
   BUG FIXES
+  HCAT-196. Remove dependency on pig.jar for hcatalog server (daijy via 
khorgath)
+
   HCAT-195. New storage-drivers directory not picked up in src-release target 
(gates via khorgath)
 
   HCAT-171. HBaseBulkOutputStorageDriver should work with secured hadoop 
(toffer via khorgath)

Modified: 
incubator/hcatalog/trunk/src/java/org/apache/hcatalog/cli/SemanticAnalysis/AlterTableFileFormatHook.java
URL: 
http://svn.apache.org/viewvc/incubator/hcatalog/trunk/src/java/org/apache/hcatalog/cli/SemanticAnalysis/AlterTableFileFormatHook.java?rev=1227904&r1=1227903&r2=1227904&view=diff
==============================================================================
--- 
incubator/hcatalog/trunk/src/java/org/apache/hcatalog/cli/SemanticAnalysis/AlterTableFileFormatHook.java
 (original)
+++ 
incubator/hcatalog/trunk/src/java/org/apache/hcatalog/cli/SemanticAnalysis/AlterTableFileFormatHook.java
 Fri Jan  6 00:08:08 2012
@@ -40,7 +40,6 @@ import org.apache.hadoop.hive.ql.plan.DD
 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 @@ public class AlterTableFileFormatHook ex
         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:

Modified: 
incubator/hcatalog/trunk/src/java/org/apache/hcatalog/cli/SemanticAnalysis/CreateTableHook.java
URL: 
http://svn.apache.org/viewvc/incubator/hcatalog/trunk/src/java/org/apache/hcatalog/cli/SemanticAnalysis/CreateTableHook.java?rev=1227904&r1=1227903&r2=1227904&view=diff
==============================================================================
--- 
incubator/hcatalog/trunk/src/java/org/apache/hcatalog/cli/SemanticAnalysis/CreateTableHook.java
 (original)
+++ 
incubator/hcatalog/trunk/src/java/org/apache/hcatalog/cli/SemanticAnalysis/CreateTableHook.java
 Fri Jan  6 00:08:08 2012
@@ -52,7 +52,6 @@ import org.apache.hcatalog.pig.drivers.S
 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 @@ final class CreateTableHook extends Abst
                     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;
 

Modified: 
incubator/hcatalog/trunk/src/java/org/apache/hcatalog/common/HCatConstants.java
URL: 
http://svn.apache.org/viewvc/incubator/hcatalog/trunk/src/java/org/apache/hcatalog/common/HCatConstants.java?rev=1227904&r1=1227903&r2=1227904&view=diff
==============================================================================
--- 
incubator/hcatalog/trunk/src/java/org/apache/hcatalog/common/HCatConstants.java 
(original)
+++ 
incubator/hcatalog/trunk/src/java/org/apache/hcatalog/common/HCatConstants.java 
Fri Jan  6 00:08:08 2012
@@ -30,6 +30,7 @@ public final class HCatConstants {
   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";