Repository: phoenix Updated Branches: refs/heads/4.x-HBase-0.98 1856a1bdc -> 284c30f69
PHOENIX-2280 - Fix failing unit test in Pherf (addendum) Project: http://git-wip-us.apache.org/repos/asf/phoenix/repo Commit: http://git-wip-us.apache.org/repos/asf/phoenix/commit/284c30f6 Tree: http://git-wip-us.apache.org/repos/asf/phoenix/tree/284c30f6 Diff: http://git-wip-us.apache.org/repos/asf/phoenix/diff/284c30f6 Branch: refs/heads/4.x-HBase-0.98 Commit: 284c30f69faf591b77e0a5797548f186cabc03c3 Parents: 1856a1b Author: Mujtaba <[email protected]> Authored: Tue Sep 22 11:08:44 2015 -0700 Committer: Mujtaba <[email protected]> Committed: Tue Sep 22 11:08:44 2015 -0700 ---------------------------------------------------------------------- .../src/it/java/org/apache/phoenix/pherf/DataIngestIT.java | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/phoenix/blob/284c30f6/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 13f9c63..4ac3be0 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 @@ -20,6 +20,7 @@ package org.apache.phoenix.pherf; import com.jcabi.jdbc.JdbcSession; import com.jcabi.jdbc.Outcome; + import org.apache.phoenix.pherf.PherfConstants.GeneratePhoenixStats; import org.apache.phoenix.pherf.configuration.Column; import org.apache.phoenix.pherf.configuration.DataModel; @@ -27,6 +28,7 @@ import org.apache.phoenix.pherf.configuration.DataTypeMapping; 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.util.PhoenixUtil; import org.apache.phoenix.pherf.workload.QueryExecutor; import org.apache.phoenix.pherf.workload.Workload; import org.apache.phoenix.pherf.workload.WorkloadExecutor; @@ -72,6 +74,7 @@ public class DataIngestIT extends ResultBaseTestIT { WorkloadExecutor executor = new WorkloadExecutor(); executor.add(loader); executor.get(); + executor.shutdown(); RulesApplier rulesApplier = loader.getRulesApplier(); List<Map> modelList = rulesApplier.getModelList(); @@ -96,11 +99,12 @@ public class DataIngestIT extends ResultBaseTestIT { } // Run some queries + executor = new WorkloadExecutor(); Workload query = new QueryExecutor(parser, util, executor); executor.add(query); executor.get(); executor.shutdown(); - + PhoenixUtil.create().deleteTables("ALL"); } catch (Exception e) { fail("We had an exception: " + e.getMessage()); }
