Skip to content

Fix concat_ws with array type don't support length exceed 254 #17816

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
phd3 merged 1 commit into from
Jun 30, 2023
Merged

Fix concat_ws with array type don't support length exceed 254 #17816

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
6 changes: 0 additions & 6 deletions core/trino-main/src/main/java/io/trino/operator/scalar/ConcatFunction.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,6 @@
import java.lang.invoke.MethodHandle;

import static io.trino.spi.StandardErrorCode.INVALID_FUNCTION_ARGUMENT;
import static io.trino.spi.StandardErrorCode.NOT_SUPPORTED;
import static io.trino.spi.block.PageBuilderStatus.DEFAULT_MAX_PAGE_SIZE_IN_BYTES;
import static io.trino.spi.function.InvocationConvention.InvocationArgumentConvention.NEVER_NULL;
import static io.trino.spi.function.InvocationConvention.InvocationReturnConvention.FAIL_ON_NULL;
Expand All @@ -43,7 +42,6 @@ public final class ConcatFunction

public static final ConcatFunction VARBINARY_CONCAT = new ConcatFunction(VARBINARY.getTypeSignature(), "concatenates given varbinary values");

private static final int MAX_INPUT_VALUES = 254;
private static final int MAX_OUTPUT_LENGTH = DEFAULT_MAX_PAGE_SIZE_IN_BYTES;

private ConcatFunction(TypeSignature type, String description)
Expand All @@ -68,10 +66,6 @@ protected SpecializedSqlScalarFunction specialize(BoundSignature boundSignature)
throw new TrinoException(INVALID_FUNCTION_ARGUMENT, "There must be two or more concatenation arguments");
}

if (arity > MAX_INPUT_VALUES) {
throw new TrinoException(NOT_SUPPORTED, "Too many arguments for string concatenation");
}

MethodHandle arrayMethodHandle = methodHandle(ConcatFunction.class, "concat", Slice[].class);
MethodHandle customMethodHandle = arrayMethodHandle.asCollector(Slice[].class, arity);

Expand Down
6 changes: 0 additions & 6 deletions core/trino-main/src/main/java/io/trino/operator/scalar/ConcatWsFunction.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,6 @@
import java.util.Collections;

import static io.trino.spi.StandardErrorCode.INVALID_FUNCTION_ARGUMENT;
import static io.trino.spi.StandardErrorCode.NOT_SUPPORTED;
import static io.trino.spi.block.PageBuilderStatus.DEFAULT_MAX_PAGE_SIZE_IN_BYTES;
import static io.trino.spi.function.InvocationConvention.InvocationArgumentConvention.BOXED_NULLABLE;
import static io.trino.spi.function.InvocationConvention.InvocationArgumentConvention.NEVER_NULL;
Expand All @@ -55,7 +54,6 @@ public final class ConcatWsFunction
extends SqlScalarFunction
{
public static final ConcatWsFunction CONCAT_WS = new ConcatWsFunction();
private static final int MAX_INPUT_VALUES = 254;
private static final int MAX_OUTPUT_LENGTH = DEFAULT_MAX_PAGE_SIZE_IN_BYTES;

@ScalarFunction("concat_ws")
Expand Down Expand Up @@ -146,10 +144,6 @@ public int getCount()

private static Slice concatWs(Slice separator, SliceArray values)
{
if (values.getCount() > MAX_INPUT_VALUES) {
throw new TrinoException(NOT_SUPPORTED, "Too many arguments for string concatenation");
}

// Validate size of output
int length = 0;
boolean requiresSeparator = false;
Expand Down
27 changes: 27 additions & 0 deletions core/trino-main/src/test/java/io/trino/operator/scalar/TestConcatWsFunction.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@
package io.trino.operator.scalar;

import io.trino.sql.query.QueryAssertions;
import org.intellij.lang.annotations.Language;
import org.junit.jupiter.api.AfterAll;
import org.junit.jupiter.api.BeforeAll;
import org.junit.jupiter.api.Test;
Expand All @@ -27,6 +28,8 @@
@TestInstance(PER_CLASS)
public class TestConcatWsFunction
{
private static final int MAX_INPUT_VALUES = 254;
private static final int MAX_CONCAT_VALUES = MAX_INPUT_VALUES - 1;
private QueryAssertions assertions;

@BeforeAll
Expand Down Expand Up @@ -159,6 +162,16 @@ public void testArray()
assertThat(assertions.function("concat_ws", "','", "ARRAY['abc', '', '', 'xyz','abcdefghi']"))
.hasType(VARCHAR)
.isEqualTo("abc,,,xyz,abcdefghi");

// array may exceed the limit
StringBuilder builder = new StringBuilder();
for (int i = 0; i < MAX_CONCAT_VALUES; i++) {
builder.append(i).append(',');
}
builder.append(MAX_CONCAT_VALUES);
assertThat(assertions.function("concat_ws", "','", "transform(sequence(0, " + MAX_CONCAT_VALUES + "), x -> cast(x as varchar))"))
.hasType(VARCHAR)
.isEqualTo(builder.toString());
}

@Test
Expand All @@ -175,6 +188,20 @@ public void testBadArguments()
.hasMessageContaining("Unexpected parameters");
}

@Test
public void testTooManyArguments()
{
// all function arguments limit to 127 in io.trino.sql.analyzer.ExpressionAnalyzer.Visitor.visitFunctionCall
int argumentsLimit = 127;
@Language("SQL") String[] inputValues = new String[argumentsLimit + 1];
inputValues[0] = "','";
for (int i = 1; i <= argumentsLimit; i++) {
inputValues[i] = ("'" + i + "'");
}
assertTrinoExceptionThrownBy(() -> assertions.function("concat_ws", inputValues).evaluate())
.hasMessage("line 1:8: Too many arguments for function call concat_ws()");
}

@Test
public void testLowArguments()
{
Expand Down