-
Notifications
You must be signed in to change notification settings - Fork 28.3k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge branch 'master' into SPARK-31937
- Loading branch information
Showing
43 changed files
with
799 additions
and
347 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
120 changes: 120 additions & 0 deletions
120
...atalyst/src/main/scala/org/apache/spark/sql/catalyst/optimizer/OptimizeCsvJsonExprs.scala
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,120 @@ | ||
| /* | ||
| * Licensed to the Apache Software Foundation (ASF) under one or more | ||
| * contributor license agreements. See the NOTICE file distributed with | ||
| * this work for additional information regarding copyright ownership. | ||
| * The ASF licenses this file to You under the Apache License, Version 2.0 | ||
| * (the "License"); you may not use this file except in compliance with | ||
| * the License. You may obtain a copy of the License at | ||
| * | ||
| * http://www.apache.org/licenses/LICENSE-2.0 | ||
| * | ||
| * Unless required by applicable law or agreed to in writing, software | ||
| * distributed under the License is distributed on an "AS IS" BASIS, | ||
| * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
| * See the License for the specific language governing permissions and | ||
| * limitations under the License. | ||
| */ | ||
|
|
||
| package org.apache.spark.sql.catalyst.optimizer | ||
|
|
||
| import org.apache.spark.sql.catalyst.expressions._ | ||
| import org.apache.spark.sql.catalyst.plans.logical.LogicalPlan | ||
| import org.apache.spark.sql.catalyst.rules.Rule | ||
| import org.apache.spark.sql.internal.SQLConf | ||
| import org.apache.spark.sql.types.{ArrayType, StructType} | ||
|
|
||
| /** | ||
| * Simplify redundant csv/json related expressions. | ||
| * | ||
| * The optimization includes: | ||
| * 1. JsonToStructs(StructsToJson(child)) => child. | ||
| * 2. Prune unnecessary columns from GetStructField/GetArrayStructFields + JsonToStructs. | ||
| * 3. CreateNamedStruct(JsonToStructs(json).col1, JsonToStructs(json).col2, ...) => | ||
| * If(IsNull(json), nullStruct, KnownNotNull(JsonToStructs(prunedSchema, ..., json))) | ||
| * if JsonToStructs(json) is shared among all fields of CreateNamedStruct. `prunedSchema` | ||
| * contains all accessed fields in original CreateNamedStruct. | ||
| * 4. Prune unnecessary columns from GetStructField + CsvToStructs. | ||
| */ | ||
| object OptimizeCsvJsonExprs extends Rule[LogicalPlan] { | ||
| private def nameOfCorruptRecord = SQLConf.get.getConf(SQLConf.COLUMN_NAME_OF_CORRUPT_RECORD) | ||
|
|
||
| override def apply(plan: LogicalPlan): LogicalPlan = plan transform { | ||
| case p => | ||
| val optimized = if (SQLConf.get.jsonExpressionOptimization) { | ||
| p.transformExpressions(jsonOptimization) | ||
| } else { | ||
| p | ||
| } | ||
|
|
||
| if (SQLConf.get.csvExpressionOptimization) { | ||
| optimized.transformExpressions(csvOptimization) | ||
| } else { | ||
| optimized | ||
| } | ||
| } | ||
|
|
||
| private val jsonOptimization: PartialFunction[Expression, Expression] = { | ||
| case c: CreateNamedStruct | ||
| // If we create struct from various fields of the same `JsonToStructs`. | ||
| if c.valExprs.forall { v => | ||
| v.isInstanceOf[GetStructField] && | ||
| v.asInstanceOf[GetStructField].child.isInstanceOf[JsonToStructs] && | ||
| v.children.head.semanticEquals(c.valExprs.head.children.head) | ||
| } => | ||
| val jsonToStructs = c.valExprs.map(_.children.head) | ||
| val sameFieldName = c.names.zip(c.valExprs).forall { | ||
| case (name, valExpr: GetStructField) => | ||
| name.toString == valExpr.childSchema(valExpr.ordinal).name | ||
| case _ => false | ||
| } | ||
|
|
||
| // Although `CreateNamedStruct` allows duplicated field names, e.g. "a int, a int", | ||
| // `JsonToStructs` does not support parsing json with duplicated field names. | ||
| val duplicateFields = c.names.map(_.toString).distinct.length != c.names.length | ||
|
|
||
| // If we create struct from various fields of the same `JsonToStructs` and we don't | ||
| // alias field names and there is no duplicated field in the struct. | ||
| if (sameFieldName && !duplicateFields) { | ||
| val fromJson = jsonToStructs.head.asInstanceOf[JsonToStructs].copy(schema = c.dataType) | ||
| val nullFields = c.children.grouped(2).flatMap { | ||
| case Seq(name, value) => Seq(name, Literal(null, value.dataType)) | ||
| }.toSeq | ||
|
|
||
| If(IsNull(fromJson.child), c.copy(children = nullFields), KnownNotNull(fromJson)) | ||
| } else { | ||
| c | ||
| } | ||
|
|
||
| case jsonToStructs @ JsonToStructs(_, options1, | ||
| StructsToJson(options2, child, timeZoneId2), timeZoneId1) | ||
| if options1.isEmpty && options2.isEmpty && timeZoneId1 == timeZoneId2 && | ||
| jsonToStructs.dataType == child.dataType => | ||
| // `StructsToJson` only fails when `JacksonGenerator` encounters data types it | ||
| // cannot convert to JSON. But `StructsToJson.checkInputDataTypes` already | ||
| // verifies its child's data types is convertible to JSON. But in | ||
| // `StructsToJson(JsonToStructs(...))` case, we cannot verify input json string | ||
| // so `JsonToStructs` might throw error in runtime. Thus we cannot optimize | ||
| // this case similarly. | ||
| child | ||
|
|
||
| case g @ GetStructField(j @ JsonToStructs(schema: StructType, _, _, _), ordinal, _) | ||
| if schema.length > 1 => | ||
| val prunedSchema = StructType(Seq(schema(ordinal))) | ||
| g.copy(child = j.copy(schema = prunedSchema), ordinal = 0) | ||
|
|
||
| case g @ GetArrayStructFields(j @ JsonToStructs(schema: ArrayType, _, _, _), _, _, _, _) | ||
| if schema.elementType.asInstanceOf[StructType].length > 1 => | ||
| val prunedSchema = ArrayType(StructType(Seq(g.field)), g.containsNull) | ||
| g.copy(child = j.copy(schema = prunedSchema), ordinal = 0, numFields = 1) | ||
| } | ||
|
|
||
| private val csvOptimization: PartialFunction[Expression, Expression] = { | ||
| case g @ GetStructField(c @ CsvToStructs(schema: StructType, _, _, _, None), ordinal, _) | ||
| if schema.length > 1 && c.options.isEmpty && schema(ordinal).name != nameOfCorruptRecord => | ||
| // When the parse mode is permissive, and corrupt column is not selected, we can prune here | ||
| // from `GetStructField`. To be more conservative, it does not optimize when any option | ||
| // is set. | ||
| val prunedSchema = StructType(Seq(schema(ordinal))) | ||
| g.copy(child = c.copy(requiredSchema = Some(prunedSchema)), ordinal = 0) | ||
| } | ||
| } |
Oops, something went wrong.