Repository: phoenix Updated Branches: refs/heads/4.5-HBase-1.0 0229ff0c2 -> 8e37ad182
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/8e37ad18 Tree: http://git-wip-us.apache.org/repos/asf/phoenix/tree/8e37ad18 Diff: http://git-wip-us.apache.org/repos/asf/phoenix/diff/8e37ad18 Branch: refs/heads/4.5-HBase-1.0 Commit: 8e37ad1824054a953fdc848a7f54692fbd946327 Parents: 0229ff0 Author: Mujtaba <mujt...@apache.org> Authored: Tue Sep 22 11:07:51 2015 -0700 Committer: Mujtaba <mujt...@apache.org> Committed: Tue Sep 22 11:07:51 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/8e37ad18/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 f301dec..6c2823c 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 @@ -33,6 +33,7 @@ import java.util.Map; 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; @@ -40,6 +41,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; @@ -74,6 +76,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(); @@ -98,11 +101,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()); }
