Apache
/
druid
mirror of https://github.com/apache/druid.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Better surfacing of invalid pattern errors for SQL REGEXP_EXTRACT function (#14505)

This commit is contained in:
Jonathan Wei 2023-07-05 17:12:54 -05:00 committed by GitHub
parent 50b7e5d20e
commit f29a9faa94
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 47 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
sql/src/main/java/org/apache/druid/sql/calcite/expression/builtin/RegexpExtractOperatorConversion.java
View File

@ -24,6 +24,7 @@ import org.apache.calcite.sql.SqlFunction;
import org.apache.calcite.sql.SqlFunctionCategory;
import org.apache.calcite.sql.type.SqlTypeFamily;
import org.apache.calcite.sql.type.SqlTypeName;
import org.apache.druid.error.InvalidSqlInput;
import org.apache.druid.java.util.common.StringUtils;
import org.apache.druid.math.expr.Expr;
import org.apache.druid.query.extraction.RegexDimExtractionFn;
@ -33,6 +34,8 @@ import org.apache.druid.sql.calcite.expression.OperatorConversions;
import org.apache.druid.sql.calcite.expression.SqlOperatorConversion;
import org.apache.druid.sql.calcite.planner.PlannerContext;
import java.util.regex.PatternSyntaxException;
public class RegexpExtractOperatorConversion implements SqlOperatorConversion
{
private static final SqlFunction SQL_FUNCTION = OperatorConversions
@ -74,16 +77,29 @@ public class RegexpExtractOperatorConversion implements SqlOperatorConversion
if (arg.isSimpleExtraction() && patternExpr.isLiteral() && (indexExpr == null || indexExpr.isLiteral())) {
final String pattern = (String) patternExpr.getLiteralValue();
return arg.getSimpleExtraction().cascade(
new RegexDimExtractionFn(
// Undo the empty-to-null conversion from patternExpr parsing (patterns cannot be null, even in
// non-SQL-compliant null handling mode).
StringUtils.nullToEmptyNonDruidDataString(pattern),
indexExpr == null ? DEFAULT_INDEX : ((Number) indexExpr.getLiteralValue()).intValue(),
true,
null
)
);
try {
return arg.getSimpleExtraction().cascade(
new RegexDimExtractionFn(
// Undo the empty-to-null conversion from patternExpr parsing (patterns cannot be null, even in
// non-SQL-compliant null handling mode).
StringUtils.nullToEmptyNonDruidDataString(pattern),
indexExpr == null ? DEFAULT_INDEX : ((Number) indexExpr.getLiteralValue()).intValue(),
true,
null
)
);
}
catch (PatternSyntaxException e) {
throw InvalidSqlInput.exception(
e,
StringUtils.format(
"An invalid pattern [%s] was provided for the REGEXP_EXTRACT function, error: [%s]",
e.getPattern(),
e.getMessage()
)
);
}
} else {
return null;
}

21
sql/src/test/java/org/apache/druid/sql/calcite/CalciteQueryTest.java
View File

@ -7511,6 +7511,27 @@ public class CalciteQueryTest extends BaseCalciteQueryTest
);
}
@Test
public void testRegexpExtractWithBadRegexPattern()
{
// Cannot vectorize due to extractionFn in dimension spec.
cannotVectorize();
expectedException.expect(DruidException.class);
expectedException.expectMessage(
"An invalid pattern [^(.))] was provided for the REGEXP_EXTRACT function, " +
"error: [Unmatched closing ')' near index 3\n^(.))\n ^]"
);
testQuery(
"SELECT DISTINCT\n"
+ " REGEXP_EXTRACT(dim1, '^(.))', 1)\n"
+ "FROM foo",
ImmutableList.of(),
ImmutableList.of()
);
}
@Test
public void testRegexpExtractFilterViaNotNullCheck()
{