Skip to content

Commit 00b9d47

Browse files
committed
Restore previous style.
1 parent aa32dcc commit 00b9d47

File tree

1 file changed

+7
-13
lines changed

1 file changed

+7
-13
lines changed

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

Lines changed: 7 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -179,22 +179,16 @@ class DataSourceV2Strategy(session: SparkSession) extends Strategy with Predicat
179179

180180
case OverwriteByExpression(r: DataSourceV2Relation, deleteExpr, query, writeOptions, _) =>
181181
// fail if any filter cannot be converted. correctness depends on removing all matching data.
182-
val filters = splitConjunctivePredicates(deleteExpr)
183-
def transferFilters =
184-
(filters: Seq[Expression]) => {
185-
filters.map { filter =>
186-
DataSourceStrategy.translateFilter(deleteExpr, supportNestedPredicatePushdown = true)
187-
.getOrElse(throw new AnalysisException(
188-
s"Cannot translate expression to source filter: $filter"))
189-
}.toArray
190-
}
182+
val filters = splitConjunctivePredicates(deleteExpr).map {
183+
filter => DataSourceStrategy.translateFilter(deleteExpr,
184+
supportNestedPredicatePushdown = true).getOrElse(
185+
throw new AnalysisException(s"Cannot translate expression to source filter: $filter"))
186+
}.toArray
191187
r.table.asWritable match {
192188
case v1 if v1.supports(TableCapability.V1_BATCH_WRITE) =>
193-
OverwriteByExpressionExecV1(
194-
v1, transferFilters(filters), writeOptions.asOptions, query) :: Nil
189+
OverwriteByExpressionExecV1(v1, filters, writeOptions.asOptions, query) :: Nil
195190
case v2 =>
196-
OverwriteByExpressionExec(
197-
v2, transferFilters(filters), writeOptions.asOptions, planLater(query)) :: Nil
191+
OverwriteByExpressionExec(v2, filters, writeOptions.asOptions, planLater(query)) :: Nil
198192
}
199193

200194
case OverwritePartitionsDynamic(r: DataSourceV2Relation, query, writeOptions, _) =>

0 commit comments

Comments
 (0)