git commit: PHOENIX-1188 Performance regression for non-aggregate queries

2014-08-21 Thread jamestaylor
Repository: phoenix
Updated Branches:
  refs/heads/4.0 e2922d43c - 1987fba12


PHOENIX-1188 Performance regression for non-aggregate queries

Conflicts:

phoenix-core/src/main/java/org/apache/phoenix/iterate/ChunkedResultIterator.java


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

Branch: refs/heads/4.0
Commit: 1987fba121dd693c5b26f364dc2081176f15bb38
Parents: e2922d4
Author: James Taylor jtay...@salesforce.com
Authored: Thu Aug 21 00:04:12 2014 -0700
Committer: James Taylor jtay...@salesforce.com
Committed: Thu Aug 21 00:44:08 2014 -0700

--
 .../phoenix/iterate/ChunkedResultIterator.java  | 85 +++-
 .../apache/phoenix/jdbc/PhoenixConnection.java  |  6 --
 .../phoenix/query/QueryServicesOptions.java |  9 ++-
 .../apache/phoenix/trace/TraceMetricSource.java |  4 +-
 4 files changed, 38 insertions(+), 66 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/phoenix/blob/1987fba1/phoenix-core/src/main/java/org/apache/phoenix/iterate/ChunkedResultIterator.java
--
diff --git 
a/phoenix-core/src/main/java/org/apache/phoenix/iterate/ChunkedResultIterator.java
 
b/phoenix-core/src/main/java/org/apache/phoenix/iterate/ChunkedResultIterator.java
index 3f6ed81..c702e99 100644
--- 
a/phoenix-core/src/main/java/org/apache/phoenix/iterate/ChunkedResultIterator.java
+++ 
b/phoenix-core/src/main/java/org/apache/phoenix/iterate/ChunkedResultIterator.java
@@ -23,15 +23,19 @@ import java.util.List;
 
 import org.apache.hadoop.hbase.client.Scan;
 import org.apache.hadoop.hbase.io.ImmutableBytesWritable;
+import org.apache.hadoop.hbase.util.Bytes;
 import org.apache.phoenix.compile.StatementContext;
 import org.apache.phoenix.query.QueryServices;
 import org.apache.phoenix.query.QueryServicesOptions;
 import org.apache.phoenix.schema.TableRef;
 import org.apache.phoenix.schema.tuple.Tuple;
+import org.apache.phoenix.util.ByteUtil;
 import org.apache.phoenix.util.ScanUtil;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+import com.google.common.base.Preconditions;
+
 /**
  * {@code PeekingResultIterator} implementation that loads data in chunks. 
This is intended for
  * basic scan plans, to avoid loading large quantities of data from HBase in 
one go.
@@ -40,7 +44,7 @@ public class ChunkedResultIterator implements 
PeekingResultIterator {
 private static final Logger logger = 
LoggerFactory.getLogger(ChunkedResultIterator.class);
 
 private final ParallelIterators.ParallelIteratorFactory 
delegateIteratorFactory;
-private SingleChunkResultIterator singleChunkResultIterator;
+private ImmutableBytesWritable lastKey = new ImmutableBytesWritable();
 private final StatementContext context;
 private final TableRef tableRef;
 private Scan scan;
@@ -70,12 +74,19 @@ public class ChunkedResultIterator implements 
PeekingResultIterator {
 }
 
 public ChunkedResultIterator(ParallelIterators.ParallelIteratorFactory 
delegateIteratorFactory,
-StatementContext context, TableRef tableRef, Scan scan, long 
chunkSize) {
+StatementContext context, TableRef tableRef, Scan scan, long 
chunkSize) throws SQLException {
 this.delegateIteratorFactory = delegateIteratorFactory;
 this.context = context;
 this.tableRef = tableRef;
 this.scan = scan;
 this.chunkSize = chunkSize;
+// Instantiate single chunk iterator and the delegate iterator in 
constructor
+// to get parallel scans kicked off in separate threads. If we delay 
this,
+// we'll get serialized behavior (see PHOENIX-
+if (logger.isDebugEnabled()) logger.debug(Get first chunked result 
iterator over  + tableRef.getTable().getName().getString() +  with  + scan);
+ResultIterator singleChunkResultIterator = new 
SingleChunkResultIterator(
+new TableResultIterator(context, tableRef, scan), chunkSize);
+resultIterator = delegateIteratorFactory.newIterator(context, 
singleChunkResultIterator, scan);
 }
 
 @Override
@@ -95,26 +106,16 @@ public class ChunkedResultIterator implements 
PeekingResultIterator {
 
 @Override
 public void close() throws SQLException {
-if (resultIterator != null) {
-resultIterator.close();
-}
-if (singleChunkResultIterator != null) {
-singleChunkResultIterator.close();
-}
+resultIterator.close();
 }
 
 private PeekingResultIterator getResultIterator() throws SQLException {
-if (resultIterator == null) {
-if (logger.isDebugEnabled()) 

git commit: PHOENIX-1188 Performance regression for non-aggregate queries

2014-08-21 Thread jamestaylor
Repository: phoenix
Updated Branches:
  refs/heads/master 52b0e0050 - 29a7be42b


PHOENIX-1188 Performance regression for non-aggregate queries

Conflicts:

phoenix-core/src/main/java/org/apache/phoenix/iterate/ChunkedResultIterator.java


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

Branch: refs/heads/master
Commit: 29a7be42bfa468b12d16fd0756b987f5359c45c4
Parents: 52b0e00
Author: James Taylor jtay...@salesforce.com
Authored: Thu Aug 21 00:04:12 2014 -0700
Committer: James Taylor jtay...@salesforce.com
Committed: Thu Aug 21 00:45:27 2014 -0700

--
 .../phoenix/iterate/ChunkedResultIterator.java  | 85 +++-
 .../apache/phoenix/jdbc/PhoenixConnection.java  |  6 --
 .../phoenix/query/QueryServicesOptions.java |  9 ++-
 .../apache/phoenix/trace/TraceMetricSource.java |  4 +-
 4 files changed, 38 insertions(+), 66 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/phoenix/blob/29a7be42/phoenix-core/src/main/java/org/apache/phoenix/iterate/ChunkedResultIterator.java
--
diff --git 
a/phoenix-core/src/main/java/org/apache/phoenix/iterate/ChunkedResultIterator.java
 
b/phoenix-core/src/main/java/org/apache/phoenix/iterate/ChunkedResultIterator.java
index 3f6ed81..c702e99 100644
--- 
a/phoenix-core/src/main/java/org/apache/phoenix/iterate/ChunkedResultIterator.java
+++ 
b/phoenix-core/src/main/java/org/apache/phoenix/iterate/ChunkedResultIterator.java
@@ -23,15 +23,19 @@ import java.util.List;
 
 import org.apache.hadoop.hbase.client.Scan;
 import org.apache.hadoop.hbase.io.ImmutableBytesWritable;
+import org.apache.hadoop.hbase.util.Bytes;
 import org.apache.phoenix.compile.StatementContext;
 import org.apache.phoenix.query.QueryServices;
 import org.apache.phoenix.query.QueryServicesOptions;
 import org.apache.phoenix.schema.TableRef;
 import org.apache.phoenix.schema.tuple.Tuple;
+import org.apache.phoenix.util.ByteUtil;
 import org.apache.phoenix.util.ScanUtil;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+import com.google.common.base.Preconditions;
+
 /**
  * {@code PeekingResultIterator} implementation that loads data in chunks. 
This is intended for
  * basic scan plans, to avoid loading large quantities of data from HBase in 
one go.
@@ -40,7 +44,7 @@ public class ChunkedResultIterator implements 
PeekingResultIterator {
 private static final Logger logger = 
LoggerFactory.getLogger(ChunkedResultIterator.class);
 
 private final ParallelIterators.ParallelIteratorFactory 
delegateIteratorFactory;
-private SingleChunkResultIterator singleChunkResultIterator;
+private ImmutableBytesWritable lastKey = new ImmutableBytesWritable();
 private final StatementContext context;
 private final TableRef tableRef;
 private Scan scan;
@@ -70,12 +74,19 @@ public class ChunkedResultIterator implements 
PeekingResultIterator {
 }
 
 public ChunkedResultIterator(ParallelIterators.ParallelIteratorFactory 
delegateIteratorFactory,
-StatementContext context, TableRef tableRef, Scan scan, long 
chunkSize) {
+StatementContext context, TableRef tableRef, Scan scan, long 
chunkSize) throws SQLException {
 this.delegateIteratorFactory = delegateIteratorFactory;
 this.context = context;
 this.tableRef = tableRef;
 this.scan = scan;
 this.chunkSize = chunkSize;
+// Instantiate single chunk iterator and the delegate iterator in 
constructor
+// to get parallel scans kicked off in separate threads. If we delay 
this,
+// we'll get serialized behavior (see PHOENIX-
+if (logger.isDebugEnabled()) logger.debug(Get first chunked result 
iterator over  + tableRef.getTable().getName().getString() +  with  + scan);
+ResultIterator singleChunkResultIterator = new 
SingleChunkResultIterator(
+new TableResultIterator(context, tableRef, scan), chunkSize);
+resultIterator = delegateIteratorFactory.newIterator(context, 
singleChunkResultIterator, scan);
 }
 
 @Override
@@ -95,26 +106,16 @@ public class ChunkedResultIterator implements 
PeekingResultIterator {
 
 @Override
 public void close() throws SQLException {
-if (resultIterator != null) {
-resultIterator.close();
-}
-if (singleChunkResultIterator != null) {
-singleChunkResultIterator.close();
-}
+resultIterator.close();
 }
 
 private PeekingResultIterator getResultIterator() throws SQLException {
-if (resultIterator == null) {
-if (logger.isDebugEnabled()) 

Apache-Phoenix | 4.0 | Hadoop1 | Build Successful

2014-08-21 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
[jtaylor] PHOENIX-1192 Re-enable reverse scan to prevent order by

[jtaylor] PHOENIX-1188 Performance regression for non-aggregate queries



Jenkins build became unstable: Phoenix | Master | Hadoop1 #343

2014-08-21 Thread Apache Jenkins Server
See https://builds.apache.org/job/Phoenix-master-hadoop1/343/changes



Git Push Summary

2014-08-21 Thread mujtaba
Repository: phoenix
Updated Tags:  refs/tags/v3.1.0-rc2 [deleted] 9908e0a0b


git commit: Update CHANGES and KEYS

2014-08-21 Thread mujtaba
Repository: phoenix
Updated Branches:
  refs/heads/3.0 6d1476225 - e010a979d


Update CHANGES and KEYS


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

Branch: refs/heads/3.0
Commit: e010a979df7890dee703978c1fa45f26f2f5f3ac
Parents: 6d14762
Author: Mujtaba mujt...@apache.org
Authored: Thu Aug 21 09:35:33 2014 -0700
Committer: Mujtaba mujt...@apache.org
Committed: Thu Aug 21 09:35:33 2014 -0700

--
 CHANGES | 40 +---
 KEYS| 58 ++
 2 files changed, 79 insertions(+), 19 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/phoenix/blob/e010a979/CHANGES
--
diff --git a/CHANGES b/CHANGES
index 998aded..ddf79e5 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,15 +1,5 @@
 Release Notes - Phoenix - Version 3.1
 
-** New Feature
-* [PHOENIX-71] - Support sub-joins
-* [PHOENIX-983] - Add a function for getting the GMT offset for a given 
timezone and time
-* [PHOENIX-984] - Add support for DECODE built-in function
-* [PHOENIX-995] - ADD ENCODE AND LPAD functions 
-* [PHOENIX-1000] - Support FIRST_VALUE, LAST_VALUE, and NTH_VALUE 
aggregate functions
-* [PHOENIX-1002] - Add support for % operator
-* [PHOENIX-1043] - Add function for convert date between timezones
-* [PHOENIX-1062] - A SQL Trimmer for log sql execute times
-
 ** Improvement
 * [PHOENIX-19] - Enhance JDBC connection of Phoenix to support connecting 
to a Secure HBase cluster.
 * [PHOENIX-890] - Create dev-support script for generating binary and 
source release tars with hadoop1 and hadoop2 profiles
@@ -23,6 +13,24 @@ Release Notes - Phoenix - Version 3.1
 * [PHOENIX-1103] - Remove hash join special case for ChunkedResultIterator
 * [PHOENIX-1175] - Add setReadOnly and setFetchSize options
 
+** New Feature
+* [PHOENIX-71] - Support sub-joins
+* [PHOENIX-983] - Add a function for getting the GMT offset for a given 
timezone and time
+* [PHOENIX-984] - Add support for DECODE built-in function
+* [PHOENIX-995] - ADD ENCODE AND LPAD functions 
+* [PHOENIX-1000] - Support FIRST_VALUE, LAST_VALUE, and NTH_VALUE 
aggregate functions
+* [PHOENIX-1002] - Add support for % operator
+* [PHOENIX-1043] - Add function for convert date between timezones
+* [PHOENIX-1062] - A SQL Trimmer for log sql execute times
+
+** Sub-task
+* [PHOENIX-136] - Support derived tables in from clause
+* [PHOENIX-927] - Support derived tables in joins
+* [PHOENIX-1038] - Dynamically add INDEX_TYPE column to SYSTEM.CATALOG if 
not already there
+* [PHOENIX-1112] - Atomically rebuild index partially when index update 
fails  
+* [PHOENIX-1132] - Merge server side phoenix-hadoop2-compat.jar, 
phoenix-hadoop-compat.jar and phoenix-version.jar
+* [PHOENIX-1161] - Prevent necessity of clearing region cache on every 
access for local indexing
+
 ** Bug
 * [PHOENIX-3] - TRUNC method doesn't work on column of datatype timestamp
 * [PHOENIX-11] - Create Pig Loader
@@ -104,6 +112,9 @@ Release Notes - Phoenix - Version 3.1
 * [PHOENIX-1162] - Use physical name instead of logical name when 
recovering from stale region cache
 * [PHOENIX-1171] - Dropping the index is not verifying the associated table
 * [PHOENIX-1172] - Prevent lock contention in ConnectionQueryServicesImpl. 
Fix exception handling. 
+* [PHOENIX-1180] - Rename test classes so they are properly picked up by 
the test runner
+* [PHOENIX-1181] - client cache fails to update itself after a table was 
altered from a diff client
+* [PHOENIX-1188] - Performance regression for non-aggregate queries
 
 ** Task
 * [PHOENIX-539] - Implement parallel scanner that does not spool to disk
@@ -113,18 +124,9 @@ Release Notes - Phoenix - Version 3.1
 * [PHOENIX-828] - Detect if split occurs while ORDER BY query is in 
progress
 * [PHOENIX-1056] - A ImportTsv tool for phoenix to build table data and 
all index data.
 
-** Sub-task
-* [PHOENIX-136] - Support derived tables in from clause
-* [PHOENIX-927] - Support derived tables in joins
-* [PHOENIX-1038] - Dynamically add INDEX_TYPE column to SYSTEM.CATALOG if 
not already there
-* [PHOENIX-1112] - Atomically rebuild index partially when index update 
fails  
-* [PHOENIX-1132] - Merge server side phoenix-hadoop2-compat.jar, 
phoenix-hadoop-compat.jar and phoenix-version.jar
-* [PHOENIX-1161] - Prevent necessity of clearing region cache on every 
access for local indexing
-
 ** Test
 * [PHOENIX-1136] - Add Integration 

git commit: PHOENIX-1187 Addendum: fix hadoop2-compat META-INF

2014-08-21 Thread jyates
Repository: phoenix
Updated Branches:
  refs/heads/4.0 1987fba12 - 9af70445c


PHOENIX-1187 Addendum: fix hadoop2-compat META-INF

Necessary because PhoenixMetricsWriter changed name to PhoenixMetricsSink


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

Branch: refs/heads/4.0
Commit: 9af70445c265f9b12d2f28eba694df3425598e94
Parents: 1987fba
Author: Jesse Yates jya...@apache.org
Authored: Thu Aug 21 09:47:42 2014 -0700
Committer: Jesse Yates jya...@apache.org
Committed: Thu Aug 21 09:49:22 2014 -0700

--
 .../services/org.apache.phoenix.trace.TestableMetricsWriter| 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/phoenix/blob/9af70445/phoenix-hadoop2-compat/src/main/resources/META-INF/services/org.apache.phoenix.trace.TestableMetricsWriter
--
diff --git 
a/phoenix-hadoop2-compat/src/main/resources/META-INF/services/org.apache.phoenix.trace.TestableMetricsWriter
 
b/phoenix-hadoop2-compat/src/main/resources/META-INF/services/org.apache.phoenix.trace.TestableMetricsWriter
index b10af39..7c9e107 100644
--- 
a/phoenix-hadoop2-compat/src/main/resources/META-INF/services/org.apache.phoenix.trace.TestableMetricsWriter
+++ 
b/phoenix-hadoop2-compat/src/main/resources/META-INF/services/org.apache.phoenix.trace.TestableMetricsWriter
@@ -1 +1 @@
-org.apache.phoenix.trace.PhoenixMetricsWriter
\ No newline at end of file
+org.apache.phoenix.trace.PhoenixMetricsSink
\ No newline at end of file



svn commit: r6226 - in /dev/phoenix: ./ phoenix-3.1.0-rc2/bin/ phoenix-3.1.0-rc2/src/

2014-08-21 Thread mujtaba
Author: mujtaba
Date: Thu Aug 21 17:01:19 2014
New Revision: 6226

Log:
Phoenix 3.1-RC2

Modified:
dev/phoenix/KEYS
dev/phoenix/phoenix-3.1.0-rc2/bin/phoenix-3.1.0-bin.tar.gz
dev/phoenix/phoenix-3.1.0-rc2/bin/phoenix-3.1.0-bin.tar.gz.asc
dev/phoenix/phoenix-3.1.0-rc2/bin/phoenix-3.1.0-bin.tar.gz.md5
dev/phoenix/phoenix-3.1.0-rc2/bin/phoenix-3.1.0-bin.tar.gz.sha
dev/phoenix/phoenix-3.1.0-rc2/src/phoenix-3.1.0-src.tar.gz
dev/phoenix/phoenix-3.1.0-rc2/src/phoenix-3.1.0-src.tar.gz.asc
dev/phoenix/phoenix-3.1.0-rc2/src/phoenix-3.1.0-src.tar.gz.md5
dev/phoenix/phoenix-3.1.0-rc2/src/phoenix-3.1.0-src.tar.gz.sha

Modified: dev/phoenix/KEYS
==
--- dev/phoenix/KEYS (original)
+++ dev/phoenix/KEYS Thu Aug 21 17:01:19 2014
@@ -71,3 +71,61 @@ fMFOWYmlNK8cL+Z7zaEOFYF5ug/i0hZhhzKZc03r
 GR2wPntvTGNAWEcuwD1/D1gws5A=
 =nO9e
 -END PGP PUBLIC KEY BLOCK-
+pub   4096R/9461178E 2014-08-20
+uid  Mujtaba Chohan (CODE SIGNING KEY) mujt...@apache.org
+sig 39461178E 2014-08-20  Mujtaba Chohan (CODE SIGNING KEY) 
mujt...@apache.org
+sub   4096R/040CE8A4 2014-08-20
+sig  9461178E 2014-08-20  Mujtaba Chohan (CODE SIGNING KEY) 
mujt...@apache.org
+
+-BEGIN PGP PUBLIC KEY BLOCK-
+Version: GnuPG v1.4.11 (GNU/Linux)
+
+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
+b3CCnSyeLFXGUhv1BciOnOYQrgph
+=WOH9
+-END PGP PUBLIC KEY BLOCK-

Modified: dev/phoenix/phoenix-3.1.0-rc2/bin/phoenix-3.1.0-bin.tar.gz
==
Binary files - no diff available.

Modified: dev/phoenix/phoenix-3.1.0-rc2/bin/phoenix-3.1.0-bin.tar.gz.asc
==
--- dev/phoenix/phoenix-3.1.0-rc2/bin/phoenix-3.1.0-bin.tar.gz.asc (original)
+++ dev/phoenix/phoenix-3.1.0-rc2/bin/phoenix-3.1.0-bin.tar.gz.asc Thu Aug 21 
17:01:19 2014
@@ -1,17 +1,17 @@
 

svn commit: r6227 - /release/phoenix/KEYS

2014-08-21 Thread mujtaba
Author: mujtaba
Date: Thu Aug 21 17:01:55 2014
New Revision: 6227

Log:
Update KEYS

Modified:
release/phoenix/KEYS

Modified: release/phoenix/KEYS
==
--- release/phoenix/KEYS (original)
+++ release/phoenix/KEYS Thu Aug 21 17:01:55 2014
@@ -71,3 +71,61 @@ fMFOWYmlNK8cL+Z7zaEOFYF5ug/i0hZhhzKZc03r
 GR2wPntvTGNAWEcuwD1/D1gws5A=
 =nO9e
 -END PGP PUBLIC KEY BLOCK-
+pub   4096R/9461178E 2014-08-20
+uid  Mujtaba Chohan (CODE SIGNING KEY) mujt...@apache.org
+sig 39461178E 2014-08-20  Mujtaba Chohan (CODE SIGNING KEY) 
mujt...@apache.org
+sub   4096R/040CE8A4 2014-08-20
+sig  9461178E 2014-08-20  Mujtaba Chohan (CODE SIGNING KEY) 
mujt...@apache.org
+
+-BEGIN PGP PUBLIC KEY BLOCK-
+Version: GnuPG v1.4.11 (GNU/Linux)
+
+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
+b3CCnSyeLFXGUhv1BciOnOYQrgph
+=WOH9
+-END PGP PUBLIC KEY BLOCK-




Git Push Summary

2014-08-21 Thread mujtaba
Repository: phoenix
Updated Tags:  refs/tags/v3.1.0-rc2 [created] a21a0a12f


svn commit: r1619499 - in /phoenix: phoenix-docs/src/main/org/h2/ phoenix-docs/src/main/org/h2/jdbc/ phoenix-docs/src/main/org/h2/jdbcx/ phoenix-docs/src/main/org/h2/tools/ site/publish/ site/source/s

2014-08-21 Thread jyates
Author: jyates
Date: Thu Aug 21 17:48:54 2014
New Revision: 1619499

URL: http://svn.apache.org/r1619499
Log:
Updating tracing docs after PHOENIX-1187

Modified:
phoenix/phoenix-docs/src/main/org/h2/Driver.java
phoenix/phoenix-docs/src/main/org/h2/jdbc/JdbcCallableStatement.java
phoenix/phoenix-docs/src/main/org/h2/jdbc/JdbcConnection.java
phoenix/phoenix-docs/src/main/org/h2/jdbc/JdbcDatabaseMetaData.java
phoenix/phoenix-docs/src/main/org/h2/jdbc/JdbcResultSet.java
phoenix/phoenix-docs/src/main/org/h2/jdbc/JdbcStatement.java
phoenix/phoenix-docs/src/main/org/h2/jdbcx/JdbcConnectionPool.java
phoenix/phoenix-docs/src/main/org/h2/jdbcx/JdbcDataSource.java
phoenix/phoenix-docs/src/main/org/h2/tools/SimpleResultSet.java
phoenix/site/publish/tracing.html
phoenix/site/source/src/site/markdown/tracing.md

Modified: phoenix/phoenix-docs/src/main/org/h2/Driver.java
URL: 
http://svn.apache.org/viewvc/phoenix/phoenix-docs/src/main/org/h2/Driver.java?rev=1619499r1=1619498r2=1619499view=diff
==
--- phoenix/phoenix-docs/src/main/org/h2/Driver.java (original)
+++ phoenix/phoenix-docs/src/main/org/h2/Driver.java Thu Aug 21 17:48:54 2014
@@ -17,7 +17,7 @@ import org.h2.message.DbException;
 import org.h2.message.TraceSystem;
 import org.h2.upgrade.DbUpgrade;
 
-/*## Java 1.7 ##
+//## Java 1.7 ##
 import java.util.logging.Logger;
 //*/
 
@@ -138,7 +138,7 @@ public class Driver implements java.sql.
 /**
  * [Not supported]
  */
-/*## Java 1.7 ##
+//## Java 1.7 ##
 public Logger getParentLogger() {
 return null;
 }

Modified: phoenix/phoenix-docs/src/main/org/h2/jdbc/JdbcCallableStatement.java
URL: 
http://svn.apache.org/viewvc/phoenix/phoenix-docs/src/main/org/h2/jdbc/JdbcCallableStatement.java?rev=1619499r1=1619498r2=1619499view=diff
==
--- phoenix/phoenix-docs/src/main/org/h2/jdbc/JdbcCallableStatement.java 
(original)
+++ phoenix/phoenix-docs/src/main/org/h2/jdbc/JdbcCallableStatement.java Thu 
Aug 21 17:48:54 2014
@@ -1440,7 +1440,7 @@ public class JdbcCallableStatement exten
  * @param parameterIndex the parameter index (1, 2, ...)
  * @param type the class of the returned value
  */
-/*## Java 1.7 ##
+//## Java 1.7 ##
 public T T getObject(int parameterIndex, ClassT type) {
 return null;
 }
@@ -1452,7 +1452,7 @@ public class JdbcCallableStatement exten
  * @param parameterName the parameter name
  * @param type the class of the returned value
  */
-/*## Java 1.7 ##
+//## Java 1.7 ##
 public T T getObject(String parameterName, ClassT type) {
 return null;
 }

Modified: phoenix/phoenix-docs/src/main/org/h2/jdbc/JdbcConnection.java
URL: 
http://svn.apache.org/viewvc/phoenix/phoenix-docs/src/main/org/h2/jdbc/JdbcConnection.java?rev=1619499r1=1619498r2=1619499view=diff
==
--- phoenix/phoenix-docs/src/main/org/h2/jdbc/JdbcConnection.java (original)
+++ phoenix/phoenix-docs/src/main/org/h2/jdbc/JdbcConnection.java Thu Aug 21 
17:48:54 2014
@@ -49,7 +49,7 @@ import java.sql.SQLXML;
 import java.sql.SQLClientInfoException;
 //*/
 
-/*## Java 1.7 ##
+//## Java 1.7 ##
 import java.util.concurrent.Executor;
 //*/
 
@@ -1678,7 +1678,7 @@ public class JdbcConnection extends Trac
  *
  * @param schema the schema
  */
-/*## Java 1.7 ##
+//## Java 1.7 ##
 public void setSchema(String schema) {
 // not supported
 }
@@ -1687,7 +1687,7 @@ public class JdbcConnection extends Trac
 /**
  * [Not supported]
  */
-/*## Java 1.7 ##
+//## Java 1.7 ##
 public String getSchema() {
 return null;
 }
@@ -1698,7 +1698,7 @@ public class JdbcConnection extends Trac
  *
  * @param executor the executor used by this method
  */
-/*## Java 1.7 ##
+//## Java 1.7 ##
 public void abort(Executor executor) {
 // not supported
 }
@@ -1710,7 +1710,7 @@ public class JdbcConnection extends Trac
  * @param executor the executor used by this method
  * @param milliseconds the TCP connection timeout
  */
-/*## Java 1.7 ##
+//## Java 1.7 ##
 public void setNetworkTimeout(Executor executor, int milliseconds) {
 // not supported
 }
@@ -1719,7 +1719,7 @@ public class JdbcConnection extends Trac
 /**
  * [Not supported]
  */
-/*## Java 1.7 ##
+//## Java 1.7 ##
 public int getNetworkTimeout() {
 return 0;
 }

Modified: phoenix/phoenix-docs/src/main/org/h2/jdbc/JdbcDatabaseMetaData.java
URL: 
http://svn.apache.org/viewvc/phoenix/phoenix-docs/src/main/org/h2/jdbc/JdbcDatabaseMetaData.java?rev=1619499r1=1619498r2=1619499view=diff
==
--- phoenix/phoenix-docs/src/main/org/h2/jdbc/JdbcDatabaseMetaData.java 
(original)

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

2014-08-21 Thread Apache Jenkins Server
See https://builds.apache.org/job/Phoenix-4.0-hadoop2/56/changes



svn commit: r1619561 - in /phoenix/site: publish/images/phoenix.png source/src/site/resources/images/phoenix.png

2014-08-21 Thread jamestaylor
Author: jamestaylor
Date: Thu Aug 21 20:10:12 2014
New Revision: 1619561

URL: http://svn.apache.org/r1619561
Log:
Add alternate phoenix logo

Added:
phoenix/site/publish/images/phoenix.png   (with props)
phoenix/site/source/src/site/resources/images/phoenix.png   (with props)

Added: phoenix/site/publish/images/phoenix.png
URL: 
http://svn.apache.org/viewvc/phoenix/site/publish/images/phoenix.png?rev=1619561view=auto
==
Binary file - no diff available.

Propchange: phoenix/site/publish/images/phoenix.png
--
svn:mime-type = application/octet-stream

Added: phoenix/site/source/src/site/resources/images/phoenix.png
URL: 
http://svn.apache.org/viewvc/phoenix/site/source/src/site/resources/images/phoenix.png?rev=1619561view=auto
==
Binary file - no diff available.

Propchange: phoenix/site/source/src/site/resources/images/phoenix.png
--
svn:mime-type = application/octet-stream




svn commit: r1619588 - in /phoenix: phoenix-docs/src/main/org/h2/ phoenix-docs/src/main/org/h2/jdbc/ phoenix-docs/src/main/org/h2/jdbcx/ phoenix-docs/src/main/org/h2/tools/ site/publish/ site/source/s

2014-08-21 Thread jamestaylor
Author: jamestaylor
Date: Thu Aug 21 21:03:41 2014
New Revision: 1619588

URL: http://svn.apache.org/r1619588
Log:
Fix markdown on tracing page

Modified:
phoenix/phoenix-docs/src/main/org/h2/Driver.java
phoenix/phoenix-docs/src/main/org/h2/jdbc/JdbcCallableStatement.java
phoenix/phoenix-docs/src/main/org/h2/jdbc/JdbcConnection.java
phoenix/phoenix-docs/src/main/org/h2/jdbc/JdbcDatabaseMetaData.java
phoenix/phoenix-docs/src/main/org/h2/jdbc/JdbcResultSet.java
phoenix/phoenix-docs/src/main/org/h2/jdbc/JdbcStatement.java
phoenix/phoenix-docs/src/main/org/h2/jdbcx/JdbcConnectionPool.java
phoenix/phoenix-docs/src/main/org/h2/jdbcx/JdbcDataSource.java
phoenix/phoenix-docs/src/main/org/h2/tools/SimpleResultSet.java
phoenix/site/publish/tracing.html
phoenix/site/source/src/site/markdown/tracing.md

Modified: phoenix/phoenix-docs/src/main/org/h2/Driver.java
URL: 
http://svn.apache.org/viewvc/phoenix/phoenix-docs/src/main/org/h2/Driver.java?rev=1619588r1=1619587r2=1619588view=diff
==
--- phoenix/phoenix-docs/src/main/org/h2/Driver.java (original)
+++ phoenix/phoenix-docs/src/main/org/h2/Driver.java Thu Aug 21 21:03:41 2014
@@ -17,7 +17,7 @@ import org.h2.message.DbException;
 import org.h2.message.TraceSystem;
 import org.h2.upgrade.DbUpgrade;
 
-//## Java 1.7 ##
+/*## Java 1.7 ##
 import java.util.logging.Logger;
 //*/
 
@@ -138,7 +138,7 @@ public class Driver implements java.sql.
 /**
  * [Not supported]
  */
-//## Java 1.7 ##
+/*## Java 1.7 ##
 public Logger getParentLogger() {
 return null;
 }

Modified: phoenix/phoenix-docs/src/main/org/h2/jdbc/JdbcCallableStatement.java
URL: 
http://svn.apache.org/viewvc/phoenix/phoenix-docs/src/main/org/h2/jdbc/JdbcCallableStatement.java?rev=1619588r1=1619587r2=1619588view=diff
==
--- phoenix/phoenix-docs/src/main/org/h2/jdbc/JdbcCallableStatement.java 
(original)
+++ phoenix/phoenix-docs/src/main/org/h2/jdbc/JdbcCallableStatement.java Thu 
Aug 21 21:03:41 2014
@@ -1440,7 +1440,7 @@ public class JdbcCallableStatement exten
  * @param parameterIndex the parameter index (1, 2, ...)
  * @param type the class of the returned value
  */
-//## Java 1.7 ##
+/*## Java 1.7 ##
 public T T getObject(int parameterIndex, ClassT type) {
 return null;
 }
@@ -1452,7 +1452,7 @@ public class JdbcCallableStatement exten
  * @param parameterName the parameter name
  * @param type the class of the returned value
  */
-//## Java 1.7 ##
+/*## Java 1.7 ##
 public T T getObject(String parameterName, ClassT type) {
 return null;
 }

Modified: phoenix/phoenix-docs/src/main/org/h2/jdbc/JdbcConnection.java
URL: 
http://svn.apache.org/viewvc/phoenix/phoenix-docs/src/main/org/h2/jdbc/JdbcConnection.java?rev=1619588r1=1619587r2=1619588view=diff
==
--- phoenix/phoenix-docs/src/main/org/h2/jdbc/JdbcConnection.java (original)
+++ phoenix/phoenix-docs/src/main/org/h2/jdbc/JdbcConnection.java Thu Aug 21 
21:03:41 2014
@@ -49,7 +49,7 @@ import java.sql.SQLXML;
 import java.sql.SQLClientInfoException;
 //*/
 
-//## Java 1.7 ##
+/*## Java 1.7 ##
 import java.util.concurrent.Executor;
 //*/
 
@@ -1678,7 +1678,7 @@ public class JdbcConnection extends Trac
  *
  * @param schema the schema
  */
-//## Java 1.7 ##
+/*## Java 1.7 ##
 public void setSchema(String schema) {
 // not supported
 }
@@ -1687,7 +1687,7 @@ public class JdbcConnection extends Trac
 /**
  * [Not supported]
  */
-//## Java 1.7 ##
+/*## Java 1.7 ##
 public String getSchema() {
 return null;
 }
@@ -1698,7 +1698,7 @@ public class JdbcConnection extends Trac
  *
  * @param executor the executor used by this method
  */
-//## Java 1.7 ##
+/*## Java 1.7 ##
 public void abort(Executor executor) {
 // not supported
 }
@@ -1710,7 +1710,7 @@ public class JdbcConnection extends Trac
  * @param executor the executor used by this method
  * @param milliseconds the TCP connection timeout
  */
-//## Java 1.7 ##
+/*## Java 1.7 ##
 public void setNetworkTimeout(Executor executor, int milliseconds) {
 // not supported
 }
@@ -1719,7 +1719,7 @@ public class JdbcConnection extends Trac
 /**
  * [Not supported]
  */
-//## Java 1.7 ##
+/*## Java 1.7 ##
 public int getNetworkTimeout() {
 return 0;
 }

Modified: phoenix/phoenix-docs/src/main/org/h2/jdbc/JdbcDatabaseMetaData.java
URL: 
http://svn.apache.org/viewvc/phoenix/phoenix-docs/src/main/org/h2/jdbc/JdbcDatabaseMetaData.java?rev=1619588r1=1619587r2=1619588view=diff
==
--- phoenix/phoenix-docs/src/main/org/h2/jdbc/JdbcDatabaseMetaData.java 
(original)
+++ 

Apache-Phoenix | 3.0 | Hadoop1 | Build Successful

2014-08-21 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
[mujtaba] Update CHANGES and KEYS



git commit: Update CHANGES and KEYS

2014-08-21 Thread mujtaba
Repository: phoenix
Updated Branches:
  refs/heads/4.0 9af70445c - 98b02975f


Update CHANGES and KEYS


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

Branch: refs/heads/4.0
Commit: 98b02975f015159e9589094ff808bd26f8271bfd
Parents: 9af7044
Author: Mujtaba mujt...@apache.org
Authored: Thu Aug 21 15:32:13 2014 -0700
Committer: Mujtaba mujt...@apache.org
Committed: Thu Aug 21 15:32:13 2014 -0700

--
 CHANGES | 52 +++-
 KEYS| 58 ++
 2 files changed, 89 insertions(+), 21 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/phoenix/blob/98b02975/CHANGES
--
diff --git a/CHANGES b/CHANGES
index 894d82e..316ef78 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,4 +1,5 @@
-Release Notes - Phoenix - Version 4.1.0
+
+Release Notes - Phoenix - Version 4.1
 
 ** New Feature
 * [PHOENIX-71] - Support sub-joins
@@ -22,6 +23,30 @@ Release Notes - Phoenix - Version 4.1.0
 * [PHOENIX-1101] - Provide a way to create Phoenix Statements on the 
server side inside a CP
 * [PHOENIX-1103] - Remove hash join special case for ChunkedResultIterator
 * [PHOENIX-1175] - Add setReadOnly and setFetchSize options
+* [PHOENIX-1198] - Add ability to pass custom tags to be added to log lines
+
+** Sub-task
+* [PHOENIX-136] - Support derived tables in from clause
+* [PHOENIX-177] - Collect usage and performance metrics
+* [PHOENIX-927] - Support derived tables in joins
+* [PHOENIX-934] - Make changes to specify index is local
+* [PHOENIX-935] - create local index table with the same split keys of 
user table
+* [PHOENIX-936] - Custom load balancer to colocate user table regions and 
index table regions
+* [PHOENIX-937] - Handle puts on local index table
+* [PHOENIX-955] - Skip region start key at beginning of local index rows
+* [PHOENIX-994] - Handle scans on local index table in case any best fit 
covering local index available
+* [PHOENIX-1004] - 'drop index' should delete index data from local index 
table
+* [PHOENIX-1015] - Support joining back to data table row from local index 
when query condition involves leading columns in local index
+* [PHOENIX-1038] - Dynamically add INDEX_TYPE column to SYSTEM.CATALOG if 
not already there
+* [PHOENIX-1058] - Support index region split on it's corresponding data 
region split
+* [PHOENIX-1086] - Document local indexes
+* [PHOENIX-1099] - Fix performance issues with unit tests.
+* [PHOENIX-1112] - Atomically rebuild index partially when index update 
fails  
+* [PHOENIX-1114] - Add user-level documentation for tracing
+* [PHOENIX-1129] - NotCompliantMBeanException
+* [PHOENIX-1132] - Merge server side phoenix-hadoop2-compat.jar, 
phoenix-hadoop-compat.jar and phoenix-version.jar
+* [PHOENIX-1161] - Prevent necessity of clearing region cache on every 
access for local indexing
+* [PHOENIX-1196] - Add ability to add custom tracing tags for connections 
and/or upserts and selects
 
 ** Bug
 * [PHOENIX-3] - TRUNC method doesn't work on column of datatype timestamp
@@ -110,6 +135,11 @@ Release Notes - Phoenix - Version 4.1.0
 * [PHOENIX-1172] - Prevent lock contention in ConnectionQueryServicesImpl. 
Fix exception handling. 
 * [PHOENIX-1174] - Rename and move properties using existing convention
 * [PHOENIX-1176] - Allow tracing to be turned on globally through config
+* [PHOENIX-1180] - Rename test classes so they are properly picked up by 
the test runner
+* [PHOENIX-1181] - client cache fails to update itself after a table was 
altered from a diff client
+* [PHOENIX-1187] - Enable tracing on server
+* [PHOENIX-1188] - Performance regression for non-aggregate queries
+* [PHOENIX-1192] - Re-enable reverse scan to prevent order by
 
 ** Task
 * [PHOENIX-539] - Implement parallel scanner that does not spool to disk
@@ -119,26 +149,6 @@ Release Notes - Phoenix - Version 4.1.0
 * [PHOENIX-828] - Detect if split occurs while ORDER BY query is in 
progress
 * [PHOENIX-949] - Replace Filter#filterRow(List) with 
Filter#filterRowCells(List)
 
-** Sub-task
-* [PHOENIX-136] - Support derived tables in from clause
-* [PHOENIX-177] - Collect usage and performance metrics
-* [PHOENIX-927] - Support derived tables in joins
-* [PHOENIX-934] - Make changes to specify index is local
-* [PHOENIX-935] - create local index table with the same split keys of 
user table
-* [PHOENIX-936] - Custom load balancer to colocate user 

Git Push Summary

2014-08-21 Thread mujtaba
Repository: phoenix
Updated Tags:  refs/tags/v4.1.0-rc0 [created] bc0764fc4