You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@phoenix.apache.org by ja...@apache.org on 2015/12/15 23:07:05 UTC

phoenix git commit: PHOENIX-2510 ReserveNSequence opens new connection per invocation (Siddhi Mehta)

Repository: phoenix
Updated Branches:
  refs/heads/master e6eb77121 -> 6b85406cb


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/6b85406c
Tree: http://git-wip-us.apache.org/repos/asf/phoenix/tree/6b85406c
Diff: http://git-wip-us.apache.org/repos/asf/phoenix/diff/6b85406c

Branch: refs/heads/master
Commit: 6b85406cb098632259fb45add562d3ced282cfcf
Parents: e6eb771
Author: James Taylor <ja...@apache.org>
Authored: Tue Dec 15 14:06:14 2015 -0800
Committer: James Taylor <ja...@apache.org>
Committed: Tue Dec 15 14:06:51 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/6b85406c/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/6b85406c/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);
-            }
         }
     }