cassandra-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From xe...@apache.org
Subject git commit: fix problem with localCopy methods after CASSANDRA-6689
Date Tue, 25 Mar 2014 21:45:11 GMT
Repository: cassandra
Updated Branches:
  refs/heads/cassandra-2.1 1a3b5dbcb -> 3bb87d169


fix problem with localCopy methods after CASSANDRA-6689


Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/3bb87d16
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/3bb87d16
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/3bb87d16

Branch: refs/heads/cassandra-2.1
Commit: 3bb87d1699584e4ffe412479ae898e52c67654a6
Parents: 1a3b5db
Author: Pavel Yaskevich <xedin@apache.org>
Authored: Tue Mar 25 14:44:41 2014 -0700
Committer: Pavel Yaskevich <xedin@apache.org>
Committed: Tue Mar 25 14:45:03 2014 -0700

----------------------------------------------------------------------
 src/java/org/apache/cassandra/db/ArrayBackedSortedColumns.java | 2 +-
 src/java/org/apache/cassandra/db/CollationController.java      | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cassandra/blob/3bb87d16/src/java/org/apache/cassandra/db/ArrayBackedSortedColumns.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/db/ArrayBackedSortedColumns.java b/src/java/org/apache/cassandra/db/ArrayBackedSortedColumns.java
index 34bc388..4a83901 100644
--- a/src/java/org/apache/cassandra/db/ArrayBackedSortedColumns.java
+++ b/src/java/org/apache/cassandra/db/ArrayBackedSortedColumns.java
@@ -94,7 +94,7 @@ public class ArrayBackedSortedColumns extends ColumnFamily
         final Cell[] cells = new Cell[value.getColumnCount()];
         int i = 0;
         for (Cell cell : value)
-            cells[i++] = cell.localCopy(cfs, HeapAllocator.instance);
+            cells[i++] = cell.localCopy(HeapAllocator.instance);
         ColumnFamily r = new ArrayBackedSortedColumns(cfs.metadata, value.isInsertReversed(),
cells, i, i);
         r.delete(value);
         return r;

http://git-wip-us.apache.org/repos/asf/cassandra/blob/3bb87d16/src/java/org/apache/cassandra/db/CollationController.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/db/CollationController.java b/src/java/org/apache/cassandra/db/CollationController.java
index e839ac1..151a7c5 100644
--- a/src/java/org/apache/cassandra/db/CollationController.java
+++ b/src/java/org/apache/cassandra/db/CollationController.java
@@ -86,7 +86,7 @@ public class CollationController
                     {
                         OnDiskAtom atom = iter.next();
                         if (copyOnHeap)
-                            atom = ((Cell) atom).localCopy(cfs, HeapAllocator.instance);
+                            atom = ((Cell) atom).localCopy(HeapAllocator.instance);
                         container.addAtom(atom);
                     }
                 }
@@ -205,7 +205,7 @@ public class CollationController
                         ColumnFamily newCf = cf.cloneMeShallow(ArrayBackedSortedColumns.factory,
false);
                         for (Cell cell : cf)
                         {
-                            newCf.addColumn(cell.localCopy(cfs, HeapAllocator.instance));
+                            newCf.addColumn(cell.localCopy(HeapAllocator.instance));
                         }
                         cf = newCf;
                         iter = filter.getColumnFamilyIterator(cf);


Mime
View raw message