[10/28] phoenix git commit: Revert "PHOENIX-4971 Drop index will execute successfully using Incorrect name of parent tables"
Revert "PHOENIX-4971 Drop index will execute successfully using Incorrect name of parent tables" This reverts commit 7b5482367eb010b5b2db285ff8bc4b345863c477. Project: http://git-wip-us.apache.org/repos/asf/phoenix/repo Commit: http://git-wip-us.apache.org/repos/asf/phoenix/commit/1da0ad70 Tree: http://git-wip-us.apache.org/repos/asf/phoenix/tree/1da0ad70 Diff: http://git-wip-us.apache.org/repos/asf/phoenix/diff/1da0ad70 Branch: refs/heads/4.x-cdh5.15 Commit: 1da0ad70ee2d0c904d3d210c0f7584f03c102303 Parents: 1767244 Author: Thomas D'Silva Authored: Wed Nov 7 19:09:31 2018 + Committer: Pedro Boado Committed: Tue Nov 27 15:11:26 2018 + -- .../phoenix/end2end/index/DropMetadataIT.java | 24 +--- .../phoenix/exception/SQLExceptionCode.java | 2 -- .../apache/phoenix/schema/MetaDataClient.java | 15 3 files changed, 1 insertion(+), 40 deletions(-) -- http://git-wip-us.apache.org/repos/asf/phoenix/blob/1da0ad70/phoenix-core/src/it/java/org/apache/phoenix/end2end/index/DropMetadataIT.java -- diff --git a/phoenix-core/src/it/java/org/apache/phoenix/end2end/index/DropMetadataIT.java b/phoenix-core/src/it/java/org/apache/phoenix/end2end/index/DropMetadataIT.java index a285526..b92ed8d 100644 --- a/phoenix-core/src/it/java/org/apache/phoenix/end2end/index/DropMetadataIT.java +++ b/phoenix-core/src/it/java/org/apache/phoenix/end2end/index/DropMetadataIT.java @@ -18,13 +18,9 @@ package org.apache.phoenix.end2end.index; import static org.apache.phoenix.util.TestUtil.HBASE_NATIVE_SCHEMA_NAME; -import static org.junit.Assert.assertTrue; -import static org.junit.Assert.fail; import java.sql.Connection; import java.sql.DriverManager; -import java.sql.SQLException; - import java.util.Properties; import org.apache.hadoop.hbase.HColumnDescriptor; @@ -33,7 +29,6 @@ import org.apache.hadoop.hbase.client.HBaseAdmin; import org.apache.hadoop.hbase.io.encoding.DataBlockEncoding; import org.apache.hadoop.hbase.util.Bytes; import org.apache.phoenix.end2end.ParallelStatsDisabledIT; -import org.apache.phoenix.exception.SQLExceptionCode; import org.apache.phoenix.jdbc.PhoenixConnection; import org.apache.phoenix.query.QueryServices; import org.apache.phoenix.util.PropertiesUtil; @@ -61,24 +56,7 @@ public class DropMetadataIT extends ParallelStatsDisabledIT { String url = QueryUtil.getConnectionUrl(props, config, PRINCIPAL); return DriverManager.getConnection(url, props); } - -@Test -public void testDropIndexTableHasSameNameWithDataTable() { -String tableName = generateUniqueName(); -String indexName = "IDX_" + tableName; -try (Connection conn = DriverManager.getConnection(getUrl())) { -String createTable = "CREATE TABLE " + tableName + " (id varchar not null primary key, col integer)"; -conn.createStatement().execute(createTable); -String createIndex = "CREATE INDEX " + indexName + " on " + tableName + "(col)"; -conn.createStatement().execute(createIndex); -String dropIndex = "DROP INDEX " + indexName + " on " + indexName; -conn.createStatement().execute(dropIndex); -fail("should not execute successfully"); -} catch (SQLException e) { -assertTrue(SQLExceptionCode.PARENT_TABLE_NOT_FOUND.getErrorCode() == e.getErrorCode()); -} -} - + @Test public void testDropViewKeepsHTable() throws Exception { Connection conn = getConnection(); http://git-wip-us.apache.org/repos/asf/phoenix/blob/1da0ad70/phoenix-core/src/main/java/org/apache/phoenix/exception/SQLExceptionCode.java -- diff --git a/phoenix-core/src/main/java/org/apache/phoenix/exception/SQLExceptionCode.java b/phoenix-core/src/main/java/org/apache/phoenix/exception/SQLExceptionCode.java index 5bffed5..d557714 100644 --- a/phoenix-core/src/main/java/org/apache/phoenix/exception/SQLExceptionCode.java +++ b/phoenix-core/src/main/java/org/apache/phoenix/exception/SQLExceptionCode.java @@ -185,8 +185,6 @@ public enum SQLExceptionCode { INVALID_REPLAY_AT(533, "42910", "Value of REPLAY_AT cannot be less than zero."), UNEQUAL_SCN_AND_BUILD_INDEX_AT(534, "42911", "If both specified, values of CURRENT_SCN and BUILD_INDEX_AT must be equal."), ONLY_INDEX_UPDATABLE_AT_SCN(535, "42912", "Only an index may be updated when the BUILD_INDEX_AT property is specified"), - PARENT_TABLE_NOT_FOUND(536, "42913", "Can't drop the index because the parent table in the DROP statement is incorrect."), - /** * HBase and Phoenix specific implementation defined sub-classes. * Column family related exceptions. http://git-wip-us.apach
[18/22] phoenix git commit: Revert "PHOENIX-4971 Drop index will execute successfully using Incorrect name of parent tables"
Revert "PHOENIX-4971 Drop index will execute successfully using Incorrect name of parent tables" This reverts commit 527098ed621d62ba18fc19099ec67d8b29e027f4. Project: http://git-wip-us.apache.org/repos/asf/phoenix/repo Commit: http://git-wip-us.apache.org/repos/asf/phoenix/commit/fd7ae940 Tree: http://git-wip-us.apache.org/repos/asf/phoenix/tree/fd7ae940 Diff: http://git-wip-us.apache.org/repos/asf/phoenix/diff/fd7ae940 Branch: refs/heads/omid2 Commit: fd7ae94065ae33f1bb20bca60b7756595f8b10b9 Parents: d6083ae Author: Thomas D'Silva Authored: Wed Nov 7 11:10:05 2018 -0800 Committer: Thomas D'Silva Committed: Wed Nov 7 11:10:05 2018 -0800 -- .../phoenix/end2end/index/DropMetadataIT.java | 23 +--- .../phoenix/exception/SQLExceptionCode.java | 2 -- .../apache/phoenix/schema/MetaDataClient.java | 15 - 3 files changed, 1 insertion(+), 39 deletions(-) -- http://git-wip-us.apache.org/repos/asf/phoenix/blob/fd7ae940/phoenix-core/src/it/java/org/apache/phoenix/end2end/index/DropMetadataIT.java -- diff --git a/phoenix-core/src/it/java/org/apache/phoenix/end2end/index/DropMetadataIT.java b/phoenix-core/src/it/java/org/apache/phoenix/end2end/index/DropMetadataIT.java index 3c670c5..b92ed8d 100644 --- a/phoenix-core/src/it/java/org/apache/phoenix/end2end/index/DropMetadataIT.java +++ b/phoenix-core/src/it/java/org/apache/phoenix/end2end/index/DropMetadataIT.java @@ -18,12 +18,9 @@ package org.apache.phoenix.end2end.index; import static org.apache.phoenix.util.TestUtil.HBASE_NATIVE_SCHEMA_NAME; -import static org.junit.Assert.assertTrue; -import static org.junit.Assert.fail; import java.sql.Connection; import java.sql.DriverManager; -import java.sql.SQLException; import java.util.Properties; import org.apache.hadoop.hbase.HColumnDescriptor; @@ -32,7 +29,6 @@ import org.apache.hadoop.hbase.client.HBaseAdmin; import org.apache.hadoop.hbase.io.encoding.DataBlockEncoding; import org.apache.hadoop.hbase.util.Bytes; import org.apache.phoenix.end2end.ParallelStatsDisabledIT; -import org.apache.phoenix.exception.SQLExceptionCode; import org.apache.phoenix.jdbc.PhoenixConnection; import org.apache.phoenix.query.QueryServices; import org.apache.phoenix.util.PropertiesUtil; @@ -60,24 +56,7 @@ public class DropMetadataIT extends ParallelStatsDisabledIT { String url = QueryUtil.getConnectionUrl(props, config, PRINCIPAL); return DriverManager.getConnection(url, props); } - -@Test -public void testDropIndexTableHasSameNameWithDataTable() { -String tableName = generateUniqueName(); -String indexName = "IDX_" + tableName; -try (Connection conn = DriverManager.getConnection(getUrl())) { -String createTable = "CREATE TABLE " + tableName + " (id varchar not null primary key, col integer)"; -conn.createStatement().execute(createTable); -String createIndex = "CREATE INDEX " + indexName + " on " + tableName + "(col)"; -conn.createStatement().execute(createIndex); -String dropIndex = "DROP INDEX " + indexName + " on " + indexName; -conn.createStatement().execute(dropIndex); -fail("should not execute successfully"); -} catch (SQLException e) { -assertTrue(SQLExceptionCode.PARENT_TABLE_NOT_FOUND.getErrorCode() == e.getErrorCode()); -} -} - + @Test public void testDropViewKeepsHTable() throws Exception { Connection conn = getConnection(); http://git-wip-us.apache.org/repos/asf/phoenix/blob/fd7ae940/phoenix-core/src/main/java/org/apache/phoenix/exception/SQLExceptionCode.java -- diff --git a/phoenix-core/src/main/java/org/apache/phoenix/exception/SQLExceptionCode.java b/phoenix-core/src/main/java/org/apache/phoenix/exception/SQLExceptionCode.java index 5bffed5..d557714 100644 --- a/phoenix-core/src/main/java/org/apache/phoenix/exception/SQLExceptionCode.java +++ b/phoenix-core/src/main/java/org/apache/phoenix/exception/SQLExceptionCode.java @@ -185,8 +185,6 @@ public enum SQLExceptionCode { INVALID_REPLAY_AT(533, "42910", "Value of REPLAY_AT cannot be less than zero."), UNEQUAL_SCN_AND_BUILD_INDEX_AT(534, "42911", "If both specified, values of CURRENT_SCN and BUILD_INDEX_AT must be equal."), ONLY_INDEX_UPDATABLE_AT_SCN(535, "42912", "Only an index may be updated when the BUILD_INDEX_AT property is specified"), - PARENT_TABLE_NOT_FOUND(536, "42913", "Can't drop the index because the parent table in the DROP statement is incorrect."), - /** * HBase and Phoenix specific implementation defined sub-classes. * Column family related exceptions. http://git-wip-us.apache.org
phoenix git commit: Revert "PHOENIX-4971 Drop index will execute successfully using Incorrect name of parent tables"
Repository: phoenix Updated Branches: refs/heads/4.x-HBase-1.4 ee8db198a -> 131ff09b2 Revert "PHOENIX-4971 Drop index will execute successfully using Incorrect name of parent tables" This reverts commit 7b7e4d4b286fa9a7bb857ea7ff3cd3bb3812eaf5. Project: http://git-wip-us.apache.org/repos/asf/phoenix/repo Commit: http://git-wip-us.apache.org/repos/asf/phoenix/commit/131ff09b Tree: http://git-wip-us.apache.org/repos/asf/phoenix/tree/131ff09b Diff: http://git-wip-us.apache.org/repos/asf/phoenix/diff/131ff09b Branch: refs/heads/4.x-HBase-1.4 Commit: 131ff09b23032c1b5271b49050c7eacd63ef5a34 Parents: ee8db19 Author: Thomas D'Silva Authored: Wed Nov 7 11:10:46 2018 -0800 Committer: Thomas D'Silva Committed: Wed Nov 7 11:10:46 2018 -0800 -- .../phoenix/end2end/index/DropMetadataIT.java | 24 +--- .../phoenix/exception/SQLExceptionCode.java | 2 -- .../apache/phoenix/schema/MetaDataClient.java | 15 3 files changed, 1 insertion(+), 40 deletions(-) -- http://git-wip-us.apache.org/repos/asf/phoenix/blob/131ff09b/phoenix-core/src/it/java/org/apache/phoenix/end2end/index/DropMetadataIT.java -- diff --git a/phoenix-core/src/it/java/org/apache/phoenix/end2end/index/DropMetadataIT.java b/phoenix-core/src/it/java/org/apache/phoenix/end2end/index/DropMetadataIT.java index 44eddfb..b92ed8d 100644 --- a/phoenix-core/src/it/java/org/apache/phoenix/end2end/index/DropMetadataIT.java +++ b/phoenix-core/src/it/java/org/apache/phoenix/end2end/index/DropMetadataIT.java @@ -18,12 +18,9 @@ package org.apache.phoenix.end2end.index; import static org.apache.phoenix.util.TestUtil.HBASE_NATIVE_SCHEMA_NAME; -import static org.junit.Assert.assertTrue; -import static org.junit.Assert.fail; import java.sql.Connection; import java.sql.DriverManager; -import java.sql.SQLException; import java.util.Properties; import org.apache.hadoop.hbase.HColumnDescriptor; @@ -32,7 +29,6 @@ import org.apache.hadoop.hbase.client.HBaseAdmin; import org.apache.hadoop.hbase.io.encoding.DataBlockEncoding; import org.apache.hadoop.hbase.util.Bytes; import org.apache.phoenix.end2end.ParallelStatsDisabledIT; -import org.apache.phoenix.exception.SQLExceptionCode; import org.apache.phoenix.jdbc.PhoenixConnection; import org.apache.phoenix.query.QueryServices; import org.apache.phoenix.util.PropertiesUtil; @@ -40,7 +36,6 @@ import org.apache.phoenix.util.QueryUtil; import org.apache.phoenix.util.SchemaUtil; import org.apache.phoenix.util.StringUtil; import org.apache.phoenix.util.TestUtil; - import org.junit.Test; public class DropMetadataIT extends ParallelStatsDisabledIT { @@ -61,24 +56,7 @@ public class DropMetadataIT extends ParallelStatsDisabledIT { String url = QueryUtil.getConnectionUrl(props, config, PRINCIPAL); return DriverManager.getConnection(url, props); } - -@Test -public void testDropIndexTableHasSameNameWithDataTable() { -String tableName = generateUniqueName(); -String indexName = "IDX_" + tableName; -try (Connection conn = DriverManager.getConnection(getUrl())) { -String createTable = "CREATE TABLE " + tableName + " (id varchar not null primary key, col integer)"; -conn.createStatement().execute(createTable); -String createIndex = "CREATE INDEX " + indexName + " on " + tableName + "(col)"; -conn.createStatement().execute(createIndex); -String dropIndex = "DROP INDEX " + indexName + " on " + indexName; -conn.createStatement().execute(dropIndex); -fail("should not execute successfully"); -} catch (SQLException e) { -assertTrue(SQLExceptionCode.PARENT_TABLE_NOT_FOUND.getErrorCode() == e.getErrorCode()); -} -} - + @Test public void testDropViewKeepsHTable() throws Exception { Connection conn = getConnection(); http://git-wip-us.apache.org/repos/asf/phoenix/blob/131ff09b/phoenix-core/src/main/java/org/apache/phoenix/exception/SQLExceptionCode.java -- diff --git a/phoenix-core/src/main/java/org/apache/phoenix/exception/SQLExceptionCode.java b/phoenix-core/src/main/java/org/apache/phoenix/exception/SQLExceptionCode.java index 5bffed5..d557714 100644 --- a/phoenix-core/src/main/java/org/apache/phoenix/exception/SQLExceptionCode.java +++ b/phoenix-core/src/main/java/org/apache/phoenix/exception/SQLExceptionCode.java @@ -185,8 +185,6 @@ public enum SQLExceptionCode { INVALID_REPLAY_AT(533, "42910", "Value of REPLAY_AT cannot be less than zero."), UNEQUAL_SCN_AND_BUILD_INDEX_AT(534, "42911", "If both specified, values of CURRENT_SCN and BUILD_INDEX_AT must be equal."), ONLY_INDEX_UPDATABLE_AT_SCN(
phoenix git commit: Revert "PHOENIX-4971 Drop index will execute successfully using Incorrect name of parent tables"
Repository: phoenix Updated Branches: refs/heads/4.x-HBase-1.3 d6083ae5c -> fd7ae9406 Revert "PHOENIX-4971 Drop index will execute successfully using Incorrect name of parent tables" This reverts commit 527098ed621d62ba18fc19099ec67d8b29e027f4. Project: http://git-wip-us.apache.org/repos/asf/phoenix/repo Commit: http://git-wip-us.apache.org/repos/asf/phoenix/commit/fd7ae940 Tree: http://git-wip-us.apache.org/repos/asf/phoenix/tree/fd7ae940 Diff: http://git-wip-us.apache.org/repos/asf/phoenix/diff/fd7ae940 Branch: refs/heads/4.x-HBase-1.3 Commit: fd7ae94065ae33f1bb20bca60b7756595f8b10b9 Parents: d6083ae Author: Thomas D'Silva Authored: Wed Nov 7 11:10:05 2018 -0800 Committer: Thomas D'Silva Committed: Wed Nov 7 11:10:05 2018 -0800 -- .../phoenix/end2end/index/DropMetadataIT.java | 23 +--- .../phoenix/exception/SQLExceptionCode.java | 2 -- .../apache/phoenix/schema/MetaDataClient.java | 15 - 3 files changed, 1 insertion(+), 39 deletions(-) -- http://git-wip-us.apache.org/repos/asf/phoenix/blob/fd7ae940/phoenix-core/src/it/java/org/apache/phoenix/end2end/index/DropMetadataIT.java -- diff --git a/phoenix-core/src/it/java/org/apache/phoenix/end2end/index/DropMetadataIT.java b/phoenix-core/src/it/java/org/apache/phoenix/end2end/index/DropMetadataIT.java index 3c670c5..b92ed8d 100644 --- a/phoenix-core/src/it/java/org/apache/phoenix/end2end/index/DropMetadataIT.java +++ b/phoenix-core/src/it/java/org/apache/phoenix/end2end/index/DropMetadataIT.java @@ -18,12 +18,9 @@ package org.apache.phoenix.end2end.index; import static org.apache.phoenix.util.TestUtil.HBASE_NATIVE_SCHEMA_NAME; -import static org.junit.Assert.assertTrue; -import static org.junit.Assert.fail; import java.sql.Connection; import java.sql.DriverManager; -import java.sql.SQLException; import java.util.Properties; import org.apache.hadoop.hbase.HColumnDescriptor; @@ -32,7 +29,6 @@ import org.apache.hadoop.hbase.client.HBaseAdmin; import org.apache.hadoop.hbase.io.encoding.DataBlockEncoding; import org.apache.hadoop.hbase.util.Bytes; import org.apache.phoenix.end2end.ParallelStatsDisabledIT; -import org.apache.phoenix.exception.SQLExceptionCode; import org.apache.phoenix.jdbc.PhoenixConnection; import org.apache.phoenix.query.QueryServices; import org.apache.phoenix.util.PropertiesUtil; @@ -60,24 +56,7 @@ public class DropMetadataIT extends ParallelStatsDisabledIT { String url = QueryUtil.getConnectionUrl(props, config, PRINCIPAL); return DriverManager.getConnection(url, props); } - -@Test -public void testDropIndexTableHasSameNameWithDataTable() { -String tableName = generateUniqueName(); -String indexName = "IDX_" + tableName; -try (Connection conn = DriverManager.getConnection(getUrl())) { -String createTable = "CREATE TABLE " + tableName + " (id varchar not null primary key, col integer)"; -conn.createStatement().execute(createTable); -String createIndex = "CREATE INDEX " + indexName + " on " + tableName + "(col)"; -conn.createStatement().execute(createIndex); -String dropIndex = "DROP INDEX " + indexName + " on " + indexName; -conn.createStatement().execute(dropIndex); -fail("should not execute successfully"); -} catch (SQLException e) { -assertTrue(SQLExceptionCode.PARENT_TABLE_NOT_FOUND.getErrorCode() == e.getErrorCode()); -} -} - + @Test public void testDropViewKeepsHTable() throws Exception { Connection conn = getConnection(); http://git-wip-us.apache.org/repos/asf/phoenix/blob/fd7ae940/phoenix-core/src/main/java/org/apache/phoenix/exception/SQLExceptionCode.java -- diff --git a/phoenix-core/src/main/java/org/apache/phoenix/exception/SQLExceptionCode.java b/phoenix-core/src/main/java/org/apache/phoenix/exception/SQLExceptionCode.java index 5bffed5..d557714 100644 --- a/phoenix-core/src/main/java/org/apache/phoenix/exception/SQLExceptionCode.java +++ b/phoenix-core/src/main/java/org/apache/phoenix/exception/SQLExceptionCode.java @@ -185,8 +185,6 @@ public enum SQLExceptionCode { INVALID_REPLAY_AT(533, "42910", "Value of REPLAY_AT cannot be less than zero."), UNEQUAL_SCN_AND_BUILD_INDEX_AT(534, "42911", "If both specified, values of CURRENT_SCN and BUILD_INDEX_AT must be equal."), ONLY_INDEX_UPDATABLE_AT_SCN(535, "42912", "Only an index may be updated when the BUILD_INDEX_AT property is specified"), - PARENT_TABLE_NOT_FOUND(536, "42913", "Can't drop the index because the parent table in the DROP statement is incorrect."), - /** * HBase and Phoenix specific implement
phoenix git commit: Revert "PHOENIX-4971 Drop index will execute successfully using Incorrect name of parent tables"
Repository: phoenix Updated Branches: refs/heads/4.x-HBase-1.2 02a6bbce5 -> dad5f6202 Revert "PHOENIX-4971 Drop index will execute successfully using Incorrect name of parent tables" This reverts commit 7b5482367eb010b5b2db285ff8bc4b345863c477. Project: http://git-wip-us.apache.org/repos/asf/phoenix/repo Commit: http://git-wip-us.apache.org/repos/asf/phoenix/commit/dad5f620 Tree: http://git-wip-us.apache.org/repos/asf/phoenix/tree/dad5f620 Diff: http://git-wip-us.apache.org/repos/asf/phoenix/diff/dad5f620 Branch: refs/heads/4.x-HBase-1.2 Commit: dad5f6202a6bbc269ca21caa17eff48d24120c96 Parents: 02a6bbc Author: Thomas D'Silva Authored: Wed Nov 7 11:09:31 2018 -0800 Committer: Thomas D'Silva Committed: Wed Nov 7 11:09:31 2018 -0800 -- .../phoenix/end2end/index/DropMetadataIT.java | 24 +--- .../phoenix/exception/SQLExceptionCode.java | 2 -- .../apache/phoenix/schema/MetaDataClient.java | 15 3 files changed, 1 insertion(+), 40 deletions(-) -- http://git-wip-us.apache.org/repos/asf/phoenix/blob/dad5f620/phoenix-core/src/it/java/org/apache/phoenix/end2end/index/DropMetadataIT.java -- diff --git a/phoenix-core/src/it/java/org/apache/phoenix/end2end/index/DropMetadataIT.java b/phoenix-core/src/it/java/org/apache/phoenix/end2end/index/DropMetadataIT.java index a285526..b92ed8d 100644 --- a/phoenix-core/src/it/java/org/apache/phoenix/end2end/index/DropMetadataIT.java +++ b/phoenix-core/src/it/java/org/apache/phoenix/end2end/index/DropMetadataIT.java @@ -18,13 +18,9 @@ package org.apache.phoenix.end2end.index; import static org.apache.phoenix.util.TestUtil.HBASE_NATIVE_SCHEMA_NAME; -import static org.junit.Assert.assertTrue; -import static org.junit.Assert.fail; import java.sql.Connection; import java.sql.DriverManager; -import java.sql.SQLException; - import java.util.Properties; import org.apache.hadoop.hbase.HColumnDescriptor; @@ -33,7 +29,6 @@ import org.apache.hadoop.hbase.client.HBaseAdmin; import org.apache.hadoop.hbase.io.encoding.DataBlockEncoding; import org.apache.hadoop.hbase.util.Bytes; import org.apache.phoenix.end2end.ParallelStatsDisabledIT; -import org.apache.phoenix.exception.SQLExceptionCode; import org.apache.phoenix.jdbc.PhoenixConnection; import org.apache.phoenix.query.QueryServices; import org.apache.phoenix.util.PropertiesUtil; @@ -61,24 +56,7 @@ public class DropMetadataIT extends ParallelStatsDisabledIT { String url = QueryUtil.getConnectionUrl(props, config, PRINCIPAL); return DriverManager.getConnection(url, props); } - -@Test -public void testDropIndexTableHasSameNameWithDataTable() { -String tableName = generateUniqueName(); -String indexName = "IDX_" + tableName; -try (Connection conn = DriverManager.getConnection(getUrl())) { -String createTable = "CREATE TABLE " + tableName + " (id varchar not null primary key, col integer)"; -conn.createStatement().execute(createTable); -String createIndex = "CREATE INDEX " + indexName + " on " + tableName + "(col)"; -conn.createStatement().execute(createIndex); -String dropIndex = "DROP INDEX " + indexName + " on " + indexName; -conn.createStatement().execute(dropIndex); -fail("should not execute successfully"); -} catch (SQLException e) { -assertTrue(SQLExceptionCode.PARENT_TABLE_NOT_FOUND.getErrorCode() == e.getErrorCode()); -} -} - + @Test public void testDropViewKeepsHTable() throws Exception { Connection conn = getConnection(); http://git-wip-us.apache.org/repos/asf/phoenix/blob/dad5f620/phoenix-core/src/main/java/org/apache/phoenix/exception/SQLExceptionCode.java -- diff --git a/phoenix-core/src/main/java/org/apache/phoenix/exception/SQLExceptionCode.java b/phoenix-core/src/main/java/org/apache/phoenix/exception/SQLExceptionCode.java index 5bffed5..d557714 100644 --- a/phoenix-core/src/main/java/org/apache/phoenix/exception/SQLExceptionCode.java +++ b/phoenix-core/src/main/java/org/apache/phoenix/exception/SQLExceptionCode.java @@ -185,8 +185,6 @@ public enum SQLExceptionCode { INVALID_REPLAY_AT(533, "42910", "Value of REPLAY_AT cannot be less than zero."), UNEQUAL_SCN_AND_BUILD_INDEX_AT(534, "42911", "If both specified, values of CURRENT_SCN and BUILD_INDEX_AT must be equal."), ONLY_INDEX_UPDATABLE_AT_SCN(535, "42912", "Only an index may be updated when the BUILD_INDEX_AT property is specified"), - PARENT_TABLE_NOT_FOUND(536, "42913", "Can't drop the index because the parent table in the DROP statement is incorrect."), - /** * HBase and Phoenix specific implemen
phoenix git commit: Revert "PHOENIX-4971 Drop index will execute successfully using Incorrect name of parent tables"
Repository: phoenix Updated Branches: refs/heads/master 11cc13b04 -> 0e1984f2f Revert "PHOENIX-4971 Drop index will execute successfully using Incorrect name of parent tables" This reverts commit a524596a778c5ba27d0227b39ab8e343392e5ac0. Project: http://git-wip-us.apache.org/repos/asf/phoenix/repo Commit: http://git-wip-us.apache.org/repos/asf/phoenix/commit/0e1984f2 Tree: http://git-wip-us.apache.org/repos/asf/phoenix/tree/0e1984f2 Diff: http://git-wip-us.apache.org/repos/asf/phoenix/diff/0e1984f2 Branch: refs/heads/master Commit: 0e1984f2fbc5f492cc98a16ea226d3a572420cef Parents: 11cc13b Author: Thomas D'Silva Authored: Wed Nov 7 11:08:11 2018 -0800 Committer: Thomas D'Silva Committed: Wed Nov 7 11:08:11 2018 -0800 -- .../phoenix/end2end/index/DropMetadataIT.java | 23 +--- .../phoenix/exception/SQLExceptionCode.java | 2 -- .../apache/phoenix/schema/MetaDataClient.java | 15 - 3 files changed, 1 insertion(+), 39 deletions(-) -- http://git-wip-us.apache.org/repos/asf/phoenix/blob/0e1984f2/phoenix-core/src/it/java/org/apache/phoenix/end2end/index/DropMetadataIT.java -- diff --git a/phoenix-core/src/it/java/org/apache/phoenix/end2end/index/DropMetadataIT.java b/phoenix-core/src/it/java/org/apache/phoenix/end2end/index/DropMetadataIT.java index d945e43..71a9f00 100644 --- a/phoenix-core/src/it/java/org/apache/phoenix/end2end/index/DropMetadataIT.java +++ b/phoenix-core/src/it/java/org/apache/phoenix/end2end/index/DropMetadataIT.java @@ -18,12 +18,9 @@ package org.apache.phoenix.end2end.index; import static org.apache.phoenix.util.TestUtil.HBASE_NATIVE_SCHEMA_NAME; -import static org.junit.Assert.assertTrue; -import static org.junit.Assert.fail; import java.sql.Connection; import java.sql.DriverManager; -import java.sql.SQLException; import java.util.Properties; import org.apache.hadoop.hbase.KeepDeletedCells; @@ -35,7 +32,6 @@ import org.apache.hadoop.hbase.client.TableDescriptorBuilder; import org.apache.hadoop.hbase.io.encoding.DataBlockEncoding; import org.apache.hadoop.hbase.util.Bytes; import org.apache.phoenix.end2end.ParallelStatsDisabledIT; -import org.apache.phoenix.exception.SQLExceptionCode; import org.apache.phoenix.jdbc.PhoenixConnection; import org.apache.phoenix.query.QueryServices; import org.apache.phoenix.util.PropertiesUtil; @@ -63,24 +59,7 @@ public class DropMetadataIT extends ParallelStatsDisabledIT { String url = QueryUtil.getConnectionUrl(props, config, PRINCIPAL); return DriverManager.getConnection(url, props); } - -@Test -public void testDropIndexTableHasSameNameWithDataTable() { -String tableName = generateUniqueName(); -String indexName = "IDX_" + tableName; -try (Connection conn = DriverManager.getConnection(getUrl())) { -String createTable = "CREATE TABLE " + tableName + " (id varchar not null primary key, col integer)"; -conn.createStatement().execute(createTable); -String createIndex = "CREATE INDEX " + indexName + " on " + tableName + "(col)"; -conn.createStatement().execute(createIndex); -String dropIndex = "DROP INDEX " + indexName + " on " + indexName; -conn.createStatement().execute(dropIndex); -fail("should not execute successfully"); -} catch (SQLException e) { -assertTrue(SQLExceptionCode.PARENT_TABLE_NOT_FOUND.getErrorCode() == e.getErrorCode()); -} -} - + @Test public void testDropViewKeepsHTable() throws Exception { Connection conn = getConnection(); http://git-wip-us.apache.org/repos/asf/phoenix/blob/0e1984f2/phoenix-core/src/main/java/org/apache/phoenix/exception/SQLExceptionCode.java -- diff --git a/phoenix-core/src/main/java/org/apache/phoenix/exception/SQLExceptionCode.java b/phoenix-core/src/main/java/org/apache/phoenix/exception/SQLExceptionCode.java index d29c90f..3e4763d 100644 --- a/phoenix-core/src/main/java/org/apache/phoenix/exception/SQLExceptionCode.java +++ b/phoenix-core/src/main/java/org/apache/phoenix/exception/SQLExceptionCode.java @@ -185,8 +185,6 @@ public enum SQLExceptionCode { INVALID_REPLAY_AT(533, "42910", "Value of REPLAY_AT cannot be less than zero."), UNEQUAL_SCN_AND_BUILD_INDEX_AT(534, "42911", "If both specified, values of CURRENT_SCN and BUILD_INDEX_AT must be equal."), ONLY_INDEX_UPDATABLE_AT_SCN(535, "42912", "Only an index may be updated when the BUILD_INDEX_AT property is specified"), - PARENT_TABLE_NOT_FOUND(536, "42913", "Can't drop the index because the parent table in the DROP statement is incorrect."), - /** * HBase and Phoenix specific implementati