incubator-accumulo-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From bil...@apache.org
Subject svn commit: r1234102 - in /incubator/accumulo/trunk: ./ src/core/ src/core/src/main/java/org/apache/accumulo/core/iterators/Combiner.java src/server/ test/system/auto/simple/combiner.py
Date Fri, 20 Jan 2012 19:55:30 GMT
Author: billie
Date: Fri Jan 20 19:55:29 2012
New Revision: 1234102

URL: http://svn.apache.org/viewvc?rev=1234102&view=rev
Log:
ACCUMULO-338 copy Value objects in Combiner, test Combiner after flush - merged to trunk

Modified:
    incubator/accumulo/trunk/   (props changed)
    incubator/accumulo/trunk/src/core/   (props changed)
    incubator/accumulo/trunk/src/core/src/main/java/org/apache/accumulo/core/iterators/Combiner.java
    incubator/accumulo/trunk/src/server/   (props changed)
    incubator/accumulo/trunk/test/system/auto/simple/combiner.py

Propchange: incubator/accumulo/trunk/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Jan 20 19:55:29 2012
@@ -1,3 +1,3 @@
 /incubator/accumulo/branches/1.3:1190280,1190413,1190420,1190427,1190500,1195622,1195625,1195629,1195635,1196044,1196054,1196057,1196071-1196072,1196106,1197066,1198935,1199383,1203683,1204625,1205547,1205880,1206169,1208031,1209124,1209526,1209532,1209539,1209541,1209587,1209657,1210518,1210571,1210596,1210598,1213424,1214320,1225006,1227215,1227231,1227611,1228195,1230180,1230736,1231043
 /incubator/accumulo/branches/1.3.5rc:1209938
-/incubator/accumulo/branches/1.4:1201902-1233959
+/incubator/accumulo/branches/1.4:1201902-1234099

Propchange: incubator/accumulo/trunk/src/core/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Jan 20 19:55:29 2012
@@ -1,3 +1,3 @@
 /incubator/accumulo/branches/1.3/src/core:1190280,1190413,1190420,1190427,1190500,1195622,1195625,1195629,1195635,1196044,1196054,1196057,1196071-1196072,1196106,1197066,1198935,1199383,1203683,1204625,1205547,1205880,1206169,1208031,1209124,1209526,1209532,1209539,1209541,1209587,1209657,1210518,1210571,1210596,1210598,1213424,1214320,1225006,1227215
 /incubator/accumulo/branches/1.3.5rc/src/core:1209938
-/incubator/accumulo/branches/1.4/src/core:1201902-1233959
+/incubator/accumulo/branches/1.4/src/core:1201902-1234099

Modified: incubator/accumulo/trunk/src/core/src/main/java/org/apache/accumulo/core/iterators/Combiner.java
URL: http://svn.apache.org/viewvc/incubator/accumulo/trunk/src/core/src/main/java/org/apache/accumulo/core/iterators/Combiner.java?rev=1234102&r1=1234101&r2=1234102&view=diff
==============================================================================
--- incubator/accumulo/trunk/src/core/src/main/java/org/apache/accumulo/core/iterators/Combiner.java
(original)
+++ incubator/accumulo/trunk/src/core/src/main/java/org/apache/accumulo/core/iterators/Combiner.java
Fri Jan 20 19:55:29 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();

Propchange: incubator/accumulo/trunk/src/server/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Jan 20 19:55:29 2012
@@ -1,3 +1,3 @@
 /incubator/accumulo/branches/1.3/src/server:1190280,1190413,1190420,1190427,1190500,1195622,1195625,1195629,1195635,1196044,1196054,1196057,1196071-1196072,1196106,1197066,1198935,1199383,1203683,1204625,1205547,1205880,1206169,1208031,1209124,1209526,1209532,1209539,1209541,1209587,1209657,1210518,1210571,1210596,1210598,1213424,1214320,1225006,1227215,1227231,1227611
 /incubator/accumulo/branches/1.3.5rc/src/server:1209938
-/incubator/accumulo/branches/1.4/src/server:1201902-1233959
+/incubator/accumulo/branches/1.4/src/server:1201902-1234099

Modified: incubator/accumulo/trunk/test/system/auto/simple/combiner.py
URL: http://svn.apache.org/viewvc/incubator/accumulo/trunk/test/system/auto/simple/combiner.py?rev=1234102&r1=1234101&r2=1234102&view=diff
==============================================================================
--- incubator/accumulo/trunk/test/system/auto/simple/combiner.py (original)
+++ incubator/accumulo/trunk/test/system/auto/simple/combiner.py Fri Jan 20 19:55:29 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()



Mime
View raw message