[C#] Merge IAdvancedFunctions into IFunctions

.gitignore

@@ -158,6 +158,7 @@ ClientBin/
 *.pfx
 *.publishsettings
 node_modules/
+**/log-commits
 
 # RIA/Silverlight projects
 Generated_Code/

cs/benchmark/Functions.cs

@@ -1,8 +1,6 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT license.
 
-#pragma warning disable 1591
-
 using System.Runtime.CompilerServices;
 using System.Diagnostics;
 using FASTER.core;
@@ -12,18 +10,25 @@ namespace FASTER.benchmark
     public struct Functions : IFunctions<Key, Value, Input, Output, Empty>
     {
         readonly bool locking;
+        readonly bool postOps;
 
-        public Functions(bool locking) => this.locking = locking;
+        public Functions(bool locking, bool postOps = false)
+        {
+            this.locking = locking;
+            this.postOps = postOps;
+        }
 
-        public void RMWCompletionCallback(ref Key key, ref Input input, ref Output output, Empty ctx, Status status)
+        public bool SupportsPostOperations => this.postOps;
+
+        public void RMWCompletionCallback(ref Key key, ref Input input, ref Output output, Empty ctx, Status status, RecordMetadata recordMetadata)
         {
         }
 
-        public void ReadCompletionCallback(ref Key key, ref Input input, ref Output output, Empty ctx, Status status)
+        public void ReadCompletionCallback(ref Key key, ref Input input, ref Output output, Empty ctx, Status status, RecordMetadata recordMetadata)
         {
         }
 
-        public void UpsertCompletionCallback(ref Key key, ref Value value, Empty ctx)
+        public void UpsertCompletionCallback(ref Key key, ref Input input, ref Value value, Empty ctx)
         {
         }
 
@@ -38,54 +43,56 @@ public void CheckpointCompletionCallback(string sessionId, CommitPoint commitPoi
 
         // Read functions
         [MethodImpl(MethodImplOptions.AggressiveInlining)]
-        public bool SingleReader(ref Key key, ref Input input, ref Value value, ref Output dst)
+        public bool SingleReader(ref Key key, ref Input input, ref Value value, ref Output dst, ref RecordInfo recordInfo, long address)
         {
             dst.value = value;
             return true;
         }
 
         [MethodImpl(MethodImplOptions.AggressiveInlining)]
-        public bool ConcurrentReader(ref Key key, ref Input input, ref Value value, ref Output dst)
+        public bool ConcurrentReader(ref Key key, ref Input input, ref Value value, ref Output dst, ref RecordInfo recordInfo, long address)
         {
             dst.value = value;
             return true;
         }
 
+        public bool ConcurrentDeleter(ref Key key, ref Value value, ref RecordInfo recordInfo, long address) => true;
+
         // Upsert functions
         [MethodImpl(MethodImplOptions.AggressiveInlining)]
-        public void SingleWriter(ref Key key, ref Value src, ref Value dst)
+        public void SingleWriter(ref Key key, ref Input input, ref Value src, ref Value dst, ref RecordInfo recordInfo, long address)
         {
             dst = src;
         }
 
         [MethodImpl(MethodImplOptions.AggressiveInlining)]
-        public bool ConcurrentWriter(ref Key key, ref Value src, ref Value dst)
+        public bool ConcurrentWriter(ref Key key, ref Input input, ref Value src, ref Value dst, ref RecordInfo recordInfo, long address)
         {
             dst = src;
             return true;
         }
 
         // RMW functions
         [MethodImpl(MethodImplOptions.AggressiveInlining)]
-        public void InitialUpdater(ref Key key, ref Input input, ref Value value, ref Output output)
+        public void InitialUpdater(ref Key key, ref Input input, ref Value value, ref Output output, ref RecordInfo recordInfo, long address)
         {
             value.value = input.value;
         }
 
         [MethodImpl(MethodImplOptions.AggressiveInlining)]
-        public bool InPlaceUpdater(ref Key key, ref Input input, ref Value value, ref Output output)
+        public bool InPlaceUpdater(ref Key key, ref Input input, ref Value value, ref Output output, ref RecordInfo recordInfo, long address)
         {
             value.value += input.value;
             return true;
         }
 
         [MethodImpl(MethodImplOptions.AggressiveInlining)]
-        public void CopyUpdater(ref Key key, ref Input input, ref Value oldValue, ref Value newValue, ref Output output)
+        public void CopyUpdater(ref Key key, ref Input input, ref Value oldValue, ref Value newValue, ref Output output, ref RecordInfo recordInfo, long address)
         {
             newValue.value = input.value + oldValue.value;
         }
 
-        public bool PostCopyUpdater(ref Key key, ref Input input, ref Value value, ref Output output) => true;
+        public bool PostCopyUpdater(ref Key key, ref Input input, ref Value oldValue, ref Value newValue, ref Output output, ref RecordInfo recordInfo, long address) => true;
 
         public bool SupportsLocking => locking;
 

cs/playground/AsyncStress/SerializedFasterWrapper.cs

@@ -14,8 +14,8 @@ public partial class SerializedFasterWrapper<Key, Value> : IFasterWrapper<Key, V
     {
         readonly FasterKV<SpanByte, SpanByte> _store;
         readonly AsyncPool<ClientSession<SpanByte, SpanByte, SpanByte, SpanByteAndMemory, Empty, SpanByteFunctions>> _sessionPool;
-        readonly UpsertUpdater upsertUpdater = new UpsertUpdater();
-        readonly RmwUpdater rmwUpdater = new RmwUpdater();
+        readonly UpsertUpdater upsertUpdater = new();
+        readonly RmwUpdater rmwUpdater = new();
         readonly bool useOsReadBuffering;
         int pendingCount = 0;
 
@@ -101,7 +101,7 @@ public void Update<TUpdater, TAsyncResult>(TUpdater updater, Key key, Value valu
             where TUpdater : IUpdater<TAsyncResult>
         {
             if (!_sessionPool.TryGet(out var session))
-                session = _sessionPool.GetAsync().GetAwaiter().GetResult();
+                session = _sessionPool.GetAsync().AsTask().GetAwaiter().GetResult();
 
             byte[] keyBytes = MessagePackSerializer.Serialize(key);
             byte[] valueBytes = MessagePackSerializer.Serialize(value);
@@ -128,7 +128,7 @@ public async ValueTask UpdateChunkAsync<TUpdater, TAsyncResult>(TUpdater updater
             where TUpdater : IUpdater<TAsyncResult>
         {
             if (!_sessionPool.TryGet(out var session))
-                session = _sessionPool.GetAsync().GetAwaiter().GetResult();
+                session = _sessionPool.GetAsync().AsTask().GetAwaiter().GetResult();
 
             for (var i = 0; i < count; ++i)
             {
@@ -156,7 +156,7 @@ public async ValueTask UpdateChunkAsync<TUpdater, TAsyncResult>(TUpdater updater
         public async ValueTask<(Status, Value)> ReadAsync(Key key)
         {
             if (!_sessionPool.TryGet(out var session))
-                session = await _sessionPool.GetAsync().ConfigureAwait(false);
+                session = await _sessionPool.GetAsync().AsTask().ConfigureAwait(false);
 
             byte[] keyBytes = MessagePackSerializer.Serialize(key);
             ValueTask<FasterKV<SpanByte, SpanByte>.ReadAsyncResult<SpanByte, SpanByteAndMemory, Empty>> task;
@@ -181,7 +181,7 @@ public async ValueTask UpdateChunkAsync<TUpdater, TAsyncResult>(TUpdater updater
         public ValueTask<(Status, Value)> Read(Key key)
         {
             if (!_sessionPool.TryGet(out var session))
-                session = _sessionPool.GetAsync().GetAwaiter().GetResult();
+                session = _sessionPool.GetAsync().AsTask().GetAwaiter().GetResult();
 
             byte[] keyBytes = MessagePackSerializer.Serialize(key);
             (Status, SpanByteAndMemory) result;
@@ -220,7 +220,7 @@ public async ValueTask UpdateChunkAsync<TUpdater, TAsyncResult>(TUpdater updater
         public async ValueTask<(Status, Value)[]> ReadChunkAsync(Key[] chunk, int offset, int count)
         {
             if (!_sessionPool.TryGet(out var session))
-                session = _sessionPool.GetAsync().GetAwaiter().GetResult();
+                session = _sessionPool.GetAsync().AsTask().GetAwaiter().GetResult();
 
             // Reads in chunk are performed serially
             (Status, Value)[] result = new (Status, Value)[count];
@@ -240,13 +240,13 @@ public void Dispose()
 
     public class SpanByteFunctions : SpanByteFunctions<SpanByte, SpanByteAndMemory, Empty>
     {
-        public unsafe override bool SingleReader(ref SpanByte key, ref SpanByte input, ref SpanByte value, ref SpanByteAndMemory dst)
+        public unsafe override bool SingleReader(ref SpanByte key, ref SpanByte input, ref SpanByte value, ref SpanByteAndMemory dst, ref RecordInfo recordInfo, long address)
         {
             value.CopyTo(ref dst, MemoryPool<byte>.Shared);
             return true;
         }
 
-        public unsafe override bool ConcurrentReader(ref SpanByte key, ref SpanByte input, ref SpanByte value, ref SpanByteAndMemory dst)
+        public unsafe override bool ConcurrentReader(ref SpanByte key, ref SpanByte input, ref SpanByte value, ref SpanByteAndMemory dst, ref RecordInfo recordInfo, long address)
         {
             value.CopyTo(ref dst, MemoryPool<byte>.Shared);
             return true;

cs/playground/CacheStoreConcurrent/Types.cs

@@ -74,7 +74,7 @@ public struct CacheContext
     /// </summary>
     public class CacheFunctions : SimpleFunctions<CacheKey, CacheValue, CacheContext>
     {
-        public override void ReadCompletionCallback(ref CacheKey key, ref CacheValue input, ref CacheValue output, CacheContext ctx, Status status)
+        public override void ReadCompletionCallback(ref CacheKey key, ref CacheValue input, ref CacheValue output, CacheContext ctx, Status status, RecordMetadata recordMetadata)
         {
             if (ctx.type == 0)
             {

cs/playground/ClassRecoveryDurability/Types.cs

@@ -123,19 +123,19 @@ internal void FinalizeRead(ref Status status, ref StoreOutput output)
 
         public sealed class StoreFunctions : FunctionsBase<StoreKey, StoreValue, StoreInput, StoreOutput, StoreContext>
         {
-            public override bool SingleReader(ref StoreKey key, ref StoreInput input, ref StoreValue value, ref StoreOutput dst)
+            public override bool SingleReader(ref StoreKey key, ref StoreInput input, ref StoreValue value, ref StoreOutput dst, ref RecordInfo recordInfo, long address)
             {
                 dst.value = value;
                 return true;
             }
 
-            public override bool ConcurrentReader(ref StoreKey key, ref StoreInput input, ref StoreValue value, ref StoreOutput dst)
+            public override bool ConcurrentReader(ref StoreKey key, ref StoreInput input, ref StoreValue value, ref StoreOutput dst, ref RecordInfo recordInfo, long address)
             {
                 dst.value = value;
                 return true;
             }
 
-            public override void ReadCompletionCallback(ref StoreKey key, ref StoreInput input, ref StoreOutput output, StoreContext ctx, Status status)
+            public override void ReadCompletionCallback(ref StoreKey key, ref StoreInput input, ref StoreOutput output, StoreContext ctx, Status status, RecordMetadata recordMetadata)
             {
                 ctx.Populate(ref status, ref output);
             }

cs/playground/SumStore/SumStoreTypes.cs

@@ -45,31 +45,31 @@ public override void CheckpointCompletionCallback(string sessionId, CommitPoint
         }
 
         // Read functions
-        public override bool SingleReader(ref AdId key, ref Input input, ref NumClicks value, ref Output dst)
+        public override bool SingleReader(ref AdId key, ref Input input, ref NumClicks value, ref Output dst, ref RecordInfo recordInfo, long address)
         {
             dst.value = value;
             return true;
         }
 
-        public override bool ConcurrentReader(ref AdId key, ref Input input, ref NumClicks value, ref Output dst)
+        public override bool ConcurrentReader(ref AdId key, ref Input input, ref NumClicks value, ref Output dst, ref RecordInfo recordInfo, long address)
         {
             dst.value = value;
             return true;
         }
 
         // RMW functions
-        public override void InitialUpdater(ref AdId key, ref Input input, ref NumClicks value, ref Output output)
+        public override void InitialUpdater(ref AdId key, ref Input input, ref NumClicks value, ref Output output, ref RecordInfo recordInfo, long address)
         {
             value = input.numClicks;
         }
 
-        public override bool InPlaceUpdater(ref AdId key, ref Input input, ref NumClicks value, ref Output output)
+        public override bool InPlaceUpdater(ref AdId key, ref Input input, ref NumClicks value, ref Output output, ref RecordInfo recordInfo, long address)
         {
             Interlocked.Add(ref value.numClicks, input.numClicks.numClicks);
             return true;
         }
 
-        public override void CopyUpdater(ref AdId key, ref Input input, ref NumClicks oldValue, ref NumClicks newValue, ref Output output)
+        public override void CopyUpdater(ref AdId key, ref Input input, ref NumClicks oldValue, ref NumClicks newValue, ref Output output, ref RecordInfo recordInfo, long address)
         {
             newValue.numClicks = oldValue.numClicks + input.numClicks.numClicks;
         }

cs/remote/samples/FixedLenServer/Types.cs

@@ -53,17 +53,17 @@ public struct Output
     }
 
 
-    public struct Functions : IAdvancedFunctions<Key, Value, Input, Output, long>
+    public struct Functions : IFunctions<Key, Value, Input, Output, long>
     {
         // No locking needed for atomic types such as Value
         public bool SupportsLocking => false;
 
         // Callbacks
-        public void RMWCompletionCallback(ref Key key, ref Input input, ref Output output, long ctx, Status status) { }
+        public void RMWCompletionCallback(ref Key key, ref Input input, ref Output output, long ctx, Status status, RecordMetadata recordMetadata) { }
 
-        public void ReadCompletionCallback(ref Key key, ref Input input, ref Output output, long ctx, Status status, RecordInfo recordInfo) { }
+        public void ReadCompletionCallback(ref Key key, ref Input input, ref Output output, long ctx, Status status, RecordMetadata recordMetadata) { }
 
-        public void UpsertCompletionCallback(ref Key key, ref Value value, long ctx) { }
+        public void UpsertCompletionCallback(ref Key key, ref Input input, ref Value value, long ctx) { }
 
         public void DeleteCompletionCallback(ref Key key, long ctx) { }
 
@@ -72,7 +72,7 @@ public void CheckpointCompletionCallback(string sessionId, CommitPoint commitPoi
 
         // Read functions
         [MethodImpl(MethodImplOptions.AggressiveInlining)]
-        public bool SingleReader(ref Key key, ref Input input, ref Value value, ref Output dst, long address)
+        public bool SingleReader(ref Key key, ref Input input, ref Value value, ref Output dst, ref RecordInfo recordInfo, long address)
         {
             dst.value = value;
             return true;
@@ -87,18 +87,18 @@ public bool ConcurrentReader(ref Key key, ref Input input, ref Value value, ref
 
         // Upsert functions
         [MethodImpl(MethodImplOptions.AggressiveInlining)]
-        public void SingleWriter(ref Key key, ref Value src, ref Value dst) => dst = src;
+        public void SingleWriter(ref Key key, ref Input input, ref Value src, ref Value dst, ref RecordInfo recordInfo, long address) => dst = src;
 
         [MethodImpl(MethodImplOptions.AggressiveInlining)]
-        public bool ConcurrentWriter(ref Key key, ref Value src, ref Value dst, ref RecordInfo recordInfo, long address)
+        public bool ConcurrentWriter(ref Key key, ref Input input, ref Value src, ref Value dst, ref RecordInfo recordInfo, long address)
         {
             dst = src;
             return true;
         }
 
         // RMW functions
         [MethodImpl(MethodImplOptions.AggressiveInlining)]
-        public void InitialUpdater(ref Key key, ref Input input, ref Value value, ref Output output)
+        public void InitialUpdater(ref Key key, ref Input input, ref Value value, ref Output output, ref RecordInfo recordInfo, long address)
         {
             value.value = input.value;
             output.value = value;
@@ -120,12 +120,12 @@ public void CopyUpdater(ref Key key, ref Input input, ref Value oldValue, ref Va
         }
 
         [MethodImpl(MethodImplOptions.AggressiveInlining)]
-        public bool PostCopyUpdater(ref Key key, ref Input input, ref Value value, ref Output output, ref RecordInfo recordInfo, long address) => true;
+        public bool PostCopyUpdater(ref Key key, ref Input input, ref Value oldValue, ref Value newValue, ref Output output, ref RecordInfo recordInfo, long address) => true;
 
         public void Lock(ref RecordInfo recordInfo, ref Key key, ref Value value, LockType lockType, ref long lockContext) { }
 
         public bool Unlock(ref RecordInfo recordInfo, ref Key key, ref Value value, LockType lockType, long lockContext) => true;
 
-        public void ConcurrentDeleter(ref Key key, ref Value value, ref RecordInfo recordInfo, long address) { }
+        public bool ConcurrentDeleter(ref Key key, ref Value value, ref RecordInfo recordInfo, long address) => true;
     }
 }

cs/remote/src/FASTER.server/BinaryServerSession.cs

@@ -11,7 +11,7 @@ namespace FASTER.server
 {
     internal unsafe sealed class BinaryServerSession<Key, Value, Input, Output, Functions, ParameterSerializer>
         : FasterKVServerSessionBase<Key, Value, Input, Output, Functions, ParameterSerializer>
-        where Functions : IAdvancedFunctions<Key, Value, Input, Output, long>
+        where Functions : IFunctions<Key, Value, Input, Output, long>
         where ParameterSerializer : IServerSerializer<Key, Value, Input, Output>
     {
         readonly HeaderReaderWriter hrw;

cs/remote/src/FASTER.server/FasterKVProvider.cs

@@ -15,7 +15,7 @@ namespace FASTER.server
     /// <typeparam name="Functions"></typeparam>
     /// <typeparam name="ParameterSerializer"></typeparam>
     public sealed class FasterKVProvider<Key, Value, Input, Output, Functions, ParameterSerializer> : ISessionProvider
-            where Functions : IAdvancedFunctions<Key, Value, Input, Output, long>
+            where Functions : IFunctions<Key, Value, Input, Output, long>
             where ParameterSerializer : IServerSerializer<Key, Value, Input, Output>
     {
         readonly FasterKV<Key, Value> store;

cs/remote/src/FASTER.server/FasterKVServerSessionBase.cs

@@ -5,10 +5,10 @@
 namespace FASTER.server
 {
     internal abstract class FasterKVServerSessionBase<Key, Value, Input, Output, Functions, ParameterSerializer> : FasterKVServerSessionBase<Output>
-        where Functions : IAdvancedFunctions<Key, Value, Input, Output, long>
+        where Functions : IFunctions<Key, Value, Input, Output, long>
         where ParameterSerializer : IServerSerializer<Key, Value, Input, Output>
     {
-        protected readonly AdvancedClientSession<Key, Value, Input, Output, long, ServerKVFunctions<Key, Value, Input, Output, Functions>> session;
+        protected readonly ClientSession<Key, Value, Input, Output, long, ServerKVFunctions<Key, Value, Input, Output, Functions>> session;
         protected readonly ParameterSerializer serializer;
 
         public FasterKVServerSessionBase(Socket socket, FasterKV<Key, Value> store, Functions functions,