Skip to content

25.3.14 Stable backport of #82900: trim - return a const value for all-const inputs (Bug 78796) #1425

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

Open
zvonand wants to merge 1 commit into
base: releases/25.3.14
Choose a base branch
from
Open

25.3.14 Stable backport of #82900: trim - return a const value for all-const inputs (Bug 78796) #1425

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
14 changes: 11 additions & 3 deletions src/Functions/trim.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,7 @@ class FunctionTrim : public IFunction
String getName() const override { return name; }
bool isVariadic() const override { return true; }
bool isSuitableForShortCircuitArgumentsExecution(const DataTypesWithConstInfo & /*arguments*/) const override { return true; }
bool useDefaultImplementationForConstants() const override { return true; }
size_t getNumberOfArguments() const override { return 0; }

DataTypePtr getReturnTypeImpl(const ColumnsWithTypeAndName & arguments) const override
Expand All @@ -48,9 +49,16 @@ class FunctionTrim : public IFunction
std::optional<SearchSymbols> custom_trim_characters;
if (arguments.size() == 2 && input_rows_count > 0)
{
const ColumnConst * col_trim_characters_const = checkAndGetColumnConst<ColumnString>(arguments[1].column.get());
const String & trim_characters_string = col_trim_characters_const->getDataAt(0).toString();
custom_trim_characters = std::make_optional<SearchSymbols>(trim_characters_string);
if (const ColumnString * col_trim_characters = checkAndGetColumn<ColumnString>(arguments[1].column.get()))
{
const String & trim_characters_string = col_trim_characters->getDataAt(0).toString();
custom_trim_characters = std::make_optional<SearchSymbols>(trim_characters_string);
}
else if (const ColumnConst * col_trim_characters_const = checkAndGetColumnConst<ColumnString>(arguments[1].column.get()))
{
const String & trim_characters_string = col_trim_characters_const->getDataAt(0).toString();
custom_trim_characters = std::make_optional<SearchSymbols>(trim_characters_string);
}
}

ColumnPtr col_input_full;
Expand Down
1 change: 1 addition & 0 deletions tests/queries/0_stateless/03315_trim_two_args.reference
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,3 +22,4 @@ Negative tests
Special tests
abc
b
1
3 changes: 3 additions & 0 deletions tests/queries/0_stateless/03315_trim_two_args.sql
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -106,3 +106,6 @@ INSERT INTO tab VALUES ('abc');
SELECT trim(trailing char(0) from col) FROM tab;
SELECT trim(both 'ac' from col) FROM tab;
DROP TABLE tab;

-- Bug 78796
SELECT isConstant(trimBoth(''));
Loading