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 <mujt...@apache.org> Authored: Mon Sep 21 14:38:56 2015 -0700 Committer: Mujtaba <mujt...@apache.org> 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<Map> 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..0000000 --- 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. --> - <scenario tableName="PHERF.TEST_VIEW" tenantId="abcdefghijklmno" rowCount="100" name="testMTWriteScenario"> + <scenario tableName="PHERF.TEST_VIEW" tenantId="xyzdefghijklmno" + ddl="CREATE VIEW IF NOT EXISTS PHERF.TEST_VIEW (field1 VARCHAR, field2 VARCHAR) AS SELECT * FROM PHERF.TEST_MULTI_TENANT_TABLE" + rowCount="100" name="testMTWriteScenario"> </scenario> <!-- Scenario level DDL that is dynamically executed before the Write Workload is run. This pattern is really useful when you want to write data to multi-tenant view and the tenant id is
