[phoenix] branch 4.x-HBase-1.4 updated: PHOENIX-5178 SYSTEM schema is not getting cached at MetaData server(addendum)

[ankit]

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

ankit pushed a commit to branch 4.x-HBase-1.4
in repository https://gitbox.apache.org/repos/asf/phoenix.git


The following commit(s) were added to refs/heads/4.x-HBase-1.4 by this push:
     new 9cc3529  PHOENIX-5178 SYSTEM schema is not getting cached at MetaData 
server(addendum)
9cc3529 is described below

commit 9cc3529ea133b118d8272e16e0fc24301063d73f
Author: Ankit Singhal <ankitsingha...@gmail.com>
AuthorDate: Mon Mar 11 21:54:40 2019 -0700

    PHOENIX-5178 SYSTEM schema is not getting cached at MetaData 
server(addendum)
---
 .../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 96e6b3a..7d1ae2b 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
@@ -1085,7 +1085,12 @@ public class MetaDataEndpointImpl extends 
MetaDataProtocol implements Coprocesso
             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());