Merge branch 'master' into async-support

microsoft · Jul 26, 2019 · 6c5420a · 6c5420a
2 parents 2fff5cb + c617beb
commit 6c5420a
Show file tree

Hide file tree

Showing 14 changed files with 600 additions and 380 deletions.
diff --git a/cs/src/core/Allocator/MallocFixedPageSize.cs b/cs/src/core/Allocator/MallocFixedPageSize.cs
@@ -422,10 +422,11 @@ public void Dispose()
         /// Public facing persistence API
         /// </summary>
         /// <param name="device"></param>
+        /// <param name="start_offset"></param>
         /// <param name="numBytes"></param>
-        public void TakeCheckpoint(IDevice device, out ulong numBytes)
+        public void TakeCheckpoint(IDevice device, ulong start_offset, out ulong numBytes)
         {
-            BeginCheckpoint(device, 0UL, out numBytes);
+            BeginCheckpoint(device, start_offset, out numBytes);
         }
 
         /// <summary>
@@ -515,9 +516,10 @@ public int GetPageSize()
         /// <param name="device"></param>
         /// <param name="buckets"></param>
         /// <param name="numBytes"></param>
-        public void Recover(IDevice device, int buckets, ulong numBytes)
+        /// <param name="offset"></param>
+        public void Recover(IDevice device, ulong offset, int buckets, ulong numBytes)
         {
-            BeginRecovery(device, 0UL, buckets, numBytes, out ulong numBytesRead);
+            BeginRecovery(device, offset, buckets, numBytes, out ulong numBytesRead);
         }
 
         /// <summary>

diff --git a/cs/src/core/Index/Common/CheckpointSettings.cs b/cs/src/core/Index/Common/CheckpointSettings.cs
@@ -2,6 +2,8 @@
 // Licensed under the MIT license.
 
 
+using System;
+
 namespace FASTER.core
 {
     /// <summary>
@@ -27,13 +29,20 @@ public enum CheckpointType
     public class CheckpointSettings
     {
         /// <summary>
-        /// Directory where checkpoints are stored
+        /// Checkpoint manager
         /// </summary>
-        public string CheckpointDir = "";
+        public ICheckpointManager CheckpointManager = null;
 
         /// <summary>
         /// Type of checkpoint
         /// </summary>
         public CheckpointType CheckPointType = CheckpointType.Snapshot;
+
+        /// <summary>
+        /// Use specified directory for storing and retrieving checkpoints
+        /// This is a shortcut to providing the following:
+        ///   CheckpointSettings.CheckpointManager = new LocalCheckpointManager(CheckpointDir)
+        /// </summary>
+        public string CheckpointDir = null;
     }
 }