Skip to content

[SPARK-27964][SQL] Move v2 catalog update methods to CatalogV2Util #24813

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
rdblue wants to merge 3 commits into from
Closed

[SPARK-27964][SQL] Move v2 catalog update methods to CatalogV2Util #24813

Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
8463c73
SPARK-27964: Move v2 catalog update methods to CatalogV2Util.
rdblue Jun 5, 2019
b1ac505
Rename path to fieldNames.
rdblue Jun 5, 2019
ca848ba
Rename util package to utils to avoid name conflict with java.util.
rdblue Jun 6, 2019
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
Prev Previous commit
Next Next commit
Rename path to fieldNames.
  • Loading branch information
@rdblue
rdblue committed Jun 5, 2019
commit b1ac505120d3e29119f7507ad1a225ddb2577d24
12 changes: 6 additions & 6 deletions sql/catalyst/src/main/java/org/apache/spark/sql/catalog/v2/util/CatalogV2Util.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -122,21 +122,21 @@ object CatalogV2Util {

private def replace(
struct: StructType,
path: Seq[String],
fieldNames: Seq[String],
update: StructField => Option[StructField]): StructType = {

val pos = struct.getFieldIndex(path.head)
.getOrElse(throw new IllegalArgumentException(s"Cannot find field: ${path.head}"))
val pos = struct.getFieldIndex(fieldNames.head)
.getOrElse(throw new IllegalArgumentException(s"Cannot find field: ${fieldNames.head}"))
val field = struct.fields(pos)
val replacement: Option[StructField] = if (path.tail.isEmpty) {
val replacement: Option[StructField] = if (fieldNames.tail.isEmpty) {
update(field)
} else {
field.dataType match {
case nestedStruct: StructType =>
val updatedType: StructType = replace(nestedStruct, path.tail, update)
val updatedType: StructType = replace(nestedStruct, fieldNames.tail, update)
Some(StructField(field.name, updatedType, field.nullable, field.metadata))
case _ =>
throw new IllegalArgumentException(s"Not a struct: ${path.head}")
throw new IllegalArgumentException(s"Not a struct: ${fieldNames.head}")
}
}

Expand Down