SWEEP: Reviewed usage of atomic numeric type methods (#927)

* SWEEP: Reviewed all applications of .AddAndGet() methods from atomic numeric classes * SWEEP: Reviewed all applications of .GetAndAdd() methods from atomic numeric classes * SWEEP: Reviewed all applications of .IncrementAndGet(), .GetAndIncrement(), .DecrementAndGet(), and .GetAndDecrement() from atomic numeric classes. Closes #917.
apache · Mar 11, 2024 · 63e1053 · 63e1053
1 parent 4356997
commit 63e1053
Show file tree

Hide file tree

Showing 5 changed files with 11 additions and 10 deletions.
diff --git a/src/Lucene.Net.Replicator/LocalReplicator.cs b/src/Lucene.Net.Replicator/LocalReplicator.cs
@@ -3,6 +3,7 @@
 using System;
 using System.Collections.Generic;
 using System.Diagnostics;
+using System.Globalization;
 using System.IO;
 using System.Linq;
 
@@ -189,7 +190,7 @@ public virtual SessionToken CheckForUpdate(string currentVersion)
                 // currentVersion is either null or older than latest published revision
                 currentRevision.IncRef();
 
-                string sessionID = sessionToken.IncrementAndGet().ToString();
+                string sessionID = sessionToken.IncrementAndGet().ToString(CultureInfo.InvariantCulture);
                 SessionToken token = new SessionToken(sessionID, currentRevision.Revision);
                 sessions[sessionID] = new ReplicationSession(token, currentRevision);
                 return token;
@@ -329,4 +330,4 @@ public virtual void Release(string sessionId)
             }
         }
     }
-}
+}
diff --git a/src/Lucene.Net.TestFramework/Codecs/RAMOnly/RAMOnlyPostingsFormat.cs b/src/Lucene.Net.TestFramework/Codecs/RAMOnly/RAMOnlyPostingsFormat.cs
@@ -572,7 +572,7 @@ public override long GetCost()
         // Holds all indexes created, keyed by the ID assigned in fieldsConsumer
         private readonly IDictionary<int, RAMPostings> state = new Dictionary<int, RAMPostings>();
 
-        private readonly AtomicInt64 nextID = new AtomicInt64();
+        private readonly AtomicInt32 nextID = new AtomicInt32();
 
         private readonly string RAM_ONLY_NAME = "RAMOnly";
         private const int VERSION_START = 0;
@@ -582,7 +582,7 @@ public override long GetCost()
 
         public override FieldsConsumer FieldsConsumer(SegmentWriteState writeState)
         {
-            int id = (int)nextID.GetAndIncrement();
+            int id = nextID.GetAndIncrement();
 
             // TODO -- ok to do this up front instead of
             // on close....?  should be ok?
@@ -659,4 +659,4 @@ public override FieldsProducer FieldsProducer(SegmentReadState readState)
             }
         }
     }
-}
+}
diff --git a/src/Lucene.Net.TestFramework/Store/MockDirectoryWrapper.cs b/src/Lucene.Net.TestFramework/Store/MockDirectoryWrapper.cs
@@ -704,7 +704,7 @@ public override IndexOutput CreateOutput(string name, IOContext context)
                     {
                         if (existing != null)
                         {
-                            ramdir.m_sizeInBytes.AddAndGet(-existing.GetSizeInBytes()); // LUCENENET: GetAndAdd in Lucene, but we are not using the value
+                            ramdir.m_sizeInBytes.GetAndAdd(-existing.GetSizeInBytes());
                             existing.directory = null;
                         }
                         ramdir.m_fileMap[name] = file;
@@ -1558,4 +1558,4 @@ protected FakeIOException(SerializationInfo info, StreamingContext context)
         }
 #endif
     }
-}
+}
diff --git a/src/Lucene.Net.Tests/Search/TestBooleanOr.cs b/src/Lucene.Net.Tests/Search/TestBooleanOr.cs
@@ -205,7 +205,7 @@ public virtual void TestBooleanScorerMax()
             while (end.Value < docCount)
             {
                 int inc = TestUtil.NextInt32(Random, 1, 1000);
-                end.AddAndGet(inc);
+                end.GetAndAdd(inc);
                 scorer.Score(c, end);
             }
 

diff --git a/src/Lucene.Net/Store/RAMFile.cs b/src/Lucene.Net/Store/RAMFile.cs
@@ -90,7 +90,7 @@ protected internal byte[] AddBuffer(int size)
                 UninterruptableMonitor.Exit(this);
             }
 
-            directory?.m_sizeInBytes.AddAndGet(size);
+            directory?.m_sizeInBytes.GetAndAdd(size);
             return buffer;
         }
 
@@ -146,4 +146,4 @@ public virtual long GetSizeInBytes()
             }
         }
     }
-}
+}