check both configs to align the behavior in hive

Author: brandonlin

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

@@ -281,9 +281,11 @@ private[hive] class HiveMetastoreCatalog(sparkSession: SparkSession) extends Log
   private def getDirectoryPathSeq(rootPath: Path): Seq[String] = {
     val enableSupportSubDirectories =
       sparkSession.sparkContext.
-        hadoopConfiguration.get("hive.mapred.supports.subdirectories", "false")
+        hadoopConfiguration.getBoolean("hive.mapred.supports.subdirectories", false) &&
+        sparkSession.sparkContext.
+          hadoopConfiguration.getBoolean("mapred.input.dir.recursive", false)
 
-    if (enableSupportSubDirectories.toBoolean) {
+    if (enableSupportSubDirectories) {
       val fs = rootPath.getFileSystem(sparkSession.sessionState.newHadoopConf())
       SparkHadoopUtil.get.listLeafDirStatuses(fs, rootPath).map(_.getPath.toString)
     } else {

sql/hive/src/test/scala/org/apache/spark/sql/hive/HiveMetastoreCatalogSuite.scala

@@ -372,6 +372,9 @@ class DataSourceWithHiveMetastoreCatalogSuite
         spark.sparkContext
           .hadoopConfiguration.set("hive.mapred.supports.subdirectories", "true")
 
+        spark.sparkContext
+          .hadoopConfiguration.set("mapred.input.dir.recursive", "true")
+
         val dataFrame = spark.sqlContext
           .createDataFrame(testData, StructType(Seq(StructField("val", IntegerType))))