Repository: phoenix Updated Branches: refs/heads/omid2 2d8df4332 -> 6dbfe5d55
Fix compilation errors from merge Project: http://git-wip-us.apache.org/repos/asf/phoenix/repo Commit: http://git-wip-us.apache.org/repos/asf/phoenix/commit/6dbfe5d5 Tree: http://git-wip-us.apache.org/repos/asf/phoenix/tree/6dbfe5d5 Diff: http://git-wip-us.apache.org/repos/asf/phoenix/diff/6dbfe5d5 Branch: refs/heads/omid2 Commit: 6dbfe5d55ea002d9ee970b4b3abc8f9cfe71584b Parents: 2d8df43 Author: James Taylor <[email protected]> Authored: Tue Oct 2 08:39:02 2018 -0700 Committer: James Taylor <[email protected]> Committed: Tue Oct 2 08:39:02 2018 -0700 ---------------------------------------------------------------------- .../java/org/apache/phoenix/iterate/TableResultIterator.java | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/phoenix/blob/6dbfe5d5/phoenix-core/src/main/java/org/apache/phoenix/iterate/TableResultIterator.java ---------------------------------------------------------------------- diff --git a/phoenix-core/src/main/java/org/apache/phoenix/iterate/TableResultIterator.java b/phoenix-core/src/main/java/org/apache/phoenix/iterate/TableResultIterator.java index 215f3a5..cc99ae4 100644 --- a/phoenix-core/src/main/java/org/apache/phoenix/iterate/TableResultIterator.java +++ b/phoenix-core/src/main/java/org/apache/phoenix/iterate/TableResultIterator.java @@ -51,7 +51,6 @@ import org.apache.phoenix.join.HashCacheClient; import org.apache.phoenix.monitoring.ScanMetricsHolder; import org.apache.phoenix.query.QueryConstants; import org.apache.phoenix.schema.PTable; -import org.apache.phoenix.schema.StaleRegionBoundaryCacheException; import org.apache.phoenix.schema.tuple.Tuple; import org.apache.phoenix.util.ByteUtil; import org.apache.phoenix.util.Closeables; @@ -187,13 +186,13 @@ public class TableResultIterator implements ResultIterator { newScan.setStartRow(ByteUtil.nextKey(startRowSuffix)); } } - plan.getContext().getConnection().getQueryServices().clearTableRegionCache(htable.getTableName()); + plan.getContext().getConnection().getQueryServices().clearTableRegionCache(htable.getName().getName()); logger.debug( "Retrying when Hash Join cache is not found on the server ,by sending the cache again"); if (retry <= 0) { throw e1; } - Long cacheId = ((HashJoinCacheNotFoundException) e1).getCacheId(); + Long cacheId = e1.getCacheId(); retry--; try { ServerCache cache = caches == null ? null :
