Repository: hive Updated Branches: refs/heads/master 05c0c7047 -> f33db1f68
HIVE-18671: Workload management Action parser does not generate the correct pool path (Harish Jaiprakash reviewed by Prasanth Jayachandran) Project: http://git-wip-us.apache.org/repos/asf/hive/repo Commit: http://git-wip-us.apache.org/repos/asf/hive/commit/f33db1f6 Tree: http://git-wip-us.apache.org/repos/asf/hive/tree/f33db1f6 Diff: http://git-wip-us.apache.org/repos/asf/hive/diff/f33db1f6 Branch: refs/heads/master Commit: f33db1f68c68b552b9888988f818c03879749461 Parents: 05c0c70 Author: Prasanth Jayachandran <[email protected]> Authored: Mon Feb 5 21:47:28 2018 -0800 Committer: Prasanth Jayachandran <[email protected]> Committed: Mon Feb 5 21:47:28 2018 -0800 ---------------------------------------------------------------------- ql/src/java/org/apache/hadoop/hive/ql/wm/Action.java | 2 +- ql/src/test/org/apache/hadoop/hive/ql/wm/TestTrigger.java | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hive/blob/f33db1f6/ql/src/java/org/apache/hadoop/hive/ql/wm/Action.java ---------------------------------------------------------------------- diff --git a/ql/src/java/org/apache/hadoop/hive/ql/wm/Action.java b/ql/src/java/org/apache/hadoop/hive/ql/wm/Action.java index 7258ad5..1e54449 100644 --- a/ql/src/java/org/apache/hadoop/hive/ql/wm/Action.java +++ b/ql/src/java/org/apache/hadoop/hive/ql/wm/Action.java @@ -79,7 +79,7 @@ public class Action { Tree poolNode = node.getChild(0); StringBuilder poolPath = new StringBuilder(poolNode.getText()); for (int i = 0; i < poolNode.getChildCount(); ++i) { - poolPath.append(poolNode.getChild(0).getText()); + poolPath.append(poolNode.getChild(i).getText()); } return new Action(Type.MOVE_TO_POOL, poolPath.toString()); } http://git-wip-us.apache.org/repos/asf/hive/blob/f33db1f6/ql/src/test/org/apache/hadoop/hive/ql/wm/TestTrigger.java ---------------------------------------------------------------------- diff --git a/ql/src/test/org/apache/hadoop/hive/ql/wm/TestTrigger.java b/ql/src/test/org/apache/hadoop/hive/ql/wm/TestTrigger.java index c5748f5..55b4ced 100644 --- a/ql/src/test/org/apache/hadoop/hive/ql/wm/TestTrigger.java +++ b/ql/src/test/org/apache/hadoop/hive/ql/wm/TestTrigger.java @@ -307,6 +307,8 @@ public class TestTrigger { public void testActionFromMetastoreStr() { assertEquals(Action.Type.KILL_QUERY, Action.fromMetastoreExpression("KILL").getType()); assertEquals(Action.Type.MOVE_TO_POOL, Action.fromMetastoreExpression("MOVE TO bi").getType()); + assertEquals("bi", Action.fromMetastoreExpression("MOVE TO bi").getPoolName()); + assertEquals("bi.c1.c2", Action.fromMetastoreExpression("MOVE TO bi.c1.c2").getPoolName()); assertEquals("MOVE TO etl", Action.fromMetastoreExpression("MOVE TO etl").toString()); thrown.expect(IllegalArgumentException.class);
