svn commit: r1565559 - in /pig/trunk: CHANGES.txt bin/pig bin/pig.cmd bin/pig.py

[da...@apache.org]

Author: daijy
Date: Fri Feb  7 07:22:22 2014
New Revision: 1565559

URL: http://svn.apache.org/r1565559
Log:
PIG-3606: Pig script throws error when searching for hcatalog jars in latest hive

Modified:
    pig/trunk/CHANGES.txt
    pig/trunk/bin/pig
    pig/trunk/bin/pig.cmd
    pig/trunk/bin/pig.py

Modified: pig/trunk/CHANGES.txt
URL: http://svn.apache.org/viewvc/pig/trunk/CHANGES.txt?rev=1565559&r1=1565558&r2=1565559&view=diff
==============================================================================
--- pig/trunk/CHANGES.txt (original)
+++ pig/trunk/CHANGES.txt Fri Feb  7 07:22:22 2014
@@ -87,6 +87,8 @@ OPTIMIZATIONS
  
 BUG FIXES
 
+PIG-3606: Pig script throws error when searching for hcatalog jars in latest hive (deepesh via daijy)
+
 PIG-3623: HBaseStorage: setting loadKey and noWAL to false doesn't have any affect (nezihyigitbasi via rohini)
 
 PIG-3744: SequenceFileLoader does not support BytesWritable (rohini)

Modified: pig/trunk/bin/pig
URL: http://svn.apache.org/viewvc/pig/trunk/bin/pig?rev=1565559&r1=1565558&r2=1565559&view=diff
==============================================================================
--- pig/trunk/bin/pig (original)
+++ pig/trunk/bin/pig Fri Feb  7 07:22:22 2014
@@ -156,10 +156,10 @@ if [ "$includeHCatalog" == "true" ]; the
 
   # hcatalog jar name for 0.4 and earlier
   hcatJarOld=hcatalog-*.jar
-  # hcatalog jar name for 0.5
-  hcatJar=hcatalog-core-*.jar
-  hbaseHCatJar=hbase-storage-handler-*.jar
-  pigHCatJar=hcatalog-pig-adapter-*.jar
+  # hcatalog jar name for 0.5 and newer
+  hcatJar=*hcatalog-core-*.jar
+  hbaseHCatJar=*hbase-storage-handler-*.jar
+  pigHCatJar=*hcatalog-pig-adapter-*.jar
   if [ "$HCAT_HOME" == "" ]; then
     if [ -d "/usr/lib/hcatalog" ]; then
       HCAT_HOME=/usr/lib/hcatalog

Modified: pig/trunk/bin/pig.cmd
URL: http://svn.apache.org/viewvc/pig/trunk/bin/pig.cmd?rev=1565559&r1=1565558&r2=1565559&view=diff
==============================================================================
--- pig/trunk/bin/pig.cmd (original)
+++ pig/trunk/bin/pig.cmd Fri Feb  7 07:22:22 2014
@@ -97,7 +97,7 @@ set PIGARGS=
   )
   
   if defined HCAT_HOME (
-      call :AddJar %HCAT_HOME%\share\hcatalog hcatalog-*.jar
+      call :AddJar %HCAT_HOME%\share\hcatalog *hcatalog-*.jar
   ) else (
       echo "HCAT_HOME should be defined"
       exit /b 1

Modified: pig/trunk/bin/pig.py
URL: http://svn.apache.org/viewvc/pig/trunk/bin/pig.py?rev=1565559&r1=1565558&r2=1565559&view=diff
==============================================================================
--- pig/trunk/bin/pig.py (original)
+++ pig/trunk/bin/pig.py Fri Feb  7 07:22:22 2014
@@ -180,7 +180,7 @@ if includeHCatalog == True:
     else:
       sys.exit("Please initialize HCAT_HOME to the hcatalog install directory")
 
-  hcatJars = glob.glob(os.path.join(hcatHome, "share", "hcatalog", "hcatalog-*.jar"))
+  hcatJars = glob.glob(os.path.join(hcatHome, "share", "hcatalog", "*hcatalog-*.jar"))
   found = False
   for hcatJar in hcatJars:
     if hcatJar.find("server") != -1: