You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hive.apache.org by cw...@apache.org on 2011/08/02 02:18:55 UTC
svn commit: r1152980 - in /hive/trunk:
contrib/src/java/org/apache/hadoop/hive/contrib/fileformat/base64/
contrib/src/java/org/apache/hadoop/hive/contrib/serde2/
contrib/src/java/org/apache/hadoop/hive/contrib/serde2/s3/
contrib/src/java/org/apache/had...
Author: cws
Date: Tue Aug 2 00:18:49 2011
New Revision: 1152980
URL: http://svn.apache.org/viewvc?rev=1152980&view=rev
Log:
HIVE-2122. Remove usage of deprecated methods from org.apache.hadoop.io package (Amareshwari Sriramadasu via cws)
Modified:
hive/trunk/contrib/src/java/org/apache/hadoop/hive/contrib/fileformat/base64/Base64TextOutputFormat.java
hive/trunk/contrib/src/java/org/apache/hadoop/hive/contrib/serde2/TypedBytesSerDe.java
hive/trunk/contrib/src/java/org/apache/hadoop/hive/contrib/serde2/s3/S3LogDeserializer.java
hive/trunk/contrib/src/java/org/apache/hadoop/hive/contrib/util/typedbytes/TypedBytesRecordWriter.java
hive/trunk/contrib/src/java/org/apache/hadoop/hive/contrib/util/typedbytes/TypedBytesWritable.java
hive/trunk/contrib/src/java/org/apache/hadoop/hive/contrib/util/typedbytes/TypedBytesWritableOutput.java
hive/trunk/serde/src/java/org/apache/hadoop/hive/serde2/ByteStreamTypedSerDe.java
hive/trunk/serde/src/java/org/apache/hadoop/hive/serde2/MetadataTypedColumnsetSerDe.java
hive/trunk/serde/src/java/org/apache/hadoop/hive/serde2/binarysortable/BinarySortableSerDe.java
hive/trunk/serde/src/java/org/apache/hadoop/hive/serde2/dynamic_type/DynamicSerDe.java
hive/trunk/serde/src/java/org/apache/hadoop/hive/serde2/lazy/LazySimpleSerDe.java
hive/trunk/serde/src/java/org/apache/hadoop/hive/serde2/lazybinary/LazyBinarySerDe.java
Modified: hive/trunk/contrib/src/java/org/apache/hadoop/hive/contrib/fileformat/base64/Base64TextOutputFormat.java
URL: http://svn.apache.org/viewvc/hive/trunk/contrib/src/java/org/apache/hadoop/hive/contrib/fileformat/base64/Base64TextOutputFormat.java?rev=1152980&r1=1152979&r2=1152980&view=diff
==============================================================================
--- hive/trunk/contrib/src/java/org/apache/hadoop/hive/contrib/fileformat/base64/Base64TextOutputFormat.java (original)
+++ hive/trunk/contrib/src/java/org/apache/hadoop/hive/contrib/fileformat/base64/Base64TextOutputFormat.java Tue Aug 2 00:18:49 2011
@@ -36,13 +36,13 @@ import org.apache.hadoop.util.Progressab
/**
* FileOutputFormat for base64 encoded text files.
- *
+ *
* Each line is a base64-encoded record. The key is a LongWritable which is the
* offset. The value is a BytesWritable containing the base64-decoded bytes.
- *
+ *
* This class accepts a configurable parameter:
* "base64.text.output.format.signature"
- *
+ *
* The UTF-8 encoded signature will be prepended to each BytesWritable before we
* do base64 encoding.
*/
@@ -75,8 +75,8 @@ public class Base64TextOutputFormat<K ex
inputLength = ((Text) w).getLength();
} else {
assert (w instanceof BytesWritable);
- input = ((BytesWritable) w).get();
- inputLength = ((BytesWritable) w).getSize();
+ input = ((BytesWritable) w).getBytes();
+ inputLength = ((BytesWritable) w).getLength();
}
// Add signature
Modified: hive/trunk/contrib/src/java/org/apache/hadoop/hive/contrib/serde2/TypedBytesSerDe.java
URL: http://svn.apache.org/viewvc/hive/trunk/contrib/src/java/org/apache/hadoop/hive/contrib/serde2/TypedBytesSerDe.java?rev=1152980&r1=1152979&r2=1152980&view=diff
==============================================================================
--- hive/trunk/contrib/src/java/org/apache/hadoop/hive/contrib/serde2/TypedBytesSerDe.java (original)
+++ hive/trunk/contrib/src/java/org/apache/hadoop/hive/contrib/serde2/TypedBytesSerDe.java Tue Aug 2 00:18:49 2011
@@ -40,11 +40,11 @@ import org.apache.hadoop.hive.serde2.io.
import org.apache.hadoop.hive.serde2.io.DoubleWritable;
import org.apache.hadoop.hive.serde2.io.ShortWritable;
import org.apache.hadoop.hive.serde2.objectinspector.ObjectInspector;
-import org.apache.hadoop.hive.serde2.objectinspector.ObjectInspector.Category;
import org.apache.hadoop.hive.serde2.objectinspector.ObjectInspectorFactory;
import org.apache.hadoop.hive.serde2.objectinspector.PrimitiveObjectInspector;
import org.apache.hadoop.hive.serde2.objectinspector.StructField;
import org.apache.hadoop.hive.serde2.objectinspector.StructObjectInspector;
+import org.apache.hadoop.hive.serde2.objectinspector.ObjectInspector.Category;
import org.apache.hadoop.hive.serde2.objectinspector.primitive.BooleanObjectInspector;
import org.apache.hadoop.hive.serde2.objectinspector.primitive.ByteObjectInspector;
import org.apache.hadoop.hive.serde2.objectinspector.primitive.DoubleObjectInspector;
@@ -165,7 +165,7 @@ public class TypedBytesSerDe implements
public Object deserialize(Writable blob) throws SerDeException {
BytesWritable data = (BytesWritable) blob;
- inBarrStr.reset(data.get(), 0, data.getSize());
+ inBarrStr.reset(data.getBytes(), 0, data.getLength());
try {
Modified: hive/trunk/contrib/src/java/org/apache/hadoop/hive/contrib/serde2/s3/S3LogDeserializer.java
URL: http://svn.apache.org/viewvc/hive/trunk/contrib/src/java/org/apache/hadoop/hive/contrib/serde2/s3/S3LogDeserializer.java?rev=1152980&r1=1152979&r2=1152980&view=diff
==============================================================================
--- hive/trunk/contrib/src/java/org/apache/hadoop/hive/contrib/serde2/s3/S3LogDeserializer.java (original)
+++ hive/trunk/contrib/src/java/org/apache/hadoop/hive/contrib/serde2/s3/S3LogDeserializer.java Tue Aug 2 00:18:49 2011
@@ -137,7 +137,7 @@ public class S3LogDeserializer implement
if (field instanceof BytesWritable) {
BytesWritable b = (BytesWritable) field;
try {
- row = Text.decode(b.get(), 0, b.getSize());
+ row = Text.decode(b.getBytes(), 0, b.getLength());
} catch (CharacterCodingException e) {
throw new SerDeException(e);
}
Modified: hive/trunk/contrib/src/java/org/apache/hadoop/hive/contrib/util/typedbytes/TypedBytesRecordWriter.java
URL: http://svn.apache.org/viewvc/hive/trunk/contrib/src/java/org/apache/hadoop/hive/contrib/util/typedbytes/TypedBytesRecordWriter.java?rev=1152980&r1=1152979&r2=1152980&view=diff
==============================================================================
--- hive/trunk/contrib/src/java/org/apache/hadoop/hive/contrib/util/typedbytes/TypedBytesRecordWriter.java (original)
+++ hive/trunk/contrib/src/java/org/apache/hadoop/hive/contrib/util/typedbytes/TypedBytesRecordWriter.java Tue Aug 2 00:18:49 2011
@@ -41,7 +41,7 @@ public class TypedBytesRecordWriter impl
public void write(Writable row) throws IOException {
BytesWritable brow = (BytesWritable) row;
- out.write(brow.get(), 0, brow.getSize());
+ out.write(brow.getBytes(), 0, brow.getLength());
}
public void close() throws IOException {
Modified: hive/trunk/contrib/src/java/org/apache/hadoop/hive/contrib/util/typedbytes/TypedBytesWritable.java
URL: http://svn.apache.org/viewvc/hive/trunk/contrib/src/java/org/apache/hadoop/hive/contrib/util/typedbytes/TypedBytesWritable.java?rev=1152980&r1=1152979&r2=1152980&view=diff
==============================================================================
--- hive/trunk/contrib/src/java/org/apache/hadoop/hive/contrib/util/typedbytes/TypedBytesWritable.java (original)
+++ hive/trunk/contrib/src/java/org/apache/hadoop/hive/contrib/util/typedbytes/TypedBytesWritable.java Tue Aug 2 00:18:49 2011
@@ -57,7 +57,7 @@ public class TypedBytesWritable extends
/** Get the typed bytes as a Java object. */
public Object getValue() {
try {
- ByteArrayInputStream bais = new ByteArrayInputStream(get());
+ ByteArrayInputStream bais = new ByteArrayInputStream(getBytes());
TypedBytesInput tbi = TypedBytesInput.get(new DataInputStream(bais));
Object obj = tbi.read();
return obj;
@@ -68,7 +68,7 @@ public class TypedBytesWritable extends
/** Get the type code embedded in the first byte. */
public Type getType() {
- byte[] bytes = get();
+ byte[] bytes = getBytes();
if (bytes == null || bytes.length == 0) {
return null;
}
Modified: hive/trunk/contrib/src/java/org/apache/hadoop/hive/contrib/util/typedbytes/TypedBytesWritableOutput.java
URL: http://svn.apache.org/viewvc/hive/trunk/contrib/src/java/org/apache/hadoop/hive/contrib/util/typedbytes/TypedBytesWritableOutput.java?rev=1152980&r1=1152979&r2=1152980&view=diff
==============================================================================
--- hive/trunk/contrib/src/java/org/apache/hadoop/hive/contrib/util/typedbytes/TypedBytesWritableOutput.java (original)
+++ hive/trunk/contrib/src/java/org/apache/hadoop/hive/contrib/util/typedbytes/TypedBytesWritableOutput.java Tue Aug 2 00:18:49 2011
@@ -149,11 +149,11 @@ public class TypedBytesWritableOutput {
}
public void writeTypedBytes(TypedBytesWritable tbw) throws IOException {
- out.writeRaw(tbw.get(), 0, tbw.getSize());
+ out.writeRaw(tbw.getBytes(), 0, tbw.getLength());
}
public void writeBytes(BytesWritable bw) throws IOException {
- byte[] bytes = Arrays.copyOfRange(bw.get(), 0, bw.getSize());
+ byte[] bytes = Arrays.copyOfRange(bw.getBytes(), 0, bw.getLength());
out.writeBytes(bytes);
}
Modified: hive/trunk/serde/src/java/org/apache/hadoop/hive/serde2/ByteStreamTypedSerDe.java
URL: http://svn.apache.org/viewvc/hive/trunk/serde/src/java/org/apache/hadoop/hive/serde2/ByteStreamTypedSerDe.java?rev=1152980&r1=1152979&r2=1152980&view=diff
==============================================================================
--- hive/trunk/serde/src/java/org/apache/hadoop/hive/serde2/ByteStreamTypedSerDe.java (original)
+++ hive/trunk/serde/src/java/org/apache/hadoop/hive/serde2/ByteStreamTypedSerDe.java Tue Aug 2 00:18:49 2011
@@ -42,7 +42,7 @@ public abstract class ByteStreamTypedSer
public Object deserialize(Writable field) throws SerDeException {
Object retObj = super.deserialize(field);
BytesWritable b = (BytesWritable) field;
- bis.reset(b.get(), b.getSize());
+ bis.reset(b.getBytes(), b.getLength());
return (retObj);
}
Modified: hive/trunk/serde/src/java/org/apache/hadoop/hive/serde2/MetadataTypedColumnsetSerDe.java
URL: http://svn.apache.org/viewvc/hive/trunk/serde/src/java/org/apache/hadoop/hive/serde2/MetadataTypedColumnsetSerDe.java?rev=1152980&r1=1152979&r2=1152980&view=diff
==============================================================================
--- hive/trunk/serde/src/java/org/apache/hadoop/hive/serde2/MetadataTypedColumnsetSerDe.java (original)
+++ hive/trunk/serde/src/java/org/apache/hadoop/hive/serde2/MetadataTypedColumnsetSerDe.java Tue Aug 2 00:18:49 2011
@@ -30,10 +30,10 @@ import org.apache.hadoop.conf.Configurat
import org.apache.hadoop.hive.serde.Constants;
import org.apache.hadoop.hive.serde2.objectinspector.MetadataListStructObjectInspector;
import org.apache.hadoop.hive.serde2.objectinspector.ObjectInspector;
-import org.apache.hadoop.hive.serde2.objectinspector.ObjectInspector.Category;
import org.apache.hadoop.hive.serde2.objectinspector.ObjectInspectorFactory;
import org.apache.hadoop.hive.serde2.objectinspector.StructField;
import org.apache.hadoop.hive.serde2.objectinspector.StructObjectInspector;
+import org.apache.hadoop.hive.serde2.objectinspector.ObjectInspector.Category;
import org.apache.hadoop.io.BytesWritable;
import org.apache.hadoop.io.Text;
import org.apache.hadoop.io.Writable;
@@ -172,7 +172,7 @@ public class MetadataTypedColumnsetSerDe
if (field instanceof BytesWritable) {
BytesWritable b = (BytesWritable) field;
try {
- row = Text.decode(b.get(), 0, b.getSize());
+ row = Text.decode(b.getBytes(), 0, b.getLength());
} catch (CharacterCodingException e) {
throw new SerDeException(e);
}
Modified: hive/trunk/serde/src/java/org/apache/hadoop/hive/serde2/binarysortable/BinarySortableSerDe.java
URL: http://svn.apache.org/viewvc/hive/trunk/serde/src/java/org/apache/hadoop/hive/serde2/binarysortable/BinarySortableSerDe.java?rev=1152980&r1=1152979&r2=1152980&view=diff
==============================================================================
--- hive/trunk/serde/src/java/org/apache/hadoop/hive/serde2/binarysortable/BinarySortableSerDe.java (original)
+++ hive/trunk/serde/src/java/org/apache/hadoop/hive/serde2/binarysortable/BinarySortableSerDe.java Tue Aug 2 00:18:49 2011
@@ -40,10 +40,10 @@ import org.apache.hadoop.hive.serde2.obj
import org.apache.hadoop.hive.serde2.objectinspector.MapObjectInspector;
import org.apache.hadoop.hive.serde2.objectinspector.ObjectInspector;
import org.apache.hadoop.hive.serde2.objectinspector.PrimitiveObjectInspector;
-import org.apache.hadoop.hive.serde2.objectinspector.StandardUnionObjectInspector.StandardUnion;
import org.apache.hadoop.hive.serde2.objectinspector.StructField;
import org.apache.hadoop.hive.serde2.objectinspector.StructObjectInspector;
import org.apache.hadoop.hive.serde2.objectinspector.UnionObjectInspector;
+import org.apache.hadoop.hive.serde2.objectinspector.StandardUnionObjectInspector.StandardUnion;
import org.apache.hadoop.hive.serde2.objectinspector.primitive.BooleanObjectInspector;
import org.apache.hadoop.hive.serde2.objectinspector.primitive.ByteObjectInspector;
import org.apache.hadoop.hive.serde2.objectinspector.primitive.DoubleObjectInspector;
@@ -159,7 +159,7 @@ public class BinarySortableSerDe impleme
@Override
public Object deserialize(Writable blob) throws SerDeException {
BytesWritable data = (BytesWritable) blob;
- inputByteBuffer.reset(data.get(), 0, data.getSize());
+ inputByteBuffer.reset(data.getBytes(), 0, data.getLength());
try {
for (int i = 0; i < columnNames.size(); i++) {
Modified: hive/trunk/serde/src/java/org/apache/hadoop/hive/serde2/dynamic_type/DynamicSerDe.java
URL: http://svn.apache.org/viewvc/hive/trunk/serde/src/java/org/apache/hadoop/hive/serde2/dynamic_type/DynamicSerDe.java?rev=1152980&r1=1152979&r2=1152980&view=diff
==============================================================================
--- hive/trunk/serde/src/java/org/apache/hadoop/hive/serde2/dynamic_type/DynamicSerDe.java (original)
+++ hive/trunk/serde/src/java/org/apache/hadoop/hive/serde2/dynamic_type/DynamicSerDe.java Tue Aug 2 00:18:49 2011
@@ -152,7 +152,7 @@ public class DynamicSerDe implements Ser
bis_.reset(b.getBytes(), b.getLength());
} else {
BytesWritable b = (BytesWritable) field;
- bis_.reset(b.get(), b.getSize());
+ bis_.reset(b.getBytes(), b.getLength());
}
deserializeReuse = bt.deserialize(deserializeReuse, iprot_);
return deserializeReuse;
Modified: hive/trunk/serde/src/java/org/apache/hadoop/hive/serde2/lazy/LazySimpleSerDe.java
URL: http://svn.apache.org/viewvc/hive/trunk/serde/src/java/org/apache/hadoop/hive/serde2/lazy/LazySimpleSerDe.java?rev=1152980&r1=1152979&r2=1152980&view=diff
==============================================================================
--- hive/trunk/serde/src/java/org/apache/hadoop/hive/serde2/lazy/LazySimpleSerDe.java (original)
+++ hive/trunk/serde/src/java/org/apache/hadoop/hive/serde2/lazy/LazySimpleSerDe.java Tue Aug 2 00:18:49 2011
@@ -35,11 +35,11 @@ import org.apache.hadoop.hive.serde2.Ser
import org.apache.hadoop.hive.serde2.objectinspector.ListObjectInspector;
import org.apache.hadoop.hive.serde2.objectinspector.MapObjectInspector;
import org.apache.hadoop.hive.serde2.objectinspector.ObjectInspector;
-import org.apache.hadoop.hive.serde2.objectinspector.ObjectInspector.Category;
import org.apache.hadoop.hive.serde2.objectinspector.PrimitiveObjectInspector;
import org.apache.hadoop.hive.serde2.objectinspector.StructField;
import org.apache.hadoop.hive.serde2.objectinspector.StructObjectInspector;
import org.apache.hadoop.hive.serde2.objectinspector.UnionObjectInspector;
+import org.apache.hadoop.hive.serde2.objectinspector.ObjectInspector.Category;
import org.apache.hadoop.hive.serde2.objectinspector.primitive.PrimitiveObjectInspectorFactory;
import org.apache.hadoop.hive.serde2.typeinfo.StructTypeInfo;
import org.apache.hadoop.hive.serde2.typeinfo.TypeInfo;
@@ -278,8 +278,8 @@ public class LazySimpleSerDe implements
if (field instanceof BytesWritable) {
BytesWritable b = (BytesWritable) field;
// For backward-compatibility with hadoop 0.17
- byteArrayRef.setData(b.get());
- cachedLazyStruct.init(byteArrayRef, 0, b.getSize());
+ byteArrayRef.setData(b.getBytes());
+ cachedLazyStruct.init(byteArrayRef, 0, b.getLength());
} else if (field instanceof Text) {
Text t = (Text) field;
byteArrayRef.setData(t.getBytes());
Modified: hive/trunk/serde/src/java/org/apache/hadoop/hive/serde2/lazybinary/LazyBinarySerDe.java
URL: http://svn.apache.org/viewvc/hive/trunk/serde/src/java/org/apache/hadoop/hive/serde2/lazybinary/LazyBinarySerDe.java?rev=1152980&r1=1152979&r2=1152980&view=diff
==============================================================================
--- hive/trunk/serde/src/java/org/apache/hadoop/hive/serde2/lazybinary/LazyBinarySerDe.java (original)
+++ hive/trunk/serde/src/java/org/apache/hadoop/hive/serde2/lazybinary/LazyBinarySerDe.java Tue Aug 2 00:18:49 2011
@@ -29,18 +29,18 @@ import org.apache.commons.logging.LogFac
import org.apache.hadoop.conf.Configuration;
import org.apache.hadoop.hive.serde.Constants;
import org.apache.hadoop.hive.serde2.ByteStream;
-import org.apache.hadoop.hive.serde2.ByteStream.Output;
import org.apache.hadoop.hive.serde2.SerDe;
import org.apache.hadoop.hive.serde2.SerDeException;
import org.apache.hadoop.hive.serde2.SerDeStats;
+import org.apache.hadoop.hive.serde2.ByteStream.Output;
import org.apache.hadoop.hive.serde2.lazy.ByteArrayRef;
import org.apache.hadoop.hive.serde2.objectinspector.ListObjectInspector;
import org.apache.hadoop.hive.serde2.objectinspector.MapObjectInspector;
import org.apache.hadoop.hive.serde2.objectinspector.ObjectInspector;
-import org.apache.hadoop.hive.serde2.objectinspector.ObjectInspector.Category;
import org.apache.hadoop.hive.serde2.objectinspector.PrimitiveObjectInspector;
import org.apache.hadoop.hive.serde2.objectinspector.StructField;
import org.apache.hadoop.hive.serde2.objectinspector.StructObjectInspector;
+import org.apache.hadoop.hive.serde2.objectinspector.ObjectInspector.Category;
import org.apache.hadoop.hive.serde2.objectinspector.primitive.BooleanObjectInspector;
import org.apache.hadoop.hive.serde2.objectinspector.primitive.ByteObjectInspector;
import org.apache.hadoop.hive.serde2.objectinspector.primitive.DoubleObjectInspector;
@@ -152,12 +152,12 @@ public class LazyBinarySerDe implements
}
if (field instanceof BytesWritable) {
BytesWritable b = (BytesWritable) field;
- if (b.getSize() == 0) {
+ if (b.getLength() == 0) {
return null;
}
// For backward-compatibility with hadoop 0.17
- byteArrayRef.setData(b.get());
- cachedLazyBinaryStruct.init(byteArrayRef, 0, b.getSize());
+ byteArrayRef.setData(b.getBytes());
+ cachedLazyBinaryStruct.init(byteArrayRef, 0, b.getLength());
} else if (field instanceof Text) {
Text t = (Text) field;
if (t.getLength() == 0) {