diff --git a/sql/hive/src/main/scala/org/apache/spark/sql/hive/hiveUdfs.scala b/sql/hive/src/main/scala/org/apache/spark/sql/hive/hiveUdfs.scala
index 537e21eac7b0f..8c1e39b76161c 100644
--- a/sql/hive/src/main/scala/org/apache/spark/sql/hive/hiveUdfs.scala
+++ b/sql/hive/src/main/scala/org/apache/spark/sql/hive/hiveUdfs.scala
@@ -28,10 +28,10 @@ import org.apache.spark.sql.catalyst.analysis
 import org.apache.spark.sql.catalyst.expressions._
 import org.apache.spark.sql.catalyst.types._
 import org.apache.spark.util.Utils.getContextOrSparkClassLoader
+import org.apache.spark.sql.hive.HiveShim
 
 /* Implicit conversions */
 import scala.collection.JavaConversions._
-import org.apache.spark.sql.hive.HiveShim
 
 private[hive] abstract class HiveFunctionRegistry
   extends analysis.FunctionRegistry with HiveInspectors {
diff --git a/sql/hive/v0.12.0/src/main/scala/org/apache/spark/sql/hive/Shim.scala b/sql/hive/v0.12.0/src/main/scala/org/apache/spark/sql/hive/Shim.scala
index 5dca21bf2eca5..b23d1f027e2e8 100644
--- a/sql/hive/v0.12.0/src/main/scala/org/apache/spark/sql/hive/Shim.scala
+++ b/sql/hive/v0.12.0/src/main/scala/org/apache/spark/sql/hive/Shim.scala
@@ -49,7 +49,7 @@ object HiveShim {
   /*handle the difference in "None" and empty ""*/
   def getEmptyCommentsFieldValue = "None"
 
-  def convertCatalystString2Hive(s: String) = new hadoopIo.Text(s)
+  def convertCatalystString2Hive(s: String) = new hadoopIo.Text(s) // TODO why should be Text?
 
   def getCommandProcessor(cmd: Array[String], conf: HiveConf) =  {
     CommandProcessorFactory.get(cmd(0), conf)