git commit: PHOENIX-1216 fix code Change spooling directory

2014-09-16 Thread greid
Repository: phoenix
Updated Branches:
  refs/heads/master 20e7559b4 - 173c7d72d


PHOENIX-1216 fix code Change spooling directory

Make the spooling directory configurable.

Signed-off-by: Gabriel Reid gabri...@ngdata.com


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

Branch: refs/heads/master
Commit: 173c7d72defbb5a73a36fd5c8c12c8e621295e70
Parents: 20e7559
Author: sofangel sofan...@naver.com
Authored: Tue Sep 16 15:31:34 2014 +0900
Committer: Gabriel Reid gabri...@ngdata.com
Committed: Tue Sep 16 12:25:47 2014 +0200

--
 .../phoenix/iterate/SpoolingResultIterator.java | 57 ++--
 .../org/apache/phoenix/query/QueryServices.java |  2 +-
 .../phoenix/query/QueryServicesOptions.java | 11 +++-
 .../iterate/SpoolingResultIteratorTest.java |  2 +-
 .../phoenix/query/QueryServicesTestImpl.java|  2 +
 5 files changed, 42 insertions(+), 32 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/phoenix/blob/173c7d72/phoenix-core/src/main/java/org/apache/phoenix/iterate/SpoolingResultIterator.java
--
diff --git 
a/phoenix-core/src/main/java/org/apache/phoenix/iterate/SpoolingResultIterator.java
 
b/phoenix-core/src/main/java/org/apache/phoenix/iterate/SpoolingResultIterator.java
index 4672657..42a61a7 100644
--- 
a/phoenix-core/src/main/java/org/apache/phoenix/iterate/SpoolingResultIterator.java
+++ 
b/phoenix-core/src/main/java/org/apache/phoenix/iterate/SpoolingResultIterator.java
@@ -47,19 +47,19 @@ import org.apache.phoenix.util.TupleUtil;
 
 
 /**
- * 
+ *
  * Result iterator that spools the results of a scan to disk once an in-memory 
threshold has been reached.
  * If the in-memory threshold is not reached, the results are held in memory 
with no disk writing perfomed.
  *
- * 
+ *
  * @since 0.1
  */
 public class SpoolingResultIterator implements PeekingResultIterator {
 private final PeekingResultIterator spoolFrom;
-
+
 public static class SpoolingResultIteratorFactory implements 
ParallelIteratorFactory {
 private final QueryServices services;
-
+
 public SpoolingResultIteratorFactory(QueryServices services) {
 this.services = services;
 }
@@ -67,15 +67,16 @@ public class SpoolingResultIterator implements 
PeekingResultIterator {
 public PeekingResultIterator newIterator(StatementContext context, 
ResultIterator scanner, Scan scan) throws SQLException {
 return new SpoolingResultIterator(scanner, services);
 }
-
+
 }
 
 public SpoolingResultIterator(ResultIterator scanner, QueryServices 
services) throws SQLException {
-this (scanner, services.getMemoryManager(), 
-   
services.getProps().getInt(QueryServices.SPOOL_THRESHOLD_BYTES_ATTRIB, 
QueryServicesOptions.DEFAULT_SPOOL_THRESHOLD_BYTES),
-   
services.getProps().getLong(QueryServices.MAX_SPOOL_TO_DISK_BYTES_ATTRIB, 
QueryServicesOptions.DEFAULT_MAX_SPOOL_TO_DISK_BYTES));
+this (scanner, services.getMemoryManager(),
+
services.getProps().getInt(QueryServices.SPOOL_THRESHOLD_BYTES_ATTRIB, 
QueryServicesOptions.DEFAULT_SPOOL_THRESHOLD_BYTES),
+
services.getProps().getLong(QueryServices.MAX_SPOOL_TO_DISK_BYTES_ATTRIB, 
QueryServicesOptions.DEFAULT_MAX_SPOOL_TO_DISK_BYTES),
+services.getProps().get(QueryServices.SPOOL_DIRECTORY, 
QueryServicesOptions.DEFAULT_SPOOL_DIRECTORY));
 }
-
+
 /**
 * Create a result iterator by iterating through the results of a scan, 
spooling them to disk once
 * a threshold has been reached. The scanner passed in is closed prior to 
returning.
@@ -85,7 +86,7 @@ public class SpoolingResultIterator implements 
PeekingResultIterator {
 *  the memory manager) is exceeded.
 * @throws SQLException
 */
-SpoolingResultIterator(ResultIterator scanner, MemoryManager mm, final int 
thresholdBytes, final long maxSpoolToDisk) throws SQLException {
+SpoolingResultIterator(ResultIterator scanner, MemoryManager mm, final int 
thresholdBytes, final long maxSpoolToDisk, final String spoolDirectory) throws 
SQLException {
 boolean success = false;
 boolean usedOnDiskIterator = false;
 final MemoryChunk chunk = mm.allocate(0, thresholdBytes);
@@ -93,7 +94,7 @@ public class SpoolingResultIterator implements 
PeekingResultIterator {
 try {
 // Can't be bigger than int, since it's the max of the above 
allocation
 int size = (int)chunk.getSize();
-tempFile = 

git commit: PHOENIX-1216 fix code Change spooling directory

2014-09-16 Thread greid
Repository: phoenix
Updated Branches:
  refs/heads/3.0 7a9fd9981 - b51318d09


PHOENIX-1216 fix code Change spooling directory

Make the spooling directory configurable.

Signed-off-by: Gabriel Reid gabri...@ngdata.com


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

Branch: refs/heads/3.0
Commit: b51318d09bd450c906e7b65348d54ea73151099f
Parents: 7a9fd99
Author: sofangel sofan...@naver.com
Authored: Tue Sep 16 15:31:34 2014 +0900
Committer: Gabriel Reid gabri...@ngdata.com
Committed: Tue Sep 16 12:06:24 2014 +0200

--
 .../phoenix/iterate/SpoolingResultIterator.java | 59 ++--
 .../org/apache/phoenix/query/QueryServices.java |  2 +-
 .../phoenix/query/QueryServicesOptions.java | 11 +++-
 .../iterate/SpoolingResultIteratorTest.java |  2 +-
 .../phoenix/query/QueryServicesTestImpl.java|  2 +
 5 files changed, 43 insertions(+), 33 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/phoenix/blob/b51318d0/phoenix-core/src/main/java/org/apache/phoenix/iterate/SpoolingResultIterator.java
--
diff --git 
a/phoenix-core/src/main/java/org/apache/phoenix/iterate/SpoolingResultIterator.java
 
b/phoenix-core/src/main/java/org/apache/phoenix/iterate/SpoolingResultIterator.java
index 22cd049..f35999e 100644
--- 
a/phoenix-core/src/main/java/org/apache/phoenix/iterate/SpoolingResultIterator.java
+++ 
b/phoenix-core/src/main/java/org/apache/phoenix/iterate/SpoolingResultIterator.java
@@ -47,19 +47,19 @@ import org.apache.phoenix.util.TupleUtil;
 
 
 /**
- * 
+ *
  * Result iterator that spools the results of a scan to disk once an in-memory 
threshold has been reached.
  * If the in-memory threshold is not reached, the results are held in memory 
with no disk writing perfomed.
  *
- * 
+ *
  * @since 0.1
  */
 public class SpoolingResultIterator implements PeekingResultIterator {
 private final PeekingResultIterator spoolFrom;
-
+
 public static class SpoolingResultIteratorFactory implements 
ParallelIteratorFactory {
 private final QueryServices services;
-
+
 public SpoolingResultIteratorFactory(QueryServices services) {
 this.services = services;
 }
@@ -67,15 +67,16 @@ public class SpoolingResultIterator implements 
PeekingResultIterator {
 public PeekingResultIterator newIterator(StatementContext context, 
ResultIterator scanner, Scan scan) throws SQLException {
 return new SpoolingResultIterator(scanner, services);
 }
-
+
 }
 
 public SpoolingResultIterator(ResultIterator scanner, QueryServices 
services) throws SQLException {
-this (scanner, services.getMemoryManager(), 
-   
services.getProps().getInt(QueryServices.SPOOL_THRESHOLD_BYTES_ATTRIB, 
QueryServicesOptions.DEFAULT_SPOOL_THRESHOLD_BYTES),
-   
services.getProps().getLong(QueryServices.MAX_SPOOL_TO_DISK_BYTES_ATTRIB, 
QueryServicesOptions.DEFAULT_MAX_SPOOL_TO_DISK_BYTES));
+this (scanner, services.getMemoryManager(),
+
services.getProps().getInt(QueryServices.SPOOL_THRESHOLD_BYTES_ATTRIB, 
QueryServicesOptions.DEFAULT_SPOOL_THRESHOLD_BYTES),
+
services.getProps().getLong(QueryServices.MAX_SPOOL_TO_DISK_BYTES_ATTRIB, 
QueryServicesOptions.DEFAULT_MAX_SPOOL_TO_DISK_BYTES),
+services.getProps().get(QueryServices.SPOOL_DIRECTORY, 
QueryServicesOptions.DEFAULT_SPOOL_DIRECTORY));
 }
-
+
 /**
 * Create a result iterator by iterating through the results of a scan, 
spooling them to disk once
 * a threshold has been reached. The scanner passed in is closed prior to 
returning.
@@ -85,7 +86,7 @@ public class SpoolingResultIterator implements 
PeekingResultIterator {
 *  the memory manager) is exceeded.
 * @throws SQLException
 */
-SpoolingResultIterator(ResultIterator scanner, MemoryManager mm, final int 
thresholdBytes, final long maxSpoolToDisk) throws SQLException {
+SpoolingResultIterator(ResultIterator scanner, MemoryManager mm, final int 
thresholdBytes, final long maxSpoolToDisk, final String spoolDirectory) throws 
SQLException {
 boolean success = false;
 boolean usedOnDiskIterator = false;
 final MemoryChunk chunk = mm.allocate(0, thresholdBytes);
@@ -93,7 +94,7 @@ public class SpoolingResultIterator implements 
PeekingResultIterator {
 try {
 // Can't be bigger than int, since it's the max of the above 
allocation
 int size = (int)chunk.getSize();
-tempFile = File.createTempFile(ResultSpooler,.bin);
+

git commit: PHOENIX-1216 fix code Change spooling directory

2014-09-16 Thread greid
Repository: phoenix
Updated Branches:
  refs/heads/4.0 caa7848cf - c2712bf2b


PHOENIX-1216 fix code Change spooling directory

Make the spooling directory configurable.

Signed-off-by: Gabriel Reid gabri...@ngdata.com


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

Branch: refs/heads/4.0
Commit: c2712bf2b1233fffcf9d236a51e04ff4997b337f
Parents: caa7848
Author: sofangel sofan...@naver.com
Authored: Tue Sep 16 15:31:34 2014 +0900
Committer: Gabriel Reid gabri...@ngdata.com
Committed: Tue Sep 16 12:06:47 2014 +0200

--
 .../phoenix/iterate/SpoolingResultIterator.java | 57 ++--
 .../org/apache/phoenix/query/QueryServices.java |  2 +-
 .../phoenix/query/QueryServicesOptions.java | 11 +++-
 .../iterate/SpoolingResultIteratorTest.java |  2 +-
 .../phoenix/query/QueryServicesTestImpl.java|  2 +
 5 files changed, 42 insertions(+), 32 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/phoenix/blob/c2712bf2/phoenix-core/src/main/java/org/apache/phoenix/iterate/SpoolingResultIterator.java
--
diff --git 
a/phoenix-core/src/main/java/org/apache/phoenix/iterate/SpoolingResultIterator.java
 
b/phoenix-core/src/main/java/org/apache/phoenix/iterate/SpoolingResultIterator.java
index 4672657..42a61a7 100644
--- 
a/phoenix-core/src/main/java/org/apache/phoenix/iterate/SpoolingResultIterator.java
+++ 
b/phoenix-core/src/main/java/org/apache/phoenix/iterate/SpoolingResultIterator.java
@@ -47,19 +47,19 @@ import org.apache.phoenix.util.TupleUtil;
 
 
 /**
- * 
+ *
  * Result iterator that spools the results of a scan to disk once an in-memory 
threshold has been reached.
  * If the in-memory threshold is not reached, the results are held in memory 
with no disk writing perfomed.
  *
- * 
+ *
  * @since 0.1
  */
 public class SpoolingResultIterator implements PeekingResultIterator {
 private final PeekingResultIterator spoolFrom;
-
+
 public static class SpoolingResultIteratorFactory implements 
ParallelIteratorFactory {
 private final QueryServices services;
-
+
 public SpoolingResultIteratorFactory(QueryServices services) {
 this.services = services;
 }
@@ -67,15 +67,16 @@ public class SpoolingResultIterator implements 
PeekingResultIterator {
 public PeekingResultIterator newIterator(StatementContext context, 
ResultIterator scanner, Scan scan) throws SQLException {
 return new SpoolingResultIterator(scanner, services);
 }
-
+
 }
 
 public SpoolingResultIterator(ResultIterator scanner, QueryServices 
services) throws SQLException {
-this (scanner, services.getMemoryManager(), 
-   
services.getProps().getInt(QueryServices.SPOOL_THRESHOLD_BYTES_ATTRIB, 
QueryServicesOptions.DEFAULT_SPOOL_THRESHOLD_BYTES),
-   
services.getProps().getLong(QueryServices.MAX_SPOOL_TO_DISK_BYTES_ATTRIB, 
QueryServicesOptions.DEFAULT_MAX_SPOOL_TO_DISK_BYTES));
+this (scanner, services.getMemoryManager(),
+
services.getProps().getInt(QueryServices.SPOOL_THRESHOLD_BYTES_ATTRIB, 
QueryServicesOptions.DEFAULT_SPOOL_THRESHOLD_BYTES),
+
services.getProps().getLong(QueryServices.MAX_SPOOL_TO_DISK_BYTES_ATTRIB, 
QueryServicesOptions.DEFAULT_MAX_SPOOL_TO_DISK_BYTES),
+services.getProps().get(QueryServices.SPOOL_DIRECTORY, 
QueryServicesOptions.DEFAULT_SPOOL_DIRECTORY));
 }
-
+
 /**
 * Create a result iterator by iterating through the results of a scan, 
spooling them to disk once
 * a threshold has been reached. The scanner passed in is closed prior to 
returning.
@@ -85,7 +86,7 @@ public class SpoolingResultIterator implements 
PeekingResultIterator {
 *  the memory manager) is exceeded.
 * @throws SQLException
 */
-SpoolingResultIterator(ResultIterator scanner, MemoryManager mm, final int 
thresholdBytes, final long maxSpoolToDisk) throws SQLException {
+SpoolingResultIterator(ResultIterator scanner, MemoryManager mm, final int 
thresholdBytes, final long maxSpoolToDisk, final String spoolDirectory) throws 
SQLException {
 boolean success = false;
 boolean usedOnDiskIterator = false;
 final MemoryChunk chunk = mm.allocate(0, thresholdBytes);
@@ -93,7 +94,7 @@ public class SpoolingResultIterator implements 
PeekingResultIterator {
 try {
 // Can't be bigger than int, since it's the max of the above 
allocation
 int size = (int)chunk.getSize();
-tempFile = File.createTempFile(ResultSpooler,.bin);
+

Jenkins build is back to normal : Phoenix | Master | Hadoop1 #363

2014-09-16 Thread Apache Jenkins Server
See https://builds.apache.org/job/Phoenix-master-hadoop1/363/changes



Apache-Phoenix | 3.0 | Hadoop1 | Build Successful

2014-09-16 Thread Apache Jenkins Server
3.0 branch build status Successful
Source repository https://git-wip-us.apache.org/repos/asf/phoenix.git

Last Successful Compiled Artifacts https://builds.apache.org/job/Phoenix-3.0-hadoop1/lastSuccessfulBuild/artifact/

Last Complete Test Report https://builds.apache.org/job/Phoenix-3.0-hadoop1/lastCompletedBuild/testReport/

Changes
[gabrielr] PHOENIX-1216 fix code Change spooling directory



svn commit: r1625328 - in /phoenix: phoenix-docs/src/docsrc/help/phoenix.csv site/publish/language/datatypes.html

2014-09-16 Thread greid
Author: greid
Date: Tue Sep 16 15:10:06 2014
New Revision: 1625328

URL: http://svn.apache.org/r1625328
Log:
PHOENIX-1255 Correct DECIMAL precision info

Correct DECIMAL precision in docs to be 38 instead of 18.

Modified:
phoenix/phoenix-docs/src/docsrc/help/phoenix.csv
phoenix/site/publish/language/datatypes.html

Modified: phoenix/phoenix-docs/src/docsrc/help/phoenix.csv
URL: 
http://svn.apache.org/viewvc/phoenix/phoenix-docs/src/docsrc/help/phoenix.csv?rev=1625328r1=1625327r2=1625328view=diff
==
--- phoenix/phoenix-docs/src/docsrc/help/phoenix.csv (original)
+++ phoenix/phoenix-docs/src/docsrc/help/phoenix.csv Tue Sep 16 15:10:06 2014
@@ -945,7 +945,7 @@ UNSIGNED_DOUBLE
 Data Types,DECIMAL Type,
 DECIMAL
 ,
-Data type with fixed precision and scale. The maximum precision is 18 digits.
+Data type with fixed precision and scale. The maximum precision is 38 digits.
 Mapped to java.math.BigDecimal. The binary representation is binary
 comparable, variable length format. When used in a row key, it is terminated
 with a null byte unless it is the last column.

Modified: phoenix/site/publish/language/datatypes.html
URL: 
http://svn.apache.org/viewvc/phoenix/site/publish/language/datatypes.html?rev=1625328r1=1625327r2=1625328view=diff
==
--- phoenix/site/publish/language/datatypes.html (original)
+++ phoenix/site/publish/language/datatypes.html Tue Sep 16 15:10:06 2014
@@ -1,7 +1,7 @@
 
 !DOCTYPE html
 !--
- Generated by Apache Maven Doxia at 2014-09-04
+ Generated by Apache Maven Doxia at 2014-09-16
  Rendered using Reflow Maven Skin 1.1.0 
(http://andriusvelykis.github.io/reflow-maven-skin)
 --
 html  xml:lang=en lang=en
@@ -469,7 +469,7 @@ DECIMAL
 DECIMAL
 /pre
 syntax-end --
-pData type with fixed precision and scale. The maximum precision is 18 
digits. Mapped to codejava.math.BigDecimal/code. The binary representation 
is binary comparable, variable length format. When used in a row key, it is 
terminated with a null byte unless it is the last column./p
+pData type with fixed precision and scale. The maximum precision is 38 
digits. Mapped to codejava.math.BigDecimal/code. The binary representation 
is binary comparable, variable length format. When used in a row key, it is 
terminated with a null byte unless it is the last column./p
 pExample:/p
 p class=notranslateDECIMAL/p
 




git commit: PHOENIX-1252 Potential lock leak for ungrouped aggregation (Jay Wong)

2014-09-16 Thread jamestaylor
Repository: phoenix
Updated Branches:
  refs/heads/4.0 c2712bf2b - 6e820828b


PHOENIX-1252 Potential lock leak for ungrouped aggregation (Jay Wong)


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

Branch: refs/heads/4.0
Commit: 6e820828bbe1d05f8da9f502c7b4e08a5ccae8e3
Parents: c2712bf
Author: James Taylor jamestay...@apache.org
Authored: Tue Sep 16 13:20:08 2014 -0700
Committer: James Taylor jamestay...@apache.org
Committed: Tue Sep 16 13:20:08 2014 -0700

--
 .../phoenix/coprocessor/UngroupedAggregateRegionObserver.java | 3 +++
 1 file changed, 3 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/phoenix/blob/6e820828/phoenix-core/src/main/java/org/apache/phoenix/coprocessor/UngroupedAggregateRegionObserver.java
--
diff --git 
a/phoenix-core/src/main/java/org/apache/phoenix/coprocessor/UngroupedAggregateRegionObserver.java
 
b/phoenix-core/src/main/java/org/apache/phoenix/coprocessor/UngroupedAggregateRegionObserver.java
index 9878777..1c6affa 100644
--- 
a/phoenix-core/src/main/java/org/apache/phoenix/coprocessor/UngroupedAggregateRegionObserver.java
+++ 
b/phoenix-core/src/main/java/org/apache/phoenix/coprocessor/UngroupedAggregateRegionObserver.java
@@ -345,8 +345,11 @@ public class UngroupedAggregateRegionObserver extends 
BaseScannerRegionObserver
 }
 } while (hasMore);
 } finally {
+  try {
 innerScanner.close();
+  } finally {
 region.closeRegionOperation();
+  }
 }
 
 if (logger.isInfoEnabled()) {



git commit: PHOENIX-1252 Potential lock leak for ungrouped aggregation (Jay Wong)

2014-09-16 Thread jamestaylor
Repository: phoenix
Updated Branches:
  refs/heads/3.0 b51318d09 - 47e9cc102


PHOENIX-1252 Potential lock leak for ungrouped aggregation (Jay Wong)


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

Branch: refs/heads/3.0
Commit: 47e9cc102431ff21072320a46c692d0f2df05622
Parents: b51318d
Author: James Taylor jamestay...@apache.org
Authored: Tue Sep 16 13:20:08 2014 -0700
Committer: James Taylor jamestay...@apache.org
Committed: Tue Sep 16 13:27:12 2014 -0700

--
 .../phoenix/coprocessor/UngroupedAggregateRegionObserver.java | 3 +++
 1 file changed, 3 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/phoenix/blob/47e9cc10/phoenix-core/src/main/java/org/apache/phoenix/coprocessor/UngroupedAggregateRegionObserver.java
--
diff --git 
a/phoenix-core/src/main/java/org/apache/phoenix/coprocessor/UngroupedAggregateRegionObserver.java
 
b/phoenix-core/src/main/java/org/apache/phoenix/coprocessor/UngroupedAggregateRegionObserver.java
index 566ec67..376531b 100644
--- 
a/phoenix-core/src/main/java/org/apache/phoenix/coprocessor/UngroupedAggregateRegionObserver.java
+++ 
b/phoenix-core/src/main/java/org/apache/phoenix/coprocessor/UngroupedAggregateRegionObserver.java
@@ -274,8 +274,11 @@ public class UngroupedAggregateRegionObserver extends 
BaseScannerRegionObserver
 }
 } while (hasMore);
 } finally {
+  try {
 innerScanner.close();
+  } finally {
 region.closeRegionOperation();
+  }
 }
 
 if (logger.isInfoEnabled()) {



git commit: PHOENIX-1252 Potential lock leak for ungrouped aggregation (Jay Wong)

2014-09-16 Thread jamestaylor
Repository: phoenix
Updated Branches:
  refs/heads/4.0 6e820828b - 5aa8d4059


PHOENIX-1252 Potential lock leak for ungrouped aggregation (Jay Wong)


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

Branch: refs/heads/4.0
Commit: 5aa8d405971911e393535fc85571fd1c6bd84650
Parents: 6e82082
Author: James Taylor jamestay...@apache.org
Authored: Tue Sep 16 13:30:04 2014 -0700
Committer: James Taylor jamestay...@apache.org
Committed: Tue Sep 16 13:31:07 2014 -0700

--
 .../coprocessor/UngroupedAggregateRegionObserver.java | 10 +-
 1 file changed, 5 insertions(+), 5 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/phoenix/blob/5aa8d405/phoenix-core/src/main/java/org/apache/phoenix/coprocessor/UngroupedAggregateRegionObserver.java
--
diff --git 
a/phoenix-core/src/main/java/org/apache/phoenix/coprocessor/UngroupedAggregateRegionObserver.java
 
b/phoenix-core/src/main/java/org/apache/phoenix/coprocessor/UngroupedAggregateRegionObserver.java
index 1c6affa..95b095e 100644
--- 
a/phoenix-core/src/main/java/org/apache/phoenix/coprocessor/UngroupedAggregateRegionObserver.java
+++ 
b/phoenix-core/src/main/java/org/apache/phoenix/coprocessor/UngroupedAggregateRegionObserver.java
@@ -345,11 +345,11 @@ public class UngroupedAggregateRegionObserver extends 
BaseScannerRegionObserver
 }
 } while (hasMore);
 } finally {
-  try {
-innerScanner.close();
-  } finally {
-region.closeRegionOperation();
-  }
+try {
+innerScanner.close();
+} finally {
+region.closeRegionOperation();
+}
 }
 
 if (logger.isInfoEnabled()) {



Apache-Phoenix | 4.0 | Hadoop1 | Build Successful

2014-09-16 Thread Apache Jenkins Server
4.0 branch build status Successful

Source repository https://git-wip-us.apache.org/repos/asf/incubator-phoenix.git

Compiled Artifacts https://builds.apache.org/job/Phoenix-4.0-hadoop1/lastSuccessfulBuild/artifact/

Test Report https://builds.apache.org/job/Phoenix-4.0-hadoop1/lastCompletedBuild/testReport/

Changes
[jamestaylor] PHOENIX-1252 Potential lock leak for ungrouped aggregation (Jay Wong)



Apache-Phoenix | 3.0 | Hadoop1 | Build Successful

2014-09-16 Thread Apache Jenkins Server
3.0 branch build status Successful
Source repository https://git-wip-us.apache.org/repos/asf/phoenix.git

Last Successful Compiled Artifacts https://builds.apache.org/job/Phoenix-3.0-hadoop1/lastSuccessfulBuild/artifact/

Last Complete Test Report https://builds.apache.org/job/Phoenix-3.0-hadoop1/lastCompletedBuild/testReport/

Changes
[jamestaylor] PHOENIX-1252 Potential lock leak for ungrouped aggregation (Jay Wong)



Apache-Phoenix | 4.0 | Hadoop1 | Build Successful

2014-09-16 Thread Apache Jenkins Server
4.0 branch build status Successful

Source repository https://git-wip-us.apache.org/repos/asf/incubator-phoenix.git

Compiled Artifacts https://builds.apache.org/job/Phoenix-4.0-hadoop1/lastSuccessfulBuild/artifact/

Test Report https://builds.apache.org/job/Phoenix-4.0-hadoop1/lastCompletedBuild/testReport/

Changes
[jamestaylor] PHOENIX-1252 Potential lock leak for ungrouped aggregation (Jay Wong)



Apache-Phoenix | 3.0 | Hadoop1 | Build Successful

2014-09-16 Thread Apache Jenkins Server
3.0 branch build status Successful
Source repository https://git-wip-us.apache.org/repos/asf/phoenix.git

Last Successful Compiled Artifacts https://builds.apache.org/job/Phoenix-3.0-hadoop1/lastSuccessfulBuild/artifact/

Last Complete Test Report https://builds.apache.org/job/Phoenix-3.0-hadoop1/lastCompletedBuild/testReport/

Changes
[jamestaylor] PHOENIX-1252 Potential lock leak for ungrouped aggregation (Jay Wong)



Build failed in Jenkins: Phoenix | 4.0 | Hadoop2 #128

2014-09-16 Thread Apache Jenkins Server
See https://builds.apache.org/job/Phoenix-4.0-hadoop2/128/changes

Changes:

[jamestaylor] PHOENIX-1252 Potential lock leak for ungrouped aggregation (Jay 
Wong)

[jamestaylor] PHOENIX-1252 Potential lock leak for ungrouped aggregation (Jay 
Wong)

--
[...truncated 29614 lines...]
52 KB   127 KB   
52 KB   127 KB   
52 KB   131 KB   
52 KB   134 KB   
52 KB   138 KB   
52 KB   142 KB   
56 KB   142 KB   
56 KB   144 KB   
60 KB   144 KB   
64 KB   144 KB   
68 KB   144 KB   
71 KB   144 KB   
72 KB   144 KB   
76 KB   144 KB   
80 KB   144 KB   
84 KB   144 KB   
88 KB   144 KB   
92 KB   144 KB   
 
Downloaded: 
http://repo1.maven.org/maven2/org/apache/maven/surefire/surefire-api/2.17/surefire-api-2.17.jar
 (144 KB at 13077.9 KB/sec)
93 KB
97 KB   
101 KB   
105 KB   
109 KB   
113 KB   
116 KB   
117 KB   
121 KB   
125 KB   
129 KB   
133 KB   
137 KB   
141 KB   
143 KB   
144 KB   
148 KB   
152 KB   
156 KB   
160 KB   
164 KB   
168 KB   
172 KB   
173 KB   
174 KB   
178 KB   
182 KB   
186 KB   
190 KB   
194 KB   
198 KB   
202 KB   
205 KB   
207 KB   
211 KB   
215 KB   
219 KB   
223 KB   
227 KB   
231 KB   
235 KB   
238 KB   
239 KB   
241 KB   
242 KB   
246 KB   
250 KB   
254 KB   
258 KB   
260 KB   
 
Downloaded: 
http://repo1.maven.org/maven2/org/apache/maven/surefire/maven-surefire-common/2.17/maven-surefire-common-2.17.jar
 (260 KB at 12958.4 KB/sec)
[INFO] Failsafe report directory: 
https://builds.apache.org/job/Phoenix-4.0-hadoop2/ws/phoenix-core/target/failsafe-reports
[INFO] parallel='none', perCoreThreadCount=true, threadCount=0, 
useUnlimitedThreads=false, threadCountSuites=0, threadCountClasses=0, 
threadCountMethods=0, parallelOptimized=true
Downloading: 
http://repo1.maven.org/maven2/org/apache/maven/surefire/surefire-junit47/2.17/surefire-junit47-2.17.pom
4 KB 
5 KB   
   
Downloaded: 
http://repo1.maven.org/maven2/org/apache/maven/surefire/surefire-junit47/2.17/surefire-junit47-2.17.pom
 (5 KB at 682.1 KB/sec)
Downloading: 
http://repo1.maven.org/maven2/org/apache/maven/surefire/surefire-providers/2.17/surefire-providers-2.17.pom
3 KB   
   
Downloaded: 
http://repo1.maven.org/maven2/org/apache/maven/surefire/surefire-providers/2.17/surefire-providers-2.17.pom
 (3 KB at 580.6 KB/sec)
Downloading: 
http://repo1.maven.org/maven2/org/apache/maven/surefire/common-junit48/2.17/common-junit48-2.17.pom
4 KB   
   
Downloaded: 
http://repo1.maven.org/maven2/org/apache/maven/surefire/common-junit48/2.17/common-junit48-2.17.pom
 (4 KB at 657.2 KB/sec)
Downloading: 
http://repo1.maven.org/maven2/org/apache/maven/surefire/common-junit4/2.17/common-junit4-2.17.pom
2 KB   
   
Downloaded: 
http://repo1.maven.org/maven2/org/apache/maven/surefire/common-junit4/2.17/common-junit4-2.17.pom
 (2 KB at 499.0 KB/sec)
Downloading: 
http://repo1.maven.org/maven2/org/apache/maven/surefire/common-junit3/2.17/common-junit3-2.17.pom
2 KB   
   
Downloaded: 
http://repo1.maven.org/maven2/org/apache/maven/surefire/common-junit3/2.17/common-junit3-2.17.pom
 (2 KB at 381.8 KB/sec)
Downloading: 
http://repo1.maven.org/maven2/org/apache/maven/surefire/common-java5/2.17/common-java5-2.17.pom
2 KB   
   
Downloaded: 
http://repo1.maven.org/maven2/org/apache/maven/surefire/common-java5/2.17/common-java5-2.17.pom
 (2 KB at 336.9 KB/sec)
Downloading: 
http://repo1.maven.org/maven2/org/apache/maven/surefire/surefire-grouper/2.17/surefire-grouper-2.17.pom
3 KB   
   
Downloaded: 
http://repo1.maven.org/maven2/org/apache/maven/surefire/surefire-grouper/2.17/surefire-grouper-2.17.pom
 (3 KB at 492.6 KB/sec)
Downloading: 
http://repo1.maven.org/maven2/org/apache/maven/surefire/common-junit48/2.17/common-junit48-2.17.jar
Downloading: 
http://repo1.maven.org/maven2/org/apache/maven/surefire/surefire-junit47/2.17/surefire-junit47-2.17.jar
Downloading: 
http://repo1.maven.org/maven2/org/apache/maven/surefire/common-junit3/2.17/common-junit3-2.17.jar
Downloading: 
http://repo1.maven.org/maven2/org/apache/maven/surefire/common-junit4/2.17/common-junit4-2.17.jar
Downloading: 
http://repo1.maven.org/maven2/org/apache/maven/surefire/common-java5/2.17/common-java5-2.17.jar
4 KB   
8 KB   
12 KB   
4 KB   12 KB   
4 KB   16 KB   
8 KB   16 KB   
8 KB   18 KB   
12 KB   18 KB   
16 KB   18 KB   
20 KB   18 KB   
24 KB   18 KB   
28 KB   18 KB   
32 KB   18 KB   
35 KB   18 KB   
35 KB   4 KB   18 KB   
35 KB   8 KB   18 KB   
37 KB   8 KB   18 KB   
41 KB   8 KB   18 KB   
41 KB   8 KB   4 KB   18 KB   
41 KB   11 KB   4 KB   18 KB   
45 KB   11 KB   4 KB   18 KB   
49 KB   11 KB   4 KB   18 KB   
49 KB   11 KB   8 KB   18 KB   
53 KB   11 KB   8 KB   18 KB   
53 KB   11 KB   12 KB   18 KB   
57 KB   11 KB   12 KB   18 KB   
61 KB   11 KB   12 KB   18 KB   
61 KB   11 KB   16 KB   18 KB   
65 KB   11 KB   16 KB   18 KB   
69 KB   11 KB   16 KB   18 KB   
73 KB   11 KB   16 KB   18 KB   
74 KB   11 KB   16 KB   18 KB   

Jenkins build is back to normal : Phoenix | 4.0 | Hadoop2 #129

2014-09-16 Thread Apache Jenkins Server
See https://builds.apache.org/job/Phoenix-4.0-hadoop2/129/changes