You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hive.apache.org by zs...@apache.org on 2010/02/09 08:55:50 UTC
svn commit: r907950 [12/15] - in /hadoop/hive/trunk: ./ checkstyle/
cli/src/java/org/apache/hadoop/hive/cli/
common/src/java/org/apache/hadoop/hive/common/
common/src/java/org/apache/hadoop/hive/conf/
contrib/src/java/org/apache/hadoop/hive/contrib/fil...
Modified: hadoop/hive/trunk/serde/src/java/org/apache/hadoop/hive/serde2/dynamic_type/DynamicSerDeFieldType.java
URL: http://svn.apache.org/viewvc/hadoop/hive/trunk/serde/src/java/org/apache/hadoop/hive/serde2/dynamic_type/DynamicSerDeFieldType.java?rev=907950&r1=907949&r2=907950&view=diff
==============================================================================
--- hadoop/hive/trunk/serde/src/java/org/apache/hadoop/hive/serde2/dynamic_type/DynamicSerDeFieldType.java (original)
+++ hadoop/hive/trunk/serde/src/java/org/apache/hadoop/hive/serde2/dynamic_type/DynamicSerDeFieldType.java Tue Feb 9 07:55:30 2010
@@ -18,7 +18,11 @@
package org.apache.hadoop.hive.serde2.dynamic_type;
-// basically just a container for the real type so more like a proxy
+/**
+ * DynamicSerDeFieldType.
+ * Basically just a container for the real type so more like a proxy.
+ *
+ */
public class DynamicSerDeFieldType extends DynamicSerDeSimpleNode {
// production: this.name | BaseType() | MapType() | SetType() | ListType()
Modified: hadoop/hive/trunk/serde/src/java/org/apache/hadoop/hive/serde2/dynamic_type/DynamicSerDeFunction.java
URL: http://svn.apache.org/viewvc/hadoop/hive/trunk/serde/src/java/org/apache/hadoop/hive/serde2/dynamic_type/DynamicSerDeFunction.java?rev=907950&r1=907949&r2=907950&view=diff
==============================================================================
--- hadoop/hive/trunk/serde/src/java/org/apache/hadoop/hive/serde2/dynamic_type/DynamicSerDeFunction.java (original)
+++ hadoop/hive/trunk/serde/src/java/org/apache/hadoop/hive/serde2/dynamic_type/DynamicSerDeFunction.java Tue Feb 9 07:55:30 2010
@@ -20,6 +20,10 @@
import org.apache.thrift.protocol.TMessageType;
+/**
+ * DynamicSerDeFunction.
+ *
+ */
public class DynamicSerDeFunction extends DynamicSerDeStructBase {
// production is: Async() FunctionType() NAME FieldList() Throws()
Modified: hadoop/hive/trunk/serde/src/java/org/apache/hadoop/hive/serde2/dynamic_type/DynamicSerDeSimpleNode.java
URL: http://svn.apache.org/viewvc/hadoop/hive/trunk/serde/src/java/org/apache/hadoop/hive/serde2/dynamic_type/DynamicSerDeSimpleNode.java?rev=907950&r1=907949&r2=907950&view=diff
==============================================================================
--- hadoop/hive/trunk/serde/src/java/org/apache/hadoop/hive/serde2/dynamic_type/DynamicSerDeSimpleNode.java (original)
+++ hadoop/hive/trunk/serde/src/java/org/apache/hadoop/hive/serde2/dynamic_type/DynamicSerDeSimpleNode.java Tue Feb 9 07:55:30 2010
@@ -18,6 +18,10 @@
package org.apache.hadoop.hive.serde2.dynamic_type;
+/**
+ * DynamicSerDeSimpleNode.
+ *
+ */
public class DynamicSerDeSimpleNode extends SimpleNode {
protected static final boolean thrift_mode = true;
Modified: hadoop/hive/trunk/serde/src/java/org/apache/hadoop/hive/serde2/dynamic_type/DynamicSerDeStruct.java
URL: http://svn.apache.org/viewvc/hadoop/hive/trunk/serde/src/java/org/apache/hadoop/hive/serde2/dynamic_type/DynamicSerDeStruct.java?rev=907950&r1=907949&r2=907950&view=diff
==============================================================================
--- hadoop/hive/trunk/serde/src/java/org/apache/hadoop/hive/serde2/dynamic_type/DynamicSerDeStruct.java (original)
+++ hadoop/hive/trunk/serde/src/java/org/apache/hadoop/hive/serde2/dynamic_type/DynamicSerDeStruct.java Tue Feb 9 07:55:30 2010
@@ -20,11 +20,15 @@
import org.apache.thrift.protocol.TType;
+/**
+ * DynamicSerDeStruct.
+ *
+ */
public class DynamicSerDeStruct extends DynamicSerDeStructBase {
// production is: struct this.name { FieldList() }
- final private static int FD_FIELD_LIST = 0;
+ private static final int FD_FIELD_LIST = 0;
public DynamicSerDeStruct(int i) {
super(i);
Modified: hadoop/hive/trunk/serde/src/java/org/apache/hadoop/hive/serde2/dynamic_type/DynamicSerDeStructBase.java
URL: http://svn.apache.org/viewvc/hadoop/hive/trunk/serde/src/java/org/apache/hadoop/hive/serde2/dynamic_type/DynamicSerDeStructBase.java?rev=907950&r1=907949&r2=907950&view=diff
==============================================================================
--- hadoop/hive/trunk/serde/src/java/org/apache/hadoop/hive/serde2/dynamic_type/DynamicSerDeStructBase.java (original)
+++ hadoop/hive/trunk/serde/src/java/org/apache/hadoop/hive/serde2/dynamic_type/DynamicSerDeStructBase.java Tue Feb 9 07:55:30 2010
@@ -27,7 +27,11 @@
import org.apache.thrift.protocol.TProtocol;
import org.apache.thrift.protocol.TStruct;
-abstract public class DynamicSerDeStructBase extends DynamicSerDeTypeBase
+/**
+ * DynamicSerDeStructBase.
+ *
+ */
+public abstract class DynamicSerDeStructBase extends DynamicSerDeTypeBase
implements Serializable {
DynamicSerDeFieldList fieldList;
@@ -40,7 +44,7 @@
super(p, i);
}
- abstract public DynamicSerDeFieldList getFieldList();
+ public abstract DynamicSerDeFieldList getFieldList();
@Override
public void initialize() {
@@ -87,8 +91,7 @@
*/
@Override
public void serialize(Object o, ObjectInspector oi, TProtocol oprot)
- throws TException, SerDeException, NoSuchFieldException,
- IllegalAccessException {
+ throws TException, SerDeException, NoSuchFieldException, IllegalAccessException {
if (thrift_mode) {
oprot.writeStructBegin(new TStruct(name));
}
Modified: hadoop/hive/trunk/serde/src/java/org/apache/hadoop/hive/serde2/dynamic_type/DynamicSerDeTypeBase.java
URL: http://svn.apache.org/viewvc/hadoop/hive/trunk/serde/src/java/org/apache/hadoop/hive/serde2/dynamic_type/DynamicSerDeTypeBase.java?rev=907950&r1=907949&r2=907950&view=diff
==============================================================================
--- hadoop/hive/trunk/serde/src/java/org/apache/hadoop/hive/serde2/dynamic_type/DynamicSerDeTypeBase.java (original)
+++ hadoop/hive/trunk/serde/src/java/org/apache/hadoop/hive/serde2/dynamic_type/DynamicSerDeTypeBase.java Tue Feb 9 07:55:30 2010
@@ -25,6 +25,10 @@
import org.apache.thrift.TException;
import org.apache.thrift.protocol.TProtocol;
+/**
+ * DynamicSerDeTypeBase.
+ *
+ */
public abstract class DynamicSerDeTypeBase extends DynamicSerDeSimpleNode
implements Serializable {
private static final long serialVersionUID = 1L;
@@ -55,8 +59,7 @@
throws SerDeException, TException, IllegalAccessException;
public abstract void serialize(Object o, ObjectInspector oi, TProtocol oprot)
- throws TException, SerDeException, NoSuchFieldException,
- IllegalAccessException;
+ throws TException, SerDeException, NoSuchFieldException, IllegalAccessException;
@Override
public String toString() {
Modified: hadoop/hive/trunk/serde/src/java/org/apache/hadoop/hive/serde2/dynamic_type/DynamicSerDeTypeBool.java
URL: http://svn.apache.org/viewvc/hadoop/hive/trunk/serde/src/java/org/apache/hadoop/hive/serde2/dynamic_type/DynamicSerDeTypeBool.java?rev=907950&r1=907949&r2=907950&view=diff
==============================================================================
--- hadoop/hive/trunk/serde/src/java/org/apache/hadoop/hive/serde2/dynamic_type/DynamicSerDeTypeBool.java (original)
+++ hadoop/hive/trunk/serde/src/java/org/apache/hadoop/hive/serde2/dynamic_type/DynamicSerDeTypeBool.java Tue Feb 9 07:55:30 2010
@@ -25,6 +25,10 @@
import org.apache.thrift.protocol.TProtocol;
import org.apache.thrift.protocol.TType;
+/**
+ * DynamicSerDeTypeBool.
+ *
+ */
public class DynamicSerDeTypeBool extends DynamicSerDeTypeBase {
// production is: bool
@@ -49,7 +53,7 @@
if (val == false
&& iprot instanceof org.apache.hadoop.hive.serde2.thrift.WriteNullsProtocol
&& ((org.apache.hadoop.hive.serde2.thrift.WriteNullsProtocol) iprot)
- .lastPrimitiveWasNull()) {
+ .lastPrimitiveWasNull()) {
return null;
}
return Boolean.valueOf(val);
@@ -57,8 +61,7 @@
@Override
public void serialize(Object o, ObjectInspector oi, TProtocol oprot)
- throws TException, SerDeException, NoSuchFieldException,
- IllegalAccessException {
+ throws TException, SerDeException, NoSuchFieldException, IllegalAccessException {
BooleanObjectInspector poi = (BooleanObjectInspector) oi;
oprot.writeBool(poi.get(o));
}
Modified: hadoop/hive/trunk/serde/src/java/org/apache/hadoop/hive/serde2/dynamic_type/DynamicSerDeTypeByte.java
URL: http://svn.apache.org/viewvc/hadoop/hive/trunk/serde/src/java/org/apache/hadoop/hive/serde2/dynamic_type/DynamicSerDeTypeByte.java?rev=907950&r1=907949&r2=907950&view=diff
==============================================================================
--- hadoop/hive/trunk/serde/src/java/org/apache/hadoop/hive/serde2/dynamic_type/DynamicSerDeTypeByte.java (original)
+++ hadoop/hive/trunk/serde/src/java/org/apache/hadoop/hive/serde2/dynamic_type/DynamicSerDeTypeByte.java Tue Feb 9 07:55:30 2010
@@ -25,6 +25,10 @@
import org.apache.thrift.protocol.TProtocol;
import org.apache.thrift.protocol.TType;
+/**
+ * DynamicSerDeTypeByte.
+ *
+ */
public class DynamicSerDeTypeByte extends DynamicSerDeTypeBase {
// production is: byte
@@ -48,7 +52,7 @@
if (val == 0
&& iprot instanceof org.apache.hadoop.hive.serde2.thrift.WriteNullsProtocol
&& ((org.apache.hadoop.hive.serde2.thrift.WriteNullsProtocol) iprot)
- .lastPrimitiveWasNull()) {
+ .lastPrimitiveWasNull()) {
return null;
}
return Byte.valueOf(val);
@@ -62,8 +66,7 @@
@Override
public void serialize(Object o, ObjectInspector oi, TProtocol oprot)
- throws TException, SerDeException, NoSuchFieldException,
- IllegalAccessException {
+ throws TException, SerDeException, NoSuchFieldException, IllegalAccessException {
ByteObjectInspector poi = (ByteObjectInspector) oi;
oprot.writeByte(poi.get(o));
}
Modified: hadoop/hive/trunk/serde/src/java/org/apache/hadoop/hive/serde2/dynamic_type/DynamicSerDeTypeDouble.java
URL: http://svn.apache.org/viewvc/hadoop/hive/trunk/serde/src/java/org/apache/hadoop/hive/serde2/dynamic_type/DynamicSerDeTypeDouble.java?rev=907950&r1=907949&r2=907950&view=diff
==============================================================================
--- hadoop/hive/trunk/serde/src/java/org/apache/hadoop/hive/serde2/dynamic_type/DynamicSerDeTypeDouble.java (original)
+++ hadoop/hive/trunk/serde/src/java/org/apache/hadoop/hive/serde2/dynamic_type/DynamicSerDeTypeDouble.java Tue Feb 9 07:55:30 2010
@@ -25,6 +25,10 @@
import org.apache.thrift.protocol.TProtocol;
import org.apache.thrift.protocol.TType;
+/**
+ * DynamicSerDeTypeDouble.
+ *
+ */
public class DynamicSerDeTypeDouble extends DynamicSerDeTypeBase {
// production is: double
@@ -49,7 +53,7 @@
if (val == 0
&& iprot instanceof org.apache.hadoop.hive.serde2.thrift.WriteNullsProtocol
&& ((org.apache.hadoop.hive.serde2.thrift.WriteNullsProtocol) iprot)
- .lastPrimitiveWasNull()) {
+ .lastPrimitiveWasNull()) {
return null;
}
return Double.valueOf(val);
@@ -57,8 +61,7 @@
@Override
public void serialize(Object o, ObjectInspector oi, TProtocol oprot)
- throws TException, SerDeException, NoSuchFieldException,
- IllegalAccessException {
+ throws TException, SerDeException, NoSuchFieldException, IllegalAccessException {
DoubleObjectInspector poi = (DoubleObjectInspector) oi;
oprot.writeDouble(poi.get(o));
}
Modified: hadoop/hive/trunk/serde/src/java/org/apache/hadoop/hive/serde2/dynamic_type/DynamicSerDeTypeList.java
URL: http://svn.apache.org/viewvc/hadoop/hive/trunk/serde/src/java/org/apache/hadoop/hive/serde2/dynamic_type/DynamicSerDeTypeList.java?rev=907950&r1=907949&r2=907950&view=diff
==============================================================================
--- hadoop/hive/trunk/serde/src/java/org/apache/hadoop/hive/serde2/dynamic_type/DynamicSerDeTypeList.java (original)
+++ hadoop/hive/trunk/serde/src/java/org/apache/hadoop/hive/serde2/dynamic_type/DynamicSerDeTypeList.java Tue Feb 9 07:55:30 2010
@@ -25,11 +25,16 @@
import org.apache.hadoop.hive.serde2.SerDeException;
import org.apache.hadoop.hive.serde2.objectinspector.ListObjectInspector;
import org.apache.hadoop.hive.serde2.objectinspector.ObjectInspector;
+import org.apache.hadoop.hive.serde2.thrift.WriteNullsProtocol;
import org.apache.thrift.TException;
import org.apache.thrift.protocol.TList;
import org.apache.thrift.protocol.TProtocol;
import org.apache.thrift.protocol.TType;
+/**
+ * DynamicSerDeTypeList.
+ *
+ */
public class DynamicSerDeTypeList extends DynamicSerDeTypeBase {
@Override
@@ -44,7 +49,7 @@
// production is: list<FieldType()>
- static final private int FD_TYPE = 0;
+ private static final int FD_TYPE = 0;
@Override
public Class getRealType() {
@@ -103,15 +108,14 @@
@Override
public void serialize(Object o, ObjectInspector oi, TProtocol oprot)
- throws TException, SerDeException, NoSuchFieldException,
- IllegalAccessException {
+ throws TException, SerDeException, NoSuchFieldException, IllegalAccessException {
ListObjectInspector loi = (ListObjectInspector) oi;
ObjectInspector elementObjectInspector = loi
.getListElementObjectInspector();
DynamicSerDeTypeBase mt = getElementType();
- org.apache.hadoop.hive.serde2.thrift.WriteNullsProtocol nullProtocol = (oprot instanceof org.apache.hadoop.hive.serde2.thrift.WriteNullsProtocol) ? (org.apache.hadoop.hive.serde2.thrift.WriteNullsProtocol) oprot
- : null;
+ WriteNullsProtocol nullProtocol =
+ (oprot instanceof WriteNullsProtocol) ? (WriteNullsProtocol) oprot : null;
if (o instanceof List) {
List<?> list = (List<?>) o;
Modified: hadoop/hive/trunk/serde/src/java/org/apache/hadoop/hive/serde2/dynamic_type/DynamicSerDeTypeMap.java
URL: http://svn.apache.org/viewvc/hadoop/hive/trunk/serde/src/java/org/apache/hadoop/hive/serde2/dynamic_type/DynamicSerDeTypeMap.java?rev=907950&r1=907949&r2=907950&view=diff
==============================================================================
--- hadoop/hive/trunk/serde/src/java/org/apache/hadoop/hive/serde2/dynamic_type/DynamicSerDeTypeMap.java (original)
+++ hadoop/hive/trunk/serde/src/java/org/apache/hadoop/hive/serde2/dynamic_type/DynamicSerDeTypeMap.java Tue Feb 9 07:55:30 2010
@@ -25,11 +25,16 @@
import org.apache.hadoop.hive.serde2.SerDeException;
import org.apache.hadoop.hive.serde2.objectinspector.MapObjectInspector;
import org.apache.hadoop.hive.serde2.objectinspector.ObjectInspector;
+import org.apache.hadoop.hive.serde2.thrift.WriteNullsProtocol;
import org.apache.thrift.TException;
import org.apache.thrift.protocol.TMap;
import org.apache.thrift.protocol.TProtocol;
import org.apache.thrift.protocol.TType;
+/**
+ * DynamicSerDeTypeMap.
+ *
+ */
public class DynamicSerDeTypeMap extends DynamicSerDeTypeBase {
@Override
@@ -117,13 +122,12 @@
@Override
public void serialize(Object o, ObjectInspector oi, TProtocol oprot)
- throws TException, SerDeException, NoSuchFieldException,
- IllegalAccessException {
+ throws TException, SerDeException, NoSuchFieldException, IllegalAccessException {
DynamicSerDeTypeBase keyType = getKeyType();
DynamicSerDeTypeBase valueType = getValueType();
- org.apache.hadoop.hive.serde2.thrift.WriteNullsProtocol nullProtocol = (oprot instanceof org.apache.hadoop.hive.serde2.thrift.WriteNullsProtocol) ? (org.apache.hadoop.hive.serde2.thrift.WriteNullsProtocol) oprot
- : null;
+ WriteNullsProtocol nullProtocol =
+ (oprot instanceof WriteNullsProtocol) ? (WriteNullsProtocol) oprot : null;
assert (oi.getCategory() == ObjectInspector.Category.MAP);
MapObjectInspector moi = (MapObjectInspector) oi;
Modified: hadoop/hive/trunk/serde/src/java/org/apache/hadoop/hive/serde2/dynamic_type/DynamicSerDeTypeSet.java
URL: http://svn.apache.org/viewvc/hadoop/hive/trunk/serde/src/java/org/apache/hadoop/hive/serde2/dynamic_type/DynamicSerDeTypeSet.java?rev=907950&r1=907949&r2=907950&view=diff
==============================================================================
--- hadoop/hive/trunk/serde/src/java/org/apache/hadoop/hive/serde2/dynamic_type/DynamicSerDeTypeSet.java (original)
+++ hadoop/hive/trunk/serde/src/java/org/apache/hadoop/hive/serde2/dynamic_type/DynamicSerDeTypeSet.java Tue Feb 9 07:55:30 2010
@@ -30,11 +30,15 @@
import org.apache.thrift.protocol.TSet;
import org.apache.thrift.protocol.TType;
+/**
+ * DynamicSerDeTypeSet.
+ *
+ */
public class DynamicSerDeTypeSet extends DynamicSerDeTypeBase {
// production is: set<FieldType()>
- static final private int FD_TYPE = 0;
+ private static final int FD_TYPE = 0;
public DynamicSerDeTypeSet(int i) {
super(i);
@@ -107,8 +111,7 @@
@Override
public void serialize(Object o, ObjectInspector oi, TProtocol oprot)
- throws TException, SerDeException, NoSuchFieldException,
- IllegalAccessException {
+ throws TException, SerDeException, NoSuchFieldException, IllegalAccessException {
ListObjectInspector loi = (ListObjectInspector) oi;
Modified: hadoop/hive/trunk/serde/src/java/org/apache/hadoop/hive/serde2/dynamic_type/DynamicSerDeTypeString.java
URL: http://svn.apache.org/viewvc/hadoop/hive/trunk/serde/src/java/org/apache/hadoop/hive/serde2/dynamic_type/DynamicSerDeTypeString.java?rev=907950&r1=907949&r2=907950&view=diff
==============================================================================
--- hadoop/hive/trunk/serde/src/java/org/apache/hadoop/hive/serde2/dynamic_type/DynamicSerDeTypeString.java (original)
+++ hadoop/hive/trunk/serde/src/java/org/apache/hadoop/hive/serde2/dynamic_type/DynamicSerDeTypeString.java Tue Feb 9 07:55:30 2010
@@ -26,6 +26,10 @@
import org.apache.thrift.protocol.TProtocol;
import org.apache.thrift.protocol.TType;
+/**
+ * DynamicSerDeTypeString.
+ *
+ */
public class DynamicSerDeTypeString extends DynamicSerDeTypeBase {
// production is: string
@@ -61,8 +65,7 @@
@Override
public void serialize(Object o, ObjectInspector oi, TProtocol oprot)
- throws TException, SerDeException, NoSuchFieldException,
- IllegalAccessException {
+ throws TException, SerDeException, NoSuchFieldException, IllegalAccessException {
StringObjectInspector poi = (StringObjectInspector) oi;
if (oprot instanceof WriteTextProtocol) {
((WriteTextProtocol) oprot).writeText(poi.getPrimitiveWritableObject(o));
Modified: hadoop/hive/trunk/serde/src/java/org/apache/hadoop/hive/serde2/dynamic_type/DynamicSerDeTypedef.java
URL: http://svn.apache.org/viewvc/hadoop/hive/trunk/serde/src/java/org/apache/hadoop/hive/serde2/dynamic_type/DynamicSerDeTypedef.java?rev=907950&r1=907949&r2=907950&view=diff
==============================================================================
--- hadoop/hive/trunk/serde/src/java/org/apache/hadoop/hive/serde2/dynamic_type/DynamicSerDeTypedef.java (original)
+++ hadoop/hive/trunk/serde/src/java/org/apache/hadoop/hive/serde2/dynamic_type/DynamicSerDeTypedef.java Tue Feb 9 07:55:30 2010
@@ -23,11 +23,15 @@
import org.apache.thrift.TException;
import org.apache.thrift.protocol.TProtocol;
+/**
+ * DynamicSerDeTypedef.
+ *
+ */
public class DynamicSerDeTypedef extends DynamicSerDeTypeBase {
// production is: typedef DefinitionType() this.name
- private final static int FD_DEFINITION_TYPE = 0;
+ private static final int FD_DEFINITION_TYPE = 0;
public DynamicSerDeTypedef(int i) {
super(i);
@@ -68,8 +72,7 @@
@Override
public void serialize(Object o, ObjectInspector oi, TProtocol oprot)
- throws TException, SerDeException, NoSuchFieldException,
- IllegalAccessException {
+ throws TException, SerDeException, NoSuchFieldException, IllegalAccessException {
throw new RuntimeException("not implemented");
}
Modified: hadoop/hive/trunk/serde/src/java/org/apache/hadoop/hive/serde2/dynamic_type/DynamicSerDeTypei16.java
URL: http://svn.apache.org/viewvc/hadoop/hive/trunk/serde/src/java/org/apache/hadoop/hive/serde2/dynamic_type/DynamicSerDeTypei16.java?rev=907950&r1=907949&r2=907950&view=diff
==============================================================================
--- hadoop/hive/trunk/serde/src/java/org/apache/hadoop/hive/serde2/dynamic_type/DynamicSerDeTypei16.java (original)
+++ hadoop/hive/trunk/serde/src/java/org/apache/hadoop/hive/serde2/dynamic_type/DynamicSerDeTypei16.java Tue Feb 9 07:55:30 2010
@@ -25,6 +25,10 @@
import org.apache.thrift.protocol.TProtocol;
import org.apache.thrift.protocol.TType;
+/**
+ * DynamicSerDeTypei16.
+ *
+ */
public class DynamicSerDeTypei16 extends DynamicSerDeTypeBase {
@Override
@@ -54,7 +58,7 @@
if (val == 0
&& iprot instanceof org.apache.hadoop.hive.serde2.thrift.WriteNullsProtocol
&& ((org.apache.hadoop.hive.serde2.thrift.WriteNullsProtocol) iprot)
- .lastPrimitiveWasNull()) {
+ .lastPrimitiveWasNull()) {
return null;
}
return Integer.valueOf(val);
@@ -62,8 +66,7 @@
@Override
public void serialize(Object o, ObjectInspector oi, TProtocol oprot)
- throws TException, SerDeException, NoSuchFieldException,
- IllegalAccessException {
+ throws TException, SerDeException, NoSuchFieldException, IllegalAccessException {
ShortObjectInspector poi = (ShortObjectInspector) oi;
oprot.writeI16(poi.get(o));
}
Modified: hadoop/hive/trunk/serde/src/java/org/apache/hadoop/hive/serde2/dynamic_type/DynamicSerDeTypei32.java
URL: http://svn.apache.org/viewvc/hadoop/hive/trunk/serde/src/java/org/apache/hadoop/hive/serde2/dynamic_type/DynamicSerDeTypei32.java?rev=907950&r1=907949&r2=907950&view=diff
==============================================================================
--- hadoop/hive/trunk/serde/src/java/org/apache/hadoop/hive/serde2/dynamic_type/DynamicSerDeTypei32.java (original)
+++ hadoop/hive/trunk/serde/src/java/org/apache/hadoop/hive/serde2/dynamic_type/DynamicSerDeTypei32.java Tue Feb 9 07:55:30 2010
@@ -25,6 +25,10 @@
import org.apache.thrift.protocol.TProtocol;
import org.apache.thrift.protocol.TType;
+/**
+ * DynamicSerDeTypei32.
+ *
+ */
public class DynamicSerDeTypei32 extends DynamicSerDeTypeBase {
// production is: i32
@@ -49,7 +53,7 @@
if (val == 0
&& iprot instanceof org.apache.hadoop.hive.serde2.thrift.WriteNullsProtocol
&& ((org.apache.hadoop.hive.serde2.thrift.WriteNullsProtocol) iprot)
- .lastPrimitiveWasNull()) {
+ .lastPrimitiveWasNull()) {
return null;
}
return Integer.valueOf(val);
@@ -57,8 +61,7 @@
@Override
public void serialize(Object o, ObjectInspector oi, TProtocol oprot)
- throws TException, SerDeException, NoSuchFieldException,
- IllegalAccessException {
+ throws TException, SerDeException, NoSuchFieldException, IllegalAccessException {
IntObjectInspector poi = (IntObjectInspector) oi;
oprot.writeI32(poi.get(o));
}
Modified: hadoop/hive/trunk/serde/src/java/org/apache/hadoop/hive/serde2/dynamic_type/DynamicSerDeTypei64.java
URL: http://svn.apache.org/viewvc/hadoop/hive/trunk/serde/src/java/org/apache/hadoop/hive/serde2/dynamic_type/DynamicSerDeTypei64.java?rev=907950&r1=907949&r2=907950&view=diff
==============================================================================
--- hadoop/hive/trunk/serde/src/java/org/apache/hadoop/hive/serde2/dynamic_type/DynamicSerDeTypei64.java (original)
+++ hadoop/hive/trunk/serde/src/java/org/apache/hadoop/hive/serde2/dynamic_type/DynamicSerDeTypei64.java Tue Feb 9 07:55:30 2010
@@ -25,6 +25,10 @@
import org.apache.thrift.protocol.TProtocol;
import org.apache.thrift.protocol.TType;
+/**
+ * DynamicSerDeTypei64.
+ *
+ */
public class DynamicSerDeTypei64 extends DynamicSerDeTypeBase {
@Override
@@ -54,7 +58,7 @@
if (val == 0
&& iprot instanceof org.apache.hadoop.hive.serde2.thrift.WriteNullsProtocol
&& ((org.apache.hadoop.hive.serde2.thrift.WriteNullsProtocol) iprot)
- .lastPrimitiveWasNull()) {
+ .lastPrimitiveWasNull()) {
return null;
}
return Long.valueOf(val);
@@ -62,8 +66,7 @@
@Override
public void serialize(Object o, ObjectInspector oi, TProtocol oprot)
- throws TException, SerDeException, NoSuchFieldException,
- IllegalAccessException {
+ throws TException, SerDeException, NoSuchFieldException, IllegalAccessException {
LongObjectInspector poi = (LongObjectInspector) oi;
oprot.writeI64(poi.get(o));
}
Modified: hadoop/hive/trunk/serde/src/java/org/apache/hadoop/hive/serde2/dynamic_type/ParseException.java
URL: http://svn.apache.org/viewvc/hadoop/hive/trunk/serde/src/java/org/apache/hadoop/hive/serde2/dynamic_type/ParseException.java?rev=907950&r1=907949&r2=907950&view=diff
==============================================================================
--- hadoop/hive/trunk/serde/src/java/org/apache/hadoop/hive/serde2/dynamic_type/ParseException.java (original)
+++ hadoop/hive/trunk/serde/src/java/org/apache/hadoop/hive/serde2/dynamic_type/ParseException.java Tue Feb 9 07:55:30 2010
@@ -96,8 +96,8 @@
if (maxSize < expectedTokenSequence.length) {
maxSize = expectedTokenSequence.length;
}
- for (int j = 0; j < expectedTokenSequence.length; j++) {
- expected.append(tokenImage[expectedTokenSequence[j]]).append(" ");
+ for (int element : expectedTokenSequence) {
+ expected.append(tokenImage[element]).append(" ");
}
if (expectedTokenSequence[expectedTokenSequence.length - 1] != 0) {
expected.append("...");
Modified: hadoop/hive/trunk/serde/src/java/org/apache/hadoop/hive/serde2/dynamic_type/TokenMgrError.java
URL: http://svn.apache.org/viewvc/hadoop/hive/trunk/serde/src/java/org/apache/hadoop/hive/serde2/dynamic_type/TokenMgrError.java?rev=907950&r1=907949&r2=907950&view=diff
==============================================================================
--- hadoop/hive/trunk/serde/src/java/org/apache/hadoop/hive/serde2/dynamic_type/TokenMgrError.java (original)
+++ hadoop/hive/trunk/serde/src/java/org/apache/hadoop/hive/serde2/dynamic_type/TokenMgrError.java Tue Feb 9 07:55:30 2010
@@ -97,8 +97,8 @@
+ errorColumn
+ ". Encountered: "
+ (EOFSeen ? "<EOF> "
- : ("\"" + addEscapes(String.valueOf(curChar)) + "\"") + " ("
- + (int) curChar + "), ") + "after : \""
+ : ("\"" + addEscapes(String.valueOf(curChar)) + "\"") + " ("
+ + (int) curChar + "), ") + "after : \""
+ addEscapes(errorAfter) + "\"");
}
Modified: hadoop/hive/trunk/serde/src/java/org/apache/hadoop/hive/serde2/dynamic_type/thrift_grammar.java
URL: http://svn.apache.org/viewvc/hadoop/hive/trunk/serde/src/java/org/apache/hadoop/hive/serde2/dynamic_type/thrift_grammar.java?rev=907950&r1=907949&r2=907950&view=diff
==============================================================================
--- hadoop/hive/trunk/serde/src/java/org/apache/hadoop/hive/serde2/dynamic_type/thrift_grammar.java (original)
+++ hadoop/hive/trunk/serde/src/java/org/apache/hadoop/hive/serde2/dynamic_type/thrift_grammar.java Tue Feb 9 07:55:30 2010
@@ -25,9 +25,9 @@
protected Map<String, DynamicSerDeSimpleNode> tables;
// system include path
- final private static String default_include_path[] = { "/usr/local/include",
+ final private static String default_include_path[] = {"/usr/local/include",
"/usr/include", "/usr/local/include/thrift/if",
- "/usr/local/include/fb303/if" };
+ "/usr/local/include/fb303/if"};
// need three params to differentiate between this and 2 param method auto
// generated since
@@ -2907,25 +2907,25 @@
}
private static void jj_la1_init_0() {
- jj_la1_0 = new int[] { 0x0, 0x100, 0xa3fee00, 0xa3fee00, 0x23fee00, 0x100,
+ jj_la1_0 = new int[] {0x0, 0x100, 0xa3fee00, 0xa3fee00, 0x23fee00, 0x100,
0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0,
0xb0000000, 0x0, 0x0, 0x0, 0x0, 0xa0000000, 0x0, 0x0, 0x0, 0x0,
- 0xa0000000, 0xb0000000, 0xa0000000, };
+ 0xa0000000, 0xb0000000, 0xa0000000,};
}
private static void jj_la1_init_1() {
- jj_la1_1 = new int[] { 0x18000000, 0x18019c20, 0x0, 0x0, 0x0, 0x19c20,
+ jj_la1_1 = new int[] {0x18000000, 0x18019c20, 0x0, 0x0, 0x0, 0x19c20,
0x11c20, 0x18000000, 0x400000, 0x80000000, 0x18000000, 0x2000000,
0x18000000, 0x18000000, 0x22700000, 0x18000000, 0x22700000, 0x18000000,
0x22700000, 0x22700000, 0x4003cf, 0x2000, 0x18000000, 0x200, 0x4000,
0x5e01cf, 0x100000, 0x18000000, 0xe0000, 0x80000000, 0x1cf, 0x4001cf,
- 0x4001cf, };
+ 0x4001cf,};
}
private static void jj_la1_init_2() {
- jj_la1_2 = new int[] { 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0,
+ jj_la1_2 = new int[] {0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0,
0x0, 0x0, 0x0, 0x0, 0x1, 0x0, 0x1, 0x0, 0x1, 0x1, 0x0, 0x0, 0x0, 0x0,
- 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, };
+ 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0,};
}
/** Constructor with InputStream. */
Modified: hadoop/hive/trunk/serde/src/java/org/apache/hadoop/hive/serde2/dynamic_type/thrift_grammarConstants.java
URL: http://svn.apache.org/viewvc/hadoop/hive/trunk/serde/src/java/org/apache/hadoop/hive/serde2/dynamic_type/thrift_grammarConstants.java?rev=907950&r1=907949&r2=907950&view=diff
==============================================================================
--- hadoop/hive/trunk/serde/src/java/org/apache/hadoop/hive/serde2/dynamic_type/thrift_grammarConstants.java (original)
+++ hadoop/hive/trunk/serde/src/java/org/apache/hadoop/hive/serde2/dynamic_type/thrift_grammarConstants.java Tue Feb 9 07:55:30 2010
@@ -116,7 +116,7 @@
int DEFAULT = 0;
/** Literal token values. */
- String[] tokenImage = { "<EOF>", "\" \"", "\"\\t\"", "\"\\n\"", "\"\\r\"",
+ String[] tokenImage = {"<EOF>", "\" \"", "\"\\t\"", "\"\\n\"", "\"\\r\"",
"<token of kind 5>", "<token of kind 6>", "<token of kind 7>",
"\"const\"", "\"namespace\"", "\"cpp_namespace\"", "\"cpp_include\"",
"\"cpp_type\"", "\"java_package\"", "\"cocoa_prefix\"",
@@ -132,6 +132,6 @@
"<tok_double_constant>", "<IDENTIFIER>", "<LETTER>", "<DIGIT>",
"<tok_literal>", "<tok_st_identifier>", "\",\"", "\";\"", "\"{\"",
"\"}\"", "\"=\"", "\"[\"", "\"]\"", "\":\"", "\"(\"", "\")\"", "\"<\"",
- "\">\"", };
+ "\">\"",};
}
Modified: hadoop/hive/trunk/serde/src/java/org/apache/hadoop/hive/serde2/dynamic_type/thrift_grammarTokenManager.java
URL: http://svn.apache.org/viewvc/hadoop/hive/trunk/serde/src/java/org/apache/hadoop/hive/serde2/dynamic_type/thrift_grammarTokenManager.java?rev=907950&r1=907949&r2=907950&view=diff
==============================================================================
--- hadoop/hive/trunk/serde/src/java/org/apache/hadoop/hive/serde2/dynamic_type/thrift_grammarTokenManager.java (original)
+++ hadoop/hive/trunk/serde/src/java/org/apache/hadoop/hive/serde2/dynamic_type/thrift_grammarTokenManager.java Tue Feb 9 07:55:30 2010
@@ -970,8 +970,8 @@
return jjMoveNfa_0(state, pos + 1);
}
- static final long[] jjbitVec0 = { 0x0L, 0x0L, 0xffffffffffffffffL,
- 0xffffffffffffffffL };
+ static final long[] jjbitVec0 = {0x0L, 0x0L, 0xffffffffffffffffL,
+ 0xffffffffffffffffL};
private int jjMoveNfa_0(int startState, int curPos) {
int startsAt = 0;
@@ -1381,8 +1381,8 @@
}
}
- static final int[] jjnextStates = { 5, 29, 30, 17, 22, 1, 2, 4, 18, 19, 21,
- 25, 27, 9, 10, 12, 13, 33, 34, };
+ static final int[] jjnextStates = {5, 29, 30, 17, 22, 1, 2, 4, 18, 19, 21,
+ 25, 27, 9, 10, 12, 13, 33, 34,};
/** Token literal values. */
public static final String[] jjstrLiteralImages = {
@@ -1424,12 +1424,12 @@
"\162\145\161\165\151\162\145\144", "\157\160\164\151\157\156\141\154",
"\163\153\151\160", null, null, null, null, null, null, null, "\54",
"\73", "\173", "\175", "\75", "\133", "\135", "\72", "\50", "\51", "\74",
- "\76", };
+ "\76",};
/** Lexer state names. */
- public static final String[] lexStateNames = { "DEFAULT", };
- static final long[] jjtoToken = { 0xfe7fffffffffff01L, 0x7fL, };
- static final long[] jjtoSkip = { 0xfeL, 0x0L, };
+ public static final String[] lexStateNames = {"DEFAULT",};
+ static final long[] jjtoToken = {0xfe7fffffffffff01L, 0x7fL,};
+ static final long[] jjtoSkip = {0xfeL, 0x0L,};
protected SimpleCharStream input_stream;
private final int[] jjrounds = new int[35];
private final int[] jjstateSet = new int[70];
Modified: hadoop/hive/trunk/serde/src/java/org/apache/hadoop/hive/serde2/dynamic_type/thrift_grammarTreeConstants.java
URL: http://svn.apache.org/viewvc/hadoop/hive/trunk/serde/src/java/org/apache/hadoop/hive/serde2/dynamic_type/thrift_grammarTreeConstants.java?rev=907950&r1=907949&r2=907950&view=diff
==============================================================================
--- hadoop/hive/trunk/serde/src/java/org/apache/hadoop/hive/serde2/dynamic_type/thrift_grammarTreeConstants.java (original)
+++ hadoop/hive/trunk/serde/src/java/org/apache/hadoop/hive/serde2/dynamic_type/thrift_grammarTreeConstants.java Tue Feb 9 07:55:30 2010
@@ -50,7 +50,7 @@
public int JJTTYPESET = 45;
public int JJTTYPELIST = 46;
- public String[] jjtNodeName = { "Start", "HeaderList", "Header", "Namespace",
+ public String[] jjtNodeName = {"Start", "HeaderList", "Header", "Namespace",
"Include", "Definition", "TypeDefinition", "Typedef", "CommaOrSemicolon",
"Enum", "EnumDefList", "EnumDef", "Senum", "SenumDefList", "SenumDef",
"Const", "ConstValue", "ConstList", "ConstListContents", "ConstMap",
@@ -59,7 +59,7 @@
"Field", "FieldRequiredness", "FieldValue", "DefinitionType",
"FunctionType", "FieldType", "TypeString", "TypeByte", "Typei16",
"Typei32", "Typei64", "TypeDouble", "TypeBool", "TypeMap", "TypeSet",
- "TypeList", };
+ "TypeList",};
}
/*
* JavaCC - OriginalChecksum=7edd3e61472739e9fede55c18a336638 (do not edit this
Modified: hadoop/hive/trunk/serde/src/java/org/apache/hadoop/hive/serde2/io/ByteWritable.java
URL: http://svn.apache.org/viewvc/hadoop/hive/trunk/serde/src/java/org/apache/hadoop/hive/serde2/io/ByteWritable.java?rev=907950&r1=907949&r2=907950&view=diff
==============================================================================
--- hadoop/hive/trunk/serde/src/java/org/apache/hadoop/hive/serde2/io/ByteWritable.java (original)
+++ hadoop/hive/trunk/serde/src/java/org/apache/hadoop/hive/serde2/io/ByteWritable.java Tue Feb 9 07:55:30 2010
@@ -24,6 +24,10 @@
import org.apache.hadoop.io.WritableComparable;
import org.apache.hadoop.io.WritableComparator;
+/**
+ * ByteWritable.
+ *
+ */
public class ByteWritable implements WritableComparable {
private byte value;
Modified: hadoop/hive/trunk/serde/src/java/org/apache/hadoop/hive/serde2/io/ShortWritable.java
URL: http://svn.apache.org/viewvc/hadoop/hive/trunk/serde/src/java/org/apache/hadoop/hive/serde2/io/ShortWritable.java?rev=907950&r1=907949&r2=907950&view=diff
==============================================================================
--- hadoop/hive/trunk/serde/src/java/org/apache/hadoop/hive/serde2/io/ShortWritable.java (original)
+++ hadoop/hive/trunk/serde/src/java/org/apache/hadoop/hive/serde2/io/ShortWritable.java Tue Feb 9 07:55:30 2010
@@ -24,6 +24,10 @@
import org.apache.hadoop.io.WritableComparable;
import org.apache.hadoop.io.WritableComparator;
+/**
+ * ShortWritable.
+ *
+ */
public class ShortWritable implements WritableComparable {
private short value;
Modified: hadoop/hive/trunk/serde/src/java/org/apache/hadoop/hive/serde2/lazy/LazyArray.java
URL: http://svn.apache.org/viewvc/hadoop/hive/trunk/serde/src/java/org/apache/hadoop/hive/serde2/lazy/LazyArray.java?rev=907950&r1=907949&r2=907950&view=diff
==============================================================================
--- hadoop/hive/trunk/serde/src/java/org/apache/hadoop/hive/serde2/lazy/LazyArray.java (original)
+++ hadoop/hive/trunk/serde/src/java/org/apache/hadoop/hive/serde2/lazy/LazyArray.java Tue Feb 9 07:55:30 2010
@@ -180,8 +180,8 @@
int elementLength = startPosition[index + 1] - startPosition[index] - 1;
if (elementLength == nullSequence.getLength()
&& 0 == LazyUtils
- .compare(bytes.getData(), startPosition[index], elementLength,
- nullSequence.getBytes(), 0, nullSequence.getLength())) {
+ .compare(bytes.getData(), startPosition[index], elementLength,
+ nullSequence.getBytes(), 0, nullSequence.getLength())) {
return null;
} else {
if (!elementInited[index]) {
@@ -189,7 +189,7 @@
if (arrayElements[index] == null) {
arrayElements[index] = LazyFactory
.createLazyObject(((ListObjectInspector) oi)
- .getListElementObjectInspector());
+ .getListElementObjectInspector());
}
arrayElements[index].init(bytes, startPosition[index], elementLength);
}
Modified: hadoop/hive/trunk/serde/src/java/org/apache/hadoop/hive/serde2/lazy/LazyByte.java
URL: http://svn.apache.org/viewvc/hadoop/hive/trunk/serde/src/java/org/apache/hadoop/hive/serde2/lazy/LazyByte.java?rev=907950&r1=907949&r2=907950&view=diff
==============================================================================
--- hadoop/hive/trunk/serde/src/java/org/apache/hadoop/hive/serde2/lazy/LazyByte.java (original)
+++ hadoop/hive/trunk/serde/src/java/org/apache/hadoop/hive/serde2/lazy/LazyByte.java Tue Feb 9 07:55:30 2010
@@ -69,8 +69,7 @@
* @throws NumberFormatException
* if the argument could not be parsed as a byte quantity.
*/
- public static byte parseByte(byte[] bytes, int start, int length)
- throws NumberFormatException {
+ public static byte parseByte(byte[] bytes, int start, int length) {
return parseByte(bytes, start, length, 10);
}
@@ -90,8 +89,7 @@
* @throws NumberFormatException
* if the argument could not be parsed as a byte quantity.
*/
- public static byte parseByte(byte[] bytes, int start, int length, int radix)
- throws NumberFormatException {
+ public static byte parseByte(byte[] bytes, int start, int length, int radix) {
int intValue = LazyInteger.parseInt(bytes, start, length, radix);
byte result = (byte) intValue;
if (result == intValue) {
Modified: hadoop/hive/trunk/serde/src/java/org/apache/hadoop/hive/serde2/lazy/LazyFactory.java
URL: http://svn.apache.org/viewvc/hadoop/hive/trunk/serde/src/java/org/apache/hadoop/hive/serde2/lazy/LazyFactory.java?rev=907950&r1=907949&r2=907950&view=diff
==============================================================================
--- hadoop/hive/trunk/serde/src/java/org/apache/hadoop/hive/serde2/lazy/LazyFactory.java (original)
+++ hadoop/hive/trunk/serde/src/java/org/apache/hadoop/hive/serde2/lazy/LazyFactory.java Tue Feb 9 07:55:30 2010
@@ -44,7 +44,11 @@
import org.apache.hadoop.hive.serde2.typeinfo.TypeInfo;
import org.apache.hadoop.io.Text;
-public class LazyFactory {
+/**
+ * LazyFactory.
+ *
+ */
+public final class LazyFactory {
/**
* Create a lazy primitive class given the type name.
@@ -53,34 +57,25 @@
PrimitiveObjectInspector oi) {
PrimitiveCategory p = oi.getPrimitiveCategory();
switch (p) {
- case BOOLEAN: {
+ case BOOLEAN:
return new LazyBoolean((LazyBooleanObjectInspector) oi);
- }
- case BYTE: {
+ case BYTE:
return new LazyByte((LazyByteObjectInspector) oi);
- }
- case SHORT: {
+ case SHORT:
return new LazyShort((LazyShortObjectInspector) oi);
- }
- case INT: {
+ case INT:
return new LazyInteger((LazyIntObjectInspector) oi);
- }
- case LONG: {
+ case LONG:
return new LazyLong((LazyLongObjectInspector) oi);
- }
- case FLOAT: {
+ case FLOAT:
return new LazyFloat((LazyFloatObjectInspector) oi);
- }
- case DOUBLE: {
+ case DOUBLE:
return new LazyDouble((LazyDoubleObjectInspector) oi);
- }
- case STRING: {
+ case STRING:
return new LazyString((LazyStringObjectInspector) oi);
- }
- default: {
+ default:
throw new RuntimeException("Internal error: no LazyObject for " + p);
}
- }
}
/**
@@ -130,17 +125,17 @@
case MAP:
return LazyObjectInspectorFactory.getLazySimpleMapObjectInspector(
createLazyObjectInspector(((MapTypeInfo) typeInfo)
- .getMapKeyTypeInfo(), separator, separatorIndex + 2,
- nullSequence, escaped, escapeChar), createLazyObjectInspector(
- ((MapTypeInfo) typeInfo).getMapValueTypeInfo(), separator,
- separatorIndex + 2, nullSequence, escaped, escapeChar),
+ .getMapKeyTypeInfo(), separator, separatorIndex + 2,
+ nullSequence, escaped, escapeChar), createLazyObjectInspector(
+ ((MapTypeInfo) typeInfo).getMapValueTypeInfo(), separator,
+ separatorIndex + 2, nullSequence, escaped, escapeChar),
separator[separatorIndex], separator[separatorIndex + 1],
nullSequence, escaped, escapeChar);
case LIST:
return LazyObjectInspectorFactory.getLazySimpleListObjectInspector(
createLazyObjectInspector(((ListTypeInfo) typeInfo)
- .getListElementTypeInfo(), separator, separatorIndex + 1,
- nullSequence, escaped, escapeChar), separator[separatorIndex],
+ .getListElementTypeInfo(), separator, separatorIndex + 1,
+ nullSequence, escaped, escapeChar), separator[separatorIndex],
nullSequence, escaped, escapeChar);
case STRUCT:
StructTypeInfo structTypeInfo = (StructTypeInfo) typeInfo;
@@ -202,10 +197,13 @@
for (int i = 0; i < columnTypes.size(); i++) {
columnObjectInspectors
.add(LazyFactory.createLazyObjectInspector(columnTypes.get(i),
- separators, 1, nullSequence, escaped, escapeChar));
+ separators, 1, nullSequence, escaped, escapeChar));
}
return ObjectInspectorFactory.getColumnarStructObjectInspector(columnNames,
columnObjectInspectors, nullSequence);
}
+ private LazyFactory() {
+ // prevent instantiation
+ }
}
Modified: hadoop/hive/trunk/serde/src/java/org/apache/hadoop/hive/serde2/lazy/LazyInteger.java
URL: http://svn.apache.org/viewvc/hadoop/hive/trunk/serde/src/java/org/apache/hadoop/hive/serde2/lazy/LazyInteger.java?rev=907950&r1=907949&r2=907950&view=diff
==============================================================================
--- hadoop/hive/trunk/serde/src/java/org/apache/hadoop/hive/serde2/lazy/LazyInteger.java (original)
+++ hadoop/hive/trunk/serde/src/java/org/apache/hadoop/hive/serde2/lazy/LazyInteger.java Tue Feb 9 07:55:30 2010
@@ -72,8 +72,7 @@
* @exception NumberFormatException
* if the argument could not be parsed as an int quantity.
*/
- public static int parseInt(byte[] bytes, int start, int length)
- throws NumberFormatException {
+ public static int parseInt(byte[] bytes, int start, int length) {
return parseInt(bytes, start, length, 10);
}
@@ -93,8 +92,7 @@
* @exception NumberFormatException
* if the argument could not be parsed as an int quantity.
*/
- public static int parseInt(byte[] bytes, int start, int length, int radix)
- throws NumberFormatException {
+ public static int parseInt(byte[] bytes, int start, int length, int radix) {
if (bytes == null) {
throw new NumberFormatException("String is null");
}
@@ -136,7 +134,7 @@
* if the argument could not be parsed as an int quantity.
*/
private static int parse(byte[] bytes, int start, int length, int offset,
- int radix, boolean negative) throws NumberFormatException {
+ int radix, boolean negative) {
int max = Integer.MIN_VALUE / radix;
int result = 0, end = start + length;
while (offset < end) {
Modified: hadoop/hive/trunk/serde/src/java/org/apache/hadoop/hive/serde2/lazy/LazyLong.java
URL: http://svn.apache.org/viewvc/hadoop/hive/trunk/serde/src/java/org/apache/hadoop/hive/serde2/lazy/LazyLong.java?rev=907950&r1=907949&r2=907950&view=diff
==============================================================================
--- hadoop/hive/trunk/serde/src/java/org/apache/hadoop/hive/serde2/lazy/LazyLong.java (original)
+++ hadoop/hive/trunk/serde/src/java/org/apache/hadoop/hive/serde2/lazy/LazyLong.java Tue Feb 9 07:55:30 2010
@@ -72,8 +72,7 @@
* @exception NumberFormatException
* if the argument could not be parsed as a long quantity.
*/
- public static long parseLong(byte[] bytes, int start, int length)
- throws NumberFormatException {
+ public static long parseLong(byte[] bytes, int start, int length) {
return parseLong(bytes, start, length, 10);
}
@@ -93,8 +92,7 @@
* @exception NumberFormatException
* if the argument could not be parsed as an long quantity.
*/
- public static long parseLong(byte[] bytes, int start, int length, int radix)
- throws NumberFormatException {
+ public static long parseLong(byte[] bytes, int start, int length, int radix) {
if (bytes == null) {
throw new NumberFormatException("String is null");
}
Modified: hadoop/hive/trunk/serde/src/java/org/apache/hadoop/hive/serde2/lazy/LazyMap.java
URL: http://svn.apache.org/viewvc/hadoop/hive/trunk/serde/src/java/org/apache/hadoop/hive/serde2/lazy/LazyMap.java?rev=907950&r1=907949&r2=907950&view=diff
==============================================================================
--- hadoop/hive/trunk/serde/src/java/org/apache/hadoop/hive/serde2/lazy/LazyMap.java (original)
+++ hadoop/hive/trunk/serde/src/java/org/apache/hadoop/hive/serde2/lazy/LazyMap.java Tue Feb 9 07:55:30 2010
@@ -72,7 +72,7 @@
*/
LazyObject[] valueObjects;
/**
- * Whether init() is called on valueObjects[i]
+ * Whether init() is called on valueObjects[i].
*/
boolean[] valueInited;
@@ -239,8 +239,8 @@
int valueILength = keyStart[index + 1] - 1 - valueIBegin;
if (valueILength < 0
|| ((valueILength == nullSequence.getLength()) && 0 == LazyUtils
- .compare(bytes.getData(), valueIBegin, valueILength, nullSequence
- .getBytes(), 0, nullSequence.getLength()))) {
+ .compare(bytes.getData(), valueIBegin, valueILength, nullSequence
+ .getBytes(), 0, nullSequence.getLength()))) {
return null;
}
if (!valueInited[index]) {
@@ -248,7 +248,7 @@
if (valueObjects[index] == null) {
valueObjects[index] = LazyFactory
.createLazyObject(((MapObjectInspector) oi)
- .getMapValueObjectInspector());
+ .getMapValueObjectInspector());
}
valueObjects[index].init(bytes, valueIBegin, valueILength);
}
@@ -267,8 +267,8 @@
int keyILength = keyEnd[index] - keyStart[index];
if (keyILength < 0
|| ((keyILength == nullSequence.getLength()) && 0 == LazyUtils.compare(
- bytes.getData(), keyIBegin, keyILength, nullSequence.getBytes(), 0,
- nullSequence.getLength()))) {
+ bytes.getData(), keyIBegin, keyILength, nullSequence.getBytes(), 0,
+ nullSequence.getLength()))) {
return null;
}
if (!keyInited[index]) {
@@ -277,7 +277,7 @@
// Keys are always primitive
keyObjects[index] = LazyFactory
.createLazyPrimitiveClass((PrimitiveObjectInspector) ((MapObjectInspector) oi)
- .getMapKeyObjectInspector());
+ .getMapKeyObjectInspector());
}
keyObjects[index].init(bytes, keyIBegin, keyILength);
}
Modified: hadoop/hive/trunk/serde/src/java/org/apache/hadoop/hive/serde2/lazy/LazyShort.java
URL: http://svn.apache.org/viewvc/hadoop/hive/trunk/serde/src/java/org/apache/hadoop/hive/serde2/lazy/LazyShort.java?rev=907950&r1=907949&r2=907950&view=diff
==============================================================================
--- hadoop/hive/trunk/serde/src/java/org/apache/hadoop/hive/serde2/lazy/LazyShort.java (original)
+++ hadoop/hive/trunk/serde/src/java/org/apache/hadoop/hive/serde2/lazy/LazyShort.java Tue Feb 9 07:55:30 2010
@@ -69,8 +69,7 @@
* @exception NumberFormatException
* if the argument could not be parsed as a short quantity.
*/
- public static short parseShort(byte[] bytes, int start, int length)
- throws NumberFormatException {
+ public static short parseShort(byte[] bytes, int start, int length) {
return parseShort(bytes, start, length, 10);
}
@@ -90,8 +89,7 @@
* @exception NumberFormatException
* if the argument could not be parsed as a short quantity.
*/
- public static short parseShort(byte[] bytes, int start, int length, int radix)
- throws NumberFormatException {
+ public static short parseShort(byte[] bytes, int start, int length, int radix) {
int intValue = LazyInteger.parseInt(bytes, start, length, radix);
short result = (short) intValue;
if (result == intValue) {
Modified: hadoop/hive/trunk/serde/src/java/org/apache/hadoop/hive/serde2/lazy/LazySimpleSerDe.java
URL: http://svn.apache.org/viewvc/hadoop/hive/trunk/serde/src/java/org/apache/hadoop/hive/serde2/lazy/LazySimpleSerDe.java?rev=907950&r1=907949&r2=907950&view=diff
==============================================================================
--- hadoop/hive/trunk/serde/src/java/org/apache/hadoop/hive/serde2/lazy/LazySimpleSerDe.java (original)
+++ hadoop/hive/trunk/serde/src/java/org/apache/hadoop/hive/serde2/lazy/LazySimpleSerDe.java Tue Feb 9 07:55:30 2010
@@ -64,7 +64,7 @@
public static final Log LOG = LogFactory.getLog(LazySimpleSerDe.class
.getName());
- final public static byte[] DefaultSeparators = { (byte) 1, (byte) 2, (byte) 3 };
+ public static final byte[] DefaultSeparators = {(byte) 1, (byte) 2, (byte) 3};
private ObjectInspector cachedObjectInspector;
private boolean useJSONSerialize; // use json to serialize
@@ -78,7 +78,7 @@
+ ((StructTypeInfo) serdeParams.rowTypeInfo).getAllStructFieldNames()
+ ":"
+ ((StructTypeInfo) serdeParams.rowTypeInfo)
- .getAllStructFieldTypeInfos() + "]";
+ .getAllStructFieldTypeInfos() + "]";
}
public LazySimpleSerDe() throws SerDeException {
@@ -104,6 +104,10 @@
return defaultVal;
}
+ /**
+ * SerDeParameters.
+ *
+ */
public static class SerDeParameters {
byte[] separators = DefaultSeparators;
String nullString;
@@ -411,8 +415,8 @@
// delimited way.
if (!foi.getCategory().equals(Category.PRIMITIVE)
&& (declaredFields == null
- || declaredFields.get(i).getFieldObjectInspector()
- .getCategory().equals(Category.PRIMITIVE) || useJSONSerialize)) {
+ || declaredFields.get(i).getFieldObjectInspector()
+ .getCategory().equals(Category.PRIMITIVE) || useJSONSerialize)) {
serialize(serializeStream, SerDeUtils.getJSONString(f, foi),
PrimitiveObjectInspectorFactory.javaStringObjectInspector,
serdeParams.separators, 1, serdeParams.nullSequence,
@@ -469,17 +473,18 @@
return;
}
+ char separator;
+ List<?> list;
switch (objInspector.getCategory()) {
- case PRIMITIVE: {
+ case PRIMITIVE:
LazyUtils.writePrimitiveUTF8(out, obj,
(PrimitiveObjectInspector) objInspector, escaped, escapeChar,
needsEscape);
return;
- }
- case LIST: {
- char separator = (char) separators[level];
+ case LIST:
+ separator = (char) separators[level];
ListObjectInspector loi = (ListObjectInspector) objInspector;
- List<?> list = loi.getList(obj);
+ list = loi.getList(obj);
ObjectInspector eoi = loi.getListElementObjectInspector();
if (list == null) {
out.write(nullSequence.getBytes(), 0, nullSequence.getLength());
@@ -493,14 +498,12 @@
}
}
return;
- }
- case MAP: {
- char separator = (char) separators[level];
+ case MAP:
+ separator = (char) separators[level];
char keyValueSeparator = (char) separators[level + 1];
MapObjectInspector moi = (MapObjectInspector) objInspector;
ObjectInspector koi = moi.getMapKeyObjectInspector();
ObjectInspector voi = moi.getMapValueObjectInspector();
-
Map<?, ?> map = moi.getMap(obj);
if (map == null) {
out.write(nullSequence.getBytes(), 0, nullSequence.getLength());
@@ -520,12 +523,11 @@
}
}
return;
- }
- case STRUCT: {
- char separator = (char) separators[level];
+ case STRUCT:
+ separator = (char) separators[level];
StructObjectInspector soi = (StructObjectInspector) objInspector;
List<? extends StructField> fields = soi.getAllStructFieldRefs();
- List<Object> list = soi.getStructFieldsDataAsList(obj);
+ list = soi.getStructFieldsDataAsList(obj);
if (list == null) {
out.write(nullSequence.getBytes(), 0, nullSequence.getLength());
} else {
@@ -539,7 +541,8 @@
}
}
return;
- }
+ default:
+ break;
}
throw new RuntimeException("Unknown category type: "
Modified: hadoop/hive/trunk/serde/src/java/org/apache/hadoop/hive/serde2/lazy/LazyStruct.java
URL: http://svn.apache.org/viewvc/hadoop/hive/trunk/serde/src/java/org/apache/hadoop/hive/serde2/lazy/LazyStruct.java?rev=907950&r1=907949&r2=907950&view=diff
==============================================================================
--- hadoop/hive/trunk/serde/src/java/org/apache/hadoop/hive/serde2/lazy/LazyStruct.java (original)
+++ hadoop/hive/trunk/serde/src/java/org/apache/hadoop/hive/serde2/lazy/LazyStruct.java Tue Feb 9 07:55:30 2010
@@ -203,8 +203,8 @@
int fieldLength = startPosition[fieldID + 1] - startPosition[fieldID] - 1;
if ((fieldLength < 0)
|| (fieldLength == nullSequence.getLength() && LazyUtils.compare(bytes
- .getData(), fieldByteBegin, fieldLength, nullSequence.getBytes(),
- 0, nullSequence.getLength()) == 0)) {
+ .getData(), fieldByteBegin, fieldLength, nullSequence.getBytes(),
+ 0, nullSequence.getLength()) == 0)) {
return null;
}
if (!fieldInited[fieldID]) {
Modified: hadoop/hive/trunk/serde/src/java/org/apache/hadoop/hive/serde2/lazy/LazyUtils.java
URL: http://svn.apache.org/viewvc/hadoop/hive/trunk/serde/src/java/org/apache/hadoop/hive/serde2/lazy/LazyUtils.java?rev=907950&r1=907949&r2=907950&view=diff
==============================================================================
--- hadoop/hive/trunk/serde/src/java/org/apache/hadoop/hive/serde2/lazy/LazyUtils.java (original)
+++ hadoop/hive/trunk/serde/src/java/org/apache/hadoop/hive/serde2/lazy/LazyUtils.java Tue Feb 9 07:55:30 2010
@@ -33,7 +33,11 @@
import org.apache.hadoop.hive.serde2.objectinspector.primitive.StringObjectInspector;
import org.apache.hadoop.io.Text;
-public class LazyUtils {
+/**
+ * LazyUtils.
+ *
+ */
+public final class LazyUtils {
/**
* Returns the digit represented by character b.
@@ -108,8 +112,8 @@
}
}
- static byte[] trueBytes = { (byte) 't', 'r', 'u', 'e' };
- static byte[] falseBytes = { (byte) 'f', 'a', 'l', 's', 'e' };
+ private static byte[] trueBytes = {(byte) 't', 'r', 'u', 'e'};
+ private static byte[] falseBytes = {(byte) 'f', 'a', 'l', 's', 'e'};
/**
* Write the bytes with special characters escaped.
@@ -218,4 +222,8 @@
return hash;
}
+ private LazyUtils() {
+ // prevent instantiation
+ }
+
}
Modified: hadoop/hive/trunk/serde/src/java/org/apache/hadoop/hive/serde2/lazy/objectinspector/LazyObjectInspectorFactory.java
URL: http://svn.apache.org/viewvc/hadoop/hive/trunk/serde/src/java/org/apache/hadoop/hive/serde2/lazy/objectinspector/LazyObjectInspectorFactory.java?rev=907950&r1=907949&r2=907950&view=diff
==============================================================================
--- hadoop/hive/trunk/serde/src/java/org/apache/hadoop/hive/serde2/lazy/objectinspector/LazyObjectInspectorFactory.java (original)
+++ hadoop/hive/trunk/serde/src/java/org/apache/hadoop/hive/serde2/lazy/objectinspector/LazyObjectInspectorFactory.java Tue Feb 9 07:55:30 2010
@@ -36,9 +36,10 @@
* internal state - so ObjectInspectors with the same construction parameters
* should result in exactly the same ObjectInspector.
*/
-public class LazyObjectInspectorFactory {
+public final class LazyObjectInspectorFactory {
- static HashMap<ArrayList<Object>, LazySimpleStructObjectInspector> cachedLazySimpleStructObjectInspector = new HashMap<ArrayList<Object>, LazySimpleStructObjectInspector>();
+ static HashMap<ArrayList<Object>, LazySimpleStructObjectInspector> cachedLazySimpleStructObjectInspector =
+ new HashMap<ArrayList<Object>, LazySimpleStructObjectInspector>();
public static LazySimpleStructObjectInspector getLazySimpleStructObjectInspector(
List<String> structFieldNames,
@@ -111,4 +112,7 @@
return result;
}
+ private LazyObjectInspectorFactory() {
+ // prevent instantiation
+ }
}
Modified: hadoop/hive/trunk/serde/src/java/org/apache/hadoop/hive/serde2/lazy/objectinspector/primitive/LazyPrimitiveObjectInspectorFactory.java
URL: http://svn.apache.org/viewvc/hadoop/hive/trunk/serde/src/java/org/apache/hadoop/hive/serde2/lazy/objectinspector/primitive/LazyPrimitiveObjectInspectorFactory.java?rev=907950&r1=907949&r2=907950&view=diff
==============================================================================
--- hadoop/hive/trunk/serde/src/java/org/apache/hadoop/hive/serde2/lazy/objectinspector/primitive/LazyPrimitiveObjectInspectorFactory.java (original)
+++ hadoop/hive/trunk/serde/src/java/org/apache/hadoop/hive/serde2/lazy/objectinspector/primitive/LazyPrimitiveObjectInspectorFactory.java Tue Feb 9 07:55:30 2010
@@ -35,18 +35,27 @@
* same construction parameters should result in exactly the same
* ObjectInspector.
*/
-public class LazyPrimitiveObjectInspectorFactory {
+public final class LazyPrimitiveObjectInspectorFactory {
- public final static LazyBooleanObjectInspector lazyBooleanObjectInspector = new LazyBooleanObjectInspector();
- public final static LazyByteObjectInspector lazyByteObjectInspector = new LazyByteObjectInspector();
- public final static LazyShortObjectInspector lazyShortObjectInspector = new LazyShortObjectInspector();
- public final static LazyIntObjectInspector lazyIntObjectInspector = new LazyIntObjectInspector();
- public final static LazyLongObjectInspector lazyLongObjectInspector = new LazyLongObjectInspector();
- public final static LazyFloatObjectInspector lazyFloatObjectInspector = new LazyFloatObjectInspector();
- public final static LazyDoubleObjectInspector lazyDoubleObjectInspector = new LazyDoubleObjectInspector();
- public final static LazyVoidObjectInspector lazyVoidObjectInspector = new LazyVoidObjectInspector();
+ public static final LazyBooleanObjectInspector LAZY_BOOLEAN_OBJECT_INSPECTOR =
+ new LazyBooleanObjectInspector();
+ public static final LazyByteObjectInspector LAZY_BYTE_OBJECT_INSPECTOR =
+ new LazyByteObjectInspector();
+ public static final LazyShortObjectInspector LAZY_SHORT_OBJECT_INSPECTOR =
+ new LazyShortObjectInspector();
+ public static final LazyIntObjectInspector LAZY_INT_OBJECT_INSPECTOR =
+ new LazyIntObjectInspector();
+ public static final LazyLongObjectInspector LAZY_LONG_OBJECT_INSPECTOR =
+ new LazyLongObjectInspector();
+ public static final LazyFloatObjectInspector LAZY_FLOAT_OBJECT_INSPECTOR =
+ new LazyFloatObjectInspector();
+ public static final LazyDoubleObjectInspector LAZY_DOUBLE_OBJECT_INSPECTOR =
+ new LazyDoubleObjectInspector();
+ public static final LazyVoidObjectInspector LAZY_VOID_OBJECT_INSPECTOR =
+ new LazyVoidObjectInspector();
- static HashMap<ArrayList<Object>, LazyStringObjectInspector> cachedLazyStringObjectInspector = new HashMap<ArrayList<Object>, LazyStringObjectInspector>();
+ static HashMap<ArrayList<Object>, LazyStringObjectInspector> cachedLazyStringObjectInspector =
+ new HashMap<ArrayList<Object>, LazyStringObjectInspector>();
public static LazyStringObjectInspector getLazyStringObjectInspector(
boolean escaped, byte escapeChar) {
@@ -67,19 +76,19 @@
switch (primitiveCategory) {
case BOOLEAN:
- return lazyBooleanObjectInspector;
+ return LAZY_BOOLEAN_OBJECT_INSPECTOR;
case BYTE:
- return lazyByteObjectInspector;
+ return LAZY_BYTE_OBJECT_INSPECTOR;
case SHORT:
- return lazyShortObjectInspector;
+ return LAZY_SHORT_OBJECT_INSPECTOR;
case INT:
- return lazyIntObjectInspector;
+ return LAZY_INT_OBJECT_INSPECTOR;
case LONG:
- return lazyLongObjectInspector;
+ return LAZY_LONG_OBJECT_INSPECTOR;
case FLOAT:
- return lazyFloatObjectInspector;
+ return LAZY_FLOAT_OBJECT_INSPECTOR;
case DOUBLE:
- return lazyDoubleObjectInspector;
+ return LAZY_DOUBLE_OBJECT_INSPECTOR;
case STRING:
return getLazyStringObjectInspector(escaped, escapeChar);
case VOID:
@@ -89,4 +98,8 @@
}
}
+ private LazyPrimitiveObjectInspectorFactory() {
+ // prevent instantiation
+ }
+
}
Modified: hadoop/hive/trunk/serde/src/java/org/apache/hadoop/hive/serde2/lazybinary/LazyBinaryArray.java
URL: http://svn.apache.org/viewvc/hadoop/hive/trunk/serde/src/java/org/apache/hadoop/hive/serde2/lazybinary/LazyBinaryArray.java?rev=907950&r1=907949&r2=907950&view=diff
==============================================================================
--- hadoop/hive/trunk/serde/src/java/org/apache/hadoop/hive/serde2/lazybinary/LazyBinaryArray.java (original)
+++ hadoop/hive/trunk/serde/src/java/org/apache/hadoop/hive/serde2/lazybinary/LazyBinaryArray.java Tue Feb 9 07:55:30 2010
@@ -62,7 +62,7 @@
int[] elementLength;
/**
- * Whether an element is initialized or not
+ * Whether an element is initialized or not.
*/
boolean[] elementInited;
Modified: hadoop/hive/trunk/serde/src/java/org/apache/hadoop/hive/serde2/lazybinary/LazyBinaryByte.java
URL: http://svn.apache.org/viewvc/hadoop/hive/trunk/serde/src/java/org/apache/hadoop/hive/serde2/lazybinary/LazyBinaryByte.java?rev=907950&r1=907949&r2=907950&view=diff
==============================================================================
--- hadoop/hive/trunk/serde/src/java/org/apache/hadoop/hive/serde2/lazybinary/LazyBinaryByte.java (original)
+++ hadoop/hive/trunk/serde/src/java/org/apache/hadoop/hive/serde2/lazybinary/LazyBinaryByte.java Tue Feb 9 07:55:30 2010
@@ -22,7 +22,7 @@
import org.apache.hadoop.hive.serde2.objectinspector.primitive.WritableByteObjectInspector;
/**
- * LazyBinaryObject for byte which takes one byte
+ * LazyBinaryObject for byte which takes one byte.
*/
public class LazyBinaryByte extends
LazyBinaryPrimitive<WritableByteObjectInspector, ByteWritable> {
Modified: hadoop/hive/trunk/serde/src/java/org/apache/hadoop/hive/serde2/lazybinary/LazyBinaryDouble.java
URL: http://svn.apache.org/viewvc/hadoop/hive/trunk/serde/src/java/org/apache/hadoop/hive/serde2/lazybinary/LazyBinaryDouble.java?rev=907950&r1=907949&r2=907950&view=diff
==============================================================================
--- hadoop/hive/trunk/serde/src/java/org/apache/hadoop/hive/serde2/lazybinary/LazyBinaryDouble.java (original)
+++ hadoop/hive/trunk/serde/src/java/org/apache/hadoop/hive/serde2/lazybinary/LazyBinaryDouble.java Tue Feb 9 07:55:30 2010
@@ -22,7 +22,7 @@
import org.apache.hadoop.hive.serde2.objectinspector.primitive.WritableDoubleObjectInspector;
/**
- * LazyBinaryObject for double which takes eight bytes
+ * LazyBinaryObject for double which takes eight bytes.
*/
public class LazyBinaryDouble extends
LazyBinaryPrimitive<WritableDoubleObjectInspector, DoubleWritable> {
Modified: hadoop/hive/trunk/serde/src/java/org/apache/hadoop/hive/serde2/lazybinary/LazyBinaryFactory.java
URL: http://svn.apache.org/viewvc/hadoop/hive/trunk/serde/src/java/org/apache/hadoop/hive/serde2/lazybinary/LazyBinaryFactory.java?rev=907950&r1=907949&r2=907950&view=diff
==============================================================================
--- hadoop/hive/trunk/serde/src/java/org/apache/hadoop/hive/serde2/lazybinary/LazyBinaryFactory.java (original)
+++ hadoop/hive/trunk/serde/src/java/org/apache/hadoop/hive/serde2/lazybinary/LazyBinaryFactory.java Tue Feb 9 07:55:30 2010
@@ -32,7 +32,11 @@
import org.apache.hadoop.hive.serde2.objectinspector.primitive.WritableShortObjectInspector;
import org.apache.hadoop.hive.serde2.objectinspector.primitive.WritableStringObjectInspector;
-public class LazyBinaryFactory {
+/**
+ * LazyBinaryFactory.
+ *
+ */
+public final class LazyBinaryFactory {
/**
* Create a lazy binary primitive class given the type name.
@@ -41,34 +45,25 @@
PrimitiveObjectInspector oi) {
PrimitiveCategory p = oi.getPrimitiveCategory();
switch (p) {
- case BOOLEAN: {
+ case BOOLEAN:
return new LazyBinaryBoolean((WritableBooleanObjectInspector) oi);
- }
- case BYTE: {
+ case BYTE:
return new LazyBinaryByte((WritableByteObjectInspector) oi);
- }
- case SHORT: {
+ case SHORT:
return new LazyBinaryShort((WritableShortObjectInspector) oi);
- }
- case INT: {
+ case INT:
return new LazyBinaryInteger((WritableIntObjectInspector) oi);
- }
- case LONG: {
+ case LONG:
return new LazyBinaryLong((WritableLongObjectInspector) oi);
- }
- case FLOAT: {
+ case FLOAT:
return new LazyBinaryFloat((WritableFloatObjectInspector) oi);
- }
- case DOUBLE: {
+ case DOUBLE:
return new LazyBinaryDouble((WritableDoubleObjectInspector) oi);
- }
- case STRING: {
+ case STRING:
return new LazyBinaryString((WritableStringObjectInspector) oi);
- }
- default: {
+ default:
throw new RuntimeException("Internal error: no LazyBinaryObject for " + p);
}
- }
}
/**
@@ -89,4 +84,8 @@
throw new RuntimeException("Hive LazyBinarySerDe Internal error.");
}
+
+ private LazyBinaryFactory() {
+ // prevent instantiation
+ }
}
Modified: hadoop/hive/trunk/serde/src/java/org/apache/hadoop/hive/serde2/lazybinary/LazyBinaryInteger.java
URL: http://svn.apache.org/viewvc/hadoop/hive/trunk/serde/src/java/org/apache/hadoop/hive/serde2/lazybinary/LazyBinaryInteger.java?rev=907950&r1=907949&r2=907950&view=diff
==============================================================================
--- hadoop/hive/trunk/serde/src/java/org/apache/hadoop/hive/serde2/lazybinary/LazyBinaryInteger.java (original)
+++ hadoop/hive/trunk/serde/src/java/org/apache/hadoop/hive/serde2/lazybinary/LazyBinaryInteger.java Tue Feb 9 07:55:30 2010
@@ -23,7 +23,7 @@
import org.apache.hadoop.io.IntWritable;
/**
- * LazyBinaryObject for integer which is serialized as VInt
+ * LazyBinaryObject for integer which is serialized as VInt.
*
* @see LazyBinaryUtils#readVInt(byte[], int, VInt)
*/
@@ -41,7 +41,7 @@
}
/**
- * The reusable vInt for decoding the integer
+ * The reusable vInt for decoding the integer.
*/
VInt vInt = new LazyBinaryUtils.VInt();
Modified: hadoop/hive/trunk/serde/src/java/org/apache/hadoop/hive/serde2/lazybinary/LazyBinaryLong.java
URL: http://svn.apache.org/viewvc/hadoop/hive/trunk/serde/src/java/org/apache/hadoop/hive/serde2/lazybinary/LazyBinaryLong.java?rev=907950&r1=907949&r2=907950&view=diff
==============================================================================
--- hadoop/hive/trunk/serde/src/java/org/apache/hadoop/hive/serde2/lazybinary/LazyBinaryLong.java (original)
+++ hadoop/hive/trunk/serde/src/java/org/apache/hadoop/hive/serde2/lazybinary/LazyBinaryLong.java Tue Feb 9 07:55:30 2010
@@ -41,7 +41,7 @@
}
/**
- * The reusable vLong for decoding the long
+ * The reusable vLong for decoding the long.
*/
VLong vLong = new LazyBinaryUtils.VLong();
Modified: hadoop/hive/trunk/serde/src/java/org/apache/hadoop/hive/serde2/lazybinary/LazyBinaryMap.java
URL: http://svn.apache.org/viewvc/hadoop/hive/trunk/serde/src/java/org/apache/hadoop/hive/serde2/lazybinary/LazyBinaryMap.java?rev=907950&r1=907949&r2=907950&view=diff
==============================================================================
--- hadoop/hive/trunk/serde/src/java/org/apache/hadoop/hive/serde2/lazybinary/LazyBinaryMap.java (original)
+++ hadoop/hive/trunk/serde/src/java/org/apache/hadoop/hive/serde2/lazybinary/LazyBinaryMap.java Tue Feb 9 07:55:30 2010
@@ -110,7 +110,7 @@
/**
* Adjust the size of arrays: keyStart, keyLength valueStart, valueLength
- * keyInited, keyIsNull valueInited, valueIsNull
+ * keyInited, keyIsNull valueInited, valueIsNull.
*/
protected void adjustArraySize(int newSize) {
if (keyStart == null || keyStart.length < newSize) {
@@ -133,7 +133,7 @@
/**
* Parse the byte[] and fill keyStart, keyLength, keyIsNull valueStart,
- * valueLength and valueIsNull
+ * valueLength and valueIsNull.
*/
private void parse() {
@@ -210,7 +210,7 @@
if (valueObjects[index] == null) {
valueObjects[index] = LazyBinaryFactory
.createLazyBinaryObject(((MapObjectInspector) oi)
- .getMapValueObjectInspector());
+ .getMapValueObjectInspector());
}
valueObjects[index].init(bytes, valueStart[index], valueLength[index]);
}
@@ -273,7 +273,7 @@
// Keys are always primitive
keyObjects[index] = LazyBinaryFactory
.createLazyBinaryPrimitiveClass((PrimitiveObjectInspector) ((MapObjectInspector) oi)
- .getMapKeyObjectInspector());
+ .getMapKeyObjectInspector());
}
keyObjects[index].init(bytes, keyStart[index], keyLength[index]);
}
Modified: hadoop/hive/trunk/serde/src/java/org/apache/hadoop/hive/serde2/lazybinary/LazyBinaryNonPrimitive.java
URL: http://svn.apache.org/viewvc/hadoop/hive/trunk/serde/src/java/org/apache/hadoop/hive/serde2/lazybinary/LazyBinaryNonPrimitive.java?rev=907950&r1=907949&r2=907950&view=diff
==============================================================================
--- hadoop/hive/trunk/serde/src/java/org/apache/hadoop/hive/serde2/lazybinary/LazyBinaryNonPrimitive.java (original)
+++ hadoop/hive/trunk/serde/src/java/org/apache/hadoop/hive/serde2/lazybinary/LazyBinaryNonPrimitive.java Tue Feb 9 07:55:30 2010
@@ -21,6 +21,11 @@
import org.apache.hadoop.hive.serde2.lazy.LazyUtils;
import org.apache.hadoop.hive.serde2.objectinspector.ObjectInspector;
+/**
+ * LazyBinaryNonPrimitive.
+ *
+ * @param <OI>
+ */
public abstract class LazyBinaryNonPrimitive<OI extends ObjectInspector>
extends LazyBinaryObject<OI> {
Modified: hadoop/hive/trunk/serde/src/java/org/apache/hadoop/hive/serde2/lazybinary/LazyBinarySerDe.java
URL: http://svn.apache.org/viewvc/hadoop/hive/trunk/serde/src/java/org/apache/hadoop/hive/serde2/lazybinary/LazyBinarySerDe.java?rev=907950&r1=907949&r2=907950&view=diff
==============================================================================
--- hadoop/hive/trunk/serde/src/java/org/apache/hadoop/hive/serde2/lazybinary/LazyBinarySerDe.java (original)
+++ hadoop/hive/trunk/serde/src/java/org/apache/hadoop/hive/serde2/lazybinary/LazyBinarySerDe.java Tue Feb 9 07:55:30 2010
@@ -79,7 +79,7 @@
LazyBinaryStruct cachedLazyBinaryStruct;
/**
- * Initialize the SerDe with configuration and table information
+ * Initialize the SerDe with configuration and table information.
*/
@Override
public void initialize(Configuration conf, Properties tbl)
Modified: hadoop/hive/trunk/serde/src/java/org/apache/hadoop/hive/serde2/lazybinary/LazyBinaryUtils.java
URL: http://svn.apache.org/viewvc/hadoop/hive/trunk/serde/src/java/org/apache/hadoop/hive/serde2/lazybinary/LazyBinaryUtils.java?rev=907950&r1=907949&r2=907950&view=diff
==============================================================================
--- hadoop/hive/trunk/serde/src/java/org/apache/hadoop/hive/serde2/lazybinary/LazyBinaryUtils.java (original)
+++ hadoop/hive/trunk/serde/src/java/org/apache/hadoop/hive/serde2/lazybinary/LazyBinaryUtils.java Tue Feb 9 07:55:30 2010
@@ -35,7 +35,11 @@
import org.apache.hadoop.hive.serde2.typeinfo.TypeInfo;
import org.apache.hadoop.io.WritableUtils;
-public class LazyBinaryUtils {
+/**
+ * LazyBinaryUtils.
+ *
+ */
+public final class LazyBinaryUtils {
/**
* Convert the byte array to an int starting from the given offset. Refer to
@@ -189,7 +193,7 @@
}
/**
- * A zero-compressed encoded long
+ * A zero-compressed encoded long.
*/
public static class VLong {
public VLong() {
@@ -228,7 +232,7 @@
}
/**
- * A zero-compressed encoded integer
+ * A zero-compressed encoded integer.
*/
public static class VInt {
public VInt() {
@@ -331,7 +335,7 @@
case PRIMITIVE: {
result = PrimitiveObjectInspectorFactory
.getPrimitiveWritableObjectInspector(((PrimitiveTypeInfo) typeInfo)
- .getPrimitiveCategory());
+ .getPrimitiveCategory());
break;
}
case LIST: {
@@ -349,7 +353,7 @@
.getMapValueTypeInfo());
result = LazyBinaryObjectInspectorFactory
.getLazyBinaryMapObjectInspector(keyObjectInspector,
- valueObjectInspector);
+ valueObjectInspector);
break;
}
case STRUCT: {
@@ -362,11 +366,11 @@
for (int i = 0; i < fieldTypeInfos.size(); i++) {
fieldObjectInspectors
.add(getLazyBinaryObjectInspectorFromTypeInfo(fieldTypeInfos
- .get(i)));
+ .get(i)));
}
result = LazyBinaryObjectInspectorFactory
.getLazyBinaryStructObjectInspector(fieldNames,
- fieldObjectInspectors);
+ fieldObjectInspectors);
break;
}
default: {
@@ -377,4 +381,8 @@
}
return result;
}
+
+ private LazyBinaryUtils() {
+ // prevent instantiation
+ }
}
Modified: hadoop/hive/trunk/serde/src/java/org/apache/hadoop/hive/serde2/lazybinary/objectinspector/LazyBinaryListObjectInspector.java
URL: http://svn.apache.org/viewvc/hadoop/hive/trunk/serde/src/java/org/apache/hadoop/hive/serde2/lazybinary/objectinspector/LazyBinaryListObjectInspector.java?rev=907950&r1=907949&r2=907950&view=diff
==============================================================================
--- hadoop/hive/trunk/serde/src/java/org/apache/hadoop/hive/serde2/lazybinary/objectinspector/LazyBinaryListObjectInspector.java (original)
+++ hadoop/hive/trunk/serde/src/java/org/apache/hadoop/hive/serde2/lazybinary/objectinspector/LazyBinaryListObjectInspector.java Tue Feb 9 07:55:30 2010
@@ -24,7 +24,7 @@
import org.apache.hadoop.hive.serde2.objectinspector.StandardListObjectInspector;
/**
- * ObjectInspector for LazyBinaryList
+ * ObjectInspector for LazyBinaryList.
*/
public class LazyBinaryListObjectInspector extends StandardListObjectInspector {
Modified: hadoop/hive/trunk/serde/src/java/org/apache/hadoop/hive/serde2/lazybinary/objectinspector/LazyBinaryMapObjectInspector.java
URL: http://svn.apache.org/viewvc/hadoop/hive/trunk/serde/src/java/org/apache/hadoop/hive/serde2/lazybinary/objectinspector/LazyBinaryMapObjectInspector.java?rev=907950&r1=907949&r2=907950&view=diff
==============================================================================
--- hadoop/hive/trunk/serde/src/java/org/apache/hadoop/hive/serde2/lazybinary/objectinspector/LazyBinaryMapObjectInspector.java (original)
+++ hadoop/hive/trunk/serde/src/java/org/apache/hadoop/hive/serde2/lazybinary/objectinspector/LazyBinaryMapObjectInspector.java Tue Feb 9 07:55:30 2010
@@ -24,7 +24,7 @@
import org.apache.hadoop.hive.serde2.objectinspector.StandardMapObjectInspector;
/**
- * ObjectInspector for LazyBinaryMap
+ * ObjectInspector for LazyBinaryMap.
*
* @see LazyBinaryMap
*/
Modified: hadoop/hive/trunk/serde/src/java/org/apache/hadoop/hive/serde2/lazybinary/objectinspector/LazyBinaryObjectInspectorFactory.java
URL: http://svn.apache.org/viewvc/hadoop/hive/trunk/serde/src/java/org/apache/hadoop/hive/serde2/lazybinary/objectinspector/LazyBinaryObjectInspectorFactory.java?rev=907950&r1=907949&r2=907950&view=diff
==============================================================================
--- hadoop/hive/trunk/serde/src/java/org/apache/hadoop/hive/serde2/lazybinary/objectinspector/LazyBinaryObjectInspectorFactory.java (original)
+++ hadoop/hive/trunk/serde/src/java/org/apache/hadoop/hive/serde2/lazybinary/objectinspector/LazyBinaryObjectInspectorFactory.java Tue Feb 9 07:55:30 2010
@@ -18,7 +18,7 @@
* should result in exactly the same ObjectInspector.
*/
-public class LazyBinaryObjectInspectorFactory {
+public final class LazyBinaryObjectInspectorFactory {
static HashMap<ArrayList<Object>, LazyBinaryStructObjectInspector> cachedLazyBinaryStructObjectInspector = new HashMap<ArrayList<Object>, LazyBinaryStructObjectInspector>();
@@ -70,4 +70,8 @@
}
return result;
}
+
+ private LazyBinaryObjectInspectorFactory() {
+ // prevent instantiation
+ }
}
Modified: hadoop/hive/trunk/serde/src/java/org/apache/hadoop/hive/serde2/lazybinary/objectinspector/LazyBinaryStructObjectInspector.java
URL: http://svn.apache.org/viewvc/hadoop/hive/trunk/serde/src/java/org/apache/hadoop/hive/serde2/lazybinary/objectinspector/LazyBinaryStructObjectInspector.java?rev=907950&r1=907949&r2=907950&view=diff
==============================================================================
--- hadoop/hive/trunk/serde/src/java/org/apache/hadoop/hive/serde2/lazybinary/objectinspector/LazyBinaryStructObjectInspector.java (original)
+++ hadoop/hive/trunk/serde/src/java/org/apache/hadoop/hive/serde2/lazybinary/objectinspector/LazyBinaryStructObjectInspector.java Tue Feb 9 07:55:30 2010
@@ -25,7 +25,7 @@
import org.apache.hadoop.hive.serde2.objectinspector.StructField;
/**
- * ObjectInspector for LazyBinaryStruct
+ * ObjectInspector for LazyBinaryStruct.
*
* @see LazyBinaryStruct
*/
Modified: hadoop/hive/trunk/serde/src/java/org/apache/hadoop/hive/serde2/objectinspector/ListObjectInspector.java
URL: http://svn.apache.org/viewvc/hadoop/hive/trunk/serde/src/java/org/apache/hadoop/hive/serde2/objectinspector/ListObjectInspector.java?rev=907950&r1=907949&r2=907950&view=diff
==============================================================================
--- hadoop/hive/trunk/serde/src/java/org/apache/hadoop/hive/serde2/objectinspector/ListObjectInspector.java (original)
+++ hadoop/hive/trunk/serde/src/java/org/apache/hadoop/hive/serde2/objectinspector/ListObjectInspector.java Tue Feb 9 07:55:30 2010
@@ -19,21 +19,25 @@
import java.util.List;
+/**
+ * ListObjectInspector.
+ *
+ */
public interface ListObjectInspector extends ObjectInspector {
// ** Methods that does not need a data object **
- public ObjectInspector getListElementObjectInspector();
+ ObjectInspector getListElementObjectInspector();
// ** Methods that need a data object **
/**
* returns null for null list, out-of-the-range index.
*/
- public Object getListElement(Object data, int index);
+ Object getListElement(Object data, int index);
/**
* returns -1 for data = null.
*/
- public int getListLength(Object data);
+ int getListLength(Object data);
/**
* returns null for data = null.
@@ -44,6 +48,6 @@
*
* However it's OK if the List object is part of the Object data.
*/
- public List<?> getList(Object data);
+ List<?> getList(Object data);
}
Modified: hadoop/hive/trunk/serde/src/java/org/apache/hadoop/hive/serde2/objectinspector/MapObjectInspector.java
URL: http://svn.apache.org/viewvc/hadoop/hive/trunk/serde/src/java/org/apache/hadoop/hive/serde2/objectinspector/MapObjectInspector.java?rev=907950&r1=907949&r2=907950&view=diff
==============================================================================
--- hadoop/hive/trunk/serde/src/java/org/apache/hadoop/hive/serde2/objectinspector/MapObjectInspector.java (original)
+++ hadoop/hive/trunk/serde/src/java/org/apache/hadoop/hive/serde2/objectinspector/MapObjectInspector.java Tue Feb 9 07:55:30 2010
@@ -19,13 +19,17 @@
import java.util.Map;
+/**
+ * MapObjectInspector.
+ *
+ */
public interface MapObjectInspector extends ObjectInspector {
// ** Methods that does not need a data object **
// Map Type
- public ObjectInspector getMapKeyObjectInspector();
+ ObjectInspector getMapKeyObjectInspector();
- public ObjectInspector getMapValueObjectInspector();
+ ObjectInspector getMapValueObjectInspector();
// ** Methods that need a data object **
// In this function, key has to be of the same structure as the Map expects.
@@ -33,7 +37,7 @@
// In rare cases that key is not primitive, the user is responsible for
// defining
// the hashCode() and equals() methods of the key class.
- public Object getMapValueElement(Object data, Object key);
+ Object getMapValueElement(Object data, Object key);
/**
* returns null for data = null.
@@ -44,10 +48,10 @@
*
* However it's OK if the Map object is part of the Object data.
*/
- public Map<?, ?> getMap(Object data);
+ Map<?, ?> getMap(Object data);
/**
* returns -1 for NULL map.
*/
- public int getMapSize(Object data);
+ int getMapSize(Object data);
}
Modified: hadoop/hive/trunk/serde/src/java/org/apache/hadoop/hive/serde2/objectinspector/ObjectInspector.java
URL: http://svn.apache.org/viewvc/hadoop/hive/trunk/serde/src/java/org/apache/hadoop/hive/serde2/objectinspector/ObjectInspector.java?rev=907950&r1=907949&r2=907950&view=diff
==============================================================================
--- hadoop/hive/trunk/serde/src/java/org/apache/hadoop/hive/serde2/objectinspector/ObjectInspector.java (original)
+++ hadoop/hive/trunk/serde/src/java/org/apache/hadoop/hive/serde2/objectinspector/ObjectInspector.java Tue Feb 9 07:55:30 2010
@@ -37,6 +37,10 @@
*/
public interface ObjectInspector {
+ /**
+ * Category.
+ *
+ */
public static enum Category {
PRIMITIVE, LIST, MAP, STRUCT
};
@@ -49,13 +53,13 @@
* type name can be something like "list<int>", "map<int,string>", java class
* names, or user-defined type names similar to typedef.
*/
- public String getTypeName();
+ String getTypeName();
/**
* An ObjectInspector must inherit from one of the following interfaces if
* getCategory() returns: PRIMITIVE: PrimitiveObjectInspector LIST:
- * ListObjectInspector MAP: MapObjectInspector STRUCT: StructObjectInspector
+ * ListObjectInspector MAP: MapObjectInspector STRUCT: StructObjectInspector.
*/
- public Category getCategory();
+ Category getCategory();
}
Modified: hadoop/hive/trunk/serde/src/java/org/apache/hadoop/hive/serde2/objectinspector/ObjectInspectorConverters.java
URL: http://svn.apache.org/viewvc/hadoop/hive/trunk/serde/src/java/org/apache/hadoop/hive/serde2/objectinspector/ObjectInspectorConverters.java?rev=907950&r1=907949&r2=907950&view=diff
==============================================================================
--- hadoop/hive/trunk/serde/src/java/org/apache/hadoop/hive/serde2/objectinspector/ObjectInspectorConverters.java (original)
+++ hadoop/hive/trunk/serde/src/java/org/apache/hadoop/hive/serde2/objectinspector/ObjectInspectorConverters.java Tue Feb 9 07:55:30 2010
@@ -33,15 +33,23 @@
import org.apache.hadoop.hive.serde2.objectinspector.primitive.SettableShortObjectInspector;
import org.apache.hadoop.hive.serde2.objectinspector.primitive.WritableStringObjectInspector;
-public class ObjectInspectorConverters {
+/**
+ * ObjectInspectorConverters.
+ *
+ */
+public final class ObjectInspectorConverters {
/**
* A converter which will convert objects with one ObjectInspector to another.
*/
public static interface Converter {
- public Object convert(Object input);
+ Object convert(Object input);
}
+ /**
+ * IdentityConverter.
+ *
+ */
public static class IdentityConverter implements Converter {
public Object convert(Object input) {
return input;
@@ -104,18 +112,15 @@
+ inputOI.getTypeName() + " to " + outputOI.getTypeName()
+ " not supported yet.");
}
- case STRUCT: {
+ case STRUCT:
return new StructConverter((StructObjectInspector) inputOI,
(SettableStructObjectInspector) outputOI);
- }
- case LIST: {
+ case LIST:
return new ListConverter((ListObjectInspector) inputOI,
(SettableListObjectInspector) outputOI);
- }
- case MAP: {
+ case MAP:
return new MapConverter((MapObjectInspector) inputOI,
(SettableMapObjectInspector) outputOI);
- }
default:
throw new RuntimeException("Hive internal error: conversion of "
+ inputOI.getTypeName() + " to " + outputOI.getTypeName()
@@ -301,4 +306,8 @@
}
+ private ObjectInspectorConverters() {
+ // prevent instantiation
+ }
+
}
Modified: hadoop/hive/trunk/serde/src/java/org/apache/hadoop/hive/serde2/objectinspector/ObjectInspectorFactory.java
URL: http://svn.apache.org/viewvc/hadoop/hive/trunk/serde/src/java/org/apache/hadoop/hive/serde2/objectinspector/ObjectInspectorFactory.java?rev=907950&r1=907949&r2=907950&view=diff
==============================================================================
--- hadoop/hive/trunk/serde/src/java/org/apache/hadoop/hive/serde2/objectinspector/ObjectInspectorFactory.java (original)
+++ hadoop/hive/trunk/serde/src/java/org/apache/hadoop/hive/serde2/objectinspector/ObjectInspectorFactory.java Tue Feb 9 07:55:30 2010
@@ -43,7 +43,7 @@
* same construction parameters should result in exactly the same
* ObjectInspector.
*/
-public class ObjectInspectorFactory {
+public final class ObjectInspectorFactory {
/**
* ObjectInspectorOptions describes what ObjectInspector to use. JAVA is to
@@ -72,7 +72,7 @@
if ((options.equals(ObjectInspectorOptions.JAVA) && oi.getClass().equals(
ThriftStructObjectInspector.class))
|| (options.equals(ObjectInspectorOptions.THRIFT) && oi.getClass()
- .equals(ReflectionStructObjectInspector.class))) {
+ .equals(ReflectionStructObjectInspector.class))) {
throw new RuntimeException(
"Cannot call getObjectInspectorByReflection with both JAVA and THRIFT !");
}
@@ -99,7 +99,7 @@
return getStandardMapObjectInspector(getReflectionObjectInspector(pt
.getActualTypeArguments()[0], options),
getReflectionObjectInspector(pt.getActualTypeArguments()[1],
- options));
+ options));
}
// Otherwise convert t to RawType so we will fall into the following if
// block.
@@ -117,21 +117,21 @@
if (PrimitiveObjectInspectorUtils.isPrimitiveJavaType(c)) {
return PrimitiveObjectInspectorFactory
.getPrimitiveJavaObjectInspector(PrimitiveObjectInspectorUtils
- .getTypeEntryFromPrimitiveJavaType(c).primitiveCategory);
+ .getTypeEntryFromPrimitiveJavaType(c).primitiveCategory);
}
// Java Primitive Class?
if (PrimitiveObjectInspectorUtils.isPrimitiveJavaClass(c)) {
return PrimitiveObjectInspectorFactory
.getPrimitiveJavaObjectInspector(PrimitiveObjectInspectorUtils
- .getTypeEntryFromPrimitiveJavaClass(c).primitiveCategory);
+ .getTypeEntryFromPrimitiveJavaClass(c).primitiveCategory);
}
// Primitive Writable class?
if (PrimitiveObjectInspectorUtils.isPrimitiveWritableClass(c)) {
return PrimitiveObjectInspectorFactory
.getPrimitiveWritableObjectInspector(PrimitiveObjectInspectorUtils
- .getTypeEntryFromPrimitiveWritableClass(c).primitiveCategory);
+ .getTypeEntryFromPrimitiveWritableClass(c).primitiveCategory);
}
// Must be struct because List and Map need to be ParameterizedType
@@ -248,4 +248,8 @@
return result;
}
+ private ObjectInspectorFactory() {
+ // prevent instantiation
+ }
+
}