Clear input header field (flags) for object store RMW operations (#357)

* When preparing input for the object store RMW operations, we need to set the flag field to 0 as the buffer being used to create the input may not be zero'ed out. * small fix * Clean up Unit Test --------- Co-authored-by: TedHartMS <15467143+TedHartMS@users.noreply.github.com>
microsoft · May 3, 2024 · 30e3780 · 30e3780
1 parent 2dc2c73
commit 30e3780
Show file tree

Hide file tree

Showing 11 changed files with 160 additions and 1 deletion.
diff --git a/libs/server/Resp/Objects/HashCommands.cs b/libs/server/Resp/Objects/HashCommands.cs
@@ -69,6 +69,7 @@ private unsafe bool HashSet<TGarnetApi>(int count, byte* ptr, HashOperation hop,
 
                 // Prepare header in input buffer
                 inputPtr->header.type = GarnetObjectType.Hash;
+                inputPtr->header.flags = 0;
                 inputPtr->header.HashOp = hop;
                 inputPtr->count = inputCount;
                 inputPtr->done = hashOpsCount;
@@ -152,6 +153,7 @@ private unsafe bool HashGet<TGarnetApi>(int count, byte* ptr, HashOperation op,
                 int inputCount = op == HashOperation.HGETALL ? 0 : (op == HashOperation.HRANDFIELD ? count + 1 : count - 1);
                 // Prepare header in input buffer
                 inputPtr->header.type = GarnetObjectType.Hash;
+                inputPtr->header.flags = 0;
                 inputPtr->header.HashOp = op;
                 inputPtr->count = inputCount;
                 inputPtr->done = hashItemsDoneCount;
@@ -253,6 +255,7 @@ private unsafe bool HashLength<TGarnetApi>(int count, byte* ptr, ref TGarnetApi
 
                 // Prepare header in input buffer
                 inputPtr->header.type = GarnetObjectType.Hash;
+                inputPtr->header.flags = 0;
                 inputPtr->header.HashOp = HashOperation.HLEN;
                 inputPtr->count = 1;
                 inputPtr->done = 0;
@@ -323,6 +326,7 @@ private unsafe bool HashStrLength<TGarnetApi>(int count, byte* ptr, ref TGarnetA
 
                 // Prepare header in input buffer
                 inputPtr->header.type = GarnetObjectType.Hash;
+                inputPtr->header.flags = 0;
                 inputPtr->header.HashOp = HashOperation.HSTRLEN;
                 inputPtr->count = 1;
                 inputPtr->done = 0;
@@ -397,6 +401,7 @@ private unsafe bool HashDelete<TGarnetApi>(int count, byte* ptr, ref TGarnetApi
 
                 // Prepare header in input buffer
                 inputPtr->header.type = GarnetObjectType.Hash;
+                inputPtr->header.flags = 0;
                 inputPtr->header.HashOp = HashOperation.HDEL;
                 inputPtr->count = inputCount;
                 inputPtr->done = hashItemsDoneCount;
@@ -474,6 +479,7 @@ private unsafe bool HashExists<TGarnetApi>(int count, byte* ptr, ref TGarnetApi
 
                 // Prepare header in input buffer
                 inputPtr->header.type = GarnetObjectType.Hash;
+                inputPtr->header.flags = 0;
                 inputPtr->header.HashOp = HashOperation.HEXISTS;
                 inputPtr->count = 1;
                 inputPtr->done = 0;
@@ -546,6 +552,7 @@ private unsafe bool HashKeys<TGarnetApi>(int count, byte* ptr, HashOperation op,
 
             // Prepare header in input buffer
             inputPtr->header.type = GarnetObjectType.Hash;
+            inputPtr->header.flags = 0;
             inputPtr->header.HashOp = op;
             inputPtr->count = count - 1;
             inputPtr->done = hashOpsCount;
@@ -634,6 +641,7 @@ private unsafe bool HashIncrement<TGarnetApi>(int count, byte* ptr, HashOperatio
 
                 // Prepare header in input buffer
                 inputPtr->header.type = GarnetObjectType.Hash;
+                inputPtr->header.flags = 0;
                 inputPtr->header.HashOp = op;
                 inputPtr->count = count + 1;
                 inputPtr->done = 0;

diff --git a/libs/server/Resp/Objects/ListCommands.cs b/libs/server/Resp/Objects/ListCommands.cs
@@ -61,6 +61,7 @@ private unsafe bool ListPush<TGarnetApi>(int count, byte* ptr, ListOperation lop
 
             // Prepare header in input buffer
             inputPtr->header.type = GarnetObjectType.List;
+            inputPtr->header.flags = 0;
             inputPtr->header.ListOp = lop;
             inputPtr->count = inputCount;
             inputPtr->done = listItemsDoneCount;
@@ -157,6 +158,7 @@ private unsafe bool ListPop<TGarnetApi>(int count, byte* ptr, ListOperation lop,
 
             // Prepare header in input buffer
             inputPtr->header.type = GarnetObjectType.List;
+            inputPtr->header.flags = 0;
             inputPtr->header.ListOp = lop;
             inputPtr->done = 0;
             inputPtr->count = popCount;
@@ -230,6 +232,7 @@ private unsafe bool ListLength<TGarnetApi>(int count, byte* ptr, ref TGarnetApi
 
                 // Prepare header in input buffer
                 inputPtr->header.type = GarnetObjectType.List;
+                inputPtr->header.flags = 0;
                 inputPtr->header.ListOp = ListOperation.LLEN;
                 inputPtr->count = count;
                 inputPtr->done = 0;
@@ -307,6 +310,7 @@ private unsafe bool ListTrim<TGarnetApi>(int count, byte* ptr, ref TGarnetApi st
 
                 // Prepare header in input buffer
                 inputPtr->header.type = GarnetObjectType.List;
+                inputPtr->header.flags = 0;
                 inputPtr->header.ListOp = ListOperation.LTRIM;
                 inputPtr->count = start;
                 inputPtr->done = stop;
@@ -375,6 +379,7 @@ private unsafe bool ListRange<TGarnetApi>(int count, byte* ptr, ref TGarnetApi s
                 var inputLength = (int)(recvBufferPtr + bytesRead - (byte*)inputPtr);
 
                 inputPtr->header.type = GarnetObjectType.List;
+                inputPtr->header.flags = 0;
                 inputPtr->header.ListOp = ListOperation.LRANGE;
                 inputPtr->count = start;
                 inputPtr->done = end;
@@ -449,6 +454,7 @@ private unsafe bool ListIndex<TGarnetApi>(int count, byte* ptr, ref TGarnetApi s
 
                 // Prepare header in input buffer
                 inputPtr->header.type = GarnetObjectType.List;
+                inputPtr->header.flags = 0;
                 inputPtr->header.ListOp = ListOperation.LINDEX;
                 inputPtr->count = index;
                 inputPtr->done = 0;
@@ -524,6 +530,7 @@ private unsafe bool ListInsert<TGarnetApi>(int count, byte* ptr, ref TGarnetApi
 
                 // Prepare header in input buffer
                 inputPtr->header.type = GarnetObjectType.List;
+                inputPtr->header.flags = 0;
                 inputPtr->header.ListOp = ListOperation.LINSERT;
                 inputPtr->done = 0;
                 inputPtr->count = 0;
@@ -610,6 +617,7 @@ private unsafe bool ListRemove<TGarnetApi>(int count, byte* ptr, ref TGarnetApi
 
                 // Prepare header in input buffer
                 inputPtr->header.type = GarnetObjectType.List;
+                inputPtr->header.flags = 0;
                 inputPtr->header.ListOp = ListOperation.LREM;
                 inputPtr->count = nCount;
                 inputPtr->done = 0;
@@ -818,6 +826,7 @@ public unsafe bool ListSet<TGarnetApi>(int count, byte* ptr, ref TGarnetApi stor
 
                 // Prepare header in input buffer
                 inputPtr->header.type = GarnetObjectType.List;
+                inputPtr->header.flags = 0;
                 inputPtr->header.ListOp = ListOperation.LSET;
                 inputPtr->count = 0;
                 inputPtr->done = 0;

diff --git a/libs/server/Resp/Objects/SetCommands.cs b/libs/server/Resp/Objects/SetCommands.cs
@@ -67,6 +67,7 @@ private unsafe bool SetAdd<TGarnetApi>(int count, byte* ptr, ref TGarnetApi stor
 
                 // Prepare header in input buffer
                 inputPtr->header.type = GarnetObjectType.Set;
+                inputPtr->header.flags = 0;
                 inputPtr->header.SetOp = SetOperation.SADD;
                 inputPtr->count = inputCount;
                 inputPtr->done = setOpsCount;
@@ -249,6 +250,7 @@ private unsafe bool SetRemove<TGarnetApi>(int count, byte* ptr, ref TGarnetApi s
 
                 // Prepare header in input buffer
                 inputPtr->header.type = GarnetObjectType.Set;
+                inputPtr->header.flags = 0;
                 inputPtr->header.SetOp = SetOperation.SREM;
                 inputPtr->count = inputCount;
                 inputPtr->done = setItemsDoneCount;
@@ -329,6 +331,7 @@ private unsafe bool SetLength<TGarnetApi>(int count, byte* ptr, ref TGarnetApi s
 
                 // Prepare header in input buffer
                 inputPtr->header.type = GarnetObjectType.Set;
+                inputPtr->header.flags = 0;
                 inputPtr->header.SetOp = SetOperation.SCARD;
                 inputPtr->count = 1;
                 inputPtr->done = 0;
@@ -396,6 +399,7 @@ private unsafe bool SetMembers<TGarnetApi>(int count, byte* ptr, ref TGarnetApi
 
                 // Prepare header in input buffer
                 inputPtr->header.type = GarnetObjectType.Set;
+                inputPtr->header.flags = 0;
                 inputPtr->header.SetOp = SetOperation.SMEMBERS;
                 inputPtr->count = count;
                 inputPtr->done = setItemsDoneCount;
@@ -466,6 +470,7 @@ private unsafe bool SetIsMember<TGarnetApi>(int count, byte* ptr, ref TGarnetApi
 
             // Prepare header in input buffer
             inputPtr->header.type = GarnetObjectType.Set;
+            inputPtr->header.flags = 0;
             inputPtr->header.SetOp = SetOperation.SISMEMBER;
             inputPtr->count = count - 2;
             inputPtr->done = 0;
@@ -543,6 +548,7 @@ private unsafe bool SetPop<TGarnetApi>(int count, byte* ptr, ref TGarnetApi stor
 
             // Prepare header in input buffer
             inputPtr->header.type = GarnetObjectType.Set;
+            inputPtr->header.flags = 0;
             inputPtr->header.SetOp = SetOperation.SPOP;
             inputPtr->count = int.MinValue;
 
@@ -726,6 +732,7 @@ private unsafe bool SetRandomMember<TGarnetApi>(int count, byte* ptr, ref TGarne
 
             // Prepare header in input buffer
             inputPtr->header.type = GarnetObjectType.Set;
+            inputPtr->header.flags = 0;
             inputPtr->header.SetOp = SetOperation.SRANDMEMBER;
             inputPtr->count = Int32.MinValue;
 

diff --git a/libs/server/Resp/Objects/SharedObjectCommands.cs b/libs/server/Resp/Objects/SharedObjectCommands.cs
@@ -68,6 +68,7 @@ private unsafe bool ObjectScan<TGarnetApi>(int count, byte* ptr, GarnetObjectTyp
 
                 // ObjectInputHeader
                 (*(ObjectInputHeader*)(pcurr)).header.type = objectType;
+                (*(ObjectInputHeader*)(pcurr)).header.flags = 0;
 
                 switch (objectType)
                 {

diff --git a/libs/server/Resp/Objects/SortedSetCommands.cs b/libs/server/Resp/Objects/SortedSetCommands.cs
@@ -74,6 +74,7 @@ private unsafe bool SortedSetAdd<TGarnetApi>(int count, byte* ptr, ref TGarnetAp
 
             // Prepare header in input buffer
             inputPtr->header.type = GarnetObjectType.SortedSet;
+            inputPtr->header.flags = 0;
             inputPtr->header.SortedSetOp = SortedSetOperation.ZADD;
             inputPtr->count = inputCount;
             inputPtr->done = zaddDoneCount;
@@ -143,6 +144,7 @@ private unsafe bool SortedSetRemove<TGarnetApi>(int count, byte* ptr, ref TGarne
 
                 // Prepare header in input buffer
                 rmwInput->header.type = GarnetObjectType.SortedSet;
+                rmwInput->header.flags = 0;
                 rmwInput->header.SortedSetOp = SortedSetOperation.ZREM;
                 rmwInput->count = inputCount;
                 rmwInput->done = zaddDoneCount;
@@ -226,6 +228,7 @@ private unsafe bool SortedSetLength<TGarnetApi>(int count, byte* ptr, ref TGarne
 
                 // Prepare header in input buffer
                 inputPtr->header.type = GarnetObjectType.SortedSet;
+                inputPtr->header.flags = 0;
                 inputPtr->header.SortedSetOp = SortedSetOperation.ZCARD;
                 inputPtr->count = 1;
                 inputPtr->done = 0;
@@ -312,6 +315,7 @@ private unsafe bool SortedSetRange<TGarnetApi>(int count, byte* ptr, SortedSetOp
 
                 // Prepare header in input buffer
                 inputPtr->header.type = GarnetObjectType.SortedSet;
+                inputPtr->header.flags = 0;
                 inputPtr->header.SortedSetOp = op;
                 inputPtr->count = count - 1;
                 inputPtr->done = 0;
@@ -411,6 +415,7 @@ private unsafe bool SortedSetScore<TGarnetApi>(int count, byte* ptr, ref TGarnet
 
                 // Prepare header in input buffer
                 inputPtr->header.type = GarnetObjectType.SortedSet;
+                inputPtr->header.flags = 0;
                 inputPtr->header.SortedSetOp = SortedSetOperation.ZSCORE;
                 inputPtr->count = scoreKeySize;
                 inputPtr->done = 0;
@@ -485,6 +490,7 @@ private unsafe bool SortedSetScores<TGarnetApi>(int count, byte* ptr, ref TGarne
 
                 // Prepare header in input buffer
                 inputPtr->header.type = GarnetObjectType.SortedSet;
+                inputPtr->header.flags = 0;
                 inputPtr->header.SortedSetOp = SortedSetOperation.ZMSCORE;
                 inputPtr->count = inputCount;
                 inputPtr->done = 0;
@@ -572,6 +578,7 @@ private unsafe bool SortedSetPop<TGarnetApi>(int count, byte* ptr, SortedSetOper
 
                 // Prepare header in input buffer
                 inputPtr->header.type = GarnetObjectType.SortedSet;
+                inputPtr->header.flags = 0;
                 inputPtr->header.SortedSetOp = op;
                 inputPtr->count = popCount;
                 inputPtr->done = zaddDoneCount;
@@ -649,6 +656,7 @@ private unsafe bool SortedSetCount<TGarnetApi>(int count, byte* ptr, ref TGarnet
 
                 // Prepare header in input buffer
                 inputPtr->header.type = GarnetObjectType.SortedSet;
+                inputPtr->header.flags = 0;
                 inputPtr->header.SortedSetOp = SortedSetOperation.ZCOUNT;
                 inputPtr->count = 0;
                 inputPtr->done = 0;
@@ -739,6 +747,7 @@ private unsafe bool SortedSetLengthByValue<TGarnetApi>(int count, byte* ptr, Sor
 
                 // Prepare header in input buffer
                 inputPtr->header.type = GarnetObjectType.SortedSet;
+                inputPtr->header.flags = 0;
                 inputPtr->header.SortedSetOp = op;
                 inputPtr->count = 0;
                 inputPtr->done = 0;
@@ -823,6 +832,7 @@ private unsafe bool SortedSetIncrement<TGarnetApi>(int count, byte* ptr, ref TGa
 
                 // Prepare header in input buffer
                 inputPtr->header.type = GarnetObjectType.SortedSet;
+                inputPtr->header.flags = 0;
                 inputPtr->header.SortedSetOp = SortedSetOperation.ZINCRBY;
                 inputPtr->count = count - 1;
                 inputPtr->done = 0;
@@ -925,6 +935,7 @@ private unsafe bool SortedSetRank<TGarnetApi>(int count, byte* ptr, SortedSetOpe
 
                 // Prepare header in input buffer
                 inputPtr->header.type = GarnetObjectType.SortedSet;
+                inputPtr->header.flags = 0;
                 inputPtr->header.SortedSetOp = op;
                 inputPtr->count = memberSize;
                 inputPtr->done = 0;
@@ -997,6 +1008,7 @@ private unsafe bool SortedSetRemoveRange<TGarnetApi>(int count, byte* ptr, Sorte
 
                 // Prepare header in input buffer
                 inputPtr->header.type = GarnetObjectType.SortedSet;
+                inputPtr->header.flags = 0;
                 inputPtr->header.SortedSetOp = op;
                 inputPtr->count = 0;
                 inputPtr->done = 0;
@@ -1101,6 +1113,7 @@ private unsafe bool SortedSetRandomMember<TGarnetApi>(int count, byte* ptr, ref
 
                 // Prepare header in input buffer
                 inputPtr->header.type = GarnetObjectType.SortedSet;
+                inputPtr->header.flags = 0;
                 inputPtr->header.SortedSetOp = SortedSetOperation.ZRANDMEMBER;
                 inputPtr->count = count == 1 ? 1 : paramCount;
                 inputPtr->done = withScoresSpan.SequenceEqual(includeWithScores) ? 1 : 0;

diff --git a/libs/server/Resp/Objects/SortedSetGeoCommands.cs b/libs/server/Resp/Objects/SortedSetGeoCommands.cs
@@ -53,6 +53,7 @@ private unsafe bool GeoAdd<TGarnetApi>(int count, byte* ptr, ref TGarnetApi stor
 
                 // Prepare header in input buffer
                 inputPtr->header.type = GarnetObjectType.SortedSet;
+                inputPtr->header.flags = 0;
                 inputPtr->header.SortedSetOp = SortedSetOperation.GEOADD;
                 inputPtr->count = inputCount;
                 inputPtr->done = zaddDoneCount;
@@ -154,6 +155,7 @@ private unsafe bool GeoCommands<TGarnetApi>(int count, byte* ptr, SortedSetOpera
 
                 // Prepare header in input buffer
                 inputPtr->header.type = GarnetObjectType.SortedSet;
+                inputPtr->header.flags = 0;
                 inputPtr->header.SortedSetOp = op;
                 inputPtr->count = inputCount;