Repository: phoenix Updated Branches: refs/heads/4.x-HBase-1.0 ff4e4a4d6 -> c51c9fac6
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/c51c9fac Tree: http://git-wip-us.apache.org/repos/asf/phoenix/tree/c51c9fac Diff: http://git-wip-us.apache.org/repos/asf/phoenix/diff/c51c9fac Branch: refs/heads/4.x-HBase-1.0 Commit: c51c9fac670cbb1c8850aa4433928171d2b06648 Parents: ff4e4a4 Author: Mujtaba <mujt...@apache.org> Authored: Tue Sep 22 11:16:35 2015 -0700 Committer: Mujtaba <mujt...@apache.org> Committed: Tue Sep 22 11:16:35 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/c51c9fac/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 1fece61..8f33c85 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,12 +33,14 @@ import java.util.Map; import com.jcabi.jdbc.JdbcSession; import com.jcabi.jdbc.Outcome; + import org.apache.phoenix.pherf.configuration.Column; import org.apache.phoenix.pherf.configuration.DataModel; 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; @@ -73,6 +75,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(); @@ -97,11 +100,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()); }