From cd79a44d30e4e2d42eb8dc0f7e98697e77540951 Mon Sep 17 00:00:00 2001 From: Shad Storhaug Date: Mon, 11 Mar 2024 02:30:43 +0700 Subject: [PATCH] SWEEP: Reviewed all applications of .IncrementAndGet(), .GetAndIncrement(), .DecrementAndGet(), and .GetAndDecrement() from atomic numeric classes. Closes #917. --- src/Lucene.Net.Replicator/LocalReplicator.cs | 5 +++-- .../Codecs/RAMOnly/RAMOnlyPostingsFormat.cs | 6 +++--- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/src/Lucene.Net.Replicator/LocalReplicator.cs b/src/Lucene.Net.Replicator/LocalReplicator.cs index 7566570666..a7c06b7dfb 100644 --- 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) } } } -} \ No newline at end of file +} diff --git a/src/Lucene.Net.TestFramework/Codecs/RAMOnly/RAMOnlyPostingsFormat.cs b/src/Lucene.Net.TestFramework/Codecs/RAMOnly/RAMOnlyPostingsFormat.cs index badefe6a65..6f198afc48 100644 --- 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 state = new Dictionary(); - 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) } } } -} \ No newline at end of file +}