From 233a289a6683167321e65cfe1fbcf8d0398d7954 Mon Sep 17 00:00:00 2001
From: Robert Muir <rmuir@apache.org>
Date: Fri, 25 Nov 2011 13:28:43 +0000
Subject: [PATCH] LUCENE-3590: cut over new DV grouping collectors

git-svn-id: https://svn.apache.org/repos/asf/lucene/dev/trunk@1206156 13f79535-47bb-0310-9956-ffa450edef68
---
 .../search/grouping/dv/DVAllGroupHeadsCollector.java      | 4 ++--
 .../lucene/search/grouping/dv/DVAllGroupsCollector.java   | 2 +-
 .../search/grouping/dv/DVFirstPassGroupingCollector.java  | 8 ++++----
 .../org/apache/lucene/search/grouping/TestGrouping.java   | 2 +-
 4 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/modules/grouping/src/java/org/apache/lucene/search/grouping/dv/DVAllGroupHeadsCollector.java b/modules/grouping/src/java/org/apache/lucene/search/grouping/dv/DVAllGroupHeadsCollector.java
index 1e638466777..ab14d414003 100644
--- a/modules/grouping/src/java/org/apache/lucene/search/grouping/dv/DVAllGroupHeadsCollector.java
+++ b/modules/grouping/src/java/org/apache/lucene/search/grouping/dv/DVAllGroupHeadsCollector.java
@@ -222,7 +222,7 @@ public abstract class DVAllGroupHeadsCollector<GH extends AbstractAllGroupHeadsC
       }
 
       protected Comparable duplicate(Comparable value) {
-        return new BytesRef((BytesRef) value);
+        return BytesRef.deepCopyOf((BytesRef) value);
       }
 
       protected void setDocValuesSources(IndexDocValues.Source source) {
@@ -248,7 +248,7 @@ public abstract class DVAllGroupHeadsCollector<GH extends AbstractAllGroupHeadsC
       }
 
       protected Comparable duplicate(Comparable value) {
-        return new BytesRef((BytesRef) value);
+        return BytesRef.deepCopyOf((BytesRef) value);
       }
 
       protected void setDocValuesSources(IndexDocValues.Source source) {
diff --git a/modules/grouping/src/java/org/apache/lucene/search/grouping/dv/DVAllGroupsCollector.java b/modules/grouping/src/java/org/apache/lucene/search/grouping/dv/DVAllGroupsCollector.java
index 94679ed2a6c..541aa780eb8 100644
--- a/modules/grouping/src/java/org/apache/lucene/search/grouping/dv/DVAllGroupsCollector.java
+++ b/modules/grouping/src/java/org/apache/lucene/search/grouping/dv/DVAllGroupsCollector.java
@@ -194,7 +194,7 @@ public abstract class DVAllGroupsCollector<GROUP_VALUE_TYPE> extends AbstractAll
     public void collect(int doc) throws IOException {
       BytesRef value = source.getBytes(doc, spare);
       if (!groups.contains(value)) {
-        groups.add(new BytesRef(value));
+        groups.add(BytesRef.deepCopyOf(value));
       }
     }
 
diff --git a/modules/grouping/src/java/org/apache/lucene/search/grouping/dv/DVFirstPassGroupingCollector.java b/modules/grouping/src/java/org/apache/lucene/search/grouping/dv/DVFirstPassGroupingCollector.java
index 05c83008a7f..d5b70355c15 100644
--- a/modules/grouping/src/java/org/apache/lucene/search/grouping/dv/DVFirstPassGroupingCollector.java
+++ b/modules/grouping/src/java/org/apache/lucene/search/grouping/dv/DVFirstPassGroupingCollector.java
@@ -154,10 +154,10 @@ public abstract class DVFirstPassGroupingCollector<GROUP_VALUE_TYPE> extends Abs
 
     protected BytesRef copyDocGroupValue(BytesRef groupValue, BytesRef reuse) {
       if (reuse != null) {
-        reuse.copy(groupValue);
+        reuse.copyBytes(groupValue);
         return reuse;
       } else {
-        return new BytesRef(groupValue);
+        return BytesRef.deepCopyOf(groupValue);
       }
     }
 
@@ -184,10 +184,10 @@ public abstract class DVFirstPassGroupingCollector<GROUP_VALUE_TYPE> extends Abs
     @Override
     protected BytesRef copyDocGroupValue(BytesRef groupValue, BytesRef reuse) {
       if (reuse != null) {
-        reuse.copy(groupValue);
+        reuse.copyBytes(groupValue);
         return reuse;
       } else {
-        return new BytesRef(groupValue);
+        return BytesRef.deepCopyOf(groupValue);
       }
     }
 
diff --git a/modules/grouping/src/test/org/apache/lucene/search/grouping/TestGrouping.java b/modules/grouping/src/test/org/apache/lucene/search/grouping/TestGrouping.java
index e2e7dfdf950..eb605cae285 100644
--- a/modules/grouping/src/test/org/apache/lucene/search/grouping/TestGrouping.java
+++ b/modules/grouping/src/test/org/apache/lucene/search/grouping/TestGrouping.java
@@ -748,7 +748,7 @@ public class TestGrouping extends LuceneTestCase {
         if (groupDoc.group != null) {
           group.setValue(groupDoc.group.utf8ToString());
           if (canUseIDV) {
-            idvGroupField.setBytes(new BytesRef(groupDoc.group), ValueType.BYTES_VAR_SORTED);
+            idvGroupField.setBytes(BytesRef.deepCopyOf(groupDoc.group), ValueType.BYTES_VAR_SORTED);
           }
         }
         sort1.setValue(groupDoc.sort1.utf8ToString());