You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cassandra.apache.org by be...@apache.org on 2015/01/28 23:42:12 UTC
[1/3] cassandra git commit: ninja fix 7882
Repository: cassandra
Updated Branches:
refs/heads/cassandra-2.1 bda32583f -> 97c54c50c
refs/heads/trunk 4537b3277 -> 0af4ae293
ninja fix 7882
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/97c54c50
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/97c54c50
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/97c54c50
Branch: refs/heads/cassandra-2.1
Commit: 97c54c50c97235e536472a05feed471b0a273a74
Parents: bda3258
Author: Benedict Elliott Smith <be...@apache.org>
Authored: Wed Jan 28 22:41:46 2015 +0000
Committer: Benedict Elliott Smith <be...@apache.org>
Committed: Wed Jan 28 22:41:46 2015 +0000
----------------------------------------------------------------------
src/java/org/apache/cassandra/utils/memory/NativeAllocator.java | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/97c54c50/src/java/org/apache/cassandra/utils/memory/NativeAllocator.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/utils/memory/NativeAllocator.java b/src/java/org/apache/cassandra/utils/memory/NativeAllocator.java
index 0e15ed2..272a4c2 100644
--- a/src/java/org/apache/cassandra/utils/memory/NativeAllocator.java
+++ b/src/java/org/apache/cassandra/utils/memory/NativeAllocator.java
@@ -104,6 +104,9 @@ public class NativeAllocator extends MemtableAllocator
public long allocate(int size, OpOrder.Group opGroup)
{
assert size >= 0;
+ offHeap().allocate(size, opGroup);
+ // satisfy large allocations directly from JVM since they don't cause fragmentation
+ // as badly, and fill up our regions quickly
if (size > MAX_CLONED_SIZE)
return allocateOversize(size, opGroup);
@@ -150,7 +153,6 @@ public class NativeAllocator extends MemtableAllocator
{
// satisfy large allocations directly from JVM since they don't cause fragmentation
// as badly, and fill up our regions quickly
- offHeap().allocate(size, opGroup);
Region region = new Region(allocator.allocate(size), size);
regions.add(region);
[2/3] cassandra git commit: ninja fix 7882
Posted by be...@apache.org.
ninja fix 7882
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/97c54c50
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/97c54c50
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/97c54c50
Branch: refs/heads/trunk
Commit: 97c54c50c97235e536472a05feed471b0a273a74
Parents: bda3258
Author: Benedict Elliott Smith <be...@apache.org>
Authored: Wed Jan 28 22:41:46 2015 +0000
Committer: Benedict Elliott Smith <be...@apache.org>
Committed: Wed Jan 28 22:41:46 2015 +0000
----------------------------------------------------------------------
src/java/org/apache/cassandra/utils/memory/NativeAllocator.java | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/97c54c50/src/java/org/apache/cassandra/utils/memory/NativeAllocator.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/utils/memory/NativeAllocator.java b/src/java/org/apache/cassandra/utils/memory/NativeAllocator.java
index 0e15ed2..272a4c2 100644
--- a/src/java/org/apache/cassandra/utils/memory/NativeAllocator.java
+++ b/src/java/org/apache/cassandra/utils/memory/NativeAllocator.java
@@ -104,6 +104,9 @@ public class NativeAllocator extends MemtableAllocator
public long allocate(int size, OpOrder.Group opGroup)
{
assert size >= 0;
+ offHeap().allocate(size, opGroup);
+ // satisfy large allocations directly from JVM since they don't cause fragmentation
+ // as badly, and fill up our regions quickly
if (size > MAX_CLONED_SIZE)
return allocateOversize(size, opGroup);
@@ -150,7 +153,6 @@ public class NativeAllocator extends MemtableAllocator
{
// satisfy large allocations directly from JVM since they don't cause fragmentation
// as badly, and fill up our regions quickly
- offHeap().allocate(size, opGroup);
Region region = new Region(allocator.allocate(size), size);
regions.add(region);
[3/3] cassandra git commit: Merge branch 'cassandra-2.1' into trunk
Posted by be...@apache.org.
Merge branch 'cassandra-2.1' into trunk
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/0af4ae29
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/0af4ae29
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/0af4ae29
Branch: refs/heads/trunk
Commit: 0af4ae293625e0cfc1dca370f982dbbc145d08a0
Parents: 4537b32 97c54c5
Author: Benedict Elliott Smith <be...@apache.org>
Authored: Wed Jan 28 22:41:52 2015 +0000
Committer: Benedict Elliott Smith <be...@apache.org>
Committed: Wed Jan 28 22:41:52 2015 +0000
----------------------------------------------------------------------
src/java/org/apache/cassandra/utils/memory/NativeAllocator.java | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/0af4ae29/src/java/org/apache/cassandra/utils/memory/NativeAllocator.java
----------------------------------------------------------------------