From 385ba4892da16cc2d5a4565985060c5979705351 Mon Sep 17 00:00:00 2001 From: Stevo Mitric Date: Wed, 15 Jan 2025 17:39:41 +0100 Subject: [PATCH 1/3] Enable trimming collations by default --- .../src/main/scala/org/apache/spark/sql/internal/SQLConf.scala | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sql/catalyst/src/main/scala/org/apache/spark/sql/internal/SQLConf.scala b/sql/catalyst/src/main/scala/org/apache/spark/sql/internal/SQLConf.scala index 727d54b6bbd2e..d8e202c46c6d2 100644 --- a/sql/catalyst/src/main/scala/org/apache/spark/sql/internal/SQLConf.scala +++ b/sql/catalyst/src/main/scala/org/apache/spark/sql/internal/SQLConf.scala @@ -880,7 +880,7 @@ object SQLConf { ) .version("4.0.0") .booleanConf - .createWithDefault(Utils.isTesting) + .createWithDefault(true) val DEFAULT_COLLATION = buildConf(SqlApiConfHelper.DEFAULT_COLLATION) From 683dd746d00c59bc092235d7463dd3d127d9a7a3 Mon Sep 17 00:00:00 2001 From: Stevo Mitric Date: Thu, 16 Jan 2025 10:58:44 +0100 Subject: [PATCH 2/3] change message --- .../main/scala/org/apache/spark/sql/internal/SQLConf.scala | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/sql/catalyst/src/main/scala/org/apache/spark/sql/internal/SQLConf.scala b/sql/catalyst/src/main/scala/org/apache/spark/sql/internal/SQLConf.scala index d8e202c46c6d2..de885d03ad176 100644 --- a/sql/catalyst/src/main/scala/org/apache/spark/sql/internal/SQLConf.scala +++ b/sql/catalyst/src/main/scala/org/apache/spark/sql/internal/SQLConf.scala @@ -874,9 +874,8 @@ object SQLConf { lazy val TRIM_COLLATION_ENABLED = buildConf("spark.sql.collation.trim.enabled") .internal() - .doc( - "Trim collation feature is under development and its use should be done under this" + - "feature flag. Trim collation trims trailing whitespaces from strings." + .doc("When enabled allows the use of trim collations which trims trailing whitespaces from" + + " strings." ) .version("4.0.0") .booleanConf From 9611ba609699bc2cfb7e9588c72e65f8dd0df35a Mon Sep 17 00:00:00 2001 From: Stevo Mitric Date: Thu, 16 Jan 2025 11:00:27 +0100 Subject: [PATCH 3/3] fix grammer --- .../src/main/scala/org/apache/spark/sql/internal/SQLConf.scala | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sql/catalyst/src/main/scala/org/apache/spark/sql/internal/SQLConf.scala b/sql/catalyst/src/main/scala/org/apache/spark/sql/internal/SQLConf.scala index de885d03ad176..64f2546f8d345 100644 --- a/sql/catalyst/src/main/scala/org/apache/spark/sql/internal/SQLConf.scala +++ b/sql/catalyst/src/main/scala/org/apache/spark/sql/internal/SQLConf.scala @@ -874,7 +874,7 @@ object SQLConf { lazy val TRIM_COLLATION_ENABLED = buildConf("spark.sql.collation.trim.enabled") .internal() - .doc("When enabled allows the use of trim collations which trims trailing whitespaces from" + + .doc("When enabled allows the use of trim collations which trim trailing whitespaces from" + " strings." ) .version("4.0.0")