Updates to merge

microsoft · Oct 5, 2019 · 0c0bf58 · 0c0bf58
1 parent 72cdfdb
commit 0c0bf58
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 28 deletions.
diff --git a/cs/src/core/Epochs/LightEpoch.cs b/cs/src/core/Epochs/LightEpoch.cs
@@ -227,32 +227,6 @@ public void Resume()
             ProtectAndDrain();
         }
 
-        /// <summary>
-        /// Thread suspends its epoch entry
-        /// </summary>
-        public void Suspend()
-        {
-            int entry = threadEntryIndex.Value;
-            if (kInvalidIndex == entry)
-            {
-                return;
-            }
-            (*(tableAligned + entry)).localCurrentEpoch = int.MaxValue;
-        }
-
-        /// <summary>
-        /// Thread resumes its epoch entry
-        /// </summary>
-        public void Resume()
-        {
-            if (!threadEntryIndex.IsInitializedForThread || threadEntryIndex.Value == kInvalidIndex)
-            {
-                Acquire();
-            }
-        }
-
-        internal FastThreadLocal<int> ThreadEntry => threadEntryIndex;
-
         /// <summary>
         /// Increment global current epoch
         /// </summary>

diff --git a/cs/src/core/Index/FasterLog/FasterLog.cs b/cs/src/core/Index/FasterLog/FasterLog.cs
@@ -291,7 +291,7 @@ public async ValueTask WaitForCommitAsync(long untilAddress = 0)
         public long FlushAndCommit(bool spinWait = false)
         {
             epoch.Resume();
-            allocator.ShiftReadOnlyToTail(out long tailAddress);
+            allocator.ShiftReadOnlyToTail(out long tailAddress, out _);
 
             if (spinWait)
             {

diff --git a/cs/test/FasterLogTests.cs b/cs/test/FasterLogTests.cs
@@ -2,6 +2,7 @@
 // Licensed under the MIT license.
 
 using System;
+using System.IO;
 using System.Linq;
 using FASTER.core;
 using NUnit.Framework;
@@ -13,21 +14,25 @@ namespace FASTER.test
     internal class FasterLogTests
     {
         const int entryLength = 100;
-        const int numEntries = 1000000;
+        const int numEntries = 100;
         private FasterLog log;
         private IDevice device;
 
 
         [SetUp]
         public void Setup()
         {
+            if (File.Exists(TestContext.CurrentContext.TestDirectory + "\\fasterlog.log.commit"))
+                File.Delete(TestContext.CurrentContext.TestDirectory + "\\fasterlog.log.commit");
             device = Devices.CreateLogDevice(TestContext.CurrentContext.TestDirectory + "\\fasterlog.log", deleteOnClose: true);
         }
 
         [TearDown]
         public void TearDown()
         {
             device.Close();
+            if (File.Exists(TestContext.CurrentContext.TestDirectory + "\\fasterlog.log.commit"))
+                File.Delete(TestContext.CurrentContext.TestDirectory + "\\fasterlog.log.commit");
         }
 
         [Test]