Skip to content

Commit b956a6c

Browse files
zhengruifengzhengruifeng
committed
init
1 parent 828b1f9 commit b956a6c

File tree

3 files changed

+17
-17
lines changed

3 files changed

+17
-17
lines changed

‎sql/catalyst/src/main/scala/org/apache/spark/sql/errors/QueryExecutionErrors.scala‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2766,7 +2766,7 @@ private[sql] object QueryExecutionErrors extends QueryErrorsBase with ExecutionE
27662766
"functionName" -> toSQLId(functionName),
27672767
"parameter" -> toSQLId("charset"),
27682768
"charset" -> charset,
2769-
"charsets" -> CharsetProvider.VALID_CHARSETS.mkString(", ")))
2769+
"charsets" -> CharsetProvider.VALID_CHARSETS.toSeq.sorted.mkString(", ")))
27702770
}
27712771

27722772
def malformedCharacterCoding(functionName: String, charset: String): RuntimeException = {

‎sql/core/src/test/resources/sql-tests/results/ansi/string-functions.sql.out‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -842,7 +842,7 @@ org.apache.spark.SparkIllegalArgumentException
842842
"sqlState" : "22023",
843843
"messageParameters" : {
844844
"charset" : "WINDOWS-1252",
845-
"charsets" : "utf-8, utf-16be, iso-8859-1, utf-16le, utf-16, utf-32, us-ascii",
845+
"charsets" : "iso-8859-1, us-ascii, utf-16, utf-16be, utf-16le, utf-32, utf-8",
846846
"functionName" : "`encode`",
847847
"parameter" : "`charset`"
848848
}
@@ -860,7 +860,7 @@ org.apache.spark.SparkIllegalArgumentException
860860
"sqlState" : "22023",
861861
"messageParameters" : {
862862
"charset" : "WINDOWS-1252",
863-
"charsets" : "utf-8, utf-16be, iso-8859-1, utf-16le, utf-16, utf-32, us-ascii",
863+
"charsets" : "iso-8859-1, us-ascii, utf-16, utf-16be, utf-16le, utf-32, utf-8",
864864
"functionName" : "`encode`",
865865
"parameter" : "`charset`"
866866
}
@@ -878,7 +878,7 @@ org.apache.spark.SparkIllegalArgumentException
878878
"sqlState" : "22023",
879879
"messageParameters" : {
880880
"charset" : "Windows-xxx",
881-
"charsets" : "utf-8, utf-16be, iso-8859-1, utf-16le, utf-16, utf-32, us-ascii",
881+
"charsets" : "iso-8859-1, us-ascii, utf-16, utf-16be, utf-16le, utf-32, utf-8",
882882
"functionName" : "`encode`",
883883
"parameter" : "`charset`"
884884
}
@@ -896,7 +896,7 @@ org.apache.spark.SparkIllegalArgumentException
896896
"sqlState" : "22023",
897897
"messageParameters" : {
898898
"charset" : "Windows-xxx",
899-
"charsets" : "utf-8, utf-16be, iso-8859-1, utf-16le, utf-16, utf-32, us-ascii",
899+
"charsets" : "iso-8859-1, us-ascii, utf-16, utf-16be, utf-16le, utf-32, utf-8",
900900
"functionName" : "`encode`",
901901
"parameter" : "`charset`"
902902
}
@@ -1140,7 +1140,7 @@ org.apache.spark.SparkIllegalArgumentException
11401140
"sqlState" : "22023",
11411141
"messageParameters" : {
11421142
"charset" : "Windows-xxx",
1143-
"charsets" : "utf-8, utf-16be, iso-8859-1, utf-16le, utf-16, utf-32, us-ascii",
1143+
"charsets" : "iso-8859-1, us-ascii, utf-16, utf-16be, utf-16le, utf-32, utf-8",
11441144
"functionName" : "`decode`",
11451145
"parameter" : "`charset`"
11461146
}
@@ -1158,7 +1158,7 @@ org.apache.spark.SparkIllegalArgumentException
11581158
"sqlState" : "22023",
11591159
"messageParameters" : {
11601160
"charset" : "Windows-xxx",
1161-
"charsets" : "utf-8, utf-16be, iso-8859-1, utf-16le, utf-16, utf-32, us-ascii",
1161+
"charsets" : "iso-8859-1, us-ascii, utf-16, utf-16be, utf-16le, utf-32, utf-8",
11621162
"functionName" : "`decode`",
11631163
"parameter" : "`charset`"
11641164
}
@@ -1208,7 +1208,7 @@ org.apache.spark.SparkIllegalArgumentException
12081208
"sqlState" : "22023",
12091209
"messageParameters" : {
12101210
"charset" : "WINDOWS-1252",
1211-
"charsets" : "utf-8, utf-16be, iso-8859-1, utf-16le, utf-16, utf-32, us-ascii",
1211+
"charsets" : "iso-8859-1, us-ascii, utf-16, utf-16be, utf-16le, utf-32, utf-8",
12121212
"functionName" : "`decode`",
12131213
"parameter" : "`charset`"
12141214
}
@@ -1226,7 +1226,7 @@ org.apache.spark.SparkIllegalArgumentException
12261226
"sqlState" : "22023",
12271227
"messageParameters" : {
12281228
"charset" : "WINDOWS-1252",
1229-
"charsets" : "utf-8, utf-16be, iso-8859-1, utf-16le, utf-16, utf-32, us-ascii",
1229+
"charsets" : "iso-8859-1, us-ascii, utf-16, utf-16be, utf-16le, utf-32, utf-8",
12301230
"functionName" : "`decode`",
12311231
"parameter" : "`charset`"
12321232
}

‎sql/core/src/test/resources/sql-tests/results/string-functions.sql.out‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -778,7 +778,7 @@ org.apache.spark.SparkIllegalArgumentException
778778
"sqlState" : "22023",
779779
"messageParameters" : {
780780
"charset" : "WINDOWS-1252",
781-
"charsets" : "utf-8, utf-16be, iso-8859-1, utf-16le, utf-16, utf-32, us-ascii",
781+
"charsets" : "iso-8859-1, us-ascii, utf-16, utf-16be, utf-16le, utf-32, utf-8",
782782
"functionName" : "`encode`",
783783
"parameter" : "`charset`"
784784
}
@@ -796,7 +796,7 @@ org.apache.spark.SparkIllegalArgumentException
796796
"sqlState" : "22023",
797797
"messageParameters" : {
798798
"charset" : "WINDOWS-1252",
799-
"charsets" : "utf-8, utf-16be, iso-8859-1, utf-16le, utf-16, utf-32, us-ascii",
799+
"charsets" : "iso-8859-1, us-ascii, utf-16, utf-16be, utf-16le, utf-32, utf-8",
800800
"functionName" : "`encode`",
801801
"parameter" : "`charset`"
802802
}
@@ -814,7 +814,7 @@ org.apache.spark.SparkIllegalArgumentException
814814
"sqlState" : "22023",
815815
"messageParameters" : {
816816
"charset" : "Windows-xxx",
817-
"charsets" : "utf-8, utf-16be, iso-8859-1, utf-16le, utf-16, utf-32, us-ascii",
817+
"charsets" : "iso-8859-1, us-ascii, utf-16, utf-16be, utf-16le, utf-32, utf-8",
818818
"functionName" : "`encode`",
819819
"parameter" : "`charset`"
820820
}
@@ -832,7 +832,7 @@ org.apache.spark.SparkIllegalArgumentException
832832
"sqlState" : "22023",
833833
"messageParameters" : {
834834
"charset" : "Windows-xxx",
835-
"charsets" : "utf-8, utf-16be, iso-8859-1, utf-16le, utf-16, utf-32, us-ascii",
835+
"charsets" : "iso-8859-1, us-ascii, utf-16, utf-16be, utf-16le, utf-32, utf-8",
836836
"functionName" : "`encode`",
837837
"parameter" : "`charset`"
838838
}
@@ -1076,7 +1076,7 @@ org.apache.spark.SparkIllegalArgumentException
10761076
"sqlState" : "22023",
10771077
"messageParameters" : {
10781078
"charset" : "Windows-xxx",
1079-
"charsets" : "utf-8, utf-16be, iso-8859-1, utf-16le, utf-16, utf-32, us-ascii",
1079+
"charsets" : "iso-8859-1, us-ascii, utf-16, utf-16be, utf-16le, utf-32, utf-8",
10801080
"functionName" : "`decode`",
10811081
"parameter" : "`charset`"
10821082
}
@@ -1094,7 +1094,7 @@ org.apache.spark.SparkIllegalArgumentException
10941094
"sqlState" : "22023",
10951095
"messageParameters" : {
10961096
"charset" : "Windows-xxx",
1097-
"charsets" : "utf-8, utf-16be, iso-8859-1, utf-16le, utf-16, utf-32, us-ascii",
1097+
"charsets" : "iso-8859-1, us-ascii, utf-16, utf-16be, utf-16le, utf-32, utf-8",
10981098
"functionName" : "`decode`",
10991099
"parameter" : "`charset`"
11001100
}
@@ -1144,7 +1144,7 @@ org.apache.spark.SparkIllegalArgumentException
11441144
"sqlState" : "22023",
11451145
"messageParameters" : {
11461146
"charset" : "WINDOWS-1252",
1147-
"charsets" : "utf-8, utf-16be, iso-8859-1, utf-16le, utf-16, utf-32, us-ascii",
1147+
"charsets" : "iso-8859-1, us-ascii, utf-16, utf-16be, utf-16le, utf-32, utf-8",
11481148
"functionName" : "`decode`",
11491149
"parameter" : "`charset`"
11501150
}
@@ -1162,7 +1162,7 @@ org.apache.spark.SparkIllegalArgumentException
11621162
"sqlState" : "22023",
11631163
"messageParameters" : {
11641164
"charset" : "WINDOWS-1252",
1165-
"charsets" : "utf-8, utf-16be, iso-8859-1, utf-16le, utf-16, utf-32, us-ascii",
1165+
"charsets" : "iso-8859-1, us-ascii, utf-16, utf-16be, utf-16le, utf-32, utf-8",
11661166
"functionName" : "`decode`",
11671167
"parameter" : "`charset`"
11681168
}

0 commit comments

Comments
 (0)