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 2013/01/17 00:04:27 UTC
svn commit: r1434468 [4/4] - in /hive/trunk: data/files/
jdbc/src/java/org/apache/hadoop/hive/jdbc/
jdbc/src/test/org/apache/hadoop/hive/jdbc/
metastore/src/java/org/apache/hadoop/hive/metastore/
ql/src/java/org/apache/hadoop/hive/ql/exec/ ql/src/java/...
Modified: hive/trunk/serde/src/java/org/apache/hadoop/hive/serde2/lazy/LazyFactory.java
URL: http://svn.apache.org/viewvc/hive/trunk/serde/src/java/org/apache/hadoop/hive/serde2/lazy/LazyFactory.java?rev=1434468&r1=1434467&r2=1434468&view=diff
==============================================================================
--- hive/trunk/serde/src/java/org/apache/hadoop/hive/serde2/lazy/LazyFactory.java (original)
+++ hive/trunk/serde/src/java/org/apache/hadoop/hive/serde2/lazy/LazyFactory.java Wed Jan 16 23:04:24 2013
@@ -26,8 +26,9 @@ import org.apache.hadoop.hive.serde2.laz
import org.apache.hadoop.hive.serde2.lazy.objectinspector.LazyObjectInspectorFactory;
import org.apache.hadoop.hive.serde2.lazy.objectinspector.LazySimpleStructObjectInspector;
import org.apache.hadoop.hive.serde2.lazy.objectinspector.LazyUnionObjectInspector;
-import org.apache.hadoop.hive.serde2.lazy.objectinspector.primitive.LazyBooleanObjectInspector;
+import org.apache.hadoop.hive.serde2.lazy.objectinspector.primitive.LazyBigDecimalObjectInspector;
import org.apache.hadoop.hive.serde2.lazy.objectinspector.primitive.LazyBinaryObjectInspector;
+import org.apache.hadoop.hive.serde2.lazy.objectinspector.primitive.LazyBooleanObjectInspector;
import org.apache.hadoop.hive.serde2.lazy.objectinspector.primitive.LazyByteObjectInspector;
import org.apache.hadoop.hive.serde2.lazy.objectinspector.primitive.LazyDoubleObjectInspector;
import org.apache.hadoop.hive.serde2.lazy.objectinspector.primitive.LazyFloatObjectInspector;
@@ -112,6 +113,8 @@ public final class LazyFactory {
return new LazyTimestamp((LazyTimestampObjectInspector) oi);
case BINARY:
return new LazyBinary((LazyBinaryObjectInspector) oi);
+ case DECIMAL:
+ return new LazyBigDecimal((LazyBigDecimalObjectInspector) oi);
default:
throw new RuntimeException("Internal error: no LazyObject for " + p);
}
Modified: hive/trunk/serde/src/java/org/apache/hadoop/hive/serde2/lazy/LazyUtils.java
URL: http://svn.apache.org/viewvc/hive/trunk/serde/src/java/org/apache/hadoop/hive/serde2/lazy/LazyUtils.java?rev=1434468&r1=1434467&r2=1434468&view=diff
==============================================================================
--- hive/trunk/serde/src/java/org/apache/hadoop/hive/serde2/lazy/LazyUtils.java (original)
+++ hive/trunk/serde/src/java/org/apache/hadoop/hive/serde2/lazy/LazyUtils.java Wed Jan 16 23:04:24 2013
@@ -21,6 +21,7 @@ package org.apache.hadoop.hive.serde2.la
import java.io.DataOutputStream;
import java.io.IOException;
import java.io.OutputStream;
+import java.math.BigDecimal;
import java.nio.ByteBuffer;
import java.nio.charset.CharacterCodingException;
import java.util.ArrayList;
@@ -32,6 +33,7 @@ import org.apache.hadoop.hive.serde.serd
import org.apache.hadoop.hive.serde2.SerDeException;
import org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe.SerDeParameters;
import org.apache.hadoop.hive.serde2.objectinspector.PrimitiveObjectInspector;
+import org.apache.hadoop.hive.serde2.objectinspector.primitive.BigDecimalObjectInspector;
import org.apache.hadoop.hive.serde2.objectinspector.primitive.BinaryObjectInspector;
import org.apache.hadoop.hive.serde2.objectinspector.primitive.BooleanObjectInspector;
import org.apache.hadoop.hive.serde2.objectinspector.primitive.ByteObjectInspector;
@@ -235,6 +237,12 @@ public final class LazyUtils {
((TimestampObjectInspector) oi).getPrimitiveWritableObject(o));
break;
}
+ case DECIMAL: {
+ BigDecimal bd = ((BigDecimalObjectInspector) oi).getPrimitiveJavaObject(o);
+ ByteBuffer b = Text.encode(bd.toString());
+ out.write(b.array(), 0, b.limit());
+ break;
+ }
default: {
throw new RuntimeException("Hive internal error.");
}
Added: hive/trunk/serde/src/java/org/apache/hadoop/hive/serde2/lazy/objectinspector/primitive/LazyBigDecimalObjectInspector.java
URL: http://svn.apache.org/viewvc/hive/trunk/serde/src/java/org/apache/hadoop/hive/serde2/lazy/objectinspector/primitive/LazyBigDecimalObjectInspector.java?rev=1434468&view=auto
==============================================================================
--- hive/trunk/serde/src/java/org/apache/hadoop/hive/serde2/lazy/objectinspector/primitive/LazyBigDecimalObjectInspector.java (added)
+++ hive/trunk/serde/src/java/org/apache/hadoop/hive/serde2/lazy/objectinspector/primitive/LazyBigDecimalObjectInspector.java Wed Jan 16 23:04:24 2013
@@ -0,0 +1,45 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.hadoop.hive.serde2.lazy.objectinspector.primitive;
+
+import java.math.BigDecimal;
+
+import org.apache.hadoop.hive.serde2.io.BigDecimalWritable;
+import org.apache.hadoop.hive.serde2.lazy.LazyBigDecimal;
+import org.apache.hadoop.hive.serde2.objectinspector.primitive.BigDecimalObjectInspector;
+import org.apache.hadoop.hive.serde2.objectinspector.primitive.PrimitiveObjectInspectorUtils;
+
+public class LazyBigDecimalObjectInspector
+ extends AbstractPrimitiveLazyObjectInspector<BigDecimalWritable>
+ implements BigDecimalObjectInspector {
+
+ protected LazyBigDecimalObjectInspector() {
+ super(PrimitiveObjectInspectorUtils.decimalTypeEntry);
+ }
+
+ @Override
+ public Object copyObject(Object o) {
+ return o == null ? null : new LazyBigDecimal((LazyBigDecimal) o);
+ }
+
+ @Override
+ public BigDecimal getPrimitiveJavaObject(Object o) {
+ return o == null ? null : ((LazyBigDecimal) o).getWritableObject().getBigDecimal();
+ }
+
+}
Modified: hive/trunk/serde/src/java/org/apache/hadoop/hive/serde2/lazy/objectinspector/primitive/LazyPrimitiveObjectInspectorFactory.java
URL: http://svn.apache.org/viewvc/hive/trunk/serde/src/java/org/apache/hadoop/hive/serde2/lazy/objectinspector/primitive/LazyPrimitiveObjectInspectorFactory.java?rev=1434468&r1=1434467&r2=1434468&view=diff
==============================================================================
--- hive/trunk/serde/src/java/org/apache/hadoop/hive/serde2/lazy/objectinspector/primitive/LazyPrimitiveObjectInspectorFactory.java (original)
+++ hive/trunk/serde/src/java/org/apache/hadoop/hive/serde2/lazy/objectinspector/primitive/LazyPrimitiveObjectInspectorFactory.java Wed Jan 16 23:04:24 2013
@@ -57,6 +57,8 @@ public final class LazyPrimitiveObjectIn
new LazyTimestampObjectInspector();
public static final LazyBinaryObjectInspector LAZY_BINARY_OBJECT_INSPECTOR =
new LazyBinaryObjectInspector();
+ public static final LazyBigDecimalObjectInspector LAZY_BIG_DECIMAL_OBJECT_INSPECTOR =
+ new LazyBigDecimalObjectInspector();
static HashMap<ArrayList<Object>, LazyStringObjectInspector> cachedLazyStringObjectInspector =
new HashMap<ArrayList<Object>, LazyStringObjectInspector>();
@@ -101,6 +103,8 @@ public final class LazyPrimitiveObjectIn
return LAZY_VOID_OBJECT_INSPECTOR;
case TIMESTAMP:
return LAZY_TIMESTAMP_OBJECT_INSPECTOR;
+ case DECIMAL:
+ return LAZY_BIG_DECIMAL_OBJECT_INSPECTOR;
default:
throw new RuntimeException("Internal error: Cannot find ObjectInspector "
+ " for " + primitiveCategory);
Added: hive/trunk/serde/src/java/org/apache/hadoop/hive/serde2/lazybinary/LazyBinaryBigDecimal.java
URL: http://svn.apache.org/viewvc/hive/trunk/serde/src/java/org/apache/hadoop/hive/serde2/lazybinary/LazyBinaryBigDecimal.java?rev=1434468&view=auto
==============================================================================
--- hive/trunk/serde/src/java/org/apache/hadoop/hive/serde2/lazybinary/LazyBinaryBigDecimal.java (added)
+++ hive/trunk/serde/src/java/org/apache/hadoop/hive/serde2/lazybinary/LazyBinaryBigDecimal.java Wed Jan 16 23:04:24 2013
@@ -0,0 +1,42 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.hadoop.hive.serde2.lazybinary;
+
+import org.apache.hadoop.hive.serde2.io.BigDecimalWritable;
+import org.apache.hadoop.hive.serde2.lazy.ByteArrayRef;
+import org.apache.hadoop.hive.serde2.objectinspector.primitive.WritableBigDecimalObjectInspector;
+
+public class LazyBinaryBigDecimal extends
+ LazyBinaryPrimitive<WritableBigDecimalObjectInspector, BigDecimalWritable> {
+
+ LazyBinaryBigDecimal(WritableBigDecimalObjectInspector oi) {
+ super(oi);
+ data = new BigDecimalWritable();
+ }
+
+ LazyBinaryBigDecimal(LazyBinaryBigDecimal copy) {
+ super(copy);
+ data = new BigDecimalWritable(copy.data);
+ }
+
+ @Override
+ public void init(ByteArrayRef bytes, int start, int length) {
+ data.setFromBytes(bytes.getData(), start, length);
+ }
+
+}
Modified: hive/trunk/serde/src/java/org/apache/hadoop/hive/serde2/lazybinary/LazyBinaryFactory.java
URL: http://svn.apache.org/viewvc/hive/trunk/serde/src/java/org/apache/hadoop/hive/serde2/lazybinary/LazyBinaryFactory.java?rev=1434468&r1=1434467&r2=1434468&view=diff
==============================================================================
--- hive/trunk/serde/src/java/org/apache/hadoop/hive/serde2/lazybinary/LazyBinaryFactory.java (original)
+++ hive/trunk/serde/src/java/org/apache/hadoop/hive/serde2/lazybinary/LazyBinaryFactory.java Wed Jan 16 23:04:24 2013
@@ -27,6 +27,7 @@ import org.apache.hadoop.hive.serde2.obj
import org.apache.hadoop.hive.serde2.objectinspector.ObjectInspectorFactory;
import org.apache.hadoop.hive.serde2.objectinspector.PrimitiveObjectInspector;
import org.apache.hadoop.hive.serde2.objectinspector.PrimitiveObjectInspector.PrimitiveCategory;
+import org.apache.hadoop.hive.serde2.objectinspector.primitive.WritableBigDecimalObjectInspector;
import org.apache.hadoop.hive.serde2.objectinspector.primitive.WritableBinaryObjectInspector;
import org.apache.hadoop.hive.serde2.objectinspector.primitive.WritableBooleanObjectInspector;
import org.apache.hadoop.hive.serde2.objectinspector.primitive.WritableByteObjectInspector;
@@ -75,6 +76,8 @@ public final class LazyBinaryFactory {
return new LazyBinaryTimestamp((WritableTimestampObjectInspector) oi);
case BINARY:
return new LazyBinaryBinary((WritableBinaryObjectInspector) oi);
+ case DECIMAL:
+ return new LazyBinaryBigDecimal((WritableBigDecimalObjectInspector) oi);
default:
throw new RuntimeException("Internal error: no LazyBinaryObject for " + p);
}
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=1434468&r1=1434467&r2=1434468&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 Wed Jan 16 23:04:24 2013
@@ -33,6 +33,7 @@ import org.apache.hadoop.hive.serde2.Byt
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.io.BigDecimalWritable;
import org.apache.hadoop.hive.serde2.io.TimestampWritable;
import org.apache.hadoop.hive.serde2.lazy.ByteArrayRef;
import org.apache.hadoop.hive.serde2.objectinspector.ListObjectInspector;
@@ -42,6 +43,7 @@ import org.apache.hadoop.hive.serde2.obj
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.primitive.BigDecimalObjectInspector;
import org.apache.hadoop.hive.serde2.objectinspector.primitive.BinaryObjectInspector;
import org.apache.hadoop.hive.serde2.objectinspector.primitive.BooleanObjectInspector;
import org.apache.hadoop.hive.serde2.objectinspector.primitive.ByteObjectInspector;
@@ -382,6 +384,14 @@ public class LazyBinarySerDe implements
t.writeToByteStream(byteStream);
return warnedOnceNullMapKey;
}
+
+ case DECIMAL: {
+ BigDecimalObjectInspector bdoi = (BigDecimalObjectInspector) poi;
+ BigDecimalWritable t = bdoi.getPrimitiveWritableObject(obj);
+ t.writeToByteStream(byteStream);
+ return warnedOnceNullMapKey;
+ }
+
default: {
throw new RuntimeException("Unrecognized type: "
+ poi.getPrimitiveCategory());
Modified: hive/trunk/serde/src/java/org/apache/hadoop/hive/serde2/lazybinary/LazyBinaryUtils.java
URL: http://svn.apache.org/viewvc/hive/trunk/serde/src/java/org/apache/hadoop/hive/serde2/lazybinary/LazyBinaryUtils.java?rev=1434468&r1=1434467&r2=1434468&view=diff
==============================================================================
--- hive/trunk/serde/src/java/org/apache/hadoop/hive/serde2/lazybinary/LazyBinaryUtils.java (original)
+++ hive/trunk/serde/src/java/org/apache/hadoop/hive/serde2/lazybinary/LazyBinaryUtils.java Wed Jan 16 23:04:24 2013
@@ -203,6 +203,14 @@ public final class LazyBinaryUtils {
recordInfo.elementSize += (byte) WritableUtils.decodeVIntSize(bytes[offset+4]);
}
break;
+ case DECIMAL:
+ // using vint instead of 4 bytes
+ LazyBinaryUtils.readVInt(bytes, offset, vInt);
+ recordInfo.elementOffset = 0;
+ recordInfo.elementSize = vInt.length;
+ LazyBinaryUtils.readVInt(bytes, offset + vInt.length, vInt);
+ recordInfo.elementSize += vInt.length + vInt.value;
+ break;
default: {
throw new RuntimeException("Unrecognized primitive type: "
+ primitiveCategory);
Modified: hive/trunk/serde/src/java/org/apache/hadoop/hive/serde2/objectinspector/ObjectInspectorConverters.java
URL: http://svn.apache.org/viewvc/hive/trunk/serde/src/java/org/apache/hadoop/hive/serde2/objectinspector/ObjectInspectorConverters.java?rev=1434468&r1=1434467&r2=1434468&view=diff
==============================================================================
--- hive/trunk/serde/src/java/org/apache/hadoop/hive/serde2/objectinspector/ObjectInspectorConverters.java (original)
+++ hive/trunk/serde/src/java/org/apache/hadoop/hive/serde2/objectinspector/ObjectInspectorConverters.java Wed Jan 16 23:04:24 2013
@@ -25,6 +25,7 @@ import java.util.Map;
import org.apache.hadoop.hive.serde2.objectinspector.primitive.JavaStringObjectInspector;
import org.apache.hadoop.hive.serde2.objectinspector.primitive.PrimitiveObjectInspectorConverter;
import org.apache.hadoop.hive.serde2.objectinspector.primitive.SettableBooleanObjectInspector;
+import org.apache.hadoop.hive.serde2.objectinspector.primitive.SettableBigDecimalObjectInspector;
import org.apache.hadoop.hive.serde2.objectinspector.primitive.SettableBinaryObjectInspector;
import org.apache.hadoop.hive.serde2.objectinspector.primitive.SettableByteObjectInspector;
import org.apache.hadoop.hive.serde2.objectinspector.primitive.SettableDoubleObjectInspector;
@@ -118,6 +119,10 @@ public final class ObjectInspectorConver
return new PrimitiveObjectInspectorConverter.BinaryConverter(
(PrimitiveObjectInspector)inputOI,
(SettableBinaryObjectInspector)outputOI);
+ case DECIMAL:
+ return new PrimitiveObjectInspectorConverter.BigDecimalConverter(
+ (PrimitiveObjectInspector) inputOI,
+ (SettableBigDecimalObjectInspector) outputOI);
default:
throw new RuntimeException("Hive internal error: conversion of "
Modified: hive/trunk/serde/src/java/org/apache/hadoop/hive/serde2/objectinspector/ObjectInspectorUtils.java
URL: http://svn.apache.org/viewvc/hive/trunk/serde/src/java/org/apache/hadoop/hive/serde2/objectinspector/ObjectInspectorUtils.java?rev=1434468&r1=1434467&r2=1434468&view=diff
==============================================================================
--- hive/trunk/serde/src/java/org/apache/hadoop/hive/serde2/objectinspector/ObjectInspectorUtils.java (original)
+++ hive/trunk/serde/src/java/org/apache/hadoop/hive/serde2/objectinspector/ObjectInspectorUtils.java Wed Jan 16 23:04:24 2013
@@ -30,10 +30,12 @@ import java.util.Map;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.apache.hadoop.hive.serde.serdeConstants;
+import org.apache.hadoop.hive.serde2.io.BigDecimalWritable;
import org.apache.hadoop.hive.serde2.io.TimestampWritable;
import org.apache.hadoop.hive.serde2.objectinspector.ObjectInspector.Category;
import org.apache.hadoop.hive.serde2.objectinspector.ObjectInspectorFactory.ObjectInspectorOptions;
import org.apache.hadoop.hive.serde2.objectinspector.primitive.AbstractPrimitiveWritableObjectInspector;
+import org.apache.hadoop.hive.serde2.objectinspector.primitive.BigDecimalObjectInspector;
import org.apache.hadoop.hive.serde2.objectinspector.primitive.BinaryObjectInspector;
import org.apache.hadoop.hive.serde2.objectinspector.primitive.BooleanObjectInspector;
import org.apache.hadoop.hive.serde2.objectinspector.primitive.ByteObjectInspector;
@@ -490,6 +492,9 @@ public final class ObjectInspectorUtils
TimestampWritable t = ((TimestampObjectInspector) poi)
.getPrimitiveWritableObject(o);
return t.hashCode();
+ case DECIMAL:
+ return ((BigDecimalObjectInspector) poi).getPrimitiveWritableObject(o).hashCode();
+
default: {
throw new RuntimeException("Unknown type: "
+ poi.getPrimitiveCategory());
@@ -674,6 +679,13 @@ public final class ObjectInspectorUtils
.getPrimitiveWritableObject(o2);
return t1.compareTo(t2);
}
+ case DECIMAL: {
+ BigDecimalWritable t1 = ((BigDecimalObjectInspector) poi1)
+ .getPrimitiveWritableObject(o1);
+ BigDecimalWritable t2 = ((BigDecimalObjectInspector) poi2)
+ .getPrimitiveWritableObject(o2);
+ return t1.compareTo(t2);
+ }
default: {
throw new RuntimeException("Unknown type: "
+ poi1.getPrimitiveCategory());
Modified: hive/trunk/serde/src/java/org/apache/hadoop/hive/serde2/objectinspector/PrimitiveObjectInspector.java
URL: http://svn.apache.org/viewvc/hive/trunk/serde/src/java/org/apache/hadoop/hive/serde2/objectinspector/PrimitiveObjectInspector.java?rev=1434468&r1=1434467&r2=1434468&view=diff
==============================================================================
--- hive/trunk/serde/src/java/org/apache/hadoop/hive/serde2/objectinspector/PrimitiveObjectInspector.java (original)
+++ hive/trunk/serde/src/java/org/apache/hadoop/hive/serde2/objectinspector/PrimitiveObjectInspector.java Wed Jan 16 23:04:24 2013
@@ -27,7 +27,7 @@ public interface PrimitiveObjectInspecto
* The primitive types supported by Hive.
*/
public static enum PrimitiveCategory {
- VOID, BOOLEAN, BYTE, SHORT, INT, LONG, FLOAT, DOUBLE, STRING, TIMESTAMP, BINARY, UNKNOWN
+ VOID, BOOLEAN, BYTE, SHORT, INT, LONG, FLOAT, DOUBLE, STRING, TIMESTAMP, BINARY, DECIMAL, UNKNOWN
};
/**
Added: hive/trunk/serde/src/java/org/apache/hadoop/hive/serde2/objectinspector/primitive/BigDecimalObjectInspector.java
URL: http://svn.apache.org/viewvc/hive/trunk/serde/src/java/org/apache/hadoop/hive/serde2/objectinspector/primitive/BigDecimalObjectInspector.java?rev=1434468&view=auto
==============================================================================
--- hive/trunk/serde/src/java/org/apache/hadoop/hive/serde2/objectinspector/primitive/BigDecimalObjectInspector.java (added)
+++ hive/trunk/serde/src/java/org/apache/hadoop/hive/serde2/objectinspector/primitive/BigDecimalObjectInspector.java Wed Jan 16 23:04:24 2013
@@ -0,0 +1,33 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.hadoop.hive.serde2.objectinspector.primitive;
+
+import java.math.BigDecimal;
+
+import org.apache.hadoop.hive.serde2.io.BigDecimalWritable;
+import org.apache.hadoop.hive.serde2.objectinspector.PrimitiveObjectInspector;
+
+/**
+ * A DecimalObjectInspector inspects an Object representing a BigDecimal.
+ */
+public interface BigDecimalObjectInspector extends PrimitiveObjectInspector {
+
+ BigDecimalWritable getPrimitiveWritableObject(Object o);
+
+ BigDecimal getPrimitiveJavaObject(Object o);
+}
Added: hive/trunk/serde/src/java/org/apache/hadoop/hive/serde2/objectinspector/primitive/JavaBigDecimalObjectInspector.java
URL: http://svn.apache.org/viewvc/hive/trunk/serde/src/java/org/apache/hadoop/hive/serde2/objectinspector/primitive/JavaBigDecimalObjectInspector.java?rev=1434468&view=auto
==============================================================================
--- hive/trunk/serde/src/java/org/apache/hadoop/hive/serde2/objectinspector/primitive/JavaBigDecimalObjectInspector.java (added)
+++ hive/trunk/serde/src/java/org/apache/hadoop/hive/serde2/objectinspector/primitive/JavaBigDecimalObjectInspector.java Wed Jan 16 23:04:24 2013
@@ -0,0 +1,68 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.hadoop.hive.serde2.objectinspector.primitive;
+
+import java.math.BigDecimal;
+import java.math.BigInteger;
+
+import org.apache.hadoop.hive.serde2.io.BigDecimalWritable;
+
+public class JavaBigDecimalObjectInspector
+ extends AbstractPrimitiveJavaObjectInspector
+ implements SettableBigDecimalObjectInspector {
+
+ protected JavaBigDecimalObjectInspector() {
+ super(PrimitiveObjectInspectorUtils.decimalTypeEntry);
+ }
+
+ @Override
+ public BigDecimalWritable getPrimitiveWritableObject(Object o) {
+ return o == null ? null : new BigDecimalWritable((BigDecimal) o);
+ }
+
+ @Override
+ public BigDecimal getPrimitiveJavaObject(Object o) {
+ return o == null ? null : (BigDecimal) o;
+ }
+
+ @Override
+ public Object set(Object o, byte[] bytes, int scale) {
+ return new BigDecimal(new BigInteger(bytes), scale);
+ }
+
+ @Override
+ public Object set(Object o, BigDecimal t) {
+ return t;
+ }
+
+ @Override
+ public Object set(Object o, BigDecimalWritable t) {
+ return t == null ? null : t.getBigDecimal();
+ }
+
+ @Override
+ public Object create(byte[] bytes, int scale) {
+ return new BigDecimal(new BigInteger(bytes), scale);
+ }
+
+ @Override
+ public Object create(BigDecimal t) {
+ return t == null ? null : new BigDecimal(t.unscaledValue(), t.scale());
+ }
+
+}
Modified: hive/trunk/serde/src/java/org/apache/hadoop/hive/serde2/objectinspector/primitive/PrimitiveObjectInspectorConverter.java
URL: http://svn.apache.org/viewvc/hive/trunk/serde/src/java/org/apache/hadoop/hive/serde2/objectinspector/primitive/PrimitiveObjectInspectorConverter.java?rev=1434468&r1=1434467&r2=1434468&view=diff
==============================================================================
--- hive/trunk/serde/src/java/org/apache/hadoop/hive/serde2/objectinspector/primitive/PrimitiveObjectInspectorConverter.java (original)
+++ hive/trunk/serde/src/java/org/apache/hadoop/hive/serde2/objectinspector/primitive/PrimitiveObjectInspectorConverter.java Wed Jan 16 23:04:24 2013
@@ -18,6 +18,7 @@
package org.apache.hadoop.hive.serde2.objectinspector.primitive;
+import java.math.BigDecimal;
import java.sql.Timestamp;
import org.apache.hadoop.hive.serde2.ByteStream;
@@ -257,6 +258,30 @@ public class PrimitiveObjectInspectorCon
}
}
+ public static class BigDecimalConverter implements Converter {
+
+ PrimitiveObjectInspector inputOI;
+ SettableBigDecimalObjectInspector outputOI;
+ Object r;
+
+ public BigDecimalConverter(PrimitiveObjectInspector inputOI,
+ SettableBigDecimalObjectInspector outputOI) {
+ this.inputOI = inputOI;
+ this.outputOI = outputOI;
+ this.r = outputOI.create(BigDecimal.ZERO);
+ }
+
+ @Override
+ public Object convert(Object input) {
+ if (input == null) {
+ return null;
+ }
+ return outputOI.set(r, PrimitiveObjectInspectorUtils.getBigDecimal(input,
+ inputOI));
+ }
+
+ }
+
public static class BinaryConverter implements Converter{
PrimitiveObjectInspector inputOI;
@@ -333,11 +358,11 @@ public class PrimitiveObjectInspectorCon
t.set(String.valueOf(((DoubleObjectInspector) inputOI).get(input)));
return t;
case STRING:
- if (inputOI.preferWritable()) {
- t.set(((StringObjectInspector) inputOI).getPrimitiveWritableObject(input));
- } else {
- t.set(((StringObjectInspector) inputOI).getPrimitiveJavaObject(input));
- }
+ if (inputOI.preferWritable()) {
+ t.set(((StringObjectInspector) inputOI).getPrimitiveWritableObject(input));
+ } else {
+ t.set(((StringObjectInspector) inputOI).getPrimitiveJavaObject(input));
+ }
return t;
case TIMESTAMP:
t.set(((TimestampObjectInspector) inputOI)
@@ -346,6 +371,9 @@ public class PrimitiveObjectInspectorCon
case BINARY:
t.set(((BinaryObjectInspector) inputOI).getPrimitiveWritableObject(input).getBytes());
return t;
+ case DECIMAL:
+ t.set(((BigDecimalObjectInspector) inputOI).getPrimitiveWritableObject(input).toString());
+ return t;
default:
throw new RuntimeException("Hive 2 Internal error: type = " + inputOI.getTypeName());
}
Modified: hive/trunk/serde/src/java/org/apache/hadoop/hive/serde2/objectinspector/primitive/PrimitiveObjectInspectorFactory.java
URL: http://svn.apache.org/viewvc/hive/trunk/serde/src/java/org/apache/hadoop/hive/serde2/objectinspector/primitive/PrimitiveObjectInspectorFactory.java?rev=1434468&r1=1434467&r2=1434468&view=diff
==============================================================================
--- hive/trunk/serde/src/java/org/apache/hadoop/hive/serde2/objectinspector/primitive/PrimitiveObjectInspectorFactory.java (original)
+++ hive/trunk/serde/src/java/org/apache/hadoop/hive/serde2/objectinspector/primitive/PrimitiveObjectInspectorFactory.java Wed Jan 16 23:04:24 2013
@@ -20,6 +20,7 @@ package org.apache.hadoop.hive.serde2.ob
import java.util.HashMap;
+import org.apache.hadoop.hive.serde2.io.BigDecimalWritable;
import org.apache.hadoop.hive.serde2.io.ByteWritable;
import org.apache.hadoop.hive.serde2.io.DoubleWritable;
import org.apache.hadoop.hive.serde2.io.ShortWritable;
@@ -69,6 +70,8 @@ public final class PrimitiveObjectInspec
new JavaTimestampObjectInspector();
public static final JavaBinaryObjectInspector javaByteArrayObjectInspector =
new JavaBinaryObjectInspector();
+ public static final JavaBigDecimalObjectInspector javaBigDecimalObjectInspector =
+ new JavaBigDecimalObjectInspector();
public static final WritableBooleanObjectInspector writableBooleanObjectInspector =
new WritableBooleanObjectInspector();
@@ -92,6 +95,8 @@ public final class PrimitiveObjectInspec
new WritableTimestampObjectInspector();
public static final WritableBinaryObjectInspector writableBinaryObjectInspector =
new WritableBinaryObjectInspector();
+ public static final WritableBigDecimalObjectInspector writableBigDecimalObjectInspector =
+ new WritableBigDecimalObjectInspector();
private static HashMap<PrimitiveCategory, AbstractPrimitiveWritableObjectInspector> cachedPrimitiveWritableInspectorCache =
new HashMap<PrimitiveCategory, AbstractPrimitiveWritableObjectInspector>();
@@ -118,6 +123,8 @@ public final class PrimitiveObjectInspec
writableTimestampObjectInspector);
cachedPrimitiveWritableInspectorCache.put(PrimitiveCategory.BINARY,
writableBinaryObjectInspector);
+ cachedPrimitiveWritableInspectorCache.put(PrimitiveCategory.DECIMAL,
+ writableBigDecimalObjectInspector);
}
private static HashMap<PrimitiveCategory, AbstractPrimitiveJavaObjectInspector> cachedPrimitiveJavaInspectorCache =
@@ -145,6 +152,8 @@ public final class PrimitiveObjectInspec
javaTimestampObjectInspector);
cachedPrimitiveJavaInspectorCache.put(PrimitiveCategory.BINARY,
javaByteArrayObjectInspector);
+ cachedPrimitiveJavaInspectorCache.put(PrimitiveCategory.DECIMAL,
+ javaBigDecimalObjectInspector);
}
/**
@@ -191,6 +200,8 @@ public final class PrimitiveObjectInspec
return new WritableConstantStringObjectInspector((Text)value);
case TIMESTAMP:
return new WritableConstantTimestampObjectInspector((TimestampWritable)value);
+ case DECIMAL:
+ return new WritableConstantBigDecimalObjectInspector((BigDecimalWritable)value);
case BINARY:
return new WritableConstantBinaryObjectInspector((BytesWritable)value);
case VOID:
Modified: hive/trunk/serde/src/java/org/apache/hadoop/hive/serde2/objectinspector/primitive/PrimitiveObjectInspectorUtils.java
URL: http://svn.apache.org/viewvc/hive/trunk/serde/src/java/org/apache/hadoop/hive/serde2/objectinspector/primitive/PrimitiveObjectInspectorUtils.java?rev=1434468&r1=1434467&r2=1434468&view=diff
==============================================================================
--- hive/trunk/serde/src/java/org/apache/hadoop/hive/serde2/objectinspector/primitive/PrimitiveObjectInspectorUtils.java (original)
+++ hive/trunk/serde/src/java/org/apache/hadoop/hive/serde2/objectinspector/primitive/PrimitiveObjectInspectorUtils.java Wed Jan 16 23:04:24 2013
@@ -21,11 +21,13 @@ package org.apache.hadoop.hive.serde2.ob
import java.io.DataInput;
import java.io.DataOutput;
import java.io.IOException;
+import java.math.BigDecimal;
import java.sql.Timestamp;
import java.util.HashMap;
import java.util.Map;
import org.apache.hadoop.hive.serde.serdeConstants;
+import org.apache.hadoop.hive.serde2.io.BigDecimalWritable;
import org.apache.hadoop.hive.serde2.io.ByteWritable;
import org.apache.hadoop.hive.serde2.io.DoubleWritable;
import org.apache.hadoop.hive.serde2.io.ShortWritable;
@@ -58,7 +60,7 @@ public final class PrimitiveObjectInspec
/**
* TypeEntry stores information about a Hive Primitive TypeInfo.
*/
- public static class PrimitiveTypeEntry implements Writable{
+ public static class PrimitiveTypeEntry implements Writable {
/**
* The category of the PrimitiveType.
@@ -175,9 +177,13 @@ public final class PrimitiveObjectInspec
public static final PrimitiveTypeEntry shortTypeEntry = new PrimitiveTypeEntry(
PrimitiveCategory.SHORT, serdeConstants.SMALLINT_TYPE_NAME, Short.TYPE,
Short.class, ShortWritable.class);
+
public static final PrimitiveTypeEntry timestampTypeEntry = new PrimitiveTypeEntry(
PrimitiveCategory.TIMESTAMP, serdeConstants.TIMESTAMP_TYPE_NAME, null,
Timestamp.class, TimestampWritable.class);
+ public static final PrimitiveTypeEntry decimalTypeEntry = new PrimitiveTypeEntry(
+ PrimitiveCategory.DECIMAL, serdeConstants.DECIMAL_TYPE_NAME, null,
+ BigDecimal.class, BigDecimalWritable.class);
// The following is a complex type for special handling
public static final PrimitiveTypeEntry unknownTypeEntry = new PrimitiveTypeEntry(
@@ -195,6 +201,7 @@ public final class PrimitiveObjectInspec
registerType(byteTypeEntry);
registerType(shortTypeEntry);
registerType(timestampTypeEntry);
+ registerType(decimalTypeEntry);
registerType(unknownTypeEntry);
}
@@ -358,10 +365,14 @@ public final class PrimitiveObjectInspec
return ((TimestampObjectInspector) oi1).getPrimitiveWritableObject(o1)
.equals(((TimestampObjectInspector) oi2).getPrimitiveWritableObject(o2));
}
- case BINARY:{
+ case BINARY: {
return ((BinaryObjectInspector) oi1).getPrimitiveWritableObject(o1).
equals(((BinaryObjectInspector) oi2).getPrimitiveWritableObject(o2));
}
+ case DECIMAL: {
+ return ((BigDecimalObjectInspector) oi1).getPrimitiveJavaObject(o1)
+ .compareTo(((BigDecimalObjectInspector) oi2).getPrimitiveJavaObject(o2)) == 0;
+ }
default:
return false;
}
@@ -391,6 +402,8 @@ public final class PrimitiveObjectInspec
case TIMESTAMP:
return ((TimestampObjectInspector) oi).getPrimitiveWritableObject(o)
.getDouble();
+ case DECIMAL:
+ return ((BigDecimalObjectInspector) oi).getPrimitiveJavaObject(o).doubleValue();
default:
throw new NumberFormatException();
}
@@ -465,6 +478,10 @@ public final class PrimitiveObjectInspec
result = (((TimestampObjectInspector) oi)
.getPrimitiveWritableObject(o).getSeconds() != 0);
break;
+ case DECIMAL:
+ result = BigDecimal.ZERO.compareTo(
+ ((BigDecimalObjectInspector) oi).getPrimitiveJavaObject(o)) != 0;
+ break;
default:
throw new RuntimeException("Hive 2 Internal error: unknown type: "
+ oi.getTypeName());
@@ -545,6 +562,10 @@ public final class PrimitiveObjectInspec
result = (int) (((TimestampObjectInspector) oi)
.getPrimitiveWritableObject(o).getSeconds());
break;
+ case DECIMAL:
+ result = ((BigDecimalObjectInspector) oi)
+ .getPrimitiveJavaObject(o).intValue();
+ break;
default: {
throw new RuntimeException("Hive 2 Internal error: unknown type: "
+ oi.getTypeName());
@@ -599,6 +620,10 @@ public final class PrimitiveObjectInspec
result = ((TimestampObjectInspector) oi).getPrimitiveWritableObject(o)
.getSeconds();
break;
+ case DECIMAL:
+ result = ((BigDecimalObjectInspector) oi)
+ .getPrimitiveJavaObject(o).longValue();
+ break;
default:
throw new RuntimeException("Hive 2 Internal error: unknown type: "
+ oi.getTypeName());
@@ -646,6 +671,10 @@ public final class PrimitiveObjectInspec
case TIMESTAMP:
result = ((TimestampObjectInspector) oi).getPrimitiveWritableObject(o).getDouble();
break;
+ case DECIMAL:
+ result = ((BigDecimalObjectInspector) oi)
+ .getPrimitiveJavaObject(o).doubleValue();
+ break;
default:
throw new RuntimeException("Hive 2 Internal error: unknown type: "
+ oi.getTypeName());
@@ -706,6 +735,10 @@ public final class PrimitiveObjectInspec
case TIMESTAMP:
result = ((TimestampObjectInspector) oi).getPrimitiveWritableObject(o).toString();
break;
+ case DECIMAL:
+ result = ((BigDecimalObjectInspector) oi)
+ .getPrimitiveJavaObject(o).toString();
+ break;
default:
throw new RuntimeException("Hive 2 Internal error: unknown type: "
+ oi.getTypeName());
@@ -713,13 +746,13 @@ public final class PrimitiveObjectInspec
return result;
}
- public static BytesWritable getBinary(Object o, PrimitiveObjectInspector oi){
+ public static BytesWritable getBinary(Object o, PrimitiveObjectInspector oi) {
- if(null == o){
+ if (null == o) {
return null;
}
- switch (oi.getPrimitiveCategory()){
+ switch (oi.getPrimitiveCategory()) {
case VOID:
return null;
@@ -739,6 +772,58 @@ public final class PrimitiveObjectInspec
}
}
+ public static BigDecimal getBigDecimal(Object o, PrimitiveObjectInspector oi) {
+ if (o == null) {
+ return null;
+ }
+
+ BigDecimal result = null;
+ switch (oi.getPrimitiveCategory()) {
+ case VOID:
+ result = null;
+ break;
+ case BOOLEAN:
+ result = ((BooleanObjectInspector) oi).get(o) ?
+ BigDecimal.ONE : BigDecimal.ZERO;
+ break;
+ case BYTE:
+ result = new BigDecimal(((ByteObjectInspector) oi).get(o));
+ break;
+ case SHORT:
+ result = new BigDecimal(((ShortObjectInspector) oi).get(o));
+ break;
+ case INT:
+ result = new BigDecimal(((IntObjectInspector) oi).get(o));
+ break;
+ case LONG:
+ result = new BigDecimal(((LongObjectInspector) oi).get(o));
+ break;
+ case FLOAT:
+ Float f = ((FloatObjectInspector) oi).get(o);
+ result = new BigDecimal(f.toString());
+ break;
+ case DOUBLE:
+ Double d = ((DoubleObjectInspector) oi).get(o);
+ result = new BigDecimal(d.toString());
+ break;
+ case STRING:
+ result = new BigDecimal(((StringObjectInspector) oi).getPrimitiveJavaObject(o));
+ break;
+ case TIMESTAMP:
+ Double ts = ((TimestampObjectInspector) oi).getPrimitiveWritableObject(o)
+ .getDouble();
+ result = new BigDecimal(ts.toString());
+ break;
+ case DECIMAL:
+ result = ((BigDecimalObjectInspector) oi).getPrimitiveJavaObject(o);
+ break;
+ default:
+ throw new RuntimeException("Hive 2 Internal error: unknown type: "
+ + oi.getTypeName());
+ }
+ return result;
+ }
+
public static Timestamp getTimestamp(Object o, PrimitiveObjectInspector oi) {
if (o == null) {
return null;
@@ -770,6 +855,10 @@ public final class PrimitiveObjectInspec
case DOUBLE:
result = TimestampWritable.doubleToTimestamp(((DoubleObjectInspector) oi).get(o));
break;
+ case DECIMAL:
+ result = TimestampWritable.decimalToTimestamp(((BigDecimalObjectInspector) oi)
+ .getPrimitiveJavaObject(o));
+ break;
case STRING:
StringObjectInspector soi = (StringObjectInspector) oi;
String s = soi.getPrimitiveJavaObject(o).trim();
@@ -801,7 +890,7 @@ public final class PrimitiveObjectInspec
if (oi.getCategory() != Category.PRIMITIVE) {
return null;
}
- PrimitiveObjectInspector poi = (PrimitiveObjectInspector)oi;
+ PrimitiveObjectInspector poi = (PrimitiveObjectInspector) oi;
PrimitiveTypeEntry t =
getTypeEntryFromPrimitiveCategory(poi.getPrimitiveCategory());
return t == null ? null : t.primitiveJavaClass;
Added: hive/trunk/serde/src/java/org/apache/hadoop/hive/serde2/objectinspector/primitive/SettableBigDecimalObjectInspector.java
URL: http://svn.apache.org/viewvc/hive/trunk/serde/src/java/org/apache/hadoop/hive/serde2/objectinspector/primitive/SettableBigDecimalObjectInspector.java?rev=1434468&view=auto
==============================================================================
--- hive/trunk/serde/src/java/org/apache/hadoop/hive/serde2/objectinspector/primitive/SettableBigDecimalObjectInspector.java (added)
+++ hive/trunk/serde/src/java/org/apache/hadoop/hive/serde2/objectinspector/primitive/SettableBigDecimalObjectInspector.java Wed Jan 16 23:04:24 2013
@@ -0,0 +1,39 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.hadoop.hive.serde2.objectinspector.primitive;
+
+import java.math.BigDecimal;
+
+import org.apache.hadoop.hive.serde2.io.BigDecimalWritable;
+
+/**
+ * A SettableDecimalObjectInspector can set a BigDecimal value to an object.
+ */
+public interface SettableBigDecimalObjectInspector extends BigDecimalObjectInspector {
+
+ Object set(Object o, byte[] bytes, int scale);
+
+ Object set(Object o, BigDecimal t);
+
+ Object set(Object o, BigDecimalWritable t);
+
+ Object create(byte[] bytes, int scale);
+
+ Object create (BigDecimal t);
+
+}
Added: hive/trunk/serde/src/java/org/apache/hadoop/hive/serde2/objectinspector/primitive/WritableBigDecimalObjectInspector.java
URL: http://svn.apache.org/viewvc/hive/trunk/serde/src/java/org/apache/hadoop/hive/serde2/objectinspector/primitive/WritableBigDecimalObjectInspector.java?rev=1434468&view=auto
==============================================================================
--- hive/trunk/serde/src/java/org/apache/hadoop/hive/serde2/objectinspector/primitive/WritableBigDecimalObjectInspector.java (added)
+++ hive/trunk/serde/src/java/org/apache/hadoop/hive/serde2/objectinspector/primitive/WritableBigDecimalObjectInspector.java Wed Jan 16 23:04:24 2013
@@ -0,0 +1,75 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.hadoop.hive.serde2.objectinspector.primitive;
+
+import java.math.BigDecimal;
+
+import org.apache.hadoop.hive.serde2.io.BigDecimalWritable;
+
+public class WritableBigDecimalObjectInspector
+ extends AbstractPrimitiveWritableObjectInspector
+ implements SettableBigDecimalObjectInspector {
+
+ protected WritableBigDecimalObjectInspector() {
+ super(PrimitiveObjectInspectorUtils.decimalTypeEntry);
+ }
+
+ @Override
+ public BigDecimalWritable getPrimitiveWritableObject(Object o) {
+ return o == null ? null : (BigDecimalWritable) o;
+ }
+
+ @Override
+ public BigDecimal getPrimitiveJavaObject(Object o) {
+ return o == null ? null : ((BigDecimalWritable) o).getBigDecimal();
+ }
+
+ @Override
+ public Object copyObject(Object o) {
+ return o == null ? null : new BigDecimalWritable((BigDecimalWritable) o);
+ }
+
+ @Override
+ public Object set(Object o, byte[] bytes, int scale) {
+ ((BigDecimalWritable) o).set(bytes, scale);
+ return o;
+ }
+
+ @Override
+ public Object set(Object o, BigDecimal t) {
+ ((BigDecimalWritable) o).set(t);
+ return o;
+ }
+
+ @Override
+ public Object set(Object o, BigDecimalWritable t) {
+ ((BigDecimalWritable) o).set(t);
+ return o;
+ }
+
+ @Override
+ public Object create(byte[] bytes, int scale) {
+ return new BigDecimalWritable(bytes, scale);
+ }
+
+ @Override
+ public Object create(BigDecimal t) {
+ return new BigDecimalWritable(t);
+ }
+
+}
Added: hive/trunk/serde/src/java/org/apache/hadoop/hive/serde2/objectinspector/primitive/WritableConstantBigDecimalObjectInspector.java
URL: http://svn.apache.org/viewvc/hive/trunk/serde/src/java/org/apache/hadoop/hive/serde2/objectinspector/primitive/WritableConstantBigDecimalObjectInspector.java?rev=1434468&view=auto
==============================================================================
--- hive/trunk/serde/src/java/org/apache/hadoop/hive/serde2/objectinspector/primitive/WritableConstantBigDecimalObjectInspector.java (added)
+++ hive/trunk/serde/src/java/org/apache/hadoop/hive/serde2/objectinspector/primitive/WritableConstantBigDecimalObjectInspector.java Wed Jan 16 23:04:24 2013
@@ -0,0 +1,40 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.hadoop.hive.serde2.objectinspector.primitive;
+
+import org.apache.hadoop.hive.serde2.io.BigDecimalWritable;
+import org.apache.hadoop.hive.serde2.objectinspector.ConstantObjectInspector;
+
+/**
+ * A WritableConstantBigDecimalObjectInspector is a WritableBigDecimalObjectInspector
+ * that implements ConstantObjectInspector.
+ */
+public class WritableConstantBigDecimalObjectInspector extends WritableBigDecimalObjectInspector
+ implements ConstantObjectInspector {
+
+ private final BigDecimalWritable value;
+
+ WritableConstantBigDecimalObjectInspector(BigDecimalWritable value) {
+ this.value = value;
+ }
+
+ @Override
+ public BigDecimalWritable getWritableConstantValue() {
+ return value;
+ }
+}
Modified: hive/trunk/serde/src/java/org/apache/hadoop/hive/serde2/typeinfo/TypeInfoFactory.java
URL: http://svn.apache.org/viewvc/hive/trunk/serde/src/java/org/apache/hadoop/hive/serde2/typeinfo/TypeInfoFactory.java?rev=1434468&r1=1434467&r2=1434468&view=diff
==============================================================================
--- hive/trunk/serde/src/java/org/apache/hadoop/hive/serde2/typeinfo/TypeInfoFactory.java (original)
+++ hive/trunk/serde/src/java/org/apache/hadoop/hive/serde2/typeinfo/TypeInfoFactory.java Wed Jan 16 23:04:24 2013
@@ -64,6 +64,7 @@ public final class TypeInfoFactory {
public static final TypeInfo shortTypeInfo = getPrimitiveTypeInfo(serdeConstants.SMALLINT_TYPE_NAME);
public static final TypeInfo timestampTypeInfo = getPrimitiveTypeInfo(serdeConstants.TIMESTAMP_TYPE_NAME);
public static final TypeInfo binaryTypeInfo = getPrimitiveTypeInfo(serdeConstants.BINARY_TYPE_NAME);
+ public static final TypeInfo decimalTypeInfo = getPrimitiveTypeInfo(serdeConstants.DECIMAL_TYPE_NAME);
public static final TypeInfo unknownTypeInfo = getPrimitiveTypeInfo("unknown");
Modified: hive/trunk/serde/src/test/org/apache/hadoop/hive/serde2/TestStatsSerde.java
URL: http://svn.apache.org/viewvc/hive/trunk/serde/src/test/org/apache/hadoop/hive/serde2/TestStatsSerde.java?rev=1434468&r1=1434467&r2=1434468&view=diff
==============================================================================
--- hive/trunk/serde/src/test/org/apache/hadoop/hive/serde2/TestStatsSerde.java (original)
+++ hive/trunk/serde/src/test/org/apache/hadoop/hive/serde2/TestStatsSerde.java Wed Jan 16 23:04:24 2013
@@ -18,6 +18,8 @@
package org.apache.hadoop.hive.serde2;
+import java.math.BigDecimal;
+import java.math.BigInteger;
import java.util.List;
import java.util.Properties;
import java.util.Random;
@@ -103,7 +105,7 @@ public class TestStatsSerde extends Test
Random r = new Random(1234);
MyTestClass rows[] = new MyTestClass[num];
for (int i = 0; i < num; i++) {
- int randField = r.nextInt(10);
+ int randField = r.nextInt(12);
Byte b = randField > 0 ? null : Byte.valueOf((byte) r.nextInt());
Short s = randField > 1 ? null : Short.valueOf((short) r.nextInt());
Integer n = randField > 2 ? null : Integer.valueOf(r.nextInt());
@@ -112,12 +114,13 @@ public class TestStatsSerde extends Test
Double d = randField > 5 ? null : Double.valueOf(r.nextDouble());
String st = randField > 6 ? null : TestBinarySortableSerDe
.getRandString(r);
- MyTestInnerStruct is = randField > 7 ? null : new MyTestInnerStruct(r
+ BigDecimal bd = randField > 8 ? null : TestBinarySortableSerDe.getRandBigDecimal(r);
+ MyTestInnerStruct is = randField > 9 ? null : new MyTestInnerStruct(r
.nextInt(5) - 2, r.nextInt(5) - 2);
- List<Integer> li = randField > 8 ? null : TestBinarySortableSerDe
+ List<Integer> li = randField > 10 ? null : TestBinarySortableSerDe
.getRandIntegerArray(r);
byte[] ba = TestBinarySortableSerDe.getRandBA(r, i);
- MyTestClass t = new MyTestClass(b, s, n, l, f, d, st, is, li,ba);
+ MyTestClass t = new MyTestClass(b, s, n, l, f, d, st, bd, is, li,ba);
rows[i] = t;
}
Modified: hive/trunk/serde/src/test/org/apache/hadoop/hive/serde2/binarysortable/MyTestClass.java
URL: http://svn.apache.org/viewvc/hive/trunk/serde/src/test/org/apache/hadoop/hive/serde2/binarysortable/MyTestClass.java?rev=1434468&r1=1434467&r2=1434468&view=diff
==============================================================================
--- hive/trunk/serde/src/test/org/apache/hadoop/hive/serde2/binarysortable/MyTestClass.java (original)
+++ hive/trunk/serde/src/test/org/apache/hadoop/hive/serde2/binarysortable/MyTestClass.java Wed Jan 16 23:04:24 2013
@@ -17,34 +17,37 @@
*/
package org.apache.hadoop.hive.serde2.binarysortable;
+import java.math.BigDecimal;
import java.util.List;
public class MyTestClass {
- Byte myByte;
- Short myShort;
- Integer myInt;
- Long myLong;
- Float myFloat;
- Double myDouble;
- String myString;
- MyTestInnerStruct myStruct;
- List<Integer> myList;
- byte[] myBA;
+ Byte myByte;
+ Short myShort;
+ Integer myInt;
+ Long myLong;
+ Float myFloat;
+ Double myDouble;
+ String myString;
+ BigDecimal myDecimal;
+ MyTestInnerStruct myStruct;
+ List<Integer> myList;
+ byte[] myBA;
- public MyTestClass() {
- }
+ public MyTestClass() {
+ }
- public MyTestClass(Byte b, Short s, Integer i, Long l, Float f, Double d,
- String st, MyTestInnerStruct is, List<Integer> li, byte[] ba) {
- myByte = b;
- myShort = s;
- myInt = i;
- myLong = l;
- myFloat = f;
- myDouble = d;
- myString = st;
- myStruct = is;
- myList = li;
- myBA = ba;
- }
+ public MyTestClass(Byte b, Short s, Integer i, Long l, Float f, Double d,
+ String st, BigDecimal bd, MyTestInnerStruct is, List<Integer> li, byte[] ba) {
+ myByte = b;
+ myShort = s;
+ myInt = i;
+ myLong = l;
+ myFloat = f;
+ myDouble = d;
+ myString = st;
+ myDecimal = bd;
+ myStruct = is;
+ myList = li;
+ myBA = ba;
+ }
}
Modified: hive/trunk/serde/src/test/org/apache/hadoop/hive/serde2/binarysortable/TestBinarySortableSerDe.java
URL: http://svn.apache.org/viewvc/hive/trunk/serde/src/test/org/apache/hadoop/hive/serde2/binarysortable/TestBinarySortableSerDe.java?rev=1434468&r1=1434467&r2=1434468&view=diff
==============================================================================
--- hive/trunk/serde/src/test/org/apache/hadoop/hive/serde2/binarysortable/TestBinarySortableSerDe.java (original)
+++ hive/trunk/serde/src/test/org/apache/hadoop/hive/serde2/binarysortable/TestBinarySortableSerDe.java Wed Jan 16 23:04:24 2013
@@ -17,6 +17,7 @@
*/
package org.apache.hadoop.hive.serde2.binarysortable;
+import java.math.BigDecimal;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
@@ -42,6 +43,8 @@ import org.apache.hadoop.io.BytesWritabl
*/
public class TestBinarySortableSerDe extends TestCase {
+ private static final String DECIMAL_CHARS = "0123456789";
+
public static HashMap<String, String> makeHashMap(String... params) {
HashMap<String, String> r = new HashMap<String, String>();
for (int i = 0; i < params.length; i += 2) {
@@ -132,11 +135,36 @@ public class TestBinarySortableSerDe ext
}
}
+ public static BigDecimal getRandBigDecimal(Random r) {
+ StringBuilder sb = new StringBuilder();
+ int l1 = 1+r.nextInt(500), l2 = r.nextInt(500);
+
+ if (r.nextBoolean()) {
+ sb.append("-");
+ }
+
+ sb.append(getRandString(r, DECIMAL_CHARS, l1));
+ if (l2 != 0) {
+ sb.append(".");
+ sb.append(getRandString(r, DECIMAL_CHARS, l2));
+ }
+
+ BigDecimal bd = new BigDecimal(sb.toString());
+ return bd;
+ }
+
public static String getRandString(Random r) {
- int length = r.nextInt(10);
+ return getRandString(r, null, r.nextInt(10));
+ }
+
+ public static String getRandString(Random r, String characters, int length) {
StringBuilder sb = new StringBuilder();
for (int i = 0; i < length; i++) {
- sb.append((char) (r.nextInt(128)));
+ if (characters == null) {
+ sb.append((char) (r.nextInt(128)));
+ } else {
+ sb.append(characters.charAt(r.nextInt(characters.length())));
+ }
}
return sb.toString();
}
@@ -179,9 +207,10 @@ public class TestBinarySortableSerDe ext
t.myDouble = randField > 5 ? null : Double
.valueOf(r.nextDouble() * 10 - 5);
t.myString = randField > 6 ? null : getRandString(r);
- t.myStruct = randField > 7 ? null : new MyTestInnerStruct(
+ t.myDecimal = randField > 7 ? null : getRandBigDecimal(r);
+ t.myStruct = randField > 8 ? null : new MyTestInnerStruct(
r.nextInt(5) - 2, r.nextInt(5) - 2);
- t.myList = randField > 8 ? null : getRandIntegerArray(r);
+ t.myList = randField > 9 ? null : getRandIntegerArray(r);
t.myBA = getRandBA(r, i);
rows[i] = t;
}
@@ -195,9 +224,9 @@ public class TestBinarySortableSerDe ext
String fieldTypes = ObjectInspectorUtils.getFieldTypes(rowOI);
testBinarySortableSerDe(rows, rowOI, getSerDe(fieldNames, fieldTypes,
- "++++++++++"), true);
+ "+++++++++++"), true);
testBinarySortableSerDe(rows, rowOI, getSerDe(fieldNames, fieldTypes,
- "----------"), false);
+ "-----------"), false);
System.out.println("Test testTBinarySortableProtocol passed!");
} catch (Throwable e) {
Modified: hive/trunk/serde/src/test/org/apache/hadoop/hive/serde2/lazybinary/MyTestClassBigger.java
URL: http://svn.apache.org/viewvc/hive/trunk/serde/src/test/org/apache/hadoop/hive/serde2/lazybinary/MyTestClassBigger.java?rev=1434468&r1=1434467&r2=1434468&view=diff
==============================================================================
--- hive/trunk/serde/src/test/org/apache/hadoop/hive/serde2/lazybinary/MyTestClassBigger.java (original)
+++ hive/trunk/serde/src/test/org/apache/hadoop/hive/serde2/lazybinary/MyTestClassBigger.java Wed Jan 16 23:04:24 2013
@@ -17,6 +17,7 @@
*/
package org.apache.hadoop.hive.serde2.lazybinary;
+import java.math.BigDecimal;
import java.util.List;
import java.util.Map;
@@ -27,34 +28,36 @@ import org.apache.hadoop.hive.serde2.bin
*
*/
public class MyTestClassBigger {
- Byte myByte;
- Short myShort;
- Integer myInt;
- Long myLong;
- Float myFloat;
- Double myDouble;
- String myString;
- MyTestInnerStruct myStruct;
- List<Integer> myList;
- byte[] myBA;
- Map<String, List<MyTestInnerStruct>> myMap;
+ Byte myByte;
+ Short myShort;
+ Integer myInt;
+ Long myLong;
+ Float myFloat;
+ Double myDouble;
+ String myString;
+ BigDecimal myDecimal;
+ MyTestInnerStruct myStruct;
+ List<Integer> myList;
+ byte[] myBA;
+ Map<String, List<MyTestInnerStruct>> myMap;
- public MyTestClassBigger() {
- }
+ public MyTestClassBigger() {
+ }
- public MyTestClassBigger(Byte b, Short s, Integer i, Long l, Float f,
- Double d, String st, MyTestInnerStruct is, List<Integer> li,
- byte[] ba, Map<String, List<MyTestInnerStruct>> mp) {
- myByte = b;
- myShort = s;
- myInt = i;
- myLong = l;
- myFloat = f;
- myDouble = d;
- myString = st;
- myStruct = is;
- myList = li;
- myBA = ba;
- myMap = mp;
- }
+ public MyTestClassBigger(Byte b, Short s, Integer i, Long l, Float f,
+ Double d, String st, BigDecimal bd, MyTestInnerStruct is, List<Integer> li,
+ byte[] ba, Map<String, List<MyTestInnerStruct>> mp) {
+ myByte = b;
+ myShort = s;
+ myInt = i;
+ myLong = l;
+ myFloat = f;
+ myDouble = d;
+ myString = st;
+ myDecimal = bd;
+ myStruct = is;
+ myList = li;
+ myBA = ba;
+ myMap = mp;
+ }
}
Modified: hive/trunk/serde/src/test/org/apache/hadoop/hive/serde2/lazybinary/MyTestClassSmaller.java
URL: http://svn.apache.org/viewvc/hive/trunk/serde/src/test/org/apache/hadoop/hive/serde2/lazybinary/MyTestClassSmaller.java?rev=1434468&r1=1434467&r2=1434468&view=diff
==============================================================================
--- hive/trunk/serde/src/test/org/apache/hadoop/hive/serde2/lazybinary/MyTestClassSmaller.java (original)
+++ hive/trunk/serde/src/test/org/apache/hadoop/hive/serde2/lazybinary/MyTestClassSmaller.java Wed Jan 16 23:04:24 2013
@@ -17,30 +17,33 @@
*/
package org.apache.hadoop.hive.serde2.lazybinary;
+import java.math.BigDecimal;
import org.apache.hadoop.hive.serde2.binarysortable.MyTestInnerStruct;
public class MyTestClassSmaller {
- Byte myByte;
- Short myShort;
- Integer myInt;
- Long myLong;
- Float myFloat;
- Double myDouble;
- String myString;
- MyTestInnerStruct myStruct;
+ Byte myByte;
+ Short myShort;
+ Integer myInt;
+ Long myLong;
+ Float myFloat;
+ Double myDouble;
+ String myString;
+ BigDecimal myDecimal;
+ MyTestInnerStruct myStruct;
- public MyTestClassSmaller() {
- }
-
- public MyTestClassSmaller(Byte b, Short s, Integer i, Long l, Float f,
- Double d, String st, MyTestInnerStruct is) {
- myByte = b;
- myShort = s;
- myInt = i;
- myLong = l;
- myFloat = f;
- myDouble = d;
- myString = st;
- myStruct = is;
- }
+ public MyTestClassSmaller() {
+ }
+
+ public MyTestClassSmaller(Byte b, Short s, Integer i, Long l, Float f,
+ Double d, String st, BigDecimal bd, MyTestInnerStruct is) {
+ myByte = b;
+ myShort = s;
+ myInt = i;
+ myLong = l;
+ myFloat = f;
+ myDouble = d;
+ myString = st;
+ myDecimal = bd;
+ myStruct = is;
+ }
}
Modified: hive/trunk/serde/src/test/org/apache/hadoop/hive/serde2/lazybinary/TestLazyBinarySerDe.java
URL: http://svn.apache.org/viewvc/hive/trunk/serde/src/test/org/apache/hadoop/hive/serde2/lazybinary/TestLazyBinarySerDe.java?rev=1434468&r1=1434467&r2=1434468&view=diff
==============================================================================
--- hive/trunk/serde/src/test/org/apache/hadoop/hive/serde2/lazybinary/TestLazyBinarySerDe.java (original)
+++ hive/trunk/serde/src/test/org/apache/hadoop/hive/serde2/lazybinary/TestLazyBinarySerDe.java Wed Jan 16 23:04:24 2013
@@ -17,6 +17,7 @@
*/
package org.apache.hadoop.hive.serde2.lazybinary;
+import java.math.BigDecimal;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.HashMap;
@@ -191,7 +192,7 @@ public class TestLazyBinarySerDe extends
int num = 100;
for (int itest = 0; itest < num; itest++) {
- int randField = r.nextInt(11);
+ int randField = r.nextInt(10);
Byte b = randField > 0 ? null : Byte.valueOf((byte) r.nextInt());
Short s = randField > 1 ? null : Short.valueOf((short) r.nextInt());
Integer n = randField > 2 ? null : Integer.valueOf(r.nextInt());
@@ -200,6 +201,7 @@ public class TestLazyBinarySerDe extends
Double d = randField > 5 ? null : Double.valueOf(r.nextDouble());
String st = randField > 6 ? null : TestBinarySortableSerDe
.getRandString(r);
+ BigDecimal bd = randField > 7 ? null : TestBinarySortableSerDe.getRandBigDecimal(r);
MyTestInnerStruct is = randField > 7 ? null : new MyTestInnerStruct(r
.nextInt(5) - 2, r.nextInt(5) - 2);
List<Integer> li = randField > 8 ? null : TestBinarySortableSerDe
@@ -207,7 +209,7 @@ public class TestLazyBinarySerDe extends
byte[] ba = TestBinarySortableSerDe.getRandBA(r, itest);
Map<String, List<MyTestInnerStruct>> mp = new HashMap<String, List<MyTestInnerStruct>>();
String key = TestBinarySortableSerDe.getRandString(r);
- List<MyTestInnerStruct> value = randField > 10 ? null
+ List<MyTestInnerStruct> value = randField > 9 ? null
: getRandStructArray(r);
mp.put(key, value);
String key1 = TestBinarySortableSerDe.getRandString(r);
@@ -216,7 +218,7 @@ public class TestLazyBinarySerDe extends
List<MyTestInnerStruct> value2 = getRandStructArray(r);
mp.put(key2, value2);
- MyTestClassBigger input = new MyTestClassBigger(b, s, n, l, f, d, st, is,
+ MyTestClassBigger input = new MyTestClassBigger(b, s, n, l, f, d, st, bd, is,
li, ba, mp);
BytesWritable bw = (BytesWritable) serde1.serialize(input, rowOI1);
Object output = serde2.deserialize(bw);
@@ -258,7 +260,7 @@ public class TestLazyBinarySerDe extends
int num = 100;
for (int itest = 0; itest < num; itest++) {
- int randField = r.nextInt(10);
+ int randField = r.nextInt(11);
Byte b = randField > 0 ? null : Byte.valueOf((byte) r.nextInt());
Short s = randField > 1 ? null : Short.valueOf((short) r.nextInt());
Integer n = randField > 2 ? null : Integer.valueOf(r.nextInt());
@@ -267,12 +269,13 @@ public class TestLazyBinarySerDe extends
Double d = randField > 5 ? null : Double.valueOf(r.nextDouble());
String st = randField > 6 ? null : TestBinarySortableSerDe
.getRandString(r);
- MyTestInnerStruct is = randField > 7 ? null : new MyTestInnerStruct(r
+ BigDecimal bd = randField > 7 ? null : TestBinarySortableSerDe.getRandBigDecimal(r);
+ MyTestInnerStruct is = randField > 8 ? null : new MyTestInnerStruct(r
.nextInt(5) - 2, r.nextInt(5) - 2);
- List<Integer> li = randField > 8 ? null : TestBinarySortableSerDe
+ List<Integer> li = randField > 9 ? null : TestBinarySortableSerDe
.getRandIntegerArray(r);
byte[] ba = TestBinarySortableSerDe.getRandBA(r, itest);
- MyTestClass input = new MyTestClass(b, s, n, l, f, d, st, is, li, ba);
+ MyTestClass input = new MyTestClass(b, s, n, l, f, d, st, bd, is, li, ba);
BytesWritable bw = (BytesWritable) serde1.serialize(input, rowOI1);
Object output = serde2.deserialize(bw);
@@ -313,7 +316,7 @@ public class TestLazyBinarySerDe extends
int num = 100;
for (int itest = 0; itest < num; itest++) {
- int randField = r.nextInt(10);
+ int randField = r.nextInt(11);
Byte b = randField > 0 ? null : Byte.valueOf((byte) r.nextInt());
Short s = randField > 1 ? null : Short.valueOf((short) r.nextInt());
Integer n = randField > 2 ? null : Integer.valueOf(r.nextInt());
@@ -322,12 +325,13 @@ public class TestLazyBinarySerDe extends
Double d = randField > 5 ? null : Double.valueOf(r.nextDouble());
String st = randField > 6 ? null : TestBinarySortableSerDe
.getRandString(r);
- MyTestInnerStruct is = randField > 7 ? null : new MyTestInnerStruct(r
+ BigDecimal bd = randField > 7 ? null : TestBinarySortableSerDe.getRandBigDecimal(r);
+ MyTestInnerStruct is = randField > 8 ? null : new MyTestInnerStruct(r
.nextInt(5) - 2, r.nextInt(5) - 2);
- List<Integer> li = randField > 8 ? null : TestBinarySortableSerDe
+ List<Integer> li = randField > 9 ? null : TestBinarySortableSerDe
.getRandIntegerArray(r);
byte[] ba = TestBinarySortableSerDe.getRandBA(r, itest);
- MyTestClass input = new MyTestClass(b, s, n, l, f, d, st, is, li,ba);
+ MyTestClass input = new MyTestClass(b, s, n, l, f, d, st, bd, is, li,ba);
BytesWritable bw = (BytesWritable) serde1.serialize(input, rowOI1);
Object output = serde2.deserialize(bw);
@@ -377,10 +381,11 @@ public class TestLazyBinarySerDe extends
Double d = randField > 5 ? null : Double.valueOf(r.nextDouble());
String st = randField > 6 ? null : TestBinarySortableSerDe
.getRandString(r);
+ BigDecimal bd = randField > 7 ? null : TestBinarySortableSerDe.getRandBigDecimal(r);
MyTestInnerStruct is = randField > 7 ? null : new MyTestInnerStruct(r
.nextInt(5) - 2, r.nextInt(5) - 2);
- MyTestClassSmaller input = new MyTestClassSmaller(b, s, n, l, f, d, st,
+ MyTestClassSmaller input = new MyTestClassSmaller(b, s, n, l, f, d, st, bd,
is);
BytesWritable bw = (BytesWritable) serde1.serialize(input, rowOI1);
Object output = serde2.deserialize(bw);
@@ -410,13 +415,13 @@ public class TestLazyBinarySerDe extends
StructObjectInspector soi1 = (StructObjectInspector) serdeOI;
List<? extends StructField> fields1 = soi1.getAllStructFieldRefs();
LazyBinaryMapObjectInspector lazympoi = (LazyBinaryMapObjectInspector) fields1
- .get(10).getFieldObjectInspector();
+ .get(11).getFieldObjectInspector();
ObjectInspector lazympkeyoi = lazympoi.getMapKeyObjectInspector();
ObjectInspector lazympvalueoi = lazympoi.getMapValueObjectInspector();
StructObjectInspector soi2 = rowOI;
List<? extends StructField> fields2 = soi2.getAllStructFieldRefs();
- MapObjectInspector inputmpoi = (MapObjectInspector) fields2.get(10)
+ MapObjectInspector inputmpoi = (MapObjectInspector) fields2.get(11)
.getFieldObjectInspector();
ObjectInspector inputmpkeyoi = inputmpoi.getMapKeyObjectInspector();
ObjectInspector inputmpvalueoi = inputmpoi.getMapValueObjectInspector();
@@ -436,10 +441,10 @@ public class TestLazyBinarySerDe extends
}
MyTestClassBigger input = new MyTestClassBigger(null, null, null, null,
- null, null, null, null, null, null, mp);
+ null, null, null, null, null, null, null, mp);
BytesWritable bw = (BytesWritable) serde.serialize(input, rowOI);
Object output = serde.deserialize(bw);
- Object lazyobj = soi1.getStructFieldData(output, fields1.get(10));
+ Object lazyobj = soi1.getStructFieldData(output, fields1.get(11));
Map<?, ?> outputmp = lazympoi.getMap(lazyobj);
if (outputmp.size() != mp.size()) {
@@ -486,7 +491,7 @@ public class TestLazyBinarySerDe extends
Random r = new Random(1234);
MyTestClass rows[] = new MyTestClass[num];
for (int i = 0; i < num; i++) {
- int randField = r.nextInt(10);
+ int randField = r.nextInt(11);
Byte b = randField > 0 ? null : Byte.valueOf((byte) r.nextInt());
Short s = randField > 1 ? null : Short.valueOf((short) r.nextInt());
Integer n = randField > 2 ? null : Integer.valueOf(r.nextInt());
@@ -495,12 +500,13 @@ public class TestLazyBinarySerDe extends
Double d = randField > 5 ? null : Double.valueOf(r.nextDouble());
String st = randField > 6 ? null : TestBinarySortableSerDe
.getRandString(r);
- MyTestInnerStruct is = randField > 7 ? null : new MyTestInnerStruct(r
+ BigDecimal bd = randField > 7 ? null : TestBinarySortableSerDe.getRandBigDecimal(r);
+ MyTestInnerStruct is = randField > 8 ? null : new MyTestInnerStruct(r
.nextInt(5) - 2, r.nextInt(5) - 2);
- List<Integer> li = randField > 8 ? null : TestBinarySortableSerDe
+ List<Integer> li = randField > 9 ? null : TestBinarySortableSerDe
.getRandIntegerArray(r);
byte[] ba = TestBinarySortableSerDe.getRandBA(r, i);
- MyTestClass t = new MyTestClass(b, s, n, l, f, d, st, is, li, ba);
+ MyTestClass t = new MyTestClass(b, s, n, l, f, d, st, bd, is, li, ba);
rows[i] = t;
}
Modified: hive/trunk/serde/src/test/org/apache/hadoop/hive/serde2/objectinspector/TestObjectInspectorConverters.java
URL: http://svn.apache.org/viewvc/hive/trunk/serde/src/test/org/apache/hadoop/hive/serde2/objectinspector/TestObjectInspectorConverters.java?rev=1434468&r1=1434467&r2=1434468&view=diff
==============================================================================
--- hive/trunk/serde/src/test/org/apache/hadoop/hive/serde2/objectinspector/TestObjectInspectorConverters.java (original)
+++ hive/trunk/serde/src/test/org/apache/hadoop/hive/serde2/objectinspector/TestObjectInspectorConverters.java Wed Jan 16 23:04:24 2013
@@ -19,6 +19,8 @@ package org.apache.hadoop.hive.serde2.ob
import junit.framework.TestCase;
+import java.math.BigDecimal;
+
import org.apache.hadoop.hive.serde2.io.ByteWritable;
import org.apache.hadoop.hive.serde2.io.DoubleWritable;
import org.apache.hadoop.hive.serde2.io.ShortWritable;
@@ -126,6 +128,11 @@ public class TestObjectInspectorConverte
PrimitiveObjectInspectorFactory.writableStringObjectInspector);
assertEquals("TextConverter", new Text("hive"), textConverter
.convert(new String("hive")));
+ textConverter = ObjectInspectorConverters.getConverter(
+ PrimitiveObjectInspectorFactory.javaBigDecimalObjectInspector,
+ PrimitiveObjectInspectorFactory.writableStringObjectInspector);
+ assertEquals("TextConverter", new Text("100.001"), textConverter
+ .convert(new BigDecimal("100.001")));
// Binary
Converter baConverter = ObjectInspectorConverters.getConverter(