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.

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

fix: Avoid string concat and regex inefficiency #117

Merged
merged 3 commits into from
Nov 14, 2023
Merged

fix: Avoid string concat and regex inefficiency #117

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
3764334
Removes cmd line string concat
rafvasq Oct 31, 2023
8bec96f
Use possessive quantifier
rafvasq Oct 31, 2023
4379300
Fixes command args
rafvasq Nov 1, 2023
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
2 changes: 1 addition & 1 deletion src/main/java/com/ibm/watson/modelmesh/ModelMesh.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -927,7 +927,7 @@ protected final TProcessor initialize() throws Exception {
// "type" or "type:p1=v1;p2=v2;...;pn=vn"
private static final Pattern METRICS_CONFIG_PATT = Pattern.compile("([a-z;]+)(:\\w+=[^;]+(?:;\\w+=[^;]+)*)?");
// "metric_name" or "metric:name;l1=v1,l2=v2,...,ln=vn,"
private static final Pattern CUSTOM_METRIC_CONFIG_PATT = Pattern.compile("([a-z_:]+);(\\w+=[^;]+(?:;\\w+=[^,]+)*)?");
private static final Pattern CUSTOM_METRIC_CONFIG_PATT = Pattern.compile("([a-z_:]+);(\\w+=[^;]+(?:;\\w+=[^,]++)*)?");
ckadner marked this conversation as resolved.
Show resolved Hide resolved

private static Metrics setUpMetrics() throws Exception {
if (System.getenv("MM_METRICS_STATSD_PORT") != null || System.getenv("MM_METRICS_PROMETHEUS_PORT") != null) {
Expand Down
4 changes: 2 additions & 2 deletions src/test/java/com/ibm/watson/modelmesh/ModelMeshTearDownTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -315,7 +315,7 @@ public static int getPID(Process process) throws Exception {
}

public static int killProcess(Process process) throws Exception {
int pid = getPID(process);
return Runtime.getRuntime().exec("kill -9 " + pid).waitFor();
String pid = Integer.toString(getPID(process));
ckadner marked this conversation as resolved.
Show resolved Hide resolved
return Runtime.getRuntime().exec(new String[] {"kill", "-9", pid}).waitFor();
}
}
Loading