Repository: phoenix Updated Branches: refs/heads/4.x-HBase-1.1 f9f792558 -> e6f976405
PHOENIX-3002 Upgrading to 4.8 doesn't recreate local indexes-addendum(Rajeshbabu) Project: http://git-wip-us.apache.org/repos/asf/phoenix/repo Commit: http://git-wip-us.apache.org/repos/asf/phoenix/commit/e6f97640 Tree: http://git-wip-us.apache.org/repos/asf/phoenix/tree/e6f97640 Diff: http://git-wip-us.apache.org/repos/asf/phoenix/diff/e6f97640 Branch: refs/heads/4.x-HBase-1.1 Commit: e6f976405f541815b3b7ba17db8811b06a32c5bd Parents: f9f7925 Author: Rajeshbabu Chintaguntla <[email protected]> Authored: Wed Jun 29 00:25:30 2016 +0530 Committer: Rajeshbabu Chintaguntla <[email protected]> Committed: Wed Jun 29 00:25:30 2016 +0530 ---------------------------------------------------------------------- .../query/ConnectionQueryServicesImpl.java | 4 +- .../org/apache/phoenix/util/UpgradeUtil.java | 50 ++++++++++++++------ 2 files changed, 38 insertions(+), 16 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/phoenix/blob/e6f97640/phoenix-core/src/main/java/org/apache/phoenix/query/ConnectionQueryServicesImpl.java ---------------------------------------------------------------------- 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 0a5c4f2..301d959 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 @@ -1551,7 +1551,7 @@ public class ConnectionQueryServicesImpl extends DelegateQueryServices implement parentPhysicalTableName = table.getPhysicalName().getBytes(); } } else if (PTableType.INDEX == table.getType()) { - PTable parentTable = getTable(null, table.getParentName().getString(), HConstants.LATEST_TIMESTAMP); + PTable parentTable = getTable(table.getTenantId(), table.getParentName().getString(), HConstants.LATEST_TIMESTAMP); parentPhysicalTableName = parentTable.getPhysicalName().getBytes(); } if (parentPhysicalTableName != null) { @@ -1658,7 +1658,7 @@ public class ConnectionQueryServicesImpl extends DelegateQueryServices implement } catch (TableNotFoundException e) { byte[] schemaName = Bytes.toBytes(SchemaUtil.getSchemaNameFromFullName(fullTableName)); byte[] tableName = Bytes.toBytes(SchemaUtil.getTableNameFromFullName(fullTableName)); - MetaDataMutationResult result = this.getTable(null, schemaName, tableName, HConstants.LATEST_TIMESTAMP, + MetaDataMutationResult result = this.getTable(tenantId, schemaName, tableName, HConstants.LATEST_TIMESTAMP, timestamp); table = result.getTable(); if (table == null) { throw e; } http://git-wip-us.apache.org/repos/asf/phoenix/blob/e6f97640/phoenix-core/src/main/java/org/apache/phoenix/util/UpgradeUtil.java ---------------------------------------------------------------------- diff --git a/phoenix-core/src/main/java/org/apache/phoenix/util/UpgradeUtil.java b/phoenix-core/src/main/java/org/apache/phoenix/util/UpgradeUtil.java index f558c72..bfe37b0 100644 --- a/phoenix-core/src/main/java/org/apache/phoenix/util/UpgradeUtil.java +++ b/phoenix-core/src/main/java/org/apache/phoenix/util/UpgradeUtil.java @@ -322,7 +322,7 @@ public class UpgradeUtil { globalConnection = new PhoenixConnection(metaConnection, metaConnection.getQueryServices(), props); SQLException sqlEx = null; try (HBaseAdmin admin = globalConnection.getQueryServices().getAdmin()) { - ResultSet rs = globalConnection.createStatement().executeQuery("SELECT TABLE_SCHEM, TABLE_NAME, DATA_TABLE_NAME FROM SYSTEM.CATALOG " + ResultSet rs = globalConnection.createStatement().executeQuery("SELECT TABLE_SCHEM, TABLE_NAME, DATA_TABLE_NAME, TENANT_ID FROM SYSTEM.CATALOG " + " WHERE COLUMN_NAME IS NULL" + " AND COLUMN_FAMILY IS NULL" + " AND INDEX_TYPE=2"); @@ -362,11 +362,16 @@ public class UpgradeUtil { admin.deleteTables(MetaDataUtil.LOCAL_INDEX_TABLE_PREFIX+".*"); droppedLocalIndexes = true; } + String schemaName = rs.getString(1); + String indexTableName = rs.getString(2); + String dataTableName = rs.getString(3); + String tenantId = rs.getString(4); String getColumns = "SELECT COLUMN_NAME, COLUMN_FAMILY FROM SYSTEM.CATALOG WHERE TABLE_SCHEM " - + (rs.getString(1) == null ? "IS NULL " : "='" + rs.getString(1) - + "'") + " and TABLE_NAME='" + rs.getString(2) - + "' AND COLUMN_NAME IS NOT NULL"; + + (schemaName == null ? "IS NULL " : "='" + schemaName+ "'") + + " AND TENANT_ID "+(tenantId == null ? "IS NULL " : "='" + tenantId + "'") + + " and TABLE_NAME='" + indexTableName + + "' AND COLUMN_NAME IS NOT NULL ORDER BY KEY_SEQ"; ResultSet getColumnsRs = globalConnection.createStatement().executeQuery(getColumns); List<String> indexedColumns = new ArrayList<String>(1); List<String> coveredColumns = new ArrayList<String>(1); @@ -386,6 +391,8 @@ public class UpgradeUtil { indexedColumns.add(SchemaUtil.getCaseSensitiveColumnDisplayName( columnFamily, columnName)); } + } else { + indexedColumns.add(columnName); } } else { coveredColumns.add(SchemaUtil.normalizeIdentifier(columnFamily) @@ -395,9 +402,9 @@ public class UpgradeUtil { } } StringBuilder createIndex = new StringBuilder("CREATE LOCAL INDEX "); - createIndex.append(rs.getString(2)); + createIndex.append(indexTableName); createIndex.append(" ON "); - createIndex.append(SchemaUtil.getTableName(rs.getString(1), rs.getString(3))); + createIndex.append(SchemaUtil.getTableName(schemaName, dataTableName)); createIndex.append("("); for (int i = 0; i < indexedColumns.size(); i++) { createIndex.append(indexedColumns.get(i)); @@ -419,20 +426,35 @@ public class UpgradeUtil { } createIndex.append(" ASYNC"); logger.info("Index creation query is : " + createIndex.toString()); - logger.info("Dropping the index " + rs.getString(2) + logger.info("Dropping the index " + indexTableName + " to clean up the index details from SYSTEM.CATALOG."); - globalConnection.createStatement().execute( - "DROP INDEX IF EXISTS " + rs.getString(2) + " ON " - + SchemaUtil.getTableName(rs.getString(1), rs.getString(3))); - logger.info("Recreating the index " + rs.getString(2)); - globalConnection.createStatement().execute(createIndex.toString()); - logger.info("Created the index " + rs.getString(2)); + PhoenixConnection localConnection = null; + if (tenantId != null) { + props.setProperty(PhoenixRuntime.TENANT_ID_ATTRIB, tenantId); + localConnection = new PhoenixConnection(globalConnection, globalConnection.getQueryServices(), props); + } + try { + (localConnection == null ? globalConnection : localConnection).createStatement().execute( + "DROP INDEX IF EXISTS " + indexTableName + " ON " + + SchemaUtil.getTableName(schemaName, dataTableName)); + logger.info("Recreating the index " + indexTableName); + (localConnection == null ? globalConnection : localConnection).createStatement().execute(createIndex.toString()); + logger.info("Created the index " + indexTableName); + } finally { + props.remove(PhoenixRuntime.TENANT_ID_ATTRIB); + if (localConnection != null) { + sqlEx = closeConnection(localConnection, sqlEx); + if (sqlEx != null) { + throw sqlEx; + } + } + } } globalConnection.createStatement().execute("DELETE FROM SYSTEM.CATALOG WHERE SUBSTR(TABLE_NAME,0,11)='"+MetaDataUtil.LOCAL_INDEX_TABLE_PREFIX+"'"); if (originalScn != null) { props.setProperty(PhoenixRuntime.CURRENT_SCN_ATTRIB, Long.toString(originalScn)); } - toReturn = new PhoenixConnection(globalConnection, metaConnection.getQueryServices(), props); + toReturn = new PhoenixConnection(globalConnection, globalConnection.getQueryServices(), props); } catch (SQLException e) { sqlEx = e; } finally {
