aboutsummaryrefslogtreecommitdiff
path: root/sql/catalyst/src/main
diff options
context:
space:
mode:
authorWenchen Fan <wenchen@databricks.com>2016-07-25 09:28:56 +0800
committerWenchen Fan <wenchen@databricks.com>2016-07-25 09:28:56 +0800
commit1221ce04029154778ccb5453e348f6d116092cc5 (patch)
tree2f59418055af7815af432eb27f766b9169f1b7eb /sql/catalyst/src/main
parent23e047f4609bf39f50ea4c65f704cac15408a821 (diff)
downloadspark-1221ce04029154778ccb5453e348f6d116092cc5.tar.gz
spark-1221ce04029154778ccb5453e348f6d116092cc5.tar.bz2
spark-1221ce04029154778ccb5453e348f6d116092cc5.zip
[SPARK-16645][SQL] rename CatalogStorageFormat.serdeProperties to properties
## What changes were proposed in this pull request? we also store data source table options in this field, it's unreasonable to call it `serdeProperties`. ## How was this patch tested? N/A Author: Wenchen Fan <wenchen@databricks.com> Closes #14283 from cloud-fan/minor1.
Diffstat (limited to 'sql/catalyst/src/main')
-rw-r--r--sql/catalyst/src/main/scala/org/apache/spark/sql/catalyst/catalog/interface.scala10
1 files changed, 5 insertions, 5 deletions
diff --git a/sql/catalyst/src/main/scala/org/apache/spark/sql/catalyst/catalog/interface.scala b/sql/catalyst/src/main/scala/org/apache/spark/sql/catalyst/catalog/interface.scala
index b12606e17d..b7f35b3af4 100644
--- a/sql/catalyst/src/main/scala/org/apache/spark/sql/catalyst/catalog/interface.scala
+++ b/sql/catalyst/src/main/scala/org/apache/spark/sql/catalyst/catalog/interface.scala
@@ -49,12 +49,12 @@ case class CatalogStorageFormat(
outputFormat: Option[String],
serde: Option[String],
compressed: Boolean,
- serdeProperties: Map[String, String]) {
+ properties: Map[String, String]) {
override def toString: String = {
val serdePropsToString =
- if (serdeProperties.nonEmpty) {
- s"Properties: " + serdeProperties.map(p => p._1 + "=" + p._2).mkString("[", ", ", "]")
+ if (properties.nonEmpty) {
+ s"Properties: " + properties.map(p => p._1 + "=" + p._2).mkString("[", ", ", "]")
} else {
""
}
@@ -73,7 +73,7 @@ case class CatalogStorageFormat(
object CatalogStorageFormat {
/** Empty storage format for default values and copies. */
val empty = CatalogStorageFormat(locationUri = None, inputFormat = None,
- outputFormat = None, serde = None, compressed = false, serdeProperties = Map.empty)
+ outputFormat = None, serde = None, compressed = false, properties = Map.empty)
}
/**
@@ -165,7 +165,7 @@ case class CatalogTable(
outputFormat: Option[String] = storage.outputFormat,
compressed: Boolean = false,
serde: Option[String] = storage.serde,
- serdeProperties: Map[String, String] = storage.serdeProperties): CatalogTable = {
+ serdeProperties: Map[String, String] = storage.properties): CatalogTable = {
copy(storage = CatalogStorageFormat(
locationUri, inputFormat, outputFormat, serde, compressed, serdeProperties))
}