Matching the Hive 2.3.x prefix

Author: wangyum

sql/hive/src/main/scala/org/apache/spark/sql/hive/HiveShim.scala

@@ -158,7 +158,7 @@ private[hive] object HiveShim {
     }
 
     def deserializePlan[UDFType](is: java.io.InputStream, clazz: Class[_]): UDFType = {
-      if (HiveUtils.isSupportedHive2) {
+      if (HiveUtils.isHive23) {
         val borrowKryo = serUtilClass.getMethod("borrowKryo")
         val kryo = borrowKryo.invoke(serUtilClass)
         val deserializeObjectByKryo = findMethod(serUtilClass, deserializeMethodName,
@@ -180,7 +180,7 @@ private[hive] object HiveShim {
     }
 
     def serializePlan(function: AnyRef, out: java.io.OutputStream): Unit = {
-      if (HiveUtils.isSupportedHive2) {
+      if (HiveUtils.isHive23) {
         val borrowKryo = serUtilClass.getMethod("borrowKryo")
         val kryo = borrowKryo.invoke(serUtilClass)
         val serializeObjectByKryo = findMethod(serUtilClass, serializeMethodName,

sql/hive/src/main/scala/org/apache/spark/sql/hive/HiveUtils.scala

@@ -55,11 +55,11 @@ private[spark] object HiveUtils extends Logging {
     sc
   }
 
-  private val supportedHive2ShortVersions = Set("2.3.0")
-  val isSupportedHive2 = supportedHive2ShortVersions.contains(HiveVersionInfo.getShortVersion)
+  private val hiveVersion = HiveVersionInfo.getVersion
+  val isHive23: Boolean = hiveVersion.startsWith("2.3")
 
   /** The version of hive used internally by Spark SQL. */
-  val builtinHiveVersion: String = if (isSupportedHive2) HiveVersionInfo.getVersion else "1.2.1"
+  val builtinHiveVersion: String = if (isHive23) hiveVersion else "1.2.1"
 
   val HIVE_METASTORE_VERSION = buildConf("spark.sql.hive.metastore.version")
     .doc("Version of the Hive metastore. Available options are " +

sql/hive/src/main/scala/org/apache/spark/sql/hive/hiveUDFs.scala

@@ -338,7 +338,7 @@ private[hive] case class HiveUDAFFunction(
     }
 
     val clazz = Utils.classForName(classOf[SimpleGenericUDAFParameterInfo].getName)
-    if (HiveUtils.isSupportedHive2) {
+    if (HiveUtils.isHive23) {
       val ctor = clazz.getDeclaredConstructor(
         classOf[Array[ObjectInspector]], JBoolean.TYPE, JBoolean.TYPE, JBoolean.TYPE)
       val args = Array[AnyRef](inputInspectors, JBoolean.FALSE, JBoolean.FALSE, JBoolean.FALSE)

sql/hive/src/main/scala/org/apache/spark/sql/hive/orc/OrcFilters.scala

@@ -70,7 +70,7 @@ private[orc] object OrcFilters extends Logging {
   }
 
   def createFilter(schema: StructType, filters: Array[Filter]): Option[SearchArgument] = {
-    if (HiveUtils.isSupportedHive2) {
+    if (HiveUtils.isHive23) {
       DatasourceOrcFilters.createFilter(schema, filters).asInstanceOf[Option[SearchArgument]]
     } else {
       val dataTypeMap = schema.map(f => f.name -> f.dataType).toMap