svn commit: r934678 - in /hadoop/hive/trunk: CHANGES.txt ql/build.xml ql/src/java/org/apache/hadoop/hive/ql/io/HiveNullValueSequenceFileOutputFormat.java

[nz...@apache.org]

Author: nzhang
Date: Fri Apr 16 03:51:40 2010
New Revision: 934678

URL: http://svn.apache.org/viewvc?rev=934678&view=rev
Log:
HIVE-1312. Hive trunk does not comipile with hadoop 0.17 any more (John Sichi via Ning Zhang)

Modified:
    hadoop/hive/trunk/CHANGES.txt
    hadoop/hive/trunk/ql/build.xml
    hadoop/hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/io/HiveNullValueSequenceFileOutputFormat.java

Modified: hadoop/hive/trunk/CHANGES.txt
URL: http://svn.apache.org/viewvc/hadoop/hive/trunk/CHANGES.txt?rev=934678&r1=934677&r2=934678&view=diff
==============================================================================
--- hadoop/hive/trunk/CHANGES.txt (original)
+++ hadoop/hive/trunk/CHANGES.txt Fri Apr 16 03:51:40 2010
@@ -372,6 +372,9 @@ Trunk -  Unreleased
     HIVE-1308. Bug in boolean datatypes comparison
     (Paul Yang via namit)
 
+    HIVE-1312. hive trunk does not compile with 0.17 any more
+    (John Sichi via Ning Zhang)
+
 Release 0.5.0 -  Unreleased
 
   INCOMPATIBLE CHANGES

Modified: hadoop/hive/trunk/ql/build.xml
URL: http://svn.apache.org/viewvc/hadoop/hive/trunk/ql/build.xml?rev=934678&r1=934677&r2=934678&view=diff
==============================================================================
--- hadoop/hive/trunk/ql/build.xml (original)
+++ hadoop/hive/trunk/ql/build.xml Fri Apr 16 03:51:40 2010
@@ -48,7 +48,6 @@
     <pathelement location="${common.jar}"/>
     <fileset dir="${hive.root}" includes="testlibs/*.jar"/>
     <fileset dir="${hadoop.root}/lib" includes="*.jar"/>
-    <fileset dir="${hadoop.root}/lib/jsp-2.1" includes="*.jar"/>
     <path refid="classpath"/>
   </path>
 

Modified: hadoop/hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/io/HiveNullValueSequenceFileOutputFormat.java
URL: http://svn.apache.org/viewvc/hadoop/hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/io/HiveNullValueSequenceFileOutputFormat.java?rev=934678&r1=934677&r2=934678&view=diff
==============================================================================
--- hadoop/hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/io/HiveNullValueSequenceFileOutputFormat.java (original)
+++ hadoop/hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/io/HiveNullValueSequenceFileOutputFormat.java Fri Apr 16 03:51:40 2010
@@ -66,7 +66,10 @@ public class HiveNullValueSequenceFileOu
           keyWritable.set(text.getBytes(), 0, text.getLength());
         } else {
           BytesWritable bw = (BytesWritable) r;
-          keyWritable.set(bw.getBytes(), 0, bw.getLength());
+          // Once we drop support for old Hadoop versions, change these
+          // to getBytes() and getLength() to fix the deprecation warnings.
+          // Not worth a shim.
+          keyWritable.set(bw.get(), 0, bw.getSize());
         }
         keyWritable.setHashCode(r.hashCode());
         outStream.append(keyWritable, NULL_WRITABLE);