From f866e9d829a4e582989281f1c0c29f6f293614f6 Mon Sep 17 00:00:00 2001 From: Kousuke Saruta Date: Tue, 23 Feb 2021 03:31:43 +0900 Subject: [PATCH 1/3] Replace symbol literals in example. --- .../org/apache/spark/examples/sql/SimpleTypedAggregator.scala | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/examples/src/main/scala/org/apache/spark/examples/sql/SimpleTypedAggregator.scala b/examples/src/main/scala/org/apache/spark/examples/sql/SimpleTypedAggregator.scala index 5510f0019353b..5d11fb2fc96e5 100644 --- a/examples/src/main/scala/org/apache/spark/examples/sql/SimpleTypedAggregator.scala +++ b/examples/src/main/scala/org/apache/spark/examples/sql/SimpleTypedAggregator.scala @@ -31,7 +31,7 @@ object SimpleTypedAggregator { .getOrCreate() import spark.implicits._ - val ds = spark.range(20).select(('id % 3).as("key"), 'id).as[(Long, Long)] + val ds = spark.range(20).select(($"id" % 3).as("key"), $"id").as[(Long, Long)] println("input data:") ds.show() From 8460c7f62a0c941653f03e067df2d3d98b4a8283 Mon Sep 17 00:00:00 2001 From: Kousuke Saruta Date: Tue, 23 Feb 2021 04:11:31 +0900 Subject: [PATCH 2/3] Replace symbol literals in docs. --- docs/sql-data-sources-avro.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/docs/sql-data-sources-avro.md b/docs/sql-data-sources-avro.md index da2a90e3ae027..928b3d021a172 100644 --- a/docs/sql-data-sources-avro.md +++ b/docs/sql-data-sources-avro.md @@ -107,9 +107,9 @@ val df = spark // 2. Filter by column `favorite_color`; // 3. Encode the column `name` in Avro format. val output = df - .select(from_avro('value, jsonFormatSchema) as 'user) + .select(from_avro($"value", jsonFormatSchema) as $"user") .where("user.favorite_color == \"red\"") - .select(to_avro($"user.name") as 'value) + .select(to_avro($"user.name") as $"value") val query = output .writeStream From 90436bdf4f1618caffcf758b3c2e87abdd6e6e54 Mon Sep 17 00:00:00 2001 From: Kousuke Saruta Date: Tue, 23 Feb 2021 05:33:44 +0900 Subject: [PATCH 3/3] Replace symbol literals in ScalaDoc. --- sql/core/src/main/scala/org/apache/spark/sql/Column.scala | 2 +- .../src/main/scala/org/apache/spark/sql/Dataset.scala | 4 ++-- .../scala/org/apache/spark/sql/expressions/Window.scala | 8 ++++---- .../org/apache/spark/sql/expressions/WindowSpec.scala | 8 ++++---- 4 files changed, 11 insertions(+), 11 deletions(-) diff --git a/sql/core/src/main/scala/org/apache/spark/sql/Column.scala b/sql/core/src/main/scala/org/apache/spark/sql/Column.scala index 6557ff3b2fc45..db008821584dd 100644 --- a/sql/core/src/main/scala/org/apache/spark/sql/Column.scala +++ b/sql/core/src/main/scala/org/apache/spark/sql/Column.scala @@ -1108,7 +1108,7 @@ class Column(val expr: Expression) extends Logging { * Gives the column an alias. * {{{ * // Renames colA to colB in select output. - * df.select($"colA".as('colB)) + * df.select($"colA".as("colB")) * }}} * * If the current column has metadata associated with it, this metadata will be propagated diff --git a/sql/core/src/main/scala/org/apache/spark/sql/Dataset.scala b/sql/core/src/main/scala/org/apache/spark/sql/Dataset.scala index 7ccf6dc872206..fd02d0b131587 100644 --- a/sql/core/src/main/scala/org/apache/spark/sql/Dataset.scala +++ b/sql/core/src/main/scala/org/apache/spark/sql/Dataset.scala @@ -2307,7 +2307,7 @@ class Dataset[T] private[sql]( * case class Book(title: String, words: String) * val ds: Dataset[Book] * - * val allWords = ds.select('title, explode(split('words, " ")).as("word")) + * val allWords = ds.select($"title", explode(split($"words", " ")).as("word")) * * val bookCountPerWord = allWords.groupBy("word").agg(count_distinct("title")) * }}} @@ -2346,7 +2346,7 @@ class Dataset[T] private[sql]( * `functions.explode()`: * * {{{ - * ds.select(explode(split('words, " ")).as("word")) + * ds.select(explode(split($"words", " ")).as("word")) * }}} * * or `flatMap()`: diff --git a/sql/core/src/main/scala/org/apache/spark/sql/expressions/Window.scala b/sql/core/src/main/scala/org/apache/spark/sql/expressions/Window.scala index d13baaedbaeff..93bf738a53daf 100644 --- a/sql/core/src/main/scala/org/apache/spark/sql/expressions/Window.scala +++ b/sql/core/src/main/scala/org/apache/spark/sql/expressions/Window.scala @@ -136,8 +136,8 @@ object Window { * val df = Seq((1, "a"), (1, "a"), (2, "a"), (1, "b"), (2, "b"), (3, "b")) * .toDF("id", "category") * val byCategoryOrderedById = - * Window.partitionBy('category).orderBy('id).rowsBetween(Window.currentRow, 1) - * df.withColumn("sum", sum('id) over byCategoryOrderedById).show() + * Window.partitionBy($"category").orderBy($"id").rowsBetween(Window.currentRow, 1) + * df.withColumn("sum", sum($"id") over byCategoryOrderedById).show() * * +---+--------+---+ * | id|category|sum| @@ -188,8 +188,8 @@ object Window { * val df = Seq((1, "a"), (1, "a"), (2, "a"), (1, "b"), (2, "b"), (3, "b")) * .toDF("id", "category") * val byCategoryOrderedById = - * Window.partitionBy('category).orderBy('id).rangeBetween(Window.currentRow, 1) - * df.withColumn("sum", sum('id) over byCategoryOrderedById).show() + * Window.partitionBy($"category").orderBy($"id").rangeBetween(Window.currentRow, 1) + * df.withColumn("sum", sum($"id") over byCategoryOrderedById).show() * * +---+--------+---+ * | id|category|sum| diff --git a/sql/core/src/main/scala/org/apache/spark/sql/expressions/WindowSpec.scala b/sql/core/src/main/scala/org/apache/spark/sql/expressions/WindowSpec.scala index 58227f075f2c7..09a945f162a98 100644 --- a/sql/core/src/main/scala/org/apache/spark/sql/expressions/WindowSpec.scala +++ b/sql/core/src/main/scala/org/apache/spark/sql/expressions/WindowSpec.scala @@ -100,8 +100,8 @@ class WindowSpec private[sql]( * val df = Seq((1, "a"), (1, "a"), (2, "a"), (1, "b"), (2, "b"), (3, "b")) * .toDF("id", "category") * val byCategoryOrderedById = - * Window.partitionBy('category).orderBy('id).rowsBetween(Window.currentRow, 1) - * df.withColumn("sum", sum('id) over byCategoryOrderedById).show() + * Window.partitionBy($"category").orderBy($"id").rowsBetween(Window.currentRow, 1) + * df.withColumn("sum", sum($"id") over byCategoryOrderedById).show() * * +---+--------+---+ * | id|category|sum| @@ -168,8 +168,8 @@ class WindowSpec private[sql]( * val df = Seq((1, "a"), (1, "a"), (2, "a"), (1, "b"), (2, "b"), (3, "b")) * .toDF("id", "category") * val byCategoryOrderedById = - * Window.partitionBy('category).orderBy('id).rangeBetween(Window.currentRow, 1) - * df.withColumn("sum", sum('id) over byCategoryOrderedById).show() + * Window.partitionBy($"category").orderBy($"id").rangeBetween(Window.currentRow, 1) + * df.withColumn("sum", sum($"id") over byCategoryOrderedById).show() * * +---+--------+---+ * | id|category|sum|