You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by sh...@apache.org on 2015/08/27 16:18:16 UTC

svn commit: r1698163 - in /lucene/dev/branches/branch_5x: ./ solr/ solr/CHANGES.txt solr/solrj/ solr/solrj/src/java/org/apache/solr/common/util/Utils.java

Author: shalin
Date: Thu Aug 27 14:18:15 2015
New Revision: 1698163

URL: http://svn.apache.org/r1698163
Log:
SOLR-7983: Utils.toUTF8 uses shorter buffer than necessary for holding UTF8 data

Modified:
    lucene/dev/branches/branch_5x/   (props changed)
    lucene/dev/branches/branch_5x/solr/   (props changed)
    lucene/dev/branches/branch_5x/solr/CHANGES.txt   (contents, props changed)
    lucene/dev/branches/branch_5x/solr/solrj/   (props changed)
    lucene/dev/branches/branch_5x/solr/solrj/src/java/org/apache/solr/common/util/Utils.java

Modified: lucene/dev/branches/branch_5x/solr/CHANGES.txt
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_5x/solr/CHANGES.txt?rev=1698163&r1=1698162&r2=1698163&view=diff
==============================================================================
--- lucene/dev/branches/branch_5x/solr/CHANGES.txt (original)
+++ lucene/dev/branches/branch_5x/solr/CHANGES.txt Thu Aug 27 14:18:15 2015
@@ -85,6 +85,8 @@ Bug Fixes
   of stats.field to prevent ArrayIndexOutOfBoundsException in a distributed search when a large precision
   is selected and a large number of values exist in each shard (hossman)
 
+* SOLR-7983: Utils.toUTF8 uses shorter buffer than necessary for holding UTF8 data. (shalin)
+
 Optimizations
 ----------------------
 

Modified: lucene/dev/branches/branch_5x/solr/solrj/src/java/org/apache/solr/common/util/Utils.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_5x/solr/solrj/src/java/org/apache/solr/common/util/Utils.java?rev=1698163&r1=1698162&r2=1698163&view=diff
==============================================================================
--- lucene/dev/branches/branch_5x/solr/solrj/src/java/org/apache/solr/common/util/Utils.java (original)
+++ lucene/dev/branches/branch_5x/solr/solrj/src/java/org/apache/solr/common/util/Utils.java Thu Aug 27 14:18:15 2015
@@ -84,7 +84,7 @@ public class Utils {
   }
 
   public static byte[] toUTF8(CharArr out) {
-    byte[] arr = new byte[out.size() << 2]; // is 4x the real worst-case upper-bound?
+    byte[] arr = new byte[out.size() * 3];
     int nBytes = ByteUtils.UTF16toUTF8(out, 0, out.size(), arr, 0);
     return Arrays.copyOf(arr, nBytes);
   }