Merging from work branch

microsoft · Sep 5, 2019 · 990d789 · 990d789
2 parents 7e80b07 + 6cab32a
commit 990d789
Show file tree

Hide file tree

Showing 61 changed files with 2,569 additions and 749 deletions.
diff --git a/cs/benchmark/Functions.cs b/cs/benchmark/Functions.cs
@@ -7,6 +7,7 @@
 using System.Runtime.CompilerServices;
 using System.Diagnostics;
 using FASTER.core;
+using System.Collections.Generic;
 
 namespace FASTER.benchmark
 {
@@ -28,9 +29,9 @@ public void DeleteCompletionCallback(ref Key key, Empty ctx)
         {
         }
 
-        public void CheckpointCompletionCallback(Guid sessionId, long serialNum)
+        public void CheckpointCompletionCallback(Guid sessionId, CommitPoint commitPoint)
         {
-            Debug.WriteLine("Session {0} reports persistence until {1}", sessionId, serialNum);
+            Debug.WriteLine("Session {0} reports persistence until {1}", sessionId, commitPoint.UntilSerialNo);
         }
 
         // Read functions
@@ -54,9 +55,10 @@ public void SingleWriter(ref Key key, ref Value src, ref Value dst)
         }
 
         [MethodImpl(MethodImplOptions.AggressiveInlining)]
-        public void ConcurrentWriter(ref Key key, ref Value src, ref Value dst)
+        public bool ConcurrentWriter(ref Key key, ref Value src, ref Value dst)
         {
             dst = src;
+            return true;
         }
 
         // RMW functions
@@ -67,9 +69,10 @@ public void InitialUpdater(ref Key key, ref Input input, ref Value value)
         }
 
         [MethodImpl(MethodImplOptions.AggressiveInlining)]
-        public void InPlaceUpdater(ref Key key, ref Input input, ref Value value)
+        public bool InPlaceUpdater(ref Key key, ref Input input, ref Value value)
         {
             value.value += input.value;
+            return true;
         }
 
         [MethodImpl(MethodImplOptions.AggressiveInlining)]

diff --git a/cs/playground/ClassCache/Types.cs b/cs/playground/ClassCache/Types.cs
@@ -92,9 +92,10 @@ public void ConcurrentReader(ref CacheKey key, ref CacheInput input, ref CacheVa
             dst.value = value;
         }
 
-        public void ConcurrentWriter(ref CacheKey key, ref CacheValue src, ref CacheValue dst)
+        public bool ConcurrentWriter(ref CacheKey key, ref CacheValue src, ref CacheValue dst)
         {
             dst = src;
+            return true;
         }
 
         public void CopyUpdater(ref CacheKey key, ref CacheInput input, ref CacheValue oldValue, ref CacheValue newValue)
@@ -107,12 +108,12 @@ public void InitialUpdater(ref CacheKey key, ref CacheInput input, ref CacheValu
             throw new NotImplementedException();
         }
 
-        public void InPlaceUpdater(ref CacheKey key, ref CacheInput input, ref CacheValue value)
+        public bool InPlaceUpdater(ref CacheKey key, ref CacheInput input, ref CacheValue value)
         {
             throw new NotImplementedException();
         }
 
-        public void CheckpointCompletionCallback(Guid sessionId, long serialNum)
+        public void CheckpointCompletionCallback(Guid sessionId, CommitPoint commitPoint)
         {
             throw new NotImplementedException();
         }

diff --git a/cs/playground/ClassCacheMT/Types.cs b/cs/playground/ClassCacheMT/Types.cs
@@ -92,9 +92,10 @@ public void ConcurrentReader(ref CacheKey key, ref CacheInput input, ref CacheVa
             dst.value = value;
         }
 
-        public void ConcurrentWriter(ref CacheKey key, ref CacheValue src, ref CacheValue dst)
+        public bool ConcurrentWriter(ref CacheKey key, ref CacheValue src, ref CacheValue dst)
         {
             dst = src;
+            return true;
         }
 
         public void CopyUpdater(ref CacheKey key, ref CacheInput input, ref CacheValue oldValue, ref CacheValue newValue)
@@ -107,12 +108,12 @@ public void InitialUpdater(ref CacheKey key, ref CacheInput input, ref CacheValu
             throw new NotImplementedException();
         }
 
-        public void InPlaceUpdater(ref CacheKey key, ref CacheInput input, ref CacheValue value)
+        public bool InPlaceUpdater(ref CacheKey key, ref CacheInput input, ref CacheValue value)
         {
             throw new NotImplementedException();
         }
 
-        public void CheckpointCompletionCallback(Guid sessionId, long serialNum)
+        public void CheckpointCompletionCallback(Guid sessionId, CommitPoint commitPoint)
         {
             throw new NotImplementedException();
         }

diff --git a/cs/playground/ClassSample/Program.cs b/cs/playground/ClassSample/Program.cs
@@ -75,19 +75,19 @@ public class MyFunctions : IFunctions<MyKey, MyValue, MyInput, MyOutput, MyConte
     {
         public void InitialUpdater(ref MyKey key, ref MyInput input, ref MyValue value) => value.value = input.value;
         public void CopyUpdater(ref MyKey key, ref MyInput input, ref MyValue oldValue, ref MyValue newValue) => newValue = oldValue;
-        public void InPlaceUpdater(ref MyKey key, ref MyInput input, ref MyValue value) => value.value += input.value;
+        public bool InPlaceUpdater(ref MyKey key, ref MyInput input, ref MyValue value) { value.value += input.value; return true; }
 
 
         public void SingleReader(ref MyKey key, ref MyInput input, ref MyValue value, ref MyOutput dst) => dst.value = value;
         public void SingleWriter(ref MyKey key, ref MyValue src, ref MyValue dst) => dst = src;
         public void ConcurrentReader(ref MyKey key, ref MyInput input, ref MyValue value, ref MyOutput dst) => dst.value = value;
-        public void ConcurrentWriter(ref MyKey key, ref MyValue src, ref MyValue dst) => dst = src;
+        public bool ConcurrentWriter(ref MyKey key, ref MyValue src, ref MyValue dst) { dst = src; return true; }
 
         public void ReadCompletionCallback(ref MyKey key, ref MyInput input, ref MyOutput output, MyContext ctx, Status status) { }
         public void UpsertCompletionCallback(ref MyKey key, ref MyValue value, MyContext ctx) { }
         public void RMWCompletionCallback(ref MyKey key, ref MyInput input, MyContext ctx, Status status) { }
         public void DeleteCompletionCallback(ref MyKey key, MyContext ctx) { }
-        public void CheckpointCompletionCallback(Guid sessionId, long serialNum) { }
+        public void CheckpointCompletionCallback(Guid sessionId, CommitPoint commitPoint) { }
     }
 
     class Program

diff --git a/cs/playground/FixedLenStructSample/Functions.cs b/cs/playground/FixedLenStructSample/Functions.cs
@@ -3,6 +3,7 @@
 
 using FASTER.core;
 using System;
+using System.Collections.Generic;
 
 namespace FixedLenStructSample
 {
@@ -11,7 +12,7 @@ namespace FixedLenStructSample
     /// </summary>
     public class FixedLenFunctions : IFunctions<FixedLenKey, FixedLenValue, string, string, Empty>
     {
-        public void CheckpointCompletionCallback(Guid sessionId, long serialNum)
+        public void CheckpointCompletionCallback(Guid sessionId, CommitPoint commitPoint)
         {
         }
 
@@ -20,9 +21,10 @@ public void ConcurrentReader(ref FixedLenKey key, ref string input, ref FixedLen
             dst = value.ToString();
         }
 
-        public void ConcurrentWriter(ref FixedLenKey key, ref FixedLenValue src, ref FixedLenValue dst)
+        public bool ConcurrentWriter(ref FixedLenKey key, ref FixedLenValue src, ref FixedLenValue dst)
         {
             src.CopyTo(ref dst);
+            return true;
         }
 
         public void CopyUpdater(ref FixedLenKey key, ref string input, ref FixedLenValue oldValue, ref FixedLenValue newValue)
@@ -37,8 +39,9 @@ public void InitialUpdater(ref FixedLenKey key, ref string input, ref FixedLenVa
         {
         }
 
-        public void InPlaceUpdater(ref FixedLenKey key, ref string input, ref FixedLenValue value)
+        public bool InPlaceUpdater(ref FixedLenKey key, ref string input, ref FixedLenValue value)
         {
+            return true;
         }
 
         public void ReadCompletionCallback(ref FixedLenKey key, ref string input, ref string output, Empty ctx, Status status)

diff --git a/cs/playground/PeriodicCompaction/Types.cs b/cs/playground/PeriodicCompaction/Types.cs
@@ -92,9 +92,10 @@ public void ConcurrentReader(ref CacheKey key, ref CacheInput input, ref CacheVa
             dst.value = value;
         }
 
-        public void ConcurrentWriter(ref CacheKey key, ref CacheValue src, ref CacheValue dst)
+        public bool ConcurrentWriter(ref CacheKey key, ref CacheValue src, ref CacheValue dst)
         {
             dst = src;
+            return true;
         }
 
         public void CopyUpdater(ref CacheKey key, ref CacheInput input, ref CacheValue oldValue, ref CacheValue newValue)
@@ -107,12 +108,12 @@ public void InitialUpdater(ref CacheKey key, ref CacheInput input, ref CacheValu
             throw new NotImplementedException();
         }
 
-        public void InPlaceUpdater(ref CacheKey key, ref CacheInput input, ref CacheValue value)
+        public bool InPlaceUpdater(ref CacheKey key, ref CacheInput input, ref CacheValue value)
         {
             throw new NotImplementedException();
         }
 
-        public void CheckpointCompletionCallback(Guid sessionId, long serialNum)
+        public void CheckpointCompletionCallback(Guid sessionId, CommitPoint commitPoint)
         {
             throw new NotImplementedException();
         }

diff --git a/cs/playground/StructSample/Functions.cs b/cs/playground/StructSample/Functions.cs
@@ -3,6 +3,7 @@
 
 using FASTER.core;
 using System;
+using System.Collections.Generic;
 using System.Diagnostics;
 using System.Runtime.CompilerServices;
 
@@ -19,19 +20,19 @@ public class Sample1Funcs : IFunctions<long, long, long, long, Empty>
 
         // Write functions
         public void SingleWriter(ref long key, ref long src, ref long dst) => dst = src;
-        public void ConcurrentWriter(ref long key, ref long src, ref long dst) => dst = src;
+        public bool ConcurrentWriter(ref long key, ref long src, ref long dst) { dst = src; return true; }
 
         // RMW functions
         public void InitialUpdater(ref long key, ref long input, ref long value) => value = input;
         public void CopyUpdater(ref long key, ref long input, ref long oldv, ref long newv) => newv = oldv + input;
-        public void InPlaceUpdater(ref long key, ref long input, ref long value) => value += input;
+        public bool InPlaceUpdater(ref long key, ref long input, ref long value) { value += input; return true; }
 
         // Completion callbacks
         public void ReadCompletionCallback(ref long key, ref long input, ref long output, Empty ctx, Status s) { }
         public void UpsertCompletionCallback(ref long key, ref long value, Empty ctx) { }
         public void DeleteCompletionCallback(ref long key, Empty ctx) { }
         public void RMWCompletionCallback(ref long key, ref long input, Empty ctx, Status s) { }
-        public void CheckpointCompletionCallback(Guid sessionId, long serialNum) { }
+        public void CheckpointCompletionCallback(Guid sessionId, CommitPoint commitPoint) { }
     }
 
 
@@ -46,7 +47,7 @@ public class Sample2Funcs : IFunctions<Key, Value, Input, Output, Empty>
 
         // Write functions
         public void SingleWriter(ref Key key, ref Value src, ref Value dst) => dst = src;
-        public void ConcurrentWriter(ref Key key, ref Value src, ref Value dst) => dst = src;
+        public bool ConcurrentWriter(ref Key key, ref Value src, ref Value dst) { dst = src; return true; }
 
         // RMW functions
         public void InitialUpdater(ref Key key, ref Input input, ref Value value)
@@ -59,17 +60,18 @@ public void CopyUpdater(ref Key key, ref Input input, ref Value oldValue, ref Va
             newValue.vfield1 = oldValue.vfield1 + input.ifield1;
             newValue.vfield2 = oldValue.vfield2 + input.ifield2;
         }
-        public void InPlaceUpdater(ref Key key, ref Input input, ref Value value)
+        public bool InPlaceUpdater(ref Key key, ref Input input, ref Value value)
         {
             value.vfield1 += input.ifield1;
             value.vfield2 += input.ifield2;
+            return true;
         }
 
         // Completion callbacks
         public void ReadCompletionCallback(ref Key key, ref Input input, ref Output output, Empty ctx, Status status) { }
         public void UpsertCompletionCallback(ref Key key, ref Value output, Empty ctx) { }
         public void DeleteCompletionCallback(ref Key key, Empty ctx) { }
         public void RMWCompletionCallback(ref Key key, ref Input output, Empty ctx, Status status) { }
-        public void CheckpointCompletionCallback(Guid sessionId, long serialNum) { }
+        public void CheckpointCompletionCallback(Guid sessionId, CommitPoint commitPoint) { }
     }
 }
diff --git a/cs/playground/StructSampleCore/Functions.cs b/cs/playground/StructSampleCore/Functions.cs
@@ -3,6 +3,7 @@
 
 using FASTER.core;
 using System;
+using System.Collections.Generic;
 using System.Diagnostics;
 using System.Runtime.CompilerServices;
 
@@ -19,19 +20,19 @@ public class Sample1Funcs : IFunctions<long, long, long, long, Empty>
 
         // Write functions
         public void SingleWriter(ref long key, ref long src, ref long dst) => dst = src;
-        public void ConcurrentWriter(ref long key, ref long src, ref long dst) => dst = src;
+        public bool ConcurrentWriter(ref long key, ref long src, ref long dst) { dst = src; return true; }
 
         // RMW functions
         public void InitialUpdater(ref long key, ref long input, ref long value) => value = input;
         public void CopyUpdater(ref long key, ref long input, ref long oldv, ref long newv) => newv = oldv + input;
-        public void InPlaceUpdater(ref long key, ref long input, ref long value) => value += input;
+        public bool InPlaceUpdater(ref long key, ref long input, ref long value) { value += input; return true; }
 
         // Completion callbacks
         public void ReadCompletionCallback(ref long key, ref long input, ref long output, Empty ctx, Status s) { }
         public void UpsertCompletionCallback(ref long key, ref long value, Empty ctx) { }
         public void DeleteCompletionCallback(ref long key, Empty ctx) { }
         public void RMWCompletionCallback(ref long key, ref long input, Empty ctx, Status s) { }
-        public void CheckpointCompletionCallback(Guid sessionId, long serialNum) { }
+        public void CheckpointCompletionCallback(Guid sessionId, CommitPoint commitPoint) { }
     }
 
 
@@ -46,7 +47,7 @@ public class Sample2Funcs : IFunctions<Key, Value, Input, Output, Empty>
 
         // Write functions
         public void SingleWriter(ref Key key, ref Value src, ref Value dst) => dst = src;
-        public void ConcurrentWriter(ref Key key, ref Value src, ref Value dst) => dst = src;
+        public bool ConcurrentWriter(ref Key key, ref Value src, ref Value dst) { dst = src; return true; }
 
         // RMW functions
         public void InitialUpdater(ref Key key, ref Input input, ref Value value)
@@ -59,17 +60,18 @@ public void CopyUpdater(ref Key key, ref Input input, ref Value oldValue, ref Va
             newValue.vfield1 = oldValue.vfield1 + input.ifield1;
             newValue.vfield2 = oldValue.vfield2 + input.ifield2;
         }
-        public void InPlaceUpdater(ref Key key, ref Input input, ref Value value)
+        public bool InPlaceUpdater(ref Key key, ref Input input, ref Value value)
         {
             value.vfield1 += input.ifield1;
             value.vfield2 += input.ifield2;
+            return true;
         }
 
         // Completion callbacks
         public void ReadCompletionCallback(ref Key key, ref Input input, ref Output output, Empty ctx, Status status) { }
         public void UpsertCompletionCallback(ref Key key, ref Value output, Empty ctx) { }
         public void DeleteCompletionCallback(ref Key key, Empty ctx) { }
         public void RMWCompletionCallback(ref Key key, ref Input output, Empty ctx, Status status) { }
-        public void CheckpointCompletionCallback(Guid sessionId, long serialNum) { }
+        public void CheckpointCompletionCallback(Guid sessionId, CommitPoint commitPoint) { }
     }
 }
diff --git a/cs/playground/SumStore/RecoveryTest.cs b/cs/playground/SumStore/RecoveryTest.cs
@@ -121,7 +121,7 @@ private void RunThread(int threadId, bool continueSession)
                 // Register with thread
                 do
                 {
-                    sno = fht.ContinueSession(sessionGuid);
+                    sno = fht.ContinueSession(sessionGuid).UntilSerialNo;
                 } while (sno == -1);
                 Console.WriteLine("Session {0} recovered until {1}", sessionGuid, sno);
                 sno++;
@@ -195,7 +195,7 @@ private void Test()
                 // Register with thread
                 long _sno = -1;
                 do {
-                    _sno = fht.ContinueSession(sessionGuid);
+                    _sno = fht.ContinueSession(sessionGuid).UntilSerialNo;
                 } while (_sno == -1);
                 sno.Add(_sno);
 

diff --git a/cs/playground/SumStore/SumStoreTypes.cs b/cs/playground/SumStore/SumStoreTypes.cs
@@ -62,9 +62,9 @@ public void DeleteCompletionCallback(ref AdId key, Empty ctx)
         {
         }
 
-        public void CheckpointCompletionCallback(Guid sessionId, long serialNum)
+        public void CheckpointCompletionCallback(Guid sessionId, CommitPoint commitPoint)
         {
-            Console.WriteLine("Session {0} reports persistence until {1}", sessionId, serialNum);
+            Console.WriteLine("Session {0} reports persistence until {1}", sessionId, commitPoint.UntilSerialNo);
         }
 
         // Read functions
@@ -84,9 +84,10 @@ public void SingleWriter(ref AdId key, ref NumClicks src, ref NumClicks dst)
             dst = src;
         }
 
-        public void ConcurrentWriter(ref AdId key, ref NumClicks src, ref NumClicks dst)
+        public bool ConcurrentWriter(ref AdId key, ref NumClicks src, ref NumClicks dst)
         {
             dst = src;
+            return true;
         }
 
         // RMW functions
@@ -95,9 +96,10 @@ public void InitialUpdater(ref AdId key, ref Input input, ref NumClicks value)
             value = input.numClicks;
         }
 
-        public void InPlaceUpdater(ref AdId key, ref Input input, ref NumClicks value)
+        public bool InPlaceUpdater(ref AdId key, ref Input input, ref NumClicks value)
         {
             Interlocked.Add(ref value.numClicks, input.numClicks.numClicks);
+            return true;
         }
 
         public void CopyUpdater(ref AdId key, ref Input input, ref NumClicks oldValue, ref NumClicks newValue)