No need for deepCopy on makeSafe for pages field data

Since its a reference to a buffer in the PagedBytes, we don't need to deep copy it on makeSafe, just shallow copy it

src/main/java/org/elasticsearch/index/fielddata/BytesValues.java

@@ -26,7 +26,7 @@ import org.elasticsearch.index.fielddata.ordinals.Ordinals.Docs;
 
 /**
  */
-public abstract class  BytesValues {
+public abstract class BytesValues {
 
     public static final BytesValues EMPTY = new Empty();
     private boolean multiValued;
@@ -49,7 +49,9 @@ public abstract class  BytesValues {
     public abstract boolean hasValue(int docId);
 
     /**
-     * Converts the provided bytes to "safe" ones from a "non" safe call made (if needed).
+     * Converts the provided bytes to "safe" ones from a "non" safe call made (if needed). Note,
+     * this calls makes the bytes safe for *reads*, not writes (into the same BytesRef). For example,
+     * it makes it safe to be placed in a map.
      */
     public BytesRef makeSafe(BytesRef bytes) {
         return BytesRef.deepCopyOf(bytes);
@@ -152,6 +154,7 @@ public abstract class  BytesValues {
             protected BytesValues.WithOrdinals withOrds;
             protected Ordinals.Docs.Iter ordsIter;
             protected final BytesRef scratch = new BytesRef();
+
             public Multi(WithOrdinals withOrds) {
                 this.withOrds = withOrds;
                 assert withOrds.isMultiValued();
@@ -245,7 +248,7 @@ public abstract class  BytesValues {
         @Override
         public BytesRef getValue(int docId) {
             final int ord = ordinals.getOrd(docId);
-            if (ord == 0)  {
+            if (ord == 0) {
                 return null;
             }
             return getValueScratchByOrd(ord, scratch);

src/main/java/org/elasticsearch/index/fielddata/plain/FSTBytesAtomicFieldData.java

@@ -19,8 +19,6 @@
 
 package org.elasticsearch.index.fielddata.plain;
 
-import java.io.IOException;
-
 import org.apache.lucene.util.BytesRef;
 import org.apache.lucene.util.IntsRef;
 import org.apache.lucene.util.fst.BytesRefFSTEnum;
@@ -35,6 +33,8 @@ import org.elasticsearch.index.fielddata.ordinals.EmptyOrdinals;
 import org.elasticsearch.index.fielddata.ordinals.Ordinals;
 import org.elasticsearch.index.fielddata.ordinals.Ordinals.Docs;
 
+import java.io.IOException;
+
 /**
  */
 public class FSTBytesAtomicFieldData implements AtomicFieldData.WithOrdinals<ScriptDocValues.Strings> {
@@ -93,7 +93,6 @@ public class FSTBytesAtomicFieldData implements AtomicFieldData.WithOrdinals<Scr
     }
 
 
-
     @Override
     public ScriptDocValues.Strings getScriptValues() {
         assert fst != null;
@@ -112,8 +111,8 @@ public class FSTBytesAtomicFieldData implements AtomicFieldData.WithOrdinals<Scr
             hashes[0] = new BytesRef().hashCode();
             int i = 1;
             try {
-                while((next = fstEnum.next()) != null) {
+                while ((next = fstEnum.next()) != null) {
-                    hashes[i++] =  next.input.hashCode();
+                    hashes[i++] = next.input.hashCode();
                 }
             } catch (IOException ex) {
                 //bogus
@@ -128,9 +127,8 @@ public class FSTBytesAtomicFieldData implements AtomicFieldData.WithOrdinals<Scr
         protected final FST<Long> fst;
         protected final Ordinals.Docs ordinals;
 
-        protected final BytesRef scratch = new BytesRef();
         // per-thread resources
-        protected final BytesReader in ;
+        protected final BytesReader in;
         protected final Arc<Long> firstArc = new Arc<Long>();
         protected final Arc<Long> scratchArc = new Arc<Long>();
         protected final IntsRef scratchInts = new IntsRef();
@@ -180,6 +178,7 @@ public class FSTBytesAtomicFieldData implements AtomicFieldData.WithOrdinals<Scr
 
         static final class SingleHashed extends Single {
             private final int[] hashes;
+
             SingleHashed(FST<Long> fst, Docs ordinals, int[] hashes) {
                 super(fst, ordinals);
                 this.hashes = hashes;
@@ -247,7 +246,6 @@ public class FSTBytesAtomicFieldData implements AtomicFieldData.WithOrdinals<Scr
     }
 
 
-
     static class Empty extends FSTBytesAtomicFieldData {
 
         Empty(int numDocs) {
@@ -286,7 +284,4 @@ public class FSTBytesAtomicFieldData implements AtomicFieldData.WithOrdinals<Scr
     }
 
 
-
-    
-
 }

src/main/java/org/elasticsearch/index/fielddata/plain/PagedBytesAtomicFieldData.java

@@ -133,6 +133,13 @@ public class PagedBytesAtomicFieldData implements AtomicFieldData.WithOrdinals<S
             this.ordinals = ordinals;
         }
 
+        @Override
+        public BytesRef makeSafe(BytesRef bytes) {
+            // when we fill from the pages bytes, we just reference an existing buffer slice, its enough
+            // to create a shallow copy of the bytes to be safe for "reads".
+            return new BytesRef(bytes.bytes, bytes.offset, bytes.length);
+        }
+
         @Override
         public Ordinals.Docs ordinals() {
             return this.ordinals;

src/main/java/org/elasticsearch/search/facet/terms/strings/HashedAggregator.java

@@ -18,10 +18,8 @@
  */
 package org.elasticsearch.search.facet.terms.strings;
 
+import com.google.common.collect.ImmutableList;
 import gnu.trove.map.hash.TObjectIntHashMap;
-
-import java.util.Arrays;
-
 import org.apache.lucene.util.ArrayUtil;
 import org.apache.lucene.util.BytesRef;
 import org.apache.lucene.util.BytesRefHash;
@@ -33,7 +31,7 @@ import org.elasticsearch.search.facet.InternalFacet;
 import org.elasticsearch.search.facet.terms.TermsFacet;
 import org.elasticsearch.search.facet.terms.support.EntryPriorityQueue;
 
-import com.google.common.collect.ImmutableList;
+import java.util.Arrays;
 
 public class HashedAggregator {
     private int missing;
@@ -57,13 +55,9 @@ public class HashedAggregator {
         }
     }
 
-    protected BytesRef makesSafe(BytesRef ref, BytesValues values) {
-        return values.makeSafe(ref);
-    }
-    
     public void addValue(BytesRef value, int hashCode, BytesValues values) {
         final boolean added = hash.addNoCount(value, hashCode, values);
-        assert assertHash.addNoCount(value, hashCode, values) == added :  "asserting counter diverged from current counter - value: "
+        assert assertHash.addNoCount(value, hashCode, values) == added : "asserting counter diverged from current counter - value: "
                 + value + " hash: " + hashCode;
     }
 
@@ -107,9 +101,9 @@ public class HashedAggregator {
     }
 
     public static InternalFacet buildFacet(String facetName, int size, long missing, long total, TermsFacet.ComparatorType comparatorType,
-            HashedAggregator aggregator) {
+                                           HashedAggregator aggregator) {
         if (aggregator.isEmpty()) {
-            return new InternalStringTermsFacet(facetName, comparatorType, size, ImmutableList.<InternalStringTermsFacet.TermEntry> of(),
+            return new InternalStringTermsFacet(facetName, comparatorType, size, ImmutableList.<InternalStringTermsFacet.TermEntry>of(),
                     missing, total);
         } else {
             if (size < EntryPriorityQueue.LIMIT) {
@@ -240,9 +234,9 @@ public class HashedAggregator {
     }
 
     private static final class AssertingHashCount implements HashCount { // simple
-                                                                         // implemenation
+        // implemenation
-                                                                         // for
+        // for
-                                                                         // assertions
+        // assertions
         private final TObjectIntHashMap<HashedBytesRef> valuesAndCount = new TObjectIntHashMap<HashedBytesRef>();
         private HashedBytesRef spare = new HashedBytesRef();
 
@@ -251,7 +245,7 @@ public class HashedAggregator {
             int adjustedValue = valuesAndCount.adjustOrPutValue(spare.reset(value, hashCode), 1, 1);
             assert adjustedValue >= 1;
             if (adjustedValue == 1) { // only if we added the spare we create a
-                                      // new instance
+                // new instance
                 spare.bytes = values.makeSafe(spare.bytes);
                 spare = new HashedBytesRef();
                 return true;

src/main/java/org/elasticsearch/search/facet/termsstats/strings/TermsStatsStringFacetExecutor.java

@@ -19,11 +19,8 @@
 
 package org.elasticsearch.search.facet.termsstats.strings;
 
-import java.io.IOException;
+import com.google.common.collect.ImmutableList;
-import java.util.Arrays;
+import com.google.common.collect.Lists;
-import java.util.Comparator;
-import java.util.List;
-
 import org.apache.lucene.index.AtomicReaderContext;
 import org.apache.lucene.search.Scorer;
 import org.apache.lucene.util.BytesRef;
@@ -42,8 +39,10 @@ import org.elasticsearch.search.facet.terms.strings.HashedAggregator;
 import org.elasticsearch.search.facet.termsstats.TermsStatsFacet;
 import org.elasticsearch.search.internal.SearchContext;
 
-import com.google.common.collect.ImmutableList;
+import java.io.IOException;
-import com.google.common.collect.Lists;
+import java.util.Arrays;
+import java.util.Comparator;
+import java.util.List;
 
 public class TermsStatsStringFacetExecutor extends FacetExecutor {
 
@@ -158,7 +157,7 @@ public class TermsStatsStringFacetExecutor extends FacetExecutor {
             spare.reset(value, hashCode);
             InternalTermsStatsStringFacet.StringEntry stringEntry = entries.get(spare);
             if (stringEntry == null) {
-                HashedBytesRef theValue = new HashedBytesRef(makesSafe(value, values), hashCode);
+                HashedBytesRef theValue = new HashedBytesRef(values.makeSafe(value), hashCode);
                 stringEntry = new InternalTermsStatsStringFacet.StringEntry(theValue, 0, 0, 0, Double.POSITIVE_INFINITY, Double.NEGATIVE_INFINITY);
                 entries.put(theValue, stringEntry);
             }
@@ -198,7 +197,7 @@ public class TermsStatsStringFacetExecutor extends FacetExecutor {
             spare.reset(value, hashCode);
             InternalTermsStatsStringFacet.StringEntry stringEntry = entries.get(spare);
             if (stringEntry == null) {
-                HashedBytesRef theValue = new HashedBytesRef(makesSafe(value, values), hashCode);
+                HashedBytesRef theValue = new HashedBytesRef(values.makeSafe(value), hashCode);
                 stringEntry = new InternalTermsStatsStringFacet.StringEntry(theValue, 1, 0, 0, Double.POSITIVE_INFINITY, Double.NEGATIVE_INFINITY);
                 entries.put(theValue, stringEntry);
             } else {