Added "none" status returned, otherwise session would hang waiting fo…

…r a response when TYPE is used on a non-existent object (#150)
microsoft · Apr 1, 2024 · b33189f · b33189f
1 parent ca3fde0
commit b33189f
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 0 deletions.
diff --git a/libs/server/Resp/ArrayCommands.cs b/libs/server/Resp/ArrayCommands.cs
@@ -827,6 +827,11 @@ private bool NetworkTYPE<TGarnetApi>(int count, byte* ptr, ref TGarnetApi storag
                 while (!RespWriteUtils.WriteSimpleString(Encoding.ASCII.GetBytes(typeName), ref dcurr, dend))
                     SendAndReset();
             }
+            else
+            {
+                while (!RespWriteUtils.WriteSimpleString(Encoding.ASCII.GetBytes(@"none"), ref dcurr, dend))
+                    SendAndReset();
+            }
 
             readHead = (int)(ptr - recvBufferPtr);
             return true;

diff --git a/libs/server/Storage/Session/MainStore/MainStoreOps.cs b/libs/server/Storage/Session/MainStore/MainStoreOps.cs
@@ -866,6 +866,7 @@ public GarnetStatus GetKeyType<TContext, TObjectContext>(ArgSlice key, out strin
             if (status != GarnetStatus.OK && objectStoreSession != null)
             {
                 status = GET(key.Bytes, out GarnetObjectStoreOutput output, ref objectContext);
+
                 if (status == GarnetStatus.OK)
                 {
                     if ((output.garnetObject as SortedSetObject) != null)
@@ -885,6 +886,11 @@ public GarnetStatus GetKeyType<TContext, TObjectContext>(ArgSlice key, out strin
                         keyType = "hash";
                     }
                 }
+                else
+                {
+                    keyType = "none";
+                    status = GarnetStatus.NOTFOUND;
+                }
             }
             return status;
         }