Build failed in Jenkins: Phoenix | 4.x-HBase-0.98 #1424

[Apache Jenkins Server]

See 

Changes:

[apurtell] PHOENIX-3611 Cache for client connections will expire (and close)

--
[...truncated 730 lines...]
Tests run: 8, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 33.934 sec - in 
org.apache.phoenix.end2end.index.txn.RollbackIT
Running org.apache.phoenix.end2end.salted.SaltedTableUpsertSelectIT
Tests run: 6, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 12.14 sec - in 
org.apache.phoenix.end2end.salted.SaltedTableUpsertSelectIT
Running org.apache.phoenix.end2end.salted.SaltedTableVarLengthRowKeyIT
Tests run: 1, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 1.255 sec - in 
org.apache.phoenix.end2end.salted.SaltedTableVarLengthRowKeyIT
Running org.apache.phoenix.iterate.PhoenixQueryTimeoutIT
Tests run: 2, Failures: 1, Errors: 0, Skipped: 0, Time elapsed: 2.244 sec <<< 
FAILURE! - in org.apache.phoenix.iterate.PhoenixQueryTimeoutIT
testCustomQueryTimeoutWithVeryLowTimeout(org.apache.phoenix.iterate.PhoenixQueryTimeoutIT)
  Time elapsed: 0.877 sec  <<< FAILURE!
java.lang.AssertionError: Expected query to timeout with a 1 ms timeout
at 
org.apache.phoenix.iterate.PhoenixQueryTimeoutIT.testCustomQueryTimeoutWithVeryLowTimeout(PhoenixQueryTimeoutIT.java:78)

Running org.apache.phoenix.iterate.RoundRobinResultIteratorIT
Tests run: 66, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 271.678 sec - 
in org.apache.phoenix.end2end.index.IndexExpressionIT
Running org.apache.phoenix.rpc.UpdateCacheIT
Tests run: 7, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 16.504 sec - in 
org.apache.phoenix.rpc.UpdateCacheIT
Running org.apache.phoenix.trace.PhoenixTableMetricsWriterIT
Tests run: 2, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 2.247 sec - in 
org.apache.phoenix.trace.PhoenixTableMetricsWriterIT
Running org.apache.phoenix.trace.PhoenixTraceReaderIT
Tests run: 2, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 1.301 sec - in 
org.apache.phoenix.trace.PhoenixTraceReaderIT
Running org.apache.phoenix.trace.PhoenixTracingEndToEndIT
Tests run: 9, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 34.98 sec - in 
org.apache.phoenix.iterate.RoundRobinResultIteratorIT
Running org.apache.phoenix.tx.TransactionIT
Running org.apache.phoenix.tx.FlappingTransactionIT
Tests run: 4, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 1.243 sec - in 
org.apache.phoenix.tx.FlappingTransactionIT
Running org.apache.phoenix.tx.TxCheckpointIT
Tests run: 19, Failures: 0, Errors: 0, Skipped: 1, Time elapsed: 47.176 sec - 
in org.apache.phoenix.tx.TransactionIT
Tests run: 6, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 86.605 sec - in 
org.apache.phoenix.trace.PhoenixTracingEndToEndIT
Tests run: 20, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 82.252 sec - 
in org.apache.phoenix.tx.TxCheckpointIT
Tests run: 40, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 406.363 sec - 
in org.apache.phoenix.end2end.index.MutableIndexIT
Tests run: 152, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 599.164 sec - 
in org.apache.phoenix.end2end.index.IndexIT

Results :

Failed tests: 
  PhoenixQueryTimeoutIT.testCustomQueryTimeoutWithVeryLowTimeout:78 Expected 
query to timeout with a 1 ms timeout

Tests run: 1650, Failures: 1, Errors: 0, Skipped: 1

[INFO] 
[INFO] --- maven-failsafe-plugin:2.19.1:integration-test 
(ClientManagedTimeTests) @ phoenix-core ---

---
 T E S T S
---
Running org.apache.phoenix.end2end.ArrayIT
Running org.apache.phoenix.end2end.CaseStatementIT
Running org.apache.phoenix.end2end.CastAndCoerceIT
Running org.apache.phoenix.end2end.AggregateQueryIT
Running org.apache.phoenix.end2end.ClientTimeArithmeticQueryIT
Tests run: 49, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 37.9 sec - in 
org.apache.phoenix.end2end.CastAndCoerceIT
Running org.apache.phoenix.end2end.ColumnProjectionOptimizationIT
Tests run: 63, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 45.029 sec - 
in org.apache.phoenix.end2end.CaseStatementIT
Running org.apache.phoenix.end2end.CreateSchemaIT
Tests run: 1, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 0.154 sec - in 
org.apache.phoenix.end2end.CreateSchemaIT
Running org.apache.phoenix.end2end.CreateTableIT
Tests run: 3, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 15.092 sec - in 
org.apache.phoenix.end2end.ColumnProjectionOptimizationIT
Tests run: 49, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 53.475 sec - 
in org.apache.phoenix.end2end.AggregateQueryIT
Running org.apache.phoenix.end2end.CustomEntityDataIT
Running org.apache.phoenix.end2end.DerivedTableIT
Tests run: 3, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 2.726 sec - in 
org.apache.phoenix.end2end.CustomEntityDataIT
Running org.apache.phoenix.end2end.DistinctCountIT
Tests run: 79, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 59.539 sec - 
in 

[3/3] phoenix git commit: PHOENIX-3611 Cache for client connections will expire (and close) entries in LRU fashion.

[apurtell]

PHOENIX-3611 Cache for client connections will expire (and close) entries in 
LRU fashion.

Signed-off-by: Andrew Purtell 


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

Branch: refs/heads/4.x-HBase-0.98
Commit: badb9b40b67e1dfc6b1bba1b368aa0ea461773f7
Parents: 2fd9b08
Author: Geoffrey 
Authored: Thu Jan 19 16:08:20 2017 -0800
Committer: Andrew Purtell 
Committed: Fri Jan 20 16:18:02 2017 -0800

--
 .../org/apache/phoenix/jdbc/PhoenixDriver.java  | 99 +---
 .../org/apache/phoenix/query/QueryServices.java |  5 +-
 .../phoenix/query/QueryServicesOptions.java |  2 +
 3 files changed, 70 insertions(+), 36 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/phoenix/blob/badb9b40/phoenix-core/src/main/java/org/apache/phoenix/jdbc/PhoenixDriver.java
--
diff --git 
a/phoenix-core/src/main/java/org/apache/phoenix/jdbc/PhoenixDriver.java 
b/phoenix-core/src/main/java/org/apache/phoenix/jdbc/PhoenixDriver.java
index 1fb827c..ba06ed9 100644
--- a/phoenix-core/src/main/java/org/apache/phoenix/jdbc/PhoenixDriver.java
+++ b/phoenix-core/src/main/java/org/apache/phoenix/jdbc/PhoenixDriver.java
@@ -23,20 +23,13 @@ import java.sql.Connection;
 import java.sql.DriverManager;
 import java.sql.SQLException;
 import java.util.Properties;
-import java.util.concurrent.ConcurrentHashMap;
-import java.util.concurrent.ConcurrentMap;
-import java.util.concurrent.ExecutionException;
-import java.util.concurrent.ExecutorService;
-import java.util.concurrent.Executors;
-import java.util.concurrent.Future;
-import java.util.concurrent.ThreadFactory;
-import java.util.concurrent.TimeUnit;
-import java.util.concurrent.TimeoutException;
+import java.util.concurrent.*;
 import java.util.concurrent.locks.ReadWriteLock;
 import java.util.concurrent.locks.ReentrantReadWriteLock;
 
 import javax.annotation.concurrent.GuardedBy;
 
+import com.google.common.cache.*;
 import org.apache.hadoop.conf.Configuration;
 import org.apache.phoenix.exception.SQLExceptionCode;
 import org.apache.phoenix.exception.SQLExceptionInfo;
@@ -50,7 +43,6 @@ import org.apache.phoenix.query.QueryServicesOptions;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import com.google.common.annotations.VisibleForTesting;
 import com.google.common.util.concurrent.ThreadFactoryBuilder;
 
 
@@ -147,13 +139,43 @@ public final class PhoenixDriver extends 
PhoenixEmbeddedDriver {
 }
 
 // One entry per cluster here
-private final ConcurrentMap 
connectionQueryServicesMap = new 
ConcurrentHashMap(3);
+private final Cache 
connectionQueryServicesCache =
+initializeConnectionCache();
 
 public PhoenixDriver() { // for Squirrel
 // Use production services implementation
 super();
 }
-
+
+private Cache 
initializeConnectionCache() {
+Configuration config = 
HBaseFactoryProvider.getConfigurationFactory().getConfiguration();
+int maxCacheSize = 
config.getInt(QueryServices.CLIENT_CONNECTION_CACHE_MAX_SIZE,
+QueryServicesOptions.DEFAULT_CLIENT_CONNECTION_CACHE_MAX_SIZE);
+int maxCacheDuration = 
config.getInt(QueryServices.CLIENT_CONNECTION_CACHE_MAX_DURATION_MILLISECONDS,
+QueryServicesOptions.DEFAULT_CLIENT_CONNECTION_CACHE_MAX_DURATION);
+RemovalListener 
cacheRemovalListener =
+new RemovalListener() {
+@Override
+public void onRemoval(RemovalNotification notification) {
+String connInfoIdentifier = 
notification.getKey().toString();
+logger.debug("Expiring " + connInfoIdentifier + " because 
of "
++ notification.getCause().name());
+
+try {
+notification.getValue().close();
+}
+catch (SQLException se) {
+logger.error("Error while closing expired cache 
connection " + connInfoIdentifier, se);
+}
+}
+};
+return CacheBuilder.newBuilder()
+.maximumSize(maxCacheSize)
+.expireAfterAccess(maxCacheDuration, TimeUnit.MILLISECONDS)
+.removalListener(cacheRemovalListener)
+   

[2/3] phoenix git commit: PHOENIX-3611 Cache for client connections will expire (and close) entries in LRU fashion.

[apurtell]

PHOENIX-3611 Cache for client connections will expire (and close) entries in 
LRU fashion.

Signed-off-by: Andrew Purtell 


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

Branch: refs/heads/4.x-HBase-1.1
Commit: d75458fee60fc16661b9394a9e93824d8c3c0363
Parents: 59e5115
Author: Geoffrey 
Authored: Thu Jan 19 16:08:20 2017 -0800
Committer: Andrew Purtell 
Committed: Fri Jan 20 16:17:19 2017 -0800

--
 .../org/apache/phoenix/jdbc/PhoenixDriver.java  | 99 +---
 .../org/apache/phoenix/query/QueryServices.java |  5 +-
 .../phoenix/query/QueryServicesOptions.java |  2 +
 3 files changed, 70 insertions(+), 36 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/phoenix/blob/d75458fe/phoenix-core/src/main/java/org/apache/phoenix/jdbc/PhoenixDriver.java
--
diff --git 
a/phoenix-core/src/main/java/org/apache/phoenix/jdbc/PhoenixDriver.java 
b/phoenix-core/src/main/java/org/apache/phoenix/jdbc/PhoenixDriver.java
index fa31dd9..b2acacf 100644
--- a/phoenix-core/src/main/java/org/apache/phoenix/jdbc/PhoenixDriver.java
+++ b/phoenix-core/src/main/java/org/apache/phoenix/jdbc/PhoenixDriver.java
@@ -23,20 +23,13 @@ import java.sql.Connection;
 import java.sql.DriverManager;
 import java.sql.SQLException;
 import java.util.Properties;
-import java.util.concurrent.ConcurrentHashMap;
-import java.util.concurrent.ConcurrentMap;
-import java.util.concurrent.ExecutionException;
-import java.util.concurrent.ExecutorService;
-import java.util.concurrent.Executors;
-import java.util.concurrent.Future;
-import java.util.concurrent.ThreadFactory;
-import java.util.concurrent.TimeUnit;
-import java.util.concurrent.TimeoutException;
+import java.util.concurrent.*;
 import java.util.concurrent.locks.ReadWriteLock;
 import java.util.concurrent.locks.ReentrantReadWriteLock;
 
 import javax.annotation.concurrent.GuardedBy;
 
+import com.google.common.cache.*;
 import org.apache.hadoop.conf.Configuration;
 import org.apache.phoenix.exception.SQLExceptionCode;
 import org.apache.phoenix.exception.SQLExceptionInfo;
@@ -50,7 +43,6 @@ import org.apache.phoenix.query.QueryServicesOptions;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import com.google.common.annotations.VisibleForTesting;
 import com.google.common.util.concurrent.ThreadFactoryBuilder;
 
 
@@ -147,13 +139,43 @@ public final class PhoenixDriver extends 
PhoenixEmbeddedDriver {
 }
 
 // One entry per cluster here
-private final ConcurrentMap 
connectionQueryServicesMap = new 
ConcurrentHashMap(3);
+private final Cache 
connectionQueryServicesCache =
+initializeConnectionCache();
 
 public PhoenixDriver() { // for Squirrel
 // Use production services implementation
 super();
 }
-
+
+private Cache 
initializeConnectionCache() {
+Configuration config = 
HBaseFactoryProvider.getConfigurationFactory().getConfiguration();
+int maxCacheSize = 
config.getInt(QueryServices.CLIENT_CONNECTION_CACHE_MAX_SIZE,
+QueryServicesOptions.DEFAULT_CLIENT_CONNECTION_CACHE_MAX_SIZE);
+int maxCacheDuration = 
config.getInt(QueryServices.CLIENT_CONNECTION_CACHE_MAX_DURATION_MILLISECONDS,
+QueryServicesOptions.DEFAULT_CLIENT_CONNECTION_CACHE_MAX_DURATION);
+RemovalListener 
cacheRemovalListener =
+new RemovalListener() {
+@Override
+public void onRemoval(RemovalNotification notification) {
+String connInfoIdentifier = 
notification.getKey().toString();
+logger.debug("Expiring " + connInfoIdentifier + " because 
of "
++ notification.getCause().name());
+
+try {
+notification.getValue().close();
+}
+catch (SQLException se) {
+logger.error("Error while closing expired cache 
connection " + connInfoIdentifier, se);
+}
+}
+};
+return CacheBuilder.newBuilder()
+.maximumSize(maxCacheSize)
+.expireAfterAccess(maxCacheDuration, TimeUnit.MILLISECONDS)
+.removalListener(cacheRemovalListener)
+

[1/3] phoenix git commit: PHOENIX-3611 Cache for client connections will expire (and close) entries in LRU fashion.

[apurtell]

Repository: phoenix
Updated Branches:
  refs/heads/4.x-HBase-0.98 2fd9b0861 -> badb9b40b
  refs/heads/4.x-HBase-1.1 59e5115c1 -> d75458fee
  refs/heads/master 4e4f7ddba -> 9b7f3ca5b


PHOENIX-3611 Cache for client connections will expire (and close) entries in 
LRU fashion.

Signed-off-by: Andrew Purtell 


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

Branch: refs/heads/master
Commit: 9b7f3ca5b2e6bbf0757d99fbe48b3065e79d6066
Parents: 4e4f7dd
Author: Geoffrey 
Authored: Thu Jan 19 16:08:20 2017 -0800
Committer: Andrew Purtell 
Committed: Fri Jan 20 16:16:50 2017 -0800

--
 .../org/apache/phoenix/jdbc/PhoenixDriver.java  | 99 +---
 .../org/apache/phoenix/query/QueryServices.java |  5 +-
 .../phoenix/query/QueryServicesOptions.java |  2 +
 3 files changed, 70 insertions(+), 36 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/phoenix/blob/9b7f3ca5/phoenix-core/src/main/java/org/apache/phoenix/jdbc/PhoenixDriver.java
--
diff --git 
a/phoenix-core/src/main/java/org/apache/phoenix/jdbc/PhoenixDriver.java 
b/phoenix-core/src/main/java/org/apache/phoenix/jdbc/PhoenixDriver.java
index fa31dd9..b2acacf 100644
--- a/phoenix-core/src/main/java/org/apache/phoenix/jdbc/PhoenixDriver.java
+++ b/phoenix-core/src/main/java/org/apache/phoenix/jdbc/PhoenixDriver.java
@@ -23,20 +23,13 @@ import java.sql.Connection;
 import java.sql.DriverManager;
 import java.sql.SQLException;
 import java.util.Properties;
-import java.util.concurrent.ConcurrentHashMap;
-import java.util.concurrent.ConcurrentMap;
-import java.util.concurrent.ExecutionException;
-import java.util.concurrent.ExecutorService;
-import java.util.concurrent.Executors;
-import java.util.concurrent.Future;
-import java.util.concurrent.ThreadFactory;
-import java.util.concurrent.TimeUnit;
-import java.util.concurrent.TimeoutException;
+import java.util.concurrent.*;
 import java.util.concurrent.locks.ReadWriteLock;
 import java.util.concurrent.locks.ReentrantReadWriteLock;
 
 import javax.annotation.concurrent.GuardedBy;
 
+import com.google.common.cache.*;
 import org.apache.hadoop.conf.Configuration;
 import org.apache.phoenix.exception.SQLExceptionCode;
 import org.apache.phoenix.exception.SQLExceptionInfo;
@@ -50,7 +43,6 @@ import org.apache.phoenix.query.QueryServicesOptions;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import com.google.common.annotations.VisibleForTesting;
 import com.google.common.util.concurrent.ThreadFactoryBuilder;
 
 
@@ -147,13 +139,43 @@ public final class PhoenixDriver extends 
PhoenixEmbeddedDriver {
 }
 
 // One entry per cluster here
-private final ConcurrentMap 
connectionQueryServicesMap = new 
ConcurrentHashMap(3);
+private final Cache 
connectionQueryServicesCache =
+initializeConnectionCache();
 
 public PhoenixDriver() { // for Squirrel
 // Use production services implementation
 super();
 }
-
+
+private Cache 
initializeConnectionCache() {
+Configuration config = 
HBaseFactoryProvider.getConfigurationFactory().getConfiguration();
+int maxCacheSize = 
config.getInt(QueryServices.CLIENT_CONNECTION_CACHE_MAX_SIZE,
+QueryServicesOptions.DEFAULT_CLIENT_CONNECTION_CACHE_MAX_SIZE);
+int maxCacheDuration = 
config.getInt(QueryServices.CLIENT_CONNECTION_CACHE_MAX_DURATION_MILLISECONDS,
+QueryServicesOptions.DEFAULT_CLIENT_CONNECTION_CACHE_MAX_DURATION);
+RemovalListener 
cacheRemovalListener =
+new RemovalListener() {
+@Override
+public void onRemoval(RemovalNotification notification) {
+String connInfoIdentifier = 
notification.getKey().toString();
+logger.debug("Expiring " + connInfoIdentifier + " because 
of "
++ notification.getCause().name());
+
+try {
+notification.getValue().close();
+}
+catch (SQLException se) {
+logger.error("Error while closing expired cache 
connection " + connInfoIdentifier, se);
+}
+}
+};
+return CacheBuilder.newBuilder()

Apache-Phoenix | 4.8-HBase-1.1 | Build Successful

[Apache Jenkins Server]

4.8-HBase-1.1 branch build status Successful

Source repository https://git-wip-us.apache.org/repos/asf?p=phoenix.git;a=shortlog;h=refs/heads/4.8-HBase-1.1

Compiled Artifacts https://builds.apache.org/job/Phoenix-4.8-HBase-1.1/lastSuccessfulBuild/artifact/

Test Report https://builds.apache.org/job/Phoenix-4.8-HBase-1.1/lastCompletedBuild/testReport/

Changes
[rajeshbabu] PHOENIX-3613 Avoid possible SQL Injection with proper input



Build times for last couple of runsLatest build time is the right most | Legend blue: normal, red: test failure, gray: timeout

Jenkins build is back to normal : Phoenix-4.8-HBase-0.98 #62

[Apache Jenkins Server]

See 

Apache-Phoenix | 4.8-HBase-1.0 | Build Successful

[Apache Jenkins Server]

4.8-HBase-1.0 branch build status Successful

Source repository https://git-wip-us.apache.org/repos/asf?p=phoenix.git;a=shortlog;h=refs/heads/4.8-HBase-1.0

Compiled Artifacts https://builds.apache.org/job/Phoenix-4.8-HBase-1.0/lastSuccessfulBuild/artifact/

Test Report https://builds.apache.org/job/Phoenix-4.8-HBase-1.0/lastCompletedBuild/testReport/

Changes
[rajeshbabu] PHOENIX-3613 Avoid possible SQL Injection with proper input



Build times for last couple of runsLatest build time is the right most | Legend blue: normal, red: test failure, gray: timeout

Build failed in Jenkins: Phoenix | Master #1538

[Apache Jenkins Server]

See 

Changes:

[rajeshbabu] PHOENIX-3613 Avoid possible SQL Injection with proper input

--
[...truncated 766 lines...]
Running org.apache.phoenix.iterate.PhoenixQueryTimeoutIT
Tests run: 8, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 51.955 sec - in 
org.apache.phoenix.end2end.index.txn.RollbackIT
Running org.apache.phoenix.iterate.RoundRobinResultIteratorIT
Tests run: 6, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 26.338 sec - in 
org.apache.phoenix.end2end.salted.SaltedTableUpsertSelectIT
Running org.apache.phoenix.rpc.UpdateCacheIT
Tests run: 2, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 4.965 sec - in 
org.apache.phoenix.iterate.PhoenixQueryTimeoutIT
Running org.apache.phoenix.trace.PhoenixTableMetricsWriterIT
Tests run: 2, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 4.521 sec - in 
org.apache.phoenix.trace.PhoenixTableMetricsWriterIT
Running org.apache.phoenix.trace.PhoenixTraceReaderIT
Tests run: 2, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 4.651 sec - in 
org.apache.phoenix.trace.PhoenixTraceReaderIT
Running org.apache.phoenix.trace.PhoenixTracingEndToEndIT
Tests run: 7, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 28.294 sec - in 
org.apache.phoenix.rpc.UpdateCacheIT
Running org.apache.phoenix.tx.FlappingTransactionIT
Tests run: 4, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 9.583 sec - in 
org.apache.phoenix.tx.FlappingTransactionIT
Tests run: 9, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 50.253 sec - in 
org.apache.phoenix.iterate.RoundRobinResultIteratorIT
Running org.apache.phoenix.tx.TransactionIT
Tests run: 6, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 88.918 sec - in 
org.apache.phoenix.trace.PhoenixTracingEndToEndIT
Running org.apache.phoenix.tx.TxCheckpointIT
Tests run: 19, Failures: 0, Errors: 1, Skipped: 1, Time elapsed: 95.745 sec <<< 
FAILURE! - in org.apache.phoenix.tx.TransactionIT
testNonTxToTxTable(org.apache.phoenix.tx.TransactionIT)  Time elapsed: 2.271 
sec  <<< ERROR!
org.apache.phoenix.schema.TableAlreadyExistsException: ERROR 1013 (42M04): 
Table already exists. tableName=IDX
at 
org.apache.phoenix.tx.TransactionIT.testNonTxToTxTable(TransactionIT.java:266)

Tests run: 20, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 144.855 sec - 
in org.apache.phoenix.tx.TxCheckpointIT
Tests run: 66, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 453.855 sec - 
in org.apache.phoenix.end2end.index.IndexExpressionIT
Tests run: 99, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 1,080.061 sec 
- in org.apache.phoenix.end2end.HashJoinIT
Tests run: 40, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 543.279 sec - 
in org.apache.phoenix.end2end.index.MutableIndexIT
Tests run: 102, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 1,105.53 sec 
- in org.apache.phoenix.end2end.SortMergeJoinIT
Tests run: 152, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 1,013.348 sec 
- in org.apache.phoenix.end2end.index.IndexIT

Results :

Tests in error: 
  TransactionIT.testNonTxToTxTable:266 » TableAlreadyExists ERROR 1013 (42M04): 
...

Tests run: 1651, Failures: 0, Errors: 1, Skipped: 1

[INFO] 
[INFO] --- maven-failsafe-plugin:2.19.1:integration-test 
(ClientManagedTimeTests) @ phoenix-core ---

---
 T E S T S
---
Running org.apache.phoenix.end2end.ColumnProjectionOptimizationIT
Running org.apache.phoenix.end2end.AggregateQueryIT
Running org.apache.phoenix.end2end.CaseStatementIT
Running org.apache.phoenix.end2end.CreateSchemaIT
Running org.apache.phoenix.end2end.ArrayIT
Running org.apache.phoenix.end2end.ClientTimeArithmeticQueryIT
Tests run: 1, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 0.498 sec - in 
org.apache.phoenix.end2end.CreateSchemaIT
Running org.apache.phoenix.end2end.CustomEntityDataIT
Running org.apache.phoenix.end2end.CreateTableIT
Running org.apache.phoenix.end2end.CastAndCoerceIT
Tests run: 3, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 6.344 sec - in 
org.apache.phoenix.end2end.CustomEntityDataIT
Running org.apache.phoenix.end2end.DerivedTableIT
Tests run: 3, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 29.399 sec - in 
org.apache.phoenix.end2end.ColumnProjectionOptimizationIT
Running org.apache.phoenix.end2end.DistinctCountIT
Tests run: 18, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 21.339 sec - 
in org.apache.phoenix.end2end.DerivedTableIT
Running org.apache.phoenix.end2end.DropSchemaIT
Tests run: 2, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 11.026 sec - in 
org.apache.phoenix.end2end.DropSchemaIT
Running org.apache.phoenix.end2end.ExtendedQueryExecIT
Tests run: 49, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 42.534 sec - 
in org.apache.phoenix.end2end.CastAndCoerceIT
Running org.apache.phoenix.end2end.FunkyNamesIT
Tests run: 63, Failures: 0, Errors: 0, Skipped: 0, 

phoenix git commit: PHOENIX-3613 Avoid possible SQL Injection with proper input validations(Rajeshbabu)

[rajeshbabu]

Repository: phoenix
Updated Branches:
  refs/heads/4.8-HBase-1.2 ffa6476cb -> 23ffd4153


PHOENIX-3613 Avoid possible SQL Injection with proper input 
validations(Rajeshbabu)


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

Branch: refs/heads/4.8-HBase-1.2
Commit: 23ffd4153bbc5ab29aab57c3011da45550dac682
Parents: ffa6476
Author: Rajeshbabu Chintaguntla 
Authored: Fri Jan 20 23:14:47 2017 +0530
Committer: Rajeshbabu Chintaguntla 
Committed: Fri Jan 20 23:14:47 2017 +0530

--
 .../tracingwebapp/http/EntityFactory.java   | 19 +-
 .../tracingwebapp/http/TraceServlet.java| 21 ++--
 2 files changed, 20 insertions(+), 20 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/phoenix/blob/23ffd415/phoenix-tracing-webapp/src/main/java/org/apache/phoenix/tracingwebapp/http/EntityFactory.java
--
diff --git 
a/phoenix-tracing-webapp/src/main/java/org/apache/phoenix/tracingwebapp/http/EntityFactory.java
 
b/phoenix-tracing-webapp/src/main/java/org/apache/phoenix/tracingwebapp/http/EntityFactory.java
index afb6312..a17630d 100644
--- 
a/phoenix-tracing-webapp/src/main/java/org/apache/phoenix/tracingwebapp/http/EntityFactory.java
+++ 
b/phoenix-tracing-webapp/src/main/java/org/apache/phoenix/tracingwebapp/http/EntityFactory.java
@@ -39,29 +39,12 @@ public class EntityFactory {
 this.connection = connection;
   }
 
-  public Map findSingle(Object[] params) throws SQLException {
-List> objects = this.findMultiple(params);
-
-if (objects.size() != 1) {
-  throw new SQLException("Query did not produce one object it produced: "
-  + objects.size() + " objects.");
-}
-
-Map object = objects.get(0); // get first record;
-
-return object;
-  }
-
-  public List> findMultiple(Object[] params)
+  public List> findMultiple()
   throws SQLException {
 ResultSet rs = null;
 PreparedStatement ps = null;
 try {
   ps = this.connection.prepareStatement(this.queryString);
-  for (int i = 0; i < params.length; ++i) {
-ps.setObject(1, params[i]);
-  }
-
   rs = ps.executeQuery();
   return getEntitiesFromResultSet(rs);
 } catch (SQLException e) {

http://git-wip-us.apache.org/repos/asf/phoenix/blob/23ffd415/phoenix-tracing-webapp/src/main/java/org/apache/phoenix/tracingwebapp/http/TraceServlet.java
--
diff --git 
a/phoenix-tracing-webapp/src/main/java/org/apache/phoenix/tracingwebapp/http/TraceServlet.java
 
b/phoenix-tracing-webapp/src/main/java/org/apache/phoenix/tracingwebapp/http/TraceServlet.java
index de047ba..c20b20d 100755
--- 
a/phoenix-tracing-webapp/src/main/java/org/apache/phoenix/tracingwebapp/http/TraceServlet.java
+++ 
b/phoenix-tracing-webapp/src/main/java/org/apache/phoenix/tracingwebapp/http/TraceServlet.java
@@ -25,7 +25,7 @@ import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 
 import org.codehaus.jackson.map.ObjectMapper;
-
+import org.apache.phoenix.metrics.MetricInfo;
 import java.sql.Connection;
 import java.sql.SQLException;
 import java.util.List;
@@ -82,6 +82,11 @@ public class TraceServlet extends HttpServlet {
 if(limit == null) {
   limit = DEFAULT_LIMIT;
 }
+try{
+Long.parseLong(limit);
+} catch (NumberFormatException e) {
+   throw new RuntimeException("The LIMIT passed to the query is not a 
number.", e);
+}
 String sqlQuery = "SELECT * FROM " + TRACING_TABLE + " LIMIT "+limit;
 json = getResults(sqlQuery);
 return getJson(json);
@@ -93,6 +98,8 @@ public class TraceServlet extends HttpServlet {
 if(countby == null) {
   countby = DEFAULT_COUNTBY;
 }
+// Throws exception if the column not present in the trace table.
+MetricInfo.getColumnName(countby.toLowerCase());
 String sqlQuery = "SELECT "+countby+", COUNT(*) AS count FROM " + 
TRACING_TABLE + " GROUP BY "+countby+" HAVING COUNT(*) > 1 ";
 json = getResults(sqlQuery);
 return json;
@@ -102,6 +109,16 @@ public class TraceServlet extends HttpServlet {
   protected String searchTrace(String parentId, String traceId,String logic) {
 String json = null;
 String query = null;
+// Check the parent Id, trace id type or long or not.
+try {
+Long.parseLong(parentId);
+Long.parseLong(traceId);
+} catch (NumberFormatException e) {
+   throw new 

phoenix git commit: PHOENIX-3613 Avoid possible SQL Injection with proper input validations(Rajeshbabu)

[rajeshbabu]

Repository: phoenix
Updated Branches:
  refs/heads/4.8-HBase-1.1 2939ca123 -> 9d64bc3ee


PHOENIX-3613 Avoid possible SQL Injection with proper input 
validations(Rajeshbabu)


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

Branch: refs/heads/4.8-HBase-1.1
Commit: 9d64bc3ee29cf18fda7cea548e0d36dbc2f12119
Parents: 2939ca1
Author: Rajeshbabu Chintaguntla 
Authored: Fri Jan 20 23:15:25 2017 +0530
Committer: Rajeshbabu Chintaguntla 
Committed: Fri Jan 20 23:15:25 2017 +0530

--
 .../tracingwebapp/http/EntityFactory.java   | 19 +-
 .../tracingwebapp/http/TraceServlet.java| 21 ++--
 2 files changed, 20 insertions(+), 20 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/phoenix/blob/9d64bc3e/phoenix-tracing-webapp/src/main/java/org/apache/phoenix/tracingwebapp/http/EntityFactory.java
--
diff --git 
a/phoenix-tracing-webapp/src/main/java/org/apache/phoenix/tracingwebapp/http/EntityFactory.java
 
b/phoenix-tracing-webapp/src/main/java/org/apache/phoenix/tracingwebapp/http/EntityFactory.java
index afb6312..a17630d 100644
--- 
a/phoenix-tracing-webapp/src/main/java/org/apache/phoenix/tracingwebapp/http/EntityFactory.java
+++ 
b/phoenix-tracing-webapp/src/main/java/org/apache/phoenix/tracingwebapp/http/EntityFactory.java
@@ -39,29 +39,12 @@ public class EntityFactory {
 this.connection = connection;
   }
 
-  public Map findSingle(Object[] params) throws SQLException {
-List> objects = this.findMultiple(params);
-
-if (objects.size() != 1) {
-  throw new SQLException("Query did not produce one object it produced: "
-  + objects.size() + " objects.");
-}
-
-Map object = objects.get(0); // get first record;
-
-return object;
-  }
-
-  public List> findMultiple(Object[] params)
+  public List> findMultiple()
   throws SQLException {
 ResultSet rs = null;
 PreparedStatement ps = null;
 try {
   ps = this.connection.prepareStatement(this.queryString);
-  for (int i = 0; i < params.length; ++i) {
-ps.setObject(1, params[i]);
-  }
-
   rs = ps.executeQuery();
   return getEntitiesFromResultSet(rs);
 } catch (SQLException e) {

http://git-wip-us.apache.org/repos/asf/phoenix/blob/9d64bc3e/phoenix-tracing-webapp/src/main/java/org/apache/phoenix/tracingwebapp/http/TraceServlet.java
--
diff --git 
a/phoenix-tracing-webapp/src/main/java/org/apache/phoenix/tracingwebapp/http/TraceServlet.java
 
b/phoenix-tracing-webapp/src/main/java/org/apache/phoenix/tracingwebapp/http/TraceServlet.java
index de047ba..c20b20d 100755
--- 
a/phoenix-tracing-webapp/src/main/java/org/apache/phoenix/tracingwebapp/http/TraceServlet.java
+++ 
b/phoenix-tracing-webapp/src/main/java/org/apache/phoenix/tracingwebapp/http/TraceServlet.java
@@ -25,7 +25,7 @@ import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 
 import org.codehaus.jackson.map.ObjectMapper;
-
+import org.apache.phoenix.metrics.MetricInfo;
 import java.sql.Connection;
 import java.sql.SQLException;
 import java.util.List;
@@ -82,6 +82,11 @@ public class TraceServlet extends HttpServlet {
 if(limit == null) {
   limit = DEFAULT_LIMIT;
 }
+try{
+Long.parseLong(limit);
+} catch (NumberFormatException e) {
+   throw new RuntimeException("The LIMIT passed to the query is not a 
number.", e);
+}
 String sqlQuery = "SELECT * FROM " + TRACING_TABLE + " LIMIT "+limit;
 json = getResults(sqlQuery);
 return getJson(json);
@@ -93,6 +98,8 @@ public class TraceServlet extends HttpServlet {
 if(countby == null) {
   countby = DEFAULT_COUNTBY;
 }
+// Throws exception if the column not present in the trace table.
+MetricInfo.getColumnName(countby.toLowerCase());
 String sqlQuery = "SELECT "+countby+", COUNT(*) AS count FROM " + 
TRACING_TABLE + " GROUP BY "+countby+" HAVING COUNT(*) > 1 ";
 json = getResults(sqlQuery);
 return json;
@@ -102,6 +109,16 @@ public class TraceServlet extends HttpServlet {
   protected String searchTrace(String parentId, String traceId,String logic) {
 String json = null;
 String query = null;
+// Check the parent Id, trace id type or long or not.
+try {
+Long.parseLong(parentId);
+Long.parseLong(traceId);
+} catch (NumberFormatException e) {
+   throw new 

phoenix git commit: PHOENIX-3613 Avoid possible SQL Injection with proper input validations(Rajeshbabu)

[rajeshbabu]

Repository: phoenix
Updated Branches:
  refs/heads/4.x-HBase-1.1 7936c2be2 -> 59e5115c1


PHOENIX-3613 Avoid possible SQL Injection with proper input 
validations(Rajeshbabu)


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

Branch: refs/heads/4.x-HBase-1.1
Commit: 59e5115c12dad2e95fa791a2248c7659b5757c99
Parents: 7936c2b
Author: Rajeshbabu Chintaguntla 
Authored: Fri Jan 20 23:12:50 2017 +0530
Committer: Rajeshbabu Chintaguntla 
Committed: Fri Jan 20 23:12:50 2017 +0530

--
 .../tracingwebapp/http/EntityFactory.java   | 19 +-
 .../tracingwebapp/http/TraceServlet.java| 21 ++--
 2 files changed, 20 insertions(+), 20 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/phoenix/blob/59e5115c/phoenix-tracing-webapp/src/main/java/org/apache/phoenix/tracingwebapp/http/EntityFactory.java
--
diff --git 
a/phoenix-tracing-webapp/src/main/java/org/apache/phoenix/tracingwebapp/http/EntityFactory.java
 
b/phoenix-tracing-webapp/src/main/java/org/apache/phoenix/tracingwebapp/http/EntityFactory.java
index afb6312..a17630d 100644
--- 
a/phoenix-tracing-webapp/src/main/java/org/apache/phoenix/tracingwebapp/http/EntityFactory.java
+++ 
b/phoenix-tracing-webapp/src/main/java/org/apache/phoenix/tracingwebapp/http/EntityFactory.java
@@ -39,29 +39,12 @@ public class EntityFactory {
 this.connection = connection;
   }
 
-  public Map findSingle(Object[] params) throws SQLException {
-List> objects = this.findMultiple(params);
-
-if (objects.size() != 1) {
-  throw new SQLException("Query did not produce one object it produced: "
-  + objects.size() + " objects.");
-}
-
-Map object = objects.get(0); // get first record;
-
-return object;
-  }
-
-  public List> findMultiple(Object[] params)
+  public List> findMultiple()
   throws SQLException {
 ResultSet rs = null;
 PreparedStatement ps = null;
 try {
   ps = this.connection.prepareStatement(this.queryString);
-  for (int i = 0; i < params.length; ++i) {
-ps.setObject(1, params[i]);
-  }
-
   rs = ps.executeQuery();
   return getEntitiesFromResultSet(rs);
 } catch (SQLException e) {

http://git-wip-us.apache.org/repos/asf/phoenix/blob/59e5115c/phoenix-tracing-webapp/src/main/java/org/apache/phoenix/tracingwebapp/http/TraceServlet.java
--
diff --git 
a/phoenix-tracing-webapp/src/main/java/org/apache/phoenix/tracingwebapp/http/TraceServlet.java
 
b/phoenix-tracing-webapp/src/main/java/org/apache/phoenix/tracingwebapp/http/TraceServlet.java
index de047ba..c20b20d 100755
--- 
a/phoenix-tracing-webapp/src/main/java/org/apache/phoenix/tracingwebapp/http/TraceServlet.java
+++ 
b/phoenix-tracing-webapp/src/main/java/org/apache/phoenix/tracingwebapp/http/TraceServlet.java
@@ -25,7 +25,7 @@ import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 
 import org.codehaus.jackson.map.ObjectMapper;
-
+import org.apache.phoenix.metrics.MetricInfo;
 import java.sql.Connection;
 import java.sql.SQLException;
 import java.util.List;
@@ -82,6 +82,11 @@ public class TraceServlet extends HttpServlet {
 if(limit == null) {
   limit = DEFAULT_LIMIT;
 }
+try{
+Long.parseLong(limit);
+} catch (NumberFormatException e) {
+   throw new RuntimeException("The LIMIT passed to the query is not a 
number.", e);
+}
 String sqlQuery = "SELECT * FROM " + TRACING_TABLE + " LIMIT "+limit;
 json = getResults(sqlQuery);
 return getJson(json);
@@ -93,6 +98,8 @@ public class TraceServlet extends HttpServlet {
 if(countby == null) {
   countby = DEFAULT_COUNTBY;
 }
+// Throws exception if the column not present in the trace table.
+MetricInfo.getColumnName(countby.toLowerCase());
 String sqlQuery = "SELECT "+countby+", COUNT(*) AS count FROM " + 
TRACING_TABLE + " GROUP BY "+countby+" HAVING COUNT(*) > 1 ";
 json = getResults(sqlQuery);
 return json;
@@ -102,6 +109,16 @@ public class TraceServlet extends HttpServlet {
   protected String searchTrace(String parentId, String traceId,String logic) {
 String json = null;
 String query = null;
+// Check the parent Id, trace id type or long or not.
+try {
+Long.parseLong(parentId);
+Long.parseLong(traceId);
+} catch (NumberFormatException e) {
+   throw new 

phoenix git commit: PHOENIX-3613 Avoid possible SQL Injection with proper input validations(Rajeshbabu)

[rajeshbabu]

Repository: phoenix
Updated Branches:
  refs/heads/4.x-HBase-0.98 88078fd5e -> 2fd9b0861


PHOENIX-3613 Avoid possible SQL Injection with proper input 
validations(Rajeshbabu)


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

Branch: refs/heads/4.x-HBase-0.98
Commit: 2fd9b08614606004f56fa19885406e97e7e4ea80
Parents: 88078fd
Author: Rajeshbabu Chintaguntla 
Authored: Fri Jan 20 23:13:32 2017 +0530
Committer: Rajeshbabu Chintaguntla 
Committed: Fri Jan 20 23:13:32 2017 +0530

--
 .../tracingwebapp/http/EntityFactory.java   | 19 +-
 .../tracingwebapp/http/TraceServlet.java| 21 ++--
 2 files changed, 20 insertions(+), 20 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/phoenix/blob/2fd9b086/phoenix-tracing-webapp/src/main/java/org/apache/phoenix/tracingwebapp/http/EntityFactory.java
--
diff --git 
a/phoenix-tracing-webapp/src/main/java/org/apache/phoenix/tracingwebapp/http/EntityFactory.java
 
b/phoenix-tracing-webapp/src/main/java/org/apache/phoenix/tracingwebapp/http/EntityFactory.java
index afb6312..a17630d 100644
--- 
a/phoenix-tracing-webapp/src/main/java/org/apache/phoenix/tracingwebapp/http/EntityFactory.java
+++ 
b/phoenix-tracing-webapp/src/main/java/org/apache/phoenix/tracingwebapp/http/EntityFactory.java
@@ -39,29 +39,12 @@ public class EntityFactory {
 this.connection = connection;
   }
 
-  public Map findSingle(Object[] params) throws SQLException {
-List> objects = this.findMultiple(params);
-
-if (objects.size() != 1) {
-  throw new SQLException("Query did not produce one object it produced: "
-  + objects.size() + " objects.");
-}
-
-Map object = objects.get(0); // get first record;
-
-return object;
-  }
-
-  public List> findMultiple(Object[] params)
+  public List> findMultiple()
   throws SQLException {
 ResultSet rs = null;
 PreparedStatement ps = null;
 try {
   ps = this.connection.prepareStatement(this.queryString);
-  for (int i = 0; i < params.length; ++i) {
-ps.setObject(1, params[i]);
-  }
-
   rs = ps.executeQuery();
   return getEntitiesFromResultSet(rs);
 } catch (SQLException e) {

http://git-wip-us.apache.org/repos/asf/phoenix/blob/2fd9b086/phoenix-tracing-webapp/src/main/java/org/apache/phoenix/tracingwebapp/http/TraceServlet.java
--
diff --git 
a/phoenix-tracing-webapp/src/main/java/org/apache/phoenix/tracingwebapp/http/TraceServlet.java
 
b/phoenix-tracing-webapp/src/main/java/org/apache/phoenix/tracingwebapp/http/TraceServlet.java
index de047ba..c20b20d 100755
--- 
a/phoenix-tracing-webapp/src/main/java/org/apache/phoenix/tracingwebapp/http/TraceServlet.java
+++ 
b/phoenix-tracing-webapp/src/main/java/org/apache/phoenix/tracingwebapp/http/TraceServlet.java
@@ -25,7 +25,7 @@ import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 
 import org.codehaus.jackson.map.ObjectMapper;
-
+import org.apache.phoenix.metrics.MetricInfo;
 import java.sql.Connection;
 import java.sql.SQLException;
 import java.util.List;
@@ -82,6 +82,11 @@ public class TraceServlet extends HttpServlet {
 if(limit == null) {
   limit = DEFAULT_LIMIT;
 }
+try{
+Long.parseLong(limit);
+} catch (NumberFormatException e) {
+   throw new RuntimeException("The LIMIT passed to the query is not a 
number.", e);
+}
 String sqlQuery = "SELECT * FROM " + TRACING_TABLE + " LIMIT "+limit;
 json = getResults(sqlQuery);
 return getJson(json);
@@ -93,6 +98,8 @@ public class TraceServlet extends HttpServlet {
 if(countby == null) {
   countby = DEFAULT_COUNTBY;
 }
+// Throws exception if the column not present in the trace table.
+MetricInfo.getColumnName(countby.toLowerCase());
 String sqlQuery = "SELECT "+countby+", COUNT(*) AS count FROM " + 
TRACING_TABLE + " GROUP BY "+countby+" HAVING COUNT(*) > 1 ";
 json = getResults(sqlQuery);
 return json;
@@ -102,6 +109,16 @@ public class TraceServlet extends HttpServlet {
   protected String searchTrace(String parentId, String traceId,String logic) {
 String json = null;
 String query = null;
+// Check the parent Id, trace id type or long or not.
+try {
+Long.parseLong(parentId);
+Long.parseLong(traceId);
+} catch (NumberFormatException e) {
+   throw new 

phoenix git commit: PHOENIX-3613 Avoid possible SQL Injection with proper input validations(Rajeshbabu)

[rajeshbabu]

Repository: phoenix
Updated Branches:
  refs/heads/master e7ef25eca -> 4e4f7ddba


PHOENIX-3613 Avoid possible SQL Injection with proper input 
validations(Rajeshbabu)


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

Branch: refs/heads/master
Commit: 4e4f7ddba9bddec94793e92698346dedfb520c9e
Parents: e7ef25e
Author: Rajeshbabu Chintaguntla 
Authored: Fri Jan 20 23:11:43 2017 +0530
Committer: Rajeshbabu Chintaguntla 
Committed: Fri Jan 20 23:11:43 2017 +0530

--
 .../tracingwebapp/http/EntityFactory.java   | 19 +-
 .../tracingwebapp/http/TraceServlet.java| 21 ++--
 2 files changed, 20 insertions(+), 20 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/phoenix/blob/4e4f7ddb/phoenix-tracing-webapp/src/main/java/org/apache/phoenix/tracingwebapp/http/EntityFactory.java
--
diff --git 
a/phoenix-tracing-webapp/src/main/java/org/apache/phoenix/tracingwebapp/http/EntityFactory.java
 
b/phoenix-tracing-webapp/src/main/java/org/apache/phoenix/tracingwebapp/http/EntityFactory.java
index afb6312..a17630d 100644
--- 
a/phoenix-tracing-webapp/src/main/java/org/apache/phoenix/tracingwebapp/http/EntityFactory.java
+++ 
b/phoenix-tracing-webapp/src/main/java/org/apache/phoenix/tracingwebapp/http/EntityFactory.java
@@ -39,29 +39,12 @@ public class EntityFactory {
 this.connection = connection;
   }
 
-  public Map findSingle(Object[] params) throws SQLException {
-List> objects = this.findMultiple(params);
-
-if (objects.size() != 1) {
-  throw new SQLException("Query did not produce one object it produced: "
-  + objects.size() + " objects.");
-}
-
-Map object = objects.get(0); // get first record;
-
-return object;
-  }
-
-  public List> findMultiple(Object[] params)
+  public List> findMultiple()
   throws SQLException {
 ResultSet rs = null;
 PreparedStatement ps = null;
 try {
   ps = this.connection.prepareStatement(this.queryString);
-  for (int i = 0; i < params.length; ++i) {
-ps.setObject(1, params[i]);
-  }
-
   rs = ps.executeQuery();
   return getEntitiesFromResultSet(rs);
 } catch (SQLException e) {

http://git-wip-us.apache.org/repos/asf/phoenix/blob/4e4f7ddb/phoenix-tracing-webapp/src/main/java/org/apache/phoenix/tracingwebapp/http/TraceServlet.java
--
diff --git 
a/phoenix-tracing-webapp/src/main/java/org/apache/phoenix/tracingwebapp/http/TraceServlet.java
 
b/phoenix-tracing-webapp/src/main/java/org/apache/phoenix/tracingwebapp/http/TraceServlet.java
index de047ba..c20b20d 100755
--- 
a/phoenix-tracing-webapp/src/main/java/org/apache/phoenix/tracingwebapp/http/TraceServlet.java
+++ 
b/phoenix-tracing-webapp/src/main/java/org/apache/phoenix/tracingwebapp/http/TraceServlet.java
@@ -25,7 +25,7 @@ import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 
 import org.codehaus.jackson.map.ObjectMapper;
-
+import org.apache.phoenix.metrics.MetricInfo;
 import java.sql.Connection;
 import java.sql.SQLException;
 import java.util.List;
@@ -82,6 +82,11 @@ public class TraceServlet extends HttpServlet {
 if(limit == null) {
   limit = DEFAULT_LIMIT;
 }
+try{
+Long.parseLong(limit);
+} catch (NumberFormatException e) {
+   throw new RuntimeException("The LIMIT passed to the query is not a 
number.", e);
+}
 String sqlQuery = "SELECT * FROM " + TRACING_TABLE + " LIMIT "+limit;
 json = getResults(sqlQuery);
 return getJson(json);
@@ -93,6 +98,8 @@ public class TraceServlet extends HttpServlet {
 if(countby == null) {
   countby = DEFAULT_COUNTBY;
 }
+// Throws exception if the column not present in the trace table.
+MetricInfo.getColumnName(countby.toLowerCase());
 String sqlQuery = "SELECT "+countby+", COUNT(*) AS count FROM " + 
TRACING_TABLE + " GROUP BY "+countby+" HAVING COUNT(*) > 1 ";
 json = getResults(sqlQuery);
 return json;
@@ -102,6 +109,16 @@ public class TraceServlet extends HttpServlet {
   protected String searchTrace(String parentId, String traceId,String logic) {
 String json = null;
 String query = null;
+// Check the parent Id, trace id type or long or not.
+try {
+Long.parseLong(parentId);
+Long.parseLong(traceId);
+} catch (NumberFormatException e) {
+   throw new RuntimeException("The passed 

Apache-Phoenix | Master | Build Successful

[Apache Jenkins Server]

Master branch build status Successful
Source repository https://git-wip-us.apache.org/repos/asf?p=phoenix.git;a=shortlog;h=refs/heads/master

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

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

Changes
[rajeshbabu] PHOENIX-3608 KeyRange interset should return EMPTY_RANGE when one of it



Build times for last couple of runsLatest build time is the right most | Legend blue: normal, red: test failure, gray: timeout

Apache-Phoenix | 4.x-HBase-0.98 | Build Successful

[Apache Jenkins Server]

4.x-HBase-0.98 branch build status Successful

Source repository https://git-wip-us.apache.org/repos/asf?p=phoenix.git;a=shortlog;h=refs/heads/4.x-HBase-0.98

Compiled Artifacts https://builds.apache.org/job/Phoenix-4.x-HBase-0.98/lastSuccessfulBuild/artifact/

Test Report https://builds.apache.org/job/Phoenix-4.x-HBase-0.98/lastCompletedBuild/testReport/

Changes
[rajeshbabu] PHOENIX-3608 KeyRange interset should return EMPTY_RANGE when one of it



Build times for last couple of runsLatest build time is the right most | Legend blue: normal, red: test failure, gray: timeout

Jenkins build is back to normal : Phoenix-4.8-HBase-1.1 #60

[Apache Jenkins Server]

See 

Build failed in Jenkins: Phoenix-4.8-HBase-1.2 #67

[Apache Jenkins Server]

See 

Changes:

[rajeshbabu] PHOENIX-3608 KeyRange interset should return EMPTY_RANGE when one 
of it

--
[...truncated 785 lines...]
Running org.apache.phoenix.tx.TxCheckpointIT
Tests run: 38, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 485.327 sec - 
in org.apache.phoenix.end2end.index.LocalIndexIT
Tests run: 20, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 119.516 sec - 
in org.apache.phoenix.tx.TxCheckpointIT
Tests run: 21, Failures: 0, Errors: 0, Skipped: 1, Time elapsed: 218.679 sec - 
in org.apache.phoenix.tx.TransactionIT
Tests run: 40, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 747.786 sec - 
in org.apache.phoenix.end2end.index.MutableIndexIT
Tests run: 136, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 1,278.388 sec 
- in org.apache.phoenix.end2end.index.IndexIT

Results :

Tests run: 1239, Failures: 0, Errors: 0, Skipped: 5

[INFO] 
[INFO] --- maven-failsafe-plugin:2.19.1:integration-test 
(HBaseManagedTimeTableReuseTest) @ phoenix-core ---

---
 T E S T S
---
Running org.apache.phoenix.end2end.ArithmeticQueryIT
Running org.apache.phoenix.end2end.AbsFunctionEnd2EndIT
Running org.apache.phoenix.end2end.AlterSessionIT
Running org.apache.phoenix.end2end.ArrayToStringFunctionIT
Tests run: 2, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 0.075 sec - in 
org.apache.phoenix.end2end.AlterSessionIT
Running org.apache.phoenix.end2end.ArrayFillFunctionIT
Running org.apache.phoenix.end2end.ArraysWithNullsIT
Tests run: 1, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 2.645 sec - in 
org.apache.phoenix.end2end.AbsFunctionEnd2EndIT
Running org.apache.phoenix.end2end.AutoCommitIT
Tests run: 1, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 1.374 sec - in 
org.apache.phoenix.end2end.AutoCommitIT
Running org.apache.phoenix.end2end.CbrtFunctionEnd2EndIT
Tests run: 2, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 0.305 sec - in 
org.apache.phoenix.end2end.CbrtFunctionEnd2EndIT
Running org.apache.phoenix.end2end.ConvertTimezoneFunctionIT
Tests run: 26, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 16.602 sec - 
in org.apache.phoenix.end2end.ArrayFillFunctionIT
Running org.apache.phoenix.end2end.DecodeFunctionIT
Tests run: 36, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 21.565 sec - 
in org.apache.phoenix.end2end.ArrayToStringFunctionIT
Tests run: 8, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 18.388 sec - in 
org.apache.phoenix.end2end.ConvertTimezoneFunctionIT
Running org.apache.phoenix.end2end.DynamicFamilyIT
Tests run: 6, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 13.737 sec - in 
org.apache.phoenix.end2end.DecodeFunctionIT
Tests run: 4, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 4.672 sec - in 
org.apache.phoenix.end2end.DynamicFamilyIT
Running org.apache.phoenix.end2end.FirstValueFunctionIT
Running org.apache.phoenix.end2end.DynamicUpsertIT
Tests run: 7, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 0.086 sec - in 
org.apache.phoenix.end2end.DynamicUpsertIT
Running org.apache.phoenix.end2end.GetSetByteBitFunctionEnd2EndIT
Tests run: 1, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 0.096 sec - in 
org.apache.phoenix.end2end.GetSetByteBitFunctionEnd2EndIT
Tests run: 16, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 36.962 sec - 
in org.apache.phoenix.end2end.ArraysWithNullsIT
Running org.apache.phoenix.end2end.MD5FunctionIT
Running org.apache.phoenix.end2end.LikeExpressionIT
Running org.apache.phoenix.end2end.DistinctPrefixFilterIT
Tests run: 3, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 6.959 sec - in 
org.apache.phoenix.end2end.MD5FunctionIT
Running org.apache.phoenix.end2end.MinMaxAggregateFunctionIT
Tests run: 1, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 2.367 sec - in 
org.apache.phoenix.end2end.MinMaxAggregateFunctionIT
Tests run: 7, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 15.002 sec - in 
org.apache.phoenix.end2end.FirstValueFunctionIT
Running org.apache.phoenix.end2end.NthValueFunctionIT
Running org.apache.phoenix.end2end.OctetLengthFunctionEnd2EndIT
Tests run: 1, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 2.295 sec - in 
org.apache.phoenix.end2end.OctetLengthFunctionEnd2EndIT
Tests run: 6, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 11.553 sec - in 
org.apache.phoenix.end2end.LikeExpressionIT
Running org.apache.phoenix.end2end.PrimitiveTypeIT
Tests run: 9, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 0.119 sec - in 
org.apache.phoenix.end2end.PrimitiveTypeIT
Running org.apache.phoenix.end2end.QueryMoreIT
Running org.apache.phoenix.end2end.PowerFunctionEnd2EndIT
Tests run: 1, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 0.292 sec - in 
org.apache.phoenix.end2end.PowerFunctionEnd2EndIT
Running org.apache.phoenix.end2end.RTrimFunctionIT
Tests run: 26, Failures: 0, Errors: 0, 

Apache-Phoenix | 4.8-HBase-1.0 | Build Successful

[Apache Jenkins Server]

4.8-HBase-1.0 branch build status Successful

Source repository https://git-wip-us.apache.org/repos/asf?p=phoenix.git;a=shortlog;h=refs/heads/4.8-HBase-1.0

Compiled Artifacts https://builds.apache.org/job/Phoenix-4.8-HBase-1.0/lastSuccessfulBuild/artifact/

Test Report https://builds.apache.org/job/Phoenix-4.8-HBase-1.0/lastCompletedBuild/testReport/

Changes
[rajeshbabu] PHOENIX-3608 KeyRange interset should return EMPTY_RANGE when one of it



Build times for last couple of runsLatest build time is the right most | Legend blue: normal, red: test failure, gray: timeout

Apache-Phoenix | Master | Build Successful

[Apache Jenkins Server]

Master branch build status Successful
Source repository https://git-wip-us.apache.org/repos/asf?p=phoenix.git;a=shortlog;h=refs/heads/master

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

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

Changes
[rajeshbabu] PHOENIX-3468 Double quote SYSTEM, USER,DATE keywords in IT



Build times for last couple of runsLatest build time is the right most | Legend blue: normal, red: test failure, gray: timeout

Apache-Phoenix | 4.x-HBase-0.98 | Build Successful

[Apache Jenkins Server]

4.x-HBase-0.98 branch build status Successful

Source repository https://git-wip-us.apache.org/repos/asf?p=phoenix.git;a=shortlog;h=refs/heads/4.x-HBase-0.98

Compiled Artifacts https://builds.apache.org/job/Phoenix-4.x-HBase-0.98/lastSuccessfulBuild/artifact/

Test Report https://builds.apache.org/job/Phoenix-4.x-HBase-0.98/lastCompletedBuild/testReport/

Changes
[rajeshbabu] PHOENIX-3468 Double quote SYSTEM, USER,DATE keywords in IT



Build times for last couple of runsLatest build time is the right most | Legend blue: normal, red: test failure, gray: timeout

Build failed in Jenkins: Phoenix-4.8-HBase-0.98 #61

[Apache Jenkins Server]

See 

Changes:

[rajeshbabu] PHOENIX-3608 KeyRange interset should return EMPTY_RANGE when one 
of it

--
[...truncated 781 lines...]

Tests run: 20, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 71.711 sec - 
in org.apache.phoenix.tx.TxCheckpointIT
Tests run: 21, Failures: 0, Errors: 0, Skipped: 1, Time elapsed: 135.112 sec - 
in org.apache.phoenix.tx.TransactionIT
Tests run: 40, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 535.705 sec - 
in org.apache.phoenix.end2end.index.MutableIndexIT
Tests run: 136, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 743.798 sec - 
in org.apache.phoenix.end2end.index.IndexIT

Results :

Tests in error: 
  LocalIndexIT.testLocalIndexRowsShouldBeDeletedWhenUserTableRowsDeleted:650 » 
PhoenixIO

Tests run: 1239, Failures: 0, Errors: 1, Skipped: 5

[INFO] 
[INFO] --- maven-failsafe-plugin:2.19.1:integration-test 
(HBaseManagedTimeTableReuseTest) @ phoenix-core ---

---
 T E S T S
---
Running org.apache.phoenix.end2end.AbsFunctionEnd2EndIT
Running org.apache.phoenix.end2end.ArrayFillFunctionIT
Running org.apache.phoenix.end2end.ArithmeticQueryIT
Running org.apache.phoenix.end2end.ArraysWithNullsIT
Tests run: 1, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 1.257 sec - in 
org.apache.phoenix.end2end.AbsFunctionEnd2EndIT
Running org.apache.phoenix.end2end.AutoCommitIT
Running org.apache.phoenix.end2end.ArrayToStringFunctionIT
Tests run: 1, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 0.821 sec - in 
org.apache.phoenix.end2end.AutoCommitIT
Running org.apache.phoenix.end2end.CbrtFunctionEnd2EndIT
Tests run: 2, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 0.323 sec - in 
org.apache.phoenix.end2end.CbrtFunctionEnd2EndIT
Running org.apache.phoenix.end2end.ConvertTimezoneFunctionIT
Tests run: 26, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 6.805 sec - in 
org.apache.phoenix.end2end.ArrayFillFunctionIT
Running org.apache.phoenix.end2end.DecodeFunctionIT
Tests run: 8, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 5.934 sec - in 
org.apache.phoenix.end2end.ConvertTimezoneFunctionIT
Tests run: 36, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 10.176 sec - 
in org.apache.phoenix.end2end.ArrayToStringFunctionIT
Tests run: 6, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 4.926 sec - in 
org.apache.phoenix.end2end.DecodeFunctionIT
Running org.apache.phoenix.end2end.DynamicFamilyIT
Running org.apache.phoenix.end2end.DynamicUpsertIT
Tests run: 4, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 1.056 sec - in 
org.apache.phoenix.end2end.DynamicFamilyIT
Tests run: 7, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 0.087 sec - in 
org.apache.phoenix.end2end.DynamicUpsertIT
Running org.apache.phoenix.end2end.FirstValueFunctionIT
Running org.apache.phoenix.end2end.GetSetByteBitFunctionEnd2EndIT
Tests run: 1, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 0.171 sec - in 
org.apache.phoenix.end2end.GetSetByteBitFunctionEnd2EndIT
Running org.apache.phoenix.end2end.LikeExpressionIT
Tests run: 16, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 15.632 sec - 
in org.apache.phoenix.end2end.ArraysWithNullsIT
Running org.apache.phoenix.end2end.MD5FunctionIT
Tests run: 3, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 1.51 sec - in 
org.apache.phoenix.end2end.MD5FunctionIT
Running org.apache.phoenix.end2end.MinMaxAggregateFunctionIT
Tests run: 7, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 5.33 sec - in 
org.apache.phoenix.end2end.FirstValueFunctionIT
Tests run: 1, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 0.942 sec - in 
org.apache.phoenix.end2end.MinMaxAggregateFunctionIT
Running org.apache.phoenix.end2end.NthValueFunctionIT
Running org.apache.phoenix.end2end.OctetLengthFunctionEnd2EndIT
Tests run: 1, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 0.307 sec - in 
org.apache.phoenix.end2end.OctetLengthFunctionEnd2EndIT
Tests run: 6, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 5.322 sec - in 
org.apache.phoenix.end2end.LikeExpressionIT
Running org.apache.phoenix.end2end.PrimitiveTypeIT
Tests run: 9, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 0.204 sec - in 
org.apache.phoenix.end2end.PrimitiveTypeIT
Running org.apache.phoenix.end2end.QueryMoreIT
Running org.apache.phoenix.end2end.PowerFunctionEnd2EndIT
Tests run: 1, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 0.314 sec - in 
org.apache.phoenix.end2end.PowerFunctionEnd2EndIT
Running org.apache.phoenix.end2end.RTrimFunctionIT
Tests run: 2, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 1.069 sec - in 
org.apache.phoenix.end2end.RTrimFunctionIT
Running org.apache.phoenix.end2end.ReadOnlyIT
Tests run: 26, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 24.599 sec - 
in org.apache.phoenix.end2end.ArithmeticQueryIT
Running 

Build failed in Jenkins: Phoenix-4.x-HBase-1.1 #313

[Apache Jenkins Server]

See 

Changes:

[rajeshbabu] PHOENIX-3608 KeyRange interset should return EMPTY_RANGE when one 
of it

--
[...truncated 336 lines...]
Tests run: 6, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 0.014 sec - in 
org.apache.phoenix.schema.types.PrimitiveBytePhoenixArrayToStringTest
Running org.apache.phoenix.schema.types.PDateArrayToStringTest
Tests run: 6, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 0.032 sec - in 
org.apache.phoenix.schema.types.PDateArrayToStringTest
Running org.apache.phoenix.schema.types.PrimitiveLongPhoenixArrayToStringTest
Tests run: 4, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 0.678 sec - in 
org.apache.phoenix.schema.stats.StatisticsScannerTest
Running org.apache.phoenix.schema.types.PrimitiveFloatPhoenixArrayToStringTest
Tests run: 6, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 0.017 sec - in 
org.apache.phoenix.schema.types.PrimitiveLongPhoenixArrayToStringTest
Running org.apache.phoenix.schema.types.PrimitiveDoublePhoenixArrayToStringTest
Tests run: 6, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 0.005 sec - in 
org.apache.phoenix.schema.types.PrimitiveFloatPhoenixArrayToStringTest
Running org.apache.phoenix.schema.types.PrimitiveBooleanPhoenixArrayToStringTest
Tests run: 6, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 0.01 sec - in 
org.apache.phoenix.schema.types.PrimitiveBooleanPhoenixArrayToStringTest
Tests run: 6, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 0.014 sec - in 
org.apache.phoenix.schema.types.PrimitiveDoublePhoenixArrayToStringTest
Running org.apache.phoenix.schema.SchemaUtilTest
Running org.apache.phoenix.schema.types.PDataTypeTest
Tests run: 6, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 0.011 sec - in 
org.apache.phoenix.schema.SchemaUtilTest
Running org.apache.phoenix.schema.ValueBitSetTest
Tests run: 4, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 0.012 sec - in 
org.apache.phoenix.schema.ValueBitSetTest
Running org.apache.phoenix.schema.PMetaDataImplTest
Tests run: 68, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 0.166 sec - in 
org.apache.phoenix.schema.types.PDataTypeForArraysTest
Tests run: 5, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 0.028 sec - in 
org.apache.phoenix.schema.PMetaDataImplTest
Running org.apache.phoenix.schema.MutationTest
Running org.apache.phoenix.schema.SequenceAllocationTest
Tests run: 2, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 0.007 sec - in 
org.apache.phoenix.schema.SequenceAllocationTest
Running org.apache.phoenix.schema.SaltingUtilTest
Tests run: 2, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 0.004 sec - in 
org.apache.phoenix.schema.SaltingUtilTest
Running org.apache.phoenix.memory.MemoryManagerTest
Tests run: 1, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 0.463 sec - in 
org.apache.phoenix.schema.RowKeyValueAccessorTest
Running org.apache.phoenix.index.IndexMaintainerTest
Tests run: 6, Failures: 0, Errors: 0, Skipped: 3, Time elapsed: 0.111 sec - in 
org.apache.phoenix.memory.MemoryManagerTest
Running org.apache.phoenix.index.automated.MRJobSubmitterTest
Tests run: 35, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 0.2 sec - in 
org.apache.phoenix.schema.types.PDataTypeTest
Running org.apache.phoenix.expression.LikeExpressionTest
Tests run: 6, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 0.343 sec - in 
org.apache.phoenix.expression.LikeExpressionTest
Running org.apache.phoenix.expression.ArrayPrependFunctionTest
Tests run: 5, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 0.379 sec - in 
org.apache.phoenix.index.automated.MRJobSubmitterTest
Running org.apache.phoenix.expression.ArithmeticOperationTest
Tests run: 6, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 0.063 sec - in 
org.apache.phoenix.expression.ArithmeticOperationTest
Running org.apache.phoenix.expression.ArrayConcatFunctionTest
Tests run: 2, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 0.844 sec - in 
org.apache.phoenix.schema.MutationTest
Running org.apache.phoenix.expression.ExpFunctionTest
Tests run: 1, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 0.056 sec - in 
org.apache.phoenix.expression.ExpFunctionTest
Running org.apache.phoenix.expression.DeterminismTest
Tests run: 1, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 0.001 sec - in 
org.apache.phoenix.expression.DeterminismTest
Running org.apache.phoenix.expression.GetSetByteBitFunctionTest
Tests run: 37, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 0.716 sec - in 
org.apache.phoenix.expression.ArrayPrependFunctionTest
Running org.apache.phoenix.expression.util.regex.PatternPerformanceTest
Tests run: 1, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 0.006 sec - in 
org.apache.phoenix.expression.util.regex.PatternPerformanceTest
Running org.apache.phoenix.expression.ArrayAppendFunctionTest
Tests run: 151, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 13.062 sec - 
in 

phoenix git commit: PHOENIX-3608 KeyRange interset should return EMPTY_RANGE when one of it is NULL_RANGE(Rajeshbabu)

[rajeshbabu]

Repository: phoenix
Updated Branches:
  refs/heads/4.8-HBase-0.98 28bf0ef55 -> 5b6e7b452


PHOENIX-3608 KeyRange interset should return EMPTY_RANGE when one of it is 
NULL_RANGE(Rajeshbabu)


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

Branch: refs/heads/4.8-HBase-0.98
Commit: 5b6e7b45231bcc97bbd80851ce8632ef3b1e1342
Parents: 28bf0ef
Author: Rajeshbabu Chintaguntla 
Authored: Fri Jan 20 19:10:42 2017 +0530
Committer: Rajeshbabu Chintaguntla 
Committed: Fri Jan 20 19:10:42 2017 +0530

--
 .../src/main/java/org/apache/phoenix/query/KeyRange.java| 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/phoenix/blob/5b6e7b45/phoenix-core/src/main/java/org/apache/phoenix/query/KeyRange.java
--
diff --git a/phoenix-core/src/main/java/org/apache/phoenix/query/KeyRange.java 
b/phoenix-core/src/main/java/org/apache/phoenix/query/KeyRange.java
index f4bf793..babce9d 100644
--- a/phoenix-core/src/main/java/org/apache/phoenix/query/KeyRange.java
+++ b/phoenix-core/src/main/java/org/apache/phoenix/query/KeyRange.java
@@ -356,10 +356,9 @@ public class KeyRange implements Writable {
 boolean newUpperInclusive;
 // Special case for null, is it is never included another range
 // except for null itself.
-if (this == IS_NULL_RANGE) {
-if (range == IS_NULL_RANGE) {
+if (this == IS_NULL_RANGE && range == IS_NULL_RANGE) {
 return IS_NULL_RANGE;
-}
+} else if(this == IS_NULL_RANGE || range == IS_NULL_RANGE) {
 return EMPTY_RANGE;
 }
 if (lowerUnbound()) {

phoenix git commit: PHOENIX-3608 KeyRange interset should return EMPTY_RANGE when one of it is NULL_RANGE(Rajeshbabu)

[rajeshbabu]

Repository: phoenix
Updated Branches:
  refs/heads/4.8-HBase-1.0 265a5b10c -> 4cfbb3d77


PHOENIX-3608 KeyRange interset should return EMPTY_RANGE when one of it is 
NULL_RANGE(Rajeshbabu)


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

Branch: refs/heads/4.8-HBase-1.0
Commit: 4cfbb3d77d1fac74a172e78b11da7623a82e1f6d
Parents: 265a5b1
Author: Rajeshbabu Chintaguntla 
Authored: Fri Jan 20 19:10:05 2017 +0530
Committer: Rajeshbabu Chintaguntla 
Committed: Fri Jan 20 19:10:05 2017 +0530

--
 .../src/main/java/org/apache/phoenix/query/KeyRange.java| 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/phoenix/blob/4cfbb3d7/phoenix-core/src/main/java/org/apache/phoenix/query/KeyRange.java
--
diff --git a/phoenix-core/src/main/java/org/apache/phoenix/query/KeyRange.java 
b/phoenix-core/src/main/java/org/apache/phoenix/query/KeyRange.java
index f4bf793..babce9d 100644
--- a/phoenix-core/src/main/java/org/apache/phoenix/query/KeyRange.java
+++ b/phoenix-core/src/main/java/org/apache/phoenix/query/KeyRange.java
@@ -356,10 +356,9 @@ public class KeyRange implements Writable {
 boolean newUpperInclusive;
 // Special case for null, is it is never included another range
 // except for null itself.
-if (this == IS_NULL_RANGE) {
-if (range == IS_NULL_RANGE) {
+if (this == IS_NULL_RANGE && range == IS_NULL_RANGE) {
 return IS_NULL_RANGE;
-}
+} else if(this == IS_NULL_RANGE || range == IS_NULL_RANGE) {
 return EMPTY_RANGE;
 }
 if (lowerUnbound()) {

phoenix git commit: PHOENIX-3608 KeyRange interset should return EMPTY_RANGE when one of it is NULL_RANGE(Rajeshbabu)

[rajeshbabu]

Repository: phoenix
Updated Branches:
  refs/heads/4.8-HBase-1.1 c8499e536 -> 2939ca123


PHOENIX-3608 KeyRange interset should return EMPTY_RANGE when one of it is 
NULL_RANGE(Rajeshbabu)


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

Branch: refs/heads/4.8-HBase-1.1
Commit: 2939ca123cb771d367f9bbb5e2c260e39349ae21
Parents: c8499e5
Author: Rajeshbabu Chintaguntla 
Authored: Fri Jan 20 19:08:54 2017 +0530
Committer: Rajeshbabu Chintaguntla 
Committed: Fri Jan 20 19:08:54 2017 +0530

--
 .../src/main/java/org/apache/phoenix/query/KeyRange.java| 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/phoenix/blob/2939ca12/phoenix-core/src/main/java/org/apache/phoenix/query/KeyRange.java
--
diff --git a/phoenix-core/src/main/java/org/apache/phoenix/query/KeyRange.java 
b/phoenix-core/src/main/java/org/apache/phoenix/query/KeyRange.java
index f4bf793..babce9d 100644
--- a/phoenix-core/src/main/java/org/apache/phoenix/query/KeyRange.java
+++ b/phoenix-core/src/main/java/org/apache/phoenix/query/KeyRange.java
@@ -356,10 +356,9 @@ public class KeyRange implements Writable {
 boolean newUpperInclusive;
 // Special case for null, is it is never included another range
 // except for null itself.
-if (this == IS_NULL_RANGE) {
-if (range == IS_NULL_RANGE) {
+if (this == IS_NULL_RANGE && range == IS_NULL_RANGE) {
 return IS_NULL_RANGE;
-}
+} else if(this == IS_NULL_RANGE || range == IS_NULL_RANGE) {
 return EMPTY_RANGE;
 }
 if (lowerUnbound()) {

phoenix git commit: PHOENIX-3608 KeyRange interset should return EMPTY_RANGE when one of it is NULL_RANGE(Rajeshbabu)

[rajeshbabu]

Repository: phoenix
Updated Branches:
  refs/heads/4.8-HBase-1.2 e55a27901 -> ffa6476cb


PHOENIX-3608 KeyRange interset should return EMPTY_RANGE when one of it is 
NULL_RANGE(Rajeshbabu)


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

Branch: refs/heads/4.8-HBase-1.2
Commit: ffa6476cb029d4cd7b1a82675c996c3821266158
Parents: e55a279
Author: Rajeshbabu Chintaguntla 
Authored: Fri Jan 20 19:08:08 2017 +0530
Committer: Rajeshbabu Chintaguntla 
Committed: Fri Jan 20 19:08:08 2017 +0530

--
 .../src/main/java/org/apache/phoenix/query/KeyRange.java| 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/phoenix/blob/ffa6476c/phoenix-core/src/main/java/org/apache/phoenix/query/KeyRange.java
--
diff --git a/phoenix-core/src/main/java/org/apache/phoenix/query/KeyRange.java 
b/phoenix-core/src/main/java/org/apache/phoenix/query/KeyRange.java
index f4bf793..babce9d 100644
--- a/phoenix-core/src/main/java/org/apache/phoenix/query/KeyRange.java
+++ b/phoenix-core/src/main/java/org/apache/phoenix/query/KeyRange.java
@@ -356,10 +356,9 @@ public class KeyRange implements Writable {
 boolean newUpperInclusive;
 // Special case for null, is it is never included another range
 // except for null itself.
-if (this == IS_NULL_RANGE) {
-if (range == IS_NULL_RANGE) {
+if (this == IS_NULL_RANGE && range == IS_NULL_RANGE) {
 return IS_NULL_RANGE;
-}
+} else if(this == IS_NULL_RANGE || range == IS_NULL_RANGE) {
 return EMPTY_RANGE;
 }
 if (lowerUnbound()) {

phoenix git commit: PHOENIX-3608 KeyRange interset should return EMPTY_RANGE when one of it is NULL_RANGE(Rajeshbabu)

[rajeshbabu]

Repository: phoenix
Updated Branches:
  refs/heads/4.x-HBase-0.98 22e26dccd -> 88078fd5e


PHOENIX-3608 KeyRange interset should return EMPTY_RANGE when one of it is 
NULL_RANGE(Rajeshbabu)


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

Branch: refs/heads/4.x-HBase-0.98
Commit: 88078fd5eba05fcb717577b527d3de7b0801f0fc
Parents: 22e26dc
Author: Rajeshbabu Chintaguntla 
Authored: Fri Jan 20 19:07:30 2017 +0530
Committer: Rajeshbabu Chintaguntla 
Committed: Fri Jan 20 19:07:30 2017 +0530

--
 .../src/main/java/org/apache/phoenix/query/KeyRange.java| 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/phoenix/blob/88078fd5/phoenix-core/src/main/java/org/apache/phoenix/query/KeyRange.java
--
diff --git a/phoenix-core/src/main/java/org/apache/phoenix/query/KeyRange.java 
b/phoenix-core/src/main/java/org/apache/phoenix/query/KeyRange.java
index f4bf793..babce9d 100644
--- a/phoenix-core/src/main/java/org/apache/phoenix/query/KeyRange.java
+++ b/phoenix-core/src/main/java/org/apache/phoenix/query/KeyRange.java
@@ -356,10 +356,9 @@ public class KeyRange implements Writable {
 boolean newUpperInclusive;
 // Special case for null, is it is never included another range
 // except for null itself.
-if (this == IS_NULL_RANGE) {
-if (range == IS_NULL_RANGE) {
+if (this == IS_NULL_RANGE && range == IS_NULL_RANGE) {
 return IS_NULL_RANGE;
-}
+} else if(this == IS_NULL_RANGE || range == IS_NULL_RANGE) {
 return EMPTY_RANGE;
 }
 if (lowerUnbound()) {

phoenix git commit: PHOENIX-3608 KeyRange interset should return EMPTY_RANGE when one of it is NULL_RANGE(Rajeshbabu)

[rajeshbabu]

Repository: phoenix
Updated Branches:
  refs/heads/4.x-HBase-1.1 e2b358775 -> 7936c2be2


PHOENIX-3608 KeyRange interset should return EMPTY_RANGE when one of it is 
NULL_RANGE(Rajeshbabu)


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

Branch: refs/heads/4.x-HBase-1.1
Commit: 7936c2be2fcc05a351e2687adcdac22438393872
Parents: e2b3587
Author: Rajeshbabu Chintaguntla 
Authored: Fri Jan 20 19:06:58 2017 +0530
Committer: Rajeshbabu Chintaguntla 
Committed: Fri Jan 20 19:06:58 2017 +0530

--
 .../src/main/java/org/apache/phoenix/query/KeyRange.java| 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/phoenix/blob/7936c2be/phoenix-core/src/main/java/org/apache/phoenix/query/KeyRange.java
--
diff --git a/phoenix-core/src/main/java/org/apache/phoenix/query/KeyRange.java 
b/phoenix-core/src/main/java/org/apache/phoenix/query/KeyRange.java
index f4bf793..babce9d 100644
--- a/phoenix-core/src/main/java/org/apache/phoenix/query/KeyRange.java
+++ b/phoenix-core/src/main/java/org/apache/phoenix/query/KeyRange.java
@@ -356,10 +356,9 @@ public class KeyRange implements Writable {
 boolean newUpperInclusive;
 // Special case for null, is it is never included another range
 // except for null itself.
-if (this == IS_NULL_RANGE) {
-if (range == IS_NULL_RANGE) {
+if (this == IS_NULL_RANGE && range == IS_NULL_RANGE) {
 return IS_NULL_RANGE;
-}
+} else if(this == IS_NULL_RANGE || range == IS_NULL_RANGE) {
 return EMPTY_RANGE;
 }
 if (lowerUnbound()) {

phoenix git commit: PHOENIX-3608 KeyRange interset should return EMPTY_RANGE when one of it is NULL_RANGE(Rajeshbabu)

[rajeshbabu]

Repository: phoenix
Updated Branches:
  refs/heads/master 895cb1dfc -> e7ef25eca


PHOENIX-3608 KeyRange interset should return EMPTY_RANGE when one of it is 
NULL_RANGE(Rajeshbabu)


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

Branch: refs/heads/master
Commit: e7ef25eca2468e6d0a154b5e3539219f07748f22
Parents: 895cb1d
Author: Rajeshbabu Chintaguntla 
Authored: Fri Jan 20 19:05:06 2017 +0530
Committer: Rajeshbabu Chintaguntla 
Committed: Fri Jan 20 19:05:06 2017 +0530

--
 .../src/main/java/org/apache/phoenix/query/KeyRange.java| 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/phoenix/blob/e7ef25ec/phoenix-core/src/main/java/org/apache/phoenix/query/KeyRange.java
--
diff --git a/phoenix-core/src/main/java/org/apache/phoenix/query/KeyRange.java 
b/phoenix-core/src/main/java/org/apache/phoenix/query/KeyRange.java
index f4bf793..babce9d 100644
--- a/phoenix-core/src/main/java/org/apache/phoenix/query/KeyRange.java
+++ b/phoenix-core/src/main/java/org/apache/phoenix/query/KeyRange.java
@@ -356,10 +356,9 @@ public class KeyRange implements Writable {
 boolean newUpperInclusive;
 // Special case for null, is it is never included another range
 // except for null itself.
-if (this == IS_NULL_RANGE) {
-if (range == IS_NULL_RANGE) {
+if (this == IS_NULL_RANGE && range == IS_NULL_RANGE) {
 return IS_NULL_RANGE;
-}
+} else if(this == IS_NULL_RANGE || range == IS_NULL_RANGE) {
 return EMPTY_RANGE;
 }
 if (lowerUnbound()) {

Build failed in Jenkins: Phoenix-4.x-HBase-1.1 #312

[Apache Jenkins Server]

See 

Changes:

[rajeshbabu] PHOENIX-3468 Double quote SYSTEM, USER,DATE keywords in IT

--
[...truncated 320 lines...]
Tests run: 6, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 0.445 sec - in 
org.apache.phoenix.schema.RowKeySchemaTest
Running org.apache.phoenix.schema.RowKeyValueAccessorTest
Tests run: 3, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 0.689 sec - in 
org.apache.phoenix.trace.TraceMetricsSourceTest
Running org.apache.phoenix.schema.PCharPadTest
Tests run: 9, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 0.004 sec - in 
org.apache.phoenix.schema.PCharPadTest
Running org.apache.phoenix.schema.SortOrderTest
Tests run: 8, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 0.003 sec - in 
org.apache.phoenix.schema.SortOrderTest
Running org.apache.phoenix.schema.types.PrimitiveIntPhoenixArrayToStringTest
Tests run: 6, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 0.003 sec - in 
org.apache.phoenix.schema.types.PrimitiveIntPhoenixArrayToStringTest
Running org.apache.phoenix.schema.types.PrimitiveShortPhoenixArrayToStringTest
Tests run: 6, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 0.014 sec - in 
org.apache.phoenix.schema.types.PrimitiveShortPhoenixArrayToStringTest
Running org.apache.phoenix.schema.types.PDataTypeForArraysTest
Tests run: 68, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 0.123 sec - in 
org.apache.phoenix.schema.types.PDataTypeForArraysTest
Running org.apache.phoenix.schema.types.PVarcharArrayToStringTest
Tests run: 8, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 0.011 sec - in 
org.apache.phoenix.schema.types.PVarcharArrayToStringTest
Running org.apache.phoenix.schema.types.PrimitiveBytePhoenixArrayToStringTest
Tests run: 6, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 0.002 sec - in 
org.apache.phoenix.schema.types.PrimitiveBytePhoenixArrayToStringTest
Running org.apache.phoenix.schema.types.PDateArrayToStringTest
Tests run: 4, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 0.661 sec - in 
org.apache.phoenix.schema.stats.StatisticsScannerTest
Tests run: 6, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 0.011 sec - in 
org.apache.phoenix.schema.types.PDateArrayToStringTest
Running org.apache.phoenix.schema.types.PrimitiveLongPhoenixArrayToStringTest
Running org.apache.phoenix.schema.types.PrimitiveFloatPhoenixArrayToStringTest
Tests run: 6, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 0.01 sec - in 
org.apache.phoenix.schema.types.PrimitiveFloatPhoenixArrayToStringTest
Running org.apache.phoenix.schema.types.PrimitiveDoublePhoenixArrayToStringTest
Tests run: 6, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 0.013 sec - in 
org.apache.phoenix.schema.types.PrimitiveLongPhoenixArrayToStringTest
Running org.apache.phoenix.schema.types.PrimitiveBooleanPhoenixArrayToStringTest
Tests run: 6, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 0.012 sec - in 
org.apache.phoenix.schema.types.PrimitiveDoublePhoenixArrayToStringTest
Running org.apache.phoenix.schema.types.PDataTypeTest
Tests run: 6, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 0.014 sec - in 
org.apache.phoenix.schema.types.PrimitiveBooleanPhoenixArrayToStringTest
Running org.apache.phoenix.schema.SchemaUtilTest
Tests run: 6, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 0.015 sec - in 
org.apache.phoenix.schema.SchemaUtilTest
Running org.apache.phoenix.schema.ValueBitSetTest
Tests run: 4, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 0.014 sec - in 
org.apache.phoenix.schema.ValueBitSetTest
Running org.apache.phoenix.schema.PMetaDataImplTest
Tests run: 5, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 0.017 sec - in 
org.apache.phoenix.schema.PMetaDataImplTest
Running org.apache.phoenix.schema.SequenceAllocationTest
Tests run: 1, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 0.561 sec - in 
org.apache.phoenix.schema.RowKeyValueAccessorTest
Running org.apache.phoenix.schema.MutationTest
Tests run: 2, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 0.006 sec - in 
org.apache.phoenix.schema.SequenceAllocationTest
Running org.apache.phoenix.schema.SaltingUtilTest
Tests run: 2, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 0.002 sec - in 
org.apache.phoenix.schema.SaltingUtilTest
Running org.apache.phoenix.memory.MemoryManagerTest
Tests run: 6, Failures: 0, Errors: 0, Skipped: 3, Time elapsed: 0.09 sec - in 
org.apache.phoenix.memory.MemoryManagerTest
Running org.apache.phoenix.index.IndexMaintainerTest
Tests run: 35, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 0.259 sec - in 
org.apache.phoenix.schema.types.PDataTypeTest
Tests run: 151, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 12 sec - in 
org.apache.phoenix.compile.QueryCompilerTest
Running org.apache.phoenix.index.automated.MRJobSubmitterTest
Running org.apache.phoenix.expression.LikeExpressionTest
Tests run: 9, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 1.747 sec - in 

[1/2] phoenix git commit: PHOENIX-3468 Double quote SYSTEM, USER, DATE keywords in IT tests(Rajeshbabu)

[rajeshbabu]

Repository: phoenix
Updated Branches:
  refs/heads/4.x-HBase-0.98 c7bb3faff -> 22e26dccd


http://git-wip-us.apache.org/repos/asf/phoenix/blob/22e26dcc/phoenix-core/src/it/java/org/apache/phoenix/end2end/UpsertValuesIT.java
--
diff --git 
a/phoenix-core/src/it/java/org/apache/phoenix/end2end/UpsertValuesIT.java 
b/phoenix-core/src/it/java/org/apache/phoenix/end2end/UpsertValuesIT.java
index eb81ae3..64935d2 100644
--- a/phoenix-core/src/it/java/org/apache/phoenix/end2end/UpsertValuesIT.java
+++ b/phoenix-core/src/it/java/org/apache/phoenix/end2end/UpsertValuesIT.java
@@ -57,7 +57,7 @@ public class UpsertValuesIT extends BaseClientManagedTimeIT {
 props.setProperty(PhoenixRuntime.CURRENT_SCN_ATTRIB, Long.toString(ts 
+ 10));
 Connection conn = DriverManager.getConnection(getUrl(), props);
 conn.setAutoCommit(true);
-PreparedStatement stmt = conn.prepareStatement("UPSERT INTO " + 
TestUtil.PTSDB_NAME + " (inst,host,date) VALUES(?,'b',CURRENT_DATE())");
+PreparedStatement stmt = conn.prepareStatement("UPSERT INTO " + 
TestUtil.PTSDB_NAME + " (inst,host,\"DATE\") VALUES(?,'b',CURRENT_DATE())");
 stmt.setString(1, "a");
 stmt.execute();
 stmt.execute();
@@ -316,8 +316,7 @@ public class UpsertValuesIT extends BaseClientManagedTimeIT 
{
 PreparedStatement stmt = null;
 try {
 conn = DriverManager.getConnection(getUrl(), props);
-stmt = conn.prepareStatement("create table UpsertTimestamp (a 
integer NOT NULL, t timestamp NOT NULL CONSTRAINT pk PRIMARY KEY (a, t))");
-stmt.execute();
+conn.createStatement().execute("create table UpsertTimestamp (a 
integer NOT NULL, t timestamp NOT NULL CONSTRAINT pk PRIMARY KEY (a, t))");
 } finally {
 closeStmtAndConn(stmt, conn);
 }
@@ -357,8 +356,7 @@ public class UpsertValuesIT extends BaseClientManagedTimeIT 
{
 PreparedStatement stmt = null;
 try {
 conn = DriverManager.getConnection(getUrl(), props);
-stmt = conn.prepareStatement("create table UpsertTimestamp (a 
integer NOT NULL, t timestamp NOT NULL CONSTRAINT pk PRIMARY KEY (a, t))");
-stmt.execute();
+conn.createStatement().execute("create table UpsertTimestamp (a 
integer NOT NULL, t timestamp NOT NULL CONSTRAINT pk PRIMARY KEY (a, t))");
 } finally {
 closeStmtAndConn(stmt, conn);
 }
@@ -455,8 +453,7 @@ public class UpsertValuesIT extends BaseClientManagedTimeIT 
{
 PreparedStatement stmt = null;
 try {
 conn = DriverManager.getConnection(getUrl(), props);
-stmt = conn.prepareStatement("create table UpsertFloat (k varchar 
primary key, v float)");
-stmt.execute();
+conn.createStatement().execute("create table UpsertFloat (k 
varchar primary key, v float)");
 } finally {
 closeStmtAndConn(stmt, conn);
 }
@@ -496,8 +493,7 @@ public class UpsertValuesIT extends BaseClientManagedTimeIT 
{
 String tableName = BaseTest.generateUniqueName();
 try {
 conn = DriverManager.getConnection(getUrl(), props);
-pstmt = conn.prepareStatement("create table " + tableName + " (k 
varchar primary key, v integer)");
-pstmt.execute();
+conn.createStatement().execute("create table " + tableName + " (k 
varchar primary key, v integer)");
 } finally {
 closeStmtAndConn(pstmt, conn);
 }
@@ -587,8 +583,7 @@ public class UpsertValuesIT extends BaseClientManagedTimeIT 
{
 PreparedStatement stmt = null;
 try {
 conn = DriverManager.getConnection(getUrl(), props);
-stmt = conn.prepareStatement("create table UpsertTimestamp (k 
varchar, v unsigned_date not null, constraint pk primary key (k,v desc))");
-stmt.execute();
+conn.createStatement().execute("create table UpsertTimestamp (k 
varchar, v unsigned_date not null, constraint pk primary key (k,v desc))");
 } finally {
 closeStmtAndConn(stmt, conn);
 }
@@ -629,9 +624,8 @@ public class UpsertValuesIT extends BaseClientManagedTimeIT 
{
 PreparedStatement stmt = null;
 try {
 conn = DriverManager.getConnection(getUrl(), props);
-stmt = conn.prepareStatement("create table UpsertDateVal (k 
varchar, v date not null, t timestamp" +
+conn.createStatement().execute("create table UpsertDateVal (k 
varchar, v date not null, t timestamp" +
 ", tt time constraint pk primary key (k,v desc))");
-stmt.execute();
 } finally {
 closeStmtAndConn(stmt, conn);
 }

http://git-wip-us.apache.org/repos/asf/phoenix/blob/22e26dcc/phoenix-core/src/test/java/org/apache/phoenix/compile/JoinQueryCompilerTest.java

[2/2] phoenix git commit: PHOENIX-3468 Double quote SYSTEM, USER, DATE keywords in IT tests(Rajeshbabu)

[rajeshbabu]

PHOENIX-3468 Double quote SYSTEM, USER,DATE keywords in IT tests(Rajeshbabu)


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

Branch: refs/heads/4.x-HBase-0.98
Commit: 22e26dccde24cab232929577790bca6425862a2f
Parents: c7bb3fa
Author: Rajeshbabu Chintaguntla 
Authored: Fri Jan 20 18:49:46 2017 +0530
Committer: Rajeshbabu Chintaguntla 
Committed: Fri Jan 20 18:49:46 2017 +0530

--
 .../AlterMultiTenantTableWithViewsIT.java   |  2 +-
 .../apache/phoenix/end2end/AlterTableIT.java| 16 ++---
 .../phoenix/end2end/AlterTableWithViewsIT.java  |  2 +-
 .../phoenix/end2end/ArithmeticQueryIT.java  |  2 +-
 .../phoenix/end2end/ArrayFillFunctionIT.java| 28 -
 .../end2end/BaseTenantSpecificTablesIT.java |  4 +-
 .../phoenix/end2end/CoalesceFunctionIT.java | 60 +-
 .../org/apache/phoenix/end2end/DateTimeIT.java  |  6 +-
 .../org/apache/phoenix/end2end/DeleteIT.java| 26 
 .../phoenix/end2end/EvaluationOfORIT.java   |  5 +-
 .../apache/phoenix/end2end/GroupByCaseIT.java   | 10 +--
 .../org/apache/phoenix/end2end/GroupByIT.java   |  6 +-
 .../apache/phoenix/end2end/HashJoinMoreIT.java  | 47 +++---
 .../phoenix/end2end/SortMergeJoinMoreIT.java| 37 +--
 .../org/apache/phoenix/end2end/SortOrderIT.java |  8 +--
 .../end2end/TenantSpecificTablesDDLIT.java  | 12 ++--
 .../end2end/TenantSpecificTablesDMLIT.java  | 66 ++--
 .../apache/phoenix/end2end/UpsertValuesIT.java  | 20 +++---
 .../phoenix/compile/JoinQueryCompilerTest.java  |  6 +-
 .../phoenix/compile/QueryCompilerTest.java  |  8 ++-
 20 files changed, 178 insertions(+), 193 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/phoenix/blob/22e26dcc/phoenix-core/src/it/java/org/apache/phoenix/end2end/AlterMultiTenantTableWithViewsIT.java
--
diff --git 
a/phoenix-core/src/it/java/org/apache/phoenix/end2end/AlterMultiTenantTableWithViewsIT.java
 
b/phoenix-core/src/it/java/org/apache/phoenix/end2end/AlterMultiTenantTableWithViewsIT.java
index adadca7..d6f3a7f 100644
--- 
a/phoenix-core/src/it/java/org/apache/phoenix/end2end/AlterMultiTenantTableWithViewsIT.java
+++ 
b/phoenix-core/src/it/java/org/apache/phoenix/end2end/AlterMultiTenantTableWithViewsIT.java
@@ -656,7 +656,7 @@ public class AlterMultiTenantTableWithViewsIT extends 
ParallelStatsDisabledIT {
 }
 
 public static void assertTableDefinition(Connection conn, String 
tableName, PTableType tableType, String parentTableName, int sequenceNumber, 
int columnCount, int baseColumnCount, String... columnName) throws Exception {
-PreparedStatement p = conn.prepareStatement("SELECT * FROM 
SYSTEM.CATALOG WHERE TABLE_NAME=? AND TABLE_TYPE=?");
+PreparedStatement p = conn.prepareStatement("SELECT * FROM 
\"SYSTEM\".\"CATALOG\" WHERE TABLE_NAME=? AND TABLE_TYPE=?");
 p.setString(1, tableName);
 p.setString(2, tableType.getSerializedValue());
 ResultSet rs = p.executeQuery();

http://git-wip-us.apache.org/repos/asf/phoenix/blob/22e26dcc/phoenix-core/src/it/java/org/apache/phoenix/end2end/AlterTableIT.java
--
diff --git 
a/phoenix-core/src/it/java/org/apache/phoenix/end2end/AlterTableIT.java 
b/phoenix-core/src/it/java/org/apache/phoenix/end2end/AlterTableIT.java
index 155b6c2..73554c9 100644
--- a/phoenix-core/src/it/java/org/apache/phoenix/end2end/AlterTableIT.java
+++ b/phoenix-core/src/it/java/org/apache/phoenix/end2end/AlterTableIT.java
@@ -998,7 +998,7 @@ public class AlterTableIT extends ParallelStatsDisabledIT {
 assertEquals("COL3",rs.getString(4));
 assertFalse(rs.next());
 
-rs = conn1.createStatement().executeQuery("SELECT COLUMN_COUNT FROM 
SYSTEM.CATALOG\n"
+rs = conn1.createStatement().executeQuery("SELECT COLUMN_COUNT FROM 
\"SYSTEM\".\"CATALOG\"\n"
 + "WHERE TENANT_ID IS NULL AND\n"
 + "(TABLE_SCHEM, TABLE_NAME) = ('" + schemaName + "','"+ 
dataTableName + "') AND\n"
 + "COLUMN_FAMILY IS NULL AND COLUMN_NAME IS NULL");
@@ -1006,7 +1006,7 @@ public class AlterTableIT extends ParallelStatsDisabledIT 
{
 assertEquals(4,rs.getInt(1));
 assertFalse(rs.next());
 
-rs = conn1.createStatement().executeQuery("SELECT COLUMN_COUNT FROM 
SYSTEM.CATALOG\n"
+rs = conn1.createStatement().executeQuery("SELECT COLUMN_COUNT FROM 
\"SYSTEM\".\"CATALOG\"\n"
 + "WHERE TENANT_ID IS NULL AND\n"
 + 

[2/2] phoenix git commit: PHOENIX-3468 Double quote SYSTEM, USER, DATE keywords in IT tests(Rajeshbabu)

[rajeshbabu]

PHOENIX-3468 Double quote SYSTEM, USER,DATE keywords in IT tests(Rajeshbabu)


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

Branch: refs/heads/4.x-HBase-1.1
Commit: e2b3587759c50c2a25e4f7f3c5ee144c5560a6be
Parents: 5bf44a9
Author: Rajeshbabu Chintaguntla 
Authored: Fri Jan 20 18:46:15 2017 +0530
Committer: Rajeshbabu Chintaguntla 
Committed: Fri Jan 20 18:46:15 2017 +0530

--
 .../AlterMultiTenantTableWithViewsIT.java   |  2 +-
 .../apache/phoenix/end2end/AlterTableIT.java| 16 ++---
 .../phoenix/end2end/AlterTableWithViewsIT.java  |  2 +-
 .../phoenix/end2end/ArithmeticQueryIT.java  |  2 +-
 .../phoenix/end2end/ArrayFillFunctionIT.java| 28 -
 .../end2end/BaseTenantSpecificTablesIT.java |  4 +-
 .../phoenix/end2end/CoalesceFunctionIT.java | 60 +-
 .../org/apache/phoenix/end2end/DateTimeIT.java  |  6 +-
 .../org/apache/phoenix/end2end/DeleteIT.java| 26 
 .../phoenix/end2end/EvaluationOfORIT.java   |  5 +-
 .../apache/phoenix/end2end/GroupByCaseIT.java   | 10 +--
 .../org/apache/phoenix/end2end/GroupByIT.java   |  6 +-
 .../apache/phoenix/end2end/HashJoinMoreIT.java  | 47 +++---
 .../phoenix/end2end/SortMergeJoinMoreIT.java| 37 +--
 .../org/apache/phoenix/end2end/SortOrderIT.java |  8 +--
 .../end2end/TenantSpecificTablesDDLIT.java  | 12 ++--
 .../end2end/TenantSpecificTablesDMLIT.java  | 66 ++--
 .../apache/phoenix/end2end/UpsertValuesIT.java  | 20 +++---
 .../phoenix/compile/JoinQueryCompilerTest.java  |  6 +-
 .../phoenix/compile/QueryCompilerTest.java  |  8 ++-
 20 files changed, 178 insertions(+), 193 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/phoenix/blob/e2b35877/phoenix-core/src/it/java/org/apache/phoenix/end2end/AlterMultiTenantTableWithViewsIT.java
--
diff --git 
a/phoenix-core/src/it/java/org/apache/phoenix/end2end/AlterMultiTenantTableWithViewsIT.java
 
b/phoenix-core/src/it/java/org/apache/phoenix/end2end/AlterMultiTenantTableWithViewsIT.java
index adadca7..d6f3a7f 100644
--- 
a/phoenix-core/src/it/java/org/apache/phoenix/end2end/AlterMultiTenantTableWithViewsIT.java
+++ 
b/phoenix-core/src/it/java/org/apache/phoenix/end2end/AlterMultiTenantTableWithViewsIT.java
@@ -656,7 +656,7 @@ public class AlterMultiTenantTableWithViewsIT extends 
ParallelStatsDisabledIT {
 }
 
 public static void assertTableDefinition(Connection conn, String 
tableName, PTableType tableType, String parentTableName, int sequenceNumber, 
int columnCount, int baseColumnCount, String... columnName) throws Exception {
-PreparedStatement p = conn.prepareStatement("SELECT * FROM 
SYSTEM.CATALOG WHERE TABLE_NAME=? AND TABLE_TYPE=?");
+PreparedStatement p = conn.prepareStatement("SELECT * FROM 
\"SYSTEM\".\"CATALOG\" WHERE TABLE_NAME=? AND TABLE_TYPE=?");
 p.setString(1, tableName);
 p.setString(2, tableType.getSerializedValue());
 ResultSet rs = p.executeQuery();

http://git-wip-us.apache.org/repos/asf/phoenix/blob/e2b35877/phoenix-core/src/it/java/org/apache/phoenix/end2end/AlterTableIT.java
--
diff --git 
a/phoenix-core/src/it/java/org/apache/phoenix/end2end/AlterTableIT.java 
b/phoenix-core/src/it/java/org/apache/phoenix/end2end/AlterTableIT.java
index f51c3cb..fee7316 100644
--- a/phoenix-core/src/it/java/org/apache/phoenix/end2end/AlterTableIT.java
+++ b/phoenix-core/src/it/java/org/apache/phoenix/end2end/AlterTableIT.java
@@ -996,7 +996,7 @@ public class AlterTableIT extends ParallelStatsDisabledIT {
 assertEquals("COL3",rs.getString(4));
 assertFalse(rs.next());
 
-rs = conn1.createStatement().executeQuery("SELECT COLUMN_COUNT FROM 
SYSTEM.CATALOG\n"
+rs = conn1.createStatement().executeQuery("SELECT COLUMN_COUNT FROM 
\"SYSTEM\".\"CATALOG\"\n"
 + "WHERE TENANT_ID IS NULL AND\n"
 + "(TABLE_SCHEM, TABLE_NAME) = ('" + schemaName + "','"+ 
dataTableName + "') AND\n"
 + "COLUMN_FAMILY IS NULL AND COLUMN_NAME IS NULL");
@@ -1004,7 +1004,7 @@ public class AlterTableIT extends ParallelStatsDisabledIT 
{
 assertEquals(4,rs.getInt(1));
 assertFalse(rs.next());
 
-rs = conn1.createStatement().executeQuery("SELECT COLUMN_COUNT FROM 
SYSTEM.CATALOG\n"
+rs = conn1.createStatement().executeQuery("SELECT COLUMN_COUNT FROM 
\"SYSTEM\".\"CATALOG\"\n"
 + "WHERE TENANT_ID IS NULL AND\n"
 + 

[1/2] phoenix git commit: PHOENIX-3468 Double quote SYSTEM, USER, DATE keywords in IT tests(Rajeshbabu)

[rajeshbabu]

Repository: phoenix
Updated Branches:
  refs/heads/4.x-HBase-1.1 5bf44a99b -> e2b358775


http://git-wip-us.apache.org/repos/asf/phoenix/blob/e2b35877/phoenix-core/src/it/java/org/apache/phoenix/end2end/UpsertValuesIT.java
--
diff --git 
a/phoenix-core/src/it/java/org/apache/phoenix/end2end/UpsertValuesIT.java 
b/phoenix-core/src/it/java/org/apache/phoenix/end2end/UpsertValuesIT.java
index eb81ae3..64935d2 100644
--- a/phoenix-core/src/it/java/org/apache/phoenix/end2end/UpsertValuesIT.java
+++ b/phoenix-core/src/it/java/org/apache/phoenix/end2end/UpsertValuesIT.java
@@ -57,7 +57,7 @@ public class UpsertValuesIT extends BaseClientManagedTimeIT {
 props.setProperty(PhoenixRuntime.CURRENT_SCN_ATTRIB, Long.toString(ts 
+ 10));
 Connection conn = DriverManager.getConnection(getUrl(), props);
 conn.setAutoCommit(true);
-PreparedStatement stmt = conn.prepareStatement("UPSERT INTO " + 
TestUtil.PTSDB_NAME + " (inst,host,date) VALUES(?,'b',CURRENT_DATE())");
+PreparedStatement stmt = conn.prepareStatement("UPSERT INTO " + 
TestUtil.PTSDB_NAME + " (inst,host,\"DATE\") VALUES(?,'b',CURRENT_DATE())");
 stmt.setString(1, "a");
 stmt.execute();
 stmt.execute();
@@ -316,8 +316,7 @@ public class UpsertValuesIT extends BaseClientManagedTimeIT 
{
 PreparedStatement stmt = null;
 try {
 conn = DriverManager.getConnection(getUrl(), props);
-stmt = conn.prepareStatement("create table UpsertTimestamp (a 
integer NOT NULL, t timestamp NOT NULL CONSTRAINT pk PRIMARY KEY (a, t))");
-stmt.execute();
+conn.createStatement().execute("create table UpsertTimestamp (a 
integer NOT NULL, t timestamp NOT NULL CONSTRAINT pk PRIMARY KEY (a, t))");
 } finally {
 closeStmtAndConn(stmt, conn);
 }
@@ -357,8 +356,7 @@ public class UpsertValuesIT extends BaseClientManagedTimeIT 
{
 PreparedStatement stmt = null;
 try {
 conn = DriverManager.getConnection(getUrl(), props);
-stmt = conn.prepareStatement("create table UpsertTimestamp (a 
integer NOT NULL, t timestamp NOT NULL CONSTRAINT pk PRIMARY KEY (a, t))");
-stmt.execute();
+conn.createStatement().execute("create table UpsertTimestamp (a 
integer NOT NULL, t timestamp NOT NULL CONSTRAINT pk PRIMARY KEY (a, t))");
 } finally {
 closeStmtAndConn(stmt, conn);
 }
@@ -455,8 +453,7 @@ public class UpsertValuesIT extends BaseClientManagedTimeIT 
{
 PreparedStatement stmt = null;
 try {
 conn = DriverManager.getConnection(getUrl(), props);
-stmt = conn.prepareStatement("create table UpsertFloat (k varchar 
primary key, v float)");
-stmt.execute();
+conn.createStatement().execute("create table UpsertFloat (k 
varchar primary key, v float)");
 } finally {
 closeStmtAndConn(stmt, conn);
 }
@@ -496,8 +493,7 @@ public class UpsertValuesIT extends BaseClientManagedTimeIT 
{
 String tableName = BaseTest.generateUniqueName();
 try {
 conn = DriverManager.getConnection(getUrl(), props);
-pstmt = conn.prepareStatement("create table " + tableName + " (k 
varchar primary key, v integer)");
-pstmt.execute();
+conn.createStatement().execute("create table " + tableName + " (k 
varchar primary key, v integer)");
 } finally {
 closeStmtAndConn(pstmt, conn);
 }
@@ -587,8 +583,7 @@ public class UpsertValuesIT extends BaseClientManagedTimeIT 
{
 PreparedStatement stmt = null;
 try {
 conn = DriverManager.getConnection(getUrl(), props);
-stmt = conn.prepareStatement("create table UpsertTimestamp (k 
varchar, v unsigned_date not null, constraint pk primary key (k,v desc))");
-stmt.execute();
+conn.createStatement().execute("create table UpsertTimestamp (k 
varchar, v unsigned_date not null, constraint pk primary key (k,v desc))");
 } finally {
 closeStmtAndConn(stmt, conn);
 }
@@ -629,9 +624,8 @@ public class UpsertValuesIT extends BaseClientManagedTimeIT 
{
 PreparedStatement stmt = null;
 try {
 conn = DriverManager.getConnection(getUrl(), props);
-stmt = conn.prepareStatement("create table UpsertDateVal (k 
varchar, v date not null, t timestamp" +
+conn.createStatement().execute("create table UpsertDateVal (k 
varchar, v date not null, t timestamp" +
 ", tt time constraint pk primary key (k,v desc))");
-stmt.execute();
 } finally {
 closeStmtAndConn(stmt, conn);
 }

http://git-wip-us.apache.org/repos/asf/phoenix/blob/e2b35877/phoenix-core/src/test/java/org/apache/phoenix/compile/JoinQueryCompilerTest.java

[2/2] phoenix git commit: PHOENIX-3468 Double quote SYSTEM, USER, DATE keywords in IT tests(Rajeshbabu)

[rajeshbabu]

PHOENIX-3468 Double quote SYSTEM, USER,DATE keywords in IT tests(Rajeshbabu)


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

Branch: refs/heads/master
Commit: 895cb1dfca01a9cfffe7d25eaa524f944cb53952
Parents: a675211
Author: Rajeshbabu Chintaguntla 
Authored: Fri Jan 20 18:39:39 2017 +0530
Committer: Rajeshbabu Chintaguntla 
Committed: Fri Jan 20 18:39:39 2017 +0530

--
 .../AlterMultiTenantTableWithViewsIT.java   |  2 +-
 .../apache/phoenix/end2end/AlterTableIT.java| 16 ++---
 .../phoenix/end2end/AlterTableWithViewsIT.java  |  2 +-
 .../phoenix/end2end/ArithmeticQueryIT.java  |  2 +-
 .../phoenix/end2end/ArrayFillFunctionIT.java| 28 -
 .../end2end/BaseTenantSpecificTablesIT.java |  4 +-
 .../phoenix/end2end/CoalesceFunctionIT.java | 60 +-
 .../org/apache/phoenix/end2end/DateTimeIT.java  |  6 +-
 .../org/apache/phoenix/end2end/DeleteIT.java| 26 
 .../phoenix/end2end/EvaluationOfORIT.java   |  5 +-
 .../apache/phoenix/end2end/GroupByCaseIT.java   | 10 +--
 .../org/apache/phoenix/end2end/GroupByIT.java   |  6 +-
 .../apache/phoenix/end2end/HashJoinMoreIT.java  | 47 +++---
 .../phoenix/end2end/SortMergeJoinMoreIT.java| 37 +--
 .../org/apache/phoenix/end2end/SortOrderIT.java |  8 +--
 .../end2end/TenantSpecificTablesDDLIT.java  | 12 ++--
 .../end2end/TenantSpecificTablesDMLIT.java  | 66 ++--
 .../apache/phoenix/end2end/UpsertValuesIT.java  | 20 +++---
 .../phoenix/compile/JoinQueryCompilerTest.java  |  6 +-
 .../phoenix/compile/QueryCompilerTest.java  |  8 ++-
 20 files changed, 178 insertions(+), 193 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/phoenix/blob/895cb1df/phoenix-core/src/it/java/org/apache/phoenix/end2end/AlterMultiTenantTableWithViewsIT.java
--
diff --git 
a/phoenix-core/src/it/java/org/apache/phoenix/end2end/AlterMultiTenantTableWithViewsIT.java
 
b/phoenix-core/src/it/java/org/apache/phoenix/end2end/AlterMultiTenantTableWithViewsIT.java
index adadca7..d6f3a7f 100644
--- 
a/phoenix-core/src/it/java/org/apache/phoenix/end2end/AlterMultiTenantTableWithViewsIT.java
+++ 
b/phoenix-core/src/it/java/org/apache/phoenix/end2end/AlterMultiTenantTableWithViewsIT.java
@@ -656,7 +656,7 @@ public class AlterMultiTenantTableWithViewsIT extends 
ParallelStatsDisabledIT {
 }
 
 public static void assertTableDefinition(Connection conn, String 
tableName, PTableType tableType, String parentTableName, int sequenceNumber, 
int columnCount, int baseColumnCount, String... columnName) throws Exception {
-PreparedStatement p = conn.prepareStatement("SELECT * FROM 
SYSTEM.CATALOG WHERE TABLE_NAME=? AND TABLE_TYPE=?");
+PreparedStatement p = conn.prepareStatement("SELECT * FROM 
\"SYSTEM\".\"CATALOG\" WHERE TABLE_NAME=? AND TABLE_TYPE=?");
 p.setString(1, tableName);
 p.setString(2, tableType.getSerializedValue());
 ResultSet rs = p.executeQuery();

http://git-wip-us.apache.org/repos/asf/phoenix/blob/895cb1df/phoenix-core/src/it/java/org/apache/phoenix/end2end/AlterTableIT.java
--
diff --git 
a/phoenix-core/src/it/java/org/apache/phoenix/end2end/AlterTableIT.java 
b/phoenix-core/src/it/java/org/apache/phoenix/end2end/AlterTableIT.java
index f51c3cb..fee7316 100644
--- a/phoenix-core/src/it/java/org/apache/phoenix/end2end/AlterTableIT.java
+++ b/phoenix-core/src/it/java/org/apache/phoenix/end2end/AlterTableIT.java
@@ -996,7 +996,7 @@ public class AlterTableIT extends ParallelStatsDisabledIT {
 assertEquals("COL3",rs.getString(4));
 assertFalse(rs.next());
 
-rs = conn1.createStatement().executeQuery("SELECT COLUMN_COUNT FROM 
SYSTEM.CATALOG\n"
+rs = conn1.createStatement().executeQuery("SELECT COLUMN_COUNT FROM 
\"SYSTEM\".\"CATALOG\"\n"
 + "WHERE TENANT_ID IS NULL AND\n"
 + "(TABLE_SCHEM, TABLE_NAME) = ('" + schemaName + "','"+ 
dataTableName + "') AND\n"
 + "COLUMN_FAMILY IS NULL AND COLUMN_NAME IS NULL");
@@ -1004,7 +1004,7 @@ public class AlterTableIT extends ParallelStatsDisabledIT 
{
 assertEquals(4,rs.getInt(1));
 assertFalse(rs.next());
 
-rs = conn1.createStatement().executeQuery("SELECT COLUMN_COUNT FROM 
SYSTEM.CATALOG\n"
+rs = conn1.createStatement().executeQuery("SELECT COLUMN_COUNT FROM 
\"SYSTEM\".\"CATALOG\"\n"
 + "WHERE TENANT_ID IS NULL AND\n"
 +