[2/2] phoenix git commit: PHOENIX-2137 Range query on DECIMAL DESC sometimes incorrect

[jamestaylor]

PHOENIX-2137 Range query on DECIMAL DESC sometimes incorrect


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

Branch: refs/heads/master
Commit: 5330c0794e143014f5bd67114e3fc87c53015789
Parents: d401fa3
Author: James Taylor jtay...@salesforce.com
Authored: Mon Aug 3 16:40:47 2015 -0700
Committer: James Taylor jtay...@salesforce.com
Committed: Tue Aug 11 01:59:37 2015 -0700

--
 .../org/apache/phoenix/end2end/SortOrderIT.java | 110 ++-
 .../org/apache/phoenix/compile/ScanRanges.java  |   7 +-
 .../DescVarLengthFastByteComparisons.java   |  12 ++
 .../apache/phoenix/filter/SkipScanFilter.java   |  13 ++-
 .../java/org/apache/phoenix/query/KeyRange.java |  42 +++
 .../apache/phoenix/schema/types/PDataType.java  |   3 +-
 .../java/org/apache/phoenix/util/ScanUtil.java  |  64 +--
 .../org/apache/phoenix/util/SchemaUtil.java |   2 +-
 .../phoenix/compile/WhereOptimizerTest.java |  20 
 .../DescVarLengthFastByteComparisonsTest.java   |  45 
 .../expression/SortOrderExpressionTest.java |  13 ++-
 11 files changed, 288 insertions(+), 43 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/phoenix/blob/5330c079/phoenix-core/src/it/java/org/apache/phoenix/end2end/SortOrderIT.java
--
diff --git 
a/phoenix-core/src/it/java/org/apache/phoenix/end2end/SortOrderIT.java 
b/phoenix-core/src/it/java/org/apache/phoenix/end2end/SortOrderIT.java
index 0e8fb4f..9228ab5 100644
--- a/phoenix-core/src/it/java/org/apache/phoenix/end2end/SortOrderIT.java
+++ b/phoenix-core/src/it/java/org/apache/phoenix/end2end/SortOrderIT.java
@@ -18,6 +18,7 @@
 package org.apache.phoenix.end2end;
 
 import static org.apache.phoenix.util.TestUtil.TEST_PROPERTIES;
+import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertFalse;
 import static org.junit.Assert.assertTrue;
 
@@ -28,12 +29,18 @@ import java.sql.Date;
 import java.sql.DriverManager;
 import java.sql.PreparedStatement;
 import java.sql.ResultSet;
+import java.sql.SQLException;
+import java.util.ArrayList;
 import java.util.Calendar;
+import java.util.Collections;
 import java.util.GregorianCalendar;
 import java.util.List;
 import java.util.Properties;
 
 import org.apache.commons.lang.ArrayUtils;
+import org.apache.phoenix.schema.SortOrder;
+import org.apache.phoenix.schema.types.PDataType;
+import org.apache.phoenix.schema.types.PDecimal;
 import org.apache.phoenix.util.PropertiesUtil;
 import org.junit.Assert;
 import org.junit.Test;
@@ -357,6 +364,102 @@ public class SortOrderIT extends BaseHBaseManagedTimeIT {
 null, null, new OrderBy(id, OrderBy.Direction.DESC));
 }
 
+@Test
+public void descVarLengthAscPKGT() throws Exception {
+String ddl = CREATE TABLE  + TABLE +  (k1 INTEGER NOT NULL, k2 
VARCHAR, CONSTRAINT pk PRIMARY KEY (k1, k2));
+Object[][] insertedRows = new Object[][]{{0, null}, {1, a}, {2, 
b}, {3, ba}, {4, baa}, {5, c}, {6, d}};
+Object[][] expectedRows = new Object[][]{{3}, {4}, {5}, {6}};
+runQueryTest(ddl, upsert(k1, k2), select(k1), insertedRows, 
expectedRows,
+new WhereCondition(k2, , 'b'), null, null);
+}
+
+@Test
+public void descVarLengthDescPKGT() throws Exception {
+String ddl = CREATE TABLE  + TABLE +  (k1 INTEGER NOT NULL, k2 
VARCHAR, CONSTRAINT pk PRIMARY KEY (k1, k2 desc));
+Object[][] insertedRows = new Object[][]{{0, null}, {1, a}, {2, 
b}, {3, ba}, {4, baa}, {5, c}, {6, d}};
+Object[][] expectedRows = new Object[][]{{3}, {4}, {5}, {6}};
+runQueryTest(ddl, upsert(k1, k2), select(k1), insertedRows, 
expectedRows,
+new WhereCondition(k2, , 'b'), null, null);
+}
+
+@Test
+public void descVarLengthDescPKLTE() throws Exception {
+String ddl = CREATE TABLE  + TABLE +  (k1 INTEGER NOT NULL, k2 
VARCHAR, CONSTRAINT pk PRIMARY KEY (k1, k2 desc));
+Object[][] insertedRows = new Object[][]{{0, null}, {1, a}, {2, 
b}, {3, ba}, {4, bb}, {5, bc}, {6, bba}, {7, c}};
+Object[][] expectedRows = new Object[][]{{1}, {2}, {3}, {4}};
+runQueryTest(ddl, upsert(k1, k2), select(k1), insertedRows, 
expectedRows,
+new WhereCondition(k2, =, 'bb'), null, null);
+}
+
+@Test
+public void descVarLengthAscPKLTE() throws Exception {
+String ddl = CREATE TABLE  + TABLE +  (k1 INTEGER NOT NULL, k2 
VARCHAR, CONSTRAINT pk PRIMARY KEY (k1, k2));
+Object[][] insertedRows = new Object[][]{{0, null}, {1, a}, {2, 
b}, {3, ba}, {4, bb}, {5, bc}, 

[1/2] phoenix git commit: PHOENIX-2171 DOUBLE and FLOAT DESC are stored as ASC

[jamestaylor]

Repository: phoenix
Updated Branches:
  refs/heads/master d401fa3a6 - c435bba8f


PHOENIX-2171 DOUBLE and FLOAT DESC are stored as ASC


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

Branch: refs/heads/master
Commit: c435bba8f375076c47739b757be12f5109bedace
Parents: 5330c07
Author: James Taylor jtay...@salesforce.com
Authored: Tue Aug 11 01:59:23 2015 -0700
Committer: James Taylor jtay...@salesforce.com
Committed: Tue Aug 11 01:59:37 2015 -0700

--
 .../org/apache/phoenix/end2end/SortOrderIT.java |  6 ++--
 .../UngroupedAggregateRegionObserver.java   |  6 
 .../org/apache/phoenix/schema/PTableImpl.java   | 10 +-
 .../apache/phoenix/schema/types/PDataType.java  |  4 +--
 .../apache/phoenix/schema/types/PDouble.java| 18 +++
 .../org/apache/phoenix/schema/types/PFloat.java | 18 ++-
 .../org/apache/phoenix/util/UpgradeUtil.java|  5 +++
 .../phoenix/schema/types/PDataTypeTest.java | 33 
 8 files changed, 82 insertions(+), 18 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/phoenix/blob/c435bba8/phoenix-core/src/it/java/org/apache/phoenix/end2end/SortOrderIT.java
--
diff --git 
a/phoenix-core/src/it/java/org/apache/phoenix/end2end/SortOrderIT.java 
b/phoenix-core/src/it/java/org/apache/phoenix/end2end/SortOrderIT.java
index 9228ab5..fdbd26d 100644
--- a/phoenix-core/src/it/java/org/apache/phoenix/end2end/SortOrderIT.java
+++ b/phoenix-core/src/it/java/org/apache/phoenix/end2end/SortOrderIT.java
@@ -41,6 +41,8 @@ import org.apache.commons.lang.ArrayUtils;
 import org.apache.phoenix.schema.SortOrder;
 import org.apache.phoenix.schema.types.PDataType;
 import org.apache.phoenix.schema.types.PDecimal;
+import org.apache.phoenix.schema.types.PDouble;
+import org.apache.phoenix.schema.types.PFloat;
 import org.apache.phoenix.util.PropertiesUtil;
 import org.junit.Assert;
 import org.junit.Test;
@@ -404,7 +406,7 @@ public class SortOrderIT extends BaseHBaseManagedTimeIT {
 public void testNonPKCompare() throws Exception {
 ListInteger expectedResults = Lists.newArrayList(2,3,4);
 Integer[] saltBuckets = new Integer[] {null,3};
-PDataType[] dataTypes = new PDataType[] {PDecimal.INSTANCE};
+PDataType[] dataTypes = new PDataType[] {PDecimal.INSTANCE, 
PDouble.INSTANCE, PFloat.INSTANCE};
 for (Integer saltBucket : saltBuckets) {
 for (PDataType dataType : dataTypes) {
 for (SortOrder sortOrder : SortOrder.values()) {
@@ -420,7 +422,7 @@ public class SortOrderIT extends BaseHBaseManagedTimeIT {
 ListInteger rExpectedResults = new ArrayList(expectedResults);
 Collections.reverse(rExpectedResults);
 Integer[] saltBuckets = new Integer[] {null,3};
-PDataType[] dataTypes = new PDataType[] {PDecimal.INSTANCE};
+PDataType[] dataTypes = new PDataType[] {PDecimal.INSTANCE, 
PDouble.INSTANCE, PFloat.INSTANCE};
 for (Integer saltBucket : saltBuckets) {
 for (PDataType dataType : dataTypes) {
 for (SortOrder sortOrder : SortOrder.values()) {

http://git-wip-us.apache.org/repos/asf/phoenix/blob/c435bba8/phoenix-core/src/main/java/org/apache/phoenix/coprocessor/UngroupedAggregateRegionObserver.java
--
diff --git 
a/phoenix-core/src/main/java/org/apache/phoenix/coprocessor/UngroupedAggregateRegionObserver.java
 
b/phoenix-core/src/main/java/org/apache/phoenix/coprocessor/UngroupedAggregateRegionObserver.java
index a7e3e44..6b51138 100644
--- 
a/phoenix-core/src/main/java/org/apache/phoenix/coprocessor/UngroupedAggregateRegionObserver.java
+++ 
b/phoenix-core/src/main/java/org/apache/phoenix/coprocessor/UngroupedAggregateRegionObserver.java
@@ -88,6 +88,8 @@ import org.apache.phoenix.schema.tuple.MultiKeyValueTuple;
 import org.apache.phoenix.schema.types.PBinary;
 import org.apache.phoenix.schema.types.PChar;
 import org.apache.phoenix.schema.types.PDataType;
+import org.apache.phoenix.schema.types.PDouble;
+import org.apache.phoenix.schema.types.PFloat;
 import org.apache.phoenix.util.ByteUtil;
 import org.apache.phoenix.util.IndexUtil;
 import org.apache.phoenix.util.KeyValueUtil;
@@ -312,6 +314,10 @@ public class UngroupedAggregateRegionObserver extends 
BaseScannerRegionObserver{
 len--;
 }
 ptr.set(ptr.get(), 
ptr.getOffset(), len);
+// Special case for re-writing 

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
[jtaylor] PHOENIX-2137 Range query on DECIMAL DESC sometimes incorrect

[jtaylor] PHOENIX-2171 DOUBLE and FLOAT DESC are stored as ASC



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

[04/12] phoenix git commit: PHOENIX-2155 Add gpg signing to release profile

[jamestaylor]

PHOENIX-2155 Add gpg signing to release profile


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

Branch: refs/heads/4.5-HBase-0.98
Commit: 0fcefaad403bc15399b26b9a426cd8fcd082dba1
Parents: 3f03ced
Author: Mujtaba mujt...@apache.org
Authored: Wed Jul 29 13:06:52 2015 -0700
Committer: James Taylor jtay...@salesforce.com
Committed: Tue Aug 11 18:36:52 2015 -0700

--
 pom.xml | 15 ++-
 1 file changed, 14 insertions(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/phoenix/blob/0fcefaad/pom.xml
--
diff --git a/pom.xml b/pom.xml
index 0c83b37..0339860 100644
--- a/pom.xml
+++ b/pom.xml
@@ -750,9 +750,22 @@
   /execution
 /executions
   /plugin
+  plugin
+groupIdorg.apache.maven.plugins/groupId
+artifactIdmaven-gpg-plugin/artifactId
+version1.6/version
+executions
+  execution
+  idsign-artifacts/id
+  phaseverify/phase
+goals
+  goalsign/goal
+/goals
+  /execution
+/executions
+  /plugin
 /plugins
   /build
 /profile
-
   /profiles
 /project

[05/12] phoenix git commit: PHOENIX-2132 Pherf - Fix drop all command and execution from Eclipse/IDE

[jamestaylor]

PHOENIX-2132 Pherf - Fix drop all command and execution from Eclipse/IDE


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

Branch: refs/heads/4.5-HBase-0.98
Commit: fd7523fa39a98739a17112cbd03ff99d3a15a77a
Parents: 43cd3ae
Author: Mujtaba mujt...@apache.org
Authored: Fri Jul 24 11:18:52 2015 -0700
Committer: James Taylor jtay...@salesforce.com
Committed: Tue Aug 11 18:36:52 2015 -0700

--
 phoenix-pherf/pom.xml   | 25 ++---
 .../apache/phoenix/pherf/util/PhoenixUtil.java  | 55 +++-
 2 files changed, 60 insertions(+), 20 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/phoenix/blob/fd7523fa/phoenix-pherf/pom.xml
--
diff --git a/phoenix-pherf/pom.xml b/phoenix-pherf/pom.xml
index a8c2979..6824b1f 100644
--- a/phoenix-pherf/pom.xml
+++ b/phoenix-pherf/pom.xml
@@ -69,7 +69,6 @@
dependency
groupIdjunit/groupId
artifactIdjunit/artifactId
-   version4.11/version
scopetest/scope
/dependency
dependency
@@ -91,14 +90,12 @@
dependency
groupIdorg.apache.hbase/groupId
artifactIdhbase-testing-util/artifactId
-   version${hbase.version}/version
scopetest/scope
optionaltrue/optional
/dependency
dependency
groupIdorg.apache.hbase/groupId
artifactIdhbase-it/artifactId
-   version${hbase.version}/version
typetest-jar/type
scopetest/scope
/dependency
@@ -109,6 +106,12 @@
resource
directorysrc/main/resources/directory
/resource
+   resource
+   directoryconfig/directory
+   includes
+   include**/*.properties/include
+   /includes
+   /resource
/resources
testResources
testResource
@@ -129,13 +132,11 @@
/plugin
plugin
artifactIdmaven-dependency-plugin/artifactId
-   
version${maven-dependency-plugin.version}/version
/plugin
 
plugin
groupIdorg.apache.maven.plugins/groupId
artifactIdmaven-compiler-plugin/artifactId
-   version3.1/version
configuration
source1.7/source
target1.7/target
@@ -177,17 +178,27 @@
/goals
configuration
descriptors
-   !-- Produces 
minimal Pherf jar --
+   !-- Produces 
minimal Pherf jar --

descriptorsrc/main/assembly/minimal.xml/descriptor
!-- Produces 
standalone zip that bundles all required dependencies --

descriptorsrc/main/assembly/standalone.xml/descriptor
-   !-- Produces 
cluster zip with minimal Pherf jar. Setting HBase classpath in env.sh is 
required for this configuration -- 
 
+   !-- Produces 
cluster zip with minimal Pherf jar. Setting HBase classpath 
+   in 
env.sh is required for this configuration --

descriptorsrc/main/assembly/cluster.xml/descriptor
/descriptors
/configuration
/execution
/executions
  

[12/12] phoenix git commit: PHOENIX-1791. Adding ability for Pherf Write Workloads to write to a multi-tenant view.

[jamestaylor]

PHOENIX-1791. Adding ability for Pherf Write Workloads to write to a 
multi-tenant view.


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

Branch: refs/heads/4.5-HBase-0.98
Commit: 42476da8357f971995d2504acf421dfc7c22e3a9
Parents: 060a00c
Author: Jan jferna...@salesforce.com
Authored: Thu Aug 6 11:12:52 2015 -0700
Committer: James Taylor jtay...@salesforce.com
Committed: Tue Aug 11 18:36:52 2015 -0700

--
 .../org/apache/phoenix/pherf/DataIngestIT.java  | 67 +---
 .../phoenix/pherf/configuration/Scenario.java   | 25 ++--
 .../pherf/configuration/XMLConfigParser.java| 23 ---
 .../apache/phoenix/pherf/util/PhoenixUtil.java  | 30 +
 .../phoenix/pherf/workload/WriteWorkload.java   | 49 +-
 .../datamodel/test_schema_mt_table.sql  | 31 +
 .../resources/datamodel/test_schema_mt_view.sql |  1 +
 .../test/resources/scenario/test_scenario.xml   | 22 +++
 8 files changed, 198 insertions(+), 50 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/phoenix/blob/42476da8/phoenix-pherf/src/it/java/org/apache/phoenix/pherf/DataIngestIT.java
--
diff --git 
a/phoenix-pherf/src/it/java/org/apache/phoenix/pherf/DataIngestIT.java 
b/phoenix-pherf/src/it/java/org/apache/phoenix/pherf/DataIngestIT.java
index 1defbb1..297f882 100644
--- a/phoenix-pherf/src/it/java/org/apache/phoenix/pherf/DataIngestIT.java
+++ b/phoenix-pherf/src/it/java/org/apache/phoenix/pherf/DataIngestIT.java
@@ -22,6 +22,19 @@ import com.jcabi.jdbc.JdbcSession;
 import com.jcabi.jdbc.Outcome;
 
 import org.apache.phoenix.pherf.PherfConstants.GeneratePhoenixStats;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.fail;
+
+import java.sql.Connection;
+import java.sql.ResultSet;
+import java.sql.SQLException;
+import java.sql.Statement;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Map;
+
 import org.apache.phoenix.pherf.configuration.Column;
 import org.apache.phoenix.pherf.configuration.DataModel;
 import org.apache.phoenix.pherf.configuration.DataTypeMapping;
@@ -35,15 +48,8 @@ import org.apache.phoenix.pherf.workload.WriteWorkload;
 import org.junit.Before;
 import org.junit.Test;
 
-import java.sql.Connection;
-import java.sql.ResultSet;
-import java.sql.SQLException;
-import java.sql.Statement;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Map;
-
-import static org.junit.Assert.*;
+import com.jcabi.jdbc.JdbcSession;
+import com.jcabi.jdbc.Outcome;
 
 public class DataIngestIT extends ResultBaseTestIT {
 
@@ -146,4 +152,47 @@ public class DataIngestIT extends ResultBaseTestIT {
 fail(Failed to load data. An exception was thrown:  + 
e.getMessage());
 }
 }
+
+
+@Test
+/**
+ * Validates that Pherf can write data to a Multi-Tenant View in addition 
to 
+ * standard Phoenix tables.
+ */
+public void testMultiTenantViewWriteWorkload() throws Exception {
+// Arrange
+Scenario scenario = parser.getScenarioByName(testMTWriteScenario);
+WorkloadExecutor executor = new WorkloadExecutor();
+executor.add(new WriteWorkload(util, parser, scenario, 
GeneratePhoenixStats.NO));
+
+// Act
+try {
+// Wait for data to load up.
+executor.get();
+executor.shutdown();
+} catch (Exception e) {
+fail(Failed to load data. An exception was thrown:  + 
e.getMessage());
+}
+
+assertExpectedNumberOfRecordsWritten(scenario);
+}
+
+private void assertExpectedNumberOfRecordsWritten(Scenario scenario) 
throws Exception,
+SQLException {
+Connection connection = util.getConnection(scenario.getTenantId());
+String sql = select count(*) from  + scenario.getTableName();
+Integer count = new JdbcSession(connection).sql(sql).select(new 
OutcomeInteger() {
+@Override public Integer handle(ResultSet resultSet, Statement 
statement)
+throws SQLException {
+while (resultSet.next()) {
+return resultSet.getInt(1);
+}
+return null;
+}
+});
+assertNotNull(Could not retrieve count.  + count);
+assertEquals(Expected 100 rows to have been inserted,
+scenario.getRowCount(), count.intValue());
+}
+
 }

[02/12] phoenix git commit: PHOENIX-2171 DOUBLE and FLOAT DESC are stored as ASC

[jamestaylor]

PHOENIX-2171 DOUBLE and FLOAT DESC are stored as ASC


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

Branch: refs/heads/4.5-HBase-0.98
Commit: 71da8a021279e69de1928605fd03c6e8bcdc1ed0
Parents: b642514
Author: James Taylor jtay...@salesforce.com
Authored: Tue Aug 11 01:59:23 2015 -0700
Committer: James Taylor jtay...@salesforce.com
Committed: Tue Aug 11 18:36:52 2015 -0700

--
 .../org/apache/phoenix/end2end/SortOrderIT.java |  6 ++--
 .../UngroupedAggregateRegionObserver.java   |  6 
 .../org/apache/phoenix/schema/PTableImpl.java   | 10 +-
 .../apache/phoenix/schema/types/PDataType.java  |  4 +--
 .../apache/phoenix/schema/types/PDouble.java| 18 +++
 .../org/apache/phoenix/schema/types/PFloat.java | 18 ++-
 .../org/apache/phoenix/util/UpgradeUtil.java|  5 +++
 .../phoenix/schema/types/PDataTypeTest.java | 33 
 8 files changed, 82 insertions(+), 18 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/phoenix/blob/71da8a02/phoenix-core/src/it/java/org/apache/phoenix/end2end/SortOrderIT.java
--
diff --git 
a/phoenix-core/src/it/java/org/apache/phoenix/end2end/SortOrderIT.java 
b/phoenix-core/src/it/java/org/apache/phoenix/end2end/SortOrderIT.java
index 9228ab5..fdbd26d 100644
--- a/phoenix-core/src/it/java/org/apache/phoenix/end2end/SortOrderIT.java
+++ b/phoenix-core/src/it/java/org/apache/phoenix/end2end/SortOrderIT.java
@@ -41,6 +41,8 @@ import org.apache.commons.lang.ArrayUtils;
 import org.apache.phoenix.schema.SortOrder;
 import org.apache.phoenix.schema.types.PDataType;
 import org.apache.phoenix.schema.types.PDecimal;
+import org.apache.phoenix.schema.types.PDouble;
+import org.apache.phoenix.schema.types.PFloat;
 import org.apache.phoenix.util.PropertiesUtil;
 import org.junit.Assert;
 import org.junit.Test;
@@ -404,7 +406,7 @@ public class SortOrderIT extends BaseHBaseManagedTimeIT {
 public void testNonPKCompare() throws Exception {
 ListInteger expectedResults = Lists.newArrayList(2,3,4);
 Integer[] saltBuckets = new Integer[] {null,3};
-PDataType[] dataTypes = new PDataType[] {PDecimal.INSTANCE};
+PDataType[] dataTypes = new PDataType[] {PDecimal.INSTANCE, 
PDouble.INSTANCE, PFloat.INSTANCE};
 for (Integer saltBucket : saltBuckets) {
 for (PDataType dataType : dataTypes) {
 for (SortOrder sortOrder : SortOrder.values()) {
@@ -420,7 +422,7 @@ public class SortOrderIT extends BaseHBaseManagedTimeIT {
 ListInteger rExpectedResults = new ArrayList(expectedResults);
 Collections.reverse(rExpectedResults);
 Integer[] saltBuckets = new Integer[] {null,3};
-PDataType[] dataTypes = new PDataType[] {PDecimal.INSTANCE};
+PDataType[] dataTypes = new PDataType[] {PDecimal.INSTANCE, 
PDouble.INSTANCE, PFloat.INSTANCE};
 for (Integer saltBucket : saltBuckets) {
 for (PDataType dataType : dataTypes) {
 for (SortOrder sortOrder : SortOrder.values()) {

http://git-wip-us.apache.org/repos/asf/phoenix/blob/71da8a02/phoenix-core/src/main/java/org/apache/phoenix/coprocessor/UngroupedAggregateRegionObserver.java
--
diff --git 
a/phoenix-core/src/main/java/org/apache/phoenix/coprocessor/UngroupedAggregateRegionObserver.java
 
b/phoenix-core/src/main/java/org/apache/phoenix/coprocessor/UngroupedAggregateRegionObserver.java
index 571d0d1..7316bb1 100644
--- 
a/phoenix-core/src/main/java/org/apache/phoenix/coprocessor/UngroupedAggregateRegionObserver.java
+++ 
b/phoenix-core/src/main/java/org/apache/phoenix/coprocessor/UngroupedAggregateRegionObserver.java
@@ -88,6 +88,8 @@ import org.apache.phoenix.schema.tuple.MultiKeyValueTuple;
 import org.apache.phoenix.schema.types.PBinary;
 import org.apache.phoenix.schema.types.PChar;
 import org.apache.phoenix.schema.types.PDataType;
+import org.apache.phoenix.schema.types.PDouble;
+import org.apache.phoenix.schema.types.PFloat;
 import org.apache.phoenix.util.ByteUtil;
 import org.apache.phoenix.util.IndexUtil;
 import org.apache.phoenix.util.KeyValueUtil;
@@ -312,6 +314,10 @@ public class UngroupedAggregateRegionObserver extends 
BaseScannerRegionObserver{
 len--;
 }
 ptr.set(ptr.get(), 
ptr.getOffset(), len);
+// Special case for re-writing DESC 
FLOAT and DOUBLE, as they're not inverted like they should be 

[08/12] phoenix git commit: PHOENIX-1994 - TestIndexWriter#testFailureOnRunningUpdateAbortsPending() deadlocks on JDK 8

[jamestaylor]

PHOENIX-1994 - TestIndexWriter#testFailureOnRunningUpdateAbortsPending() 
deadlocks on JDK 8


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

Branch: refs/heads/4.5-HBase-0.98
Commit: 233b48d6d0c9807172f4a617d75926ffa86f7e34
Parents: 42476da
Author: Cody Marcel cody.mar...@gmail.com
Authored: Mon Aug 10 12:08:07 2015 -0700
Committer: James Taylor jtay...@salesforce.com
Committed: Tue Aug 11 18:36:52 2015 -0700

--
 .../java/org/apache/phoenix/hbase/index/write/TestIndexWriter.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/phoenix/blob/233b48d6/phoenix-core/src/test/java/org/apache/phoenix/hbase/index/write/TestIndexWriter.java
--
diff --git 
a/phoenix-core/src/test/java/org/apache/phoenix/hbase/index/write/TestIndexWriter.java
 
b/phoenix-core/src/test/java/org/apache/phoenix/hbase/index/write/TestIndexWriter.java
index 37a8cf4..8f576cf 100644
--- 
a/phoenix-core/src/test/java/org/apache/phoenix/hbase/index/write/TestIndexWriter.java
+++ 
b/phoenix-core/src/test/java/org/apache/phoenix/hbase/index/write/TestIndexWriter.java
@@ -145,7 +145,7 @@ public class TestIndexWriter {
 Abortable abort = new StubAbortable();
 Stoppable stop = Mockito.mock(Stoppable.class);
 // single thread factory so the older request gets queued
-ExecutorService exec = Executors.newFixedThreadPool(1);
+ExecutorService exec = Executors.newFixedThreadPool(3);
 MapImmutableBytesPtr, HTableInterface tables = new 
HashMapImmutableBytesPtr, HTableInterface();
 FakeTableFactory factory = new FakeTableFactory(tables);
 

[03/12] phoenix git commit: PHOENIX-2149 MAX Value of Sequences not honored when closing Connection between calls to NEXT VALUE FOR (Jan Fernando)

[jamestaylor]

PHOENIX-2149 MAX Value of Sequences not honored when closing Connection between 
calls to NEXT VALUE FOR (Jan Fernando)


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

Branch: refs/heads/4.5-HBase-0.98
Commit: 3f03ced5392ecc324affcbdf3a51d2c4ecc18126
Parents: e78a648
Author: Thomas D'Silva tdsi...@salesforce.com
Authored: Mon Jul 27 13:15:17 2015 -0700
Committer: James Taylor jtay...@salesforce.com
Committed: Tue Aug 11 18:36:52 2015 -0700

--
 .../org/apache/phoenix/end2end/SequenceIT.java  | 33 
 .../org/apache/phoenix/schema/Sequence.java |  3 +-
 2 files changed, 34 insertions(+), 2 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/phoenix/blob/3f03ced5/phoenix-core/src/it/java/org/apache/phoenix/end2end/SequenceIT.java
--
diff --git 
a/phoenix-core/src/it/java/org/apache/phoenix/end2end/SequenceIT.java 
b/phoenix-core/src/it/java/org/apache/phoenix/end2end/SequenceIT.java
index 4273022..78f8132 100644
--- a/phoenix-core/src/it/java/org/apache/phoenix/end2end/SequenceIT.java
+++ b/phoenix-core/src/it/java/org/apache/phoenix/end2end/SequenceIT.java
@@ -54,6 +54,7 @@ import com.google.common.collect.Lists;
 
 public class SequenceIT extends BaseClientManagedTimeIT {
 private static final String NEXT_VAL_SQL = SELECT NEXT VALUE FOR foo.bar 
FROM SYSTEM.\SEQUENCE\;
+private static final String SELECT_NEXT_VALUE_SQL = SELECT NEXT VALUE FOR 
%s FROM SYSTEM.\SEQUENCE\;
 private static final long BATCH_SIZE = 3;

 private Connection conn;
@@ -1147,6 +1148,38 @@ public class SequenceIT extends BaseClientManagedTimeIT {
 assertEquals(1, rs.getLong(metric_val));
 assertFalse(rs.next());
 }
+
+@Test
+/**
+ * Test to validate that the bug discovered in PHOENIX-2149 has been 
fixed. There was an issue
+ * whereby, when closing connections and returning sequences we were not 
setting the limit
+ * reached flag correctly and this was causing the max value to be ignored 
as the LIMIT_REACHED_FLAG
+ * value was being unset from true to false.
+ */
+public void testNextValuesForSequenceClosingConnections() throws Exception 
{
+
+// Create Sequence
+nextConnection();
+conn.createStatement().execute(CREATE SEQUENCE seqtest.closeconn 
START WITH 4990 MINVALUE 4990 MAXVALUE 5000 CACHE 10);
+nextConnection();
+
+// Call NEXT VALUE FOR 1 time more than available values in the 
Sequence. We expected the final time
+// to throw an error as we will have reached the max value
+try {
+long val = 0L;
+for (int i = 0; i = 11; i++) {
+ResultSet rs = 
conn.createStatement().executeQuery(String.format(SELECT_NEXT_VALUE_SQL, 
seqtest.closeconn));
+rs.next();
+val = rs.getLong(1);
+nextConnection();
+}
+fail(Expect to fail as we have arrived at the max sequence value 
 + val);
+} catch (SQLException e) {
+
assertEquals(SQLExceptionCode.SEQUENCE_VAL_REACHED_MAX_VALUE.getErrorCode(),
+e.getErrorCode());
+assertTrue(e.getNextException() == null);
+}
+}
 
 private void insertEvent(long id, String userId, long val) throws 
SQLException {
 PreparedStatement stmt = conn.prepareStatement(UPSERT INTO events 
VALUES(?,?,?));

http://git-wip-us.apache.org/repos/asf/phoenix/blob/3f03ced5/phoenix-core/src/main/java/org/apache/phoenix/schema/Sequence.java
--
diff --git a/phoenix-core/src/main/java/org/apache/phoenix/schema/Sequence.java 
b/phoenix-core/src/main/java/org/apache/phoenix/schema/Sequence.java
index adca5e8..a2041f7 100644
--- a/phoenix-core/src/main/java/org/apache/phoenix/schema/Sequence.java
+++ b/phoenix-core/src/main/java/org/apache/phoenix/schema/Sequence.java
@@ -302,8 +302,7 @@ public class Sequence {
 Mapbyte[], ListCell familyMap = append.getFamilyCellMap();
 familyMap.put(PhoenixDatabaseMetaData.SEQUENCE_FAMILY_BYTES, 
Arrays.CellasList(
(Cell)KeyValueUtil.newKeyValue(key, 
PhoenixDatabaseMetaData.SEQUENCE_FAMILY_BYTES, 
PhoenixDatabaseMetaData.CURRENT_VALUE_BYTES, value.timestamp, 
PLong.INSTANCE.toBytes(value.currentValue)),
-   // set LIMIT_REACHED flag to false since we are 
returning unused sequence values
-   (Cell)KeyValueUtil.newKeyValue(key, 
PhoenixDatabaseMetaData.SEQUENCE_FAMILY_BYTES, 

[11/12] phoenix git commit: PHOENIX-2137 Range query on DECIMAL DESC sometimes incorrect

[jamestaylor]

PHOENIX-2137 Range query on DECIMAL DESC sometimes incorrect

Conflicts:

phoenix-core/src/test/java/org/apache/phoenix/compile/WhereOptimizerTest.java


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

Branch: refs/heads/4.5-HBase-0.98
Commit: b6425149eeaf285cba18ea11057fde6db9fc0cdc
Parents: 233b48d
Author: James Taylor jtay...@salesforce.com
Authored: Mon Aug 3 16:40:47 2015 -0700
Committer: James Taylor jtay...@salesforce.com
Committed: Tue Aug 11 18:36:52 2015 -0700

--
 .../org/apache/phoenix/end2end/SortOrderIT.java | 110 ++-
 .../org/apache/phoenix/compile/ScanRanges.java  |   7 +-
 .../DescVarLengthFastByteComparisons.java   |  12 ++
 .../apache/phoenix/filter/SkipScanFilter.java   |  13 ++-
 .../java/org/apache/phoenix/query/KeyRange.java |  42 +++
 .../apache/phoenix/schema/types/PDataType.java  |   3 +-
 .../java/org/apache/phoenix/util/ScanUtil.java  |  64 +--
 .../org/apache/phoenix/util/SchemaUtil.java |   2 +-
 .../phoenix/compile/WhereOptimizerTest.java |  20 
 .../DescVarLengthFastByteComparisonsTest.java   |  45 
 .../expression/SortOrderExpressionTest.java |  13 ++-
 11 files changed, 288 insertions(+), 43 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/phoenix/blob/b6425149/phoenix-core/src/it/java/org/apache/phoenix/end2end/SortOrderIT.java
--
diff --git 
a/phoenix-core/src/it/java/org/apache/phoenix/end2end/SortOrderIT.java 
b/phoenix-core/src/it/java/org/apache/phoenix/end2end/SortOrderIT.java
index 0e8fb4f..9228ab5 100644
--- a/phoenix-core/src/it/java/org/apache/phoenix/end2end/SortOrderIT.java
+++ b/phoenix-core/src/it/java/org/apache/phoenix/end2end/SortOrderIT.java
@@ -18,6 +18,7 @@
 package org.apache.phoenix.end2end;
 
 import static org.apache.phoenix.util.TestUtil.TEST_PROPERTIES;
+import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertFalse;
 import static org.junit.Assert.assertTrue;
 
@@ -28,12 +29,18 @@ import java.sql.Date;
 import java.sql.DriverManager;
 import java.sql.PreparedStatement;
 import java.sql.ResultSet;
+import java.sql.SQLException;
+import java.util.ArrayList;
 import java.util.Calendar;
+import java.util.Collections;
 import java.util.GregorianCalendar;
 import java.util.List;
 import java.util.Properties;
 
 import org.apache.commons.lang.ArrayUtils;
+import org.apache.phoenix.schema.SortOrder;
+import org.apache.phoenix.schema.types.PDataType;
+import org.apache.phoenix.schema.types.PDecimal;
 import org.apache.phoenix.util.PropertiesUtil;
 import org.junit.Assert;
 import org.junit.Test;
@@ -357,6 +364,102 @@ public class SortOrderIT extends BaseHBaseManagedTimeIT {
 null, null, new OrderBy(id, OrderBy.Direction.DESC));
 }
 
+@Test
+public void descVarLengthAscPKGT() throws Exception {
+String ddl = CREATE TABLE  + TABLE +  (k1 INTEGER NOT NULL, k2 
VARCHAR, CONSTRAINT pk PRIMARY KEY (k1, k2));
+Object[][] insertedRows = new Object[][]{{0, null}, {1, a}, {2, 
b}, {3, ba}, {4, baa}, {5, c}, {6, d}};
+Object[][] expectedRows = new Object[][]{{3}, {4}, {5}, {6}};
+runQueryTest(ddl, upsert(k1, k2), select(k1), insertedRows, 
expectedRows,
+new WhereCondition(k2, , 'b'), null, null);
+}
+
+@Test
+public void descVarLengthDescPKGT() throws Exception {
+String ddl = CREATE TABLE  + TABLE +  (k1 INTEGER NOT NULL, k2 
VARCHAR, CONSTRAINT pk PRIMARY KEY (k1, k2 desc));
+Object[][] insertedRows = new Object[][]{{0, null}, {1, a}, {2, 
b}, {3, ba}, {4, baa}, {5, c}, {6, d}};
+Object[][] expectedRows = new Object[][]{{3}, {4}, {5}, {6}};
+runQueryTest(ddl, upsert(k1, k2), select(k1), insertedRows, 
expectedRows,
+new WhereCondition(k2, , 'b'), null, null);
+}
+
+@Test
+public void descVarLengthDescPKLTE() throws Exception {
+String ddl = CREATE TABLE  + TABLE +  (k1 INTEGER NOT NULL, k2 
VARCHAR, CONSTRAINT pk PRIMARY KEY (k1, k2 desc));
+Object[][] insertedRows = new Object[][]{{0, null}, {1, a}, {2, 
b}, {3, ba}, {4, bb}, {5, bc}, {6, bba}, {7, c}};
+Object[][] expectedRows = new Object[][]{{1}, {2}, {3}, {4}};
+runQueryTest(ddl, upsert(k1, k2), select(k1), insertedRows, 
expectedRows,
+new WhereCondition(k2, =, 'bb'), null, null);
+}
+
+@Test
+public void descVarLengthAscPKLTE() throws Exception {
+String ddl = CREATE TABLE  + TABLE +  (k1 INTEGER NOT NULL, k2 
VARCHAR, CONSTRAINT pk PRIMARY KEY (k1, 

[06/12] phoenix git commit: PHOENIX 2132 Minor addendum to fix RAT warning

[jamestaylor]

PHOENIX 2132 Minor addendum to fix RAT warning


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

Branch: refs/heads/4.5-HBase-0.98
Commit: b1ad90f05513c66aa0250e0044823063307dcf59
Parents: fd7523f
Author: Mujtaba mujt...@apache.org
Authored: Fri Jul 24 11:55:45 2015 -0700
Committer: James Taylor jtay...@salesforce.com
Committed: Tue Aug 11 18:36:52 2015 -0700

--
 phoenix-pherf/pom.xml | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/phoenix/blob/b1ad90f0/phoenix-pherf/pom.xml
--
diff --git a/phoenix-pherf/pom.xml b/phoenix-pherf/pom.xml
index 6824b1f..68a8905 100644
--- a/phoenix-pherf/pom.xml
+++ b/phoenix-pherf/pom.xml
@@ -195,7 +195,8 @@
artifactIdapache-rat-plugin/artifactId
configuration
excludes
-   excludeRESULTS/**/exclude
+   exclude*/RESULTS/**/exclude
+   excludeREADME.md/exclude
/excludes
/configuration
/plugin

[09/12] phoenix git commit: PHOENIX-2141 ComparisonExpression should return Boolean null if either operand is null

[jamestaylor]

PHOENIX-2141 ComparisonExpression should return Boolean null if either operand 
is null


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

Branch: refs/heads/4.5-HBase-0.98
Commit: e78a6481e5910d3c57c62a621b8711d00e7a07f4
Parents: aa68b55
Author: maryannxue wei@intel.com
Authored: Mon Jul 27 14:50:16 2015 -0400
Committer: James Taylor jtay...@salesforce.com
Committed: Tue Aug 11 18:36:52 2015 -0700

--
 .../phoenix/compile/ExpressionCompiler.java |  3 +
 .../apache/phoenix/compile/HavingCompiler.java  |  2 +-
 .../apache/phoenix/compile/WhereCompiler.java   |  2 +-
 .../apache/phoenix/compile/WhereOptimizer.java  |  2 +-
 .../phoenix/expression/AndExpression.java   |  3 +
 .../expression/ComparisonExpression.java|  4 +-
 .../phoenix/expression/LiteralExpression.java   | 23 ++--
 .../phoenix/expression/NullValueTest.java   | 59 
 8 files changed, 89 insertions(+), 9 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/phoenix/blob/e78a6481/phoenix-core/src/main/java/org/apache/phoenix/compile/ExpressionCompiler.java
--
diff --git 
a/phoenix-core/src/main/java/org/apache/phoenix/compile/ExpressionCompiler.java 
b/phoenix-core/src/main/java/org/apache/phoenix/compile/ExpressionCompiler.java
index 1278494..1523dce 100644
--- 
a/phoenix-core/src/main/java/org/apache/phoenix/compile/ExpressionCompiler.java
+++ 
b/phoenix-core/src/main/java/org/apache/phoenix/compile/ExpressionCompiler.java
@@ -251,6 +251,9 @@ public class ExpressionCompiler extends 
UnsupportedAllParseNodeVisitorExpressio
 if (child.getDataType() != PBoolean.INSTANCE) {
 throw TypeMismatchException.newException(PBoolean.INSTANCE, 
child.getDataType(), child.toString());
 }
+if (LiteralExpression.isBooleanNull(child)) {
+return child;
+}
 if (LiteralExpression.isFalse(child)) {
 iterator.remove();
 }

http://git-wip-us.apache.org/repos/asf/phoenix/blob/e78a6481/phoenix-core/src/main/java/org/apache/phoenix/compile/HavingCompiler.java
--
diff --git 
a/phoenix-core/src/main/java/org/apache/phoenix/compile/HavingCompiler.java 
b/phoenix-core/src/main/java/org/apache/phoenix/compile/HavingCompiler.java
index 224a9b4..9ccd2f0 100644
--- a/phoenix-core/src/main/java/org/apache/phoenix/compile/HavingCompiler.java
+++ b/phoenix-core/src/main/java/org/apache/phoenix/compile/HavingCompiler.java
@@ -54,7 +54,7 @@ public class HavingCompiler {
 if (expression.getDataType() != PBoolean.INSTANCE) {
 throw TypeMismatchException.newException(PBoolean.INSTANCE, 
expression.getDataType(), expression.toString());
 }
-if (LiteralExpression.isFalse(expression)) {
+if (LiteralExpression.isBooleanFalseOrNull(expression)) {
 context.setScanRanges(ScanRanges.NOTHING);
 return null;
 } else if (LiteralExpression.isTrue(expression)) {

http://git-wip-us.apache.org/repos/asf/phoenix/blob/e78a6481/phoenix-core/src/main/java/org/apache/phoenix/compile/WhereCompiler.java
--
diff --git 
a/phoenix-core/src/main/java/org/apache/phoenix/compile/WhereCompiler.java 
b/phoenix-core/src/main/java/org/apache/phoenix/compile/WhereCompiler.java
index 9631850..13963d7 100644
--- a/phoenix-core/src/main/java/org/apache/phoenix/compile/WhereCompiler.java
+++ b/phoenix-core/src/main/java/org/apache/phoenix/compile/WhereCompiler.java
@@ -235,7 +235,7 @@ public class WhereCompiler {
 private static void setScanFilter(StatementContext context, 
FilterableStatement statement, Expression whereClause, boolean 
disambiguateWithFamily, boolean hashJoinOptimization) {
 Scan scan = context.getScan();
 
-if (LiteralExpression.isFalse(whereClause)) {
+if (LiteralExpression.isBooleanFalseOrNull(whereClause)) {
 context.setScanRanges(ScanRanges.NOTHING);
 } else if (whereClause != null  
!LiteralExpression.isTrue(whereClause)  !hashJoinOptimization) {
 Filter filter = null;

http://git-wip-us.apache.org/repos/asf/phoenix/blob/e78a6481/phoenix-core/src/main/java/org/apache/phoenix/compile/WhereOptimizer.java
--
diff --git 
a/phoenix-core/src/main/java/org/apache/phoenix/compile/WhereOptimizer.java 
b/phoenix-core/src/main/java/org/apache/phoenix/compile/WhereOptimizer.java
index 

[01/12] phoenix git commit: Revert PHOENIX-1791. Adding ability for Pherf Write Workloads to write to a multi-tenant view.

[jamestaylor]

Repository: phoenix
Updated Branches:
  refs/heads/4.5-HBase-0.98 e9d8c01c8 - 71da8a021


Revert PHOENIX-1791. Adding ability for Pherf Write Workloads to write to a 
multi-tenant view.

This reverts commit e9d8c01c8141a2f402bd8466ebb71ed5418a1638.


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

Branch: refs/heads/4.5-HBase-0.98
Commit: 43cd3ae402d6c0dd16da73d96f1e4e47932f497e
Parents: e9d8c01
Author: James Taylor jtay...@salesforce.com
Authored: Tue Aug 11 18:12:43 2015 -0700
Committer: James Taylor jtay...@salesforce.com
Committed: Tue Aug 11 18:36:51 2015 -0700

--
 .../org/apache/phoenix/pherf/DataIngestIT.java  | 74 +++-
 .../phoenix/pherf/configuration/Scenario.java   | 25 ++-
 .../pherf/configuration/XMLConfigParser.java| 23 +++---
 .../apache/phoenix/pherf/util/PhoenixUtil.java  | 28 +++-
 .../phoenix/pherf/workload/WriteWorkload.java   | 36 +-
 .../datamodel/test_schema_mt_table.sql  | 31 
 .../resources/datamodel/test_schema_mt_view.sql |  1 -
 .../test/resources/scenario/test_scenario.xml   | 22 --
 8 files changed, 53 insertions(+), 187 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/phoenix/blob/43cd3ae4/phoenix-pherf/src/it/java/org/apache/phoenix/pherf/DataIngestIT.java
--
diff --git 
a/phoenix-pherf/src/it/java/org/apache/phoenix/pherf/DataIngestIT.java 
b/phoenix-pherf/src/it/java/org/apache/phoenix/pherf/DataIngestIT.java
index 2b9d309..8a340b3 100644
--- a/phoenix-pherf/src/it/java/org/apache/phoenix/pherf/DataIngestIT.java
+++ b/phoenix-pherf/src/it/java/org/apache/phoenix/pherf/DataIngestIT.java
@@ -18,19 +18,8 @@
 
 package org.apache.phoenix.pherf;
 
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertTrue;
-import static org.junit.Assert.fail;
-
-import java.sql.Connection;
-import java.sql.ResultSet;
-import java.sql.SQLException;
-import java.sql.Statement;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Map;
-
+import com.jcabi.jdbc.JdbcSession;
+import com.jcabi.jdbc.Outcome;
 import org.apache.phoenix.pherf.configuration.Column;
 import org.apache.phoenix.pherf.configuration.DataModel;
 import org.apache.phoenix.pherf.configuration.DataTypeMapping;
@@ -44,8 +33,15 @@ import org.apache.phoenix.pherf.workload.WriteWorkload;
 import org.junit.Before;
 import org.junit.Test;
 
-import com.jcabi.jdbc.JdbcSession;
-import com.jcabi.jdbc.Outcome;
+import java.sql.Connection;
+import java.sql.ResultSet;
+import java.sql.SQLException;
+import java.sql.Statement;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Map;
+
+import static org.junit.Assert.*;
 
 public class DataIngestIT extends ResultBaseTestIT {
 
@@ -148,52 +144,4 @@ public class DataIngestIT extends ResultBaseTestIT {
 fail(Failed to load data. An exception was thrown:  + 
e.getMessage());
 }
 }
-
-
-@Test
-/**
- * Validates that Pherf can write data to a Multi-Tenant View in addition 
to 
- * standard Phoenix tables.
- */
-public void testMultiTenantViewWriteWorkload() throws Exception {
-// Arrange
-Scenario scenario = parser.getScenarioByName(testMTWriteScenario);
-WorkloadExecutor executor = new WorkloadExecutor();
-executor.add(new WriteWorkload(util, parser, scenario));
-
-// Act
-try {
-// Wait for data to load up.
-executor.get();
-executor.shutdown();
-} catch (Exception e) {
-fail(Failed to load data. An exception was thrown:  + 
e.getMessage());
-}
-
-// Assert
-assertExpectedNumberOfRecordsWritten(scenario);
-
-}
-
-private void assertExpectedNumberOfRecordsWritten(Scenario scenario) 
throws Exception,
-SQLException {
-Connection connection = util.getConnection(scenario.getTenantId());
-String sql = select count(*) from  + scenario.getTableName();
-Integer count = new JdbcSession(connection).sql(sql).select(new 
OutcomeInteger() {
-@Override public Integer handle(ResultSet resultSet, Statement 
statement)
-throws SQLException {
-while (resultSet.next()) {
-return resultSet.getInt(1);
-}
-return null;
-}
-});
-assertNotNull(Could not retrieve count.  + count);
-assertTrue(Could not query any rows for in  + 
scenario.getTableName(), count  0);
-

[07/12] phoenix git commit: PHOENIX-2138 Non equality comparisons don't work for ARRAY type columns that are DESC in row key (Dumindu Buddhika)

[jamestaylor]

PHOENIX-2138 Non equality comparisons don't work for ARRAY type columns
that are DESC in row key (Dumindu Buddhika)


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

Branch: refs/heads/4.5-HBase-0.98
Commit: aa68b5568483f801bc0fc71ad94bfb3d452b4625
Parents: b1ad90f
Author: ramkrishna ramkrishna.s.vasude...@gmail.com
Authored: Sun Jul 26 12:06:11 2015 +0530
Committer: James Taylor jtay...@salesforce.com
Committed: Tue Aug 11 18:36:52 2015 -0700

--
 .../org/apache/phoenix/end2end/ArrayIT.java | 201 ++-
 .../apache/phoenix/iterate/ExplainTable.java|   4 +-
 .../phoenix/schema/types/PArrayDataType.java|   9 +-
 .../phoenix/schema/types/PhoenixArray.java  |   4 -
 4 files changed, 209 insertions(+), 9 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/phoenix/blob/aa68b556/phoenix-core/src/it/java/org/apache/phoenix/end2end/ArrayIT.java
--
diff --git a/phoenix-core/src/it/java/org/apache/phoenix/end2end/ArrayIT.java 
b/phoenix-core/src/it/java/org/apache/phoenix/end2end/ArrayIT.java
index 89997f4..800a7b4 100644
--- a/phoenix-core/src/it/java/org/apache/phoenix/end2end/ArrayIT.java
+++ b/phoenix-core/src/it/java/org/apache/phoenix/end2end/ArrayIT.java
@@ -2038,5 +2038,204 @@ public class ArrayIT extends BaseClientManagedTimeIT {
 assertFalse(rs.next());
 conn.close();
 }
-
+
+@Test
+public void testComparisonOperatorsForDesc1()throws Exception{
+long ts = nextTimestamp();
+Properties props = PropertiesUtil.deepCopy(TEST_PROPERTIES);
+props.setProperty(PhoenixRuntime.CURRENT_SCN_ATTRIB, Long.toString(ts 
+ 10));
+Connection conn = DriverManager.getConnection(getUrl(), props);
+String ddl = create table a (k varchar array primary key desc);
+conn.createStatement().execute(ddl);
+conn.close();
+
+props.setProperty(PhoenixRuntime.CURRENT_SCN_ATTRIB, Long.toString(ts 
+ 30));
+conn = DriverManager.getConnection(getUrl(), props);
+PreparedStatement stmt = conn.prepareStatement(upsert into a values 
(array['a', 'c']));
+stmt.execute();
+conn.commit();
+conn.close();
+
+props.setProperty(PhoenixRuntime.CURRENT_SCN_ATTRIB, Long.toString(ts 
+ 40));
+conn = DriverManager.getConnection(getUrl(), props);
+ResultSet rs;
+stmt = conn.prepareStatement(select * from a where k = array['a', 
'b']);
+rs = stmt.executeQuery();
+assertTrue(rs.next());
+}
+
+@Test
+public void testComparisonOperatorsForDesc2()throws Exception{
+long ts = nextTimestamp();
+Properties props = PropertiesUtil.deepCopy(TEST_PROPERTIES);
+props.setProperty(PhoenixRuntime.CURRENT_SCN_ATTRIB, Long.toString(ts 
+ 10));
+Connection conn = DriverManager.getConnection(getUrl(), props);
+String ddl = create table a (k varchar array primary key desc);
+conn.createStatement().execute(ddl);
+conn.close();
+
+props.setProperty(PhoenixRuntime.CURRENT_SCN_ATTRIB, Long.toString(ts 
+ 30));
+conn = DriverManager.getConnection(getUrl(), props);
+PreparedStatement stmt = conn.prepareStatement(upsert into a values 
(array['a', 'c']));
+stmt.execute();
+conn.commit();
+conn.close();
+
+props.setProperty(PhoenixRuntime.CURRENT_SCN_ATTRIB, Long.toString(ts 
+ 40));
+conn = DriverManager.getConnection(getUrl(), props);
+ResultSet rs;
+stmt = conn.prepareStatement(select * from a where k = array['a', 
'c']);
+rs = stmt.executeQuery();
+assertTrue(rs.next());
+}
+
+@Test
+public void testComparisonOperatorsForDesc3()throws Exception{
+long ts = nextTimestamp();
+Properties props = PropertiesUtil.deepCopy(TEST_PROPERTIES);
+props.setProperty(PhoenixRuntime.CURRENT_SCN_ATTRIB, Long.toString(ts 
+ 10));
+Connection conn = DriverManager.getConnection(getUrl(), props);
+String ddl = create table a (k varchar array primary key desc);
+conn.createStatement().execute(ddl);
+conn.close();
+
+props.setProperty(PhoenixRuntime.CURRENT_SCN_ATTRIB, Long.toString(ts 
+ 30));
+conn = DriverManager.getConnection(getUrl(), props);
+PreparedStatement stmt = conn.prepareStatement(upsert into a values 
(array['a', 'c']));
+stmt.execute();
+conn.commit();
+conn.close();
+
+props.setProperty(PhoenixRuntime.CURRENT_SCN_ATTRIB, Long.toString(ts 
+ 40));
+conn = 

[03/12] phoenix git commit: PHOENIX-2149 MAX Value of Sequences not honored when closing Connection between calls to NEXT VALUE FOR (Jan Fernando)

[jamestaylor]

PHOENIX-2149 MAX Value of Sequences not honored when closing Connection between 
calls to NEXT VALUE FOR (Jan Fernando)


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

Branch: refs/heads/4.5-HBase-1.1
Commit: fc6f39212ca24aac0d8130b287210fcb69ff49ae
Parents: 818567c
Author: Thomas D'Silva tdsi...@salesforce.com
Authored: Mon Jul 27 13:15:17 2015 -0700
Committer: James Taylor jtay...@salesforce.com
Committed: Tue Aug 11 18:44:51 2015 -0700

--
 .../org/apache/phoenix/end2end/SequenceIT.java  | 33 
 .../org/apache/phoenix/schema/Sequence.java |  3 +-
 2 files changed, 34 insertions(+), 2 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/phoenix/blob/fc6f3921/phoenix-core/src/it/java/org/apache/phoenix/end2end/SequenceIT.java
--
diff --git 
a/phoenix-core/src/it/java/org/apache/phoenix/end2end/SequenceIT.java 
b/phoenix-core/src/it/java/org/apache/phoenix/end2end/SequenceIT.java
index 4273022..78f8132 100644
--- a/phoenix-core/src/it/java/org/apache/phoenix/end2end/SequenceIT.java
+++ b/phoenix-core/src/it/java/org/apache/phoenix/end2end/SequenceIT.java
@@ -54,6 +54,7 @@ import com.google.common.collect.Lists;
 
 public class SequenceIT extends BaseClientManagedTimeIT {
 private static final String NEXT_VAL_SQL = SELECT NEXT VALUE FOR foo.bar 
FROM SYSTEM.\SEQUENCE\;
+private static final String SELECT_NEXT_VALUE_SQL = SELECT NEXT VALUE FOR 
%s FROM SYSTEM.\SEQUENCE\;
 private static final long BATCH_SIZE = 3;

 private Connection conn;
@@ -1147,6 +1148,38 @@ public class SequenceIT extends BaseClientManagedTimeIT {
 assertEquals(1, rs.getLong(metric_val));
 assertFalse(rs.next());
 }
+
+@Test
+/**
+ * Test to validate that the bug discovered in PHOENIX-2149 has been 
fixed. There was an issue
+ * whereby, when closing connections and returning sequences we were not 
setting the limit
+ * reached flag correctly and this was causing the max value to be ignored 
as the LIMIT_REACHED_FLAG
+ * value was being unset from true to false.
+ */
+public void testNextValuesForSequenceClosingConnections() throws Exception 
{
+
+// Create Sequence
+nextConnection();
+conn.createStatement().execute(CREATE SEQUENCE seqtest.closeconn 
START WITH 4990 MINVALUE 4990 MAXVALUE 5000 CACHE 10);
+nextConnection();
+
+// Call NEXT VALUE FOR 1 time more than available values in the 
Sequence. We expected the final time
+// to throw an error as we will have reached the max value
+try {
+long val = 0L;
+for (int i = 0; i = 11; i++) {
+ResultSet rs = 
conn.createStatement().executeQuery(String.format(SELECT_NEXT_VALUE_SQL, 
seqtest.closeconn));
+rs.next();
+val = rs.getLong(1);
+nextConnection();
+}
+fail(Expect to fail as we have arrived at the max sequence value 
 + val);
+} catch (SQLException e) {
+
assertEquals(SQLExceptionCode.SEQUENCE_VAL_REACHED_MAX_VALUE.getErrorCode(),
+e.getErrorCode());
+assertTrue(e.getNextException() == null);
+}
+}
 
 private void insertEvent(long id, String userId, long val) throws 
SQLException {
 PreparedStatement stmt = conn.prepareStatement(UPSERT INTO events 
VALUES(?,?,?));

http://git-wip-us.apache.org/repos/asf/phoenix/blob/fc6f3921/phoenix-core/src/main/java/org/apache/phoenix/schema/Sequence.java
--
diff --git a/phoenix-core/src/main/java/org/apache/phoenix/schema/Sequence.java 
b/phoenix-core/src/main/java/org/apache/phoenix/schema/Sequence.java
index adca5e8..a2041f7 100644
--- a/phoenix-core/src/main/java/org/apache/phoenix/schema/Sequence.java
+++ b/phoenix-core/src/main/java/org/apache/phoenix/schema/Sequence.java
@@ -302,8 +302,7 @@ public class Sequence {
 Mapbyte[], ListCell familyMap = append.getFamilyCellMap();
 familyMap.put(PhoenixDatabaseMetaData.SEQUENCE_FAMILY_BYTES, 
Arrays.CellasList(
(Cell)KeyValueUtil.newKeyValue(key, 
PhoenixDatabaseMetaData.SEQUENCE_FAMILY_BYTES, 
PhoenixDatabaseMetaData.CURRENT_VALUE_BYTES, value.timestamp, 
PLong.INSTANCE.toBytes(value.currentValue)),
-   // set LIMIT_REACHED flag to false since we are 
returning unused sequence values
-   (Cell)KeyValueUtil.newKeyValue(key, 
PhoenixDatabaseMetaData.SEQUENCE_FAMILY_BYTES, 

[11/12] phoenix git commit: PHOENIX-2137 Range query on DECIMAL DESC sometimes incorrect

[jamestaylor]

PHOENIX-2137 Range query on DECIMAL DESC sometimes incorrect

Conflicts:

phoenix-core/src/test/java/org/apache/phoenix/compile/WhereOptimizerTest.java


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

Branch: refs/heads/4.5-HBase-1.1
Commit: 149cd24f37ff4d799ae680ec3fd622cdf8543004
Parents: 9c4cdb6
Author: James Taylor jtay...@salesforce.com
Authored: Mon Aug 3 16:40:47 2015 -0700
Committer: James Taylor jtay...@salesforce.com
Committed: Tue Aug 11 18:44:51 2015 -0700

--
 .../org/apache/phoenix/end2end/SortOrderIT.java | 110 ++-
 .../org/apache/phoenix/compile/ScanRanges.java  |   7 +-
 .../DescVarLengthFastByteComparisons.java   |  12 ++
 .../apache/phoenix/filter/SkipScanFilter.java   |  13 ++-
 .../java/org/apache/phoenix/query/KeyRange.java |  42 +++
 .../apache/phoenix/schema/types/PDataType.java  |   3 +-
 .../java/org/apache/phoenix/util/ScanUtil.java  |  64 +--
 .../org/apache/phoenix/util/SchemaUtil.java |   2 +-
 .../phoenix/compile/WhereOptimizerTest.java |  20 
 .../DescVarLengthFastByteComparisonsTest.java   |  45 
 .../expression/SortOrderExpressionTest.java |  13 ++-
 11 files changed, 288 insertions(+), 43 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/phoenix/blob/149cd24f/phoenix-core/src/it/java/org/apache/phoenix/end2end/SortOrderIT.java
--
diff --git 
a/phoenix-core/src/it/java/org/apache/phoenix/end2end/SortOrderIT.java 
b/phoenix-core/src/it/java/org/apache/phoenix/end2end/SortOrderIT.java
index 0e8fb4f..9228ab5 100644
--- a/phoenix-core/src/it/java/org/apache/phoenix/end2end/SortOrderIT.java
+++ b/phoenix-core/src/it/java/org/apache/phoenix/end2end/SortOrderIT.java
@@ -18,6 +18,7 @@
 package org.apache.phoenix.end2end;
 
 import static org.apache.phoenix.util.TestUtil.TEST_PROPERTIES;
+import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertFalse;
 import static org.junit.Assert.assertTrue;
 
@@ -28,12 +29,18 @@ import java.sql.Date;
 import java.sql.DriverManager;
 import java.sql.PreparedStatement;
 import java.sql.ResultSet;
+import java.sql.SQLException;
+import java.util.ArrayList;
 import java.util.Calendar;
+import java.util.Collections;
 import java.util.GregorianCalendar;
 import java.util.List;
 import java.util.Properties;
 
 import org.apache.commons.lang.ArrayUtils;
+import org.apache.phoenix.schema.SortOrder;
+import org.apache.phoenix.schema.types.PDataType;
+import org.apache.phoenix.schema.types.PDecimal;
 import org.apache.phoenix.util.PropertiesUtil;
 import org.junit.Assert;
 import org.junit.Test;
@@ -357,6 +364,102 @@ public class SortOrderIT extends BaseHBaseManagedTimeIT {
 null, null, new OrderBy(id, OrderBy.Direction.DESC));
 }
 
+@Test
+public void descVarLengthAscPKGT() throws Exception {
+String ddl = CREATE TABLE  + TABLE +  (k1 INTEGER NOT NULL, k2 
VARCHAR, CONSTRAINT pk PRIMARY KEY (k1, k2));
+Object[][] insertedRows = new Object[][]{{0, null}, {1, a}, {2, 
b}, {3, ba}, {4, baa}, {5, c}, {6, d}};
+Object[][] expectedRows = new Object[][]{{3}, {4}, {5}, {6}};
+runQueryTest(ddl, upsert(k1, k2), select(k1), insertedRows, 
expectedRows,
+new WhereCondition(k2, , 'b'), null, null);
+}
+
+@Test
+public void descVarLengthDescPKGT() throws Exception {
+String ddl = CREATE TABLE  + TABLE +  (k1 INTEGER NOT NULL, k2 
VARCHAR, CONSTRAINT pk PRIMARY KEY (k1, k2 desc));
+Object[][] insertedRows = new Object[][]{{0, null}, {1, a}, {2, 
b}, {3, ba}, {4, baa}, {5, c}, {6, d}};
+Object[][] expectedRows = new Object[][]{{3}, {4}, {5}, {6}};
+runQueryTest(ddl, upsert(k1, k2), select(k1), insertedRows, 
expectedRows,
+new WhereCondition(k2, , 'b'), null, null);
+}
+
+@Test
+public void descVarLengthDescPKLTE() throws Exception {
+String ddl = CREATE TABLE  + TABLE +  (k1 INTEGER NOT NULL, k2 
VARCHAR, CONSTRAINT pk PRIMARY KEY (k1, k2 desc));
+Object[][] insertedRows = new Object[][]{{0, null}, {1, a}, {2, 
b}, {3, ba}, {4, bb}, {5, bc}, {6, bba}, {7, c}};
+Object[][] expectedRows = new Object[][]{{1}, {2}, {3}, {4}};
+runQueryTest(ddl, upsert(k1, k2), select(k1), insertedRows, 
expectedRows,
+new WhereCondition(k2, =, 'bb'), null, null);
+}
+
+@Test
+public void descVarLengthAscPKLTE() throws Exception {
+String ddl = CREATE TABLE  + TABLE +  (k1 INTEGER NOT NULL, k2 
VARCHAR, CONSTRAINT pk PRIMARY KEY (k1, k2));

[02/12] phoenix git commit: PHOENIX-1994 - TestIndexWriter#testFailureOnRunningUpdateAbortsPending() deadlocks on JDK 8

[jamestaylor]

PHOENIX-1994 - TestIndexWriter#testFailureOnRunningUpdateAbortsPending() 
deadlocks on JDK 8


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

Branch: refs/heads/4.5-HBase-1.1
Commit: 9c4cdb6cac8c09876f60f1641fe449c5fa380559
Parents: 0ba0e7b
Author: Cody Marcel cody.mar...@gmail.com
Authored: Mon Aug 10 12:08:07 2015 -0700
Committer: James Taylor jtay...@salesforce.com
Committed: Tue Aug 11 18:44:51 2015 -0700

--
 .../java/org/apache/phoenix/hbase/index/write/TestIndexWriter.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/phoenix/blob/9c4cdb6c/phoenix-core/src/test/java/org/apache/phoenix/hbase/index/write/TestIndexWriter.java
--
diff --git 
a/phoenix-core/src/test/java/org/apache/phoenix/hbase/index/write/TestIndexWriter.java
 
b/phoenix-core/src/test/java/org/apache/phoenix/hbase/index/write/TestIndexWriter.java
index 37a8cf4..8f576cf 100644
--- 
a/phoenix-core/src/test/java/org/apache/phoenix/hbase/index/write/TestIndexWriter.java
+++ 
b/phoenix-core/src/test/java/org/apache/phoenix/hbase/index/write/TestIndexWriter.java
@@ -145,7 +145,7 @@ public class TestIndexWriter {
 Abortable abort = new StubAbortable();
 Stoppable stop = Mockito.mock(Stoppable.class);
 // single thread factory so the older request gets queued
-ExecutorService exec = Executors.newFixedThreadPool(1);
+ExecutorService exec = Executors.newFixedThreadPool(3);
 MapImmutableBytesPtr, HTableInterface tables = new 
HashMapImmutableBytesPtr, HTableInterface();
 FakeTableFactory factory = new FakeTableFactory(tables);
 

[10/12] phoenix git commit: PHOENIX-2145 Pherf - Make update stats optional and fix threads not exiting after performance run

[jamestaylor]

PHOENIX-2145 Pherf - Make update stats optional and fix threads not exiting 
after performance run


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

Branch: refs/heads/4.5-HBase-1.1
Commit: 7cf5e20ea7f33e40cb4d38603ec185eb4d6b5819
Parents: f2b94a7
Author: Mujtaba mujt...@apache.org
Authored: Tue Aug 4 15:47:44 2015 -0700
Committer: James Taylor jtay...@salesforce.com
Committed: Tue Aug 11 18:44:51 2015 -0700

--
 phoenix-pherf/pom.xml   |  3 --
 .../org/apache/phoenix/pherf/DataIngestIT.java  |  4 +-
 .../src/main/assembly/components-minimal.xml|  2 +-
 .../java/org/apache/phoenix/pherf/Pherf.java| 23 +--
 .../apache/phoenix/pherf/PherfConstants.java|  5 +++
 .../apache/phoenix/pherf/util/PhoenixUtil.java  | 11 +
 .../phoenix/pherf/workload/QueryExecutor.java   |  3 +-
 .../phoenix/pherf/workload/WriteWorkload.java   | 43 ++--
 .../org/apache/phoenix/pherf/PherfTest.java |  2 +-
 9 files changed, 55 insertions(+), 41 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/phoenix/blob/7cf5e20e/phoenix-pherf/pom.xml
--
diff --git a/phoenix-pherf/pom.xml b/phoenix-pherf/pom.xml
index b734e4d..d68ddc7 100644
--- a/phoenix-pherf/pom.xml
+++ b/phoenix-pherf/pom.xml
@@ -108,9 +108,6 @@
/resource
resource
directoryconfig/directory
-   includes
-   include**/*.properties/include
-   /includes
/resource
/resources
testResources

http://git-wip-us.apache.org/repos/asf/phoenix/blob/7cf5e20e/phoenix-pherf/src/it/java/org/apache/phoenix/pherf/DataIngestIT.java
--
diff --git 
a/phoenix-pherf/src/it/java/org/apache/phoenix/pherf/DataIngestIT.java 
b/phoenix-pherf/src/it/java/org/apache/phoenix/pherf/DataIngestIT.java
index 8a340b3..1defbb1 100644
--- a/phoenix-pherf/src/it/java/org/apache/phoenix/pherf/DataIngestIT.java
+++ b/phoenix-pherf/src/it/java/org/apache/phoenix/pherf/DataIngestIT.java
@@ -20,6 +20,8 @@ package org.apache.phoenix.pherf;
 
 import com.jcabi.jdbc.JdbcSession;
 import com.jcabi.jdbc.Outcome;
+
+import org.apache.phoenix.pherf.PherfConstants.GeneratePhoenixStats;
 import org.apache.phoenix.pherf.configuration.Column;
 import org.apache.phoenix.pherf.configuration.DataModel;
 import org.apache.phoenix.pherf.configuration.DataTypeMapping;
@@ -66,7 +68,7 @@ public class DataIngestIT extends ResultBaseTestIT {
 scenario.getTableNameWithoutSchemaName(), 
util.getConnection());
 assertTrue(Could not get phoenix columns., 
columnListFromPhoenix.size()  0);
 
-WriteWorkload loader = new WriteWorkload(util, parser, scenario);
+WriteWorkload loader = new WriteWorkload(util, parser, scenario, 
GeneratePhoenixStats.NO);
 WorkloadExecutor executor = new WorkloadExecutor();
 executor.add(loader);
 executor.get();

http://git-wip-us.apache.org/repos/asf/phoenix/blob/7cf5e20e/phoenix-pherf/src/main/assembly/components-minimal.xml
--
diff --git a/phoenix-pherf/src/main/assembly/components-minimal.xml 
b/phoenix-pherf/src/main/assembly/components-minimal.xml
index 38c6929..9c9b9a1 100644
--- a/phoenix-pherf/src/main/assembly/components-minimal.xml
+++ b/phoenix-pherf/src/main/assembly/components-minimal.xml
@@ -23,7 +23,7 @@
   outputDirectory//outputDirectory
   includes
 includeorg.apache.phoenix:phoenix-pherf/include
-includeorg.jfree:jfreechart/include
+includeorg.jfree:*/include
 includecom.googlecode.java-diff-utils:diffutils/include
 includeorg.apache.commons:commons-lang3/include
 includeorg.apache.commons:commons-math3/include

http://git-wip-us.apache.org/repos/asf/phoenix/blob/7cf5e20e/phoenix-pherf/src/main/java/org/apache/phoenix/pherf/Pherf.java
--
diff --git a/phoenix-pherf/src/main/java/org/apache/phoenix/pherf/Pherf.java 
b/phoenix-pherf/src/main/java/org/apache/phoenix/pherf/Pherf.java
index 5a9f45f..0421b6f 100644
--- a/phoenix-pherf/src/main/java/org/apache/phoenix/pherf/Pherf.java
+++ b/phoenix-pherf/src/main/java/org/apache/phoenix/pherf/Pherf.java
@@ -19,6 +19,7 @@
 package org.apache.phoenix.pherf;
 
 import org.apache.commons.cli.*;

[07/12] phoenix git commit: PHOENIX-2138 Non equality comparisons don't work for ARRAY type columns that are DESC in row key (Dumindu Buddhika)

[jamestaylor]

PHOENIX-2138 Non equality comparisons don't work for ARRAY type columns
that are DESC in row key (Dumindu Buddhika)


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

Branch: refs/heads/4.5-HBase-1.1
Commit: 7c8e5f0b91f50bdee27360843079ef3f0d0ed20f
Parents: 9a4f9d8
Author: ramkrishna ramkrishna.s.vasude...@gmail.com
Authored: Sun Jul 26 12:06:11 2015 +0530
Committer: James Taylor jtay...@salesforce.com
Committed: Tue Aug 11 18:44:51 2015 -0700

--
 .../org/apache/phoenix/end2end/ArrayIT.java | 201 ++-
 .../apache/phoenix/iterate/ExplainTable.java|   4 +-
 .../phoenix/schema/types/PArrayDataType.java|   9 +-
 .../phoenix/schema/types/PhoenixArray.java  |   4 -
 4 files changed, 209 insertions(+), 9 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/phoenix/blob/7c8e5f0b/phoenix-core/src/it/java/org/apache/phoenix/end2end/ArrayIT.java
--
diff --git a/phoenix-core/src/it/java/org/apache/phoenix/end2end/ArrayIT.java 
b/phoenix-core/src/it/java/org/apache/phoenix/end2end/ArrayIT.java
index 89997f4..800a7b4 100644
--- a/phoenix-core/src/it/java/org/apache/phoenix/end2end/ArrayIT.java
+++ b/phoenix-core/src/it/java/org/apache/phoenix/end2end/ArrayIT.java
@@ -2038,5 +2038,204 @@ public class ArrayIT extends BaseClientManagedTimeIT {
 assertFalse(rs.next());
 conn.close();
 }
-
+
+@Test
+public void testComparisonOperatorsForDesc1()throws Exception{
+long ts = nextTimestamp();
+Properties props = PropertiesUtil.deepCopy(TEST_PROPERTIES);
+props.setProperty(PhoenixRuntime.CURRENT_SCN_ATTRIB, Long.toString(ts 
+ 10));
+Connection conn = DriverManager.getConnection(getUrl(), props);
+String ddl = create table a (k varchar array primary key desc);
+conn.createStatement().execute(ddl);
+conn.close();
+
+props.setProperty(PhoenixRuntime.CURRENT_SCN_ATTRIB, Long.toString(ts 
+ 30));
+conn = DriverManager.getConnection(getUrl(), props);
+PreparedStatement stmt = conn.prepareStatement(upsert into a values 
(array['a', 'c']));
+stmt.execute();
+conn.commit();
+conn.close();
+
+props.setProperty(PhoenixRuntime.CURRENT_SCN_ATTRIB, Long.toString(ts 
+ 40));
+conn = DriverManager.getConnection(getUrl(), props);
+ResultSet rs;
+stmt = conn.prepareStatement(select * from a where k = array['a', 
'b']);
+rs = stmt.executeQuery();
+assertTrue(rs.next());
+}
+
+@Test
+public void testComparisonOperatorsForDesc2()throws Exception{
+long ts = nextTimestamp();
+Properties props = PropertiesUtil.deepCopy(TEST_PROPERTIES);
+props.setProperty(PhoenixRuntime.CURRENT_SCN_ATTRIB, Long.toString(ts 
+ 10));
+Connection conn = DriverManager.getConnection(getUrl(), props);
+String ddl = create table a (k varchar array primary key desc);
+conn.createStatement().execute(ddl);
+conn.close();
+
+props.setProperty(PhoenixRuntime.CURRENT_SCN_ATTRIB, Long.toString(ts 
+ 30));
+conn = DriverManager.getConnection(getUrl(), props);
+PreparedStatement stmt = conn.prepareStatement(upsert into a values 
(array['a', 'c']));
+stmt.execute();
+conn.commit();
+conn.close();
+
+props.setProperty(PhoenixRuntime.CURRENT_SCN_ATTRIB, Long.toString(ts 
+ 40));
+conn = DriverManager.getConnection(getUrl(), props);
+ResultSet rs;
+stmt = conn.prepareStatement(select * from a where k = array['a', 
'c']);
+rs = stmt.executeQuery();
+assertTrue(rs.next());
+}
+
+@Test
+public void testComparisonOperatorsForDesc3()throws Exception{
+long ts = nextTimestamp();
+Properties props = PropertiesUtil.deepCopy(TEST_PROPERTIES);
+props.setProperty(PhoenixRuntime.CURRENT_SCN_ATTRIB, Long.toString(ts 
+ 10));
+Connection conn = DriverManager.getConnection(getUrl(), props);
+String ddl = create table a (k varchar array primary key desc);
+conn.createStatement().execute(ddl);
+conn.close();
+
+props.setProperty(PhoenixRuntime.CURRENT_SCN_ATTRIB, Long.toString(ts 
+ 30));
+conn = DriverManager.getConnection(getUrl(), props);
+PreparedStatement stmt = conn.prepareStatement(upsert into a values 
(array['a', 'c']));
+stmt.execute();
+conn.commit();
+conn.close();
+
+props.setProperty(PhoenixRuntime.CURRENT_SCN_ATTRIB, Long.toString(ts 
+ 40));
+conn = 

[06/12] phoenix git commit: PHOENIX 2132 Minor addendum to fix RAT warning

[jamestaylor]

PHOENIX 2132 Minor addendum to fix RAT warning


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

Branch: refs/heads/4.5-HBase-1.1
Commit: 9a4f9d8899dcc2ac049c168268b28c548e46a550
Parents: 9ac3396
Author: Mujtaba mujt...@apache.org
Authored: Fri Jul 24 11:55:45 2015 -0700
Committer: James Taylor jtay...@salesforce.com
Committed: Tue Aug 11 18:44:51 2015 -0700

--
 phoenix-pherf/pom.xml | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/phoenix/blob/9a4f9d88/phoenix-pherf/pom.xml
--
diff --git a/phoenix-pherf/pom.xml b/phoenix-pherf/pom.xml
index e08670c..b734e4d 100644
--- a/phoenix-pherf/pom.xml
+++ b/phoenix-pherf/pom.xml
@@ -195,7 +195,8 @@
artifactIdapache-rat-plugin/artifactId
configuration
excludes
-   excludeRESULTS/**/exclude
+   exclude*/RESULTS/**/exclude
+   excludeREADME.md/exclude
/excludes
/configuration
/plugin

[08/12] phoenix git commit: PHOENIX-2155 Add gpg signing to release profile

[jamestaylor]

PHOENIX-2155 Add gpg signing to release profile


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

Branch: refs/heads/4.5-HBase-1.1
Commit: f2b94a7bf0463900dcf8a331f2dd12491a0cf622
Parents: fc6f392
Author: Mujtaba mujt...@apache.org
Authored: Wed Jul 29 13:06:52 2015 -0700
Committer: James Taylor jtay...@salesforce.com
Committed: Tue Aug 11 18:44:51 2015 -0700

--
 pom.xml | 15 ++-
 1 file changed, 14 insertions(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/phoenix/blob/f2b94a7b/pom.xml
--
diff --git a/pom.xml b/pom.xml
index 2e2c6c2..cce0311 100644
--- a/pom.xml
+++ b/pom.xml
@@ -788,9 +788,22 @@
   /execution
 /executions
   /plugin
+  plugin
+groupIdorg.apache.maven.plugins/groupId
+artifactIdmaven-gpg-plugin/artifactId
+version1.6/version
+executions
+  execution
+  idsign-artifacts/id
+  phaseverify/phase
+goals
+  goalsign/goal
+/goals
+  /execution
+/executions
+  /plugin
 /plugins
   /build
 /profile
-
   /profiles
 /project

[01/12] phoenix git commit: PHOENIX-2171 DOUBLE and FLOAT DESC are stored as ASC

[jamestaylor]

Repository: phoenix
Updated Branches:
  refs/heads/4.5-HBase-1.1 93bd2c33c - 6c8d08e9e


PHOENIX-2171 DOUBLE and FLOAT DESC are stored as ASC


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

Branch: refs/heads/4.5-HBase-1.1
Commit: 6c8d08e9e4e12d1f4231c67f1c09eda9f0d0a504
Parents: 149cd24
Author: James Taylor jtay...@salesforce.com
Authored: Tue Aug 11 01:59:23 2015 -0700
Committer: James Taylor jtay...@salesforce.com
Committed: Tue Aug 11 18:44:51 2015 -0700

--
 .../org/apache/phoenix/end2end/SortOrderIT.java |  6 ++--
 .../UngroupedAggregateRegionObserver.java   |  6 
 .../org/apache/phoenix/schema/PTableImpl.java   | 10 +-
 .../apache/phoenix/schema/types/PDataType.java  |  4 +--
 .../apache/phoenix/schema/types/PDouble.java| 18 +++
 .../org/apache/phoenix/schema/types/PFloat.java | 18 ++-
 .../org/apache/phoenix/util/UpgradeUtil.java|  5 +++
 .../phoenix/schema/types/PDataTypeTest.java | 33 
 8 files changed, 82 insertions(+), 18 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/phoenix/blob/6c8d08e9/phoenix-core/src/it/java/org/apache/phoenix/end2end/SortOrderIT.java
--
diff --git 
a/phoenix-core/src/it/java/org/apache/phoenix/end2end/SortOrderIT.java 
b/phoenix-core/src/it/java/org/apache/phoenix/end2end/SortOrderIT.java
index 9228ab5..fdbd26d 100644
--- a/phoenix-core/src/it/java/org/apache/phoenix/end2end/SortOrderIT.java
+++ b/phoenix-core/src/it/java/org/apache/phoenix/end2end/SortOrderIT.java
@@ -41,6 +41,8 @@ import org.apache.commons.lang.ArrayUtils;
 import org.apache.phoenix.schema.SortOrder;
 import org.apache.phoenix.schema.types.PDataType;
 import org.apache.phoenix.schema.types.PDecimal;
+import org.apache.phoenix.schema.types.PDouble;
+import org.apache.phoenix.schema.types.PFloat;
 import org.apache.phoenix.util.PropertiesUtil;
 import org.junit.Assert;
 import org.junit.Test;
@@ -404,7 +406,7 @@ public class SortOrderIT extends BaseHBaseManagedTimeIT {
 public void testNonPKCompare() throws Exception {
 ListInteger expectedResults = Lists.newArrayList(2,3,4);
 Integer[] saltBuckets = new Integer[] {null,3};
-PDataType[] dataTypes = new PDataType[] {PDecimal.INSTANCE};
+PDataType[] dataTypes = new PDataType[] {PDecimal.INSTANCE, 
PDouble.INSTANCE, PFloat.INSTANCE};
 for (Integer saltBucket : saltBuckets) {
 for (PDataType dataType : dataTypes) {
 for (SortOrder sortOrder : SortOrder.values()) {
@@ -420,7 +422,7 @@ public class SortOrderIT extends BaseHBaseManagedTimeIT {
 ListInteger rExpectedResults = new ArrayList(expectedResults);
 Collections.reverse(rExpectedResults);
 Integer[] saltBuckets = new Integer[] {null,3};
-PDataType[] dataTypes = new PDataType[] {PDecimal.INSTANCE};
+PDataType[] dataTypes = new PDataType[] {PDecimal.INSTANCE, 
PDouble.INSTANCE, PFloat.INSTANCE};
 for (Integer saltBucket : saltBuckets) {
 for (PDataType dataType : dataTypes) {
 for (SortOrder sortOrder : SortOrder.values()) {

http://git-wip-us.apache.org/repos/asf/phoenix/blob/6c8d08e9/phoenix-core/src/main/java/org/apache/phoenix/coprocessor/UngroupedAggregateRegionObserver.java
--
diff --git 
a/phoenix-core/src/main/java/org/apache/phoenix/coprocessor/UngroupedAggregateRegionObserver.java
 
b/phoenix-core/src/main/java/org/apache/phoenix/coprocessor/UngroupedAggregateRegionObserver.java
index a7e3e44..6b51138 100644
--- 
a/phoenix-core/src/main/java/org/apache/phoenix/coprocessor/UngroupedAggregateRegionObserver.java
+++ 
b/phoenix-core/src/main/java/org/apache/phoenix/coprocessor/UngroupedAggregateRegionObserver.java
@@ -88,6 +88,8 @@ import org.apache.phoenix.schema.tuple.MultiKeyValueTuple;
 import org.apache.phoenix.schema.types.PBinary;
 import org.apache.phoenix.schema.types.PChar;
 import org.apache.phoenix.schema.types.PDataType;
+import org.apache.phoenix.schema.types.PDouble;
+import org.apache.phoenix.schema.types.PFloat;
 import org.apache.phoenix.util.ByteUtil;
 import org.apache.phoenix.util.IndexUtil;
 import org.apache.phoenix.util.KeyValueUtil;
@@ -312,6 +314,10 @@ public class UngroupedAggregateRegionObserver extends 
BaseScannerRegionObserver{
 len--;
 }
 ptr.set(ptr.get(), 
ptr.getOffset(), len);
+// Special case 

[09/12] phoenix git commit: PHOENIX-2141 ComparisonExpression should return Boolean null if either operand is null

[jamestaylor]

PHOENIX-2141 ComparisonExpression should return Boolean null if either operand 
is null


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

Branch: refs/heads/4.5-HBase-1.1
Commit: 818567c7f73b6aedb9562b9e880b19f5971bddca
Parents: 7c8e5f0
Author: maryannxue wei@intel.com
Authored: Mon Jul 27 14:50:16 2015 -0400
Committer: James Taylor jtay...@salesforce.com
Committed: Tue Aug 11 18:44:51 2015 -0700

--
 .../phoenix/compile/ExpressionCompiler.java |  3 +
 .../apache/phoenix/compile/HavingCompiler.java  |  2 +-
 .../apache/phoenix/compile/WhereCompiler.java   |  2 +-
 .../apache/phoenix/compile/WhereOptimizer.java  |  2 +-
 .../phoenix/expression/AndExpression.java   |  3 +
 .../expression/ComparisonExpression.java|  4 +-
 .../phoenix/expression/LiteralExpression.java   | 23 ++--
 .../phoenix/expression/NullValueTest.java   | 59 
 8 files changed, 89 insertions(+), 9 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/phoenix/blob/818567c7/phoenix-core/src/main/java/org/apache/phoenix/compile/ExpressionCompiler.java
--
diff --git 
a/phoenix-core/src/main/java/org/apache/phoenix/compile/ExpressionCompiler.java 
b/phoenix-core/src/main/java/org/apache/phoenix/compile/ExpressionCompiler.java
index 1278494..1523dce 100644
--- 
a/phoenix-core/src/main/java/org/apache/phoenix/compile/ExpressionCompiler.java
+++ 
b/phoenix-core/src/main/java/org/apache/phoenix/compile/ExpressionCompiler.java
@@ -251,6 +251,9 @@ public class ExpressionCompiler extends 
UnsupportedAllParseNodeVisitorExpressio
 if (child.getDataType() != PBoolean.INSTANCE) {
 throw TypeMismatchException.newException(PBoolean.INSTANCE, 
child.getDataType(), child.toString());
 }
+if (LiteralExpression.isBooleanNull(child)) {
+return child;
+}
 if (LiteralExpression.isFalse(child)) {
 iterator.remove();
 }

http://git-wip-us.apache.org/repos/asf/phoenix/blob/818567c7/phoenix-core/src/main/java/org/apache/phoenix/compile/HavingCompiler.java
--
diff --git 
a/phoenix-core/src/main/java/org/apache/phoenix/compile/HavingCompiler.java 
b/phoenix-core/src/main/java/org/apache/phoenix/compile/HavingCompiler.java
index 224a9b4..9ccd2f0 100644
--- a/phoenix-core/src/main/java/org/apache/phoenix/compile/HavingCompiler.java
+++ b/phoenix-core/src/main/java/org/apache/phoenix/compile/HavingCompiler.java
@@ -54,7 +54,7 @@ public class HavingCompiler {
 if (expression.getDataType() != PBoolean.INSTANCE) {
 throw TypeMismatchException.newException(PBoolean.INSTANCE, 
expression.getDataType(), expression.toString());
 }
-if (LiteralExpression.isFalse(expression)) {
+if (LiteralExpression.isBooleanFalseOrNull(expression)) {
 context.setScanRanges(ScanRanges.NOTHING);
 return null;
 } else if (LiteralExpression.isTrue(expression)) {

http://git-wip-us.apache.org/repos/asf/phoenix/blob/818567c7/phoenix-core/src/main/java/org/apache/phoenix/compile/WhereCompiler.java
--
diff --git 
a/phoenix-core/src/main/java/org/apache/phoenix/compile/WhereCompiler.java 
b/phoenix-core/src/main/java/org/apache/phoenix/compile/WhereCompiler.java
index 9631850..13963d7 100644
--- a/phoenix-core/src/main/java/org/apache/phoenix/compile/WhereCompiler.java
+++ b/phoenix-core/src/main/java/org/apache/phoenix/compile/WhereCompiler.java
@@ -235,7 +235,7 @@ public class WhereCompiler {
 private static void setScanFilter(StatementContext context, 
FilterableStatement statement, Expression whereClause, boolean 
disambiguateWithFamily, boolean hashJoinOptimization) {
 Scan scan = context.getScan();
 
-if (LiteralExpression.isFalse(whereClause)) {
+if (LiteralExpression.isBooleanFalseOrNull(whereClause)) {
 context.setScanRanges(ScanRanges.NOTHING);
 } else if (whereClause != null  
!LiteralExpression.isTrue(whereClause)  !hashJoinOptimization) {
 Filter filter = null;

http://git-wip-us.apache.org/repos/asf/phoenix/blob/818567c7/phoenix-core/src/main/java/org/apache/phoenix/compile/WhereOptimizer.java
--
diff --git 
a/phoenix-core/src/main/java/org/apache/phoenix/compile/WhereOptimizer.java 
b/phoenix-core/src/main/java/org/apache/phoenix/compile/WhereOptimizer.java
index 

[05/12] phoenix git commit: PHOENIX-2132 Pherf - Fix drop all command and execution from Eclipse/IDE

[jamestaylor]

PHOENIX-2132 Pherf - Fix drop all command and execution from Eclipse/IDE


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

Branch: refs/heads/4.5-HBase-1.1
Commit: 9ac3396e1fd4ad7b2085eb28b50761d3216b5932
Parents: a12f9d2
Author: Mujtaba mujt...@apache.org
Authored: Fri Jul 24 11:18:52 2015 -0700
Committer: James Taylor jtay...@salesforce.com
Committed: Tue Aug 11 18:44:51 2015 -0700

--
 phoenix-pherf/pom.xml   | 25 ++---
 .../apache/phoenix/pherf/util/PhoenixUtil.java  | 55 +++-
 2 files changed, 60 insertions(+), 20 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/phoenix/blob/9ac3396e/phoenix-pherf/pom.xml
--
diff --git a/phoenix-pherf/pom.xml b/phoenix-pherf/pom.xml
index 8343be0..e08670c 100644
--- a/phoenix-pherf/pom.xml
+++ b/phoenix-pherf/pom.xml
@@ -69,7 +69,6 @@
dependency
groupIdjunit/groupId
artifactIdjunit/artifactId
-   version4.11/version
scopetest/scope
/dependency
dependency
@@ -91,14 +90,12 @@
dependency
groupIdorg.apache.hbase/groupId
artifactIdhbase-testing-util/artifactId
-   version${hbase.version}/version
scopetest/scope
optionaltrue/optional
/dependency
dependency
groupIdorg.apache.hbase/groupId
artifactIdhbase-it/artifactId
-   version${hbase.version}/version
typetest-jar/type
scopetest/scope
/dependency
@@ -109,6 +106,12 @@
resource
directorysrc/main/resources/directory
/resource
+   resource
+   directoryconfig/directory
+   includes
+   include**/*.properties/include
+   /includes
+   /resource
/resources
testResources
testResource
@@ -129,13 +132,11 @@
/plugin
plugin
artifactIdmaven-dependency-plugin/artifactId
-   
version${maven-dependency-plugin.version}/version
/plugin
 
plugin
groupIdorg.apache.maven.plugins/groupId
artifactIdmaven-compiler-plugin/artifactId
-   version3.1/version
configuration
source1.7/source
target1.7/target
@@ -177,17 +178,27 @@
/goals
configuration
descriptors
-   !-- Produces 
minimal Pherf jar --
+   !-- Produces 
minimal Pherf jar --

descriptorsrc/main/assembly/minimal.xml/descriptor
!-- Produces 
standalone zip that bundles all required dependencies --

descriptorsrc/main/assembly/standalone.xml/descriptor
-   !-- Produces 
cluster zip with minimal Pherf jar. Setting HBase classpath in env.sh is 
required for this configuration -- 
 
+   !-- Produces 
cluster zip with minimal Pherf jar. Setting HBase classpath 
+   in 
env.sh is required for this configuration --

descriptorsrc/main/assembly/cluster.xml/descriptor
/descriptors
/configuration
/execution
/executions
   

[04/12] phoenix git commit: Revert PHOENIX-1791. Adding ability for Pherf Write Workloads to write to a multi-tenant view.

[jamestaylor]

Revert PHOENIX-1791. Adding ability for Pherf Write Workloads to write to a 
multi-tenant view.

This reverts commit e9d8c01c8141a2f402bd8466ebb71ed5418a1638.


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

Branch: refs/heads/4.5-HBase-1.1
Commit: a12f9d253352f952a04f2d185050739c1b0c
Parents: 93bd2c3
Author: James Taylor jtay...@salesforce.com
Authored: Tue Aug 11 18:12:43 2015 -0700
Committer: James Taylor jtay...@salesforce.com
Committed: Tue Aug 11 18:44:51 2015 -0700

--
 .../org/apache/phoenix/pherf/DataIngestIT.java  | 74 +++-
 .../phoenix/pherf/configuration/Scenario.java   | 25 ++-
 .../pherf/configuration/XMLConfigParser.java| 23 +++---
 .../apache/phoenix/pherf/util/PhoenixUtil.java  | 28 +++-
 .../phoenix/pherf/workload/WriteWorkload.java   | 36 +-
 .../datamodel/test_schema_mt_table.sql  | 31 
 .../resources/datamodel/test_schema_mt_view.sql |  1 -
 .../test/resources/scenario/test_scenario.xml   | 22 --
 8 files changed, 53 insertions(+), 187 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/phoenix/blob/a12f9d25/phoenix-pherf/src/it/java/org/apache/phoenix/pherf/DataIngestIT.java
--
diff --git 
a/phoenix-pherf/src/it/java/org/apache/phoenix/pherf/DataIngestIT.java 
b/phoenix-pherf/src/it/java/org/apache/phoenix/pherf/DataIngestIT.java
index 2b9d309..8a340b3 100644
--- a/phoenix-pherf/src/it/java/org/apache/phoenix/pherf/DataIngestIT.java
+++ b/phoenix-pherf/src/it/java/org/apache/phoenix/pherf/DataIngestIT.java
@@ -18,19 +18,8 @@
 
 package org.apache.phoenix.pherf;
 
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertTrue;
-import static org.junit.Assert.fail;
-
-import java.sql.Connection;
-import java.sql.ResultSet;
-import java.sql.SQLException;
-import java.sql.Statement;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Map;
-
+import com.jcabi.jdbc.JdbcSession;
+import com.jcabi.jdbc.Outcome;
 import org.apache.phoenix.pherf.configuration.Column;
 import org.apache.phoenix.pherf.configuration.DataModel;
 import org.apache.phoenix.pherf.configuration.DataTypeMapping;
@@ -44,8 +33,15 @@ import org.apache.phoenix.pherf.workload.WriteWorkload;
 import org.junit.Before;
 import org.junit.Test;
 
-import com.jcabi.jdbc.JdbcSession;
-import com.jcabi.jdbc.Outcome;
+import java.sql.Connection;
+import java.sql.ResultSet;
+import java.sql.SQLException;
+import java.sql.Statement;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Map;
+
+import static org.junit.Assert.*;
 
 public class DataIngestIT extends ResultBaseTestIT {
 
@@ -148,52 +144,4 @@ public class DataIngestIT extends ResultBaseTestIT {
 fail(Failed to load data. An exception was thrown:  + 
e.getMessage());
 }
 }
-
-
-@Test
-/**
- * Validates that Pherf can write data to a Multi-Tenant View in addition 
to 
- * standard Phoenix tables.
- */
-public void testMultiTenantViewWriteWorkload() throws Exception {
-// Arrange
-Scenario scenario = parser.getScenarioByName(testMTWriteScenario);
-WorkloadExecutor executor = new WorkloadExecutor();
-executor.add(new WriteWorkload(util, parser, scenario));
-
-// Act
-try {
-// Wait for data to load up.
-executor.get();
-executor.shutdown();
-} catch (Exception e) {
-fail(Failed to load data. An exception was thrown:  + 
e.getMessage());
-}
-
-// Assert
-assertExpectedNumberOfRecordsWritten(scenario);
-
-}
-
-private void assertExpectedNumberOfRecordsWritten(Scenario scenario) 
throws Exception,
-SQLException {
-Connection connection = util.getConnection(scenario.getTenantId());
-String sql = select count(*) from  + scenario.getTableName();
-Integer count = new JdbcSession(connection).sql(sql).select(new 
OutcomeInteger() {
-@Override public Integer handle(ResultSet resultSet, Statement 
statement)
-throws SQLException {
-while (resultSet.next()) {
-return resultSet.getInt(1);
-}
-return null;
-}
-});
-assertNotNull(Could not retrieve count.  + count);
-assertTrue(Could not query any rows for in  + 
scenario.getTableName(), count  0);
-assertEquals(Expected 100 rows to have been inserted, 
scenario.getRowCount(), 

[12/12] phoenix git commit: PHOENIX-1791. Adding ability for Pherf Write Workloads to write to a multi-tenant view.

[jamestaylor]

PHOENIX-1791. Adding ability for Pherf Write Workloads to write to a 
multi-tenant view.


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

Branch: refs/heads/4.5-HBase-1.1
Commit: 0ba0e7b7816ed9dc7f212928d694d2769dd6fc52
Parents: 7cf5e20
Author: Jan jferna...@salesforce.com
Authored: Thu Aug 6 11:12:52 2015 -0700
Committer: James Taylor jtay...@salesforce.com
Committed: Tue Aug 11 18:44:51 2015 -0700

--
 .../org/apache/phoenix/pherf/DataIngestIT.java  | 67 +---
 .../phoenix/pherf/configuration/Scenario.java   | 25 ++--
 .../pherf/configuration/XMLConfigParser.java| 23 ---
 .../apache/phoenix/pherf/util/PhoenixUtil.java  | 30 +
 .../phoenix/pherf/workload/WriteWorkload.java   | 49 +-
 .../datamodel/test_schema_mt_table.sql  | 31 +
 .../resources/datamodel/test_schema_mt_view.sql |  1 +
 .../test/resources/scenario/test_scenario.xml   | 22 +++
 8 files changed, 198 insertions(+), 50 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/phoenix/blob/0ba0e7b7/phoenix-pherf/src/it/java/org/apache/phoenix/pherf/DataIngestIT.java
--
diff --git 
a/phoenix-pherf/src/it/java/org/apache/phoenix/pherf/DataIngestIT.java 
b/phoenix-pherf/src/it/java/org/apache/phoenix/pherf/DataIngestIT.java
index 1defbb1..297f882 100644
--- a/phoenix-pherf/src/it/java/org/apache/phoenix/pherf/DataIngestIT.java
+++ b/phoenix-pherf/src/it/java/org/apache/phoenix/pherf/DataIngestIT.java
@@ -22,6 +22,19 @@ import com.jcabi.jdbc.JdbcSession;
 import com.jcabi.jdbc.Outcome;
 
 import org.apache.phoenix.pherf.PherfConstants.GeneratePhoenixStats;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.fail;
+
+import java.sql.Connection;
+import java.sql.ResultSet;
+import java.sql.SQLException;
+import java.sql.Statement;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Map;
+
 import org.apache.phoenix.pherf.configuration.Column;
 import org.apache.phoenix.pherf.configuration.DataModel;
 import org.apache.phoenix.pherf.configuration.DataTypeMapping;
@@ -35,15 +48,8 @@ import org.apache.phoenix.pherf.workload.WriteWorkload;
 import org.junit.Before;
 import org.junit.Test;
 
-import java.sql.Connection;
-import java.sql.ResultSet;
-import java.sql.SQLException;
-import java.sql.Statement;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Map;
-
-import static org.junit.Assert.*;
+import com.jcabi.jdbc.JdbcSession;
+import com.jcabi.jdbc.Outcome;
 
 public class DataIngestIT extends ResultBaseTestIT {
 
@@ -146,4 +152,47 @@ public class DataIngestIT extends ResultBaseTestIT {
 fail(Failed to load data. An exception was thrown:  + 
e.getMessage());
 }
 }
+
+
+@Test
+/**
+ * Validates that Pherf can write data to a Multi-Tenant View in addition 
to 
+ * standard Phoenix tables.
+ */
+public void testMultiTenantViewWriteWorkload() throws Exception {
+// Arrange
+Scenario scenario = parser.getScenarioByName(testMTWriteScenario);
+WorkloadExecutor executor = new WorkloadExecutor();
+executor.add(new WriteWorkload(util, parser, scenario, 
GeneratePhoenixStats.NO));
+
+// Act
+try {
+// Wait for data to load up.
+executor.get();
+executor.shutdown();
+} catch (Exception e) {
+fail(Failed to load data. An exception was thrown:  + 
e.getMessage());
+}
+
+assertExpectedNumberOfRecordsWritten(scenario);
+}
+
+private void assertExpectedNumberOfRecordsWritten(Scenario scenario) 
throws Exception,
+SQLException {
+Connection connection = util.getConnection(scenario.getTenantId());
+String sql = select count(*) from  + scenario.getTableName();
+Integer count = new JdbcSession(connection).sql(sql).select(new 
OutcomeInteger() {
+@Override public Integer handle(ResultSet resultSet, Statement 
statement)
+throws SQLException {
+while (resultSet.next()) {
+return resultSet.getInt(1);
+}
+return null;
+}
+});
+assertNotNull(Could not retrieve count.  + count);
+assertEquals(Expected 100 rows to have been inserted,
+scenario.getRowCount(), count.intValue());
+}
+
 }

[08/12] phoenix git commit: PHOENIX-2155 Add gpg signing to release profile

[jamestaylor]

PHOENIX-2155 Add gpg signing to release profile


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

Branch: refs/heads/4.5-HBase-1.0
Commit: 01825ccf7d8fb1391f92a8cff818f0106dab036e
Parents: 58f0236
Author: Mujtaba mujt...@apache.org
Authored: Wed Jul 29 13:06:52 2015 -0700
Committer: James Taylor jtay...@salesforce.com
Committed: Tue Aug 11 18:42:11 2015 -0700

--
 pom.xml | 15 ++-
 1 file changed, 14 insertions(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/phoenix/blob/01825ccf/pom.xml
--
diff --git a/pom.xml b/pom.xml
index 8543eb4..10826f3 100644
--- a/pom.xml
+++ b/pom.xml
@@ -749,9 +749,22 @@
   /execution
 /executions
   /plugin
+  plugin
+groupIdorg.apache.maven.plugins/groupId
+artifactIdmaven-gpg-plugin/artifactId
+version1.6/version
+executions
+  execution
+  idsign-artifacts/id
+  phaseverify/phase
+goals
+  goalsign/goal
+/goals
+  /execution
+/executions
+  /plugin
 /plugins
   /build
 /profile
-
   /profiles
 /project

[10/12] phoenix git commit: PHOENIX-2145 Pherf - Make update stats optional and fix threads not exiting after performance run

[jamestaylor]

PHOENIX-2145 Pherf - Make update stats optional and fix threads not exiting 
after performance run


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

Branch: refs/heads/4.5-HBase-1.0
Commit: 4c945d3c551ecb27fd0ad3af5d6737720f5e6c51
Parents: 01825cc
Author: Mujtaba mujt...@apache.org
Authored: Tue Aug 4 15:47:44 2015 -0700
Committer: James Taylor jtay...@salesforce.com
Committed: Tue Aug 11 18:42:11 2015 -0700

--
 phoenix-pherf/pom.xml   |  3 --
 .../org/apache/phoenix/pherf/DataIngestIT.java  |  4 +-
 .../src/main/assembly/components-minimal.xml|  2 +-
 .../java/org/apache/phoenix/pherf/Pherf.java| 23 +--
 .../apache/phoenix/pherf/PherfConstants.java|  5 +++
 .../apache/phoenix/pherf/util/PhoenixUtil.java  | 11 +
 .../phoenix/pherf/workload/QueryExecutor.java   |  3 +-
 .../phoenix/pherf/workload/WriteWorkload.java   | 43 ++--
 .../org/apache/phoenix/pherf/PherfTest.java |  2 +-
 9 files changed, 55 insertions(+), 41 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/phoenix/blob/4c945d3c/phoenix-pherf/pom.xml
--
diff --git a/phoenix-pherf/pom.xml b/phoenix-pherf/pom.xml
index 281c771..bd92c9e 100644
--- a/phoenix-pherf/pom.xml
+++ b/phoenix-pherf/pom.xml
@@ -108,9 +108,6 @@
/resource
resource
directoryconfig/directory
-   includes
-   include**/*.properties/include
-   /includes
/resource
/resources
testResources

http://git-wip-us.apache.org/repos/asf/phoenix/blob/4c945d3c/phoenix-pherf/src/it/java/org/apache/phoenix/pherf/DataIngestIT.java
--
diff --git 
a/phoenix-pherf/src/it/java/org/apache/phoenix/pherf/DataIngestIT.java 
b/phoenix-pherf/src/it/java/org/apache/phoenix/pherf/DataIngestIT.java
index 8a340b3..1defbb1 100644
--- a/phoenix-pherf/src/it/java/org/apache/phoenix/pherf/DataIngestIT.java
+++ b/phoenix-pherf/src/it/java/org/apache/phoenix/pherf/DataIngestIT.java
@@ -20,6 +20,8 @@ package org.apache.phoenix.pherf;
 
 import com.jcabi.jdbc.JdbcSession;
 import com.jcabi.jdbc.Outcome;
+
+import org.apache.phoenix.pherf.PherfConstants.GeneratePhoenixStats;
 import org.apache.phoenix.pherf.configuration.Column;
 import org.apache.phoenix.pherf.configuration.DataModel;
 import org.apache.phoenix.pherf.configuration.DataTypeMapping;
@@ -66,7 +68,7 @@ public class DataIngestIT extends ResultBaseTestIT {
 scenario.getTableNameWithoutSchemaName(), 
util.getConnection());
 assertTrue(Could not get phoenix columns., 
columnListFromPhoenix.size()  0);
 
-WriteWorkload loader = new WriteWorkload(util, parser, scenario);
+WriteWorkload loader = new WriteWorkload(util, parser, scenario, 
GeneratePhoenixStats.NO);
 WorkloadExecutor executor = new WorkloadExecutor();
 executor.add(loader);
 executor.get();

http://git-wip-us.apache.org/repos/asf/phoenix/blob/4c945d3c/phoenix-pherf/src/main/assembly/components-minimal.xml
--
diff --git a/phoenix-pherf/src/main/assembly/components-minimal.xml 
b/phoenix-pherf/src/main/assembly/components-minimal.xml
index 38c6929..9c9b9a1 100644
--- a/phoenix-pherf/src/main/assembly/components-minimal.xml
+++ b/phoenix-pherf/src/main/assembly/components-minimal.xml
@@ -23,7 +23,7 @@
   outputDirectory//outputDirectory
   includes
 includeorg.apache.phoenix:phoenix-pherf/include
-includeorg.jfree:jfreechart/include
+includeorg.jfree:*/include
 includecom.googlecode.java-diff-utils:diffutils/include
 includeorg.apache.commons:commons-lang3/include
 includeorg.apache.commons:commons-math3/include

http://git-wip-us.apache.org/repos/asf/phoenix/blob/4c945d3c/phoenix-pherf/src/main/java/org/apache/phoenix/pherf/Pherf.java
--
diff --git a/phoenix-pherf/src/main/java/org/apache/phoenix/pherf/Pherf.java 
b/phoenix-pherf/src/main/java/org/apache/phoenix/pherf/Pherf.java
index 5a9f45f..0421b6f 100644
--- a/phoenix-pherf/src/main/java/org/apache/phoenix/pherf/Pherf.java
+++ b/phoenix-pherf/src/main/java/org/apache/phoenix/pherf/Pherf.java
@@ -19,6 +19,7 @@
 package org.apache.phoenix.pherf;
 
 import org.apache.commons.cli.*;

[04/12] phoenix git commit: Revert PHOENIX-1791. Adding ability for Pherf Write Workloads to write to a multi-tenant view.

[jamestaylor]

Revert PHOENIX-1791. Adding ability for Pherf Write Workloads to write to a 
multi-tenant view.

This reverts commit e9d8c01c8141a2f402bd8466ebb71ed5418a1638.


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

Branch: refs/heads/4.5-HBase-1.0
Commit: d6bd99c2df55de95177e4427c860111a653219a1
Parents: d21ee23
Author: James Taylor jtay...@salesforce.com
Authored: Tue Aug 11 18:12:43 2015 -0700
Committer: James Taylor jtay...@salesforce.com
Committed: Tue Aug 11 18:42:11 2015 -0700

--
 .../org/apache/phoenix/pherf/DataIngestIT.java  | 74 +++-
 .../phoenix/pherf/configuration/Scenario.java   | 25 ++-
 .../pherf/configuration/XMLConfigParser.java| 23 +++---
 .../apache/phoenix/pherf/util/PhoenixUtil.java  | 28 +++-
 .../phoenix/pherf/workload/WriteWorkload.java   | 36 +-
 .../datamodel/test_schema_mt_table.sql  | 31 
 .../resources/datamodel/test_schema_mt_view.sql |  1 -
 .../test/resources/scenario/test_scenario.xml   | 22 --
 8 files changed, 53 insertions(+), 187 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/phoenix/blob/d6bd99c2/phoenix-pherf/src/it/java/org/apache/phoenix/pherf/DataIngestIT.java
--
diff --git 
a/phoenix-pherf/src/it/java/org/apache/phoenix/pherf/DataIngestIT.java 
b/phoenix-pherf/src/it/java/org/apache/phoenix/pherf/DataIngestIT.java
index 2b9d309..8a340b3 100644
--- a/phoenix-pherf/src/it/java/org/apache/phoenix/pherf/DataIngestIT.java
+++ b/phoenix-pherf/src/it/java/org/apache/phoenix/pherf/DataIngestIT.java
@@ -18,19 +18,8 @@
 
 package org.apache.phoenix.pherf;
 
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertTrue;
-import static org.junit.Assert.fail;
-
-import java.sql.Connection;
-import java.sql.ResultSet;
-import java.sql.SQLException;
-import java.sql.Statement;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Map;
-
+import com.jcabi.jdbc.JdbcSession;
+import com.jcabi.jdbc.Outcome;
 import org.apache.phoenix.pherf.configuration.Column;
 import org.apache.phoenix.pherf.configuration.DataModel;
 import org.apache.phoenix.pherf.configuration.DataTypeMapping;
@@ -44,8 +33,15 @@ import org.apache.phoenix.pherf.workload.WriteWorkload;
 import org.junit.Before;
 import org.junit.Test;
 
-import com.jcabi.jdbc.JdbcSession;
-import com.jcabi.jdbc.Outcome;
+import java.sql.Connection;
+import java.sql.ResultSet;
+import java.sql.SQLException;
+import java.sql.Statement;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Map;
+
+import static org.junit.Assert.*;
 
 public class DataIngestIT extends ResultBaseTestIT {
 
@@ -148,52 +144,4 @@ public class DataIngestIT extends ResultBaseTestIT {
 fail(Failed to load data. An exception was thrown:  + 
e.getMessage());
 }
 }
-
-
-@Test
-/**
- * Validates that Pherf can write data to a Multi-Tenant View in addition 
to 
- * standard Phoenix tables.
- */
-public void testMultiTenantViewWriteWorkload() throws Exception {
-// Arrange
-Scenario scenario = parser.getScenarioByName(testMTWriteScenario);
-WorkloadExecutor executor = new WorkloadExecutor();
-executor.add(new WriteWorkload(util, parser, scenario));
-
-// Act
-try {
-// Wait for data to load up.
-executor.get();
-executor.shutdown();
-} catch (Exception e) {
-fail(Failed to load data. An exception was thrown:  + 
e.getMessage());
-}
-
-// Assert
-assertExpectedNumberOfRecordsWritten(scenario);
-
-}
-
-private void assertExpectedNumberOfRecordsWritten(Scenario scenario) 
throws Exception,
-SQLException {
-Connection connection = util.getConnection(scenario.getTenantId());
-String sql = select count(*) from  + scenario.getTableName();
-Integer count = new JdbcSession(connection).sql(sql).select(new 
OutcomeInteger() {
-@Override public Integer handle(ResultSet resultSet, Statement 
statement)
-throws SQLException {
-while (resultSet.next()) {
-return resultSet.getInt(1);
-}
-return null;
-}
-});
-assertNotNull(Could not retrieve count.  + count);
-assertTrue(Could not query any rows for in  + 
scenario.getTableName(), count  0);
-assertEquals(Expected 100 rows to have been inserted, 
scenario.getRowCount(), 

[09/12] phoenix git commit: PHOENIX-2141 ComparisonExpression should return Boolean null if either operand is null

[jamestaylor]

PHOENIX-2141 ComparisonExpression should return Boolean null if either operand 
is null


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

Branch: refs/heads/4.5-HBase-1.0
Commit: bbed18fdb53d214f7927c1881f1b12306d3932d9
Parents: 9227b32
Author: maryannxue wei@intel.com
Authored: Mon Jul 27 14:50:16 2015 -0400
Committer: James Taylor jtay...@salesforce.com
Committed: Tue Aug 11 18:42:11 2015 -0700

--
 .../phoenix/compile/ExpressionCompiler.java |  3 +
 .../apache/phoenix/compile/HavingCompiler.java  |  2 +-
 .../apache/phoenix/compile/WhereCompiler.java   |  2 +-
 .../apache/phoenix/compile/WhereOptimizer.java  |  2 +-
 .../phoenix/expression/AndExpression.java   |  3 +
 .../expression/ComparisonExpression.java|  4 +-
 .../phoenix/expression/LiteralExpression.java   | 23 ++--
 .../phoenix/expression/NullValueTest.java   | 59 
 8 files changed, 89 insertions(+), 9 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/phoenix/blob/bbed18fd/phoenix-core/src/main/java/org/apache/phoenix/compile/ExpressionCompiler.java
--
diff --git 
a/phoenix-core/src/main/java/org/apache/phoenix/compile/ExpressionCompiler.java 
b/phoenix-core/src/main/java/org/apache/phoenix/compile/ExpressionCompiler.java
index 1278494..1523dce 100644
--- 
a/phoenix-core/src/main/java/org/apache/phoenix/compile/ExpressionCompiler.java
+++ 
b/phoenix-core/src/main/java/org/apache/phoenix/compile/ExpressionCompiler.java
@@ -251,6 +251,9 @@ public class ExpressionCompiler extends 
UnsupportedAllParseNodeVisitorExpressio
 if (child.getDataType() != PBoolean.INSTANCE) {
 throw TypeMismatchException.newException(PBoolean.INSTANCE, 
child.getDataType(), child.toString());
 }
+if (LiteralExpression.isBooleanNull(child)) {
+return child;
+}
 if (LiteralExpression.isFalse(child)) {
 iterator.remove();
 }

http://git-wip-us.apache.org/repos/asf/phoenix/blob/bbed18fd/phoenix-core/src/main/java/org/apache/phoenix/compile/HavingCompiler.java
--
diff --git 
a/phoenix-core/src/main/java/org/apache/phoenix/compile/HavingCompiler.java 
b/phoenix-core/src/main/java/org/apache/phoenix/compile/HavingCompiler.java
index 224a9b4..9ccd2f0 100644
--- a/phoenix-core/src/main/java/org/apache/phoenix/compile/HavingCompiler.java
+++ b/phoenix-core/src/main/java/org/apache/phoenix/compile/HavingCompiler.java
@@ -54,7 +54,7 @@ public class HavingCompiler {
 if (expression.getDataType() != PBoolean.INSTANCE) {
 throw TypeMismatchException.newException(PBoolean.INSTANCE, 
expression.getDataType(), expression.toString());
 }
-if (LiteralExpression.isFalse(expression)) {
+if (LiteralExpression.isBooleanFalseOrNull(expression)) {
 context.setScanRanges(ScanRanges.NOTHING);
 return null;
 } else if (LiteralExpression.isTrue(expression)) {

http://git-wip-us.apache.org/repos/asf/phoenix/blob/bbed18fd/phoenix-core/src/main/java/org/apache/phoenix/compile/WhereCompiler.java
--
diff --git 
a/phoenix-core/src/main/java/org/apache/phoenix/compile/WhereCompiler.java 
b/phoenix-core/src/main/java/org/apache/phoenix/compile/WhereCompiler.java
index 9631850..13963d7 100644
--- a/phoenix-core/src/main/java/org/apache/phoenix/compile/WhereCompiler.java
+++ b/phoenix-core/src/main/java/org/apache/phoenix/compile/WhereCompiler.java
@@ -235,7 +235,7 @@ public class WhereCompiler {
 private static void setScanFilter(StatementContext context, 
FilterableStatement statement, Expression whereClause, boolean 
disambiguateWithFamily, boolean hashJoinOptimization) {
 Scan scan = context.getScan();
 
-if (LiteralExpression.isFalse(whereClause)) {
+if (LiteralExpression.isBooleanFalseOrNull(whereClause)) {
 context.setScanRanges(ScanRanges.NOTHING);
 } else if (whereClause != null  
!LiteralExpression.isTrue(whereClause)  !hashJoinOptimization) {
 Filter filter = null;

http://git-wip-us.apache.org/repos/asf/phoenix/blob/bbed18fd/phoenix-core/src/main/java/org/apache/phoenix/compile/WhereOptimizer.java
--
diff --git 
a/phoenix-core/src/main/java/org/apache/phoenix/compile/WhereOptimizer.java 
b/phoenix-core/src/main/java/org/apache/phoenix/compile/WhereOptimizer.java
index 

[02/12] phoenix git commit: PHOENIX-1994 - TestIndexWriter#testFailureOnRunningUpdateAbortsPending() deadlocks on JDK 8

[jamestaylor]

PHOENIX-1994 - TestIndexWriter#testFailureOnRunningUpdateAbortsPending() 
deadlocks on JDK 8


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

Branch: refs/heads/4.5-HBase-1.0
Commit: a689528c77c58542b9a5aabd3f2fecfd6a94eab3
Parents: 417a82a
Author: Cody Marcel cody.mar...@gmail.com
Authored: Mon Aug 10 12:08:07 2015 -0700
Committer: James Taylor jtay...@salesforce.com
Committed: Tue Aug 11 18:42:11 2015 -0700

--
 .../java/org/apache/phoenix/hbase/index/write/TestIndexWriter.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/phoenix/blob/a689528c/phoenix-core/src/test/java/org/apache/phoenix/hbase/index/write/TestIndexWriter.java
--
diff --git 
a/phoenix-core/src/test/java/org/apache/phoenix/hbase/index/write/TestIndexWriter.java
 
b/phoenix-core/src/test/java/org/apache/phoenix/hbase/index/write/TestIndexWriter.java
index 37a8cf4..8f576cf 100644
--- 
a/phoenix-core/src/test/java/org/apache/phoenix/hbase/index/write/TestIndexWriter.java
+++ 
b/phoenix-core/src/test/java/org/apache/phoenix/hbase/index/write/TestIndexWriter.java
@@ -145,7 +145,7 @@ public class TestIndexWriter {
 Abortable abort = new StubAbortable();
 Stoppable stop = Mockito.mock(Stoppable.class);
 // single thread factory so the older request gets queued
-ExecutorService exec = Executors.newFixedThreadPool(1);
+ExecutorService exec = Executors.newFixedThreadPool(3);
 MapImmutableBytesPtr, HTableInterface tables = new 
HashMapImmutableBytesPtr, HTableInterface();
 FakeTableFactory factory = new FakeTableFactory(tables);
 

[06/12] phoenix git commit: PHOENIX 2132 Minor addendum to fix RAT warning

[jamestaylor]

PHOENIX 2132 Minor addendum to fix RAT warning


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

Branch: refs/heads/4.5-HBase-1.0
Commit: c81229a8125bb523efc1bd4436a4d4375a8a2f97
Parents: 2c35f32
Author: Mujtaba mujt...@apache.org
Authored: Fri Jul 24 11:55:45 2015 -0700
Committer: James Taylor jtay...@salesforce.com
Committed: Tue Aug 11 18:42:11 2015 -0700

--
 phoenix-pherf/pom.xml | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/phoenix/blob/c81229a8/phoenix-pherf/pom.xml
--
diff --git a/phoenix-pherf/pom.xml b/phoenix-pherf/pom.xml
index bc474c6..281c771 100644
--- a/phoenix-pherf/pom.xml
+++ b/phoenix-pherf/pom.xml
@@ -195,7 +195,8 @@
artifactIdapache-rat-plugin/artifactId
configuration
excludes
-   excludeRESULTS/**/exclude
+   exclude*/RESULTS/**/exclude
+   excludeREADME.md/exclude
/excludes
/configuration
/plugin

[01/12] phoenix git commit: PHOENIX-2171 DOUBLE and FLOAT DESC are stored as ASC

[jamestaylor]

Repository: phoenix
Updated Branches:
  refs/heads/4.5-HBase-1.0 d21ee23ed - 381e448d5


PHOENIX-2171 DOUBLE and FLOAT DESC are stored as ASC


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

Branch: refs/heads/4.5-HBase-1.0
Commit: 381e448d5a82eff7b4ab1ceb9a8c5ff6c5313354
Parents: 5421ba0
Author: James Taylor jtay...@salesforce.com
Authored: Tue Aug 11 01:59:23 2015 -0700
Committer: James Taylor jtay...@salesforce.com
Committed: Tue Aug 11 18:42:11 2015 -0700

--
 .../org/apache/phoenix/end2end/SortOrderIT.java |  6 ++--
 .../UngroupedAggregateRegionObserver.java   |  6 
 .../org/apache/phoenix/schema/PTableImpl.java   | 10 +-
 .../apache/phoenix/schema/types/PDataType.java  |  4 +--
 .../apache/phoenix/schema/types/PDouble.java| 18 +++
 .../org/apache/phoenix/schema/types/PFloat.java | 18 ++-
 .../org/apache/phoenix/util/UpgradeUtil.java|  5 +++
 .../phoenix/schema/types/PDataTypeTest.java | 33 
 8 files changed, 82 insertions(+), 18 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/phoenix/blob/381e448d/phoenix-core/src/it/java/org/apache/phoenix/end2end/SortOrderIT.java
--
diff --git 
a/phoenix-core/src/it/java/org/apache/phoenix/end2end/SortOrderIT.java 
b/phoenix-core/src/it/java/org/apache/phoenix/end2end/SortOrderIT.java
index 9228ab5..fdbd26d 100644
--- a/phoenix-core/src/it/java/org/apache/phoenix/end2end/SortOrderIT.java
+++ b/phoenix-core/src/it/java/org/apache/phoenix/end2end/SortOrderIT.java
@@ -41,6 +41,8 @@ import org.apache.commons.lang.ArrayUtils;
 import org.apache.phoenix.schema.SortOrder;
 import org.apache.phoenix.schema.types.PDataType;
 import org.apache.phoenix.schema.types.PDecimal;
+import org.apache.phoenix.schema.types.PDouble;
+import org.apache.phoenix.schema.types.PFloat;
 import org.apache.phoenix.util.PropertiesUtil;
 import org.junit.Assert;
 import org.junit.Test;
@@ -404,7 +406,7 @@ public class SortOrderIT extends BaseHBaseManagedTimeIT {
 public void testNonPKCompare() throws Exception {
 ListInteger expectedResults = Lists.newArrayList(2,3,4);
 Integer[] saltBuckets = new Integer[] {null,3};
-PDataType[] dataTypes = new PDataType[] {PDecimal.INSTANCE};
+PDataType[] dataTypes = new PDataType[] {PDecimal.INSTANCE, 
PDouble.INSTANCE, PFloat.INSTANCE};
 for (Integer saltBucket : saltBuckets) {
 for (PDataType dataType : dataTypes) {
 for (SortOrder sortOrder : SortOrder.values()) {
@@ -420,7 +422,7 @@ public class SortOrderIT extends BaseHBaseManagedTimeIT {
 ListInteger rExpectedResults = new ArrayList(expectedResults);
 Collections.reverse(rExpectedResults);
 Integer[] saltBuckets = new Integer[] {null,3};
-PDataType[] dataTypes = new PDataType[] {PDecimal.INSTANCE};
+PDataType[] dataTypes = new PDataType[] {PDecimal.INSTANCE, 
PDouble.INSTANCE, PFloat.INSTANCE};
 for (Integer saltBucket : saltBuckets) {
 for (PDataType dataType : dataTypes) {
 for (SortOrder sortOrder : SortOrder.values()) {

http://git-wip-us.apache.org/repos/asf/phoenix/blob/381e448d/phoenix-core/src/main/java/org/apache/phoenix/coprocessor/UngroupedAggregateRegionObserver.java
--
diff --git 
a/phoenix-core/src/main/java/org/apache/phoenix/coprocessor/UngroupedAggregateRegionObserver.java
 
b/phoenix-core/src/main/java/org/apache/phoenix/coprocessor/UngroupedAggregateRegionObserver.java
index 571d0d1..7316bb1 100644
--- 
a/phoenix-core/src/main/java/org/apache/phoenix/coprocessor/UngroupedAggregateRegionObserver.java
+++ 
b/phoenix-core/src/main/java/org/apache/phoenix/coprocessor/UngroupedAggregateRegionObserver.java
@@ -88,6 +88,8 @@ import org.apache.phoenix.schema.tuple.MultiKeyValueTuple;
 import org.apache.phoenix.schema.types.PBinary;
 import org.apache.phoenix.schema.types.PChar;
 import org.apache.phoenix.schema.types.PDataType;
+import org.apache.phoenix.schema.types.PDouble;
+import org.apache.phoenix.schema.types.PFloat;
 import org.apache.phoenix.util.ByteUtil;
 import org.apache.phoenix.util.IndexUtil;
 import org.apache.phoenix.util.KeyValueUtil;
@@ -312,6 +314,10 @@ public class UngroupedAggregateRegionObserver extends 
BaseScannerRegionObserver{
 len--;
 }
 ptr.set(ptr.get(), 
ptr.getOffset(), len);
+// Special case