Use unmodifiableSortedMap instead of unModifiableMap when wrapping tr…

…eemaps to ensure that bulk copy operations are faster when copied onto another TreeMap RB=1919280 R=rtecco,kbalasub,mnchen A=rtecco,lcarmody
linkedin · Dec 20, 2019 · aa4d897 · aa4d897
1 parent 2fb4679
commit aa4d897
Show file tree

Hide file tree

Showing 9 changed files with 21 additions and 15 deletions.
diff --git a/CHANGELOG b/CHANGELOG
@@ -1,3 +1,6 @@
+28.1.4
+------
+
 28.1.3
 ------
 (RB=1920382)
@@ -9,6 +12,9 @@ Use PDL in examples and restli-example-api
 (RB=1882175)
 Dark cluster schema and serializer changes
 
+(RB=1919280)
+Use unmodifiableSortedMap instead of unModifiableMap when wrapping treemaps to ensure that bulk copy operations are faster when copied onto another TreeMap.
+
 (RB=1913253)
 Fix convertToPdl tool validation issue when there is an extra whitespace in the beginning of a line in doc. 
 

diff --git a/gradle.properties b/gradle.properties
@@ -1,4 +1,4 @@
-version=28.1.2
+version=28.1.3
 sonatypeUsername=please_set_in_home_dir_if_uploading_to_maven_central
 sonatypePassword=please_set_in_home_dir_if_uploading_to_maven_central
 org.gradle.configureondemand=true

diff --git a/r2-core/src/main/java/com/linkedin/r2/message/BaseMessage.java b/r2-core/src/main/java/com/linkedin/r2/message/BaseMessage.java
@@ -43,10 +43,10 @@ protected BaseMessage(Map<String, String> headers, List<String> cookies)
   {
     ArgumentUtil.notNull(headers, "headers");
     ArgumentUtil.notNull(cookies, "cookies");
-    Map<String, String> tmpHeaders = new TreeMap<String, String>(String.CASE_INSENSITIVE_ORDER);
+    TreeMap<String, String> tmpHeaders = new TreeMap<>(String.CASE_INSENSITIVE_ORDER);
     tmpHeaders.putAll(headers);
-    _headers = Collections.unmodifiableMap(tmpHeaders);
-    _cookies = Collections.unmodifiableList(new ArrayList<String>(cookies));
+    _headers = Collections.unmodifiableSortedMap(tmpHeaders);
+    _cookies = Collections.unmodifiableList(new ArrayList<>(cookies));
   }
 
   @Override

diff --git a/r2-core/src/main/java/com/linkedin/r2/message/BaseMessageBuilder.java b/r2-core/src/main/java/com/linkedin/r2/message/BaseMessageBuilder.java
@@ -45,7 +45,7 @@ public abstract class BaseMessageBuilder<B extends BaseMessageBuilder<B>>
 
   private static final String CANONICAL_REPLACEMENT = " ";
 
-  private Map<String, String> _headers;
+  private TreeMap<String, String> _headers;
 
   private List<String> _cookies;
 
@@ -139,7 +139,7 @@ public B clearCookies()
   @Override
   public Map<String, String> getHeaders()
   {
-    return Collections.unmodifiableMap(_headers);
+    return Collections.unmodifiableSortedMap(_headers);
   }
 
   @Override

diff --git a/r2-core/src/main/java/com/linkedin/r2/transport/common/WireAttributeHelper.java b/r2-core/src/main/java/com/linkedin/r2/transport/common/WireAttributeHelper.java
@@ -55,7 +55,7 @@ public static Map<String, String> removeWireAttributes(Map<String, String> map)
     {
       final Map.Entry<String, String> entry = it.next();
       final String key = entry.getKey();
-      if (key.toUpperCase().startsWith(WIRE_ATTR_PREFIX))
+      if (key.regionMatches(true, 0, WIRE_ATTR_PREFIX, 0, WIRE_ATTR_PREFIX.length()))
       {
         final String value = entry.getValue();
         final String newKey = key.substring(WIRE_ATTR_PREFIX.length());

diff --git a/restli-client/src/main/java/com/linkedin/restli/client/AbstractRequestBuilder.java b/restli-client/src/main/java/com/linkedin/restli/client/AbstractRequestBuilder.java
@@ -606,9 +606,9 @@ protected List<HttpCookie> buildReadOnlyCookies()
 
   static protected Map<String, String> getReadOnlyHeaders(Map<String, String> headers)
   {
-    Map<String, String> copyHeaders = new TreeMap<String, String>(String.CASE_INSENSITIVE_ORDER);
+    TreeMap<String, String> copyHeaders = new TreeMap<>(String.CASE_INSENSITIVE_ORDER);
     copyHeaders.putAll(headers);
-    return Collections.unmodifiableMap(copyHeaders);
+    return Collections.unmodifiableSortedMap(copyHeaders);
   }
 
   static protected List<HttpCookie> getReadOnlyCookies(List<HttpCookie> cookies)

diff --git a/restli-client/src/main/java/com/linkedin/restli/client/multiplexer/MultiplexedResponse.java b/restli-client/src/main/java/com/linkedin/restli/client/multiplexer/MultiplexedResponse.java
@@ -38,7 +38,7 @@ public MultiplexedResponse(int status, Map<String, String> headers)
     // see com.linkedin.restli.internal.client.ResponseImpl.ResponseImpl()
     TreeMap<String, String> headersTreeMap = new TreeMap<String, String>(String.CASE_INSENSITIVE_ORDER);
     headersTreeMap.putAll(headers);
-    _headers = Collections.unmodifiableMap(headersTreeMap);
+    _headers = Collections.unmodifiableSortedMap(headersTreeMap);
   }
 
   public int getStatus()

diff --git a/restli-client/src/main/java/com/linkedin/restli/internal/client/ResponseImpl.java b/restli-client/src/main/java/com/linkedin/restli/internal/client/ResponseImpl.java
@@ -50,7 +50,7 @@
 public class ResponseImpl<T> implements Response<T>
 {
   private int _status = 102;  // SC_PROCESSING
-  private final Map<String, String> _headers;
+  private final TreeMap<String, String> _headers;
   private final List<HttpCookie> _cookies;
   private T _entity;
   private RestLiResponseException _error;
@@ -126,7 +126,7 @@ public void setEntity(T entity)
   @Override
   public Map<String, String> getHeaders()
   {
-    return Collections.unmodifiableMap(_headers);
+    return Collections.unmodifiableSortedMap(_headers);
   }
 
   @Override

diff --git a/restli-server/src/main/java/com/linkedin/restli/internal/server/ResourceContextImpl.java b/restli-server/src/main/java/com/linkedin/restli/internal/server/ResourceContextImpl.java
@@ -73,8 +73,8 @@ public class ResourceContextImpl implements ServerResourceContext
   private final MutablePathKeys                     _pathKeys;
   private final Request                             _request;
   private final DataMap                             _parameters;
-  private final Map<String, String>                 _requestHeaders;
-  private final Map<String, String>                 _responseHeaders;
+  private final TreeMap<String, String>             _requestHeaders;
+  private final TreeMap<String, String>             _responseHeaders;
   private final List<HttpCookie>                    _requestCookies;
   private final List<HttpCookie>                    _responseCookies;
   private final Map<Object, RestLiServiceException> _batchKeyErrors;
@@ -472,7 +472,7 @@ public RequestContext getRawRequestContext()
   @Override
   public Map<String, String> getResponseHeaders()
   {
-    return Collections.unmodifiableMap(_responseHeaders);
+    return Collections.unmodifiableSortedMap(_responseHeaders);
   }
 
   @Override