svn commit: r1621612 - /hive/trunk/serde/src/java/org/apache/hadoop/hive/serde2/objectinspector/primitive/JavaHiveVarcharObjectInspector.java

[szehon]

Author: szehon
Date: Sun Aug 31 17:45:14 2014
New Revision: 1621612

URL: http://svn.apache.org/r1621612
Log:
HIVE-7921: Fix confusing dead assignment in return statement 
(JavaHiveVarcharObjectInspector) (Lars Francke via Szehon)

Modified:
    
hive/trunk/serde/src/java/org/apache/hadoop/hive/serde2/objectinspector/primitive/JavaHiveVarcharObjectInspector.java

Modified: 
hive/trunk/serde/src/java/org/apache/hadoop/hive/serde2/objectinspector/primitive/JavaHiveVarcharObjectInspector.java
URL: 
http://svn.apache.org/viewvc/hive/trunk/serde/src/java/org/apache/hadoop/hive/serde2/objectinspector/primitive/JavaHiveVarcharObjectInspector.java?rev=1621612&r1=1621611&r2=1621612&view=diff
==============================================================================
--- 
hive/trunk/serde/src/java/org/apache/hadoop/hive/serde2/objectinspector/primitive/JavaHiveVarcharObjectInspector.java
 (original)
+++ 
hive/trunk/serde/src/java/org/apache/hadoop/hive/serde2/objectinspector/primitive/JavaHiveVarcharObjectInspector.java
 Sun Aug 31 17:45:14 2014
@@ -19,11 +19,11 @@ package org.apache.hadoop.hive.serde2.ob
 
 import org.apache.hadoop.hive.common.type.HiveVarchar;
 import org.apache.hadoop.hive.serde2.io.HiveVarcharWritable;
-import org.apache.hadoop.hive.serde2.typeinfo.VarcharTypeInfo;
 import org.apache.hadoop.hive.serde2.typeinfo.BaseCharUtils;
+import org.apache.hadoop.hive.serde2.typeinfo.VarcharTypeInfo;
 
 public class JavaHiveVarcharObjectInspector extends 
AbstractPrimitiveJavaObjectInspector
-implements SettableHiveVarcharObjectInspector {
+  implements SettableHiveVarcharObjectInspector {
 
   // no-arg ctor required for Kyro serialization
   public JavaHiveVarcharObjectInspector() {
@@ -38,9 +38,8 @@ implements SettableHiveVarcharObjectInsp
     if (o == null) {
       return null;
     }
-    HiveVarchar value = (HiveVarchar)o;
-    if (BaseCharUtils.doesPrimitiveMatchTypeParams(
-        value, (VarcharTypeInfo)typeInfo)) {
+    HiveVarchar value = (HiveVarchar) o;
+    if (BaseCharUtils.doesPrimitiveMatchTypeParams(value, (VarcharTypeInfo) 
typeInfo)) {
       return value;
     }
     // value needs to be converted to match the type params (length, etc).
@@ -52,40 +51,27 @@ implements SettableHiveVarcharObjectInsp
     if (o == null) {
       return null;
     }
-    return getWritableWithParams((HiveVarchar)o);
-  }
-
-  private HiveVarchar getPrimitiveWithParams(HiveVarchar val) {
-    HiveVarchar hv = new HiveVarchar(val, getMaxLength());
-    return hv;
-  }
-
-  private HiveVarcharWritable getWritableWithParams(HiveVarchar val) {
-    HiveVarcharWritable newValue = new HiveVarcharWritable();
-    newValue.set(val, getMaxLength());
-    return newValue;
+    return getWritableWithParams((HiveVarchar) o);
   }
 
   @Override
   public Object set(Object o, HiveVarchar value) {
-    if (BaseCharUtils.doesPrimitiveMatchTypeParams(
-        value, (VarcharTypeInfo)typeInfo)) {
-      return o = value;
+    if (BaseCharUtils.doesPrimitiveMatchTypeParams(value, (VarcharTypeInfo) 
typeInfo)) {
+      return value;
     } else {
       // Otherwise value may be too long, convert to appropriate value based 
on params
-      return o = new HiveVarchar(value,  getMaxLength());
+      return new HiveVarchar(value, getMaxLength());
     }
   }
 
   @Override
   public Object set(Object o, String value) {
-    return o = new HiveVarchar(value, getMaxLength());
+    return new HiveVarchar(value, getMaxLength());
   }
 
   @Override
   public Object create(HiveVarchar value) {
-    HiveVarchar hc = new HiveVarchar(value, getMaxLength());
-    return hc;
+    return new HiveVarchar(value, getMaxLength());
   }
 
   public int getMaxLength() {
@@ -93,4 +79,14 @@ implements SettableHiveVarcharObjectInsp
     return ti.getLength();
   }
 
+  private HiveVarchar getPrimitiveWithParams(HiveVarchar val) {
+    return new HiveVarchar(val, getMaxLength());
+  }
+
+  private HiveVarcharWritable getWritableWithParams(HiveVarchar val) {
+    HiveVarcharWritable newValue = new HiveVarcharWritable();
+    newValue.set(val, getMaxLength());
+    return newValue;
+  }
+
 }