Revert "Make keys and argv as native lua tables"

This reverts commit c30d65e.

Author: badrishc

benchmark/BDN.benchmark/Resp/RespLuaRunnerStress.cs

@@ -10,7 +10,7 @@ namespace BDN.benchmark.Resp
     public unsafe class RespLuaRunnerStress
     {
         LuaRunner r1, r2, r3, r4;
-        readonly string[] keys = ["key1"];
+        readonly string[] keys = ["key1", "key2"];
 
         [GlobalSetup]
         public void GlobalSetup()

libs/server/Lua/LuaRunner.cs

@@ -26,9 +26,6 @@ internal sealed class LuaRunner : IDisposable
         readonly TxnKeyEntries txnKeyEntries;
         readonly bool txnMode;
 
-        LuaTable keyTable, argvTable;
-        int keyLength, argvLength;
-
         /// <summary>
         /// Creates a new runner with the source of the script
         /// </summary>
@@ -64,8 +61,6 @@ function redis.status_reply(text)
                 function redis.error_reply(text)
                     return { err = text }
                 end
-                KEYS = {}
-                ARGV = {}
                 sandbox_env = {
                     tostring = tostring;
                     next = next;
@@ -86,17 +81,13 @@ function redis.error_reply(text)
                     math = math;
                     table = table;
                     string = string;
-                    KEYS = KEYS;
-                    ARGV = ARGV;
                 }
                 function load_sandboxed(source)
                     if (not source) then return nil end
                     return load(source, nil, nil, sandbox_env)
                 end
             ");
             sandbox_env = (LuaTable)state["sandbox_env"];
-            keyTable = (LuaTable)state["KEYS"];
-            argvTable = (LuaTable)state["ARGV"];
         }
 
         /// <summary>
@@ -261,7 +252,7 @@ public object Run(int count, SessionParseState parseState)
             if (nKeys > 0)
             {
                 // Lua uses 1-based indexing, so we allocate an extra entry in the array
-                keys = new string[nKeys];
+                keys = new string[nKeys + 2];
                 for (int i = 0; i < nKeys; i++)
                 {
                     if (txnMode)
@@ -271,8 +262,9 @@ public object Run(int count, SessionParseState parseState)
                         if (!respServerSession.storageSession.objectStoreLockableContext.IsNull)
                             txnKeyEntries.AddKey(key, true, Tsavorite.core.LockType.Exclusive);
                     }
-                    keys[i] = parseState.GetString(offset++);
+                    keys[i + 1] = parseState.GetString(offset++);
                 }
+                keys[nKeys + 1] = null;
                 count -= nKeys;
 
                 //TODO: handle slot verification for Lua script keys
@@ -286,11 +278,12 @@ public object Run(int count, SessionParseState parseState)
             if (count > 0)
             {
                 // Lua uses 1-based indexing, so we allocate an extra entry in the array
-                argv = new string[count];
+                argv = new string[count + 2];
                 for (int i = 0; i < count; i++)
                 {
-                    argv[i] = parseState.GetString(offset++);
+                    argv[i + 1] = parseState.GetString(offset++);
                 }
+                argv[count + 1] = null;
             }
 
             if (txnMode && nKeys > 0)
@@ -351,52 +344,40 @@ object RunTransactionInternal(string[] keys, string[] argv)
 
         object RunInternal(string[] keys, string[] argv)
         {
-            if (keys != null)
+            if (keys != this.keys)
             {
-                if (keyLength != keys.Length)
+                if (keys == null)
+                {
+                    this.keys = null;
+                    sandbox_env["KEYS"] = this.keys;
+                }
+                else
                 {
-                    if (keyLength > 0)
+                    if (this.keys != null && keys.Length == this.keys.Length)
+                        Array.Copy(keys, this.keys, keys.Length);
+                    else
                     {
-                        keyTable.Dispose();
-                        keyTable = (LuaTable)state.DoString("return {}")[0];
-                        sandbox_env["KEYS"] = keyTable;
+                        this.keys = keys;
+                        sandbox_env["KEYS"] = this.keys;
                     }
-                    keyLength = keys.Length;
                 }
-                for (int i = 0; i < keys.Length; i++)
-                    keyTable[i + 1] = keys[i];
             }
-            else
+            if (argv != this.argv)
             {
-                if (keyLength > 0)
+                if (argv == null)
                 {
-                    keyTable = (LuaTable)state.DoString("return {}")[0];
-                    sandbox_env["KEYS"] = keyTable;
-                    keyLength = 0;
+                    this.argv = null;
+                    sandbox_env["ARGV"] = this.argv;
                 }
-            }
-            if (argv != null)
-            {
-                if (argvLength != argv.Length)
+                else
                 {
-                    if (argvLength > 0)
+                    if (this.argv != null && argv.Length == this.argv.Length)
+                        Array.Copy(argv, this.argv, argv.Length);
+                    else
                     {
-                        argvTable.Dispose();
-                        argvTable = (LuaTable)state.DoString("return {}")[0];
-                        sandbox_env["ARGV"] = argvTable;
+                        this.argv = argv;
+                        sandbox_env["ARGV"] = this.argv;
                     }
-                    argvLength = argv.Length;
-                }
-                for (int i = 0; i < argv.Length; i++)
-                    argvTable[i + 1] = argv[i];
-            }
-            else
-            {
-                if (argvLength > 0)
-                {
-                    argvTable = (LuaTable)state.DoString("return {}")[0];
-                    sandbox_env["ARGV"] = argvTable;
-                    argvLength = 0;
                 }
             }
 

test/Garnet.test/LuaScriptTests.cs

@@ -356,7 +356,7 @@ public void ComplexLuaTest()
 for _, key in ipairs(KEYS) do
     table.insert(setArgs, key)
 end
-unpack(KEYS)
+
 return redis.status_reply(table.concat(setArgs))
 """;