Skip to content

Commit c5120fa

Browse files
committed
Fix scalastyle and address review comment
1 parent c81c039 commit c5120fa

File tree

4 files changed

+4
-3
lines changed

4 files changed

+4
-3
lines changed

sql/catalyst/src/main/scala/org/apache/spark/sql/internal/SQLConf.scala

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1538,7 +1538,7 @@ object SQLConf {
15381538
.createWithDefault(false)
15391539

15401540
val V2_BUCKETING_ALLOW_COMPATIBLE_TRANSFORMS =
1541-
buildConf("spark.sql.sources.v2.bucketing.allow.enabled")
1541+
buildConf("spark.sql.sources.v2.bucketing.allowCompatibleTransforms.enabled")
15421542
.doc("Whether to allow storage-partition join in the case where the partition transforms" +
15431543
"are compatible but not identical. This config requires both " +
15441544
s"${V2_BUCKETING_ENABLED.key} and ${V2_BUCKETING_PUSH_PART_VALUES_ENABLED.key} to be " +

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -237,6 +237,7 @@ case class BatchScanExec(
237237

238238
case _ => filteredPartitions
239239
}
240+
240241
new DataSourceRDD(
241242
sparkContext, finalPartitions, readerFactory, supportsColumnar, customMetrics)
242243
}

sql/core/src/test/scala/org/apache/spark/sql/connector/KeyGroupedPartitioningSuite.scala

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1549,7 +1549,7 @@ class KeyGroupedPartitioningSuite extends DistributionAndOrderingSuiteBase {
15491549
Row(3, 4, 2, 2, "ad", "04"),
15501550
Row(4, 3, 3, 3, "ae", "05"),
15511551
Row(5, 2, 4, 4, "af", "06"),
1552-
Row(6, 1, 5, 5, "ag", "07"),
1552+
Row(6, 1, 5, 5, "ag", "07")
15531553
))
15541554
}
15551555
}

sql/core/src/test/scala/org/apache/spark/sql/connector/catalog/functions/transformFunctions.scala

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -91,7 +91,7 @@ object BucketFunction extends ReducibleFunction[Int, Int] {
9191
otherNumBuckets: Option[_]): Option[Reducer[Int]] = {
9292
(thisNumBuckets, otherNumBuckets) match {
9393
case (Some(thisNumBucketsVal: Int), Some(otherNumBucketsVal: Int))
94-
if func.isInstanceOf[ReducibleFunction[_, _]] &&
94+
if func == BucketFunction &&
9595
((thisNumBucketsVal > otherNumBucketsVal) &&
9696
(thisNumBucketsVal % otherNumBucketsVal == 0)) =>
9797
Some(BucketReducer(thisNumBucketsVal, otherNumBucketsVal))

0 commit comments

Comments
 (0)