Skip to content

Commit b9dd44c

Browse files
authored
fix expire over max value (#50) (#61)
Signed-off-by: catcherwong <[email protected]>
1 parent c3b911d commit b9dd44c

File tree

4 files changed

+11
-4
lines changed

4 files changed

+11
-4
lines changed

build/version.props

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
<Project>
22
<PropertyGroup>
33

4-
<RDBParserVersion>0.9.2</RDBParserVersion>
5-
<RDBCliVersion>0.9.2</RDBCliVersion>
4+
<RDBParserVersion>0.9.3</RDBParserVersion>
5+
<RDBCliVersion>0.9.3</RDBCliVersion>
66

77
</PropertyGroup>
88
</Project>

src/RDBCli/Helpers/CommonHelper.Func.cs

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,11 @@ internal static string GetExpireString(long exp)
5656
{
5757
var res = exp.ToString();
5858

59-
if (exp > 0)
59+
if (exp >= RDBParser.Constant.MaxExpireTimestamp)
60+
{
61+
res = ">7d";
62+
}
63+
else if (exp > 0)
6064
{
6165
var sub = DateTimeOffset.FromUnixTimeMilliseconds(exp).Subtract(DateTimeOffset.UtcNow);
6266

src/RDBParser/BinaryReaderRDBParser.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -240,7 +240,7 @@ private bool MatchFilter(int database = -1, int dataType = -1, byte[] key = null
240240

241241
if (_filter.IsExpired.HasValue)
242242
{
243-
if (_expiry == 0)
243+
if (_expiry == 0 || _expiry >= Constant.MaxExpireTimestamp)
244244
{
245245
return false;
246246
}

src/RDBParser/Constant.cs

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,9 @@
22
{
33
public static class Constant
44
{
5+
// 9999-12-31 23:59:59
6+
public static long MaxExpireTimestamp = 253402300799999;
7+
58
public static class RdbVersion
69
{
710
public const int Min = 1;

0 commit comments

Comments
 (0)