Skip to content

[SPARK-45902][SQL] Remove unused function resolvePartitionColumns from DataSource #43779

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 2 commits into from
Closed

[SPARK-45902][SQL] Remove unused function resolvePartitionColumns from DataSource #43779

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
cb144a1
init
LuciferYang Nov 13, 2023
25afef3
Merge branch 'apache:master' into SPARK-45902
LuciferYang Nov 13, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
25 changes: 1 addition & 24 deletions sql/core/src/main/scala/org/apache/spark/sql/execution/datasources/DataSource.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,9 +29,8 @@ import org.apache.spark.SparkException
import org.apache.spark.deploy.SparkHadoopUtil
import org.apache.spark.internal.Logging
import org.apache.spark.sql._
import org.apache.spark.sql.catalyst.analysis.{Resolver, UnresolvedAttribute}
import org.apache.spark.sql.catalyst.analysis.UnresolvedAttribute
import org.apache.spark.sql.catalyst.catalog.{BucketSpec, CatalogStorageFormat, CatalogTable, CatalogUtils}
import org.apache.spark.sql.catalyst.expressions.Attribute
import org.apache.spark.sql.catalyst.plans.logical.LogicalPlan
import org.apache.spark.sql.catalyst.util.{CaseInsensitiveMap, TypeUtils}
import org.apache.spark.sql.connector.catalog.TableProvider
Expand Down Expand Up @@ -822,26 +821,4 @@ object DataSource extends Logging {
throw QueryCompilationErrors.writeEmptySchemasUnsupportedByDataSourceError()
}
}

/**
* Resolve partition columns using output columns of the query plan.
*/
def resolvePartitionColumns(
partitionColumns: Seq[Attribute],
outputColumns: Seq[Attribute],
plan: LogicalPlan,
resolver: Resolver): Seq[Attribute] = {
partitionColumns.map { col =>
// The partition columns created in `planForWritingFileFormat` should always be
// `UnresolvedAttribute` with a single name part.
assert(col.isInstanceOf[UnresolvedAttribute])
val unresolved = col.asInstanceOf[UnresolvedAttribute]
assert(unresolved.nameParts.length == 1)
val name = unresolved.nameParts.head
outputColumns.find(a => resolver(a.name, name)).getOrElse {
throw QueryCompilationErrors.cannotResolveAttributeError(
name, plan.output.map(_.name).mkString(", "))
}
}
}
}