You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cassandra.apache.org by al...@apache.org on 2014/02/08 02:13:49 UTC
[1/3] git commit: Clean up Memtable.resolve()
Updated Branches:
refs/heads/trunk a4ed367ea -> 813da911b
Clean up Memtable.resolve()
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/887558f7
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/887558f7
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/887558f7
Branch: refs/heads/trunk
Commit: 887558f7a3c6a5bbb38a1cf0bacad90f8baa4f0e
Parents: c70f6d8
Author: Aleksey Yeschenko <al...@apache.org>
Authored: Sat Feb 8 04:11:32 2014 +0300
Committer: Aleksey Yeschenko <al...@apache.org>
Committed: Sat Feb 8 04:11:32 2014 +0300
----------------------------------------------------------------------
src/java/org/apache/cassandra/db/Memtable.java | 6 +-----
1 file changed, 1 insertion(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/887558f7/src/java/org/apache/cassandra/db/Memtable.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/db/Memtable.java b/src/java/org/apache/cassandra/db/Memtable.java
index b229060..b6fceda 100644
--- a/src/java/org/apache/cassandra/db/Memtable.java
+++ b/src/java/org/apache/cassandra/db/Memtable.java
@@ -192,7 +192,6 @@ public class Memtable
{
ColumnFamily previous = columnFamilies.get(key);
- long sizeDelta = 0;
if (previous == null)
{
// AtomicSortedColumns doesn't work for super columns (see #3821)
@@ -200,13 +199,10 @@ public class Memtable
// We'll add the columns later. This avoids wasting works if we get beaten in the putIfAbsent
previous = columnFamilies.putIfAbsent(new DecoratedKey(key.token, allocator.clone(key.key)), empty);
if (previous == null)
- {
previous = empty;
- sizeDelta += empty.deletionInfo().dataSize();
- }
}
- sizeDelta = previous.addAllWithSizeDelta(cf, allocator, localCopyFunction, indexer);
+ long sizeDelta = previous.addAllWithSizeDelta(cf, allocator, localCopyFunction, indexer);
currentSize.addAndGet(sizeDelta);
currentOperations.addAndGet(cf.getColumnCount() + (cf.isMarkedForDelete() ? 1 : 0) + cf.deletionInfo().rangeCount());
}
[3/3] git commit: Merge branch 'cassandra-2.0' into trunk
Posted by al...@apache.org.
Merge branch 'cassandra-2.0' into trunk
Conflicts:
src/java/org/apache/cassandra/db/Memtable.java
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/813da911
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/813da911
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/813da911
Branch: refs/heads/trunk
Commit: 813da911b9b4ba53b4da9714f3b37e76687d2904
Parents: a4ed367 800e45f
Author: Aleksey Yeschenko <al...@apache.org>
Authored: Sat Feb 8 04:13:41 2014 +0300
Committer: Aleksey Yeschenko <al...@apache.org>
Committed: Sat Feb 8 04:13:41 2014 +0300
----------------------------------------------------------------------
----------------------------------------------------------------------
[2/3] git commit: Merge branch 'cassandra-1.2' into cassandra-2.0
Posted by al...@apache.org.
Merge branch 'cassandra-1.2' into cassandra-2.0
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/800e45f4
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/800e45f4
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/800e45f4
Branch: refs/heads/trunk
Commit: 800e45f48c8860696559d896f28be1f3bd2ca86f
Parents: 130d135 887558f
Author: Aleksey Yeschenko <al...@apache.org>
Authored: Sat Feb 8 04:12:04 2014 +0300
Committer: Aleksey Yeschenko <al...@apache.org>
Committed: Sat Feb 8 04:12:04 2014 +0300
----------------------------------------------------------------------
src/java/org/apache/cassandra/db/Memtable.java | 6 +-----
1 file changed, 1 insertion(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/800e45f4/src/java/org/apache/cassandra/db/Memtable.java
----------------------------------------------------------------------
diff --cc src/java/org/apache/cassandra/db/Memtable.java
index 01170d6,b6fceda..1d26779
--- a/src/java/org/apache/cassandra/db/Memtable.java
+++ b/src/java/org/apache/cassandra/db/Memtable.java
@@@ -180,22 -190,19 +180,18 @@@ public class Memtabl
private void resolve(DecoratedKey key, ColumnFamily cf, SecondaryIndexManager.Updater indexer)
{
- ColumnFamily previous = columnFamilies.get(key);
+ AtomicSortedColumns previous = rows.get(key);
- long sizeDelta = 0;
if (previous == null)
{
- // AtomicSortedColumns doesn't work for super columns (see #3821)
- ColumnFamily empty = cf.cloneMeShallow(cf.isSuper() ? ThreadSafeSortedColumns.factory() : AtomicSortedColumns.factory(), false);
+ AtomicSortedColumns empty = cf.cloneMeShallow(AtomicSortedColumns.factory, false);
// We'll add the columns later. This avoids wasting works if we get beaten in the putIfAbsent
- previous = columnFamilies.putIfAbsent(new DecoratedKey(key.token, allocator.clone(key.key)), empty);
+ previous = rows.putIfAbsent(new DecoratedKey(key.token, allocator.clone(key.key)), empty);
if (previous == null)
- {
previous = empty;
- sizeDelta += empty.deletionInfo().dataSize();
- }
}
- sizeDelta = previous.addAllWithSizeDelta(cf, allocator, localCopyFunction, indexer);
+ long sizeDelta = previous.addAllWithSizeDelta(cf, allocator, localCopyFunction, indexer);
currentSize.addAndGet(sizeDelta);
currentOperations.addAndGet(cf.getColumnCount() + (cf.isMarkedForDelete() ? 1 : 0) + cf.deletionInfo().rangeCount());
}