Revert "PHOENIX-3497 Provide a work around for HBASE-17122"
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..e09dcea 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
@@ -42,7 +42,6 @@
import org.apache.hadoop.hbase.HColumnDescriptor;
import org.apache.hadoop.hbase.HTableDescriptor;
import org.apache.hadoop.hbase.KeepDeletedCells;
-import org.apache.hadoop.hbase.TableNotEnabledException;
import org.apache.hadoop.hbase.client.HBaseAdmin;
import org.apache.hadoop.hbase.client.HTable;
import org.apache.hadoop.hbase.client.Result;
@@ -50,7 +49,6 @@
import org.apache.hadoop.hbase.client.Scan;
import org.apache.hadoop.hbase.util.Bytes;
import org.apache.phoenix.coprocessor.MetaDataProtocol;
-import org.apache.phoenix.exception.PhoenixIOException;
import org.apache.phoenix.exception.SQLExceptionCode;
import org.apache.phoenix.jdbc.PhoenixConnection;
import org.apache.phoenix.jdbc.PhoenixDatabaseMetaData;
@@ -2218,27 +2216,5 @@
}
}
- @Test
- public void testQueryingDisabledTable() throws Exception {
- try (Connection conn = DriverManager.getConnection(getUrl())) {
- String tableName = generateRandomString();
- 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);
- }
- }
- }
- }
-
}
diff --git a/phoenix-core/src/main/java/org/apache/phoenix/iterate/BaseResultIterators.java b/phoenix-core/src/main/java/org/apache/phoenix/iterate/BaseResultIterators.java
index 3bb6463..581e0cd 100644
--- a/phoenix-core/src/main/java/org/apache/phoenix/iterate/BaseResultIterators.java
+++ b/phoenix-core/src/main/java/org/apache/phoenix/iterate/BaseResultIterators.java
@@ -52,8 +52,6 @@
import org.apache.hadoop.hbase.HRegionInfo;
import org.apache.hadoop.hbase.HRegionLocation;
import org.apache.hadoop.hbase.TableName;
-import org.apache.hadoop.hbase.TableNotEnabledException;
-import org.apache.hadoop.hbase.client.HBaseAdmin;
import org.apache.hadoop.hbase.client.Scan;
import org.apache.hadoop.hbase.filter.FirstKeyOnlyFilter;
import org.apache.hadoop.hbase.filter.PageFilter;
@@ -779,20 +777,6 @@
try { // Rethrow as SQLException
throw ServerUtil.parseServerException(e);
} catch (StaleRegionBoundaryCacheException e2) {
- /*
- * Note that a StaleRegionBoundaryCacheException could be thrown in multiple scenarios including splits, region
- * moves, table disabled, etc. See ServerUtil.parseServerException() for details.
- * Because of HBASE-17122 we need to explicitly check whether this exception is being
- * thrown because the table was disabled or because a split happened. This obviously is a HACK.
- * With older versions of HBase we were correctly thrown a TableNotEnabledException so this
- * kind of hackery wasn't needed.
- * TODO: remove this once HBASE-17122 is fixed.
- */
- try (HBaseAdmin admin = context.getConnection().getQueryServices().getAdmin()) {
- if (admin.isTableDisabled(physicalTableName)) {
- throw new TableNotEnabledException(physicalTableName);
- }
- }
scanPairItr.remove();
// Catch only to try to recover from region boundary cache being out of date
if (!clearedCache) { // Clear cache once so that we rejigger job based on new boundaries
diff --git a/phoenix-core/src/main/java/org/apache/phoenix/util/ServerUtil.java b/phoenix-core/src/main/java/org/apache/phoenix/util/ServerUtil.java
index 024ab90..a3940fc 100644
--- a/phoenix-core/src/main/java/org/apache/phoenix/util/ServerUtil.java
+++ b/phoenix-core/src/main/java/org/apache/phoenix/util/ServerUtil.java
@@ -115,11 +115,6 @@
public static SQLException parseServerExceptionOrNull(Throwable t) {
while (t.getCause() != null) {
- /*
- * Note that a NotServingRegionException could be thrown in multiple scenarios including splits, region
- * move, table disabled, etc. This is a hack and is meant to address the buggy behavior introduced in HBase
- * 0.98.21 and beyond. See HBASE-17122 for details.
- */
if (t instanceof NotServingRegionException) {
return parseRemoteException(new StaleRegionBoundaryCacheException());
}
