cassandra-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jbel...@apache.org
Subject svn commit: r924883 - in /cassandra/branches/cassandra-0.6: CHANGES.txt src/java/org/apache/cassandra/service/RangeSliceResponseResolver.java
Date Thu, 18 Mar 2010 16:25:03 GMT
Author: jbellis
Date: Thu Mar 18 16:25:03 2010
New Revision: 924883

URL: http://svn.apache.org/viewvc?rev=924883&view=rev
Log:
fix merging row versions in range_slice for CL > ONE.  patch by Omer van der Horst Jansen
and jbellis for CASSANDRA-884

Modified:
    cassandra/branches/cassandra-0.6/CHANGES.txt
    cassandra/branches/cassandra-0.6/src/java/org/apache/cassandra/service/RangeSliceResponseResolver.java

Modified: cassandra/branches/cassandra-0.6/CHANGES.txt
URL: http://svn.apache.org/viewvc/cassandra/branches/cassandra-0.6/CHANGES.txt?rev=924883&r1=924882&r2=924883&view=diff
==============================================================================
--- cassandra/branches/cassandra-0.6/CHANGES.txt (original)
+++ cassandra/branches/cassandra-0.6/CHANGES.txt Thu Mar 18 16:25:03 2010
@@ -1,6 +1,8 @@
-dev
-* JMX drain to flush memtables and run through commit log (CASSANDRA-880)
-* Bootstrapping can skip ranges under the right conditions (CASSANDRA-902)
+0.6.0-RC1
+ * JMX drain to flush memtables and run through commit log (CASSANDRA-880)
+ * Bootstrapping can skip ranges under the right conditions (CASSANDRA-902)
+ * fix merging row versions in range_slice for CL > ONE (CASSANDRA-884)
+
 
 0.6.0-beta3
  * fix compaction bucketing bug (CASSANDRA-814)

Modified: cassandra/branches/cassandra-0.6/src/java/org/apache/cassandra/service/RangeSliceResponseResolver.java
URL: http://svn.apache.org/viewvc/cassandra/branches/cassandra-0.6/src/java/org/apache/cassandra/service/RangeSliceResponseResolver.java?rev=924883&r1=924882&r2=924883&view=diff
==============================================================================
--- cassandra/branches/cassandra-0.6/src/java/org/apache/cassandra/service/RangeSliceResponseResolver.java
(original)
+++ cassandra/branches/cassandra-0.6/src/java/org/apache/cassandra/service/RangeSliceResponseResolver.java
Thu Mar 18 16:25:03 2010
@@ -76,6 +76,12 @@ public class RangeSliceResponseResolver 
             List<InetAddress> versionSources = new ArrayList<InetAddress>(sources.size());
             String key;
 
+            @Override
+            protected boolean isEqual(Pair<Row, InetAddress> o1, Pair<Row, InetAddress>
o2)
+            {
+                return o1.left.key.equals(o2.left.key);
+            }
+
             public void reduce(Pair<Row,InetAddress> current)
             {
                 key = current.left.key;
@@ -88,6 +94,7 @@ public class RangeSliceResponseResolver 
                 ColumnFamily resolved = ReadResponseResolver.resolveSuperset(versions);
                 ReadResponseResolver.maybeScheduleRepairs(resolved, table, key, versions,
versionSources);
                 versions.clear();
+                versionSources.clear();
                 return new Row(key, resolved);
             }
         };



Mime
View raw message