[1/3] phoenix git commit: PHOENIX-4971 Drop index will execute successfully using Incorrect name of parent tables

2018-11-27 Thread pboado 
Repository: phoenix
Updated Branches:
  refs/heads/4.x-cdh5.15 505551251 -> f8836f7a2


PHOENIX-4971 Drop index will execute successfully using Incorrect name of 
parent tables


Project: http://git-wip-us.apache.org/repos/asf/phoenix/repo
Commit: http://git-wip-us.apache.org/repos/asf/phoenix/commit/ce3c451f
Tree: http://git-wip-us.apache.org/repos/asf/phoenix/tree/ce3c451f
Diff: http://git-wip-us.apache.org/repos/asf/phoenix/diff/ce3c451f

Branch: refs/heads/4.x-cdh5.15
Commit: ce3c451fc6e3dfd598b2de302901f5d1195bc3e3
Parents: 5055512
Author: Jaanai 
Authored: Sat Nov 24 17:22:49 2018 +
Committer: Pedro Boado 
Committed: Tue Nov 27 15:20:58 2018 +

--
 .../java/org/apache/phoenix/end2end/ViewIT.java | 76 ++--
 .../phoenix/end2end/index/DropMetadataIT.java   | 23 +-
 .../phoenix/end2end/index/IndexMetadataIT.java  |  5 +-
 .../coprocessor/MetaDataEndpointImpl.java   |  2 +-
 .../phoenix/exception/SQLExceptionCode.java |  2 +
 .../apache/phoenix/schema/MetaDataClient.java   | 16 +
 6 files changed, 83 insertions(+), 41 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/phoenix/blob/ce3c451f/phoenix-core/src/it/java/org/apache/phoenix/end2end/ViewIT.java
--
diff --git a/phoenix-core/src/it/java/org/apache/phoenix/end2end/ViewIT.java 
b/phoenix-core/src/it/java/org/apache/phoenix/end2end/ViewIT.java
index 090ccaa..6318dca 100644
--- a/phoenix-core/src/it/java/org/apache/phoenix/end2end/ViewIT.java
+++ b/phoenix-core/src/it/java/org/apache/phoenix/end2end/ViewIT.java
@@ -59,6 +59,7 @@ import org.apache.hadoop.hbase.DoNotRetryIOException;
 import org.apache.hadoop.hbase.HColumnDescriptor;
 import org.apache.hadoop.hbase.HTableDescriptor;
 import org.apache.hadoop.hbase.TableName;
+import org.apache.hadoop.hbase.client.Admin;
 import org.apache.hadoop.hbase.client.HBaseAdmin;
 import org.apache.hadoop.hbase.client.Scan;
 import org.apache.hadoop.hbase.coprocessor.ObserverContext;
@@ -908,60 +909,61 @@ public class ViewIT extends SplitSystemCatalogIT {
 props.setProperty(QueryServices.IS_NAMESPACE_MAPPING_ENABLED, 
Boolean.TRUE.toString());
 
 try (Connection conn = DriverManager.getConnection(getUrl(), props);
-HBaseAdmin admin =
-
conn.unwrap(PhoenixConnection.class).getQueryServices().getAdmin()) {
+Admin admin = 
conn.unwrap(PhoenixConnection.class).getQueryServices().getAdmin()) {
 
 conn.createStatement().execute("CREATE SCHEMA " + NS);
 
 // test for a view that is in non-default schema
-HTableDescriptor desc = new HTableDescriptor(TableName.valueOf(NS, 
TBL));
-desc.addFamily(new HColumnDescriptor(CF));
-admin.createTable(desc);
+{
+HTableDescriptor desc = new 
HTableDescriptor(TableName.valueOf(NS, TBL));
+desc.addFamily(new HColumnDescriptor(CF));
+admin.createTable(desc);
 
-String view1 = NS + "." + TBL;
-conn.createStatement().execute(
-"CREATE VIEW " + view1 + " (PK VARCHAR PRIMARY KEY, " + CF + 
".COL VARCHAR)");
+String view1 = NS + "." + TBL;
+conn.createStatement().execute(
+"CREATE VIEW " + view1 + " (PK VARCHAR PRIMARY KEY, " 
+ CF + ".COL VARCHAR)");
 
-assertTrue(QueryUtil
-.getExplainPlan(
+assertTrue(QueryUtil.getExplainPlan(
 conn.createStatement().executeQuery("explain select * 
from " + view1))
-.contains(NS + ":" + TBL));
+.contains(NS + ":" + TBL));
 
-
+conn.createStatement().execute("DROP VIEW " + view1);
+}
+
+// test for a view whose name contains a dot (e.g. "AAA.BBB") in 
default schema (for backward compatibility)
+{
+HTableDescriptor desc = new 
HTableDescriptor(TableName.valueOf(NS + "." + TBL));
+desc.addFamily(new HColumnDescriptor(CF));
+admin.createTable(desc);
 
-// test for a view whose name contains a dot (e.g. "AAA.BBB") in 
default schema (for
-// backward compatibility)
-desc = new HTableDescriptor(TableName.valueOf(NS + "." + TBL));
-desc.addFamily(new HColumnDescriptor(CF));
-admin.createTable(desc);
+String view2 = "\"" + NS + "." + TBL + "\"";
+conn.createStatement().execute(
+"CREATE VIEW " + view2 + " (PK VARCHAR PRIMARY KEY, " 
+ CF + ".COL VARCHAR)");
 
-String view2 = "\"" + NS + "." + TBL + "\"";
-conn.createStatement().execute(
-"CREATE VIEW " +

phoenix git commit: PHOENIX-4971 Drop index will execute successfully using Incorrect name of parent tables

2018-11-26 Thread tdsilva 
Repository: phoenix
Updated Branches:
  refs/heads/4.x-HBase-1.4 2e4cd0ddb -> 5997a567e


PHOENIX-4971 Drop index will execute successfully using Incorrect name of 
parent tables


Project: http://git-wip-us.apache.org/repos/asf/phoenix/repo
Commit: http://git-wip-us.apache.org/repos/asf/phoenix/commit/5997a567
Tree: http://git-wip-us.apache.org/repos/asf/phoenix/tree/5997a567
Diff: http://git-wip-us.apache.org/repos/asf/phoenix/diff/5997a567

Branch: refs/heads/4.x-HBase-1.4
Commit: 5997a567ef05d3dc25d9452b1f0e75dda830b529
Parents: 2e4cd0d
Author: Jaanai 
Authored: Sun Nov 25 01:22:49 2018 +0800
Committer: Thomas D'Silva 
Committed: Mon Nov 26 10:21:27 2018 -0800

--
 .../java/org/apache/phoenix/end2end/ViewIT.java | 76 ++--
 .../phoenix/end2end/index/DropMetadataIT.java   | 23 +-
 .../phoenix/end2end/index/IndexMetadataIT.java  |  5 +-
 .../coprocessor/MetaDataEndpointImpl.java   |  2 +-
 .../phoenix/exception/SQLExceptionCode.java |  2 +
 .../apache/phoenix/schema/MetaDataClient.java   | 16 +
 6 files changed, 83 insertions(+), 41 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/phoenix/blob/5997a567/phoenix-core/src/it/java/org/apache/phoenix/end2end/ViewIT.java
--
diff --git a/phoenix-core/src/it/java/org/apache/phoenix/end2end/ViewIT.java 
b/phoenix-core/src/it/java/org/apache/phoenix/end2end/ViewIT.java
index 090ccaa..6318dca 100644
--- a/phoenix-core/src/it/java/org/apache/phoenix/end2end/ViewIT.java
+++ b/phoenix-core/src/it/java/org/apache/phoenix/end2end/ViewIT.java
@@ -59,6 +59,7 @@ import org.apache.hadoop.hbase.DoNotRetryIOException;
 import org.apache.hadoop.hbase.HColumnDescriptor;
 import org.apache.hadoop.hbase.HTableDescriptor;
 import org.apache.hadoop.hbase.TableName;
+import org.apache.hadoop.hbase.client.Admin;
 import org.apache.hadoop.hbase.client.HBaseAdmin;
 import org.apache.hadoop.hbase.client.Scan;
 import org.apache.hadoop.hbase.coprocessor.ObserverContext;
@@ -908,60 +909,61 @@ public class ViewIT extends SplitSystemCatalogIT {
 props.setProperty(QueryServices.IS_NAMESPACE_MAPPING_ENABLED, 
Boolean.TRUE.toString());
 
 try (Connection conn = DriverManager.getConnection(getUrl(), props);
-HBaseAdmin admin =
-
conn.unwrap(PhoenixConnection.class).getQueryServices().getAdmin()) {
+Admin admin = 
conn.unwrap(PhoenixConnection.class).getQueryServices().getAdmin()) {
 
 conn.createStatement().execute("CREATE SCHEMA " + NS);
 
 // test for a view that is in non-default schema
-HTableDescriptor desc = new HTableDescriptor(TableName.valueOf(NS, 
TBL));
-desc.addFamily(new HColumnDescriptor(CF));
-admin.createTable(desc);
+{
+HTableDescriptor desc = new 
HTableDescriptor(TableName.valueOf(NS, TBL));
+desc.addFamily(new HColumnDescriptor(CF));
+admin.createTable(desc);
 
-String view1 = NS + "." + TBL;
-conn.createStatement().execute(
-"CREATE VIEW " + view1 + " (PK VARCHAR PRIMARY KEY, " + CF + 
".COL VARCHAR)");
+String view1 = NS + "." + TBL;
+conn.createStatement().execute(
+"CREATE VIEW " + view1 + " (PK VARCHAR PRIMARY KEY, " 
+ CF + ".COL VARCHAR)");
 
-assertTrue(QueryUtil
-.getExplainPlan(
+assertTrue(QueryUtil.getExplainPlan(
 conn.createStatement().executeQuery("explain select * 
from " + view1))
-.contains(NS + ":" + TBL));
+.contains(NS + ":" + TBL));
 
-
+conn.createStatement().execute("DROP VIEW " + view1);
+}
+
+// test for a view whose name contains a dot (e.g. "AAA.BBB") in 
default schema (for backward compatibility)
+{
+HTableDescriptor desc = new 
HTableDescriptor(TableName.valueOf(NS + "." + TBL));
+desc.addFamily(new HColumnDescriptor(CF));
+admin.createTable(desc);
 
-// test for a view whose name contains a dot (e.g. "AAA.BBB") in 
default schema (for
-// backward compatibility)
-desc = new HTableDescriptor(TableName.valueOf(NS + "." + TBL));
-desc.addFamily(new HColumnDescriptor(CF));
-admin.createTable(desc);
+String view2 = "\"" + NS + "." + TBL + "\"";
+conn.createStatement().execute(
+"CREATE VIEW " + view2 + " (PK VARCHAR PRIMARY KEY, " 
+ CF + ".COL VARCHAR)");
 
-String view2 = "\"" + NS + "." + TBL + "\"";
-conn.createStatement().execute(
-"CREATE VIEW

phoenix git commit: PHOENIX-4971 Drop index will execute successfully using Incorrect name of parent tables

2018-11-26 Thread tdsilva 
Repository: phoenix
Updated Branches:
  refs/heads/4.x-HBase-1.2 3508086ce -> 7b1ee3ce7


PHOENIX-4971 Drop index will execute successfully using Incorrect name of 
parent tables


Project: http://git-wip-us.apache.org/repos/asf/phoenix/repo
Commit: http://git-wip-us.apache.org/repos/asf/phoenix/commit/7b1ee3ce
Tree: http://git-wip-us.apache.org/repos/asf/phoenix/tree/7b1ee3ce
Diff: http://git-wip-us.apache.org/repos/asf/phoenix/diff/7b1ee3ce

Branch: refs/heads/4.x-HBase-1.2
Commit: 7b1ee3ce70830f369ce9058f2c1981e7747b87d0
Parents: 3508086
Author: Jaanai 
Authored: Sun Nov 25 01:22:49 2018 +0800
Committer: Thomas D'Silva 
Committed: Mon Nov 26 10:21:01 2018 -0800

--
 .../java/org/apache/phoenix/end2end/ViewIT.java | 76 ++--
 .../phoenix/end2end/index/DropMetadataIT.java   | 23 +-
 .../phoenix/end2end/index/IndexMetadataIT.java  |  5 +-
 .../coprocessor/MetaDataEndpointImpl.java   |  2 +-
 .../phoenix/exception/SQLExceptionCode.java |  2 +
 .../apache/phoenix/schema/MetaDataClient.java   | 16 +
 6 files changed, 83 insertions(+), 41 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/phoenix/blob/7b1ee3ce/phoenix-core/src/it/java/org/apache/phoenix/end2end/ViewIT.java
--
diff --git a/phoenix-core/src/it/java/org/apache/phoenix/end2end/ViewIT.java 
b/phoenix-core/src/it/java/org/apache/phoenix/end2end/ViewIT.java
index 090ccaa..6318dca 100644
--- a/phoenix-core/src/it/java/org/apache/phoenix/end2end/ViewIT.java
+++ b/phoenix-core/src/it/java/org/apache/phoenix/end2end/ViewIT.java
@@ -59,6 +59,7 @@ import org.apache.hadoop.hbase.DoNotRetryIOException;
 import org.apache.hadoop.hbase.HColumnDescriptor;
 import org.apache.hadoop.hbase.HTableDescriptor;
 import org.apache.hadoop.hbase.TableName;
+import org.apache.hadoop.hbase.client.Admin;
 import org.apache.hadoop.hbase.client.HBaseAdmin;
 import org.apache.hadoop.hbase.client.Scan;
 import org.apache.hadoop.hbase.coprocessor.ObserverContext;
@@ -908,60 +909,61 @@ public class ViewIT extends SplitSystemCatalogIT {
 props.setProperty(QueryServices.IS_NAMESPACE_MAPPING_ENABLED, 
Boolean.TRUE.toString());
 
 try (Connection conn = DriverManager.getConnection(getUrl(), props);
-HBaseAdmin admin =
-
conn.unwrap(PhoenixConnection.class).getQueryServices().getAdmin()) {
+Admin admin = 
conn.unwrap(PhoenixConnection.class).getQueryServices().getAdmin()) {
 
 conn.createStatement().execute("CREATE SCHEMA " + NS);
 
 // test for a view that is in non-default schema
-HTableDescriptor desc = new HTableDescriptor(TableName.valueOf(NS, 
TBL));
-desc.addFamily(new HColumnDescriptor(CF));
-admin.createTable(desc);
+{
+HTableDescriptor desc = new 
HTableDescriptor(TableName.valueOf(NS, TBL));
+desc.addFamily(new HColumnDescriptor(CF));
+admin.createTable(desc);
 
-String view1 = NS + "." + TBL;
-conn.createStatement().execute(
-"CREATE VIEW " + view1 + " (PK VARCHAR PRIMARY KEY, " + CF + 
".COL VARCHAR)");
+String view1 = NS + "." + TBL;
+conn.createStatement().execute(
+"CREATE VIEW " + view1 + " (PK VARCHAR PRIMARY KEY, " 
+ CF + ".COL VARCHAR)");
 
-assertTrue(QueryUtil
-.getExplainPlan(
+assertTrue(QueryUtil.getExplainPlan(
 conn.createStatement().executeQuery("explain select * 
from " + view1))
-.contains(NS + ":" + TBL));
+.contains(NS + ":" + TBL));
 
-
+conn.createStatement().execute("DROP VIEW " + view1);
+}
+
+// test for a view whose name contains a dot (e.g. "AAA.BBB") in 
default schema (for backward compatibility)
+{
+HTableDescriptor desc = new 
HTableDescriptor(TableName.valueOf(NS + "." + TBL));
+desc.addFamily(new HColumnDescriptor(CF));
+admin.createTable(desc);
 
-// test for a view whose name contains a dot (e.g. "AAA.BBB") in 
default schema (for
-// backward compatibility)
-desc = new HTableDescriptor(TableName.valueOf(NS + "." + TBL));
-desc.addFamily(new HColumnDescriptor(CF));
-admin.createTable(desc);
+String view2 = "\"" + NS + "." + TBL + "\"";
+conn.createStatement().execute(
+"CREATE VIEW " + view2 + " (PK VARCHAR PRIMARY KEY, " 
+ CF + ".COL VARCHAR)");
 
-String view2 = "\"" + NS + "." + TBL + "\"";
-conn.createStatement().execute(
-"CREATE VIEW

phoenix git commit: PHOENIX-4971 Drop index will execute successfully using Incorrect name of parent tables

2018-11-26 Thread tdsilva 
Repository: phoenix
Updated Branches:
  refs/heads/master d821ea30c -> 12c8f1b1f


PHOENIX-4971 Drop index will execute successfully using Incorrect name of 
parent tables


Project: http://git-wip-us.apache.org/repos/asf/phoenix/repo
Commit: http://git-wip-us.apache.org/repos/asf/phoenix/commit/12c8f1b1
Tree: http://git-wip-us.apache.org/repos/asf/phoenix/tree/12c8f1b1
Diff: http://git-wip-us.apache.org/repos/asf/phoenix/diff/12c8f1b1

Branch: refs/heads/master
Commit: 12c8f1b1f67e56cd4f3f2a0dde9035a5b72b9de9
Parents: d821ea3
Author: Jaanai 
Authored: Fri Nov 23 21:16:20 2018 +0800
Committer: Thomas D'Silva 
Committed: Mon Nov 26 10:22:05 2018 -0800

--
 .../java/org/apache/phoenix/end2end/ViewIT.java | 51 +---
 .../phoenix/end2end/index/DropMetadataIT.java   | 23 -
 .../phoenix/end2end/index/IndexMetadataIT.java  |  5 +-
 .../coprocessor/MetaDataEndpointImpl.java   |  2 +-
 .../phoenix/exception/SQLExceptionCode.java |  2 +
 .../apache/phoenix/schema/MetaDataClient.java   | 16 ++
 6 files changed, 68 insertions(+), 31 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/phoenix/blob/12c8f1b1/phoenix-core/src/it/java/org/apache/phoenix/end2end/ViewIT.java
--
diff --git a/phoenix-core/src/it/java/org/apache/phoenix/end2end/ViewIT.java 
b/phoenix-core/src/it/java/org/apache/phoenix/end2end/ViewIT.java
index 572846e..bcf7eca 100644
--- a/phoenix-core/src/it/java/org/apache/phoenix/end2end/ViewIT.java
+++ b/phoenix-core/src/it/java/org/apache/phoenix/end2end/ViewIT.java
@@ -927,55 +927,52 @@ public class ViewIT extends SplitSystemCatalogIT {
 TableDescriptorBuilder builder = 
TableDescriptorBuilder.newBuilder(TableName.valueOf(NS, TBL));
 builder.addColumnFamily(ColumnFamilyDescriptorBuilder.of(CF));
 admin.createTable(builder.build());
-}
 
-String view1 = NS + "." + TBL;
-conn.createStatement().execute(
-"CREATE VIEW " + view1 + " (PK VARCHAR PRIMARY KEY, " + CF + 
".COL VARCHAR)");
+String view1 = NS + "." + TBL;
+conn.createStatement().execute(
+"CREATE VIEW " + view1 + " (PK VARCHAR PRIMARY KEY, " 
+ CF + ".COL VARCHAR)");
 
-assertTrue(QueryUtil
-.getExplainPlan(
-conn.createStatement().executeQuery("explain select * 
from " + view1))
+assertTrue(QueryUtil.getExplainPlan(
+conn.createStatement().executeQuery("explain select * from 
" + view1))
 .contains(NS + ":" + TBL));
 
-
+conn.createStatement().execute("DROP VIEW " + view1);
+}
 
 // test for a view whose name contains a dot (e.g. "AAA.BBB") in 
default schema (for backward compatibility)
 {
 TableDescriptorBuilder builder = 
TableDescriptorBuilder.newBuilder(TableName.valueOf(NS + "." + TBL));
 builder.addColumnFamily(ColumnFamilyDescriptorBuilder.of(CF));
 admin.createTable(builder.build());
-}
 
-String view2 = "\"" + NS + "." + TBL + "\"";
-conn.createStatement().execute(
-"CREATE VIEW " + view2 + " (PK VARCHAR PRIMARY KEY, " + CF + 
".COL VARCHAR)");
+String view2 = "\"" + NS + "." + TBL + "\"";
+conn.createStatement().execute(
+"CREATE VIEW " + view2 + " (PK VARCHAR PRIMARY KEY, " + CF 
+ ".COL VARCHAR)");
 
-assertTrue(QueryUtil
-.getExplainPlan(
-conn.createStatement().executeQuery("explain select * 
from " + view2))
-.contains(NS + "." + TBL));
+assertTrue(QueryUtil
+.getExplainPlan(
+conn.createStatement().executeQuery("explain 
select * from " + view2))
+.contains(NS + "." + TBL));
+
+conn.createStatement().execute("DROP VIEW " + view2);
+}
 
 // test for a view whose name contains a dot (e.g. "AAA.BBB") in 
non-default schema
 {
 TableDescriptorBuilder builder = 
TableDescriptorBuilder.newBuilder(TableName.valueOf(NS, NS + "." + TBL));
 builder.addColumnFamily(ColumnFamilyDescriptorBuilder.of(CF));
 admin.createTable(builder.build());
-}
 
-String view3 = NS + ".\"" + NS + "." + TBL + "\"";
-conn.createStatement().execute(
-"CREATE VIEW " + view3 + " (PK VARCHAR PRIMARY KEY, " + CF + 
".COL VARCHAR)");
+String view3 = NS + ".\"" + NS + "." + TBL + "\"";
+

phoenix git commit: PHOENIX-4971 Drop index will execute successfully using Incorrect name of parent tables

2018-11-26 Thread tdsilva 
Repository: phoenix
Updated Branches:
  refs/heads/4.x-HBase-1.3 8a7295dc4 -> d54ae1909


PHOENIX-4971 Drop index will execute successfully using Incorrect name of 
parent tables


Project: http://git-wip-us.apache.org/repos/asf/phoenix/repo
Commit: http://git-wip-us.apache.org/repos/asf/phoenix/commit/d54ae190
Tree: http://git-wip-us.apache.org/repos/asf/phoenix/tree/d54ae190
Diff: http://git-wip-us.apache.org/repos/asf/phoenix/diff/d54ae190

Branch: refs/heads/4.x-HBase-1.3
Commit: d54ae1909923e23f76bc236ad4413ee7c30983e6
Parents: 8a7295d
Author: Jaanai 
Authored: Sun Nov 25 01:22:49 2018 +0800
Committer: Thomas D'Silva 
Committed: Mon Nov 26 10:21:17 2018 -0800

--
 .../java/org/apache/phoenix/end2end/ViewIT.java | 76 ++--
 .../phoenix/end2end/index/DropMetadataIT.java   | 23 +-
 .../phoenix/end2end/index/IndexMetadataIT.java  |  5 +-
 .../coprocessor/MetaDataEndpointImpl.java   |  2 +-
 .../phoenix/exception/SQLExceptionCode.java |  2 +
 .../apache/phoenix/schema/MetaDataClient.java   | 16 +
 6 files changed, 83 insertions(+), 41 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/phoenix/blob/d54ae190/phoenix-core/src/it/java/org/apache/phoenix/end2end/ViewIT.java
--
diff --git a/phoenix-core/src/it/java/org/apache/phoenix/end2end/ViewIT.java 
b/phoenix-core/src/it/java/org/apache/phoenix/end2end/ViewIT.java
index 090ccaa..6318dca 100644
--- a/phoenix-core/src/it/java/org/apache/phoenix/end2end/ViewIT.java
+++ b/phoenix-core/src/it/java/org/apache/phoenix/end2end/ViewIT.java
@@ -59,6 +59,7 @@ import org.apache.hadoop.hbase.DoNotRetryIOException;
 import org.apache.hadoop.hbase.HColumnDescriptor;
 import org.apache.hadoop.hbase.HTableDescriptor;
 import org.apache.hadoop.hbase.TableName;
+import org.apache.hadoop.hbase.client.Admin;
 import org.apache.hadoop.hbase.client.HBaseAdmin;
 import org.apache.hadoop.hbase.client.Scan;
 import org.apache.hadoop.hbase.coprocessor.ObserverContext;
@@ -908,60 +909,61 @@ public class ViewIT extends SplitSystemCatalogIT {
 props.setProperty(QueryServices.IS_NAMESPACE_MAPPING_ENABLED, 
Boolean.TRUE.toString());
 
 try (Connection conn = DriverManager.getConnection(getUrl(), props);
-HBaseAdmin admin =
-
conn.unwrap(PhoenixConnection.class).getQueryServices().getAdmin()) {
+Admin admin = 
conn.unwrap(PhoenixConnection.class).getQueryServices().getAdmin()) {
 
 conn.createStatement().execute("CREATE SCHEMA " + NS);
 
 // test for a view that is in non-default schema
-HTableDescriptor desc = new HTableDescriptor(TableName.valueOf(NS, 
TBL));
-desc.addFamily(new HColumnDescriptor(CF));
-admin.createTable(desc);
+{
+HTableDescriptor desc = new 
HTableDescriptor(TableName.valueOf(NS, TBL));
+desc.addFamily(new HColumnDescriptor(CF));
+admin.createTable(desc);
 
-String view1 = NS + "." + TBL;
-conn.createStatement().execute(
-"CREATE VIEW " + view1 + " (PK VARCHAR PRIMARY KEY, " + CF + 
".COL VARCHAR)");
+String view1 = NS + "." + TBL;
+conn.createStatement().execute(
+"CREATE VIEW " + view1 + " (PK VARCHAR PRIMARY KEY, " 
+ CF + ".COL VARCHAR)");
 
-assertTrue(QueryUtil
-.getExplainPlan(
+assertTrue(QueryUtil.getExplainPlan(
 conn.createStatement().executeQuery("explain select * 
from " + view1))
-.contains(NS + ":" + TBL));
+.contains(NS + ":" + TBL));
 
-
+conn.createStatement().execute("DROP VIEW " + view1);
+}
+
+// test for a view whose name contains a dot (e.g. "AAA.BBB") in 
default schema (for backward compatibility)
+{
+HTableDescriptor desc = new 
HTableDescriptor(TableName.valueOf(NS + "." + TBL));
+desc.addFamily(new HColumnDescriptor(CF));
+admin.createTable(desc);
 
-// test for a view whose name contains a dot (e.g. "AAA.BBB") in 
default schema (for
-// backward compatibility)
-desc = new HTableDescriptor(TableName.valueOf(NS + "." + TBL));
-desc.addFamily(new HColumnDescriptor(CF));
-admin.createTable(desc);
+String view2 = "\"" + NS + "." + TBL + "\"";
+conn.createStatement().execute(
+"CREATE VIEW " + view2 + " (PK VARCHAR PRIMARY KEY, " 
+ CF + ".COL VARCHAR)");
 
-String view2 = "\"" + NS + "." + TBL + "\"";
-conn.createStatement().execute(
-"CREATE VIEW

[06/12] phoenix git commit: PHOENIX-4971 Drop index will execute successfully using Incorrect name of parent tables

2018-11-26 Thread pboado 
PHOENIX-4971 Drop index will execute successfully using Incorrect name of 
parent tables

Signed-off-by: Geoffrey Jacoby 


Project: http://git-wip-us.apache.org/repos/asf/phoenix/repo
Commit: http://git-wip-us.apache.org/repos/asf/phoenix/commit/76f07482
Tree: http://git-wip-us.apache.org/repos/asf/phoenix/tree/76f07482
Diff: http://git-wip-us.apache.org/repos/asf/phoenix/diff/76f07482

Branch: refs/heads/4.x-cdh5.15
Commit: 76f07482081a0115c503a4a226ba84e854d35513
Parents: 4bbe8e2
Author: Jaanai 
Authored: Sun Oct 28 11:10:51 2018 +
Committer: pboado 
Committed: Sun Nov 25 22:09:09 2018 +

--
 .../phoenix/end2end/index/DropMetadataIT.java   | 24 +++-
 .../phoenix/exception/SQLExceptionCode.java |  2 ++
 .../apache/phoenix/schema/MetaDataClient.java   | 15 
 3 files changed, 40 insertions(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/phoenix/blob/76f07482/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 b92ed8d..a285526 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,9 +18,13 @@
 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;
@@ -29,6 +33,7 @@ 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;
@@ -56,7 +61,24 @@ 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/76f07482/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 d84857d..6696521 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
@@ -184,6 +184,8 @@ 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.

[03/22] phoenix git commit: PHOENIX-4971 Drop index will execute successfully using Incorrect name of parent tables

2018-11-10 Thread jamestaylor 
PHOENIX-4971 Drop index will execute successfully using Incorrect name of 
parent tables

Signed-off-by: Geoffrey Jacoby 


Project: http://git-wip-us.apache.org/repos/asf/phoenix/repo
Commit: http://git-wip-us.apache.org/repos/asf/phoenix/commit/527098ed
Tree: http://git-wip-us.apache.org/repos/asf/phoenix/tree/527098ed
Diff: http://git-wip-us.apache.org/repos/asf/phoenix/diff/527098ed

Branch: refs/heads/omid2
Commit: 527098ed621d62ba18fc19099ec67d8b29e027f4
Parents: 3903ad7
Author: Jaanai 
Authored: Sun Oct 28 19:10:51 2018 +0800
Committer: Geoffrey Jacoby 
Committed: Sun Oct 28 15:28:39 2018 -0700

--
 .../phoenix/end2end/index/DropMetadataIT.java   | 23 +++-
 .../phoenix/exception/SQLExceptionCode.java |  2 ++
 .../apache/phoenix/schema/MetaDataClient.java   | 15 +
 3 files changed, 39 insertions(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/phoenix/blob/527098ed/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 b92ed8d..3c670c5 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,9 +18,12 @@
 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;
@@ -29,6 +32,7 @@ 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;
@@ -56,7 +60,24 @@ 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/527098ed/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 d84857d..6696521 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
@@ -184,6 +184,8 @@ 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.

phoenix git commit: PHOENIX-4971 Drop index will execute successfully using Incorrect name of parent tables

2018-10-28 Thread gjacoby 
Repository: phoenix
Updated Branches:
  refs/heads/4.x-HBase-1.2 49da7216d -> 7b5482367


PHOENIX-4971 Drop index will execute successfully using Incorrect name of 
parent tables

Signed-off-by: Geoffrey Jacoby 


Project: http://git-wip-us.apache.org/repos/asf/phoenix/repo
Commit: http://git-wip-us.apache.org/repos/asf/phoenix/commit/7b548236
Tree: http://git-wip-us.apache.org/repos/asf/phoenix/tree/7b548236
Diff: http://git-wip-us.apache.org/repos/asf/phoenix/diff/7b548236

Branch: refs/heads/4.x-HBase-1.2
Commit: 7b5482367eb010b5b2db285ff8bc4b345863c477
Parents: 49da721
Author: Jaanai 
Authored: Sun Oct 28 19:10:51 2018 +0800
Committer: Geoffrey Jacoby 
Committed: Sun Oct 28 15:39:44 2018 -0700

--
 .../phoenix/end2end/index/DropMetadataIT.java   | 24 +++-
 .../phoenix/exception/SQLExceptionCode.java |  2 ++
 .../apache/phoenix/schema/MetaDataClient.java   | 15 
 3 files changed, 40 insertions(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/phoenix/blob/7b548236/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 b92ed8d..a285526 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,9 +18,13 @@
 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;
@@ -29,6 +33,7 @@ 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;
@@ -56,7 +61,24 @@ 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/7b548236/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 d84857d..6696521 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
@@ -184,6 +184,8 @@ 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

phoenix git commit: PHOENIX-4971 Drop index will execute successfully using Incorrect name of parent tables

2018-10-28 Thread gjacoby 
Repository: phoenix
Updated Branches:
  refs/heads/4.x-HBase-1.4 90afa2dd9 -> 7b7e4d4b2


PHOENIX-4971 Drop index will execute successfully using Incorrect name of 
parent tables

Signed-off-by: Geoffrey Jacoby 


Project: http://git-wip-us.apache.org/repos/asf/phoenix/repo
Commit: http://git-wip-us.apache.org/repos/asf/phoenix/commit/7b7e4d4b
Tree: http://git-wip-us.apache.org/repos/asf/phoenix/tree/7b7e4d4b
Diff: http://git-wip-us.apache.org/repos/asf/phoenix/diff/7b7e4d4b

Branch: refs/heads/4.x-HBase-1.4
Commit: 7b7e4d4b286fa9a7bb857ea7ff3cd3bb3812eaf5
Parents: 90afa2d
Author: Jaanai 
Authored: Sun Oct 28 19:10:51 2018 +0800
Committer: Geoffrey Jacoby 
Committed: Sun Oct 28 15:21:53 2018 -0700

--
 .../phoenix/end2end/index/DropMetadataIT.java   | 24 +++-
 .../phoenix/exception/SQLExceptionCode.java |  2 ++
 .../apache/phoenix/schema/MetaDataClient.java   | 15 
 3 files changed, 40 insertions(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/phoenix/blob/7b7e4d4b/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 b92ed8d..44eddfb 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,9 +18,12 @@
 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;
@@ -29,6 +32,7 @@ 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;
@@ -36,6 +40,7 @@ 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 {
@@ -56,7 +61,24 @@ 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/7b7e4d4b/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 d84857d..6696521 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
@@ -184,6 +184,8 @@ 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

phoenix git commit: PHOENIX-4971 Drop index will execute successfully using Incorrect name of parent tables

2018-10-28 Thread gjacoby 
Repository: phoenix
Updated Branches:
  refs/heads/master 9f224a18b -> a524596a7


PHOENIX-4971 Drop index will execute successfully using Incorrect name of 
parent tables

Signed-off-by: Geoffrey Jacoby 


Project: http://git-wip-us.apache.org/repos/asf/phoenix/repo
Commit: http://git-wip-us.apache.org/repos/asf/phoenix/commit/a524596a
Tree: http://git-wip-us.apache.org/repos/asf/phoenix/tree/a524596a
Diff: http://git-wip-us.apache.org/repos/asf/phoenix/diff/a524596a

Branch: refs/heads/master
Commit: a524596a778c5ba27d0227b39ab8e343392e5ac0
Parents: 9f224a1
Author: Jaanai 
Authored: Sun Oct 28 19:10:51 2018 +0800
Committer: Geoffrey Jacoby 
Committed: Sun Oct 28 14:40:50 2018 -0700

--
 .../phoenix/end2end/index/DropMetadataIT.java   | 23 +++-
 .../phoenix/exception/SQLExceptionCode.java |  2 ++
 .../apache/phoenix/schema/MetaDataClient.java   | 15 +
 3 files changed, 39 insertions(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/phoenix/blob/a524596a/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 71a9f00..d945e43 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,9 +18,12 @@
 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;
@@ -32,6 +35,7 @@ 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;
@@ -59,7 +63,24 @@ 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/a524596a/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 26a1e26..d20478d 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
@@ -184,6 +184,8 @@ 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