You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hbase.apache.org by st...@apache.org on 2010/12/07 20:46:58 UTC
svn commit: r1043179 - in /hbase/trunk: CHANGES.txt
src/main/java/org/apache/hadoop/hbase/io/HbaseObjectWritable.java
src/test/java/org/apache/hadoop/hbase/io/TestHbaseObjectWritable.java
Author: stack
Date: Tue Dec 7 19:46:58 2010
New Revision: 1043179
URL: http://svn.apache.org/viewvc?rev=1043179&view=rev
Log:
HBASE-3316 Add support for Java Serialization to HbaseObjectWritable
Modified:
hbase/trunk/CHANGES.txt
hbase/trunk/src/main/java/org/apache/hadoop/hbase/io/HbaseObjectWritable.java
hbase/trunk/src/test/java/org/apache/hadoop/hbase/io/TestHbaseObjectWritable.java
Modified: hbase/trunk/CHANGES.txt
URL: http://svn.apache.org/viewvc/hbase/trunk/CHANGES.txt?rev=1043179&r1=1043178&r2=1043179&view=diff
==============================================================================
--- hbase/trunk/CHANGES.txt (original)
+++ hbase/trunk/CHANGES.txt Tue Dec 7 19:46:58 2010
@@ -23,6 +23,8 @@ Release 0.91.0 - Unreleased
HBASE-3292 Expose block cache hit/miss/evict counts into region server
metrics
HBASE-2936 Differentiate between daemon & restart sleep periods
+ HBASE-3316 Add support for Java Serialization to HbaseObjectWritable
+ (Ed Kohlwey via Stack)
NEW FEATURES
HBASE-3287 Add option to cache blocks on hfile write and evict blocks on
Modified: hbase/trunk/src/main/java/org/apache/hadoop/hbase/io/HbaseObjectWritable.java
URL: http://svn.apache.org/viewvc/hbase/trunk/src/main/java/org/apache/hadoop/hbase/io/HbaseObjectWritable.java?rev=1043179&r1=1043178&r2=1043179&view=diff
==============================================================================
--- hbase/trunk/src/main/java/org/apache/hadoop/hbase/io/HbaseObjectWritable.java (original)
+++ hbase/trunk/src/main/java/org/apache/hadoop/hbase/io/HbaseObjectWritable.java Tue Dec 7 19:46:58 2010
@@ -18,9 +18,15 @@
package org.apache.hadoop.hbase.io;
+import java.io.ByteArrayInputStream;
+import java.io.ByteArrayOutputStream;
import java.io.DataInput;
import java.io.DataOutput;
+import java.io.DataOutputStream;
import java.io.IOException;
+import java.io.ObjectInputStream;
+import java.io.ObjectOutputStream;
+import java.io.Serializable;
import java.lang.reflect.Array;
import java.util.ArrayList;
import java.util.HashMap;
@@ -206,6 +212,9 @@ public class HbaseObjectWritable impleme
addToMap(Increment.class, code++);
addToMap(KeyOnlyFilter.class, code++);
+
+ // serializable
+ addToMap(Serializable.class, code++);
}
@@ -310,6 +319,9 @@ public class HbaseObjectWritable impleme
else if (Writable.class.isAssignableFrom(c)) {
code = CLASS_TO_CODE.get(Writable.class);
}
+ else if (Serializable.class.isAssignableFrom(c)){
+ code = CLASS_TO_CODE.get(Serializable.class);
+ }
}
if (code == null) {
LOG.error("Unsupported type " + c);
@@ -426,6 +438,28 @@ public class HbaseObjectWritable impleme
writeClassCode(out, c);
}
((Writable)instanceObj).write(out);
+ } else if (Serializable.class.isAssignableFrom(declClass)) {
+ Class <?> c = instanceObj.getClass();
+ Byte code = CLASS_TO_CODE.get(c);
+ if (code == null) {
+ out.writeByte(NOT_ENCODED);
+ Text.writeString(out, c.getName());
+ } else {
+ writeClassCode(out, c);
+ }
+ ByteArrayOutputStream bos = null;
+ ObjectOutputStream oos = null;
+ try{
+ bos = new ByteArrayOutputStream();
+ oos = new ObjectOutputStream(bos);
+ oos.writeObject(instanceObj);
+ byte[] value = bos.toByteArray();
+ out.writeInt(value.length);
+ out.write(value);
+ } finally {
+ if(bos!=null) bos.close();
+ if(oos!=null) oos.close();
+ }
} else {
throw new IOException("Can't write: "+instanceObj+" as "+declClass);
}
@@ -505,7 +539,7 @@ public class HbaseObjectWritable impleme
} else if (declaredClass.isEnum()) { // enum
instance = Enum.valueOf((Class<? extends Enum>) declaredClass,
Text.readString(in));
- } else { // Writable
+ } else { // Writable or Serializable
Class instanceClass = null;
Byte b = in.readByte();
if (b.byteValue() == NOT_ENCODED) {
@@ -519,17 +553,36 @@ public class HbaseObjectWritable impleme
} else {
instanceClass = CODE_TO_CLASS.get(b);
}
- Writable writable = WritableFactories.newInstance(instanceClass, conf);
- try {
- writable.readFields(in);
- } catch (Exception e) {
- LOG.error("Error in readFields", e);
- throw new IOException("Error in readFields" , e);
- }
- instance = writable;
- if (instanceClass == NullInstance.class) { // null
- declaredClass = ((NullInstance)instance).declaredClass;
- instance = null;
+ if(Writable.class.isAssignableFrom(instanceClass)){
+ Writable writable = WritableFactories.newInstance(instanceClass, conf);
+ try {
+ writable.readFields(in);
+ } catch (Exception e) {
+ LOG.error("Error in readFields", e);
+ throw new IOException("Error in readFields" , e);
+ }
+ instance = writable;
+ if (instanceClass == NullInstance.class) { // null
+ declaredClass = ((NullInstance)instance).declaredClass;
+ instance = null;
+ }
+ } else {
+ int length = in.readInt();
+ byte[] objectBytes = new byte[length];
+ in.readFully(objectBytes);
+ ByteArrayInputStream bis = null;
+ ObjectInputStream ois = null;
+ try {
+ bis = new ByteArrayInputStream(objectBytes);
+ ois = new ObjectInputStream(bis);
+ instance = ois.readObject();
+ } catch (ClassNotFoundException e) {
+ LOG.error("Error in readFields", e);
+ throw new IOException("Error in readFields", e);
+ } finally {
+ if(bis!=null) bis.close();
+ if(ois!=null) ois.close();
+ }
}
}
if (objectWritable != null) { // store values
Modified: hbase/trunk/src/test/java/org/apache/hadoop/hbase/io/TestHbaseObjectWritable.java
URL: http://svn.apache.org/viewvc/hbase/trunk/src/test/java/org/apache/hadoop/hbase/io/TestHbaseObjectWritable.java?rev=1043179&r1=1043178&r2=1043179&view=diff
==============================================================================
--- hbase/trunk/src/test/java/org/apache/hadoop/hbase/io/TestHbaseObjectWritable.java (original)
+++ hbase/trunk/src/test/java/org/apache/hadoop/hbase/io/TestHbaseObjectWritable.java Tue Dec 7 19:46:58 2010
@@ -63,7 +63,7 @@ public class TestHbaseObjectWritable ext
// Do unsupported type.
boolean exception = false;
try {
- doType(conf, new File("a"), File.class);
+ doType(conf, new Object(), Object.class);
} catch (UnsupportedOperationException uoe) {
exception = true;
}
@@ -121,6 +121,17 @@ public class TestHbaseObjectWritable ext
assertTrue(child instanceof CustomFilter);
assertEquals("mykey", ((CustomFilter)child).getKey());
}
+
+ public void testCustomSerializable() throws Exception {
+ Configuration conf = HBaseConfiguration.create();
+
+ // test proper serialization of un-encoded serialized java objects
+ CustomSerializable custom = new CustomSerializable("test phrase");
+ Object obj = doType(conf, custom, CustomSerializable.class);
+ assertTrue(obj instanceof Serializable);
+ assertTrue(obj instanceof CustomSerializable);
+ assertEquals("test phrase", ((CustomSerializable)obj).getValue());
+ }
private Object doType(final Configuration conf, final Object value,
final Class<?> clazz)
@@ -136,6 +147,27 @@ public class TestHbaseObjectWritable ext
dis.close();
return product;
}
+
+ public static class CustomSerializable implements Serializable {
+ private static final long serialVersionUID = 1048445561865740632L;
+ private String value = null;
+
+ public CustomSerializable() {
+ }
+
+ public CustomSerializable(String value) {
+ this.value = value;
+ }
+
+ public String getValue() {
+ return value;
+ }
+
+ public void setValue(String value) {
+ this.value = value;
+ }
+
+ }
public static class CustomWritable implements Writable {
private String value = null;