From bf40d1203d3972035c819e18cc8314739dec1fb5 Mon Sep 17 00:00:00 2001
From: Geoffrey Jacoby <gjacoby@apache.org>
Date: Wed, 19 Aug 2020 15:46:34 -0700
Subject: [PATCH] PHOENIX-5881 - Port PHOENIX-5645 (MaxLookbackAge) to 5.x

---
 .../java/org/apache/phoenix/compile/QueryCompiler.java    | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/phoenix-core/src/main/java/org/apache/phoenix/compile/QueryCompiler.java b/phoenix-core/src/main/java/org/apache/phoenix/compile/QueryCompiler.java
index e16f33bd0a3..ebed26cd885 100644
--- a/phoenix-core/src/main/java/org/apache/phoenix/compile/QueryCompiler.java
+++ b/phoenix-core/src/main/java/org/apache/phoenix/compile/QueryCompiler.java
@@ -189,11 +189,11 @@ private void verifySCN() throws SQLException {
         }
         ColumnResolver resolver =
             FromCompiler.getResolverForQuery(select, conn);
-        int maxLookBackAge = conn.getQueryServices().
-            getConfiguration().getInt(CompatBaseScannerRegionObserver.PHOENIX_MAX_LOOKBACK_AGE_CONF_KEY,
-            CompatBaseScannerRegionObserver.DEFAULT_PHOENIX_MAX_LOOKBACK_AGE);
+        long maxLookBackAgeInMillis =
+            CompatBaseScannerRegionObserver.getMaxLookbackInMillis(conn.getQueryServices().
+            getConfiguration());
         long now = EnvironmentEdgeManager.currentTimeMillis();
-        if (maxLookBackAge > 0 && now - maxLookBackAge * 1000L > scn){
+        if (maxLookBackAgeInMillis > 0 && now - maxLookBackAgeInMillis > scn){
             throw new SQLExceptionInfo.Builder(
                 SQLExceptionCode.CANNOT_QUERY_TABLE_WITH_SCN_OLDER_THAN_MAX_LOOKBACK_AGE)
                 .build().buildException();