This is an automated email from the ASF dual-hosted git repository. stoty pushed a commit to branch 4.x in repository https://gitbox.apache.org/repos/asf/phoenix.git
The following commit(s) were added to refs/heads/4.x by this push: new ace3e78 PHOENIX-6646 System tables are not upgraded after namespace migration (addendum:backport fixes) ace3e78 is described below commit ace3e7832aed2cee73b456386efba71eae2e7ed9 Author: Istvan Toth <st...@apache.org> AuthorDate: Thu Feb 24 17:22:22 2022 +0100 PHOENIX-6646 System tables are not upgraded after namespace migration (addendum:backport fixes) --- .../src/it/java/org/apache/phoenix/end2end/SnapshotTestTemplateIT.java | 2 +- .../main/java/org/apache/phoenix/query/ConnectionQueryServicesImpl.java | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/phoenix-core/src/it/java/org/apache/phoenix/end2end/SnapshotTestTemplateIT.java b/phoenix-core/src/it/java/org/apache/phoenix/end2end/SnapshotTestTemplateIT.java index 767baf2..a990ab3 100644 --- a/phoenix-core/src/it/java/org/apache/phoenix/end2end/SnapshotTestTemplateIT.java +++ b/phoenix-core/src/it/java/org/apache/phoenix/end2end/SnapshotTestTemplateIT.java @@ -108,7 +108,7 @@ public class SnapshotTestTemplateIT extends BaseTest { assertEquals(0, importExitCode); //load the snapshot - utility.getAdmin().restoreSnapshot(key); + utility.getHBaseAdmin().restoreSnapshot(key); } @Test diff --git a/phoenix-core/src/main/java/org/apache/phoenix/query/ConnectionQueryServicesImpl.java b/phoenix-core/src/main/java/org/apache/phoenix/query/ConnectionQueryServicesImpl.java index 00abf7a..4863687 100644 --- a/phoenix-core/src/main/java/org/apache/phoenix/query/ConnectionQueryServicesImpl.java +++ b/phoenix-core/src/main/java/org/apache/phoenix/query/ConnectionQueryServicesImpl.java @@ -126,6 +126,7 @@ import org.apache.hadoop.conf.Configuration; import org.apache.hadoop.hbase.HColumnDescriptor; import org.apache.hadoop.hbase.HConstants; import org.apache.hadoop.hbase.HRegionLocation; +import org.apache.hadoop.hbase.HTableDescriptor; import org.apache.hadoop.hbase.KeepDeletedCells; import org.apache.hadoop.hbase.NamespaceDescriptor; import org.apache.hadoop.hbase.NamespaceNotFoundException;