Repository: phoenix Updated Branches: refs/heads/4.x-HBase-0.98 cab567ce9 -> 2f8a27eae
PHOENIX-2616 Indexes over immutable tables not marked as immutable Project: http://git-wip-us.apache.org/repos/asf/phoenix/repo Commit: http://git-wip-us.apache.org/repos/asf/phoenix/commit/2f8a27ea Tree: http://git-wip-us.apache.org/repos/asf/phoenix/tree/2f8a27ea Diff: http://git-wip-us.apache.org/repos/asf/phoenix/diff/2f8a27ea Branch: refs/heads/4.x-HBase-0.98 Commit: 2f8a27eaec6790e5ab0f3cc931e5ff6451af39f7 Parents: cab567c Author: James Taylor <[email protected]> Authored: Wed Jan 20 19:09:19 2016 -0800 Committer: James Taylor <[email protected]> Committed: Wed Jan 20 19:10:28 2016 -0800 ---------------------------------------------------------------------- .../apache/phoenix/query/ConnectionQueryServicesImpl.java | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/phoenix/blob/2f8a27ea/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 b7df6af..cf75c42 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 @@ -2426,6 +2426,9 @@ public class ConnectionQueryServicesImpl extends DelegateQueryServices implement // Drop old stats table so that new stats table is created metaConnection = dropStatsTable(metaConnection, MetaDataProtocol.MIN_SYSTEM_TABLE_TIMESTAMP_4_7_0); + // Clear the server cache so the above changes make it over to any clients + // that already have cached data. + clearCache(); } } @@ -2620,11 +2623,6 @@ public class ConnectionQueryServicesImpl extends DelegateQueryServices implement throw sqlE; } } - metaConnection.removeTable(null, PhoenixDatabaseMetaData.SYSTEM_SCHEMA_NAME, - PhoenixDatabaseMetaData.SYSTEM_STATS_TABLE, MetaDataProtocol.MIN_SYSTEM_TABLE_TIMESTAMP); - clearTableFromCache(ByteUtil.EMPTY_BYTE_ARRAY, PhoenixDatabaseMetaData.SYSTEM_SCHEMA_NAME_BYTES, - PhoenixDatabaseMetaData.SYSTEM_STATS_TABLE_BYTES, MetaDataProtocol.MIN_SYSTEM_TABLE_TIMESTAMP); - clearTableRegionCache(PhoenixDatabaseMetaData.SYSTEM_STATS_NAME_BYTES); return metaConnection; }
