svn commit: r1422050 - in /accumulo/branches/1.4/src/core/src: main/java/org/apache/accumulo/core/iterators/Combiner.java test/java/org/apache/accumulo/core/iterators/user/CombinerTest.java

[ecn]

Author: ecn
Date: Fri Dec 14 19:19:05 2012
New Revision: 1422050

URL: http://svn.apache.org/viewvc?rev=1422050&view=rev
Log:
ACCUMULO-907 fix combiners over iterators that mutate their top key

Modified:
    
accumulo/branches/1.4/src/core/src/main/java/org/apache/accumulo/core/iterators/Combiner.java
    
accumulo/branches/1.4/src/core/src/test/java/org/apache/accumulo/core/iterators/user/CombinerTest.java

Modified: 
accumulo/branches/1.4/src/core/src/main/java/org/apache/accumulo/core/iterators/Combiner.java
URL: 
http://svn.apache.org/viewvc/accumulo/branches/1.4/src/core/src/main/java/org/apache/accumulo/core/iterators/Combiner.java?rev=1422050&r1=1422049&r2=1422050&view=diff
==============================================================================
--- 
accumulo/branches/1.4/src/core/src/main/java/org/apache/accumulo/core/iterators/Combiner.java
 (original)
+++ 
accumulo/branches/1.4/src/core/src/main/java/org/apache/accumulo/core/iterators/Combiner.java
 Fri Dec 14 19:19:05 2012
@@ -63,7 +63,7 @@ public abstract class Combiner extends W
      */
     public ValueIterator(SortedKeyValueIterator<Key,Value> source) {
       this.source = source;
-      topKey = source.getTopKey();
+      topKey = new Key(source.getTopKey());
       hasNext = _hasNext();
     }
     

Modified: 
accumulo/branches/1.4/src/core/src/test/java/org/apache/accumulo/core/iterators/user/CombinerTest.java
URL: 
http://svn.apache.org/viewvc/accumulo/branches/1.4/src/core/src/test/java/org/apache/accumulo/core/iterators/user/CombinerTest.java?rev=1422050&r1=1422049&r2=1422050&view=diff
==============================================================================
--- 
accumulo/branches/1.4/src/core/src/test/java/org/apache/accumulo/core/iterators/user/CombinerTest.java
 (original)
+++ 
accumulo/branches/1.4/src/core/src/test/java/org/apache/accumulo/core/iterators/user/CombinerTest.java
 Fri Dec 14 19:19:05 2012
@@ -573,6 +573,42 @@ public class CombinerTest {
   }
   
   @Test
+  public void sumAllColumns() throws IOException {
+    TreeMap<Key,Value> tm = new TreeMap<Key,Value>();
+    tm.put(new Key("r", "count", "a", 1), new Value("1".getBytes()));
+    tm.put(new Key("r", "count", "a", 2), new Value("1".getBytes()));
+    tm.put(new Key("r", "count", "b", 3), new Value("1".getBytes()));
+    tm.put(new Key("r", "count", "b", 4), new Value("1".getBytes()));
+    tm.put(new Key("r", "count", "b", 5), new Value("1".getBytes()));
+    tm.put(new Key("r", "count", "c", 6), new Value("1".getBytes()));
+    SortedMapIterator smi = new SortedMapIterator(tm);
+    Combiner iter = new SummingCombiner();
+    IteratorSetting s = new IteratorSetting(10, "s", SummingCombiner.class);
+    SummingCombiner.setColumns(s, Collections.singletonList(new 
IteratorSetting.Column("count")));
+    SummingCombiner.setEncodingType(s, LongCombiner.StringEncoder.class);
+    iter.init(smi, s.getOptions(), new DefaultIteratorEnvironment());
+    Combiner iter2 = new SummingCombiner();
+    IteratorSetting s2 = new IteratorSetting(10, "s2", SummingCombiner.class);
+    SummingCombiner.setColumns(s2, Collections.singletonList(new 
IteratorSetting.Column("count","a")));
+    SummingCombiner.setEncodingType(s2, LongCombiner.StringEncoder.class);
+    iter2.init(iter, s.getOptions(), new DefaultIteratorEnvironment());
+    iter2.seek(new Range(), EMPTY_COL_FAMS, false);
+    
+    assertTrue(iter2.hasTop());
+    assertEquals("2", iter2.getTopValue().toString());
+    iter2.next();
+    assertTrue(iter2.hasTop());
+    assertEquals("3", iter2.getTopValue().toString());
+    iter2.next();
+    assertTrue(iter2.hasTop());
+    assertEquals("1", iter2.getTopValue().toString());
+    iter2.next();
+    assertFalse(iter2.hasTop());
+  }
+  
+
+  
+  @Test
   public void maxMinTest() throws IOException {
     Encoder<Long> encoder = LongCombiner.VAR_LEN_ENCODER;