Remove the ColumnarFileFormat type to put it in another PR

Author: mallman

sql/core/src/main/scala/org/apache/spark/sql/execution/DataSourceScanExec.scala

@@ -301,20 +301,7 @@ case class FileSourceScanExec(
     } getOrElse {
       withOptPartitionCount
     }
-
-    val withOptColumnCount = withSelectedBucketsCount.fileFormat match {
-      case columnar: ColumnarFileFormat =>
-        SparkSession
-          .getActiveSession
-          .map { sparkSession =>
-            val columnCount = columnar.columnCountForSchema(sparkSession, requiredSchema)
-            withSelectedBucketsCount + ("ColumnCount" -> columnCount.toString)
-          } getOrElse {
-            withSelectedBucketsCount
-          }
-      case _ => withSelectedBucketsCount
-    }
-    withOptColumnCount
+    withSelectedBucketsCount
   }
 
   private lazy val inputRDD: RDD[InternalRow] = {

sql/core/src/main/scala/org/apache/spark/sql/execution/datasources/ColumnarFileFormat.scala

@@ -56,7 +56,6 @@ import org.apache.spark.util.{SerializableConfiguration, ThreadUtils}
 
 class ParquetFileFormat
   extends FileFormat
-  with ColumnarFileFormat
   with DataSourceRegister
   with Logging
   with Serializable {
@@ -74,14 +73,6 @@ class ParquetFileFormat
 
   override def equals(other: Any): Boolean = other.isInstanceOf[ParquetFileFormat]
 
-  override def columnCountForSchema(sparkSession: SparkSession, readSchema: StructType): Int = {
-    val converter = new SparkToParquetSchemaConverter(
-          sparkSession.sessionState.conf.writeLegacyParquetFormat,
-          sparkSession.sessionState.conf.parquetOutputTimestampType)
-    val parquetSchema = converter.convert(readSchema)
-    parquetSchema.getPaths.size
-  }
-
   override def prepareWrite(
       sparkSession: SparkSession,
       job: Job,