Skip to content

[SPARK-54436][SQL] Fix error formatting for incompatible table metadata checks #53115

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 1 commit into from
Closed

[SPARK-54436][SQL] Fix error formatting for incompatible table metadata checks #53115

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
8 changes: 4 additions & 4 deletions sql/catalyst/src/main/scala/org/apache/spark/sql/errors/QueryCompilationErrors.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2140,7 +2140,7 @@ private[sql] object QueryCompilationErrors extends QueryErrorsBase with Compilat
errorClass = "INCOMPATIBLE_TABLE_CHANGE_AFTER_ANALYSIS.COLUMNS_MISMATCH",
messageParameters = Map(
"tableName" -> toSQLId(tableName),
"errors" -> errors.mkString("\n- ", "\n- ", "")))
"errors" -> errors.mkString("- ", "\n- ", "")))
}

def metadataColumnsChangedAfterAnalysis(
Expand All @@ -2150,7 +2150,7 @@ private[sql] object QueryCompilationErrors extends QueryErrorsBase with Compilat
errorClass = "INCOMPATIBLE_TABLE_CHANGE_AFTER_ANALYSIS.METADATA_COLUMNS_MISMATCH",
messageParameters = Map(
"tableName" -> toSQLId(tableName),
"errors" -> errors.mkString("\n- ", "\n- ", "")))
"errors" -> errors.mkString("- ", "\n- ", "")))
}

def numberOfPartitionsNotAllowedWithUnspecifiedDistributionError(): Throwable = {
Expand Down Expand Up @@ -4477,7 +4477,7 @@ private[sql] object QueryCompilationErrors extends QueryErrorsBase with Compilat
"viewName" -> toSQLId(viewName),
"tableName" -> toSQLId(tableName),
"colType" -> "data",
"errors" -> errors.mkString("\n- ", "\n- ", "")))
"errors" -> errors.mkString("- ", "\n- ", "")))
}

def metadataColumnsChangedAfterViewWithPlanCreation(
Expand All @@ -4490,6 +4490,6 @@ private[sql] object QueryCompilationErrors extends QueryErrorsBase with Compilat
"viewName" -> toSQLId(viewName),
"tableName" -> toSQLId(tableName),
"colType" -> "metadata",
"errors" -> errors.mkString("\n- ", "\n- ", "")))
"errors" -> errors.mkString("- ", "\n- ", "")))
}
}
28 changes: 12 additions & 16 deletions sql/core/src/test/scala/org/apache/spark/sql/connector/DataSourceV2DataFrameSuite.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1117,7 +1117,7 @@ class DataSourceV2DataFrameSuite
condition = "INCOMPATIBLE_TABLE_CHANGE_AFTER_ANALYSIS.COLUMNS_MISMATCH",
parameters = Map(
"tableName" -> "`testcat`.`ns1`.`ns2`.`tbl`",
"errors" -> "\n- `extra` STRING has been removed"))
"errors" -> "- `extra` STRING has been removed"))
}
}

Expand All @@ -1141,8 +1141,7 @@ class DataSourceV2DataFrameSuite
parameters = Map(
"tableName" -> "`testcat`.`ns1`.`ns2`.`tbl`",
"errors" ->
"""
|- `new_col1` INT has been added
"""- `new_col1` INT has been added
|- `new_col2` INT has been added""".stripMargin))
}
}
Expand All @@ -1167,8 +1166,7 @@ class DataSourceV2DataFrameSuite
parameters = Map(
"tableName" -> "`testcat`.`ns1`.`ns2`.`tbl`",
"errors" ->
"""
|- `col4` STRING has been removed
"""- `col4` STRING has been removed
|- `col5` INT has been added""".stripMargin))
}
}
Expand All @@ -1195,9 +1193,7 @@ class DataSourceV2DataFrameSuite
"viewName" -> "`v`",
"tableName" -> "`testcat`.`ns1`.`ns2`.`tbl`",
"colType" -> "data",
"errors" ->
"""
|- `extra` INT has been added""".stripMargin))
"errors" -> "- `extra` INT has been added"))
}
}

Expand All @@ -1220,7 +1216,7 @@ class DataSourceV2DataFrameSuite
parameters = Map(
"tableName" -> "`testcat`.`ns1`.`ns2`.`tbl`",
"errors" ->
("\n- `person` type has changed from STRUCT<name: STRING, age: INT> " +
("- `person` type has changed from STRUCT<name: STRING, age: INT> " +
"to STRUCT<name: STRING, age: INT, city: STRING>")))
}
}
Expand Down Expand Up @@ -1270,7 +1266,7 @@ class DataSourceV2DataFrameSuite
condition = "INCOMPATIBLE_TABLE_CHANGE_AFTER_ANALYSIS.COLUMNS_MISMATCH",
parameters = Map(
"tableName" -> "`testcat`.`ns1`.`ns2`.`tbl`",
"errors" -> "\n- `extra` STRING has been added"))
"errors" -> "- `extra` STRING has been added"))

// DataFrame execution before joins must have pinned used versions
// subsequent version refreshes must not be visible in original DataFrames
Expand Down Expand Up @@ -1400,7 +1396,7 @@ class DataSourceV2DataFrameSuite
"viewName" -> "`v`",
"tableName" -> "`testcat`.`ns1`.`ns2`.`tbl`",
"colType" -> "data",
"errors" -> "\n- `age` INT has been added"))
"errors" -> "- `age` INT has been added"))
}
}

Expand All @@ -1424,7 +1420,7 @@ class DataSourceV2DataFrameSuite
"viewName" -> "`v`",
"tableName" -> "`testcat`.`ns1`.`ns2`.`tbl`",
"colType" -> "data",
"errors" -> "\n- `age` INT has been removed"))
"errors" -> "- `age` INT has been removed"))
}
}

Expand All @@ -1448,7 +1444,7 @@ class DataSourceV2DataFrameSuite
"viewName" -> "`v`",
"tableName" -> "`testcat`.`ns1`.`ns2`.`tbl`",
"colType" -> "data",
"errors" -> "\n- `data` type has changed from STRING NOT NULL to STRING"))
"errors" -> "- `data` type has changed from STRING NOT NULL to STRING"))
}
}

Expand Down Expand Up @@ -1537,7 +1533,7 @@ class DataSourceV2DataFrameSuite
"viewName" -> "`v`",
"tableName" -> "`testcat`.`ns1`.`ns2`.`tbl`",
"colType" -> "data",
"errors" -> "\n- `age` INT has been added"))
"errors" -> "- `age` INT has been added"))
}
}

Expand Down Expand Up @@ -1566,7 +1562,7 @@ class DataSourceV2DataFrameSuite
"viewName" -> "`v`",
"tableName" -> "`testcat`.`ns1`.`ns2`.`tbl`",
"colType" -> "data",
"errors" -> "\n- `age` INT has been added"))
"errors" -> "- `age` INT has been added"))
}
}
}
Expand All @@ -1591,7 +1587,7 @@ class DataSourceV2DataFrameSuite
"viewName" -> "`v`",
"tableName" -> "`testcat`.`ns1`.`ns2`.`tbl`",
"colType" -> "data",
"errors" -> "\n- `name` type has changed from VARCHAR(10) to VARCHAR(20)"))
"errors" -> "- `name` type has changed from VARCHAR(10) to VARCHAR(20)"))
}
}

Expand Down