Repository: phoenix Updated Branches: refs/heads/4.x-HBase-0.98 d42dc5b20 -> 418bb9837
PHOENIX-1939 Test are failing with DoNotRetryIOException: ATABLE: null (Alicia Ying Shu) Project: http://git-wip-us.apache.org/repos/asf/phoenix/repo Commit: http://git-wip-us.apache.org/repos/asf/phoenix/commit/418bb983 Tree: http://git-wip-us.apache.org/repos/asf/phoenix/tree/418bb983 Diff: http://git-wip-us.apache.org/repos/asf/phoenix/diff/418bb983 Branch: refs/heads/4.x-HBase-0.98 Commit: 418bb983755a27f8f0158acf2111cc15a3b5544c Parents: d42dc5b Author: Nick Dimiduk <[email protected]> Authored: Fri May 29 17:26:01 2015 -0700 Committer: Nick Dimiduk <[email protected]> Committed: Fri May 29 17:26:01 2015 -0700 ---------------------------------------------------------------------- .../src/main/java/org/apache/phoenix/schema/PTableImpl.java | 4 ++-- .../src/test/java/org/apache/phoenix/query/BaseTest.java | 2 ++ 2 files changed, 4 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/phoenix/blob/418bb983/phoenix-core/src/main/java/org/apache/phoenix/schema/PTableImpl.java ---------------------------------------------------------------------- diff --git a/phoenix-core/src/main/java/org/apache/phoenix/schema/PTableImpl.java b/phoenix-core/src/main/java/org/apache/phoenix/schema/PTableImpl.java index 0616f45..5dc59e0 100644 --- a/phoenix-core/src/main/java/org/apache/phoenix/schema/PTableImpl.java +++ b/phoenix-core/src/main/java/org/apache/phoenix/schema/PTableImpl.java @@ -88,8 +88,8 @@ public class PTableImpl implements PTable { private PTableKey key; private PName name; - private PName schemaName; - private PName tableName; + private PName schemaName = PName.EMPTY_NAME; + private PName tableName = PName.EMPTY_NAME; private PName tenantId; private PTableType type; private PIndexState state; http://git-wip-us.apache.org/repos/asf/phoenix/blob/418bb983/phoenix-core/src/test/java/org/apache/phoenix/query/BaseTest.java ---------------------------------------------------------------------- diff --git a/phoenix-core/src/test/java/org/apache/phoenix/query/BaseTest.java b/phoenix-core/src/test/java/org/apache/phoenix/query/BaseTest.java index cd337d9..03b7381 100644 --- a/phoenix-core/src/test/java/org/apache/phoenix/query/BaseTest.java +++ b/phoenix-core/src/test/java/org/apache/phoenix/query/BaseTest.java @@ -828,6 +828,7 @@ public abstract class BaseTest { logger.info("Table " + fullTableName + " is already deleted."); } } + rs.close(); if (lastTenantId != null) { conn.close(); } @@ -859,6 +860,7 @@ public abstract class BaseTest { logger.info("DROP SEQUENCE STATEMENT: DROP SEQUENCE " + SchemaUtil.getEscapedTableName(rs.getString(2), rs.getString(3))); conn.createStatement().execute("DROP SEQUENCE " + SchemaUtil.getEscapedTableName(rs.getString(2), rs.getString(3))); } + rs.close(); } protected static void initSumDoubleValues(byte[][] splits, String url) throws Exception {
