avoid commiting needlessly.

Also calling tick from invoke is close to a taxing noop as it is only if it exceeds the upper bound it would perform the commit.

Author: jmd

src/DotJEM.Json.Index2.Management/Writer/IJsonIndexWriter.cs

@@ -47,20 +47,23 @@ public void Update(JObject entity)
         Term term = resolver.Resolver.Identity(entity);
         LuceneDocumentEntry doc = mapper.Create(entity);
         Writer.UpdateDocument(term, doc.Document);
+        throttledCommit.Increment();
         DebugInfo($"Writer.UpdateDocument({term}, <doc>)");
     }
 
     public void Create(JObject entity)
     {
         LuceneDocumentEntry doc = mapper.Create(entity);
         Writer.AddDocument(doc.Document);
+        throttledCommit.Increment();
         DebugInfo($"Writer.AddDocument(<doc>)");
     }
 
     public void Delete(JObject entity)
     {
         Term term = resolver.Resolver.Identity(entity);
         Writer.DeleteDocuments(term);
+        throttledCommit.Increment();
         DebugInfo($"Writer.UpdateDocuments({term})");
     }
 
@@ -92,10 +95,11 @@ public class ThrottledCommit
         private readonly JsonIndexWriter target;
         private readonly WaitHandle handle = new AutoResetEvent(false);
         private readonly long upperBound = Stopwatch.Frequency * 10;
-        private readonly long lowerBound = Stopwatch.Frequency / 10;
+        private readonly long lowerBound = Stopwatch.Frequency / 5;
 
         private long lastInvocation = 0;
         private long lastRequest = 0;
+        private long writes = 0;
 
         public ThrottledCommit(JsonIndexWriter target)
         {
@@ -122,6 +126,9 @@ private void Tick()
 
         private void Commit()
         {
+            if(Interlocked.Exchange(ref writes, 0) < 1)
+                return;
+
             try
             {
                 target.Writer.Commit();
@@ -136,7 +143,11 @@ private void Commit()
         public void Invoke()
         {
             lastRequest = Stopwatch.GetTimestamp();
-            Tick();
+        }
+
+        public void Increment()
+        {
+            Interlocked.Increment(ref writes);
         }
     }
 }

src/DotJEM.Json.Index2.Snapshots/IndexSnapshotHandler.cs

@@ -93,6 +93,9 @@ private static async Task<bool> UnpackSnapshotAsync(IJsonIndex index, ISnapshot
         if(!snapshot.Verify())
             return false;
 
+        // TODO: Lock index and move close here:
+        // index.WriterManager.Close();
+
         using ISnapshotReader reader = snapshot.OpenReader();
         List<IIndexFile> snapshotFiles = reader.GetIndexFiles().ToList();