Repository: hive Updated Branches: refs/heads/master ed92b154c -> ed38decb2
Revert "HIVE-17834: Fix flaky triggers test (Prasanth Jayachandran reviewed by Sergey Shelukhin)" This reverts commit d6dd543b2ee982c48f0f7b44e019d268ba084213. Project: http://git-wip-us.apache.org/repos/asf/hive/repo Commit: http://git-wip-us.apache.org/repos/asf/hive/commit/ed38decb Tree: http://git-wip-us.apache.org/repos/asf/hive/tree/ed38decb Diff: http://git-wip-us.apache.org/repos/asf/hive/diff/ed38decb Branch: refs/heads/master Commit: ed38decb2fad04ea49f1de4e905bba058c692428 Parents: ed92b15 Author: Prasanth Jayachandran <prasan...@apache.org> Authored: Mon Oct 30 11:19:53 2017 -0700 Committer: Prasanth Jayachandran <prasan...@apache.org> Committed: Mon Oct 30 11:19:53 2017 -0700 ---------------------------------------------------------------------- .../hive/jdbc/TestTriggersTezSessionPoolManager.java | 14 +++----------- 1 file changed, 3 insertions(+), 11 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hive/blob/ed38decb/itests/hive-unit/src/test/java/org/apache/hive/jdbc/TestTriggersTezSessionPoolManager.java ---------------------------------------------------------------------- diff --git a/itests/hive-unit/src/test/java/org/apache/hive/jdbc/TestTriggersTezSessionPoolManager.java b/itests/hive-unit/src/test/java/org/apache/hive/jdbc/TestTriggersTezSessionPoolManager.java index c195243..aeca663 100644 --- a/itests/hive-unit/src/test/java/org/apache/hive/jdbc/TestTriggersTezSessionPoolManager.java +++ b/itests/hive-unit/src/test/java/org/apache/hive/jdbc/TestTriggersTezSessionPoolManager.java @@ -138,17 +138,9 @@ public class TestTriggersTezSessionPoolManager { Expression expression = ExpressionFactory.fromString("SHUFFLE_BYTES > 100"); Trigger trigger = new ExecutionTrigger("big_shuffle", expression, Trigger.Action.KILL_QUERY); setupTriggers(Lists.newArrayList(trigger)); - List<String> setCmds = new ArrayList<>(); - // reducer phase starts only after 75% of mappers - // this will start 15 tasks, shuffle starts after 11 tasks - setCmds.add("set hive.exec.dynamic.partition.mode=nonstrict"); - setCmds.add("set mapred.min.split.size=400"); - setCmds.add("set mapred.max.split.size=400"); - setCmds.add("set tez.grouping.min-size=400"); - setCmds.add("set tez.grouping.max-size=400"); - String query = "select t1.under_col, t1.value from " + tableName + " t1 join " + tableName + - " t2 on t1.under_col>=t2.under_col order by t1.under_col"; - runQueryWithTrigger(query, setCmds, trigger + " violated"); + String query = "select sleep(t1.under_col, 5), t1.value from " + tableName + " t1 join " + tableName + + " t2 on t1.under_col>=t2.under_col"; + runQueryWithTrigger(query, null, "Query was cancelled"); } @Test(timeout = 60000)
