git commit: PHOENIX-990 OOM caused by order by query returning all rows (PraveenMurugesan)

2014-06-20 Thread mujtaba
Repository: phoenix
Updated Branches:
  refs/heads/3.0 e4218a99c - 3a3a04b82


PHOENIX-990 OOM caused by order by query returning all rows (PraveenMurugesan)


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

Branch: refs/heads/3.0
Commit: 3a3a04b82a97439f1c96ad97b225982cbd540194
Parents: e4218a9
Author: Mujtaba mujt...@apache.org
Authored: Fri Jun 20 09:47:03 2014 -0700
Committer: Mujtaba mujt...@apache.org
Committed: Fri Jun 20 09:47:03 2014 -0700

--
 .../org/apache/phoenix/iterate/MappedByteBufferSortedQueue.java   | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/phoenix/blob/3a3a04b8/phoenix-core/src/main/java/org/apache/phoenix/iterate/MappedByteBufferSortedQueue.java
--
diff --git 
a/phoenix-core/src/main/java/org/apache/phoenix/iterate/MappedByteBufferSortedQueue.java
 
b/phoenix-core/src/main/java/org/apache/phoenix/iterate/MappedByteBufferSortedQueue.java
index 4a97f9a..7bb25d0 100644
--- 
a/phoenix-core/src/main/java/org/apache/phoenix/iterate/MappedByteBufferSortedQueue.java
+++ 
b/phoenix-core/src/main/java/org/apache/phoenix/iterate/MappedByteBufferSortedQueue.java
@@ -175,7 +175,8 @@ public class MappedByteBufferSortedQueue extends 
AbstractQueueResultEntry {
 }
 
 private static class MappedByteBufferPriorityQueue {
-private static final long DEFAULT_MAPPING_SIZE = 1024;
+   // at least create 128 KB MappedByteBuffers
+private static final long DEFAULT_MAPPING_SIZE = 128 * 1024;
 
 private final int limit;
 private final int thresholdBytes;



git commit: PHOENIX-990 OOM caused by order by query returning all rows (PraveenMurugesan)

2014-06-20 Thread mujtaba
Repository: phoenix
Updated Branches:
  refs/heads/master 6506dadfe - 67c452e15


PHOENIX-990 OOM caused by order by query returning all rows (PraveenMurugesan)


Project: http://git-wip-us.apache.org/repos/asf/phoenix/repo
Commit: http://git-wip-us.apache.org/repos/asf/phoenix/commit/67c452e1
Tree: http://git-wip-us.apache.org/repos/asf/phoenix/tree/67c452e1
Diff: http://git-wip-us.apache.org/repos/asf/phoenix/diff/67c452e1

Branch: refs/heads/master
Commit: 67c452e150d2a0844e13c4c3c6c5d9cd3f281ed7
Parents: 6506dad
Author: Mujtaba mujt...@apache.org
Authored: Fri Jun 20 09:46:50 2014 -0700
Committer: Mujtaba mujt...@apache.org
Committed: Fri Jun 20 09:46:50 2014 -0700

--
 .../org/apache/phoenix/iterate/MappedByteBufferSortedQueue.java   | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/phoenix/blob/67c452e1/phoenix-core/src/main/java/org/apache/phoenix/iterate/MappedByteBufferSortedQueue.java
--
diff --git 
a/phoenix-core/src/main/java/org/apache/phoenix/iterate/MappedByteBufferSortedQueue.java
 
b/phoenix-core/src/main/java/org/apache/phoenix/iterate/MappedByteBufferSortedQueue.java
index 83426c1..85c91a1 100644
--- 
a/phoenix-core/src/main/java/org/apache/phoenix/iterate/MappedByteBufferSortedQueue.java
+++ 
b/phoenix-core/src/main/java/org/apache/phoenix/iterate/MappedByteBufferSortedQueue.java
@@ -176,7 +176,8 @@ public class MappedByteBufferSortedQueue extends 
AbstractQueueResultEntry {
 }
 
 private static class MappedByteBufferPriorityQueue {
-private static final long DEFAULT_MAPPING_SIZE = 1024;
+   // at least create 128 KB MappedByteBuffers
+private static final long DEFAULT_MAPPING_SIZE = 128 * 1024;
 
 private final int limit;
 private final int thresholdBytes;