Skip to content
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.

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

[GLUTEN-5898][CH] Fix regexp_extract function use bracket has diff behaver with spark #5908

Merged
merged 3 commits into from
May 30, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
Original file line number Diff line number Diff line change
Expand Up @@ -708,4 +708,24 @@ class GlutenFunctionValidateSuite extends GlutenClickHouseWholeStageTransformerS

}

test("GLUTEN-5897: fix regexp_extract with bracket") {
withTable("regexp_extract_bracket") {
sql("create table regexp_extract_bracket(a String) using parquet")
sql(
"""
|insert into regexp_extract_bracket values ('123.123abc-abc'),('123-LOW'),('123]abc-abc')
|""".stripMargin)

val sql_str =
s"""select
| regexp_extract(a, '([0-9][[\\.][0-9]]*)', 1)
| , regexp_extract(a, '([0-9][[\\.][0-9]]*)', 1)
| , regexp_extract(a, '([0-9][[]]]*)', 1)
| from regexp_extract_bracket
""".stripMargin

runQueryAndCompare(sql_str) { _ => }
}
}

}
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,8 @@
* limitations under the License.
*/

#include <stack>

#include <Parser/FunctionParser.h>

namespace DB
Expand Down Expand Up @@ -56,10 +58,11 @@ class FunctionParserRegexpExtract : public FunctionParser
size_t expr_size = expr_str.size();
if (expr_str.data()[expr_size - 1] == '$')
expr_str.replace(expr_str.find_last_of("$"), 1, "(?:(\n)*)$");

const auto * regex_expr_node = addColumnToActionsDAG(actions_dag, std::make_shared<DataTypeString>(), expr_str);

String sparkRegexp = adjustSparkRegexpRule(expr_str);
const auto * regex_expr_node = addColumnToActionsDAG(actions_dag, std::make_shared<DataTypeString>(), sparkRegexp);
auto parsed_args = parseFunctionArguments(substrait_func, "", actions_dag);
parsed_args[1] = regex_expr_node;
parsed_args[1] = regex_expr_node;
const auto * result_node = toFunctionNode(actions_dag, "regexpExtract", parsed_args);
return convertNodeTypeIfNeeded(substrait_func, result_node, actions_dag);
}
Expand All @@ -69,6 +72,77 @@ class FunctionParserRegexpExtract : public FunctionParser
else
throw Exception(ErrorCodes::ILLEGAL_TYPE_OF_ARGUMENT, "Function {} 2nd argument's type must be const", getName());
}

private:
String adjustSparkRegexpRule(String & str) const
{
const auto left_bracket_pos = str.find('[');
const auto right_bracket_pos = str.find(']');

if (left_bracket_pos == str.npos || right_bracket_pos == str.npos || left_bracket_pos >= right_bracket_pos)
return str;

auto throw_message = [this, &str]() -> void {
throw Exception(
ErrorCodes::ILLEGAL_TYPE_OF_ARGUMENT, "The value of parameter(s) 'regexp' in `{}` is invalid: '{}'", getName(), str);
};

ReadBufferFromString buf(str);
std::stack<String> strs;
strs.emplace("");
bool nead_right_bracket = false;

while (!buf.eof())
{
if (*buf.position() == '[')
{
strs.emplace("");
}
else if (*buf.position() == ']')
{
if (strs.size() == 1)
{
// "ab]c"
strs.top().append("]");
}
else
{
String back = strs.top();
strs.pop();
if (strs.size() == 1)
{
// "abc[abc]abc"
strs.top().append("[").append(back).append("]");
nead_right_bracket = false;
}
else
{
// "abc[a[abc]c]abc"
strs.top().append(back);
nead_right_bracket = true;
}
}
}
else
{
strs.top() += *buf.position();
}

++buf.position();
}

if (nead_right_bracket && strs.size() != 1)
throw_message();

while (strs.size() != 1)
{
String back = strs.top();
strs.pop();
strs.top().append("[").append(back);
}

return strs.top();
}
};

static FunctionParserRegister<FunctionParserRegexpExtract> register_regexp_extract;
Expand Down
Loading