[phoenix] 15/34: PHOENIX-5178 SYSTEM schema is not getting cached at MetaData server(addendum)

[pboado]

This is an automated email from the ASF dual-hosted git repository.

pboado pushed a commit to branch 5.x-cdh6
in repository https://gitbox.apache.org/repos/asf/phoenix.git

commit e612d9759614ee58248b8dbf43329f2a2a4085a7
Author: Ankit Singhal <ankitsingha...@gmail.com>
AuthorDate: Tue Mar 12 04:54:40 2019 +0000

    PHOENIX-5178 SYSTEM schema is not getting cached at MetaData 
server(addendum)
    
    (cherry picked from commit f969444c96a060a5619e70e543c6d6fb21b32bed)
---
 .../java/org/apache/phoenix/coprocessor/MetaDataEndpointImpl.java  | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git 
a/phoenix-core/src/main/java/org/apache/phoenix/coprocessor/MetaDataEndpointImpl.java
 
b/phoenix-core/src/main/java/org/apache/phoenix/coprocessor/MetaDataEndpointImpl.java
index 06d36d9..192d004 100644
--- 
a/phoenix-core/src/main/java/org/apache/phoenix/coprocessor/MetaDataEndpointImpl.java
+++ 
b/phoenix-core/src/main/java/org/apache/phoenix/coprocessor/MetaDataEndpointImpl.java
@@ -1088,7 +1088,12 @@ public class MetaDataEndpointImpl extends 
MetaDataProtocol implements RegionCopr
             keyRanges.add(PVarbinary.INSTANCE.getKeyRange(key, true, stopKey, 
false));
         }
         Scan scan = new Scan();
-        scan.setTimeRange(MIN_TABLE_TIMESTAMP, clientTimeStamp + 1);
+        if (clientTimeStamp != HConstants.LATEST_TIMESTAMP
+            && clientTimeStamp != HConstants.OLDEST_TIMESTAMP) {
+            scan.setTimeRange(MIN_TABLE_TIMESTAMP, clientTimeStamp + 1);
+        } else {
+            scan.setTimeRange(MIN_TABLE_TIMESTAMP, clientTimeStamp);
+        }
         ScanRanges scanRanges = ScanRanges.createPointLookup(keyRanges);
         scanRanges.initializeScan(scan);
         scan.setFilter(scanRanges.getSkipScanFilter());