fix expire over max value (#50) (#61)

Signed-off-by: catcherwong <catcher_hwq@outlook.com>
catcherwong · Jul 13, 2024 · b9dd44c · b9dd44c
1 parent c3b911d
commit b9dd44c
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 4 deletions.
diff --git a/build/version.props b/build/version.props
@@ -1,8 +1,8 @@
 <Project>
 	<PropertyGroup>
 
-		<RDBParserVersion>0.9.2</RDBParserVersion>
-		<RDBCliVersion>0.9.2</RDBCliVersion>
+		<RDBParserVersion>0.9.3</RDBParserVersion>
+		<RDBCliVersion>0.9.3</RDBCliVersion>
 
 	</PropertyGroup>
 </Project>
diff --git a/src/RDBCli/Helpers/CommonHelper.Func.cs b/src/RDBCli/Helpers/CommonHelper.Func.cs
@@ -56,7 +56,11 @@ internal static string GetExpireString(long exp)
         {
             var res = exp.ToString();
 
-            if (exp > 0)
+            if (exp >=  RDBParser.Constant.MaxExpireTimestamp)
+            {
+                res = ">7d";
+            }
+            else if (exp > 0)
             {
                 var sub = DateTimeOffset.FromUnixTimeMilliseconds(exp).Subtract(DateTimeOffset.UtcNow);
 

diff --git a/src/RDBParser/BinaryReaderRDBParser.cs b/src/RDBParser/BinaryReaderRDBParser.cs
@@ -240,7 +240,7 @@ private bool MatchFilter(int database = -1, int dataType = -1, byte[] key = null
 
             if (_filter.IsExpired.HasValue)
             {
-                if (_expiry == 0)
+                if (_expiry == 0 || _expiry >= Constant.MaxExpireTimestamp)
                 { 
                     return false;
                 }

diff --git a/src/RDBParser/Constant.cs b/src/RDBParser/Constant.cs
@@ -2,6 +2,9 @@
 {
     public static class Constant
     {
+        // 9999-12-31 23:59:59
+        public static long MaxExpireTimestamp = 253402300799999;
+
         public static class RdbVersion
         { 
             public const int Min = 1;