Skip to content

[BugFix] fix concat_ws(',', 1, NULL) incorrect result when last element is NULL (backport #56384) #56456

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Mar 22, 2025
Merged

[BugFix] fix concat_ws(',', 1, NULL) incorrect result when last element is NULL (backport #56384) #56456

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 9 additions & 9 deletions fe/fe-core/src/main/java/com/starrocks/sql/optimizer/rewrite/ScalarOperatorFunctions.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -77,10 +77,12 @@
import java.time.temporal.IsoFields;
import java.time.temporal.TemporalAdjusters;
import java.time.temporal.TemporalUnit;
import java.util.Arrays;
import java.util.HashSet;
import java.util.List;
import java.util.Map;
import java.util.Set;
import java.util.stream.Collectors;

import static com.starrocks.catalog.PrimitiveType.BIGINT;
import static com.starrocks.catalog.PrimitiveType.BITMAP;
Expand Down Expand Up @@ -1297,15 +1299,13 @@ public static ConstantOperator concat_ws(ConstantOperator split, ConstantOperato
if (split.isNull()) {
return ConstantOperator.createNull(Type.VARCHAR);
}
final StringBuilder resultBuilder = new StringBuilder();
for (int i = 0; i < values.length - 1; i++) {
if (values[i].isNull()) {
continue;
}
resultBuilder.append(values[i].getVarchar()).append(split.getVarchar());
}
resultBuilder.append(values[values.length - 1].getVarchar());
return ConstantOperator.createVarchar(resultBuilder.toString());
String separator = split.getVarchar();
return ConstantOperator.createVarchar(
Arrays.stream(values)
.filter(v -> !v.isNull())
.map(ConstantOperator::getVarchar)
.collect(Collectors.joining(separator))
);
}

@ConstantFunction(name = "version", argTypes = {}, returnType = VARCHAR)
Expand Down
52 changes: 36 additions & 16 deletions ...e-core/src/test/java/com/starrocks/sql/optimizer/rewrite/ScalarOperatorFunctionsTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1322,22 +1322,42 @@ public void concat_ws() {

@Test
public void concat_ws_with_null() {
ConstantOperator[] argWithNull = {ConstantOperator.createVarchar("star"),
ConstantOperator.createNull(Type.VARCHAR),
ConstantOperator.createVarchar("cks")};
ConstantOperator result =
ScalarOperatorFunctions.concat_ws(ConstantOperator.createVarchar("ro"), argWithNull);
assertEquals(Type.VARCHAR, result.getType());
assertEquals("starrocks", result.getVarchar());

result = ScalarOperatorFunctions.concat_ws(ConstantOperator.createVarchar(","),
ConstantOperator.createNull(Type.VARCHAR));
assertEquals("", result.getVarchar());

ConstantOperator[] argWithoutNull = {ConstantOperator.createVarchar("star"),
ConstantOperator.createVarchar("cks")};
result = ScalarOperatorFunctions.concat_ws(ConstantOperator.createNull(Type.VARCHAR), argWithoutNull);
assertTrue(result.isNull());
{
ConstantOperator[] argWithNull = {ConstantOperator.createVarchar("star"),
ConstantOperator.createNull(Type.VARCHAR),
ConstantOperator.createVarchar("cks")};
ConstantOperator result =
ScalarOperatorFunctions.concat_ws(ConstantOperator.createVarchar("ro"), argWithNull);
assertEquals(Type.VARCHAR, result.getType());
assertEquals("starrocks", result.getVarchar());
}
{
ConstantOperator[] argWithNull = {ConstantOperator.createVarchar("1"),
ConstantOperator.createNull(Type.VARCHAR)};
ConstantOperator result =
ScalarOperatorFunctions.concat_ws(ConstantOperator.createVarchar(","), argWithNull);
assertEquals(Type.VARCHAR, result.getType());
assertEquals("1", result.getVarchar());
}
{
ConstantOperator[] argWithNull = {ConstantOperator.createVarchar("1"),
ConstantOperator.createNull(Type.VARCHAR),
ConstantOperator.createNull(Type.VARCHAR)};
ConstantOperator result =
ScalarOperatorFunctions.concat_ws(ConstantOperator.createVarchar(","), argWithNull);
assertEquals(Type.VARCHAR, result.getType());
assertEquals("1", result.getVarchar());
}
{
ConstantOperator result = ScalarOperatorFunctions.concat_ws(ConstantOperator.createVarchar(","),
ConstantOperator.createNull(Type.VARCHAR));
assertEquals("", result.getVarchar());

ConstantOperator[] argWithoutNull = {ConstantOperator.createVarchar("star"),
ConstantOperator.createVarchar("cks")};
result = ScalarOperatorFunctions.concat_ws(ConstantOperator.createNull(Type.VARCHAR), argWithoutNull);
assertTrue(result.isNull());
}
}

@Test
Expand Down
Loading