code style

apache · Mar 20, 2018 · 82c5a73 · 82c5a73
1 parent 8f36d1e
commit 82c5a73
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 21 deletions.
diff --git a/...re/src/main/scala/org/apache/spark/sql/execution/datasources/parquet/ParquetFilters.scala b/...re/src/main/scala/org/apache/spark/sql/execution/datasources/parquet/ParquetFilters.scala
@@ -53,13 +53,11 @@ private[parquet] object ParquetFilters {
         binaryColumn(n),
         Option(v).map(b => Binary.fromReusedByteArray(v.asInstanceOf[Array[Byte]])).orNull)
     case DateType if SQLConf.get.parquetFilterPushDownDate =>
-      (n: String, v: Any) => {
-        FilterApi.eq(
+      (n: String, v: Any) => FilterApi.eq(
           intColumn(n),
           Option(v).map { d =>
             DateTimeUtils.fromJavaDate(d.asInstanceOf[java.sql.Date]).asInstanceOf[Integer]
           }.orNull)
-      }
   }
 
   private val makeNotEq: PartialFunction[DataType, (String, Any) => FilterPredicate] = {
@@ -83,13 +81,11 @@ private[parquet] object ParquetFilters {
         binaryColumn(n),
         Option(v).map(b => Binary.fromReusedByteArray(v.asInstanceOf[Array[Byte]])).orNull)
     case DateType if SQLConf.get.parquetFilterPushDownDate =>
-      (n: String, v: Any) => {
-        FilterApi.notEq(
+      (n: String, v: Any) => FilterApi.notEq(
           intColumn(n),
           Option(v).map { d =>
             DateTimeUtils.fromJavaDate(d.asInstanceOf[java.sql.Date]).asInstanceOf[Integer]
           }.orNull)
-      }
   }
 
   private val makeLt: PartialFunction[DataType, (String, Any) => FilterPredicate] = {
@@ -110,13 +106,11 @@ private[parquet] object ParquetFilters {
       (n: String, v: Any) =>
         FilterApi.lt(binaryColumn(n), Binary.fromReusedByteArray(v.asInstanceOf[Array[Byte]]))
     case DateType if SQLConf.get.parquetFilterPushDownDate =>
-      (n: String, v: Any) => {
-        FilterApi.lt(
+      (n: String, v: Any) => FilterApi.lt(
           intColumn(n),
           Option(v).map { d =>
             DateTimeUtils.fromJavaDate(d.asInstanceOf[java.sql.Date]).asInstanceOf[Integer]
           }.orNull)
-      }
   }
 
   private val makeLtEq: PartialFunction[DataType, (String, Any) => FilterPredicate] = {
@@ -137,13 +131,11 @@ private[parquet] object ParquetFilters {
       (n: String, v: Any) =>
         FilterApi.ltEq(binaryColumn(n), Binary.fromReusedByteArray(v.asInstanceOf[Array[Byte]]))
     case DateType if SQLConf.get.parquetFilterPushDownDate =>
-      (n: String, v: Any) => {
-        FilterApi.ltEq(
+      (n: String, v: Any) => FilterApi.ltEq(
           intColumn(n),
           Option(v).map { d =>
             DateTimeUtils.fromJavaDate(d.asInstanceOf[java.sql.Date]).asInstanceOf[Integer]
           }.orNull)
-      }
   }
 
   private val makeGt: PartialFunction[DataType, (String, Any) => FilterPredicate] = {
@@ -164,13 +156,11 @@ private[parquet] object ParquetFilters {
       (n: String, v: Any) =>
         FilterApi.gt(binaryColumn(n), Binary.fromReusedByteArray(v.asInstanceOf[Array[Byte]]))
     case DateType if SQLConf.get.parquetFilterPushDownDate =>
-      (n: String, v: Any) => {
-        FilterApi.gt(
+      (n: String, v: Any) => FilterApi.gt(
           intColumn(n),
           Option(v).map { d =>
             DateTimeUtils.fromJavaDate(d.asInstanceOf[java.sql.Date]).asInstanceOf[Integer]
           }.orNull)
-      }
   }
 
   private val makeGtEq: PartialFunction[DataType, (String, Any) => FilterPredicate] = {
@@ -191,13 +181,11 @@ private[parquet] object ParquetFilters {
       (n: String, v: Any) =>
         FilterApi.gtEq(binaryColumn(n), Binary.fromReusedByteArray(v.asInstanceOf[Array[Byte]]))
     case DateType if SQLConf.get.parquetFilterPushDownDate =>
-      (n: String, v: Any) => {
-        FilterApi.gtEq(
+      (n: String, v: Any) => FilterApi.gtEq(
           intColumn(n),
           Option(v).map { d =>
             DateTimeUtils.fromJavaDate(d.asInstanceOf[java.sql.Date]).asInstanceOf[Integer]
           }.orNull)
-      }
   }
 
   /**

diff --git a/...rc/test/scala/org/apache/spark/sql/execution/datasources/parquet/ParquetFilterSuite.scala b/...rc/test/scala/org/apache/spark/sql/execution/datasources/parquet/ParquetFilterSuite.scala
@@ -79,8 +79,8 @@ class ParquetFilterSuite extends QueryTest with ParquetTest with SharedSQLContex
 
     withSQLConf(
       SQLConf.PARQUET_FILTER_PUSHDOWN_ENABLED.key -> "true",
-      SQLConf.PARQUET_FILTER_PUSHDOWN_DATE_ENABLED.key -> "true") {
-      withSQLConf(SQLConf.PARQUET_VECTORIZED_READER_ENABLED.key -> "false") {
+      SQLConf.PARQUET_FILTER_PUSHDOWN_DATE_ENABLED.key -> "true",
+      SQLConf.PARQUET_VECTORIZED_READER_ENABLED.key -> "false") {
         val query = df
           .select(output.map(e => Column(e)): _*)
           .where(Column(predicate))
@@ -105,7 +105,6 @@ class ParquetFilterSuite extends QueryTest with ParquetTest with SharedSQLContex
           maybeFilter.exists(_.getClass === filterClass)
         }
         checker(stripSparkFilter(query), expected)
-      }
     }
   }