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

branch-2.1:[fix](Nereids) fix regression framework compare issue and fix code point count (#49575) (#50667)

Browse Source 
backport: https://github.com/apache/doris/pull/49575

Co-authored-by: LiBinfeng <libinfeng@selectdb.com>
This commit is contained in:
James
2025-05-08 16:53:02 +08:00
committed by GitHub
parent 5501e130bf
commit 995f1e5dc0
6 changed files with 75 additions and 56 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
fe/fe-core/src/main/java/org/apache/doris/nereids/trees/expressions/functions/executable/StringArithmetic.java
View File

@ -104,8 +104,8 @@ public class StringArithmetic {
rightIndex = third + leftIndex;
}
// at here leftIndex and rightIndex can not be exceeding boundary
int finalLeftIndex = first.codePointCount(0, (int) leftIndex);
int finalRightIndex = first.codePointCount(0, (int) rightIndex);
int finalLeftIndex = first.offsetByCodePoints(0, (int) leftIndex);
int finalRightIndex = first.offsetByCodePoints(0, (int) rightIndex);
// left index and right index are in integer range because of definition, so we can safely cast it to int
return first.substring(finalLeftIndex, finalRightIndex);
}
@ -132,7 +132,11 @@ public class StringArithmetic {
*/
@ExecFunction(name = "lower")
public static Expression lowerVarchar(StringLikeLiteral first) {
return castStringLikeLiteral(first, first.getValue().toLowerCase());
StringBuilder result = new StringBuilder(first.getValue().length());
for (char c : first.getValue().toCharArray()) {
result.append(Character.toLowerCase(c));
}
return castStringLikeLiteral(first, result.toString());
}
/**
@ -140,7 +144,11 @@ public class StringArithmetic {
*/
@ExecFunction(name = "upper")
public static Expression upperVarchar(StringLikeLiteral first) {
return castStringLikeLiteral(first, first.getValue().toUpperCase());
StringBuilder result = new StringBuilder(first.getValue().length());
for (char c : first.getValue().toCharArray()) {
result.append(Character.toUpperCase(c));
}
return castStringLikeLiteral(first, result.toString());
}
private static String trimImpl(String first, String second, boolean left, boolean right) {
@ -304,7 +312,8 @@ public class StringArithmetic {
} else if (second.getValue() >= inputLength) {
return first;
} else {
int index = first.getValue().codePointCount(0, second.getValue());
// at here leftIndex and rightIndex can not be exceeding boundary
int index = first.getValue().offsetByCodePoints(0, second.getValue());
return castStringLikeLiteral(first, first.getValue().substring(0, index));
}
}
@ -320,14 +329,15 @@ public class StringArithmetic {
} else if (second.getValue() >= inputLength) {
return first;
} else {
// at here second can not be exceeding boundary
if (second.getValue() >= 0) {
int index = first.getValue().codePointCount(0, second.getValue());
int index = first.getValue().offsetByCodePoints(0, second.getValue());
return castStringLikeLiteral(first, first.getValue().substring(
inputLength - index, inputLength));
} else {
int index = first.getValue().codePointCount(Math.abs(second.getValue()) - 1, first.getValue().length());
int index = first.getValue().offsetByCodePoints(0, Math.abs(second.getValue()) - 1);
return castStringLikeLiteral(first, first.getValue().substring(
Math.abs(index) - 1, inputLength));
index, inputLength));
}
}
}

2
fe/fe-core/src/test/java/org/apache/doris/nereids/rules/expression/FoldConstantTest.java
View File

@ -363,7 +363,7 @@ class FoldConstantTest extends ExpressionRewriteTestHelper {
Assertions.assertEquals(new StringLiteral(""), rewritten);
right = new Right(StringLiteral.of("data"), IntegerLiteral.of(-3));
rewritten = executor.rewrite(right, context);
Assertions.assertEquals(new StringLiteral("ata"), rewritten);
Assertions.assertEquals(new StringLiteral("ta"), rewritten);
Substring substr = new Substring(
StringLiteral.of("database"),