Skip to content

Avoid unnecessary regex compilation in hot paths #951

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
Smorki wants to merge 1 commit into
base: master
Choose a base branch
from
+4 −2
Open

Avoid unnecessary regex compilation in hot paths #951

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
4 changes: 3 additions & 1 deletion src/main/java/net/coreprotect/config/Config.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@
import java.util.Map;
import java.util.concurrent.CancellationException;
import java.util.concurrent.CompletableFuture;
import java.util.regex.Pattern;

import org.bukkit.Bukkit;
import org.bukkit.World;
Expand All @@ -30,6 +31,7 @@ public class Config extends Language {
private static final Map<String, String> DEFAULT_VALUES = new LinkedHashMap<>();
private static final Map<String, Config> CONFIG_BY_WORLD_NAME = new HashMap<>();
private static final String DEFAULT_FILE_HEADER = "# CoreProtect Config";
private static final Pattern NON_DIGIT_PATTERN = Pattern.compile("[^0-9]");
public static final String LINE_SEPARATOR = "\n";

private static final Config GLOBAL = new Config();
Expand Down Expand Up @@ -370,7 +372,7 @@ private int getInt(final String key, final int dfl) {
return dfl;
}

configured = configured.replaceAll("[^0-9]", "");
configured = NON_DIGIT_PATTERN.matcher(configured).replaceAll("");

return configured.isEmpty() ? dfl : Integer.parseInt(configured);
}
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/net/coreprotect/database/logger/BlockBreakLogger.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,7 @@ else if (checkType != null && (checkType.equals(Material.AIR) || checkType.equal
}

if (checkType == Material.LECTERN && blockData != null) {
blockData = blockData.replaceFirst("has_book=true", "has_book=false");
blockData = blockData.replace("has_book=true", "has_book=false");
}
else if (checkType != null && (checkType == Material.PAINTING || BukkitAdapter.ADAPTER.isItemFrame(checkType))) {
blockData = overrideData;
Expand Down