Repository: phoenix Updated Branches: refs/heads/master 845888bcb -> 3abb90bb0
PHOENIX-1139 Failed to disable local index when index update fails(addendum) Project: http://git-wip-us.apache.org/repos/asf/phoenix/repo Commit: http://git-wip-us.apache.org/repos/asf/phoenix/commit/3abb90bb Tree: http://git-wip-us.apache.org/repos/asf/phoenix/tree/3abb90bb Diff: http://git-wip-us.apache.org/repos/asf/phoenix/diff/3abb90bb Branch: refs/heads/master Commit: 3abb90bb0fa0721a333f919f4d0c734cf51028fc Parents: 845888b Author: Rajeshbabu Chintaguntla <[email protected]> Authored: Wed Sep 3 18:16:49 2014 +0800 Committer: Rajeshbabu Chintaguntla <[email protected]> Committed: Thu Sep 4 01:49:28 2014 +0530 ---------------------------------------------------------------------- .../org/apache/phoenix/schema/MetaDataClient.java | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/phoenix/blob/3abb90bb/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); }
