Code for 1.1.2045

  * Fixed bug in GetRangeFromSet
  * Simplify code in ExpirationManager
  * Code cleanup

Author: xavierjefferson

Hangfire.FluentNHibernateStorage/CountersAggregator.cs

@@ -53,20 +53,20 @@ public void Execute(CancellationToken cancellationToken)
                                     expireAt = i.Max(counter => counter.ExpireAt)
                                 })
                             .ToList();
-                        var query = session.CreateQuery(SQLHelper.UpdateAggregateCounterSql);
+                        var query = session.CreateQuery(SqlUtil.UpdateAggregateCounterSql);
 
                         foreach (var item in countersByName)
                         {
                             if (item.expireAt.HasValue)
                             {
-                                query.SetParameter(SQLHelper.ValueParameter2Name, item.expireAt.Value);
+                                query.SetParameter(SqlUtil.ValueParameter2Name, item.expireAt.Value);
                             }
                             else
                             {
-                                query.SetParameter(SQLHelper.ValueParameter2Name, null);
+                                query.SetParameter(SqlUtil.ValueParameter2Name, null);
                             }
-                            if (query.SetString(SQLHelper.IdParameterName, item.Key)
-                                    .SetParameter(SQLHelper.ValueParameterName, item.value)
+                            if (query.SetString(SqlUtil.IdParameterName, item.Key)
+                                    .SetParameter(SqlUtil.ValueParameterName, item.value)
                                     .ExecuteUpdate() == 0)
                             {
                                 session.Insert(new _AggregatedCounter

Hangfire.FluentNHibernateStorage/DateHelper.cs

@@ -4,11 +4,11 @@ namespace Hangfire.FluentNHibernateStorage
 {
     internal static class DateHelper
     {
-        public static readonly DateTime horizon = new DateTime(1970, 1, 1);
+        public static readonly DateTime Horizon = new DateTime(1970, 1, 1);
 
         public static long ToUnixDate(this DateTime dt)
         {
-            return Convert.ToInt64(dt.Subtract(horizon).TotalMilliseconds);
+            return Convert.ToInt64(dt.Subtract(Horizon).TotalMilliseconds);
         }
     }
 }

Hangfire.FluentNHibernateStorage/Entities/EntityBase0.cs renamed to Hangfire.FluentNHibernateStorage/Entities/Int64IdBase.cs

@@ -1,6 +1,6 @@
 namespace Hangfire.FluentNHibernateStorage.Entities
 {
-    public abstract class EntityBase0 : IInt64Id
+    public abstract class Int64IdBase : IInt64Id
     {
         public virtual long Id { get; set; }
     }

Hangfire.FluentNHibernateStorage/Entities/EntityBase1.cs renamed to Hangfire.FluentNHibernateStorage/Entities/KeyValueTypeBase.cs

@@ -2,7 +2,7 @@
 
 namespace Hangfire.FluentNHibernateStorage.Entities
 {
-    public abstract class EntityBase1<T> : EntityBase0, IExpirableWithKey, IExpirableWithId
+    public abstract class KeyValueTypeBase<T> : Int64IdBase, IExpirableWithKey, IExpirableWithId
     {
         public virtual T Value { get; set; }
         public virtual string Key { get; set; }

Hangfire.FluentNHibernateStorage/Entities/_AggregatedCounter.cs

@@ -1,6 +1,6 @@
 namespace Hangfire.FluentNHibernateStorage.Entities
 {
-    public class _AggregatedCounter : EntityBase1<long>
+    public class _AggregatedCounter : KeyValueTypeBase<long>
     {
     }
 }

Hangfire.FluentNHibernateStorage/Entities/_Counter.cs

@@ -1,6 +1,6 @@
 namespace Hangfire.FluentNHibernateStorage.Entities
 {
-    public class _Counter : EntityBase1<long>
+    public class _Counter : KeyValueTypeBase<long>
     {
     }
 }

Hangfire.FluentNHibernateStorage/Entities/_DistributedLock.cs

@@ -2,14 +2,18 @@
 
 namespace Hangfire.FluentNHibernateStorage.Entities
 {
-    public class _DistributedLock : EntityBase0
+    public class _DistributedLock : Int64IdBase
     {
         public _DistributedLock()
         {
             CreatedAt = DateTime.UtcNow;
             ExpireAtAsLong = DateTime.Now.ToUnixDate();
         }
 
+        /// <summary>
+        /// This is a long integer because NHibernate's default storage for dates
+        /// doesn't have accuracy smaller than 1 second.
+        /// </summary>
         public virtual long ExpireAtAsLong { get; set; }
         public virtual string Resource { get; set; }
         public virtual DateTime CreatedAt { get; set; }

Hangfire.FluentNHibernateStorage/Entities/_Dual.cs

@@ -1,6 +1,6 @@
 namespace Hangfire.FluentNHibernateStorage.Entities
 {
-    public class _Dual : EntityBase0
+    public class _Dual : Int64IdBase
     {
     }
 }

Hangfire.FluentNHibernateStorage/Entities/_Hash.cs

@@ -1,6 +1,6 @@
 namespace Hangfire.FluentNHibernateStorage.Entities
 {
-    public class _Hash : EntityBase1<string>
+    public class _Hash : KeyValueTypeBase<string>
     {
         public virtual string Field { get; set; }
     }

Hangfire.FluentNHibernateStorage/Entities/_JobParameter.cs

@@ -1,6 +1,6 @@
 namespace Hangfire.FluentNHibernateStorage.Entities
 {
-    public class _JobParameter : EntityBase0
+    public class _JobParameter : Int64IdBase
     {
         public virtual string Name { get; set; }
         public virtual string Value { get; set; }