phoenix git commit: PHOENIX-2205 Group by a divided value (e.g., time/10) returns NULL

2015-09-21 Thread duminduk 
Repository: phoenix
Updated Branches:
  refs/heads/4.x-HBase-0.98 6cd79361c -> 1f4a5400b


PHOENIX-2205 Group by a divided value (e.g., time/10) returns NULL


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

Branch: refs/heads/4.x-HBase-0.98
Commit: 1f4a5400b21289216454fc11285f5c785cc4cffe
Parents: 6cd7936
Author: Dumindu Buddhika 
Authored: Mon Sep 21 18:52:34 2015 +0530
Committer: Dumindu Buddhika 
Committed: Mon Sep 21 18:52:34 2015 +0530

--
 .../org/apache/phoenix/end2end/GroupByIT.java   | 72 
 .../expression/RowKeyColumnExpression.java  |  2 +-
 2 files changed, 73 insertions(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/phoenix/blob/1f4a5400/phoenix-core/src/it/java/org/apache/phoenix/end2end/GroupByIT.java
--
diff --git a/phoenix-core/src/it/java/org/apache/phoenix/end2end/GroupByIT.java 
b/phoenix-core/src/it/java/org/apache/phoenix/end2end/GroupByIT.java
index 31a55a0..51ab070 100644
--- a/phoenix-core/src/it/java/org/apache/phoenix/end2end/GroupByIT.java
+++ b/phoenix-core/src/it/java/org/apache/phoenix/end2end/GroupByIT.java
@@ -574,4 +574,76 @@ public class GroupByIT extends BaseQueryIT {
 conn.close();
 }
 
+
+@Test
+public void testGroupByWithIntegerDivision1() throws Exception {
+long ts = nextTimestamp();
+Properties props = PropertiesUtil.deepCopy(TEST_PROPERTIES);
+props.setProperty(PhoenixRuntime.CURRENT_SCN_ATTRIB, Long.toString(ts 
+ 10));
+Connection conn = DriverManager.getConnection(getUrl(), props);
+String ddl = "create table test1(time integer not null, hostname 
varchar not null,usage float,period integer constraint pk PRIMARY KEY(time, 
hostname))";
+conn.createStatement().execute(ddl);
+conn.close();
+
+props.setProperty(PhoenixRuntime.CURRENT_SCN_ATTRIB, Long.toString(ts 
+ 30));
+conn = DriverManager.getConnection(getUrl(), props);
+PreparedStatement stmt = conn.prepareStatement("upsert into test1 
values(1439853462,'qa9',8.27,1439853462)");
+stmt.execute();
+stmt = conn.prepareStatement("upsert into test1 
values(1439853461,'qa9',8.27,1439853362)");
+stmt.execute();
+stmt = conn.prepareStatement("upsert into test1 
values(1439853461,'qa9',5.27,1439853461)");
+stmt.execute();
+stmt = conn.prepareStatement("upsert into test1 
values(1439853451,'qa9',4.27,1439853451)");
+stmt.execute();
+conn.commit();
+conn.close();
+
+props.setProperty(PhoenixRuntime.CURRENT_SCN_ATTRIB, Long.toString(ts 
+ 40));
+conn = DriverManager.getConnection(getUrl(), props);
+ResultSet rs;
+stmt = conn.prepareStatement("select time/10 as tm, hostname, 
avg(usage) from test1 group by hostname, tm");
+rs = stmt.executeQuery();
+assertTrue(rs.next());
+assertEquals(143985345, rs.getInt(1));
+assertEquals(4.2699, rs.getDouble(3), 0.1);
+assertTrue(rs.next());
+assertEquals(143985346, rs.getInt(1));
+assertEquals(6.77, rs.getDouble(3), 0.1);
+}
+
+@Test
+public void testGroupByWithIntegerDivision2() throws Exception {
+long ts = nextTimestamp();
+Properties props = PropertiesUtil.deepCopy(TEST_PROPERTIES);
+props.setProperty(PhoenixRuntime.CURRENT_SCN_ATTRIB, Long.toString(ts 
+ 10));
+Connection conn = DriverManager.getConnection(getUrl(), props);
+String ddl = "create table test1(time integer not null, hostname 
varchar not null,usage float,period integer constraint pk PRIMARY KEY(time, 
hostname))";
+conn.createStatement().execute(ddl);
+conn.close();
+
+props.setProperty(PhoenixRuntime.CURRENT_SCN_ATTRIB, Long.toString(ts 
+ 30));
+conn = DriverManager.getConnection(getUrl(), props);
+PreparedStatement stmt = conn.prepareStatement("upsert into test1 
values(1439853462,'qa9',8.27,1439853462)");
+stmt.execute();
+stmt = conn.prepareStatement("upsert into test1 
values(1439853461,'qa9',8.27,1439853362)");
+stmt.execute();
+stmt = conn.prepareStatement("upsert into test1 
values(1439853461,'qa9',5.27,1439853461)");
+stmt.execute();
+stmt = conn.prepareStatement("upsert into test1 
values(1439853451,'qa9',4.27,1439853451)");
+stmt.execute();
+conn.commit();
+conn.close();
+
+props.setProperty(PhoenixRuntime.CURRENT_SCN_ATTRIB, Long.toString(ts 
+ 40));
+conn =

[2/2] phoenix git commit: Merge branch '4.x-HBase-0.98' of https://git-wip-us.apache.org/repos/asf/phoenix into 4.x-HBase-0.98

2015-09-21 Thread maryannxue 
Merge branch '4.x-HBase-0.98' of 
https://git-wip-us.apache.org/repos/asf/phoenix into 4.x-HBase-0.98


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

Branch: refs/heads/4.x-HBase-0.98
Commit: 7eac78e75dcc63a8667a28635dcacb8f542edeca
Parents: ea91e63 1f4a540
Author: maryannxue 
Authored: Mon Sep 21 09:26:34 2015 -0400
Committer: maryannxue 
Committed: Mon Sep 21 09:26:34 2015 -0400

--
 .../org/apache/phoenix/end2end/GroupByIT.java   | 72 
 .../expression/RowKeyColumnExpression.java  |  2 +-
 2 files changed, 73 insertions(+), 1 deletion(-)
--

phoenix git commit: PHOENIX-2205 Group by a divided value (e.g., time/10) returns NULL

2015-09-21 Thread duminduk 
Repository: phoenix
Updated Branches:
  refs/heads/4.x-HBase-1.0 1f2259e52 -> 3381de474


PHOENIX-2205 Group by a divided value (e.g., time/10) returns NULL


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

Branch: refs/heads/4.x-HBase-1.0
Commit: 3381de474deb937d7b806884634bbf62f5c95619
Parents: 1f2259e
Author: Dumindu Buddhika 
Authored: Mon Sep 21 19:00:21 2015 +0530
Committer: Dumindu Buddhika 
Committed: Mon Sep 21 19:00:21 2015 +0530

--
 .../org/apache/phoenix/end2end/GroupByIT.java   | 72 
 .../expression/RowKeyColumnExpression.java  |  2 +-
 2 files changed, 73 insertions(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/phoenix/blob/3381de47/phoenix-core/src/it/java/org/apache/phoenix/end2end/GroupByIT.java
--
diff --git a/phoenix-core/src/it/java/org/apache/phoenix/end2end/GroupByIT.java 
b/phoenix-core/src/it/java/org/apache/phoenix/end2end/GroupByIT.java
index 31a55a0..51ab070 100644
--- a/phoenix-core/src/it/java/org/apache/phoenix/end2end/GroupByIT.java
+++ b/phoenix-core/src/it/java/org/apache/phoenix/end2end/GroupByIT.java
@@ -574,4 +574,76 @@ public class GroupByIT extends BaseQueryIT {
 conn.close();
 }
 
+
+@Test
+public void testGroupByWithIntegerDivision1() throws Exception {
+long ts = nextTimestamp();
+Properties props = PropertiesUtil.deepCopy(TEST_PROPERTIES);
+props.setProperty(PhoenixRuntime.CURRENT_SCN_ATTRIB, Long.toString(ts 
+ 10));
+Connection conn = DriverManager.getConnection(getUrl(), props);
+String ddl = "create table test1(time integer not null, hostname 
varchar not null,usage float,period integer constraint pk PRIMARY KEY(time, 
hostname))";
+conn.createStatement().execute(ddl);
+conn.close();
+
+props.setProperty(PhoenixRuntime.CURRENT_SCN_ATTRIB, Long.toString(ts 
+ 30));
+conn = DriverManager.getConnection(getUrl(), props);
+PreparedStatement stmt = conn.prepareStatement("upsert into test1 
values(1439853462,'qa9',8.27,1439853462)");
+stmt.execute();
+stmt = conn.prepareStatement("upsert into test1 
values(1439853461,'qa9',8.27,1439853362)");
+stmt.execute();
+stmt = conn.prepareStatement("upsert into test1 
values(1439853461,'qa9',5.27,1439853461)");
+stmt.execute();
+stmt = conn.prepareStatement("upsert into test1 
values(1439853451,'qa9',4.27,1439853451)");
+stmt.execute();
+conn.commit();
+conn.close();
+
+props.setProperty(PhoenixRuntime.CURRENT_SCN_ATTRIB, Long.toString(ts 
+ 40));
+conn = DriverManager.getConnection(getUrl(), props);
+ResultSet rs;
+stmt = conn.prepareStatement("select time/10 as tm, hostname, 
avg(usage) from test1 group by hostname, tm");
+rs = stmt.executeQuery();
+assertTrue(rs.next());
+assertEquals(143985345, rs.getInt(1));
+assertEquals(4.2699, rs.getDouble(3), 0.1);
+assertTrue(rs.next());
+assertEquals(143985346, rs.getInt(1));
+assertEquals(6.77, rs.getDouble(3), 0.1);
+}
+
+@Test
+public void testGroupByWithIntegerDivision2() throws Exception {
+long ts = nextTimestamp();
+Properties props = PropertiesUtil.deepCopy(TEST_PROPERTIES);
+props.setProperty(PhoenixRuntime.CURRENT_SCN_ATTRIB, Long.toString(ts 
+ 10));
+Connection conn = DriverManager.getConnection(getUrl(), props);
+String ddl = "create table test1(time integer not null, hostname 
varchar not null,usage float,period integer constraint pk PRIMARY KEY(time, 
hostname))";
+conn.createStatement().execute(ddl);
+conn.close();
+
+props.setProperty(PhoenixRuntime.CURRENT_SCN_ATTRIB, Long.toString(ts 
+ 30));
+conn = DriverManager.getConnection(getUrl(), props);
+PreparedStatement stmt = conn.prepareStatement("upsert into test1 
values(1439853462,'qa9',8.27,1439853462)");
+stmt.execute();
+stmt = conn.prepareStatement("upsert into test1 
values(1439853461,'qa9',8.27,1439853362)");
+stmt.execute();
+stmt = conn.prepareStatement("upsert into test1 
values(1439853461,'qa9',5.27,1439853461)");
+stmt.execute();
+stmt = conn.prepareStatement("upsert into test1 
values(1439853451,'qa9',4.27,1439853451)");
+stmt.execute();
+conn.commit();
+conn.close();
+
+props.setProperty(PhoenixRuntime.CURRENT_SCN_ATTRIB, Long.toString(ts 
+ 40));
+conn =

phoenix git commit: PHOENIX-2205 Group by a divided value (e.g., time/10) returns NULL

2015-09-21 Thread duminduk 
Repository: phoenix
Updated Branches:
  refs/heads/4.5-HBase-0.98 c1fadb10c -> 98b01546f


PHOENIX-2205 Group by a divided value (e.g., time/10) returns NULL


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

Branch: refs/heads/4.5-HBase-0.98
Commit: 98b01546fd0c8a5437c0abda3ee786ea335c089a
Parents: c1fadb1
Author: Dumindu Buddhika 
Authored: Mon Sep 21 19:29:04 2015 +0530
Committer: Dumindu Buddhika 
Committed: Mon Sep 21 19:29:04 2015 +0530

--
 .../org/apache/phoenix/end2end/GroupByIT.java   | 72 
 .../expression/RowKeyColumnExpression.java  |  2 +-
 2 files changed, 73 insertions(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/phoenix/blob/98b01546/phoenix-core/src/it/java/org/apache/phoenix/end2end/GroupByIT.java
--
diff --git a/phoenix-core/src/it/java/org/apache/phoenix/end2end/GroupByIT.java 
b/phoenix-core/src/it/java/org/apache/phoenix/end2end/GroupByIT.java
index 31a55a0..51ab070 100644
--- a/phoenix-core/src/it/java/org/apache/phoenix/end2end/GroupByIT.java
+++ b/phoenix-core/src/it/java/org/apache/phoenix/end2end/GroupByIT.java
@@ -574,4 +574,76 @@ public class GroupByIT extends BaseQueryIT {
 conn.close();
 }
 
+
+@Test
+public void testGroupByWithIntegerDivision1() throws Exception {
+long ts = nextTimestamp();
+Properties props = PropertiesUtil.deepCopy(TEST_PROPERTIES);
+props.setProperty(PhoenixRuntime.CURRENT_SCN_ATTRIB, Long.toString(ts 
+ 10));
+Connection conn = DriverManager.getConnection(getUrl(), props);
+String ddl = "create table test1(time integer not null, hostname 
varchar not null,usage float,period integer constraint pk PRIMARY KEY(time, 
hostname))";
+conn.createStatement().execute(ddl);
+conn.close();
+
+props.setProperty(PhoenixRuntime.CURRENT_SCN_ATTRIB, Long.toString(ts 
+ 30));
+conn = DriverManager.getConnection(getUrl(), props);
+PreparedStatement stmt = conn.prepareStatement("upsert into test1 
values(1439853462,'qa9',8.27,1439853462)");
+stmt.execute();
+stmt = conn.prepareStatement("upsert into test1 
values(1439853461,'qa9',8.27,1439853362)");
+stmt.execute();
+stmt = conn.prepareStatement("upsert into test1 
values(1439853461,'qa9',5.27,1439853461)");
+stmt.execute();
+stmt = conn.prepareStatement("upsert into test1 
values(1439853451,'qa9',4.27,1439853451)");
+stmt.execute();
+conn.commit();
+conn.close();
+
+props.setProperty(PhoenixRuntime.CURRENT_SCN_ATTRIB, Long.toString(ts 
+ 40));
+conn = DriverManager.getConnection(getUrl(), props);
+ResultSet rs;
+stmt = conn.prepareStatement("select time/10 as tm, hostname, 
avg(usage) from test1 group by hostname, tm");
+rs = stmt.executeQuery();
+assertTrue(rs.next());
+assertEquals(143985345, rs.getInt(1));
+assertEquals(4.2699, rs.getDouble(3), 0.1);
+assertTrue(rs.next());
+assertEquals(143985346, rs.getInt(1));
+assertEquals(6.77, rs.getDouble(3), 0.1);
+}
+
+@Test
+public void testGroupByWithIntegerDivision2() throws Exception {
+long ts = nextTimestamp();
+Properties props = PropertiesUtil.deepCopy(TEST_PROPERTIES);
+props.setProperty(PhoenixRuntime.CURRENT_SCN_ATTRIB, Long.toString(ts 
+ 10));
+Connection conn = DriverManager.getConnection(getUrl(), props);
+String ddl = "create table test1(time integer not null, hostname 
varchar not null,usage float,period integer constraint pk PRIMARY KEY(time, 
hostname))";
+conn.createStatement().execute(ddl);
+conn.close();
+
+props.setProperty(PhoenixRuntime.CURRENT_SCN_ATTRIB, Long.toString(ts 
+ 30));
+conn = DriverManager.getConnection(getUrl(), props);
+PreparedStatement stmt = conn.prepareStatement("upsert into test1 
values(1439853462,'qa9',8.27,1439853462)");
+stmt.execute();
+stmt = conn.prepareStatement("upsert into test1 
values(1439853461,'qa9',8.27,1439853362)");
+stmt.execute();
+stmt = conn.prepareStatement("upsert into test1 
values(1439853461,'qa9',5.27,1439853461)");
+stmt.execute();
+stmt = conn.prepareStatement("upsert into test1 
values(1439853451,'qa9',4.27,1439853451)");
+stmt.execute();
+conn.commit();
+conn.close();
+
+props.setProperty(PhoenixRuntime.CURRENT_SCN_ATTRIB, Long.toString(ts 
+ 40));
+conn =

phoenix git commit: PHOENIX-2274 Sort-merge join could not optimize out the sort on the right table

2015-09-21 Thread maryannxue 
Repository: phoenix
Updated Branches:
  refs/heads/master 3c2997cda -> 65d56bba6


PHOENIX-2274 Sort-merge join could not optimize out the sort on the right table


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

Branch: refs/heads/master
Commit: 65d56bba6d8782ca0a76a30958daa059e3652f16
Parents: 3c2997c
Author: maryannxue 
Authored: Mon Sep 21 08:32:36 2015 -0400
Committer: maryannxue 
Committed: Mon Sep 21 08:32:36 2015 -0400

--
 .../apache/phoenix/end2end/SortMergeJoinIT.java | 35 ++--
 .../end2end/SubqueryUsingSortMergeJoinIT.java   |  2 --
 .../apache/phoenix/compile/OrderByCompiler.java | 10 +++---
 .../apache/phoenix/compile/QueryCompiler.java   | 11 +++---
 4 files changed, 45 insertions(+), 13 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/phoenix/blob/65d56bba/phoenix-core/src/it/java/org/apache/phoenix/end2end/SortMergeJoinIT.java
--
diff --git 
a/phoenix-core/src/it/java/org/apache/phoenix/end2end/SortMergeJoinIT.java 
b/phoenix-core/src/it/java/org/apache/phoenix/end2end/SortMergeJoinIT.java
index 8b65ab3..9b85d8a 100644
--- a/phoenix-core/src/it/java/org/apache/phoenix/end2end/SortMergeJoinIT.java
+++ b/phoenix-core/src/it/java/org/apache/phoenix/end2end/SortMergeJoinIT.java
@@ -113,8 +113,6 @@ public class SortMergeJoinIT extends BaseHBaseManagedTimeIT 
{
 "AND\n" +
 "SORT-MERGE-JOIN (INNER) TABLES\n" +
 "CLIENT PARALLEL 1-WAY FULL SCAN OVER " + 
JOIN_ITEM_TABLE_DISPLAY_NAME + "\n" +
-"SERVER SORTED BY [\"I.item_id\"]\n" +
-"CLIENT MERGE SORT\n" +
 "AND (SKIP MERGE)\n" +
 "CLIENT PARALLEL 1-WAY FULL SCAN OVER " + 
JOIN_ORDER_TABLE_DISPLAY_NAME + "\n" +
 "SERVER FILTER BY QUANTITY < 5000\n" +
@@ -129,6 +127,12 @@ public class SortMergeJoinIT extends 
BaseHBaseManagedTimeIT {
 "SERVER SORTED BY [\"O.item_id\"]\n" +
 "CLIENT MERGE SORT\n" +
 "CLIENT 4 ROW LIMIT",
+
+"SORT-MERGE-JOIN (INNER) TABLES\n" +
+"CLIENT PARALLEL 1-WAY FULL SCAN OVER Join.ItemTable\n" +
+"AND\n" +
+"CLIENT PARALLEL 1-WAY FULL SCAN OVER Join.ItemTable\n" +
+"SERVER FILTER BY FIRST KEY ONLY"
 }});
 testCases.add(new String[][] {
 {
@@ -163,6 +167,18 @@ public class SortMergeJoinIT extends 
BaseHBaseManagedTimeIT {
 "SERVER SORTED BY [\"O.item_id\"]\n" +
 "CLIENT MERGE SORT\n" +
 "CLIENT 4 ROW LIMIT",
+
+"SORT-MERGE-JOIN (INNER) TABLES\n" +
+"CLIENT PARALLEL 1-WAY FULL SCAN OVER Join.idx_item\n" +
+"SERVER FILTER BY FIRST KEY ONLY\n" +
+"SERVER SORTED BY [\"I1.:item_id\"]\n" +
+"CLIENT MERGE SORT\n" +
+"AND\n" +
+"CLIENT PARALLEL 1-WAY FULL SCAN OVER Join.idx_item\n" +
+"SERVER FILTER BY FIRST KEY ONLY\n" +
+"SERVER SORTED BY [\"I2.:item_id\"]\n" +
+"CLIENT MERGE SORT\n" +
+"CLIENT SORTED BY [\"I1.:item_id\"]"
 }});
 testCases.add(new String[][] {
 {
@@ -197,6 +213,18 @@ public class SortMergeJoinIT extends 
BaseHBaseManagedTimeIT {
 "SERVER SORTED BY [\"O.item_id\"]\n" +
 "CLIENT MERGE SORT\n" +
 "CLIENT 4 ROW LIMIT",
+
+"SORT-MERGE-JOIN (INNER) TABLES\n" +
+"CLIENT PARALLEL 1-WAY RANGE SCAN OVER 
_LOCAL_IDX_Join.ItemTable [-32768]\n" +
+"SERVER FILTER BY FIRST KEY ONLY\n" +
+"SERVER SORTED BY [\"I1.:item_id\"]\n" +
+"CLIENT MERGE SORT\n" +
+"AND\n" +
+"CLIENT PARALLEL 1-WAY RANGE SCAN OVER 
_LOCAL_IDX_Join.ItemTable [-32768]\n" +
+"SERVER FILTER BY FIRST KEY ONLY\n" +
+"SERVER SORTED BY [\"I2.:item_id\"]\n" +
+"CLIENT MERGE SORT\n" +
+"CLIENT SORTED BY [\"I1.:item_id\"]"
 }});
 return testCases;
 }
@@ -1674,6 +1702,9 @@ public class SortMergeJoinIT extends 
BaseHBaseManagedTimeIT {

Build failed in Jenkins: Phoenix | Master #901

2015-09-21 Thread Apache Jenkins Server 
See 

Changes:

[mujtaba] PHOENIX-2182 - Pherf - Add ability to compare of runs

--
[...truncated 119441 lines...]
Tests run: 6, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 148.002 sec - 
in org.apache.phoenix.end2end.index.GlobalIndexOptimizationIT
Running org.apache.phoenix.end2end.index.LocalIndexIT
Tests run: 6, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 128.123 sec - 
in org.apache.phoenix.end2end.index.IndexMetadataIT
Running org.apache.phoenix.end2end.index.ImmutableIndexIT
Tests run: 13, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 74.65 sec - in 
org.apache.phoenix.end2end.index.ImmutableIndexIT
Running org.apache.phoenix.end2end.PowerFunctionEnd2EndIT
Tests run: 1, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 22.734 sec - in 
org.apache.phoenix.end2end.PowerFunctionEnd2EndIT
Running org.apache.phoenix.end2end.ServerExceptionIT
Tests run: 1, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 7.818 sec - in 
org.apache.phoenix.end2end.ServerExceptionIT
Running org.apache.phoenix.end2end.LastValueFunctionIT
Tests run: 15, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 288.981 sec - 
in org.apache.phoenix.end2end.index.GlobalMutableIndexIT
Running org.apache.phoenix.end2end.DisableLocalIndexIT
Tests run: 11, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 27.088 sec - 
in org.apache.phoenix.end2end.LastValueFunctionIT
Running org.apache.phoenix.end2end.ExpFunctionEnd2EndIT
Tests run: 1, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 21.091 sec - in 
org.apache.phoenix.end2end.DisableLocalIndexIT
Running org.apache.phoenix.end2end.HashJoinIT
Tests run: 3, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 32.539 sec - in 
org.apache.phoenix.end2end.ExpFunctionEnd2EndIT
Running org.apache.phoenix.end2end.CbrtFunctionEnd2EndIT
Tests run: 2, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 23.214 sec - in 
org.apache.phoenix.end2end.CbrtFunctionEnd2EndIT
Running org.apache.phoenix.end2end.LikeExpressionIT
Tests run: 2, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 20.785 sec - in 
org.apache.phoenix.end2end.LikeExpressionIT
Running org.apache.phoenix.end2end.FirstValueFunctionIT
Tests run: 15, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 304.981 sec - 
in org.apache.phoenix.end2end.index.LocalMutableIndexIT
Running org.apache.phoenix.end2end.RoundFloorCeilFunctionsEnd2EndIT
Tests run: 7, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 12.613 sec - in 
org.apache.phoenix.end2end.FirstValueFunctionIT
Running org.apache.phoenix.end2end.CSVCommonsLoaderIT
Tests run: 58, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 306.359 sec - 
in org.apache.phoenix.end2end.index.IndexExpressionIT
Running org.apache.phoenix.end2end.DynamicFamilyIT
Tests run: 31, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 41.28 sec - in 
org.apache.phoenix.end2end.RoundFloorCeilFunctionsEnd2EndIT
Running org.apache.phoenix.end2end.AlterSessionIT
Tests run: 4, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 21.092 sec - in 
org.apache.phoenix.end2end.DynamicFamilyIT
Running org.apache.phoenix.end2end.EvaluationOfORIT
Tests run: 2, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 10.656 sec - in 
org.apache.phoenix.end2end.AlterSessionIT
Running org.apache.phoenix.end2end.ArrayConcatFunctionIT
Tests run: 2, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 8.818 sec - in 
org.apache.phoenix.end2end.EvaluationOfORIT
Running org.apache.phoenix.end2end.UpsertBigValuesIT
Tests run: 16, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 72.369 sec - 
in org.apache.phoenix.end2end.CSVCommonsLoaderIT
Running org.apache.phoenix.end2end.ToDateFunctionIT
Tests run: 4, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 36.589 sec - in 
org.apache.phoenix.end2end.UpsertBigValuesIT
Running org.apache.phoenix.end2end.SignFunctionEnd2EndIT
Tests run: 30, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 51.294 sec - 
in org.apache.phoenix.end2end.ArrayConcatFunctionIT
Tests run: 11, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 21.489 sec - 
in org.apache.phoenix.end2end.ToDateFunctionIT
Running org.apache.phoenix.end2end.salted.SaltedTableUpsertSelectIT
Running org.apache.phoenix.end2end.RegexpSplitFunctionIT
Tests run: 2, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 19.354 sec - in 
org.apache.phoenix.end2end.SignFunctionEnd2EndIT
Running org.apache.phoenix.end2end.salted.SaltedTableVarLengthRowKeyIT
Tests run: 1, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 9.513 sec - in 
org.apache.phoenix.end2end.salted.SaltedTableVarLengthRowKeyIT
Running org.apache.phoenix.end2end.GetSetByteBitFunctionEnd2EndIT
Tests run: 11, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 17.957 sec - 
in org.apache.phoenix.end2end.RegexpSplitFunctionIT
Running org.apache.phoenix.end2end.RegexpReplaceFunctionIT
Tests run: 1, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 8.387 sec - in

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

2015-09-21 Thread Apache Jenkins Server 
4.x-HBase-1.0 branch build status Successful

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

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

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

Changes
[mujtaba] PHOENIX-2182 - Pherf - Add ability to compare of runs

[mujtaba] PHOENIX-2280 - Fix failing unit test in Pherf



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

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

2015-09-21 Thread Apache Jenkins Server 
4.5-HBase-1.0 branch build status Successful

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

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

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

Changes
[mujtaba] PHOENIX-2280 - Fix failing unit test in Pherf



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 | Master #902

2015-09-21 Thread Apache Jenkins Server 
See

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

2015-09-21 Thread Apache Jenkins Server 
4.x-HBase-0.98 branch build status Successful

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

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

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

Changes
[maryannxue] PHOENIX-2274 Sort-merge join could not optimize out the sort on the right table



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-1.0 | Build Successful

2015-09-21 Thread Apache Jenkins Server 
4.x-HBase-1.0 branch build status Successful

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

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

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

Changes
[maryannxue] PHOENIX-2274 Sort-merge join could not optimize out the sort on the right table



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.x-HBase-0.98 #842

2015-09-21 Thread Apache Jenkins Server 
See

phoenix git commit: PHOENIX-2205 Group by a divided value (e.g., time/10) returns NULL

2015-09-21 Thread duminduk 
Repository: phoenix
Updated Branches:
  refs/heads/master 6dcc88262 -> 3c2997cda


PHOENIX-2205 Group by a divided value (e.g., time/10) returns NULL


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

Branch: refs/heads/master
Commit: 3c2997cda557cb9b6cb3bd36c67ed0b4a3f89f0e
Parents: 6dcc882
Author: Dumindu Buddhika 
Authored: Mon Sep 21 16:37:50 2015 +0530
Committer: Dumindu Buddhika 
Committed: Mon Sep 21 16:37:50 2015 +0530

--
 .../org/apache/phoenix/end2end/GroupByIT.java   | 72 
 .../expression/RowKeyColumnExpression.java  |  2 +-
 2 files changed, 73 insertions(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/phoenix/blob/3c2997cd/phoenix-core/src/it/java/org/apache/phoenix/end2end/GroupByIT.java
--
diff --git a/phoenix-core/src/it/java/org/apache/phoenix/end2end/GroupByIT.java 
b/phoenix-core/src/it/java/org/apache/phoenix/end2end/GroupByIT.java
index 31a55a0..51ab070 100644
--- a/phoenix-core/src/it/java/org/apache/phoenix/end2end/GroupByIT.java
+++ b/phoenix-core/src/it/java/org/apache/phoenix/end2end/GroupByIT.java
@@ -574,4 +574,76 @@ public class GroupByIT extends BaseQueryIT {
 conn.close();
 }
 
+
+@Test
+public void testGroupByWithIntegerDivision1() throws Exception {
+long ts = nextTimestamp();
+Properties props = PropertiesUtil.deepCopy(TEST_PROPERTIES);
+props.setProperty(PhoenixRuntime.CURRENT_SCN_ATTRIB, Long.toString(ts 
+ 10));
+Connection conn = DriverManager.getConnection(getUrl(), props);
+String ddl = "create table test1(time integer not null, hostname 
varchar not null,usage float,period integer constraint pk PRIMARY KEY(time, 
hostname))";
+conn.createStatement().execute(ddl);
+conn.close();
+
+props.setProperty(PhoenixRuntime.CURRENT_SCN_ATTRIB, Long.toString(ts 
+ 30));
+conn = DriverManager.getConnection(getUrl(), props);
+PreparedStatement stmt = conn.prepareStatement("upsert into test1 
values(1439853462,'qa9',8.27,1439853462)");
+stmt.execute();
+stmt = conn.prepareStatement("upsert into test1 
values(1439853461,'qa9',8.27,1439853362)");
+stmt.execute();
+stmt = conn.prepareStatement("upsert into test1 
values(1439853461,'qa9',5.27,1439853461)");
+stmt.execute();
+stmt = conn.prepareStatement("upsert into test1 
values(1439853451,'qa9',4.27,1439853451)");
+stmt.execute();
+conn.commit();
+conn.close();
+
+props.setProperty(PhoenixRuntime.CURRENT_SCN_ATTRIB, Long.toString(ts 
+ 40));
+conn = DriverManager.getConnection(getUrl(), props);
+ResultSet rs;
+stmt = conn.prepareStatement("select time/10 as tm, hostname, 
avg(usage) from test1 group by hostname, tm");
+rs = stmt.executeQuery();
+assertTrue(rs.next());
+assertEquals(143985345, rs.getInt(1));
+assertEquals(4.2699, rs.getDouble(3), 0.1);
+assertTrue(rs.next());
+assertEquals(143985346, rs.getInt(1));
+assertEquals(6.77, rs.getDouble(3), 0.1);
+}
+
+@Test
+public void testGroupByWithIntegerDivision2() throws Exception {
+long ts = nextTimestamp();
+Properties props = PropertiesUtil.deepCopy(TEST_PROPERTIES);
+props.setProperty(PhoenixRuntime.CURRENT_SCN_ATTRIB, Long.toString(ts 
+ 10));
+Connection conn = DriverManager.getConnection(getUrl(), props);
+String ddl = "create table test1(time integer not null, hostname 
varchar not null,usage float,period integer constraint pk PRIMARY KEY(time, 
hostname))";
+conn.createStatement().execute(ddl);
+conn.close();
+
+props.setProperty(PhoenixRuntime.CURRENT_SCN_ATTRIB, Long.toString(ts 
+ 30));
+conn = DriverManager.getConnection(getUrl(), props);
+PreparedStatement stmt = conn.prepareStatement("upsert into test1 
values(1439853462,'qa9',8.27,1439853462)");
+stmt.execute();
+stmt = conn.prepareStatement("upsert into test1 
values(1439853461,'qa9',8.27,1439853362)");
+stmt.execute();
+stmt = conn.prepareStatement("upsert into test1 
values(1439853461,'qa9',5.27,1439853461)");
+stmt.execute();
+stmt = conn.prepareStatement("upsert into test1 
values(1439853451,'qa9',4.27,1439853451)");
+stmt.execute();
+conn.commit();
+conn.close();
+
+props.setProperty(PhoenixRuntime.CURRENT_SCN_ATTRIB, Long.toString(ts 
+ 40));
+conn =

Build failed in Jenkins: Phoenix | Master #899

2015-09-21 Thread Apache Jenkins Server 
See 

Changes:

[dumindukarunathilaka] PHOENIX-2205 Group by a divided value (e.g., time/10) 
returns NULL

--
[...truncated 123148 lines...]
[INFO] Copying 5 resources
[INFO] skip non existing resourceDirectory 

[INFO] Copying 3 resources
[INFO] 
[INFO] --- maven-compiler-plugin:3.0:testCompile (default-testCompile) @ 
phoenix-pherf ---
[INFO] Changes detected - recompiling the module!
[INFO] Compiling 13 source files to 

[WARNING] 
:
 

 uses or overrides a deprecated API.
[WARNING] 
:
 Recompile with -Xlint:deprecation for details.
[WARNING] 
:
 Some input files use unchecked or unsafe operations.
[WARNING] 
:
 Recompile with -Xlint:unchecked for details.
[INFO] 
[INFO] --- maven-surefire-plugin:2.18:test (default-test) @ phoenix-pherf ---
[INFO] Surefire report directory: 


---
 T E S T S
---
Running org.apache.phoenix.pherf.ResourceTest
Tests run: 3, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 0.612 sec - in 
org.apache.phoenix.pherf.ResourceTest
Running org.apache.phoenix.pherf.ConfigurationParserTest
Tests run: 2, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 0.556 sec - in 
org.apache.phoenix.pherf.ConfigurationParserTest
Running org.apache.phoenix.pherf.RuleGeneratorTest
Tests run: 4, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 1.483 sec - in 
org.apache.phoenix.pherf.RuleGeneratorTest
Running org.apache.phoenix.pherf.ResultTest
Tests run: 4, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 4.854 sec - in 
org.apache.phoenix.pherf.ResultTest
Running org.apache.phoenix.pherf.RowCalculatorTest
Tests run: 4, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 0 sec - in 
org.apache.phoenix.pherf.RowCalculatorTest
Running org.apache.phoenix.pherf.PherfTest
Tests run: 2, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 0.444 sec - in 
org.apache.phoenix.pherf.PherfTest
Running org.apache.phoenix.pherf.TestHBaseProps
Tests run: 1, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 0.103 sec - in 
org.apache.phoenix.pherf.TestHBaseProps
Running org.apache.phoenix.pherf.ColumnTest
Tests run: 1, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 0 sec - in 
org.apache.phoenix.pherf.ColumnTest

Results :




Tests run: 21, Failures: 0, Errors: 0, Skipped: 0

[INFO] 
[INFO] --- maven-source-plugin:2.2.1:jar-no-fork (attach-sources) @ 
phoenix-pherf ---
[INFO] Building jar: 

[INFO] 
[INFO] --- maven-jar-plugin:2.4:test-jar (default) @ phoenix-pherf ---
[INFO] Building jar: 

[INFO] 
[INFO] --- maven-jar-plugin:2.4:jar (default-jar) @ phoenix-pherf ---
[INFO] Building jar: 

[INFO] 
[INFO] --- maven-site-plugin:3.2:attach-descriptor (attach-descriptor) @ 
phoenix-pherf ---
[INFO] 
[INFO] --- maven-assembly-plugin:2.5.2:single (make-dependency-jar) @ 
phoenix-pherf ---
[INFO] artifact junit:junit-dep: checking for updates from apache release
[INFO] artifact junit:junit-dep: checking for updates from conjars.org
[INFO] artifact junit:junit-dep: checking for updates from apache snapshot
[INFO] artifact junit:junit-dep: checking for updates from 
sonatype-nexus-snapshots
[INFO] artifact junit:junit-dep: checking for updates from central
[INFO] artifact junit:junit: checking for updates from apache release
[INFO] artifact junit:junit: checking for updates from conjars.org
[INFO] artifact junit:junit: checking for updates from apache snapshot
[INFO] artifact junit:junit: checking for updates from sonatype-nexus-snapshots
[INFO] artifact junit:junit: checking for updates from central
[INFO] artifact commons-io:commons-io: checking for updates from apache release
[INFO] artifact

[1/2] phoenix git commit: PHOENIX-2274 Sort-merge join could not optimize out the sort on the right table

2015-09-21 Thread maryannxue 
Repository: phoenix
Updated Branches:
  refs/heads/4.x-HBase-0.98 1f4a5400b -> 7eac78e75


PHOENIX-2274 Sort-merge join could not optimize out the sort on the right table


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

Branch: refs/heads/4.x-HBase-0.98
Commit: ea91e634400a58654ba98d8b696c169272ac8308
Parents: 6cd7936
Author: maryannxue 
Authored: Mon Sep 21 09:26:07 2015 -0400
Committer: maryannxue 
Committed: Mon Sep 21 09:26:07 2015 -0400

--
 .../apache/phoenix/end2end/SortMergeJoinIT.java | 35 ++--
 .../end2end/SubqueryUsingSortMergeJoinIT.java   |  2 --
 .../apache/phoenix/compile/OrderByCompiler.java | 10 +++---
 .../apache/phoenix/compile/QueryCompiler.java   | 11 +++---
 4 files changed, 45 insertions(+), 13 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/phoenix/blob/ea91e634/phoenix-core/src/it/java/org/apache/phoenix/end2end/SortMergeJoinIT.java
--
diff --git 
a/phoenix-core/src/it/java/org/apache/phoenix/end2end/SortMergeJoinIT.java 
b/phoenix-core/src/it/java/org/apache/phoenix/end2end/SortMergeJoinIT.java
index 8b65ab3..9b85d8a 100644
--- a/phoenix-core/src/it/java/org/apache/phoenix/end2end/SortMergeJoinIT.java
+++ b/phoenix-core/src/it/java/org/apache/phoenix/end2end/SortMergeJoinIT.java
@@ -113,8 +113,6 @@ public class SortMergeJoinIT extends BaseHBaseManagedTimeIT 
{
 "AND\n" +
 "SORT-MERGE-JOIN (INNER) TABLES\n" +
 "CLIENT PARALLEL 1-WAY FULL SCAN OVER " + 
JOIN_ITEM_TABLE_DISPLAY_NAME + "\n" +
-"SERVER SORTED BY [\"I.item_id\"]\n" +
-"CLIENT MERGE SORT\n" +
 "AND (SKIP MERGE)\n" +
 "CLIENT PARALLEL 1-WAY FULL SCAN OVER " + 
JOIN_ORDER_TABLE_DISPLAY_NAME + "\n" +
 "SERVER FILTER BY QUANTITY < 5000\n" +
@@ -129,6 +127,12 @@ public class SortMergeJoinIT extends 
BaseHBaseManagedTimeIT {
 "SERVER SORTED BY [\"O.item_id\"]\n" +
 "CLIENT MERGE SORT\n" +
 "CLIENT 4 ROW LIMIT",
+
+"SORT-MERGE-JOIN (INNER) TABLES\n" +
+"CLIENT PARALLEL 1-WAY FULL SCAN OVER Join.ItemTable\n" +
+"AND\n" +
+"CLIENT PARALLEL 1-WAY FULL SCAN OVER Join.ItemTable\n" +
+"SERVER FILTER BY FIRST KEY ONLY"
 }});
 testCases.add(new String[][] {
 {
@@ -163,6 +167,18 @@ public class SortMergeJoinIT extends 
BaseHBaseManagedTimeIT {
 "SERVER SORTED BY [\"O.item_id\"]\n" +
 "CLIENT MERGE SORT\n" +
 "CLIENT 4 ROW LIMIT",
+
+"SORT-MERGE-JOIN (INNER) TABLES\n" +
+"CLIENT PARALLEL 1-WAY FULL SCAN OVER Join.idx_item\n" +
+"SERVER FILTER BY FIRST KEY ONLY\n" +
+"SERVER SORTED BY [\"I1.:item_id\"]\n" +
+"CLIENT MERGE SORT\n" +
+"AND\n" +
+"CLIENT PARALLEL 1-WAY FULL SCAN OVER Join.idx_item\n" +
+"SERVER FILTER BY FIRST KEY ONLY\n" +
+"SERVER SORTED BY [\"I2.:item_id\"]\n" +
+"CLIENT MERGE SORT\n" +
+"CLIENT SORTED BY [\"I1.:item_id\"]"
 }});
 testCases.add(new String[][] {
 {
@@ -197,6 +213,18 @@ public class SortMergeJoinIT extends 
BaseHBaseManagedTimeIT {
 "SERVER SORTED BY [\"O.item_id\"]\n" +
 "CLIENT MERGE SORT\n" +
 "CLIENT 4 ROW LIMIT",
+
+"SORT-MERGE-JOIN (INNER) TABLES\n" +
+"CLIENT PARALLEL 1-WAY RANGE SCAN OVER 
_LOCAL_IDX_Join.ItemTable [-32768]\n" +
+"SERVER FILTER BY FIRST KEY ONLY\n" +
+"SERVER SORTED BY [\"I1.:item_id\"]\n" +
+"CLIENT MERGE SORT\n" +
+"AND\n" +
+"CLIENT PARALLEL 1-WAY RANGE SCAN OVER 
_LOCAL_IDX_Join.ItemTable [-32768]\n" +
+"SERVER FILTER BY FIRST KEY ONLY\n" +
+"SERVER SORTED BY [\"I2.:item_id\"]\n" +
+"CLIENT MERGE SORT\n" +
+"CLIENT SORTED BY [\"I1.:item_id\"]"
 }});
 return testCases;
 }
@@ -1674,6 +1702,9 @@ public class SortMergeJoinIT extends 
BaseHBaseManagedTimeIT {

phoenix git commit: PHOENIX-2205 Group by a divided value (e.g., time/10) returns NULL

2015-09-21 Thread duminduk 
Repository: phoenix
Updated Branches:
  refs/heads/4.5-HBase-1.1 2ab807d1e -> dc594854f


PHOENIX-2205 Group by a divided value (e.g., time/10) returns NULL


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

Branch: refs/heads/4.5-HBase-1.1
Commit: dc594854f87315950506be260969a3d14e76a873
Parents: 2ab807d
Author: Dumindu Buddhika 
Authored: Mon Sep 21 19:36:57 2015 +0530
Committer: Dumindu Buddhika 
Committed: Mon Sep 21 19:36:57 2015 +0530

--
 .../org/apache/phoenix/end2end/GroupByIT.java   | 72 
 .../expression/RowKeyColumnExpression.java  |  2 +-
 2 files changed, 73 insertions(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/phoenix/blob/dc594854/phoenix-core/src/it/java/org/apache/phoenix/end2end/GroupByIT.java
--
diff --git a/phoenix-core/src/it/java/org/apache/phoenix/end2end/GroupByIT.java 
b/phoenix-core/src/it/java/org/apache/phoenix/end2end/GroupByIT.java
index 31a55a0..51ab070 100644
--- a/phoenix-core/src/it/java/org/apache/phoenix/end2end/GroupByIT.java
+++ b/phoenix-core/src/it/java/org/apache/phoenix/end2end/GroupByIT.java
@@ -574,4 +574,76 @@ public class GroupByIT extends BaseQueryIT {
 conn.close();
 }
 
+
+@Test
+public void testGroupByWithIntegerDivision1() throws Exception {
+long ts = nextTimestamp();
+Properties props = PropertiesUtil.deepCopy(TEST_PROPERTIES);
+props.setProperty(PhoenixRuntime.CURRENT_SCN_ATTRIB, Long.toString(ts 
+ 10));
+Connection conn = DriverManager.getConnection(getUrl(), props);
+String ddl = "create table test1(time integer not null, hostname 
varchar not null,usage float,period integer constraint pk PRIMARY KEY(time, 
hostname))";
+conn.createStatement().execute(ddl);
+conn.close();
+
+props.setProperty(PhoenixRuntime.CURRENT_SCN_ATTRIB, Long.toString(ts 
+ 30));
+conn = DriverManager.getConnection(getUrl(), props);
+PreparedStatement stmt = conn.prepareStatement("upsert into test1 
values(1439853462,'qa9',8.27,1439853462)");
+stmt.execute();
+stmt = conn.prepareStatement("upsert into test1 
values(1439853461,'qa9',8.27,1439853362)");
+stmt.execute();
+stmt = conn.prepareStatement("upsert into test1 
values(1439853461,'qa9',5.27,1439853461)");
+stmt.execute();
+stmt = conn.prepareStatement("upsert into test1 
values(1439853451,'qa9',4.27,1439853451)");
+stmt.execute();
+conn.commit();
+conn.close();
+
+props.setProperty(PhoenixRuntime.CURRENT_SCN_ATTRIB, Long.toString(ts 
+ 40));
+conn = DriverManager.getConnection(getUrl(), props);
+ResultSet rs;
+stmt = conn.prepareStatement("select time/10 as tm, hostname, 
avg(usage) from test1 group by hostname, tm");
+rs = stmt.executeQuery();
+assertTrue(rs.next());
+assertEquals(143985345, rs.getInt(1));
+assertEquals(4.2699, rs.getDouble(3), 0.1);
+assertTrue(rs.next());
+assertEquals(143985346, rs.getInt(1));
+assertEquals(6.77, rs.getDouble(3), 0.1);
+}
+
+@Test
+public void testGroupByWithIntegerDivision2() throws Exception {
+long ts = nextTimestamp();
+Properties props = PropertiesUtil.deepCopy(TEST_PROPERTIES);
+props.setProperty(PhoenixRuntime.CURRENT_SCN_ATTRIB, Long.toString(ts 
+ 10));
+Connection conn = DriverManager.getConnection(getUrl(), props);
+String ddl = "create table test1(time integer not null, hostname 
varchar not null,usage float,period integer constraint pk PRIMARY KEY(time, 
hostname))";
+conn.createStatement().execute(ddl);
+conn.close();
+
+props.setProperty(PhoenixRuntime.CURRENT_SCN_ATTRIB, Long.toString(ts 
+ 30));
+conn = DriverManager.getConnection(getUrl(), props);
+PreparedStatement stmt = conn.prepareStatement("upsert into test1 
values(1439853462,'qa9',8.27,1439853462)");
+stmt.execute();
+stmt = conn.prepareStatement("upsert into test1 
values(1439853461,'qa9',8.27,1439853362)");
+stmt.execute();
+stmt = conn.prepareStatement("upsert into test1 
values(1439853461,'qa9',5.27,1439853461)");
+stmt.execute();
+stmt = conn.prepareStatement("upsert into test1 
values(1439853451,'qa9',4.27,1439853451)");
+stmt.execute();
+conn.commit();
+conn.close();
+
+props.setProperty(PhoenixRuntime.CURRENT_SCN_ATTRIB, Long.toString(ts 
+ 40));
+conn =

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

2015-09-21 Thread Apache Jenkins Server 
4.x-HBase-1.0 branch build status Successful

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

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

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

Changes
[duminduk] PHOENIX-2205 Group by a divided value (e.g., time/10) returns NULL



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-2205 Group by a divided value (e.g., time/10) returns NULL

2015-09-21 Thread duminduk 
Repository: phoenix
Updated Branches:
  refs/heads/4.5-HBase-1.0 c35c47571 -> f7253eee6


PHOENIX-2205 Group by a divided value (e.g., time/10) returns NULL


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

Branch: refs/heads/4.5-HBase-1.0
Commit: f7253eee6d401aafb4cb479cc3e97d2ac017894e
Parents: c35c475
Author: Dumindu Buddhika 
Authored: Mon Sep 21 19:34:59 2015 +0530
Committer: Dumindu Buddhika 
Committed: Mon Sep 21 19:34:59 2015 +0530

--
 .../org/apache/phoenix/end2end/GroupByIT.java   | 72 
 .../expression/RowKeyColumnExpression.java  |  2 +-
 2 files changed, 73 insertions(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/phoenix/blob/f7253eee/phoenix-core/src/it/java/org/apache/phoenix/end2end/GroupByIT.java
--
diff --git a/phoenix-core/src/it/java/org/apache/phoenix/end2end/GroupByIT.java 
b/phoenix-core/src/it/java/org/apache/phoenix/end2end/GroupByIT.java
index 31a55a0..51ab070 100644
--- a/phoenix-core/src/it/java/org/apache/phoenix/end2end/GroupByIT.java
+++ b/phoenix-core/src/it/java/org/apache/phoenix/end2end/GroupByIT.java
@@ -574,4 +574,76 @@ public class GroupByIT extends BaseQueryIT {
 conn.close();
 }
 
+
+@Test
+public void testGroupByWithIntegerDivision1() throws Exception {
+long ts = nextTimestamp();
+Properties props = PropertiesUtil.deepCopy(TEST_PROPERTIES);
+props.setProperty(PhoenixRuntime.CURRENT_SCN_ATTRIB, Long.toString(ts 
+ 10));
+Connection conn = DriverManager.getConnection(getUrl(), props);
+String ddl = "create table test1(time integer not null, hostname 
varchar not null,usage float,period integer constraint pk PRIMARY KEY(time, 
hostname))";
+conn.createStatement().execute(ddl);
+conn.close();
+
+props.setProperty(PhoenixRuntime.CURRENT_SCN_ATTRIB, Long.toString(ts 
+ 30));
+conn = DriverManager.getConnection(getUrl(), props);
+PreparedStatement stmt = conn.prepareStatement("upsert into test1 
values(1439853462,'qa9',8.27,1439853462)");
+stmt.execute();
+stmt = conn.prepareStatement("upsert into test1 
values(1439853461,'qa9',8.27,1439853362)");
+stmt.execute();
+stmt = conn.prepareStatement("upsert into test1 
values(1439853461,'qa9',5.27,1439853461)");
+stmt.execute();
+stmt = conn.prepareStatement("upsert into test1 
values(1439853451,'qa9',4.27,1439853451)");
+stmt.execute();
+conn.commit();
+conn.close();
+
+props.setProperty(PhoenixRuntime.CURRENT_SCN_ATTRIB, Long.toString(ts 
+ 40));
+conn = DriverManager.getConnection(getUrl(), props);
+ResultSet rs;
+stmt = conn.prepareStatement("select time/10 as tm, hostname, 
avg(usage) from test1 group by hostname, tm");
+rs = stmt.executeQuery();
+assertTrue(rs.next());
+assertEquals(143985345, rs.getInt(1));
+assertEquals(4.2699, rs.getDouble(3), 0.1);
+assertTrue(rs.next());
+assertEquals(143985346, rs.getInt(1));
+assertEquals(6.77, rs.getDouble(3), 0.1);
+}
+
+@Test
+public void testGroupByWithIntegerDivision2() throws Exception {
+long ts = nextTimestamp();
+Properties props = PropertiesUtil.deepCopy(TEST_PROPERTIES);
+props.setProperty(PhoenixRuntime.CURRENT_SCN_ATTRIB, Long.toString(ts 
+ 10));
+Connection conn = DriverManager.getConnection(getUrl(), props);
+String ddl = "create table test1(time integer not null, hostname 
varchar not null,usage float,period integer constraint pk PRIMARY KEY(time, 
hostname))";
+conn.createStatement().execute(ddl);
+conn.close();
+
+props.setProperty(PhoenixRuntime.CURRENT_SCN_ATTRIB, Long.toString(ts 
+ 30));
+conn = DriverManager.getConnection(getUrl(), props);
+PreparedStatement stmt = conn.prepareStatement("upsert into test1 
values(1439853462,'qa9',8.27,1439853462)");
+stmt.execute();
+stmt = conn.prepareStatement("upsert into test1 
values(1439853461,'qa9',8.27,1439853362)");
+stmt.execute();
+stmt = conn.prepareStatement("upsert into test1 
values(1439853461,'qa9',5.27,1439853461)");
+stmt.execute();
+stmt = conn.prepareStatement("upsert into test1 
values(1439853451,'qa9',4.27,1439853451)");
+stmt.execute();
+conn.commit();
+conn.close();
+
+props.setProperty(PhoenixRuntime.CURRENT_SCN_ATTRIB, Long.toString(ts 
+ 40));
+conn =

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

2015-09-21 Thread Apache Jenkins Server 
See

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

2015-09-21 Thread Apache Jenkins Server 
4.x-HBase-0.98 branch build status Successful

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

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

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

Changes
[mujtaba] PHOENIX-2182 - Pherf - Add ability to compare of runs



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-2182 - Pherf - Add ability to compare of runs

2015-09-21 Thread mujtaba 
Repository: phoenix
Updated Branches:
  refs/heads/4.x-HBase-1.0 3381de474 -> bf80d8e69


PHOENIX-2182 - Pherf - Add ability to compare of runs


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

Branch: refs/heads/4.x-HBase-1.0
Commit: bf80d8e69ea8a11626daa1a1e293d6f68b138e75
Parents: 3381de4
Author: Mujtaba 
Authored: Mon Sep 21 13:02:37 2015 -0700
Committer: Mujtaba 
Committed: Mon Sep 21 13:02:37 2015 -0700

--
 phoenix-pherf/config/pherf.properties   |   8 +-
 .../java/org/apache/phoenix/pherf/Pherf.java|  23 +-
 .../phoenix/pherf/result/QueryResult.java   |  32 +-
 .../phoenix/pherf/result/ResultManager.java |  19 +-
 .../apache/phoenix/pherf/result/ResultUtil.java |  12 +-
 .../phoenix/pherf/result/file/Header.java   |   2 +-
 .../pherf/util/GoogleChartGenerator.java| 361 +++
 .../apache/phoenix/pherf/util/PhoenixUtil.java  |  30 ++
 .../pherf/workload/MultiThreadedRunner.java |   4 +-
 .../pherf/workload/MultithreadedDiffer.java |   4 +-
 .../phoenix/pherf/workload/QueryExecutor.java   |  12 +-
 .../phoenix/pherf/workload/QueryVerifier.java   |  30 --
 12 files changed, 494 insertions(+), 43 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/phoenix/blob/bf80d8e6/phoenix-pherf/config/pherf.properties
--
diff --git a/phoenix-pherf/config/pherf.properties 
b/phoenix-pherf/config/pherf.properties
index 152e09c..de5c167 100644
--- a/phoenix-pherf/config/pherf.properties
+++ b/phoenix-pherf/config/pherf.properties
@@ -30,4 +30,10 @@ pherf.default.dataloader.threadpool=0
 pherf.default.dataloader.batchsize=1000
 
 # Directory where results from a scenario run will be written
-pherf.default.results.dir=RESULTS
\ No newline at end of file
+pherf.default.results.dir=RESULTS
+
+# Google chart summary html file
+pherf.default.summary.file=RESULTS/summary.html
+
+# Threshold for comparator to fail. ex. 0.5 equates to 50%
+pherf.default.comparison.threshold=0.45
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/phoenix/blob/bf80d8e6/phoenix-pherf/src/main/java/org/apache/phoenix/pherf/Pherf.java
--
diff --git a/phoenix-pherf/src/main/java/org/apache/phoenix/pherf/Pherf.java 
b/phoenix-pherf/src/main/java/org/apache/phoenix/pherf/Pherf.java
index 70fdb11..f6ed19d 100644
--- a/phoenix-pherf/src/main/java/org/apache/phoenix/pherf/Pherf.java
+++ b/phoenix-pherf/src/main/java/org/apache/phoenix/pherf/Pherf.java
@@ -22,7 +22,9 @@ import org.apache.commons.cli.*;
 import org.apache.phoenix.pherf.PherfConstants.GeneratePhoenixStats;
 import org.apache.phoenix.pherf.configuration.XMLConfigParser;
 import org.apache.phoenix.pherf.jmx.MonitorManager;
+import org.apache.phoenix.pherf.result.ResultUtil;
 import org.apache.phoenix.pherf.schema.SchemaReader;
+import org.apache.phoenix.pherf.util.GoogleChartGenerator;
 import org.apache.phoenix.pherf.util.PhoenixUtil;
 import org.apache.phoenix.pherf.util.ResourceList;
 import org.apache.phoenix.pherf.workload.QueryExecutor;
@@ -45,6 +47,8 @@ public class Pherf {
 
 static {
 options.addOption("disableSchemaApply", false, "Set to disable schema 
from being applied.");
+   options.addOption("disableRuntimeResult", false,
+   "Set to disable writing detailed CSV file 
during query execution. Those will eventually get written at the end of query 
execution.");
 options.addOption("z", "zookeeper", true,
 "HBase Zookeeper address for connection. Default: localhost");
 options.addOption("q", "query", false, "Executes multi-threaded query 
sets");
@@ -76,6 +80,8 @@ public class Pherf {
 options.addOption("d", "debug", false, "Put tool in debug mode");
 options.addOption("stats", false,
 "Update Phoenix Statistics after data is loaded with -l 
argument");
+   options.addOption("label", true, "Label a run. Result file name 
will be suffixed with specified label");
+   options.addOption("compare", true, "Specify labeled runs to 
compare against current run");
 }
 
 private final String zookeeper;
@@ -92,7 +98,10 @@ public class Pherf {
 private final int rowCountOverride;
 private final boolean listFiles;
 private final boolean applySchema;
+private final boolean writeRuntimeResults;
 private final GeneratePhoenixStats generateStatistics;
+private final String label;
+private final String compareResults;

phoenix git commit: PHOENIX-2182 - Pherf - Add ability to compare of runs

2015-09-21 Thread mujtaba 
Repository: phoenix
Updated Branches:
  refs/heads/4.x-HBase-0.98 7eac78e75 -> e3a3bd9b8


PHOENIX-2182 - Pherf - Add ability to compare of runs


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

Branch: refs/heads/4.x-HBase-0.98
Commit: e3a3bd9b8ee582e2d7f7a01671fd76bd53b98312
Parents: 7eac78e
Author: Mujtaba 
Authored: Mon Sep 21 12:06:32 2015 -0700
Committer: Mujtaba 
Committed: Mon Sep 21 12:06:32 2015 -0700

--
 phoenix-pherf/config/pherf.properties   |   8 +-
 .../java/org/apache/phoenix/pherf/Pherf.java|  23 +-
 .../phoenix/pherf/result/QueryResult.java   |  32 +-
 .../phoenix/pherf/result/ResultManager.java |  19 +-
 .../apache/phoenix/pherf/result/ResultUtil.java |  12 +-
 .../phoenix/pherf/result/file/Header.java   |   2 +-
 .../pherf/util/GoogleChartGenerator.java| 361 +++
 .../apache/phoenix/pherf/util/PhoenixUtil.java  |  30 ++
 .../pherf/workload/MultiThreadedRunner.java |   4 +-
 .../pherf/workload/MultithreadedDiffer.java |   4 +-
 .../phoenix/pherf/workload/QueryExecutor.java   |  12 +-
 .../phoenix/pherf/workload/QueryVerifier.java   |  30 --
 12 files changed, 494 insertions(+), 43 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/phoenix/blob/e3a3bd9b/phoenix-pherf/config/pherf.properties
--
diff --git a/phoenix-pherf/config/pherf.properties 
b/phoenix-pherf/config/pherf.properties
index 152e09c..de5c167 100644
--- a/phoenix-pherf/config/pherf.properties
+++ b/phoenix-pherf/config/pherf.properties
@@ -30,4 +30,10 @@ pherf.default.dataloader.threadpool=0
 pherf.default.dataloader.batchsize=1000
 
 # Directory where results from a scenario run will be written
-pherf.default.results.dir=RESULTS
\ No newline at end of file
+pherf.default.results.dir=RESULTS
+
+# Google chart summary html file
+pherf.default.summary.file=RESULTS/summary.html
+
+# Threshold for comparator to fail. ex. 0.5 equates to 50%
+pherf.default.comparison.threshold=0.45
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/phoenix/blob/e3a3bd9b/phoenix-pherf/src/main/java/org/apache/phoenix/pherf/Pherf.java
--
diff --git a/phoenix-pherf/src/main/java/org/apache/phoenix/pherf/Pherf.java 
b/phoenix-pherf/src/main/java/org/apache/phoenix/pherf/Pherf.java
index 70fdb11..f6ed19d 100644
--- a/phoenix-pherf/src/main/java/org/apache/phoenix/pherf/Pherf.java
+++ b/phoenix-pherf/src/main/java/org/apache/phoenix/pherf/Pherf.java
@@ -22,7 +22,9 @@ import org.apache.commons.cli.*;
 import org.apache.phoenix.pherf.PherfConstants.GeneratePhoenixStats;
 import org.apache.phoenix.pherf.configuration.XMLConfigParser;
 import org.apache.phoenix.pherf.jmx.MonitorManager;
+import org.apache.phoenix.pherf.result.ResultUtil;
 import org.apache.phoenix.pherf.schema.SchemaReader;
+import org.apache.phoenix.pherf.util.GoogleChartGenerator;
 import org.apache.phoenix.pherf.util.PhoenixUtil;
 import org.apache.phoenix.pherf.util.ResourceList;
 import org.apache.phoenix.pherf.workload.QueryExecutor;
@@ -45,6 +47,8 @@ public class Pherf {
 
 static {
 options.addOption("disableSchemaApply", false, "Set to disable schema 
from being applied.");
+   options.addOption("disableRuntimeResult", false,
+   "Set to disable writing detailed CSV file 
during query execution. Those will eventually get written at the end of query 
execution.");
 options.addOption("z", "zookeeper", true,
 "HBase Zookeeper address for connection. Default: localhost");
 options.addOption("q", "query", false, "Executes multi-threaded query 
sets");
@@ -76,6 +80,8 @@ public class Pherf {
 options.addOption("d", "debug", false, "Put tool in debug mode");
 options.addOption("stats", false,
 "Update Phoenix Statistics after data is loaded with -l 
argument");
+   options.addOption("label", true, "Label a run. Result file name 
will be suffixed with specified label");
+   options.addOption("compare", true, "Specify labeled runs to 
compare against current run");
 }
 
 private final String zookeeper;
@@ -92,7 +98,10 @@ public class Pherf {
 private final int rowCountOverride;
 private final boolean listFiles;
 private final boolean applySchema;
+private final boolean writeRuntimeResults;
 private final GeneratePhoenixStats generateStatistics;
+private final String label;
+private final String compareResults;

phoenix git commit: PHOENIX-2280 - Fix failing unit test in Pherf

2015-09-21 Thread mujtaba 
Repository: phoenix
Updated Branches:
  refs/heads/4.x-HBase-1.0 bf80d8e69 -> ff4e4a4d6


PHOENIX-2280 - Fix failing unit test in Pherf


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

Branch: refs/heads/4.x-HBase-1.0
Commit: ff4e4a4d622f882393e19a2b656fa0c8def9b690
Parents: bf80d8e
Author: Mujtaba 
Authored: Mon Sep 21 14:33:31 2015 -0700
Committer: Mujtaba 
Committed: Mon Sep 21 14:33:31 2015 -0700

--
 .../org/apache/phoenix/pherf/DataIngestIT.java|  3 ++-
 .../resources/datamodel/test_schema_mt_view.sql   | 18 --
 .../src/test/resources/scenario/test_scenario.xml |  4 +++-
 3 files changed, 5 insertions(+), 20 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/phoenix/blob/ff4e4a4d/phoenix-pherf/src/it/java/org/apache/phoenix/pherf/DataIngestIT.java
--
diff --git 
a/phoenix-pherf/src/it/java/org/apache/phoenix/pherf/DataIngestIT.java 
b/phoenix-pherf/src/it/java/org/apache/phoenix/pherf/DataIngestIT.java
index 33f8a53..1fece61 100644
--- a/phoenix-pherf/src/it/java/org/apache/phoenix/pherf/DataIngestIT.java
+++ b/phoenix-pherf/src/it/java/org/apache/phoenix/pherf/DataIngestIT.java
@@ -73,7 +73,7 @@ public class DataIngestIT extends ResultBaseTestIT {
 WorkloadExecutor executor = new WorkloadExecutor();
 executor.add(loader);
 executor.get();
-
+
 RulesApplier rulesApplier = loader.getRulesApplier();
 List modelList = rulesApplier.getModelList();
 assertTrue("Could not generate the modelList", modelList.size() > 
0);
@@ -100,6 +100,7 @@ public class DataIngestIT extends ResultBaseTestIT {
 Workload query = new QueryExecutor(parser, util, executor);
 executor.add(query);
 executor.get();
+executor.shutdown();
 
 } catch (Exception e) {
 fail("We had an exception: " + e.getMessage());

http://git-wip-us.apache.org/repos/asf/phoenix/blob/ff4e4a4d/phoenix-pherf/src/test/resources/datamodel/test_schema_mt_view.sql
--
diff --git a/phoenix-pherf/src/test/resources/datamodel/test_schema_mt_view.sql 
b/phoenix-pherf/src/test/resources/datamodel/test_schema_mt_view.sql
deleted file mode 100644
index 26549fd..000
--- a/phoenix-pherf/src/test/resources/datamodel/test_schema_mt_view.sql
+++ /dev/null
@@ -1,18 +0,0 @@
-/*
-  -- 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.
-*/
-CREATE VIEW IF NOT EXISTS PHERF.TEST_VIEW (field1 VARCHAR, field2 VARCHAR) AS 
SELECT * FROM PHERF.TEST_MULTI_TENANT_TABLE

http://git-wip-us.apache.org/repos/asf/phoenix/blob/ff4e4a4d/phoenix-pherf/src/test/resources/scenario/test_scenario.xml
--
diff --git a/phoenix-pherf/src/test/resources/scenario/test_scenario.xml 
b/phoenix-pherf/src/test/resources/scenario/test_scenario.xml
index 50a603e..f23e71a 100644
--- a/phoenix-pherf/src/test/resources/scenario/test_scenario.xml
+++ b/phoenix-pherf/src/test/resources/scenario/test_scenario.xml
@@ -228,7 +228,9 @@
  the tablename attribute. This assumes the tenant specific view 
has been created. To 
  dynamically create the view see comments below with regard to the 
ddl attribute. 
 -->
-
+

phoenix git commit: PHOENIX-2280 - Fix failing unit test in Pherf

2015-09-21 Thread mujtaba 
Repository: phoenix
Updated Branches:
  refs/heads/4.x-HBase-0.98 e3a3bd9b8 -> 1856a1bdc


PHOENIX-2280 - Fix failing unit test in Pherf


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

Branch: refs/heads/4.x-HBase-0.98
Commit: 1856a1bdcadcd8b5bd0f6f855c4ec8c5a915e5bc
Parents: e3a3bd9
Author: Mujtaba 
Authored: Mon Sep 21 14:29:54 2015 -0700
Committer: Mujtaba 
Committed: Mon Sep 21 14:29:54 2015 -0700

--
 .../org/apache/phoenix/pherf/DataIngestIT.java|  3 ++-
 .../resources/datamodel/test_schema_mt_view.sql   | 18 --
 .../src/test/resources/scenario/test_scenario.xml |  4 +++-
 3 files changed, 5 insertions(+), 20 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/phoenix/blob/1856a1bd/phoenix-pherf/src/it/java/org/apache/phoenix/pherf/DataIngestIT.java
--
diff --git 
a/phoenix-pherf/src/it/java/org/apache/phoenix/pherf/DataIngestIT.java 
b/phoenix-pherf/src/it/java/org/apache/phoenix/pherf/DataIngestIT.java
index 1098799..13f9c63 100644
--- a/phoenix-pherf/src/it/java/org/apache/phoenix/pherf/DataIngestIT.java
+++ b/phoenix-pherf/src/it/java/org/apache/phoenix/pherf/DataIngestIT.java
@@ -72,7 +72,7 @@ public class DataIngestIT extends ResultBaseTestIT {
 WorkloadExecutor executor = new WorkloadExecutor();
 executor.add(loader);
 executor.get();
-
+
 RulesApplier rulesApplier = loader.getRulesApplier();
 List modelList = rulesApplier.getModelList();
 assertTrue("Could not generate the modelList", modelList.size() > 
0);
@@ -99,6 +99,7 @@ public class DataIngestIT extends ResultBaseTestIT {
 Workload query = new QueryExecutor(parser, util, executor);
 executor.add(query);
 executor.get();
+executor.shutdown();
 
 } catch (Exception e) {
 fail("We had an exception: " + e.getMessage());

http://git-wip-us.apache.org/repos/asf/phoenix/blob/1856a1bd/phoenix-pherf/src/test/resources/datamodel/test_schema_mt_view.sql
--
diff --git a/phoenix-pherf/src/test/resources/datamodel/test_schema_mt_view.sql 
b/phoenix-pherf/src/test/resources/datamodel/test_schema_mt_view.sql
deleted file mode 100644
index 26549fd..000
--- a/phoenix-pherf/src/test/resources/datamodel/test_schema_mt_view.sql
+++ /dev/null
@@ -1,18 +0,0 @@
-/*
-  -- 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.
-*/
-CREATE VIEW IF NOT EXISTS PHERF.TEST_VIEW (field1 VARCHAR, field2 VARCHAR) AS 
SELECT * FROM PHERF.TEST_MULTI_TENANT_TABLE

http://git-wip-us.apache.org/repos/asf/phoenix/blob/1856a1bd/phoenix-pherf/src/test/resources/scenario/test_scenario.xml
--
diff --git a/phoenix-pherf/src/test/resources/scenario/test_scenario.xml 
b/phoenix-pherf/src/test/resources/scenario/test_scenario.xml
index 50a603e..f23e71a 100644
--- a/phoenix-pherf/src/test/resources/scenario/test_scenario.xml
+++ b/phoenix-pherf/src/test/resources/scenario/test_scenario.xml
@@ -228,7 +228,9 @@
  the tablename attribute. This assumes the tenant specific view 
has been created. To 
  dynamically create the view see comments below with regard to the 
ddl attribute. 
 -->
-
+

phoenix git commit: PHOENIX-2280 - Fix failing unit test in Pherf

2015-09-21 Thread mujtaba 
Repository: phoenix
Updated Branches:
  refs/heads/master 67c9cd0fd -> 98dc849e9


PHOENIX-2280 - Fix failing unit test in Pherf


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

Branch: refs/heads/master
Commit: 98dc849e93136249588f85551e70c748229db669
Parents: 67c9cd0
Author: Mujtaba 
Authored: Mon Sep 21 14:38:56 2015 -0700
Committer: Mujtaba 
Committed: Mon Sep 21 14:38:56 2015 -0700

--
 .../src/it/java/org/apache/phoenix/pherf/DataIngestIT.java   | 3 ++-
 .../src/test/resources/datamodel/test_schema_mt_view.sql | 1 -
 phoenix-pherf/src/test/resources/scenario/test_scenario.xml  | 4 +++-
 3 files changed, 5 insertions(+), 3 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/phoenix/blob/98dc849e/phoenix-pherf/src/it/java/org/apache/phoenix/pherf/DataIngestIT.java
--
diff --git 
a/phoenix-pherf/src/it/java/org/apache/phoenix/pherf/DataIngestIT.java 
b/phoenix-pherf/src/it/java/org/apache/phoenix/pherf/DataIngestIT.java
index f2a1a07..f301dec 100644
--- a/phoenix-pherf/src/it/java/org/apache/phoenix/pherf/DataIngestIT.java
+++ b/phoenix-pherf/src/it/java/org/apache/phoenix/pherf/DataIngestIT.java
@@ -74,7 +74,7 @@ public class DataIngestIT extends ResultBaseTestIT {
 WorkloadExecutor executor = new WorkloadExecutor();
 executor.add(loader);
 executor.get();
-
+
 RulesApplier rulesApplier = loader.getRulesApplier();
 List modelList = rulesApplier.getModelList();
 assertTrue("Could not generate the modelList", modelList.size() > 
0);
@@ -101,6 +101,7 @@ public class DataIngestIT extends ResultBaseTestIT {
 Workload query = new QueryExecutor(parser, util, executor);
 executor.add(query);
 executor.get();
+executor.shutdown();
 
 } catch (Exception e) {
 fail("We had an exception: " + e.getMessage());

http://git-wip-us.apache.org/repos/asf/phoenix/blob/98dc849e/phoenix-pherf/src/test/resources/datamodel/test_schema_mt_view.sql
--
diff --git a/phoenix-pherf/src/test/resources/datamodel/test_schema_mt_view.sql 
b/phoenix-pherf/src/test/resources/datamodel/test_schema_mt_view.sql
deleted file mode 100644
index 5f5d7ec..000
--- a/phoenix-pherf/src/test/resources/datamodel/test_schema_mt_view.sql
+++ /dev/null
@@ -1 +0,0 @@
-CREATE VIEW IF NOT EXISTS PHERF.TEST_VIEW (field1 VARCHAR, field2 VARCHAR) AS 
SELECT * FROM PHERF.TEST_MULTI_TENANT_TABLE
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/phoenix/blob/98dc849e/phoenix-pherf/src/test/resources/scenario/test_scenario.xml
--
diff --git a/phoenix-pherf/src/test/resources/scenario/test_scenario.xml 
b/phoenix-pherf/src/test/resources/scenario/test_scenario.xml
index 50a603e..f23e71a 100644
--- a/phoenix-pherf/src/test/resources/scenario/test_scenario.xml
+++ b/phoenix-pherf/src/test/resources/scenario/test_scenario.xml
@@ -228,7 +228,9 @@
  the tablename attribute. This assumes the tenant specific view 
has been created. To 
  dynamically create the view see comments below with regard to the 
ddl attribute. 
 -->
-
+

phoenix git commit: PHOENIX-2280 - Fix failing unit test in Pherf

2015-09-21 Thread mujtaba 
Repository: phoenix
Updated Branches:
  refs/heads/4.5-HBase-1.1 dc594854f -> 9f4e19536


PHOENIX-2280 - Fix failing unit test in Pherf


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

Branch: refs/heads/4.5-HBase-1.1
Commit: 9f4e19536b0f009490e6f87b80d4cec5bcb52a78
Parents: dc59485
Author: Mujtaba 
Authored: Mon Sep 21 14:40:50 2015 -0700
Committer: Mujtaba 
Committed: Mon Sep 21 14:40:50 2015 -0700

--
 .../org/apache/phoenix/pherf/DataIngestIT.java|  3 ++-
 .../resources/datamodel/test_schema_mt_view.sql   | 18 --
 .../src/test/resources/scenario/test_scenario.xml |  4 +++-
 3 files changed, 5 insertions(+), 20 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/phoenix/blob/9f4e1953/phoenix-pherf/src/it/java/org/apache/phoenix/pherf/DataIngestIT.java
--
diff --git 
a/phoenix-pherf/src/it/java/org/apache/phoenix/pherf/DataIngestIT.java 
b/phoenix-pherf/src/it/java/org/apache/phoenix/pherf/DataIngestIT.java
index f2a1a07..f301dec 100644
--- a/phoenix-pherf/src/it/java/org/apache/phoenix/pherf/DataIngestIT.java
+++ b/phoenix-pherf/src/it/java/org/apache/phoenix/pherf/DataIngestIT.java
@@ -74,7 +74,7 @@ public class DataIngestIT extends ResultBaseTestIT {
 WorkloadExecutor executor = new WorkloadExecutor();
 executor.add(loader);
 executor.get();
-
+
 RulesApplier rulesApplier = loader.getRulesApplier();
 List modelList = rulesApplier.getModelList();
 assertTrue("Could not generate the modelList", modelList.size() > 
0);
@@ -101,6 +101,7 @@ public class DataIngestIT extends ResultBaseTestIT {
 Workload query = new QueryExecutor(parser, util, executor);
 executor.add(query);
 executor.get();
+executor.shutdown();
 
 } catch (Exception e) {
 fail("We had an exception: " + e.getMessage());

http://git-wip-us.apache.org/repos/asf/phoenix/blob/9f4e1953/phoenix-pherf/src/test/resources/datamodel/test_schema_mt_view.sql
--
diff --git a/phoenix-pherf/src/test/resources/datamodel/test_schema_mt_view.sql 
b/phoenix-pherf/src/test/resources/datamodel/test_schema_mt_view.sql
deleted file mode 100644
index 26549fd..000
--- a/phoenix-pherf/src/test/resources/datamodel/test_schema_mt_view.sql
+++ /dev/null
@@ -1,18 +0,0 @@
-/*
-  -- 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.
-*/
-CREATE VIEW IF NOT EXISTS PHERF.TEST_VIEW (field1 VARCHAR, field2 VARCHAR) AS 
SELECT * FROM PHERF.TEST_MULTI_TENANT_TABLE

http://git-wip-us.apache.org/repos/asf/phoenix/blob/9f4e1953/phoenix-pherf/src/test/resources/scenario/test_scenario.xml
--
diff --git a/phoenix-pherf/src/test/resources/scenario/test_scenario.xml 
b/phoenix-pherf/src/test/resources/scenario/test_scenario.xml
index 50a603e..f23e71a 100644
--- a/phoenix-pherf/src/test/resources/scenario/test_scenario.xml
+++ b/phoenix-pherf/src/test/resources/scenario/test_scenario.xml
@@ -228,7 +228,9 @@
  the tablename attribute. This assumes the tenant specific view 
has been created. To 
  dynamically create the view see comments below with regard to the 
ddl attribute. 
 -->
-
+

phoenix git commit: PHOENIX-2280 - Fix failing unit test in Pherf

2015-09-21 Thread mujtaba 
Repository: phoenix
Updated Branches:
  refs/heads/4.5-HBase-1.0 f7253eee6 -> 0229ff0c2


PHOENIX-2280 - Fix failing unit test in Pherf


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

Branch: refs/heads/4.5-HBase-1.0
Commit: 0229ff0c23f80f7f55d41606a68224cc26bbcbd5
Parents: f7253ee
Author: Mujtaba 
Authored: Mon Sep 21 14:40:35 2015 -0700
Committer: Mujtaba 
Committed: Mon Sep 21 14:40:35 2015 -0700

--
 .../org/apache/phoenix/pherf/DataIngestIT.java|  3 ++-
 .../resources/datamodel/test_schema_mt_view.sql   | 18 --
 .../src/test/resources/scenario/test_scenario.xml |  4 +++-
 3 files changed, 5 insertions(+), 20 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/phoenix/blob/0229ff0c/phoenix-pherf/src/it/java/org/apache/phoenix/pherf/DataIngestIT.java
--
diff --git 
a/phoenix-pherf/src/it/java/org/apache/phoenix/pherf/DataIngestIT.java 
b/phoenix-pherf/src/it/java/org/apache/phoenix/pherf/DataIngestIT.java
index f2a1a07..f301dec 100644
--- a/phoenix-pherf/src/it/java/org/apache/phoenix/pherf/DataIngestIT.java
+++ b/phoenix-pherf/src/it/java/org/apache/phoenix/pherf/DataIngestIT.java
@@ -74,7 +74,7 @@ public class DataIngestIT extends ResultBaseTestIT {
 WorkloadExecutor executor = new WorkloadExecutor();
 executor.add(loader);
 executor.get();
-
+
 RulesApplier rulesApplier = loader.getRulesApplier();
 List modelList = rulesApplier.getModelList();
 assertTrue("Could not generate the modelList", modelList.size() > 
0);
@@ -101,6 +101,7 @@ public class DataIngestIT extends ResultBaseTestIT {
 Workload query = new QueryExecutor(parser, util, executor);
 executor.add(query);
 executor.get();
+executor.shutdown();
 
 } catch (Exception e) {
 fail("We had an exception: " + e.getMessage());

http://git-wip-us.apache.org/repos/asf/phoenix/blob/0229ff0c/phoenix-pherf/src/test/resources/datamodel/test_schema_mt_view.sql
--
diff --git a/phoenix-pherf/src/test/resources/datamodel/test_schema_mt_view.sql 
b/phoenix-pherf/src/test/resources/datamodel/test_schema_mt_view.sql
deleted file mode 100644
index 26549fd..000
--- a/phoenix-pherf/src/test/resources/datamodel/test_schema_mt_view.sql
+++ /dev/null
@@ -1,18 +0,0 @@
-/*
-  -- 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.
-*/
-CREATE VIEW IF NOT EXISTS PHERF.TEST_VIEW (field1 VARCHAR, field2 VARCHAR) AS 
SELECT * FROM PHERF.TEST_MULTI_TENANT_TABLE

http://git-wip-us.apache.org/repos/asf/phoenix/blob/0229ff0c/phoenix-pherf/src/test/resources/scenario/test_scenario.xml
--
diff --git a/phoenix-pherf/src/test/resources/scenario/test_scenario.xml 
b/phoenix-pherf/src/test/resources/scenario/test_scenario.xml
index 50a603e..f23e71a 100644
--- a/phoenix-pherf/src/test/resources/scenario/test_scenario.xml
+++ b/phoenix-pherf/src/test/resources/scenario/test_scenario.xml
@@ -228,7 +228,9 @@
  the tablename attribute. This assumes the tenant specific view 
has been created. To 
  dynamically create the view see comments below with regard to the 
ddl attribute. 
 -->
-
+

phoenix git commit: PHOENIX-2280 - Fix failing unit test in Pherf

2015-09-21 Thread mujtaba 
Repository: phoenix
Updated Branches:
  refs/heads/4.5-HBase-0.98 98b01546f -> 6bb958f88


PHOENIX-2280 - Fix failing unit test in Pherf


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

Branch: refs/heads/4.5-HBase-0.98
Commit: 6bb958f88ca76889269f066e814591d6fa43d7fb
Parents: 98b0154
Author: Mujtaba 
Authored: Mon Sep 21 14:40:07 2015 -0700
Committer: Mujtaba 
Committed: Mon Sep 21 14:40:07 2015 -0700

--
 .../org/apache/phoenix/pherf/DataIngestIT.java|  3 ++-
 .../resources/datamodel/test_schema_mt_view.sql   | 18 --
 .../src/test/resources/scenario/test_scenario.xml |  4 +++-
 3 files changed, 5 insertions(+), 20 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/phoenix/blob/6bb958f8/phoenix-pherf/src/it/java/org/apache/phoenix/pherf/DataIngestIT.java
--
diff --git 
a/phoenix-pherf/src/it/java/org/apache/phoenix/pherf/DataIngestIT.java 
b/phoenix-pherf/src/it/java/org/apache/phoenix/pherf/DataIngestIT.java
index f2a1a07..f301dec 100644
--- a/phoenix-pherf/src/it/java/org/apache/phoenix/pherf/DataIngestIT.java
+++ b/phoenix-pherf/src/it/java/org/apache/phoenix/pherf/DataIngestIT.java
@@ -74,7 +74,7 @@ public class DataIngestIT extends ResultBaseTestIT {
 WorkloadExecutor executor = new WorkloadExecutor();
 executor.add(loader);
 executor.get();
-
+
 RulesApplier rulesApplier = loader.getRulesApplier();
 List modelList = rulesApplier.getModelList();
 assertTrue("Could not generate the modelList", modelList.size() > 
0);
@@ -101,6 +101,7 @@ public class DataIngestIT extends ResultBaseTestIT {
 Workload query = new QueryExecutor(parser, util, executor);
 executor.add(query);
 executor.get();
+executor.shutdown();
 
 } catch (Exception e) {
 fail("We had an exception: " + e.getMessage());

http://git-wip-us.apache.org/repos/asf/phoenix/blob/6bb958f8/phoenix-pherf/src/test/resources/datamodel/test_schema_mt_view.sql
--
diff --git a/phoenix-pherf/src/test/resources/datamodel/test_schema_mt_view.sql 
b/phoenix-pherf/src/test/resources/datamodel/test_schema_mt_view.sql
deleted file mode 100644
index 26549fd..000
--- a/phoenix-pherf/src/test/resources/datamodel/test_schema_mt_view.sql
+++ /dev/null
@@ -1,18 +0,0 @@
-/*
-  -- 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.
-*/
-CREATE VIEW IF NOT EXISTS PHERF.TEST_VIEW (field1 VARCHAR, field2 VARCHAR) AS 
SELECT * FROM PHERF.TEST_MULTI_TENANT_TABLE

http://git-wip-us.apache.org/repos/asf/phoenix/blob/6bb958f8/phoenix-pherf/src/test/resources/scenario/test_scenario.xml
--
diff --git a/phoenix-pherf/src/test/resources/scenario/test_scenario.xml 
b/phoenix-pherf/src/test/resources/scenario/test_scenario.xml
index 50a603e..f23e71a 100644
--- a/phoenix-pherf/src/test/resources/scenario/test_scenario.xml
+++ b/phoenix-pherf/src/test/resources/scenario/test_scenario.xml
@@ -228,7 +228,9 @@
  the tablename attribute. This assumes the tenant specific view 
has been created. To 
  dynamically create the view see comments below with regard to the 
ddl attribute. 
 -->
-
+