date:20150402

phoenix git commit: Remove PhoenixProjectScanMergeRule; Inject projection to server side plans whenever possible; Make aggregate+join merged server plans as in original Phoenix planning

2015-04-02 Thread maryannxue

Repository: phoenix
Updated Branches:
  refs/heads/calcite b01bdd172 -> f6ff11710


Remove PhoenixProjectScanMergeRule; Inject projection to server side plans 
whenever possible; Make aggregate+join merged server plans as in original 
Phoenix planning


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

Branch: refs/heads/calcite
Commit: f6ff117104d78c09ab691535c9cc0c40003e8636
Parents: b01bdd1
Author: maryannxue 
Authored: Thu Apr 2 23:56:26 2015 -0400
Committer: maryannxue 
Committed: Thu Apr 2 23:56:26 2015 -0400

--
 .../org/apache/phoenix/calcite/CalciteTest.java | 41 ++-
 .../apache/phoenix/calcite/CalciteUtils.java| 10 +
 .../phoenix/calcite/PhoenixAggregate.java   | 36 
 .../apache/phoenix/calcite/PhoenixFilter.java   |  5 +++
 .../calcite/PhoenixFilterScanMergeRule.java |  2 +-
 .../org/apache/phoenix/calcite/PhoenixJoin.java | 13 --
 .../apache/phoenix/calcite/PhoenixProject.java  | 43 ++--
 .../calcite/PhoenixProjectScanMergeRule.java| 37 -
 .../org/apache/phoenix/calcite/PhoenixRel.java  | 23 ++-
 .../calcite/PhoenixRelImplementorImpl.java  |  5 ++-
 .../org/apache/phoenix/calcite/PhoenixSort.java |  5 +++
 .../apache/phoenix/calcite/PhoenixTable.java|  2 +-
 .../phoenix/calcite/PhoenixTableScan.java   | 41 ++-
 .../calcite/PhoenixToEnumerableConverter.java   | 26 +---
 .../apache/phoenix/calcite/PhoenixUnion.java|  5 +++
 .../apache/phoenix/calcite/PhoenixValues.java   |  5 +++
 .../GroupedAggregateRegionObserver.java |  3 +-
 .../coprocessor/HashJoinRegionScanner.java  |  8 +++-
 .../phoenix/coprocessor/ScanRegionObserver.java |  3 +-
 .../UngroupedAggregateRegionObserver.java   |  3 +-
 .../phoenix/execute/TupleProjectionPlan.java| 12 --
 .../apache/phoenix/execute/TupleProjector.java  | 17 +++-
 .../java/org/apache/phoenix/util/TestUtil.java  |  4 +-
 23 files changed, 210 insertions(+), 139 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/phoenix/blob/f6ff1171/phoenix-core/src/it/java/org/apache/phoenix/calcite/CalciteTest.java
--
diff --git 
a/phoenix-core/src/it/java/org/apache/phoenix/calcite/CalciteTest.java 
b/phoenix-core/src/it/java/org/apache/phoenix/calcite/CalciteTest.java
index 15c..f9e00ce 100644
--- a/phoenix-core/src/it/java/org/apache/phoenix/calcite/CalciteTest.java
+++ b/phoenix-core/src/it/java/org/apache/phoenix/calcite/CalciteTest.java
@@ -201,7 +201,8 @@ public class CalciteTest extends BaseClientManagedTimeIT {
 @Test public void testProject() throws Exception {
 start().sql("select entity_id, a_string, organization_id from aTable 
where a_string = 'a'")
 .explainIs("PhoenixToEnumerableConverter\n" +
-   "  PhoenixTableScan(table=[[phoenix, ATABLE]], 
filter=[=($2, 'a')], project=[[$1, $2, $0]])\n")
+   "  PhoenixProject(ENTITY_ID=[$1], A_STRING=[$2], 
ORGANIZATION_ID=[$0])\n" +
+   "PhoenixTableScan(table=[[phoenix, ATABLE]], 
filter=[=($2, 'a')])\n")
 .resultIs(new Object[][] {
   {"00A123122312312", "a", "00D3XHP"}, 
   {"00A223122312312", "a", "00D3XHP"}, 
@@ -215,8 +216,10 @@ public class CalciteTest extends BaseClientManagedTimeIT {
 .explainIs("PhoenixToEnumerableConverter\n" +
"  PhoenixProject(ENTITY_ID=[$4], A_STRING=[$2], 
ORGANIZATION_ID=[$3])\n" +
"PhoenixJoin(condition=[AND(=($4, $1), =($3, 
$0))], joinType=[inner])\n" +
-   "  PhoenixTableScan(table=[[phoenix, ATABLE]], 
project=[[$0, $1, $2]])\n" +
-   "  PhoenixTableScan(table=[[phoenix, ATABLE]], 
filter=[=($2, 'a')], project=[[$0, $1, $2]])\n")
+   "  PhoenixProject(ORGANIZATION_ID=[$0], 
ENTITY_ID=[$1], A_STRING=[$2])\n" +
+   "PhoenixTableScan(table=[[phoenix, 
ATABLE]])\n" +
+   "  PhoenixProject(ORGANIZATION_ID=[$0], 
ENTITY_ID=[$1], A_STRING=[$2])\n" +
+   "PhoenixTableScan(table=[[phoenix, 
ATABLE]], filter=[=($2, 'a')])\n")
 .resultIs(new Object[][] {
   {"00A123122312312", "a", "00D3XHP"}, 
   {"00A223122312312", "a", "00D3XHP"}, 
@@ -228,8 +231,10 @@ public class CalciteTest extends BaseClientManaged

phoenix git commit: PHOENIX-1800 Fix failing test case SaltedViewIT#testSaltedUpdatableViewWithLocalIndex(Rajeshbabu Chintaguntla)

2015-04-02 Thread jamestaylor

Repository: phoenix
Updated Branches:
  refs/heads/4.3 a57f137a1 -> e54ebfa65


PHOENIX-1800 Fix failing test case 
SaltedViewIT#testSaltedUpdatableViewWithLocalIndex(Rajeshbabu Chintaguntla)


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

Branch: refs/heads/4.3
Commit: e54ebfa65a0110bb44ebc4013b8584e57905f6b0
Parents: a57f137
Author: Rajeshbabu Chintaguntla 
Authored: Thu Apr 2 19:26:51 2015 +0530
Committer: James Taylor 
Committed: Thu Apr 2 19:38:49 2015 -0700

--
 .../src/main/java/org/apache/phoenix/util/IndexUtil.java | 8 
 1 file changed, 4 insertions(+), 4 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/phoenix/blob/e54ebfa6/phoenix-core/src/main/java/org/apache/phoenix/util/IndexUtil.java
--
diff --git a/phoenix-core/src/main/java/org/apache/phoenix/util/IndexUtil.java 
b/phoenix-core/src/main/java/org/apache/phoenix/util/IndexUtil.java
index b72d3db..ba379ad 100644
--- a/phoenix-core/src/main/java/org/apache/phoenix/util/IndexUtil.java
+++ b/phoenix-core/src/main/java/org/apache/phoenix/util/IndexUtil.java
@@ -477,12 +477,12 @@ public class IndexUtil {
 if (dataRegion != null) {
 joinResult = dataRegion.get(get);
 } else {
-TableName indexTable =
-
TableName.valueOf(MetaDataUtil.getLocalIndexPhysicalName(c.getEnvironment()
-.getRegion().getTableDesc().getName()));
+TableName dataTable =
+
TableName.valueOf(MetaDataUtil.getUserTableName(c.getEnvironment()
+
.getRegion().getTableDesc().getNameAsString()));
 HTableInterface table = null;
 try {
-table = c.getEnvironment().getTable(indexTable);
+table = c.getEnvironment().getTable(dataTable);
 joinResult = table.get(get);
 } finally {
 if (table != null) table.close();

Apache-Phoenix | Master | Build Successful

2015-04-02 Thread Apache Jenkins Server

Master branch build status Successful
Source repository https://git-wip-us.apache.org/repos/asf/phoenix.git

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

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

Changes
[twdsilva] PHOENIX-1803 Fix flapping PhoenixServerRpcIT.testMetadataQos



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

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

2015-04-02 Thread Apache Jenkins Server

4.x-HBase-0.98 branch build status Successful

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

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

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

Changes
[twdsilva] PHOENIX-1803 Fix flapping PhoenixServerRpcIT.testMetadataQos



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

Jenkins build is back to normal : Phoenix | 4.3 #66

2015-04-02 Thread Apache Jenkins Server

See

phoenix git commit: PHOENIX-1803 Fix flapping PhoenixServerRpcIT.testMetadataQos

2015-04-02 Thread tdsilva

Repository: phoenix
Updated Branches:
  refs/heads/4.x-HBase-0.98 57b5ad30e -> 2a5c737d5


PHOENIX-1803 Fix flapping PhoenixServerRpcIT.testMetadataQos


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

Branch: refs/heads/4.x-HBase-0.98
Commit: 2a5c737d585653332bffa60ad312de40191f31e9
Parents: 57b5ad3
Author: Thomas D'Silva 
Authored: Thu Apr 2 17:50:58 2015 -0700
Committer: Thomas D'Silva 
Committed: Thu Apr 2 17:56:11 2015 -0700

--
 .../src/it/java/org/apache/phoenix/rpc/PhoenixServerRpcIT.java   | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/phoenix/blob/2a5c737d/phoenix-core/src/it/java/org/apache/phoenix/rpc/PhoenixServerRpcIT.java
--
diff --git 
a/phoenix-core/src/it/java/org/apache/phoenix/rpc/PhoenixServerRpcIT.java 
b/phoenix-core/src/it/java/org/apache/phoenix/rpc/PhoenixServerRpcIT.java
index 2a7898a..ef7fed4 100644
--- a/phoenix-core/src/it/java/org/apache/phoenix/rpc/PhoenixServerRpcIT.java
+++ b/phoenix-core/src/it/java/org/apache/phoenix/rpc/PhoenixServerRpcIT.java
@@ -220,8 +220,8 @@ public class PhoenixServerRpcIT extends 
BaseOwnClusterHBaseManagedTimeIT {
 "CREATE TABLE " + DATA_TABLE_FULL_NAME + " (k VARCHAR NOT 
NULL PRIMARY KEY, v VARCHAR)");
 // query the table from another connection, so that SYSTEM.STATS 
will be used 
 conn.createStatement().execute("SELECT * FROM 
"+DATA_TABLE_FULL_NAME);
-// verify that that metadata queue is used once 
-
Mockito.verify(TestPhoenixIndexRpcSchedulerFactory.getMetadataRpcExecutor()).dispatch(Mockito.any(CallRunner.class));
+// verify that that metadata queue is at least once 
+
Mockito.verify(TestPhoenixIndexRpcSchedulerFactory.getMetadataRpcExecutor(), 
Mockito.atLeastOnce()).dispatch(Mockito.any(CallRunner.class));
 }
 finally {
 conn.close();

phoenix git commit: PHOENIX-1803 Fix flapping PhoenixServerRpcIT.testMetadataQos

2015-04-02 Thread tdsilva

Repository: phoenix
Updated Branches:
  refs/heads/master eb7327113 -> 3a0ce7d0f


PHOENIX-1803 Fix flapping PhoenixServerRpcIT.testMetadataQos


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

Branch: refs/heads/master
Commit: 3a0ce7d0f31bddc1ea802d66dde91bdde0e01504
Parents: eb73271
Author: Thomas D'Silva 
Authored: Thu Apr 2 17:50:58 2015 -0700
Committer: Thomas D'Silva 
Committed: Thu Apr 2 17:56:37 2015 -0700

--
 .../src/it/java/org/apache/phoenix/rpc/PhoenixServerRpcIT.java   | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/phoenix/blob/3a0ce7d0/phoenix-core/src/it/java/org/apache/phoenix/rpc/PhoenixServerRpcIT.java
--
diff --git 
a/phoenix-core/src/it/java/org/apache/phoenix/rpc/PhoenixServerRpcIT.java 
b/phoenix-core/src/it/java/org/apache/phoenix/rpc/PhoenixServerRpcIT.java
index dbcd7ac..4d3620f 100644
--- a/phoenix-core/src/it/java/org/apache/phoenix/rpc/PhoenixServerRpcIT.java
+++ b/phoenix-core/src/it/java/org/apache/phoenix/rpc/PhoenixServerRpcIT.java
@@ -221,8 +221,8 @@ public class PhoenixServerRpcIT extends 
BaseOwnClusterHBaseManagedTimeIT {
 "CREATE TABLE " + DATA_TABLE_FULL_NAME + " (k VARCHAR NOT 
NULL PRIMARY KEY, v VARCHAR)");
 // query the table from another connection, so that SYSTEM.STATS 
will be used 
 conn.createStatement().execute("SELECT * FROM 
"+DATA_TABLE_FULL_NAME);
-// verify that that metadata queue is used once 
-
Mockito.verify(TestPhoenixIndexRpcSchedulerFactory.getMetadataRpcExecutor()).dispatch(Mockito.any(CallRunner.class));
+// verify that that metadata queue is at least once 
+
Mockito.verify(TestPhoenixIndexRpcSchedulerFactory.getMetadataRpcExecutor(), 
Mockito.atLeastOnce()).dispatch(Mockito.any(CallRunner.class));
 }
 finally {
 conn.close();

phoenix git commit: PHOENIX-1803 Fix flapping PhoenixServerRpcIT.testMetadataQos

2015-04-02 Thread tdsilva

Repository: phoenix
Updated Branches:
  refs/heads/4.3 b4448693b -> a57f137a1


PHOENIX-1803 Fix flapping PhoenixServerRpcIT.testMetadataQos


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

Branch: refs/heads/4.3
Commit: a57f137a1658452601715402ed1c51b733036fbc
Parents: b444869
Author: Thomas D'Silva 
Authored: Thu Apr 2 17:50:58 2015 -0700
Committer: Thomas D'Silva 
Committed: Thu Apr 2 17:50:58 2015 -0700

--
 .../src/it/java/org/apache/phoenix/rpc/PhoenixServerRpcIT.java   | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/phoenix/blob/a57f137a/phoenix-core/src/it/java/org/apache/phoenix/rpc/PhoenixServerRpcIT.java
--
diff --git 
a/phoenix-core/src/it/java/org/apache/phoenix/rpc/PhoenixServerRpcIT.java 
b/phoenix-core/src/it/java/org/apache/phoenix/rpc/PhoenixServerRpcIT.java
index 2a7898a..ef7fed4 100644
--- a/phoenix-core/src/it/java/org/apache/phoenix/rpc/PhoenixServerRpcIT.java
+++ b/phoenix-core/src/it/java/org/apache/phoenix/rpc/PhoenixServerRpcIT.java
@@ -220,8 +220,8 @@ public class PhoenixServerRpcIT extends 
BaseOwnClusterHBaseManagedTimeIT {
 "CREATE TABLE " + DATA_TABLE_FULL_NAME + " (k VARCHAR NOT 
NULL PRIMARY KEY, v VARCHAR)");
 // query the table from another connection, so that SYSTEM.STATS 
will be used 
 conn.createStatement().execute("SELECT * FROM 
"+DATA_TABLE_FULL_NAME);
-// verify that that metadata queue is used once 
-
Mockito.verify(TestPhoenixIndexRpcSchedulerFactory.getMetadataRpcExecutor()).dispatch(Mockito.any(CallRunner.class));
+// verify that that metadata queue is at least once 
+
Mockito.verify(TestPhoenixIndexRpcSchedulerFactory.getMetadataRpcExecutor(), 
Mockito.atLeastOnce()).dispatch(Mockito.any(CallRunner.class));
 }
 finally {
 conn.close();

Apache-Phoenix | 3.0 | Hadoop1 | Build Successful

2015-04-02 Thread Apache Jenkins Server

3.0 branch build status Successful
Source repository https://git-wip-us.apache.org/repos/asf/phoenix.git

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

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

Changes
[jtaylor] PHOENIX-1799 Provide parameter metadata for prepared create table statements

[jtaylor] PHOENIX-1776 The literal -1.0 (floating point) should not be converted to -1 (Integer) (Dave Hacker)



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

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

2015-04-02 Thread Apache Jenkins Server

4.x-HBase-0.98 branch build status Successful

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

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

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

Changes
[jtaylor] PHOENIX-1799 Provide parameter metadata for prepared create table statements



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

Build failed in Jenkins: Phoenix | 4.3 #65

2015-04-02 Thread Apache Jenkins Server

See 

Changes:

[jtaylor] PHOENIX-1799 Provide parameter metadata for prepared create table 
statements

--
[...truncated 565 lines...]
Running org.apache.phoenix.end2end.SaltedViewIT
Running org.apache.phoenix.mapreduce.CsvBulkLoadToolIT
Tests run: 15, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 27.163 sec - 
in org.apache.phoenix.end2end.ViewIT
Running org.apache.phoenix.end2end.StatsCollectorIT
Tests run: 2, Failures: 0, Errors: 1, Skipped: 0, Time elapsed: 11.684 sec <<< 
FAILURE! - in org.apache.phoenix.end2end.SaltedViewIT
testSaltedUpdatableViewWithLocalIndex(org.apache.phoenix.end2end.SaltedViewIT)  
Time elapsed: 3.1 sec  <<< ERROR!
org.apache.phoenix.exception.PhoenixIOException: 
org.apache.phoenix.exception.PhoenixIOException: 
org.apache.hadoop.hbase.TableNotFoundException: _LOCAL_IDX__LOCAL_IDX_T
at 
org.apache.hadoop.hbase.client.HConnectionManager$HConnectionImplementation.locateRegionInMeta(HConnectionManager.java:1279)
at 
org.apache.hadoop.hbase.client.HConnectionManager$HConnectionImplementation.locateRegion(HConnectionManager.java:1150)
at 
org.apache.hadoop.hbase.client.HConnectionManager$HConnectionImplementation.locateRegion(HConnectionManager.java:1107)
at 
org.apache.hadoop.hbase.client.HConnectionManager$HConnectionImplementation.getRegionLocation(HConnectionManager.java:948)
at 
org.apache.hadoop.hbase.client.RegionServerCallable.prepare(RegionServerCallable.java:72)
at 
org.apache.hadoop.hbase.client.RpcRetryingCaller.callWithRetries(RpcRetryingCaller.java:116)
at org.apache.hadoop.hbase.client.HTable.get(HTable.java:813)
at 
org.apache.hadoop.hbase.coprocessor.CoprocessorHost$Environment$HTableWrapper.get(CoprocessorHost.java:452)
at 
org.apache.phoenix.util.IndexUtil.wrapResultUsingOffset(IndexUtil.java:486)
at 
org.apache.phoenix.coprocessor.BaseScannerRegionObserver$2.nextRaw(BaseScannerRegionObserver.java:305)
at 
org.apache.phoenix.coprocessor.DelegateRegionScanner.nextRaw(DelegateRegionScanner.java:76)
at 
org.apache.hadoop.hbase.regionserver.HRegionServer.scan(HRegionServer.java:3249)
at 
org.apache.hadoop.hbase.protobuf.generated.ClientProtos$ClientService$2.callBlockingMethod(ClientProtos.java:29941)
at org.apache.hadoop.hbase.ipc.RpcServer.call(RpcServer.java:2029)
at org.apache.hadoop.hbase.ipc.CallRunner.run(CallRunner.java:108)
at 
org.apache.hadoop.hbase.ipc.RpcExecutor.consumerLoop(RpcExecutor.java:112)
at org.apache.hadoop.hbase.ipc.RpcExecutor$1.run(RpcExecutor.java:92)
at java.lang.Thread.run(Thread.java:724)

at java.util.concurrent.FutureTask$Sync.innerGet(FutureTask.java:262)
at java.util.concurrent.FutureTask.get(FutureTask.java:119)
at 
org.apache.phoenix.iterate.BaseResultIterators.getIterators(BaseResultIterators.java:536)
at 
org.apache.phoenix.iterate.MergeSortResultIterator.getIterators(MergeSortResultIterator.java:48)
at 
org.apache.phoenix.iterate.MergeSortResultIterator.minIterator(MergeSortResultIterator.java:84)
at 
org.apache.phoenix.iterate.MergeSortResultIterator.next(MergeSortResultIterator.java:111)
at 
org.apache.phoenix.jdbc.PhoenixResultSet.next(PhoenixResultSet.java:756)
at 
org.apache.phoenix.end2end.BaseViewIT.testUpdatableViewIndex(BaseViewIT.java:124)
at 
org.apache.phoenix.end2end.BaseViewIT.testUpdatableViewWithIndex(BaseViewIT.java:53)
at 
org.apache.phoenix.end2end.SaltedViewIT.testSaltedUpdatableViewWithLocalIndex(SaltedViewIT.java:39)
Caused by: org.apache.phoenix.exception.PhoenixIOException: 
org.apache.hadoop.hbase.TableNotFoundException: _LOCAL_IDX__LOCAL_IDX_T
at 
org.apache.hadoop.hbase.client.HConnectionManager$HConnectionImplementation.locateRegionInMeta(HConnectionManager.java:1279)
at 
org.apache.hadoop.hbase.client.HConnectionManager$HConnectionImplementation.locateRegion(HConnectionManager.java:1150)
at 
org.apache.hadoop.hbase.client.HConnectionManager$HConnectionImplementation.locateRegion(HConnectionManager.java:1107)
at 
org.apache.hadoop.hbase.client.HConnectionManager$HConnectionImplementation.getRegionLocation(HConnectionManager.java:948)
at 
org.apache.hadoop.hbase.client.RegionServerCallable.prepare(RegionServerCallable.java:72)
at 
org.apache.hadoop.hbase.client.RpcRetryingCaller.callWithRetries(RpcRetryingCaller.java:116)
at org.apache.hadoop.hbase.client.HTable.get(HTable.java:813)
at 
org.apache.hadoop.hbase.coprocessor.CoprocessorHost$Environment$HTableWrapper.get(CoprocessorHost.java:452)
at 
org.apache.phoenix.util.IndexUtil.wrapResultUsingOffset(IndexUtil.java:486)
at 
org.apache.phoenix.coprocessor.BaseScannerRegionObserver$2.nextRaw(BaseScannerRegionObserver.java:305)
at 
org.apache.phoenix.

Apache-Phoenix | Master | Build Successful

2015-04-02 Thread Apache Jenkins Server

Master branch build status Successful
Source repository https://git-wip-us.apache.org/repos/asf/phoenix.git

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

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

Changes
[samarth.jain] PHOENIX-1798 UnsupportedOperationException throws from BaseResultIterators.getIterators (Cen Qi)

[jtaylor] PHOENIX-1799 Provide parameter metadata for prepared create table statements



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

Apache-Phoenix | 3.0 | Hadoop1 | Build Successful

2015-04-02 Thread Apache Jenkins Server

3.0 branch build status Successful
Source repository https://git-wip-us.apache.org/repos/asf/phoenix.git

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

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

Changes
[samarth.jain] PHOENIX-1798 UnsupportedOperationException throws from BaseResultIterators.getIterators (Cen Qi)



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

[2/2] phoenix git commit: PHOENIX-1776 The literal -1.0 (floating point) should not be converted to -1 (Integer) (Dave Hacker)

2015-04-02 Thread jamestaylor

PHOENIX-1776 The literal -1.0 (floating point) should not be converted to -1 
(Integer) (Dave Hacker)

Conflicts:

phoenix-core/src/main/java/org/apache/phoenix/parse/ParseNodeFactory.java


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

Branch: refs/heads/3.0
Commit: f490692c2935707497153381312bbf8fea709749
Parents: a828537
Author: Samarth 
Authored: Thu Mar 26 00:37:12 2015 -0700
Committer: James Taylor 
Committed: Thu Apr 2 16:57:06 2015 -0700

--
 .../phoenix/end2end/ArithmeticQueryIT.java  | 28 
 .../phoenix/compile/CreateTableCompiler.java|  5 ++--
 .../apache/phoenix/parse/LiteralParseNode.java  |  1 +
 .../apache/phoenix/parse/ParseNodeFactory.java  | 11 ++--
 4 files changed, 40 insertions(+), 5 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/phoenix/blob/f490692c/phoenix-core/src/it/java/org/apache/phoenix/end2end/ArithmeticQueryIT.java
--
diff --git 
a/phoenix-core/src/it/java/org/apache/phoenix/end2end/ArithmeticQueryIT.java 
b/phoenix-core/src/it/java/org/apache/phoenix/end2end/ArithmeticQueryIT.java
index 21af737..3cb4b57 100644
--- a/phoenix-core/src/it/java/org/apache/phoenix/end2end/ArithmeticQueryIT.java
+++ b/phoenix-core/src/it/java/org/apache/phoenix/end2end/ArithmeticQueryIT.java
@@ -857,4 +857,32 @@ public class ArithmeticQueryIT extends 
BaseHBaseManagedTimeIT {
 assertTrue(rs.next());
 assertEquals(1.3, rs.getDouble(1), 0.001);
 }
+
+@Test
+public void testFloatingPointUpsert() throws Exception {
+Connection conn = DriverManager.getConnection(getUrl());
+String ddl = "CREATE TABLE test (id VARCHAR not null primary key, name 
VARCHAR, lat FLOAT)";
+conn.createStatement().execute(ddl);
+String dml = "UPSERT INTO test(id,name,lat) VALUES ('testid', 
'testname', -1.00)";
+conn.createStatement().execute(dml);
+conn.commit();
+
+ResultSet rs = conn.createStatement().executeQuery("SELECT lat FROM 
test");
+assertTrue(rs.next());
+assertEquals(-1.0f, rs.getFloat(1), 0.001);
+}
+
+@Test
+public void testFloatingPointMultiplicationUpsert() throws Exception {
+Connection conn = DriverManager.getConnection(getUrl());
+String ddl = "CREATE TABLE test (id VARCHAR not null primary key, name 
VARCHAR, lat FLOAT)";
+conn.createStatement().execute(ddl);
+String dml = "UPSERT INTO test(id,name,lat) VALUES ('testid', 
'testname', -1.00 * 1)";
+conn.createStatement().execute(dml);
+conn.commit();
+
+ResultSet rs = conn.createStatement().executeQuery("SELECT lat FROM 
test");
+assertTrue(rs.next());
+assertEquals(-1.0f, rs.getFloat(1), 0.001);
+}
 }
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/phoenix/blob/f490692c/phoenix-core/src/main/java/org/apache/phoenix/compile/CreateTableCompiler.java
--
diff --git 
a/phoenix-core/src/main/java/org/apache/phoenix/compile/CreateTableCompiler.java
 
b/phoenix-core/src/main/java/org/apache/phoenix/compile/CreateTableCompiler.java
index ac50285..4af0cc9 100644
--- 
a/phoenix-core/src/main/java/org/apache/phoenix/compile/CreateTableCompiler.java
+++ 
b/phoenix-core/src/main/java/org/apache/phoenix/compile/CreateTableCompiler.java
@@ -51,6 +51,7 @@ import org.apache.phoenix.parse.TableName;
 import org.apache.phoenix.query.DelegateConnectionQueryServices;
 import org.apache.phoenix.schema.ColumnRef;
 import org.apache.phoenix.schema.MetaDataClient;
+import org.apache.phoenix.schema.PDataType;
 import org.apache.phoenix.schema.PDatum;
 import org.apache.phoenix.schema.PMetaData;
 import org.apache.phoenix.schema.PTable;
@@ -58,8 +59,6 @@ import org.apache.phoenix.schema.PTable.ViewType;
 import org.apache.phoenix.schema.PTableType;
 import org.apache.phoenix.schema.SortOrder;
 import org.apache.phoenix.schema.TableRef;
-import org.apache.phoenix.schema.types.PDataType;
-import org.apache.phoenix.schema.types.PVarbinary;
 import org.apache.phoenix.util.ByteUtil;
 import org.apache.phoenix.util.QueryUtil;
 
@@ -318,7 +317,7 @@ public class CreateTableCompiler {
 
 @Override
 public PDataType getDataType() {
-return PVarbinary.INSTANCE;
+return PDataType.VARBINARY;
 }
 
 @Override

http://git-wip-us.apache.org/repos/asf/phoenix/blob/f490692c/phoenix-core/src/main/java/org/apache/phoenix/parse/LiteralParseNode.java
--

[1/2] phoenix git commit: PHOENIX-1799 Provide parameter metadata for prepared create table statements

2015-04-02 Thread jamestaylor

Repository: phoenix
Updated Branches:
  refs/heads/3.0 2742cdced -> f490692c2


PHOENIX-1799 Provide parameter metadata for prepared create table statements


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

Branch: refs/heads/3.0
Commit: a828537d398a602015e144aa67cc1af6d8e54cb2
Parents: 2742cdc
Author: James Taylor 
Authored: Thu Apr 2 13:32:47 2015 -0700
Committer: James Taylor 
Committed: Thu Apr 2 16:46:30 2015 -0700

--
 .../phoenix/compile/CreateTableCompiler.java| 37 
 .../phoenix/compile/QueryMetaDataTest.java  | 11 ++
 2 files changed, 48 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/phoenix/blob/a828537d/phoenix-core/src/main/java/org/apache/phoenix/compile/CreateTableCompiler.java
--
diff --git 
a/phoenix-core/src/main/java/org/apache/phoenix/compile/CreateTableCompiler.java
 
b/phoenix-core/src/main/java/org/apache/phoenix/compile/CreateTableCompiler.java
index ade8345..ac50285 100644
--- 
a/phoenix-core/src/main/java/org/apache/phoenix/compile/CreateTableCompiler.java
+++ 
b/phoenix-core/src/main/java/org/apache/phoenix/compile/CreateTableCompiler.java
@@ -41,6 +41,7 @@ import org.apache.phoenix.expression.RowKeyColumnExpression;
 import org.apache.phoenix.expression.visitor.TraverseNoExpressionVisitor;
 import org.apache.phoenix.jdbc.PhoenixConnection;
 import org.apache.phoenix.jdbc.PhoenixStatement;
+import org.apache.phoenix.parse.BindParseNode;
 import org.apache.phoenix.parse.ColumnParseNode;
 import org.apache.phoenix.parse.CreateTableStatement;
 import org.apache.phoenix.parse.ParseNode;
@@ -50,11 +51,15 @@ import org.apache.phoenix.parse.TableName;
 import org.apache.phoenix.query.DelegateConnectionQueryServices;
 import org.apache.phoenix.schema.ColumnRef;
 import org.apache.phoenix.schema.MetaDataClient;
+import org.apache.phoenix.schema.PDatum;
 import org.apache.phoenix.schema.PMetaData;
 import org.apache.phoenix.schema.PTable;
 import org.apache.phoenix.schema.PTable.ViewType;
 import org.apache.phoenix.schema.PTableType;
+import org.apache.phoenix.schema.SortOrder;
 import org.apache.phoenix.schema.TableRef;
+import org.apache.phoenix.schema.types.PDataType;
+import org.apache.phoenix.schema.types.PVarbinary;
 import org.apache.phoenix.util.ByteUtil;
 import org.apache.phoenix.util.QueryUtil;
 
@@ -62,6 +67,7 @@ import com.google.common.collect.Iterators;
 
 
 public class CreateTableCompiler {
+private static final PDatum VARBINARY_DATUM = new VarbinaryDatum();
 private final PhoenixStatement statement;
 
 public CreateTableCompiler(PhoenixStatement statement) {
@@ -149,6 +155,9 @@ public class CreateTableCompiler {
 ExpressionCompiler expressionCompiler = new 
ExpressionCompiler(context);
 for (int i = 0; i < splits.length; i++) {
 ParseNode node = splitNodes.get(i);
+if (node instanceof BindParseNode) {
+context.getBindManager().addParamMetaData((BindParseNode) 
node, VARBINARY_DATUM);
+}
 if (node.isStateless()) {
 Expression expression = node.accept(expressionCompiler);
 if (expression.evaluate(null, ptr)) {;
@@ -300,4 +309,32 @@ public class CreateTableCompiler {
 }
 
 }
+private static class VarbinaryDatum implements PDatum {
+
+@Override
+public boolean isNullable() {
+return false;
+}
+
+@Override
+public PDataType getDataType() {
+return PVarbinary.INSTANCE;
+}
+
+@Override
+public Integer getMaxLength() {
+return null;
+}
+
+@Override
+public Integer getScale() {
+return null;
+}
+
+@Override
+public SortOrder getSortOrder() {
+return SortOrder.getDefault();
+}
+
+}
 }

http://git-wip-us.apache.org/repos/asf/phoenix/blob/a828537d/phoenix-core/src/test/java/org/apache/phoenix/compile/QueryMetaDataTest.java
--
diff --git 
a/phoenix-core/src/test/java/org/apache/phoenix/compile/QueryMetaDataTest.java 
b/phoenix-core/src/test/java/org/apache/phoenix/compile/QueryMetaDataTest.java
index 73ba2a4..bf11b72 100644
--- 
a/phoenix-core/src/test/java/org/apache/phoenix/compile/QueryMetaDataTest.java
+++ 
b/phoenix-core/src/test/java/org/apache/phoenix/compile/QueryMetaDataTest.java
@@ -441,4 +441,15 @@ public class QueryMetaDataTest extends 
BaseConnectionlessQueryTest {
 assertEquals(String.class.getName(), p

Jenkins build is back to normal : Phoenix | 4.x-HBase-0.98 #619

2015-04-02 Thread Apache Jenkins Server

See

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

2015-04-02 Thread Apache Jenkins Server

4.x-HBase-0.98 branch build status Successful

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

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

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

Changes
[samarth.jain] PHOENIX-1798 UnsupportedOperationException throws from BaseResultIterators.getIterators (Cen Qi)



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

phoenix git commit: PHOENIX-1799 Provide parameter metadata for prepared create table statements

2015-04-02 Thread jamestaylor

Repository: phoenix
Updated Branches:
  refs/heads/4.x-HBase-0.98 de3e2ab7e -> 57b5ad30e


PHOENIX-1799 Provide parameter metadata for prepared create table statements


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

Branch: refs/heads/4.x-HBase-0.98
Commit: 57b5ad30e5b1888e079247d8cb55d2d23b62de9a
Parents: de3e2ab
Author: James Taylor 
Authored: Thu Apr 2 13:32:47 2015 -0700
Committer: James Taylor 
Committed: Thu Apr 2 16:43:11 2015 -0700

--
 .../phoenix/compile/CreateTableCompiler.java| 37 
 .../phoenix/compile/QueryMetaDataTest.java  | 11 ++
 2 files changed, 48 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/phoenix/blob/57b5ad30/phoenix-core/src/main/java/org/apache/phoenix/compile/CreateTableCompiler.java
--
diff --git 
a/phoenix-core/src/main/java/org/apache/phoenix/compile/CreateTableCompiler.java
 
b/phoenix-core/src/main/java/org/apache/phoenix/compile/CreateTableCompiler.java
index edee788..a5adc49 100644
--- 
a/phoenix-core/src/main/java/org/apache/phoenix/compile/CreateTableCompiler.java
+++ 
b/phoenix-core/src/main/java/org/apache/phoenix/compile/CreateTableCompiler.java
@@ -41,6 +41,7 @@ import org.apache.phoenix.expression.RowKeyColumnExpression;
 import 
org.apache.phoenix.expression.visitor.StatelessTraverseNoExpressionVisitor;
 import org.apache.phoenix.jdbc.PhoenixConnection;
 import org.apache.phoenix.jdbc.PhoenixStatement;
+import org.apache.phoenix.parse.BindParseNode;
 import org.apache.phoenix.parse.ColumnParseNode;
 import org.apache.phoenix.parse.CreateTableStatement;
 import org.apache.phoenix.parse.ParseNode;
@@ -50,11 +51,15 @@ import org.apache.phoenix.parse.TableName;
 import org.apache.phoenix.query.DelegateConnectionQueryServices;
 import org.apache.phoenix.schema.ColumnRef;
 import org.apache.phoenix.schema.MetaDataClient;
+import org.apache.phoenix.schema.PDatum;
 import org.apache.phoenix.schema.PMetaData;
 import org.apache.phoenix.schema.PTable;
 import org.apache.phoenix.schema.PTable.ViewType;
 import org.apache.phoenix.schema.PTableType;
+import org.apache.phoenix.schema.SortOrder;
 import org.apache.phoenix.schema.TableRef;
+import org.apache.phoenix.schema.types.PDataType;
+import org.apache.phoenix.schema.types.PVarbinary;
 import org.apache.phoenix.util.ByteUtil;
 import org.apache.phoenix.util.QueryUtil;
 
@@ -62,6 +67,7 @@ import com.google.common.collect.Iterators;
 
 
 public class CreateTableCompiler {
+private static final PDatum VARBINARY_DATUM = new VarbinaryDatum();
 private final PhoenixStatement statement;
 
 public CreateTableCompiler(PhoenixStatement statement) {
@@ -151,6 +157,9 @@ public class CreateTableCompiler {
 ExpressionCompiler expressionCompiler = new 
ExpressionCompiler(context);
 for (int i = 0; i < splits.length; i++) {
 ParseNode node = splitNodes.get(i);
+if (node instanceof BindParseNode) {
+context.getBindManager().addParamMetaData((BindParseNode) 
node, VARBINARY_DATUM);
+}
 if (node.isStateless()) {
 Expression expression = node.accept(expressionCompiler);
 if (expression.evaluate(null, ptr)) {;
@@ -302,4 +311,32 @@ public class CreateTableCompiler {
 }
 
 }
+private static class VarbinaryDatum implements PDatum {
+
+@Override
+public boolean isNullable() {
+return false;
+}
+
+@Override
+public PDataType getDataType() {
+return PVarbinary.INSTANCE;
+}
+
+@Override
+public Integer getMaxLength() {
+return null;
+}
+
+@Override
+public Integer getScale() {
+return null;
+}
+
+@Override
+public SortOrder getSortOrder() {
+return SortOrder.getDefault();
+}
+
+}
 }

http://git-wip-us.apache.org/repos/asf/phoenix/blob/57b5ad30/phoenix-core/src/test/java/org/apache/phoenix/compile/QueryMetaDataTest.java
--
diff --git 
a/phoenix-core/src/test/java/org/apache/phoenix/compile/QueryMetaDataTest.java 
b/phoenix-core/src/test/java/org/apache/phoenix/compile/QueryMetaDataTest.java
index 73ba2a4..bf11b72 100644
--- 
a/phoenix-core/src/test/java/org/apache/phoenix/compile/QueryMetaDataTest.java
+++ 
b/phoenix-core/src/test/java/org/apache/phoenix/compile/QueryMetaDataTest.java
@@ -441,4 +441,15 @@ public class QueryMetaDataTest extends 
BaseConnectionlessQueryTest {
 assert

phoenix git commit: PHOENIX-1799 Provide parameter metadata for prepared create table statements

2015-04-02 Thread jamestaylor

Repository: phoenix
Updated Branches:
  refs/heads/4.3 90e8c7a2c -> b4448693b


PHOENIX-1799 Provide parameter metadata for prepared create table statements


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

Branch: refs/heads/4.3
Commit: b4448693be1954b0d0430392a015a1e750f007fb
Parents: 90e8c7a
Author: James Taylor 
Authored: Thu Apr 2 13:32:47 2015 -0700
Committer: James Taylor 
Committed: Thu Apr 2 16:39:10 2015 -0700

--
 .../phoenix/compile/CreateTableCompiler.java| 37 
 .../phoenix/compile/QueryMetaDataTest.java  | 11 ++
 2 files changed, 48 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/phoenix/blob/b4448693/phoenix-core/src/main/java/org/apache/phoenix/compile/CreateTableCompiler.java
--
diff --git 
a/phoenix-core/src/main/java/org/apache/phoenix/compile/CreateTableCompiler.java
 
b/phoenix-core/src/main/java/org/apache/phoenix/compile/CreateTableCompiler.java
index edee788..a5adc49 100644
--- 
a/phoenix-core/src/main/java/org/apache/phoenix/compile/CreateTableCompiler.java
+++ 
b/phoenix-core/src/main/java/org/apache/phoenix/compile/CreateTableCompiler.java
@@ -41,6 +41,7 @@ import org.apache.phoenix.expression.RowKeyColumnExpression;
 import 
org.apache.phoenix.expression.visitor.StatelessTraverseNoExpressionVisitor;
 import org.apache.phoenix.jdbc.PhoenixConnection;
 import org.apache.phoenix.jdbc.PhoenixStatement;
+import org.apache.phoenix.parse.BindParseNode;
 import org.apache.phoenix.parse.ColumnParseNode;
 import org.apache.phoenix.parse.CreateTableStatement;
 import org.apache.phoenix.parse.ParseNode;
@@ -50,11 +51,15 @@ import org.apache.phoenix.parse.TableName;
 import org.apache.phoenix.query.DelegateConnectionQueryServices;
 import org.apache.phoenix.schema.ColumnRef;
 import org.apache.phoenix.schema.MetaDataClient;
+import org.apache.phoenix.schema.PDatum;
 import org.apache.phoenix.schema.PMetaData;
 import org.apache.phoenix.schema.PTable;
 import org.apache.phoenix.schema.PTable.ViewType;
 import org.apache.phoenix.schema.PTableType;
+import org.apache.phoenix.schema.SortOrder;
 import org.apache.phoenix.schema.TableRef;
+import org.apache.phoenix.schema.types.PDataType;
+import org.apache.phoenix.schema.types.PVarbinary;
 import org.apache.phoenix.util.ByteUtil;
 import org.apache.phoenix.util.QueryUtil;
 
@@ -62,6 +67,7 @@ import com.google.common.collect.Iterators;
 
 
 public class CreateTableCompiler {
+private static final PDatum VARBINARY_DATUM = new VarbinaryDatum();
 private final PhoenixStatement statement;
 
 public CreateTableCompiler(PhoenixStatement statement) {
@@ -151,6 +157,9 @@ public class CreateTableCompiler {
 ExpressionCompiler expressionCompiler = new 
ExpressionCompiler(context);
 for (int i = 0; i < splits.length; i++) {
 ParseNode node = splitNodes.get(i);
+if (node instanceof BindParseNode) {
+context.getBindManager().addParamMetaData((BindParseNode) 
node, VARBINARY_DATUM);
+}
 if (node.isStateless()) {
 Expression expression = node.accept(expressionCompiler);
 if (expression.evaluate(null, ptr)) {;
@@ -302,4 +311,32 @@ public class CreateTableCompiler {
 }
 
 }
+private static class VarbinaryDatum implements PDatum {
+
+@Override
+public boolean isNullable() {
+return false;
+}
+
+@Override
+public PDataType getDataType() {
+return PVarbinary.INSTANCE;
+}
+
+@Override
+public Integer getMaxLength() {
+return null;
+}
+
+@Override
+public Integer getScale() {
+return null;
+}
+
+@Override
+public SortOrder getSortOrder() {
+return SortOrder.getDefault();
+}
+
+}
 }

http://git-wip-us.apache.org/repos/asf/phoenix/blob/b4448693/phoenix-core/src/test/java/org/apache/phoenix/compile/QueryMetaDataTest.java
--
diff --git 
a/phoenix-core/src/test/java/org/apache/phoenix/compile/QueryMetaDataTest.java 
b/phoenix-core/src/test/java/org/apache/phoenix/compile/QueryMetaDataTest.java
index 73ba2a4..bf11b72 100644
--- 
a/phoenix-core/src/test/java/org/apache/phoenix/compile/QueryMetaDataTest.java
+++ 
b/phoenix-core/src/test/java/org/apache/phoenix/compile/QueryMetaDataTest.java
@@ -441,4 +441,15 @@ public class QueryMetaDataTest extends 
BaseConnectionlessQueryTest {
 assertEquals(String.class.ge

phoenix git commit: PHOENIX-1799 Provide parameter metadata for prepared create table statements

2015-04-02 Thread jamestaylor

Repository: phoenix
Updated Branches:
  refs/heads/master 4859fb9d6 -> eb7327113


PHOENIX-1799 Provide parameter metadata for prepared create table statements


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

Branch: refs/heads/master
Commit: eb7327113c1310af209015cf84caec339930ae3e
Parents: 4859fb9
Author: James Taylor 
Authored: Thu Apr 2 13:32:47 2015 -0700
Committer: James Taylor 
Committed: Thu Apr 2 16:34:41 2015 -0700

--
 .../phoenix/compile/CreateTableCompiler.java| 37 
 .../phoenix/compile/QueryMetaDataTest.java  | 11 ++
 2 files changed, 48 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/phoenix/blob/eb732711/phoenix-core/src/main/java/org/apache/phoenix/compile/CreateTableCompiler.java
--
diff --git 
a/phoenix-core/src/main/java/org/apache/phoenix/compile/CreateTableCompiler.java
 
b/phoenix-core/src/main/java/org/apache/phoenix/compile/CreateTableCompiler.java
index edee788..a5adc49 100644
--- 
a/phoenix-core/src/main/java/org/apache/phoenix/compile/CreateTableCompiler.java
+++ 
b/phoenix-core/src/main/java/org/apache/phoenix/compile/CreateTableCompiler.java
@@ -41,6 +41,7 @@ import org.apache.phoenix.expression.RowKeyColumnExpression;
 import 
org.apache.phoenix.expression.visitor.StatelessTraverseNoExpressionVisitor;
 import org.apache.phoenix.jdbc.PhoenixConnection;
 import org.apache.phoenix.jdbc.PhoenixStatement;
+import org.apache.phoenix.parse.BindParseNode;
 import org.apache.phoenix.parse.ColumnParseNode;
 import org.apache.phoenix.parse.CreateTableStatement;
 import org.apache.phoenix.parse.ParseNode;
@@ -50,11 +51,15 @@ import org.apache.phoenix.parse.TableName;
 import org.apache.phoenix.query.DelegateConnectionQueryServices;
 import org.apache.phoenix.schema.ColumnRef;
 import org.apache.phoenix.schema.MetaDataClient;
+import org.apache.phoenix.schema.PDatum;
 import org.apache.phoenix.schema.PMetaData;
 import org.apache.phoenix.schema.PTable;
 import org.apache.phoenix.schema.PTable.ViewType;
 import org.apache.phoenix.schema.PTableType;
+import org.apache.phoenix.schema.SortOrder;
 import org.apache.phoenix.schema.TableRef;
+import org.apache.phoenix.schema.types.PDataType;
+import org.apache.phoenix.schema.types.PVarbinary;
 import org.apache.phoenix.util.ByteUtil;
 import org.apache.phoenix.util.QueryUtil;
 
@@ -62,6 +67,7 @@ import com.google.common.collect.Iterators;
 
 
 public class CreateTableCompiler {
+private static final PDatum VARBINARY_DATUM = new VarbinaryDatum();
 private final PhoenixStatement statement;
 
 public CreateTableCompiler(PhoenixStatement statement) {
@@ -151,6 +157,9 @@ public class CreateTableCompiler {
 ExpressionCompiler expressionCompiler = new 
ExpressionCompiler(context);
 for (int i = 0; i < splits.length; i++) {
 ParseNode node = splitNodes.get(i);
+if (node instanceof BindParseNode) {
+context.getBindManager().addParamMetaData((BindParseNode) 
node, VARBINARY_DATUM);
+}
 if (node.isStateless()) {
 Expression expression = node.accept(expressionCompiler);
 if (expression.evaluate(null, ptr)) {;
@@ -302,4 +311,32 @@ public class CreateTableCompiler {
 }
 
 }
+private static class VarbinaryDatum implements PDatum {
+
+@Override
+public boolean isNullable() {
+return false;
+}
+
+@Override
+public PDataType getDataType() {
+return PVarbinary.INSTANCE;
+}
+
+@Override
+public Integer getMaxLength() {
+return null;
+}
+
+@Override
+public Integer getScale() {
+return null;
+}
+
+@Override
+public SortOrder getSortOrder() {
+return SortOrder.getDefault();
+}
+
+}
 }

http://git-wip-us.apache.org/repos/asf/phoenix/blob/eb732711/phoenix-core/src/test/java/org/apache/phoenix/compile/QueryMetaDataTest.java
--
diff --git 
a/phoenix-core/src/test/java/org/apache/phoenix/compile/QueryMetaDataTest.java 
b/phoenix-core/src/test/java/org/apache/phoenix/compile/QueryMetaDataTest.java
index 73ba2a4..bf11b72 100644
--- 
a/phoenix-core/src/test/java/org/apache/phoenix/compile/QueryMetaDataTest.java
+++ 
b/phoenix-core/src/test/java/org/apache/phoenix/compile/QueryMetaDataTest.java
@@ -441,4 +441,15 @@ public class QueryMetaDataTest extends 
BaseConnectionlessQueryTest {
 assertEquals(String.cl

phoenix git commit: PHOENIX-1798 UnsupportedOperationException throws from BaseResultIterators.getIterators (Cen Qi)

2015-04-02 Thread samarth

Repository: phoenix
Updated Branches:
  refs/heads/3.0 9615fa6d8 -> 2742cdced


PHOENIX-1798 UnsupportedOperationException throws from 
BaseResultIterators.getIterators (Cen Qi)


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

Branch: refs/heads/3.0
Commit: 2742cdced3e3700505aabc79915d7a1a5c9b6cc0
Parents: 9615fa6
Author: Samarth 
Authored: Thu Apr 2 16:31:45 2015 -0700
Committer: Samarth 
Committed: Thu Apr 2 16:31:45 2015 -0700

--
 .../main/java/org/apache/phoenix/iterate/BaseResultIterators.java  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/phoenix/blob/2742cdce/phoenix-core/src/main/java/org/apache/phoenix/iterate/BaseResultIterators.java
--
diff --git 
a/phoenix-core/src/main/java/org/apache/phoenix/iterate/BaseResultIterators.java
 
b/phoenix-core/src/main/java/org/apache/phoenix/iterate/BaseResultIterators.java
index 465fc6e..a3a0869 100644
--- 
a/phoenix-core/src/main/java/org/apache/phoenix/iterate/BaseResultIterators.java
+++ 
b/phoenix-core/src/main/java/org/apache/phoenix/iterate/BaseResultIterators.java
@@ -524,7 +524,7 @@ public abstract class BaseResultIterators extends 
ExplainTable implements Result
 // Add any concatIterators that were successful so 
far
 // as we need these to be in order
 addIterator(iterators, concatIterators);
-concatIterators = Collections.emptyList();
+concatIterators = Lists.newArrayList();
 submitWork(newNestedScans, newFutures, 
allIterators, newNestedScans.size());
 allFutures.add(newFutures);
 for 
(List>> newFuture : 
reverseIfNecessary(newFutures, isReverse)) {

phoenix git commit: PHOENIX-1798 UnsupportedOperationException throws from BaseResultIterators.getIterators (Cen Qi)

2015-04-02 Thread samarth

Repository: phoenix
Updated Branches:
  refs/heads/master 1f942b1f0 -> 4859fb9d6


PHOENIX-1798 UnsupportedOperationException throws from 
BaseResultIterators.getIterators (Cen Qi)


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

Branch: refs/heads/master
Commit: 4859fb9d66ccdeb4224bf7d52895368d9592d5fa
Parents: 1f942b1
Author: Samarth 
Authored: Thu Apr 2 16:26:50 2015 -0700
Committer: Samarth 
Committed: Thu Apr 2 16:26:50 2015 -0700

--
 .../main/java/org/apache/phoenix/iterate/BaseResultIterators.java  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/phoenix/blob/4859fb9d/phoenix-core/src/main/java/org/apache/phoenix/iterate/BaseResultIterators.java
--
diff --git 
a/phoenix-core/src/main/java/org/apache/phoenix/iterate/BaseResultIterators.java
 
b/phoenix-core/src/main/java/org/apache/phoenix/iterate/BaseResultIterators.java
index a120143..9ac6a29 100644
--- 
a/phoenix-core/src/main/java/org/apache/phoenix/iterate/BaseResultIterators.java
+++ 
b/phoenix-core/src/main/java/org/apache/phoenix/iterate/BaseResultIterators.java
@@ -556,7 +556,7 @@ public abstract class BaseResultIterators extends 
ExplainTable implements Result
 // Add any concatIterators that were successful so 
far
 // as we need these to be in order
 addIterator(iterators, concatIterators);
-concatIterators = Collections.emptyList();
+concatIterators = Lists.newArrayList();
 submitWork(newNestedScans, newFutures, 
allIterators, newNestedScans.size());
 allFutures.add(newFutures);
 for 
(List>> newFuture : 
reverseIfNecessary(newFutures, isReverse)) {

phoenix git commit: PHOENIX-1798 UnsupportedOperationException throws from BaseResultIterators.getIterators (Cen Qi)

2015-04-02 Thread samarth

Repository: phoenix
Updated Branches:
  refs/heads/4.3 79a810f9a -> 90e8c7a2c


PHOENIX-1798 UnsupportedOperationException throws from 
BaseResultIterators.getIterators (Cen Qi)


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

Branch: refs/heads/4.3
Commit: 90e8c7a2ca473547bc4cc9a5b5f4320878b93a82
Parents: 79a810f
Author: Samarth 
Authored: Thu Apr 2 16:25:45 2015 -0700
Committer: Samarth 
Committed: Thu Apr 2 16:25:45 2015 -0700

--
 .../main/java/org/apache/phoenix/iterate/BaseResultIterators.java  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/phoenix/blob/90e8c7a2/phoenix-core/src/main/java/org/apache/phoenix/iterate/BaseResultIterators.java
--
diff --git 
a/phoenix-core/src/main/java/org/apache/phoenix/iterate/BaseResultIterators.java
 
b/phoenix-core/src/main/java/org/apache/phoenix/iterate/BaseResultIterators.java
index a120143..9ac6a29 100644
--- 
a/phoenix-core/src/main/java/org/apache/phoenix/iterate/BaseResultIterators.java
+++ 
b/phoenix-core/src/main/java/org/apache/phoenix/iterate/BaseResultIterators.java
@@ -556,7 +556,7 @@ public abstract class BaseResultIterators extends 
ExplainTable implements Result
 // Add any concatIterators that were successful so 
far
 // as we need these to be in order
 addIterator(iterators, concatIterators);
-concatIterators = Collections.emptyList();
+concatIterators = Lists.newArrayList();
 submitWork(newNestedScans, newFutures, 
allIterators, newNestedScans.size());
 allFutures.add(newFutures);
 for 
(List>> newFuture : 
reverseIfNecessary(newFutures, isReverse)) {

phoenix git commit: PHOENIX-1798 UnsupportedOperationException throws from BaseResultIterators.getIterators (Cen Qi)

2015-04-02 Thread samarth

Repository: phoenix
Updated Branches:
  refs/heads/4.x-HBase-0.98 3e217e391 -> de3e2ab7e


PHOENIX-1798 UnsupportedOperationException throws from 
BaseResultIterators.getIterators (Cen Qi)


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

Branch: refs/heads/4.x-HBase-0.98
Commit: de3e2ab7eccacc7ad1af29557c5ea7d3e517c200
Parents: 3e217e3
Author: Samarth 
Authored: Thu Apr 2 16:23:03 2015 -0700
Committer: Samarth 
Committed: Thu Apr 2 16:23:03 2015 -0700

--
 .../main/java/org/apache/phoenix/iterate/BaseResultIterators.java  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/phoenix/blob/de3e2ab7/phoenix-core/src/main/java/org/apache/phoenix/iterate/BaseResultIterators.java
--
diff --git 
a/phoenix-core/src/main/java/org/apache/phoenix/iterate/BaseResultIterators.java
 
b/phoenix-core/src/main/java/org/apache/phoenix/iterate/BaseResultIterators.java
index a120143..9ac6a29 100644
--- 
a/phoenix-core/src/main/java/org/apache/phoenix/iterate/BaseResultIterators.java
+++ 
b/phoenix-core/src/main/java/org/apache/phoenix/iterate/BaseResultIterators.java
@@ -556,7 +556,7 @@ public abstract class BaseResultIterators extends 
ExplainTable implements Result
 // Add any concatIterators that were successful so 
far
 // as we need these to be in order
 addIterator(iterators, concatIterators);
-concatIterators = Collections.emptyList();
+concatIterators = Lists.newArrayList();
 submitWork(newNestedScans, newFutures, 
allIterators, newNestedScans.size());
 allFutures.add(newFutures);
 for 
(List>> newFuture : 
reverseIfNecessary(newFutures, isReverse)) {

phoenix git commit: Fix for UPSERT with autocommit

2015-04-02 Thread tdsilva

Repository: phoenix
Updated Branches:
  refs/heads/txn 0c0dbb56c -> ab6fac2b1


Fix for UPSERT with autocommit


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

Branch: refs/heads/txn
Commit: ab6fac2b1c7458ca03395b2420b0c241c7a36b98
Parents: 0c0dbb5
Author: Thomas D'Silva 
Authored: Thu Apr 2 12:23:47 2015 -0700
Committer: Thomas D'Silva 
Committed: Thu Apr 2 12:23:47 2015 -0700

--
 .../phoenix/transactions/TransactionIT.java | 22 +++-
 .../apache/phoenix/jdbc/PhoenixConnection.java  |  5 -
 2 files changed, 25 insertions(+), 2 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/phoenix/blob/ab6fac2b/phoenix-core/src/it/java/org/apache/phoenix/transactions/TransactionIT.java
--
diff --git 
a/phoenix-core/src/it/java/org/apache/phoenix/transactions/TransactionIT.java 
b/phoenix-core/src/it/java/org/apache/phoenix/transactions/TransactionIT.java
index 5ef2016..a4b5bc3 100644
--- 
a/phoenix-core/src/it/java/org/apache/phoenix/transactions/TransactionIT.java
+++ 
b/phoenix-core/src/it/java/org/apache/phoenix/transactions/TransactionIT.java
@@ -81,9 +81,14 @@ public class TransactionIT extends BaseHBaseManagedTimeIT {
stmt.setInt(1, 1);
stmt.setInt(2, 1);
stmt.execute();
+   
+   // verify no rows returned 
+   ResultSet rs = conn.createStatement().executeQuery("SELECT * 
FROM t");
+   assertFalse(rs.next());
+   
conn.commit();
// verify row exists
-   ResultSet rs = conn.createStatement().executeQuery("SELECT * 
FROM t");
+   rs = conn.createStatement().executeQuery("SELECT * FROM t");
assertTrue(rs.next());
assertEquals(1,rs.getInt(1));
assertEquals(1,rs.getInt(1));
@@ -95,6 +100,21 @@ public class TransactionIT extends BaseHBaseManagedTimeIT {
}

@Test
+   public void testUpsertWithAutocommit() throws Exception {
+   Connection conn = DriverManager.getConnection(getUrl());
+   String ddl = "CREATE TABLE t (k1 INTEGER PRIMARY KEY, k2 
INTEGER) transactional=true";
+   try {
+   conn.setAutoCommit(true);
+   conn.createStatement().execute(ddl);
+   // verify no rows returned
+   ResultSet rs = 
conn.createStatement().executeQuery("SELECT * FROM t");
+   assertFalse(rs.next());
+   } finally {
+   conn.close();
+   }
+   }
+   
+   @Test
public void testColConflicts() throws Exception {
Connection conn1 = DriverManager.getConnection(getUrl());
Connection conn2 = DriverManager.getConnection(getUrl());

http://git-wip-us.apache.org/repos/asf/phoenix/blob/ab6fac2b/phoenix-core/src/main/java/org/apache/phoenix/jdbc/PhoenixConnection.java
--
diff --git 
a/phoenix-core/src/main/java/org/apache/phoenix/jdbc/PhoenixConnection.java 
b/phoenix-core/src/main/java/org/apache/phoenix/jdbc/PhoenixConnection.java
index a646d96..240a599 100644
--- a/phoenix-core/src/main/java/org/apache/phoenix/jdbc/PhoenixConnection.java
+++ b/phoenix-core/src/main/java/org/apache/phoenix/jdbc/PhoenixConnection.java
@@ -453,7 +453,10 @@ public class PhoenixConnection implements Connection, 
org.apache.phoenix.jdbc.Jd
 }
 }
 
-public void addTxParticipant(TransactionAware txnAware) {
+public void addTxParticipant(TransactionAware txnAware) throws 
SQLException {
+   if (!isTransactionStarted()) {
+   startTransaction();
+   }
 txContext.addTransactionAware(txnAware);
 }

Jenkins build is back to normal : Phoenix | Master #652

2015-04-02 Thread Apache Jenkins Server

See

phoenix git commit: Passed another two tests: aggregate+project, aggregate+join

2015-04-02 Thread maryannxue

Repository: phoenix
Updated Branches:
  refs/heads/calcite 8097c8b9d -> b01bdd172


Passed another two tests: aggregate+project, aggregate+join


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

Branch: refs/heads/calcite
Commit: b01bdd1721ca6b2425c9011bda09c339128459e4
Parents: 8097c8b
Author: maryannxue 
Authored: Thu Apr 2 15:13:47 2015 -0400
Committer: maryannxue 
Committed: Thu Apr 2 15:13:47 2015 -0400

--
 .../org/apache/phoenix/calcite/CalciteTest.java | 26 ++
 .../phoenix/calcite/PhoenixAggregate.java   | 84 
 .../org/apache/phoenix/calcite/PhoenixJoin.java |  2 +-
 .../apache/phoenix/calcite/PhoenixProject.java  | 33 ++--
 .../org/apache/phoenix/calcite/PhoenixRel.java  |  5 ++
 .../calcite/PhoenixRelImplementorImpl.java  | 36 +
 .../phoenix/calcite/PhoenixTableScan.java   |  6 +-
 7 files changed, 113 insertions(+), 79 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/phoenix/blob/b01bdd17/phoenix-core/src/it/java/org/apache/phoenix/calcite/CalciteTest.java
--
diff --git 
a/phoenix-core/src/it/java/org/apache/phoenix/calcite/CalciteTest.java 
b/phoenix-core/src/it/java/org/apache/phoenix/calcite/CalciteTest.java
index 70d44f6..15c 100644
--- a/phoenix-core/src/it/java/org/apache/phoenix/calcite/CalciteTest.java
+++ b/phoenix-core/src/it/java/org/apache/phoenix/calcite/CalciteTest.java
@@ -256,6 +256,7 @@ public class CalciteTest extends BaseClientManagedTimeIT {
   {"00A323122312312", "a", "00D3XHP"}, 
   {"00A423122312312", "a", "00D3XHP"}})
 .close();
+
 start().sql("select t1.entity_id, t2.a_string, t3.organization_id from 
aTable t1 join aTable t2 on t1.entity_id = t2.entity_id and t1.organization_id 
= t2.organization_id join atable t3 on t1.entity_id = t3.entity_id and 
t1.organization_id = t3.organization_id") 
 .explainIs("PhoenixToEnumerableConverter\n" +
"  PhoenixProject(ENTITY_ID=[$19], A_STRING=[$2], 
ORGANIZATION_ID=[$36])\n" +
@@ -287,6 +288,31 @@ public class CalciteTest extends BaseClientManagedTimeIT {
   {"b", 4L},
   {"c", 1L}})
 .close();
+
+start().sql("select count(entity_id), a_string from atable group by 
a_string")
+.explainIs("PhoenixToEnumerableConverter\n" +
+   "  PhoenixProject(EXPR$0=[$1], A_STRING=[$0])\n" +
+   "PhoenixAggregate(group=[{0}], 
EXPR$0=[COUNT()])\n" +
+   "  PhoenixTableScan(table=[[phoenix, ATABLE]], 
project=[[$2]])\n")
+.resultIs(new Object[][] {
+  {4L, "a"},
+  {4L, "b"},
+  {1L, "c"}})
+.close();
+
+start().sql("select s.name, count(\"item_id\") from " + 
JOIN_SUPPLIER_TABLE_FULL_NAME + " s join " + JOIN_ITEM_TABLE_FULL_NAME + " i on 
s.\"supplier_id\" = i.\"supplier_id\" group by s.name")
+.explainIs("PhoenixToEnumerableConverter\n" +
+   "  PhoenixAggregate(group=[{0}], 
EXPR$1=[COUNT()])\n" +
+   "PhoenixProject(NAME=[$1])\n" +
+   "  PhoenixJoin(condition=[=($0, $2)], 
joinType=[inner])\n" +
+   "PhoenixTableScan(table=[[phoenix, 
SUPPLIERTABLE]], project=[[$0, $1]])\n" +
+   "PhoenixTableScan(table=[[phoenix, 
ITEMTABLE]], project=[[$5]])\n")
+.resultIs(new Object[][] {
+  {"S1", 2L},
+  {"S2", 2L},
+  {"S5", 1L},
+  {"S6", 1L}})
+.close();
 }
 
 @Test public void testSubquery() {

http://git-wip-us.apache.org/repos/asf/phoenix/blob/b01bdd17/phoenix-core/src/main/java/org/apache/phoenix/calcite/PhoenixAggregate.java
--
diff --git 
a/phoenix-core/src/main/java/org/apache/phoenix/calcite/PhoenixAggregate.java 
b/phoenix-core/src/main/java/org/apache/phoenix/calcite/PhoenixAggregate.java
index 7a38f25..0c620c8 100644
--- 
a/phoenix-core/src/main/java/org/apache/phoenix/calcite/PhoenixAggregate.java
+++ 
b/phoenix-core/src/main/java/org/apache/phoenix/calcite/PhoenixAggregate.java
@@ -7,6 +7,7 @@ import org.apache.calcite.plan.RelOptCluster;
 import org.apache.calcite.plan.RelOptCo

phoenix git commit: PHOENIX-1712 Add INSTR function

2015-04-02 Thread greid

Repository: phoenix
Updated Branches:
  refs/heads/4.x-HBase-0.98 2d23b4275 -> 3e217e391


PHOENIX-1712 Add INSTR function

Add method for detecting a substring within another string.

Signed-off-by: Gabriel Reid 


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

Branch: refs/heads/4.x-HBase-0.98
Commit: 3e217e3912dd205861a48a304f7d749fc668105e
Parents: 2d23b42
Author: NAVEEN MADHIRE 
Authored: Mon Mar 16 23:11:45 2015 -0400
Committer: Gabriel Reid 
Committed: Thu Apr 2 21:06:12 2015 +0200

--
 .../apache/phoenix/end2end/InstrFunctionIT.java | 126 +++
 .../phoenix/expression/ExpressionType.java  |   4 +-
 .../expression/function/InstrFunction.java  | 105 
 .../expression/function/InstrFunctionTest.java  | 108 
 4 files changed, 342 insertions(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/phoenix/blob/3e217e39/phoenix-core/src/it/java/org/apache/phoenix/end2end/InstrFunctionIT.java
--
diff --git 
a/phoenix-core/src/it/java/org/apache/phoenix/end2end/InstrFunctionIT.java 
b/phoenix-core/src/it/java/org/apache/phoenix/end2end/InstrFunctionIT.java
new file mode 100644
index 000..57c0661
--- /dev/null
+++ b/phoenix-core/src/it/java/org/apache/phoenix/end2end/InstrFunctionIT.java
@@ -0,0 +1,126 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.phoenix.end2end;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertTrue;
+
+import java.sql.Connection;
+import java.sql.DriverManager;
+import java.sql.PreparedStatement;
+import java.sql.ResultSet;
+
+import org.junit.Test;
+
+public class InstrFunctionIT extends BaseHBaseManagedTimeIT {
+private void initTable(Connection conn, String sortOrder, String s, String 
subStr) throws Exception {
+String ddl = "CREATE TABLE SAMPLE (name VARCHAR NOT NULL PRIMARY KEY " 
+ sortOrder + ", substr VARCHAR)";
+conn.createStatement().execute(ddl);
+String dml = "UPSERT INTO SAMPLE VALUES(?,?)";
+PreparedStatement stmt = conn.prepareStatement(dml);
+stmt.setString(1, s);
+stmt.setString(2, subStr);
+stmt.execute();
+conn.commit();
+}
+
+ private void testInstr(Connection conn, String queryToExecute, Integer 
expValue) throws Exception {
+ResultSet rs;
+rs = conn.createStatement().executeQuery(queryToExecute);
+assertTrue(rs.next());
+assertEquals(expValue.intValue(), rs.getInt(1));
+assertFalse(rs.next());
+
+}
+
+  private void testInstrFilter(Connection conn, String queryToExecute, 
String expected) throws Exception {
+ResultSet rs;
+PreparedStatement stmt = conn.prepareStatement(queryToExecute);
+rs = stmt.executeQuery();
+assertTrue(rs.next());
+assertEquals(expected, rs.getString(1));
+
+}
+
+@Test
+public void testSingleByteInstrAscending() throws Exception {
+Connection conn = DriverManager.getConnection(getUrl());
+initTable(conn, "ASC", "abcdefghijkl","fgh");
+String queryToExecute = "SELECT INSTR(name, 'fgh') FROM SAMPLE";
+testInstr(conn, queryToExecute, 5);
+}
+
+@Test
+public void testSingleByteInstrDescending() throws Exception {
+Connection conn = DriverManager.getConnection(getUrl());
+initTable(conn, "DESC", "abcdefghijkl","fgh");
+String queryToExecute = "SELECT INSTR(name, 'fgh') FROM SAMPLE";
+testInstr(conn, queryToExecute, 5);
+}
+
+@Test
+public void testSingleByteInstrAscendingNoString() throws Exception {
+Connection conn = DriverManager.getConnection(getUrl());
+initTable(conn, "ASC", "

phoenix git commit: PHOENIX-1712 Add INSTR function

2015-04-02 Thread greid

Repository: phoenix
Updated Branches:
  refs/heads/master f766a780c -> 1f942b1f0


PHOENIX-1712 Add INSTR function

Add method for detecting a substring within another string.

Signed-off-by: Gabriel Reid 


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

Branch: refs/heads/master
Commit: 1f942b1f0e815674f1917c18167d848769435148
Parents: f766a78
Author: NAVEEN MADHIRE 
Authored: Mon Mar 16 23:11:45 2015 -0400
Committer: Gabriel Reid 
Committed: Thu Apr 2 21:07:55 2015 +0200

--
 .../apache/phoenix/end2end/InstrFunctionIT.java | 126 +++
 .../phoenix/expression/ExpressionType.java  |   4 +-
 .../expression/function/InstrFunction.java  | 105 
 .../expression/function/InstrFunctionTest.java  | 108 
 4 files changed, 342 insertions(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/phoenix/blob/1f942b1f/phoenix-core/src/it/java/org/apache/phoenix/end2end/InstrFunctionIT.java
--
diff --git 
a/phoenix-core/src/it/java/org/apache/phoenix/end2end/InstrFunctionIT.java 
b/phoenix-core/src/it/java/org/apache/phoenix/end2end/InstrFunctionIT.java
new file mode 100644
index 000..57c0661
--- /dev/null
+++ b/phoenix-core/src/it/java/org/apache/phoenix/end2end/InstrFunctionIT.java
@@ -0,0 +1,126 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.phoenix.end2end;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertTrue;
+
+import java.sql.Connection;
+import java.sql.DriverManager;
+import java.sql.PreparedStatement;
+import java.sql.ResultSet;
+
+import org.junit.Test;
+
+public class InstrFunctionIT extends BaseHBaseManagedTimeIT {
+private void initTable(Connection conn, String sortOrder, String s, String 
subStr) throws Exception {
+String ddl = "CREATE TABLE SAMPLE (name VARCHAR NOT NULL PRIMARY KEY " 
+ sortOrder + ", substr VARCHAR)";
+conn.createStatement().execute(ddl);
+String dml = "UPSERT INTO SAMPLE VALUES(?,?)";
+PreparedStatement stmt = conn.prepareStatement(dml);
+stmt.setString(1, s);
+stmt.setString(2, subStr);
+stmt.execute();
+conn.commit();
+}
+
+ private void testInstr(Connection conn, String queryToExecute, Integer 
expValue) throws Exception {
+ResultSet rs;
+rs = conn.createStatement().executeQuery(queryToExecute);
+assertTrue(rs.next());
+assertEquals(expValue.intValue(), rs.getInt(1));
+assertFalse(rs.next());
+
+}
+
+  private void testInstrFilter(Connection conn, String queryToExecute, 
String expected) throws Exception {
+ResultSet rs;
+PreparedStatement stmt = conn.prepareStatement(queryToExecute);
+rs = stmt.executeQuery();
+assertTrue(rs.next());
+assertEquals(expected, rs.getString(1));
+
+}
+
+@Test
+public void testSingleByteInstrAscending() throws Exception {
+Connection conn = DriverManager.getConnection(getUrl());
+initTable(conn, "ASC", "abcdefghijkl","fgh");
+String queryToExecute = "SELECT INSTR(name, 'fgh') FROM SAMPLE";
+testInstr(conn, queryToExecute, 5);
+}
+
+@Test
+public void testSingleByteInstrDescending() throws Exception {
+Connection conn = DriverManager.getConnection(getUrl());
+initTable(conn, "DESC", "abcdefghijkl","fgh");
+String queryToExecute = "SELECT INSTR(name, 'fgh') FROM SAMPLE";
+testInstr(conn, queryToExecute, 5);
+}
+
+@Test
+public void testSingleByteInstrAscendingNoString() throws Exception {
+Connection conn = DriverManager.getConnection(getUrl());
+initTable(conn, "ASC", "abcde fghijkl","

phoenix git commit: PHOENIX-1748 Applying TRUNC|ROUND|FLOOR|CEIL on TIMESTAMP should maintain return type of TIMESTAMP (Dave Hacker)

2015-04-02 Thread tdsilva

Repository: phoenix
Updated Branches:
  refs/heads/4.x-HBase-0.98 681b310b7 -> 2d23b4275


PHOENIX-1748 Applying TRUNC|ROUND|FLOOR|CEIL on TIMESTAMP should maintain 
return type of TIMESTAMP (Dave Hacker)


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

Branch: refs/heads/4.x-HBase-0.98
Commit: 2d23b427518b2aec1ed0ca316f09ef43fd45ec0e
Parents: 681b310
Author: Thomas D'Silva 
Authored: Thu Apr 2 11:51:04 2015 -0700
Committer: Thomas D'Silva 
Committed: Thu Apr 2 11:57:01 2015 -0700

--
 .../RoundFloorCeilFunctionsEnd2EndIT.java   | 114 +++
 1 file changed, 114 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/phoenix/blob/2d23b427/phoenix-core/src/it/java/org/apache/phoenix/end2end/RoundFloorCeilFunctionsEnd2EndIT.java
--
diff --git 
a/phoenix-core/src/it/java/org/apache/phoenix/end2end/RoundFloorCeilFunctionsEnd2EndIT.java
 
b/phoenix-core/src/it/java/org/apache/phoenix/end2end/RoundFloorCeilFunctionsEnd2EndIT.java
index 2cf08e9..42635c6 100644
--- 
a/phoenix-core/src/it/java/org/apache/phoenix/end2end/RoundFloorCeilFunctionsEnd2EndIT.java
+++ 
b/phoenix-core/src/it/java/org/apache/phoenix/end2end/RoundFloorCeilFunctionsEnd2EndIT.java
@@ -29,10 +29,12 @@ import java.sql.PreparedStatement;
 import java.sql.ResultSet;
 import java.sql.Time;
 import java.sql.Timestamp;
+import java.util.Properties;
 
 import org.apache.phoenix.expression.function.CeilFunction;
 import org.apache.phoenix.expression.function.FloorFunction;
 import org.apache.phoenix.expression.function.RoundFunction;
+import org.apache.phoenix.query.QueryServices;
 import org.apache.phoenix.util.DateUtil;
 import org.junit.Before;
 import org.junit.Test;
@@ -439,5 +441,117 @@ public class RoundFloorCeilFunctionsEnd2EndIT extends 
BaseHBaseManagedTimeIT {
assertEquals(0, Floats.compare(1.26f, rs.getFloat(3)));
assertEquals(0, Floats.compare(1.264f, rs.getFloat(4)));
}   
+   
+   @Test
+   public void testTimestampAggregateFunctions() throws Exception {
+   String dateString = "2015-03-08 09:09:11.665";
+   Properties props = new Properties();
+   props.setProperty(QueryServices.DATE_FORMAT_TIMEZONE_ATTRIB, 
"GMT+1");
+   Connection conn = DriverManager.getConnection(getUrl(), props);
+   try {
+   conn.prepareStatement(
+   "create table TIME_AGG_TABLE("
+   + "ID unsigned_int NOT 
NULL, "
+   + "THE_DATE TIMESTAMP, "
+   + "constraint PK 
primary key (ID))").execute();
+   PreparedStatement stmt = conn.prepareStatement("upsert 
into "
+   + "TIME_AGG_TABLE(" + "ID, " + "
THE_DATE)"
+   + "VALUES (?, ?)");
+   stmt.setInt(1, 1);
+   stmt.setTimestamp(2, 
DateUtil.parseTimestamp(dateString));
+   stmt.execute();
+   conn.commit();
+
+   ResultSet rs = conn.prepareStatement(
+   "SELECT THE_DATE ,TRUNC(THE_DATE,'DAY') 
AS day_from_dt "
+   + 
",TRUNC(THE_DATE,'HOUR') AS hour_from_dt "
+   + 
",TRUNC(THE_DATE,'MINUTE') AS min_from_dt "
+   + 
",TRUNC(THE_DATE,'SECOND') AS sec_from_dt "
+   + 
",TRUNC(THE_DATE,'MILLISECOND') AS mil_from_dt "
+   + "FROM 
TIME_AGG_TABLE").executeQuery();
+   assertTrue(rs.next());
+   assertEquals(DateUtil.parseTimestamp("2015-03-08 
09:09:11.665"),
+   rs.getTimestamp("THE_DATE"));
+   assertEquals(DateUtil.parseTimestamp("2015-03-08 
00:00:00.0"),
+   rs.getTimestamp("day_from_dt"));
+   assertEquals(DateUtil.parseTimestamp("2015-03-08 
09:00:00.0"),
+   rs.getTimestamp("hour_from_dt"));
+   assertEquals(DateUtil.parseTimestamp("2015-03-08 
09:09:00.0"),
+   rs.getTimestamp("min_from_dt"));
+   assertEqu

phoenix git commit: PHOENIX-1748 Applying TRUNC|ROUND|FLOOR|CEIL on TIMESTAMP should maintain return type of TIMESTAMP (Dave Hacker)

2015-04-02 Thread tdsilva

Repository: phoenix
Updated Branches:
  refs/heads/master 1e280617c -> f766a780c


PHOENIX-1748 Applying TRUNC|ROUND|FLOOR|CEIL on TIMESTAMP should maintain 
return type of TIMESTAMP (Dave Hacker)


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

Branch: refs/heads/master
Commit: f766a780c2941ec30911989de5c28852ebfeb9bf
Parents: 1e28061
Author: Thomas D'Silva 
Authored: Thu Apr 2 11:51:04 2015 -0700
Committer: Thomas D'Silva 
Committed: Thu Apr 2 11:51:04 2015 -0700

--
 .../RoundFloorCeilFunctionsEnd2EndIT.java   | 114 +++
 1 file changed, 114 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/phoenix/blob/f766a780/phoenix-core/src/it/java/org/apache/phoenix/end2end/RoundFloorCeilFunctionsEnd2EndIT.java
--
diff --git 
a/phoenix-core/src/it/java/org/apache/phoenix/end2end/RoundFloorCeilFunctionsEnd2EndIT.java
 
b/phoenix-core/src/it/java/org/apache/phoenix/end2end/RoundFloorCeilFunctionsEnd2EndIT.java
index 2cf08e9..42635c6 100644
--- 
a/phoenix-core/src/it/java/org/apache/phoenix/end2end/RoundFloorCeilFunctionsEnd2EndIT.java
+++ 
b/phoenix-core/src/it/java/org/apache/phoenix/end2end/RoundFloorCeilFunctionsEnd2EndIT.java
@@ -29,10 +29,12 @@ import java.sql.PreparedStatement;
 import java.sql.ResultSet;
 import java.sql.Time;
 import java.sql.Timestamp;
+import java.util.Properties;
 
 import org.apache.phoenix.expression.function.CeilFunction;
 import org.apache.phoenix.expression.function.FloorFunction;
 import org.apache.phoenix.expression.function.RoundFunction;
+import org.apache.phoenix.query.QueryServices;
 import org.apache.phoenix.util.DateUtil;
 import org.junit.Before;
 import org.junit.Test;
@@ -439,5 +441,117 @@ public class RoundFloorCeilFunctionsEnd2EndIT extends 
BaseHBaseManagedTimeIT {
assertEquals(0, Floats.compare(1.26f, rs.getFloat(3)));
assertEquals(0, Floats.compare(1.264f, rs.getFloat(4)));
}   
+   
+   @Test
+   public void testTimestampAggregateFunctions() throws Exception {
+   String dateString = "2015-03-08 09:09:11.665";
+   Properties props = new Properties();
+   props.setProperty(QueryServices.DATE_FORMAT_TIMEZONE_ATTRIB, 
"GMT+1");
+   Connection conn = DriverManager.getConnection(getUrl(), props);
+   try {
+   conn.prepareStatement(
+   "create table TIME_AGG_TABLE("
+   + "ID unsigned_int NOT 
NULL, "
+   + "THE_DATE TIMESTAMP, "
+   + "constraint PK 
primary key (ID))").execute();
+   PreparedStatement stmt = conn.prepareStatement("upsert 
into "
+   + "TIME_AGG_TABLE(" + "ID, " + "
THE_DATE)"
+   + "VALUES (?, ?)");
+   stmt.setInt(1, 1);
+   stmt.setTimestamp(2, 
DateUtil.parseTimestamp(dateString));
+   stmt.execute();
+   conn.commit();
+
+   ResultSet rs = conn.prepareStatement(
+   "SELECT THE_DATE ,TRUNC(THE_DATE,'DAY') 
AS day_from_dt "
+   + 
",TRUNC(THE_DATE,'HOUR') AS hour_from_dt "
+   + 
",TRUNC(THE_DATE,'MINUTE') AS min_from_dt "
+   + 
",TRUNC(THE_DATE,'SECOND') AS sec_from_dt "
+   + 
",TRUNC(THE_DATE,'MILLISECOND') AS mil_from_dt "
+   + "FROM 
TIME_AGG_TABLE").executeQuery();
+   assertTrue(rs.next());
+   assertEquals(DateUtil.parseTimestamp("2015-03-08 
09:09:11.665"),
+   rs.getTimestamp("THE_DATE"));
+   assertEquals(DateUtil.parseTimestamp("2015-03-08 
00:00:00.0"),
+   rs.getTimestamp("day_from_dt"));
+   assertEquals(DateUtil.parseTimestamp("2015-03-08 
09:00:00.0"),
+   rs.getTimestamp("hour_from_dt"));
+   assertEquals(DateUtil.parseTimestamp("2015-03-08 
09:09:00.0"),
+   rs.getTimestamp("min_from_dt"));
+   assertEquals(DateUtil.par

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

2015-04-02 Thread Apache Jenkins Server

See 

Changes:

[rajeshbabu] PHOENIX-1800 Fix failing test case 
SaltedViewIT#testSaltedUpdatableViewWithLocalIndex(Rajeshbabu Chintaguntla)

--
[...truncated 432 lines...]
Running org.apache.phoenix.end2end.index.DropViewIT
Tests run: 11, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 10.655 sec - 
in org.apache.phoenix.end2end.NthValueFunctionIT
Running org.apache.phoenix.end2end.index.ImmutableIndexIT
Tests run: 1, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 8.056 sec - in 
org.apache.phoenix.end2end.index.DropViewIT
Running org.apache.phoenix.end2end.index.GlobalMutableIndexIT
Tests run: 2, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 17.882 sec - in 
org.apache.phoenix.end2end.PhoenixRuntimeIT
Running org.apache.phoenix.end2end.index.IndexExpressionIT
Tests run: 3, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 18.851 sec - in 
org.apache.phoenix.end2end.index.SaltedIndexIT
Running org.apache.phoenix.end2end.index.LocalIndexIT
Tests run: 13, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 36.859 sec - 
in org.apache.phoenix.end2end.index.ImmutableIndexIT
Running org.apache.phoenix.end2end.index.LocalMutableIndexIT
Tests run: 15, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 77.739 sec - 
in org.apache.phoenix.end2end.SubqueryUsingSortMergeJoinIT
Running org.apache.phoenix.end2end.index.GlobalIndexOptimizationIT
Tests run: 15, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 77.338 sec - 
in org.apache.phoenix.end2end.index.GlobalMutableIndexIT
Running org.apache.phoenix.end2end.index.IndexMetadataIT
Tests run: 6, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 39.257 sec - in 
org.apache.phoenix.end2end.index.GlobalIndexOptimizationIT
Running org.apache.phoenix.end2end.index.ViewIndexIT
Tests run: 1, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 4.938 sec - in 
org.apache.phoenix.end2end.index.ViewIndexIT
Running org.apache.phoenix.end2end.UpsertBigValuesIT
Tests run: 4, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 8.134 sec - in 
org.apache.phoenix.end2end.UpsertBigValuesIT
Running org.apache.phoenix.end2end.AutoCommitIT
Tests run: 1, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 2.532 sec - in 
org.apache.phoenix.end2end.AutoCommitIT
Running org.apache.phoenix.end2end.StddevIT
Tests run: 4, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 3.773 sec - in 
org.apache.phoenix.end2end.StddevIT
Running org.apache.phoenix.end2end.DeleteIT
Tests run: 15, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 75.274 sec - 
in org.apache.phoenix.end2end.index.LocalMutableIndexIT
Running org.apache.phoenix.end2end.FirstValueFunctionIT
Tests run: 7, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 5.88 sec - in 
org.apache.phoenix.end2end.FirstValueFunctionIT
Running org.apache.phoenix.end2end.RegexpSubstrFunctionIT
Tests run: 2, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 3.573 sec - in 
org.apache.phoenix.end2end.RegexpSubstrFunctionIT
Tests run: 6, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 42.872 sec - in 
org.apache.phoenix.end2end.index.IndexMetadataIT
Running org.apache.phoenix.end2end.BinaryRowKeyIT
Running org.apache.phoenix.end2end.ModulusExpressionIT
Tests run: 3, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 3.566 sec - in 
org.apache.phoenix.end2end.BinaryRowKeyIT
Running org.apache.phoenix.end2end.SkipScanQueryIT
Tests run: 20, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 29.773 sec - 
in org.apache.phoenix.end2end.DeleteIT
Running org.apache.phoenix.end2end.SpooledSortMergeJoinIT
Tests run: 11, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 10.008 sec - 
in org.apache.phoenix.end2end.ModulusExpressionIT
Running org.apache.phoenix.end2end.HashJoinIT
Tests run: 9, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 18.006 sec - in 
org.apache.phoenix.end2end.SkipScanQueryIT
Running org.apache.phoenix.end2end.ReadOnlyIT
Tests run: 1, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 7.999 sec - in 
org.apache.phoenix.end2end.ReadOnlyIT
Running org.apache.phoenix.end2end.MD5FunctionIT
Tests run: 20, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 148.036 sec - 
in org.apache.phoenix.end2end.index.LocalIndexIT
Running org.apache.phoenix.end2end.DateTimeIT
Tests run: 2, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 5.688 sec - in 
org.apache.phoenix.end2end.MD5FunctionIT
Tests run: 9, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 3.859 sec - in 
org.apache.phoenix.end2end.DateTimeIT
Running org.apache.phoenix.end2end.HashJoinLocalIndexIT
Running org.apache.phoenix.end2end.StoreNullsIT
Tests run: 3, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 18.948 sec - in 
org.apache.phoenix.end2end.StoreNullsIT
Running org.apache.phoenix.end2end.ArithmeticQueryIT
Tests run: 1, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 20.074 sec - in 
org.apache.phoenix.end2end.HashJoinLocalIndexIT
Running org.apache.phoenix.end2end.DecodeFunctionIT
Tests r

Build failed in Jenkins: Phoenix | Master #651

2015-04-02 Thread Apache Jenkins Server

See 

Changes:

[rajeshbabu] PHOENIX-1800 Fix failing test case 
SaltedViewIT#testSaltedUpdatableViewWithLocalIndex(Rajeshbabu Chintaguntla)

--
[...truncated 90 lines...]

Downloading: 
http://repository.apache.org/snapshots/org/apache/hbase/hbase-common/1.0.1-SNAPSHOT/maven-metadata.xml

Downloading: 
http://people.apache.org/~garyh/mvn/org/apache/hbase/hbase-common/1.0.1-SNAPSHOT/maven-metadata.xml

2/2 KB  
 
 
Downloaded: 
https://repository.apache.org/content/repositories/snapshots/org/apache/hbase/hbase-common/1.0.1-SNAPSHOT/maven-metadata.xml
 (2 KB at 0.0 KB/sec)
 
[WARNING] Could not transfer metadata 
org.apache.hbase:hbase-common:1.0.1-SNAPSHOT/maven-metadata.xml from/to Nexus 
(http://repository.apache.org/snapshots): Failed to transfer file: 
http://repository.apache.org/snapshots/org/apache/hbase/hbase-common/1.0.1-SNAPSHOT/maven-metadata.xml.
 Return code is: 502, ReasonPhrase:Proxy Error.
[WARNING] Failure to transfer 
org.apache.hbase:hbase-common:1.0.1-SNAPSHOT/maven-metadata.xml from 
http://repository.apache.org/snapshots was cached in the local repository, 
resolution will not be reattempted until the update interval of Nexus has 
elapsed or updates are forced. Original error: Could not transfer metadata 
org.apache.hbase:hbase-common:1.0.1-SNAPSHOT/maven-metadata.xml from/to Nexus 
(http://repository.apache.org/snapshots): Failed to transfer file: 
http://repository.apache.org/snapshots/org/apache/hbase/hbase-common/1.0.1-SNAPSHOT/maven-metadata.xml.
 Return code is: 502, ReasonPhrase:Proxy Error.
Downloading: 
https://repository.apache.org/content/repositories/releases/org/apache/hbase/hbase-annotations/1.0.1-SNAPSHOT/maven-metadata.xml
Downloading: 
http://conjars.org/repo/org/apache/hbase/hbase-annotations/1.0.1-SNAPSHOT/maven-metadata.xml
Downloading: 
https://oss.sonatype.org/content/repositories/snapshots/org/apache/hbase/hbase-annotations/1.0.1-SNAPSHOT/maven-metadata.xml
Downloading: 
https://repository.apache.org/content/repositories/snapshots/org/apache/hbase/hbase-annotations/1.0.1-SNAPSHOT/maven-metadata.xml
 
Downloading: 
http://repository.apache.org/snapshots/org/apache/hbase/hbase-annotations/1.0.1-SNAPSHOT/maven-metadata.xml
 
Downloading: 
http://people.apache.org/~garyh/mvn/org/apache/hbase/hbase-annotations/1.0.1-SNAPSHOT/maven-metadata.xml
 
 
2/2 KB   
2/2 KB   2/2 KB   
  
Downloaded: 
https://repository.apache.org/content/repositories/snapshots/org/apache/hbase/hbase-annotations/1.0.1-SNAPSHOT/maven-metadata.xml
 (2 KB at 0.0 KB/sec)
  
Downloaded: 
http://repository.apache.org/snapshots/org/apache/hbase/hbase-annotations/1.0.1-SNAPSHOT/maven-metadata.xml
 (2 KB at 0.0 KB/sec)
[WARNING] Failure to transfer 
org.apache.hbase:hbase-common:1.0.1-SNAPSHOT/maven-metadata.xml from 
http://repository.apache.org/snapshots was cached in the local repository, 
resolution will not be reattempted until the update interval of Nexus has 
elapsed or updates are forced. Original error: Could not transfer metadata 
org.apache.hbase:hbase-common:1.0.1-SNAPSHOT/maven-metadata.xml from/to Nexus 
(http://repository.apache.org/snapshots): Failed to transfer file: 
http://repository.apache.org/snapshots/org/apache/hbase/hbase-common/1.0.1-SNAPSHOT/maven-metadata.xml.
 Return code is: 502, ReasonPhrase:Proxy Error.
Downloading: 
https://repository.apache.org/content/repositories/releases/org/apache/hbase/hbase-protocol/1.0.1-SNAPSHOT/maven-metadata.xml
Downloading: 
http://conjars.org/repo/org/apache/hbase/hbase-protocol/1.0.1-SNAPSHOT/maven-metadata.xml
Downloading: 
https://repository.apache.org/content/repositories/snapshots/org/apache/hbase/hbase-protocol/1.0.1-SNAPSHOT/maven-metadata.xml
Downloading: 
https://oss.sonatype.org/content/repositories/snapshots/org/apache/hbase/hbase-protocol/1.0.1-SNAPSHOT/maven-metadata.xml
  
Downloading: 
http://repository.apache.org/snapshots/org/apache/hbase/hbase-protocol/1.0.1-SNAPSHOT/maven-metadata.xml
  
Downloading: 
http://people.apache.org/~garyh/mvn/org/apache/hbase/hbase-protocol/1.0.1-SNAPSHOT/maven-metadata.xml
  
2/2 KB
 
 
Downloaded: 
https://repository.apache.org/content/repositories/snapshots/org/apache/hbase/hbase-protocol/1.0.1-SNAPSHOT/maven-metadata.xml
 (2 KB at 0.1 KB/sec)
 
[WARNING] Could not transfer metadata 
org.apache.hbase:hbase-protocol:1.0.1-SNAPSHOT/maven-metadata.xml from/to Nexus 
(http://repository.apache.org/snapshots): Failed to transfer file: 
http://repository.apache.org/snapshots/org/apache/hbase/hbase-protocol/1.0.1-SNAPSHOT/maven-metadata.xml.
 Return code is: 502, ReasonPhrase:Proxy Error.
[WARNING] Failure to transfer 
org.apache.hbase:hbase-protocol:1.0.1-SNAPSHOT/maven-metadata.xml from 
http:/

phoenix git commit: PHOENIX-1800 Fix failing test case SaltedViewIT#testSaltedUpdatableViewWithLocalIndex(Rajeshbabu Chintaguntla)

2015-04-02 Thread rajeshbabu

Repository: phoenix
Updated Branches:
  refs/heads/4.x-HBase-0.98 37ac2fefb -> 681b310b7


PHOENIX-1800 Fix failing test case 
SaltedViewIT#testSaltedUpdatableViewWithLocalIndex(Rajeshbabu Chintaguntla)


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

Branch: refs/heads/4.x-HBase-0.98
Commit: 681b310b7f147cbfbcde978da7f615d0936bb515
Parents: 37ac2fe
Author: Rajeshbabu Chintaguntla 
Authored: Thu Apr 2 19:28:03 2015 +0530
Committer: Rajeshbabu Chintaguntla 
Committed: Thu Apr 2 19:28:03 2015 +0530

--
 .../src/main/java/org/apache/phoenix/util/IndexUtil.java | 8 
 1 file changed, 4 insertions(+), 4 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/phoenix/blob/681b310b/phoenix-core/src/main/java/org/apache/phoenix/util/IndexUtil.java
--
diff --git a/phoenix-core/src/main/java/org/apache/phoenix/util/IndexUtil.java 
b/phoenix-core/src/main/java/org/apache/phoenix/util/IndexUtil.java
index c147f91..ba96c83 100644
--- a/phoenix-core/src/main/java/org/apache/phoenix/util/IndexUtil.java
+++ b/phoenix-core/src/main/java/org/apache/phoenix/util/IndexUtil.java
@@ -481,12 +481,12 @@ public class IndexUtil {
 if (dataRegion != null) {
 joinResult = dataRegion.get(get);
 } else {
-TableName indexTable =
-
TableName.valueOf(MetaDataUtil.getLocalIndexPhysicalName(c.getEnvironment()
-.getRegion().getTableDesc().getName()));
+TableName dataTable =
+
TableName.valueOf(MetaDataUtil.getUserTableName(c.getEnvironment()
+
.getRegion().getTableDesc().getNameAsString()));
 HTableInterface table = null;
 try {
-table = c.getEnvironment().getTable(indexTable);
+table = c.getEnvironment().getTable(dataTable);
 joinResult = table.get(get);
 } finally {
 if (table != null) table.close();

phoenix git commit: PHOENIX-1800 Fix failing test case SaltedViewIT#testSaltedUpdatableViewWithLocalIndex(Rajeshbabu Chintaguntla)

2015-04-02 Thread rajeshbabu

Repository: phoenix
Updated Branches:
  refs/heads/master 13d6296f7 -> 1e280617c


PHOENIX-1800 Fix failing test case 
SaltedViewIT#testSaltedUpdatableViewWithLocalIndex(Rajeshbabu Chintaguntla)


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

Branch: refs/heads/master
Commit: 1e280617c25f31658ab7c5a68de62438458a94e5
Parents: 13d6296
Author: Rajeshbabu Chintaguntla 
Authored: Thu Apr 2 19:26:51 2015 +0530
Committer: Rajeshbabu Chintaguntla 
Committed: Thu Apr 2 19:26:51 2015 +0530

--
 .../src/main/java/org/apache/phoenix/util/IndexUtil.java | 8 
 1 file changed, 4 insertions(+), 4 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/phoenix/blob/1e280617/phoenix-core/src/main/java/org/apache/phoenix/util/IndexUtil.java
--
diff --git a/phoenix-core/src/main/java/org/apache/phoenix/util/IndexUtil.java 
b/phoenix-core/src/main/java/org/apache/phoenix/util/IndexUtil.java
index 10ca305..ca25348 100644
--- a/phoenix-core/src/main/java/org/apache/phoenix/util/IndexUtil.java
+++ b/phoenix-core/src/main/java/org/apache/phoenix/util/IndexUtil.java
@@ -483,12 +483,12 @@ public class IndexUtil {
 if (dataRegion != null) {
 joinResult = dataRegion.get(get);
 } else {
-TableName indexTable =
-
TableName.valueOf(MetaDataUtil.getLocalIndexPhysicalName(c.getEnvironment()
-.getRegion().getTableDesc().getName()));
+TableName dataTable =
+
TableName.valueOf(MetaDataUtil.getUserTableName(c.getEnvironment()
+
.getRegion().getTableDesc().getNameAsString()));
 HTableInterface table = null;
 try {
-table = c.getEnvironment().getTable(indexTable);
+table = c.getEnvironment().getTable(dataTable);
 joinResult = table.get(get);
 } finally {
 if (table != null) table.close();

phoenix git commit: Remove PhoenixProjectScanMergeRule; Inject projection to server side plans whenever possible; Make aggregate+join merged server plans as in original Phoenix planning

phoenix git commit: PHOENIX-1800 Fix failing test case SaltedViewIT#testSaltedUpdatableViewWithLocalIndex(Rajeshbabu Chintaguntla)

Apache-Phoenix | Master | Build Successful

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

Jenkins build is back to normal : Phoenix | 4.3 #66

phoenix git commit: PHOENIX-1803 Fix flapping PhoenixServerRpcIT.testMetadataQos

phoenix git commit: PHOENIX-1803 Fix flapping PhoenixServerRpcIT.testMetadataQos

phoenix git commit: PHOENIX-1803 Fix flapping PhoenixServerRpcIT.testMetadataQos

Apache-Phoenix | 3.0 | Hadoop1 | Build Successful

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

Build failed in Jenkins: Phoenix | 4.3 #65

Apache-Phoenix | Master | Build Successful

Apache-Phoenix | 3.0 | Hadoop1 | Build Successful

[2/2] phoenix git commit: PHOENIX-1776 The literal -1.0 (floating point) should not be converted to -1 (Integer) (Dave Hacker)

[1/2] phoenix git commit: PHOENIX-1799 Provide parameter metadata for prepared create table statements

Jenkins build is back to normal : Phoenix | 4.x-HBase-0.98 #619

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

phoenix git commit: PHOENIX-1799 Provide parameter metadata for prepared create table statements

phoenix git commit: PHOENIX-1799 Provide parameter metadata for prepared create table statements

phoenix git commit: PHOENIX-1799 Provide parameter metadata for prepared create table statements

phoenix git commit: PHOENIX-1798 UnsupportedOperationException throws from BaseResultIterators.getIterators (Cen Qi)

phoenix git commit: PHOENIX-1798 UnsupportedOperationException throws from BaseResultIterators.getIterators (Cen Qi)

phoenix git commit: PHOENIX-1798 UnsupportedOperationException throws from BaseResultIterators.getIterators (Cen Qi)

phoenix git commit: PHOENIX-1798 UnsupportedOperationException throws from BaseResultIterators.getIterators (Cen Qi)

phoenix git commit: Fix for UPSERT with autocommit

Jenkins build is back to normal : Phoenix | Master #652

phoenix git commit: Passed another two tests: aggregate+project, aggregate+join

phoenix git commit: PHOENIX-1712 Add INSTR function

phoenix git commit: PHOENIX-1712 Add INSTR function

phoenix git commit: PHOENIX-1748 Applying TRUNC|ROUND|FLOOR|CEIL on TIMESTAMP should maintain return type of TIMESTAMP (Dave Hacker)

phoenix git commit: PHOENIX-1748 Applying TRUNC|ROUND|FLOOR|CEIL on TIMESTAMP should maintain return type of TIMESTAMP (Dave Hacker)

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

Build failed in Jenkins: Phoenix | Master #651

phoenix git commit: PHOENIX-1800 Fix failing test case SaltedViewIT#testSaltedUpdatableViewWithLocalIndex(Rajeshbabu Chintaguntla)

phoenix git commit: PHOENIX-1800 Fix failing test case SaltedViewIT#testSaltedUpdatableViewWithLocalIndex(Rajeshbabu Chintaguntla)

35 matches

Site Navigation

Mail list logo

Footer information