You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@phoenix.apache.org by co...@apache.org on 2015/07/13 23:24:17 UTC
phoenix git commit: PHOENIX-2109 - Joda time version conflict between
phoenix and pherf
Repository: phoenix
Updated Branches:
refs/heads/master 70c542d8e -> a772a4a0c
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/a772a4a0
Tree: http://git-wip-us.apache.org/repos/asf/phoenix/tree/a772a4a0
Diff: http://git-wip-us.apache.org/repos/asf/phoenix/diff/a772a4a0
Branch: refs/heads/master
Commit: a772a4a0ca3c9ac98335ce2148eb2b34d3ce1369
Parents: 70c542d
Author: Cody Marcel <co...@gmail.com>
Authored: Mon Jul 13 14:23:53 2015 -0700
Committer: Cody Marcel <co...@gmail.com>
Committed: Mon Jul 13 14:23:53 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/a772a4a0/phoenix-pherf/pom.xml
----------------------------------------------------------------------
diff --git a/phoenix-pherf/pom.xml b/phoenix-pherf/pom.xml
index 0facbde..4d27305 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/a772a4a0/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());
}