Merge branch 'hilo-bug' of http://github.com/hdeshev/NoRM

atheken · Jul 8, 2010 · 9c13a59 · 9c13a59
2 parents 948676b + ec5625c
commit 9c13a59
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 11 deletions.
diff --git a/NoRM/Collections/CollectionHiLoIdGenerator.cs b/NoRM/Collections/CollectionHiLoIdGenerator.cs
@@ -36,17 +36,17 @@ public long GenerateId(MongoDatabase db, string collectionName)
             lock (generatorLock)
             {
                 if (keyGeneratorsByTag.TryGetValue(collectionName, out value))
-                    return value.GenerateId(collectionName);
+                    return value.GenerateId(collectionName, db);
 
-                value = new HiLoIdGenerator(db, _capacity);
+                value = new HiLoIdGenerator(_capacity);
                 // doing it this way for thread safety
                 keyGeneratorsByTag = new Dictionary<string, HiLoIdGenerator>(keyGeneratorsByTag)
                 {
                     {collectionName, value}
                 };
             }
 
-            return value.GenerateId(collectionName);
+            return value.GenerateId(collectionName, db);
         }
     }
 }
diff --git a/NoRM/Collections/HiLoIdGenerator.cs b/NoRM/Collections/HiLoIdGenerator.cs
@@ -17,11 +17,9 @@ public class HiLoIdGenerator
         private readonly object generatorLock = new object();
         private long _currentHi;
         private long _currentLo;
-        private MongoDatabase _db;
 
-        public HiLoIdGenerator(MongoDatabase db, long capacity)
+        public HiLoIdGenerator(long capacity)
         {
-            _db = db;
             _currentHi = 0;
             _capacity = capacity;
             _currentLo = capacity + 1;
@@ -32,7 +30,7 @@ public HiLoIdGenerator(MongoDatabase db, long capacity)
         /// </summary>
         /// <param name="collectionName">Collection Name</param>
         /// <returns></returns>
-        public long GenerateId(string collectionName)
+        public long GenerateId(string collectionName, MongoDatabase database)
         {
             long incrementedCurrentLow = Interlocked.Increment(ref _currentLo);
             if (incrementedCurrentLow > _capacity)
@@ -41,7 +39,7 @@ public long GenerateId(string collectionName)
                 {
                     if (Thread.VolatileRead(ref _currentLo) > _capacity)
                     {
-                        _currentHi = GetNextHi(collectionName);
+                        _currentHi = GetNextHi(collectionName, database);
                         _currentLo = 1;
                         incrementedCurrentLow = 1;
                     }
@@ -50,7 +48,7 @@ public long GenerateId(string collectionName)
             return (_currentHi - 1) * _capacity + (incrementedCurrentLow);
         }
 
-        private long GetNextHi(string collectionName)
+        private long GetNextHi(string collectionName, MongoDatabase database)
         {
             while (true)
             {
@@ -59,10 +57,10 @@ private long GetNextHi(string collectionName)
                     var update = new Expando();
                     update["$inc"] = new { ServerHi = 1 };
 
-                    var hiLoKey = _db.GetCollection<NormHiLoKey>().FindAndModify(new { _id = collectionName }, update);
+                    var hiLoKey = database.GetCollection<NormHiLoKey>().FindAndModify(new { _id = collectionName }, update);
                     if (hiLoKey == null)
                     {
-                        _db.GetCollection<NormHiLoKey>().Insert(new NormHiLoKey { CollectionName = collectionName, ServerHi = 2 });
+                        database.GetCollection<NormHiLoKey>().Insert(new NormHiLoKey { CollectionName = collectionName, ServerHi = 2 });
                         return 1;
                     }