Fix concurrency issue due to static variable in LazyBinaryUtils.

See 8920f1d
amplab · Aug 3, 2012 · 37eb3e4 · 37eb3e4
1 parent a4959ed
commit 37eb3e4
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 5 deletions.
diff --git a/serde/src/java/org/apache/hadoop/hive/serde2/lazybinary/LazyBinaryArray.java b/serde/src/java/org/apache/hadoop/hive/serde2/lazybinary/LazyBinaryArray.java
@@ -149,7 +149,7 @@ private void parse() {
       if ((bytes[nullByteCur] & (1 << (i % 8))) != 0) {
         elementIsNull[i] = false;
         LazyBinaryUtils.checkObjectByteInfo(listEleObjectInspector, bytes,
-            lastElementByteEnd, recordInfo);
+            lastElementByteEnd, recordInfo, vInt);
         elementStart[i] = lastElementByteEnd + recordInfo.elementOffset;
         elementLength[i] = recordInfo.elementSize;
         lastElementByteEnd = elementStart[i] + elementLength[i];

diff --git a/serde/src/java/org/apache/hadoop/hive/serde2/lazybinary/LazyBinaryMap.java b/serde/src/java/org/apache/hadoop/hive/serde2/lazybinary/LazyBinaryMap.java
@@ -163,7 +163,7 @@ private void parse() {
       if ((bytes[nullByteCur] & (1 << ((i * 2) % 8))) != 0) {
         keyIsNull[i] = false;
         LazyBinaryUtils.checkObjectByteInfo(((MapObjectInspector) oi)
-            .getMapKeyObjectInspector(), bytes, lastElementByteEnd, recordInfo);
+            .getMapKeyObjectInspector(), bytes, lastElementByteEnd, recordInfo, vInt);
         keyStart[i] = lastElementByteEnd + recordInfo.elementOffset;
         keyLength[i] = recordInfo.elementSize;
         lastElementByteEnd = keyStart[i] + keyLength[i];
@@ -178,7 +178,7 @@ private void parse() {
         valueIsNull[i] = false;
         LazyBinaryUtils.checkObjectByteInfo(((MapObjectInspector) oi)
             .getMapValueObjectInspector(), bytes, lastElementByteEnd,
-            recordInfo);
+            recordInfo, vInt);
         valueStart[i] = lastElementByteEnd + recordInfo.elementOffset;
         valueLength[i] = recordInfo.elementSize;
         lastElementByteEnd = valueStart[i] + valueLength[i];

diff --git a/serde/src/java/org/apache/hadoop/hive/serde2/lazybinary/LazyBinaryStruct.java b/serde/src/java/org/apache/hadoop/hive/serde2/lazybinary/LazyBinaryStruct.java
@@ -26,6 +26,7 @@
 import org.apache.hadoop.hive.serde2.SerDeStatsStruct;
 import org.apache.hadoop.hive.serde2.lazy.ByteArrayRef;
 import org.apache.hadoop.hive.serde2.lazybinary.LazyBinaryUtils.RecordInfo;
+import org.apache.hadoop.hive.serde2.lazybinary.LazyBinaryUtils.VInt;
 import org.apache.hadoop.hive.serde2.lazybinary.objectinspector.LazyBinaryStructObjectInspector;
 import org.apache.hadoop.hive.serde2.objectinspector.ObjectInspector;
 import org.apache.hadoop.hive.serde2.objectinspector.StructField;
@@ -47,6 +48,8 @@ public class LazyBinaryStruct extends
 
   private static Log LOG = LogFactory.getLog(LazyBinaryStruct.class.getName());
 
+  private VInt vInt = new VInt();
+
   /**
    * Whether the data is already parsed or not.
    */
@@ -136,7 +139,7 @@ private void parse() {
       if ((nullByte & (1 << (i % 8))) != 0) {
         fieldIsNull[i] = false;
         LazyBinaryUtils.checkObjectByteInfo(fieldRefs.get(i)
-            .getFieldObjectInspector(), bytes, lastFieldByteEnd, recordInfo);
+            .getFieldObjectInspector(), bytes, lastFieldByteEnd, recordInfo, vInt);
         fieldStart[i] = lastFieldByteEnd + recordInfo.elementOffset;
         fieldLength[i] = recordInfo.elementSize;
         lastFieldByteEnd = fieldStart[i] + fieldLength[i];

diff --git a/serde/src/java/org/apache/hadoop/hive/serde2/lazybinary/LazyBinaryUtils.java b/serde/src/java/org/apache/hadoop/hive/serde2/lazybinary/LazyBinaryUtils.java
@@ -147,7 +147,7 @@ public String toString() {
    *          modify this byteinfo object and return it
    */
   public static void checkObjectByteInfo(ObjectInspector objectInspector,
-      byte[] bytes, int offset, RecordInfo recordInfo) {
+      byte[] bytes, int offset, RecordInfo recordInfo, VInt vInt) {
     Category category = objectInspector.getCategory();
     switch (category) {
     case PRIMITIVE: