Skip to content

[SPARK-53290][SQL][CONNECT] Fix Metadata backward-compatibility breaking #52037

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-53290][SQL][CONNECT] Fix Metadata backward-compatibility breaking #52037

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
18 changes: 12 additions & 6 deletions sql/api/src/main/scala/org/apache/spark/sql/types/Metadata.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,13 +40,15 @@ import org.apache.spark.util.ArrayImplicits._
* @since 1.3.0
*/
@Stable
sealed class Metadata private[types] (
private[types] val map: Map[String, Any],
@transient private[types] val runtimeMap: Map[String, Any])
@SerialVersionUID(-3987058932362209243L)
sealed class Metadata private[types] (private[types] val map: Map[String, Any])
extends Serializable {

@transient private[types] var runtimeMap: Map[String, Any] = _
private[types] def setRuntimeMap(map: Map[String, Any]): Unit = runtimeMap = map

/** No-arg constructor for kryo. */
protected def this() = this(null, null)
protected def this() = this(null)

/** Tests whether this Metadata contains a binding for a key. */
def contains(key: String): Boolean = map.contains(key)
Expand Down Expand Up @@ -137,7 +139,7 @@ sealed class Metadata private[types] (
@Stable
object Metadata {

private[this] val _empty = new Metadata(Map.empty, Map.empty)
private[this] val _empty = new Metadata(Map.empty)

/** Returns an empty Metadata. */
def empty: Metadata = _empty
Expand Down Expand Up @@ -309,7 +311,11 @@ class MetadataBuilder {
// Save some memory when the metadata is empty
Metadata.empty
} else {
new Metadata(map.toMap, runtimeMap.toMap)
val metadata = new Metadata(map.toMap)
if (runtimeMap.nonEmpty) {
metadata.setRuntimeMap(runtimeMap.toMap)
}
metadata
}
}

Expand Down