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

2015-08-23 Thread maryannxue 
PHOENIX-1791. Adding ability for Pherf Write Workloads to write to a 
multi-tenant view.


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

Branch: refs/heads/calcite
Commit: c811cf68752b91585fc9c12741f3be005fefbe2f
Parents: 60500f2
Author: Jan jferna...@salesforce.com
Authored: Thu Aug 6 11:12:52 2015 -0700
Committer: Cody Marcel cody.mar...@gmail.com
Committed: Mon Aug 10 10:02:18 2015 -0700

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


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

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

2015-08-11 Thread jamestaylor 
PHOENIX-1791. Adding ability for Pherf Write Workloads to write to a 
multi-tenant view.


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

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

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


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

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

2015-08-11 Thread jamestaylor 
PHOENIX-1791. Adding ability for Pherf Write Workloads to write to a 
multi-tenant view.


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

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

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


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

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

2015-08-10 Thread codymarcel 
Repository: phoenix
Updated Branches:
  refs/heads/4.5-HBase-0.98 26ba0159e - e9d8c01c8


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


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

Branch: refs/heads/4.5-HBase-0.98
Commit: e9d8c01c8141a2f402bd8466ebb71ed5418a1638
Parents: 26ba015
Author: Jan jferna...@salesforce.com
Authored: Thu Aug 6 11:12:52 2015 -0700
Committer: Cody Marcel cody.mar...@gmail.com
Committed: Mon Aug 10 11:16:34 2015 -0700

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


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

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

2015-08-10 Thread codymarcel 
Repository: phoenix
Updated Branches:
  refs/heads/4.4-HBase-1.1 1b9c7ea9a - 3718da181


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


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

Branch: refs/heads/4.4-HBase-1.1
Commit: 3718da18195dc4b5d35cd8e9b0f1b8a6b488faec
Parents: 1b9c7ea
Author: Jan jferna...@salesforce.com
Authored: Thu Aug 6 11:12:52 2015 -0700
Committer: Cody Marcel cody.mar...@gmail.com
Committed: Mon Aug 10 10:39:56 2015 -0700

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


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

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

2015-08-10 Thread codymarcel 
Repository: phoenix
Updated Branches:
  refs/heads/4.5-HBase-1.0 083998f15 - d21ee23ed


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


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

Branch: refs/heads/4.5-HBase-1.0
Commit: d21ee23ed80b333c98d3a3e7117c6d4e23a4c4d5
Parents: 083998f
Author: Jan jferna...@salesforce.com
Authored: Thu Aug 6 11:12:52 2015 -0700
Committer: Cody Marcel cody.mar...@gmail.com
Committed: Mon Aug 10 11:19:21 2015 -0700

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


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

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

2015-08-10 Thread codymarcel 
Repository: phoenix
Updated Branches:
  refs/heads/4.4-HBase-1.0 ea349f083 - 94e095083


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


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

Branch: refs/heads/4.4-HBase-1.0
Commit: 94e095083714e244d03c048b7f8409eaf725eb92
Parents: ea349f0
Author: Jan jferna...@salesforce.com
Authored: Thu Aug 6 11:12:52 2015 -0700
Committer: Cody Marcel cody.mar...@gmail.com
Committed: Mon Aug 10 10:37:45 2015 -0700

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


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

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

2015-08-10 Thread codymarcel 
Repository: phoenix
Updated Branches:
  refs/heads/4.5-HBase-1.1 b7cd7e505 - 93bd2c33c


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


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

Branch: refs/heads/4.5-HBase-1.1
Commit: 93bd2c33ccfa9fca0d6f52a76d7e3c4d14637109
Parents: b7cd7e5
Author: Jan jferna...@salesforce.com
Authored: Thu Aug 6 11:12:52 2015 -0700
Committer: Cody Marcel cody.mar...@gmail.com
Committed: Mon Aug 10 11:22:46 2015 -0700

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


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

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

2015-08-10 Thread codymarcel 
Repository: phoenix
Updated Branches:
  refs/heads/master 60500f253 - c811cf687


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


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

Branch: refs/heads/master
Commit: c811cf68752b91585fc9c12741f3be005fefbe2f
Parents: 60500f2
Author: Jan jferna...@salesforce.com
Authored: Thu Aug 6 11:12:52 2015 -0700
Committer: Cody Marcel cody.mar...@gmail.com
Committed: Mon Aug 10 10:02:18 2015 -0700

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


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