You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@accumulo.apache.org by bi...@apache.org on 2012/01/20 20:48:48 UTC
svn commit: r1234096 - in /incubator/accumulo/branches/1.4:
src/core/src/main/java/org/apache/accumulo/core/iterators/Combiner.java
test/system/auto/simple/combiner.py
Author: billie
Date: Fri Jan 20 19:48:48 2012
New Revision: 1234096
URL: http://svn.apache.org/viewvc?rev=1234096&view=rev
Log:
ACCUMULO-338 copy Value objects in Combiner, test Combiner after flush
Modified:
incubator/accumulo/branches/1.4/src/core/src/main/java/org/apache/accumulo/core/iterators/Combiner.java
incubator/accumulo/branches/1.4/test/system/auto/simple/combiner.py
Modified: incubator/accumulo/branches/1.4/src/core/src/main/java/org/apache/accumulo/core/iterators/Combiner.java
URL: http://svn.apache.org/viewvc/incubator/accumulo/branches/1.4/src/core/src/main/java/org/apache/accumulo/core/iterators/Combiner.java?rev=1234096&r1=1234095&r2=1234096&view=diff
==============================================================================
--- incubator/accumulo/branches/1.4/src/core/src/main/java/org/apache/accumulo/core/iterators/Combiner.java (original)
+++ incubator/accumulo/branches/1.4/src/core/src/main/java/org/apache/accumulo/core/iterators/Combiner.java Fri Jan 20 19:48:48 2012
@@ -90,7 +90,7 @@ public abstract class Combiner extends W
public Value next() {
if (!hasNext)
throw new NoSuchElementException();
- Value topValue = source.getTopValue();
+ Value topValue = new Value(source.getTopValue());
try {
source.next();
hasNext = _hasNext();
Modified: incubator/accumulo/branches/1.4/test/system/auto/simple/combiner.py
URL: http://svn.apache.org/viewvc/incubator/accumulo/branches/1.4/test/system/auto/simple/combiner.py?rev=1234096&r1=1234095&r2=1234096&view=diff
==============================================================================
--- incubator/accumulo/branches/1.4/test/system/auto/simple/combiner.py (original)
+++ incubator/accumulo/branches/1.4/test/system/auto/simple/combiner.py Fri Jan 20 19:48:48 2012
@@ -45,10 +45,11 @@ class CombinerTest(TestUtilsMixin, unitt
# initialize the database
out, err, code = self.rootShell(self.masterHost(),"createtable test\n"
- "setiter -t test -minc -majc -scan -p 10 -n mycombiner -class org.apache.accumulo.core.iterators.user.SummingCombiner\n"
+ "setiter -t test -scan -p 10 -n mycombiner -class org.apache.accumulo.core.iterators.user.SummingCombiner\n"
"\n"
"cf\n"
- "STRING\n")
+ "STRING\n"
+ "deleteiter -t test -n vers -minc -majc -scan\n")
self.assert_(code == 0)
# insert some rows
@@ -59,6 +60,9 @@ class CombinerTest(TestUtilsMixin, unitt
out, err, code = self.rootShell(self.masterHost(), cmd)
self.assert_(code == 0)
self.checkSum()
+ out, err, code = self.rootShell(self.masterHost(), "flush -t test -w\n")
+ self.assert_(code == 0)
+ self.checkSum()
self.shutdown_accumulo()
self.start_accumulo()
self.checkSum()