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

Jump to bottom

perf: avoid string concatenation in HTTPHC4.HttpClientKey #5954

Merged
merged 1 commit into from
Jun 1, 2023
Merged

perf: avoid string concatenation in HTTPHC4.HttpClientKey #5954

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.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
43 changes: 22 additions & 21 deletions src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/sampler/HTTPHC4Impl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,7 @@
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import java.util.Objects;
import java.util.concurrent.TimeUnit;
import java.util.function.Predicate;
import java.util.regex.Pattern;
Expand Down Expand Up @@ -945,7 +946,8 @@ private CloseableHttpResponse executeRequest(final CloseableHttpClient httpClien
*/
private static final class HttpClientKey {

private final String target; // protocol://[user:pass@]host:[port]
private final String protocol;
private final String authority;
private final boolean hasProxy;
private final String proxyScheme;
private final String proxyHost;
Expand All @@ -968,7 +970,8 @@ public HttpClientKey(URL url, boolean hasProxy, String proxyScheme, String proxy
int proxyPort, String proxyUser, String proxyPass) {
// N.B. need to separate protocol from authority otherwise http://server would match https://erver (<= sic, not typo error)
// could use separate fields, but simpler to combine them
this.target = url.getProtocol()+"://"+url.getAuthority();
this.protocol = url.getProtocol();
this.authority = url.getAuthority();
this.hasProxy = hasProxy;
this.proxyScheme = proxyScheme;
this.proxyHost = proxyHost;
Expand All @@ -988,7 +991,8 @@ private int getHash() {
hash = hash*31 + getHash(proxyUser);
hash = hash*31 + getHash(proxyPass);
}
hash = hash*31 + target.hashCode();
hash = hash*31 + getHash(protocol);
hash = hash*31 + getHash(authority);
return hash;
}

Expand All @@ -1006,26 +1010,21 @@ public boolean equals(Object obj) {
return false;
}
HttpClientKey other = (HttpClientKey) obj;
if (this.hasProxy) { // otherwise proxy String fields may be null
if (proxyScheme == null) {
if (other.proxyScheme != null) {
return false;
}
} else if (!proxyScheme.equals(other.proxyScheme)) {
return false;
}
return
this.hasProxy == other.hasProxy &&
if (!Objects.equals(authority, other.authority) ||
!Objects.equals(protocol, other.protocol) ||
hasProxy != other.hasProxy) {
return false;
}
if (!hasProxy) {
// No proxy, so don't check proxy fields
return true;
}
return
this.proxyPort == other.proxyPort &&
Objects.equals(proxyScheme, other.proxyScheme) &&
this.proxyHost.equals(other.proxyHost) &&
this.proxyUser.equals(other.proxyUser) &&
this.proxyPass.equals(other.proxyPass) &&
this.target.equals(other.target);
}
// No proxy, so don't check proxy fields
return
this.hasProxy == other.hasProxy &&
this.target.equals(other.target);
this.proxyPass.equals(other.proxyPass);
}

@Override
Expand All @@ -1037,7 +1036,9 @@ public int hashCode(){
@Override
public String toString() {
StringBuilder sb = new StringBuilder();
sb.append(target);
sb.append(protocol);
sb.append("://");
sb.append(authority);
if (hasProxy) {
sb.append(" via ");
sb.append(proxyUser);
Expand Down