Repository: phoenix Updated Branches: refs/heads/4.0 8325029cd -> 2051459cd
PHOENIX-1139 Failed to disable local index when index update fails-addendum(Rajeshbabu) Project: http://git-wip-us.apache.org/repos/asf/phoenix/repo Commit: http://git-wip-us.apache.org/repos/asf/phoenix/commit/2051459c Tree: http://git-wip-us.apache.org/repos/asf/phoenix/tree/2051459c Diff: http://git-wip-us.apache.org/repos/asf/phoenix/diff/2051459c Branch: refs/heads/4.0 Commit: 2051459cdcf6a6fa6a5b6cdde2cb1aa984532252 Parents: 8325029 Author: Rajeshbabu Chintaguntla <rajeshb...@apache.org> Authored: Wed Sep 3 20:37:08 2014 +0000 Committer: Rajeshbabu Chintaguntla <rajeshb...@apache.org> Committed: Wed Sep 3 20:37:08 2014 +0000 ---------------------------------------------------------------------- .../org/apache/phoenix/schema/MetaDataClient.java | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/phoenix/blob/2051459c/phoenix-core/src/main/java/org/apache/phoenix/schema/MetaDataClient.java ---------------------------------------------------------------------- diff --git a/phoenix-core/src/main/java/org/apache/phoenix/schema/MetaDataClient.java b/phoenix-core/src/main/java/org/apache/phoenix/schema/MetaDataClient.java index 4f53422..a3db203 100644 --- a/phoenix-core/src/main/java/org/apache/phoenix/schema/MetaDataClient.java +++ b/phoenix-core/src/main/java/org/apache/phoenix/schema/MetaDataClient.java @@ -527,8 +527,18 @@ public class MetaDataClient { // Define the LOCAL_INDEX_BUILD as a new static in BaseScannerRegionObserver Scan scan = plan.getContext().getScan(); try { - scan.setTimeRange(dataTableRef.getLowerBoundTimeStamp(), Long.MAX_VALUE); - plan.getContext().setScanTimeRange(scan.getTimeRange()); + if(plan.getContext().getScanTimeRange()==null) { + Long scn = connection.getSCN(); + if (scn == null) { + scn = plan.getContext().getCurrentTime(); + // Add one to server time since max of time range is exclusive + // and we need to account of OSs with lower resolution clocks. + if (scn < HConstants.LATEST_TIMESTAMP) { + scn++; + } + } + plan.getContext().setScanTimeRange(new TimeRange(dataTableRef.getLowerBoundTimeStamp(),scn)); + } } catch (IOException e) { throw new SQLException(e); }
