Repository: phoenix Updated Branches: refs/heads/4.x-HBase-1.0 f4257c6a5 -> 9a71114d8
PHOENIX-2510 ReserveNSequence opens new connection per invocation (Siddhi Mehta) Project: http://git-wip-us.apache.org/repos/asf/phoenix/repo Commit: http://git-wip-us.apache.org/repos/asf/phoenix/commit/9a71114d Tree: http://git-wip-us.apache.org/repos/asf/phoenix/tree/9a71114d Diff: http://git-wip-us.apache.org/repos/asf/phoenix/diff/9a71114d Branch: refs/heads/4.x-HBase-1.0 Commit: 9a71114d8f16c597ae3407e9f24c414d24165809 Parents: f4257c6 Author: James Taylor <jamestay...@apache.org> Authored: Tue Dec 15 14:06:14 2015 -0800 Committer: James Taylor <jamestay...@apache.org> Committed: Tue Dec 15 14:10:15 2015 -0800 ---------------------------------------------------------------------- .../org/apache/phoenix/pig/udf/ReserveNSequenceTestIT.java | 2 ++ .../java/org/apache/phoenix/pig/udf/ReserveNSequence.java | 9 --------- 2 files changed, 2 insertions(+), 9 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/phoenix/blob/9a71114d/phoenix-pig/src/it/java/org/apache/phoenix/pig/udf/ReserveNSequenceTestIT.java ---------------------------------------------------------------------- diff --git a/phoenix-pig/src/it/java/org/apache/phoenix/pig/udf/ReserveNSequenceTestIT.java b/phoenix-pig/src/it/java/org/apache/phoenix/pig/udf/ReserveNSequenceTestIT.java index 30ce132..98f46f0 100644 --- a/phoenix-pig/src/it/java/org/apache/phoenix/pig/udf/ReserveNSequenceTestIT.java +++ b/phoenix-pig/src/it/java/org/apache/phoenix/pig/udf/ReserveNSequenceTestIT.java @@ -193,6 +193,8 @@ public class ReserveNSequenceTestIT extends BasePigIT { ReserveNSequence udf = new ReserveNSequence(zkQuorum, tenantId); result = udf.exec(tuple); validateReservedSequence(conn, props.getCurrentValue(), props.getNumToReserve(), result); + // Calling this to cleanup for the udf. To close the connection + udf.finish(); } catch (Exception e) { if (props.isExceptionExpected()) { assertEquals(props.getExceptionClass(), e.getClass()); http://git-wip-us.apache.org/repos/asf/phoenix/blob/9a71114d/phoenix-pig/src/main/java/org/apache/phoenix/pig/udf/ReserveNSequence.java ---------------------------------------------------------------------- diff --git a/phoenix-pig/src/main/java/org/apache/phoenix/pig/udf/ReserveNSequence.java b/phoenix-pig/src/main/java/org/apache/phoenix/pig/udf/ReserveNSequence.java index 6187d5e..eaf4e91 100644 --- a/phoenix-pig/src/main/java/org/apache/phoenix/pig/udf/ReserveNSequence.java +++ b/phoenix-pig/src/main/java/org/apache/phoenix/pig/udf/ReserveNSequence.java @@ -77,7 +77,6 @@ public class ReserveNSequence extends EvalFunc<Long> { } ResultSet rs = null; try { - connection = ConnectionUtil.getOutputConnection(configuration); String sql = getNextNSequenceSelectStatement(Long.valueOf(numToReserve), sequenceName); rs = connection.createStatement().executeQuery(sql); Preconditions.checkArgument(rs.next()); @@ -87,14 +86,6 @@ public class ReserveNSequence extends EvalFunc<Long> { return startIndex; } catch (SQLException e) { throw new IOException("Caught exception while processing row." + e.getMessage(), e); - } finally { - try { - if (connection != null) { - connection.close(); - } - } catch (SQLException e) { - throw new IOException("Caught exception while closing connection", e); - } } }
