database/doris
2
0
Fork 0
Code Issues Pull Requests Actions 3 Packages Projects Releases Wiki Activity

[fix](collation) add back id 33 collation for bi compatible (#33787)

Browse Source
This commit is contained in:
morrySnow
2024-04-22 10:59:36 +08:00
committed by yiguolei
parent 7f61626c8d
commit f0667ea8a2
1 changed files with 18 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
fe/fe-core/src/main/java/org/apache/doris/qe/ShowExecutor.java
View File

@ -1674,15 +1674,25 @@ public class ShowExecutor {
private void handleShowCollation() throws AnalysisException {
ShowCollationStmt showStmt = (ShowCollationStmt) stmt;
List<List<String>> rows = Lists.newArrayList();
List<String> row = Lists.newArrayList();
List<String> utf8mb40900Bin = Lists.newArrayList();
// | utf8mb4_0900_bin | utf8mb4 | 309 | Yes | Yes | 1 |
row.add(ctx.getSessionVariable().getCollationConnection());
row.add(ctx.getSessionVariable().getCharsetServer());
row.add("309");
row.add("Yes");
row.add("Yes");
row.add("1");
rows.add(row);
utf8mb40900Bin.add(ctx.getSessionVariable().getCollationConnection());
utf8mb40900Bin.add(ctx.getSessionVariable().getCharsetServer());
utf8mb40900Bin.add("309");
utf8mb40900Bin.add("Yes");
utf8mb40900Bin.add("Yes");
utf8mb40900Bin.add("1");
rows.add(utf8mb40900Bin);
// ATTN: we must have this collation for compatible with some bi tools
List<String> utf8mb3GeneralCi = Lists.newArrayList();
// | utf8mb3_general_ci | utf8mb3 | 33 | Yes | Yes | 1 |
utf8mb3GeneralCi.add("utf8mb3_general_ci");
utf8mb3GeneralCi.add("utf8mb3");
utf8mb3GeneralCi.add("33");
utf8mb3GeneralCi.add("Yes");
utf8mb3GeneralCi.add("Yes");
utf8mb3GeneralCi.add("1");
rows.add(utf8mb3GeneralCi);
resultSet = new ShowResultSet(showStmt.getMetaData(), rows);
}