Repository: phoenix Updated Branches: refs/heads/4.8-HBase-0.98 fbd41f9dc -> cf6c4f7c4
PHOENIX-3497 Addendum: re-enable table so that test clean up doesn't break Project: http://git-wip-us.apache.org/repos/asf/phoenix/repo Commit: http://git-wip-us.apache.org/repos/asf/phoenix/commit/cf6c4f7c Tree: http://git-wip-us.apache.org/repos/asf/phoenix/tree/cf6c4f7c Diff: http://git-wip-us.apache.org/repos/asf/phoenix/diff/cf6c4f7c Branch: refs/heads/4.8-HBase-0.98 Commit: cf6c4f7c44ac64ada9e61385c4b10ef00e06b014 Parents: fbd41f9 Author: Samarth <[email protected]> Authored: Fri Nov 18 08:33:56 2016 -0800 Committer: Samarth <[email protected]> Committed: Fri Nov 18 08:33:56 2016 -0800 ---------------------------------------------------------------------- .../org/apache/phoenix/end2end/AlterTableIT.java | 19 +++++++++++-------- 1 file changed, 11 insertions(+), 8 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/phoenix/blob/cf6c4f7c/phoenix-core/src/it/java/org/apache/phoenix/end2end/AlterTableIT.java ---------------------------------------------------------------------- diff --git a/phoenix-core/src/it/java/org/apache/phoenix/end2end/AlterTableIT.java b/phoenix-core/src/it/java/org/apache/phoenix/end2end/AlterTableIT.java index 7b3fc47..8614a69 100644 --- a/phoenix-core/src/it/java/org/apache/phoenix/end2end/AlterTableIT.java +++ b/phoenix-core/src/it/java/org/apache/phoenix/end2end/AlterTableIT.java @@ -2225,16 +2225,19 @@ public class AlterTableIT extends BaseOwnClusterHBaseManagedTimeIT { conn.createStatement().execute( "CREATE TABLE " + tableName + " (k1 VARCHAR NOT NULL, k2 VARCHAR, CONSTRAINT PK PRIMARY KEY(K1,K2)) "); + try (HBaseAdmin admin = conn.unwrap(PhoenixConnection.class).getQueryServices().getAdmin()) { admin.disableTable(Bytes.toBytes(tableName)); - } - String query = "SELECT * FROM " + tableName + " WHERE 1=1"; - try (Connection conn2 = DriverManager.getConnection(getUrl())) { - try (ResultSet rs = conn2.createStatement().executeQuery(query)) { - assertFalse(rs.next()); - fail(); - } catch (PhoenixIOException ioe) { - assertTrue(ioe.getCause() instanceof TableNotEnabledException); + String query = "SELECT * FROM " + tableName + " WHERE 1=1"; + try (Connection conn2 = DriverManager.getConnection(getUrl())) { + try (ResultSet rs = conn2.createStatement().executeQuery(query)) { + assertFalse(rs.next()); + fail(); + } catch (PhoenixIOException ioe) { + assertTrue(ioe.getCause() instanceof TableNotEnabledException); + } + } finally { + admin.enableTable(Bytes.toBytes(tableName)); } } }
