Repository: phoenix Updated Branches: refs/heads/4.x-HBase-1.0 35b7776e7 -> 8d003ad64
PHOENIX-2109 - Joda time version conflict between phoenix and pherf Project: http://git-wip-us.apache.org/repos/asf/phoenix/repo Commit: http://git-wip-us.apache.org/repos/asf/phoenix/commit/8d003ad6 Tree: http://git-wip-us.apache.org/repos/asf/phoenix/tree/8d003ad6 Diff: http://git-wip-us.apache.org/repos/asf/phoenix/diff/8d003ad6 Branch: refs/heads/4.x-HBase-1.0 Commit: 8d003ad6465b39fea8e09cee97703601d5a57503 Parents: 35b7776 Author: Cody Marcel <cody.mar...@gmail.com> Authored: Mon Jul 13 14:32:28 2015 -0700 Committer: Cody Marcel <cody.mar...@gmail.com> Committed: Mon Jul 13 14:32:28 2015 -0700 ---------------------------------------------------------------------- phoenix-pherf/pom.xml | 2 +- .../src/it/java/org/apache/phoenix/pherf/DataIngestIT.java | 8 ++++++++ 2 files changed, 9 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/phoenix/blob/8d003ad6/phoenix-pherf/pom.xml ---------------------------------------------------------------------- diff --git a/phoenix-pherf/pom.xml b/phoenix-pherf/pom.xml index 577ace9..f3482eb 100644 --- a/phoenix-pherf/pom.xml +++ b/phoenix-pherf/pom.xml @@ -219,7 +219,7 @@ <dependency> <groupId>joda-time</groupId> <artifactId>joda-time</artifactId> - <version>1.6.2</version> + <version>${jodatime.version}</version> </dependency> <dependency> <groupId>com.googlecode.java-diff-utils</groupId> http://git-wip-us.apache.org/repos/asf/phoenix/blob/8d003ad6/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 828ac38..8a340b3 100644 --- a/phoenix-pherf/src/it/java/org/apache/phoenix/pherf/DataIngestIT.java +++ b/phoenix-pherf/src/it/java/org/apache/phoenix/pherf/DataIngestIT.java @@ -27,6 +27,7 @@ import org.apache.phoenix.pherf.configuration.Scenario; import org.apache.phoenix.pherf.rules.DataValue; import org.apache.phoenix.pherf.rules.RulesApplier; import org.apache.phoenix.pherf.workload.QueryExecutor; +import org.apache.phoenix.pherf.workload.Workload; import org.apache.phoenix.pherf.workload.WorkloadExecutor; import org.apache.phoenix.pherf.workload.WriteWorkload; import org.junit.Before; @@ -68,6 +69,7 @@ public class DataIngestIT extends ResultBaseTestIT { WriteWorkload loader = new WriteWorkload(util, parser, scenario); WorkloadExecutor executor = new WorkloadExecutor(); executor.add(loader); + executor.get(); RulesApplier rulesApplier = loader.getRulesApplier(); List<Map> modelList = rulesApplier.getModelList(); @@ -90,6 +92,12 @@ public class DataIngestIT extends ResultBaseTestIT { data.getDistribution() == Integer.MIN_VALUE); } } + + // Run some queries + Workload query = new QueryExecutor(parser, util, executor.getPool()); + executor.add(query); + executor.get(); + } catch (Exception e) { fail("We had an exception: " + e.getMessage()); }
