Skip to content

Remove regex usage from Identifier validation #11548

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
findepi merged 1 commit into from
Mar 22, 2022
Merged

Remove regex usage from Identifier validation #11548

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
30 changes: 26 additions & 4 deletions core/trino-parser/src/main/java/io/trino/sql/tree/Identifier.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,21 +13,30 @@
*/
package io.trino.sql.tree;

import com.google.common.base.CharMatcher;
import com.google.common.base.Strings;
import com.google.common.collect.ImmutableList;

import java.util.List;
import java.util.Objects;
import java.util.Optional;
import java.util.regex.Pattern;

import static com.google.common.base.Preconditions.checkArgument;
import static com.google.common.base.Verify.verify;
import static java.util.Locale.ENGLISH;
import static java.util.Objects.requireNonNull;

public class Identifier
extends Expression
{
private static final Pattern NAME_PATTERN = Pattern.compile("[a-zA-Z_]([a-zA-Z0-9_])*");
private static final CharMatcher FIRST_CHAR_DISALLOWED_MATCHER = CharMatcher.inRange('0', '9')
.precomputed();

private static final CharMatcher ALLOWED_CHARS_MATCHER = CharMatcher.inRange('a', 'z')
.or(CharMatcher.inRange('A', 'Z'))
.or(CharMatcher.is('_'))
.or(CharMatcher.inRange('0', '9'))
.precomputed();

private final String value;
private final boolean delimited;
Expand All @@ -44,7 +53,7 @@ public Identifier(String value, boolean delimited)

public Identifier(String value)
{
this(Optional.empty(), value, !NAME_PATTERN.matcher(value).matches());
this(Optional.empty(), value, !isValidIdentifier(value));
}

private Identifier(Optional<NodeLocation> location, String value, boolean delimited)
Expand All @@ -54,7 +63,7 @@ private Identifier(Optional<NodeLocation> location, String value, boolean delimi
this.delimited = delimited;

checkArgument(!value.isEmpty(), "value is empty");
checkArgument(delimited || NAME_PATTERN.matcher(value).matches(), "value contains illegal characters: %s", value);
checkArgument(delimited || isValidIdentifier(value), "value contains illegal characters: %s", value);
}

public String getValue()
Expand Down Expand Up @@ -118,4 +127,17 @@ public boolean shallowEquals(Node other)
Identifier that = (Identifier) other;
return Objects.equals(value, that.value) && delimited == that.delimited;
}

private static boolean isValidIdentifier(String value)
{
verify(!Strings.isNullOrEmpty(value), "Identifier cannot be empty or null");

if (FIRST_CHAR_DISALLOWED_MATCHER.matches(value.charAt(0))) {
return false;
}

// We've already checked that first char does not contain digits,
// so to avoid copying we are checking whole string.
return ALLOWED_CHARS_MATCHER.matchesAllOf(value);
}
}