use "redis.call" instead of "redis.pcall"; use "evalsha" instead of "eval"

limen · limen · commit c9c8f91a761b · 2018-11-30T15:11:37.000+08:00
diff --git a/src/Commands/Command.php b/src/Commands/Command.php
@@ -145,14 +145,14 @@ protected function luaSetTtl($ttl)
             $script = '';
         } elseif ($ttl == Model::TTL_PERSIST) {
             $script = <<<LUA
-redis.pcall('persist', v);
+redis.call('persist', v);
 LUA;
         } else {
             $script = <<<LUA
-redis.pcall('expire', v, $ttl);
+redis.call('expire', v, $ttl);
 LUA;
         }
 
         return $script;
     }
-}
+}
diff --git a/src/Commands/GetCommand.php b/src/Commands/GetCommand.php
@@ -17,10 +17,10 @@ public function getScript()
         $script = <<<LUA
     local values = {}; 
     for i,v in ipairs(KEYS) do 
-        values[#values+1] = redis.pcall('get',v); 
+        values[#values+1] = redis.call('get',v); 
     end 
     return {KEYS,values};
 LUA;
         return $script;
     }
-}
+}
diff --git a/src/Commands/GetsetHashCommand.php b/src/Commands/GetsetHashCommand.php
@@ -12,22 +12,22 @@ public function getScript()
     local values = {}; 
     local setTtl = $setTtl;
     for i,v in ipairs(KEYS) do 
-        local ttl = redis.pcall('ttl', v);
-        values[#values+1] = redis.pcall('hgetall',v); 
-        redis.pcall('del',v);
+        local ttl = redis.call('ttl', v);
+        values[#values+1] = redis.call('hgetall',v); 
+        redis.call('del',v);
         local j=1
         while j<#ARGV do
-            redis.pcall('hset',v,ARGV[j],ARGV[j+1]);
+            redis.call('hset',v,ARGV[j],ARGV[j+1]);
             j=j+2
         end
         if setTtl == 1 then
             $luaSetTtl
         elseif ttl >= 0 then
-            redis.pcall('expire',v,ttl)
+            redis.call('expire',v,ttl)
         end
     end 
     return {KEYS,values};
 LUA;
         return $script;
     }
-}
+}
diff --git a/src/Commands/GetsetListCommand.php b/src/Commands/GetsetListCommand.php
@@ -12,20 +12,20 @@ public function getScript()
     local values = {}; 
     local setTtl = $setTtl;
     for i,v in ipairs(KEYS) do 
-        local ttl = redis.pcall('ttl', v);
-        values[#values+1] = redis.pcall('lrange',v,0,-1); 
-        redis.pcall('del',v);
+        local ttl = redis.call('ttl', v);
+        values[#values+1] = redis.call('lrange',v,0,-1); 
+        redis.call('del',v);
         for j=1,#ARGV do
-            redis.pcall('rpush',v,ARGV[j]);
+            redis.call('rpush',v,ARGV[j]);
         end
         if setTtl == 1 then
             $luaSetTtl
         elseif ttl >= 0 then
-            redis.pcall('expire',v,ttl)
+            redis.call('expire',v,ttl)
         end
     end 
     return {KEYS,values};
 LUA;
         return $script;
     }
-}
+}
diff --git a/src/Commands/GetsetSetCommand.php b/src/Commands/GetsetSetCommand.php
@@ -12,20 +12,20 @@ public function getScript()
     local values = {}; 
     local setTtl = $setTtl;
     for i,v in ipairs(KEYS) do 
-        local ttl = redis.pcall('ttl', v);
-        values[#values+1] = redis.pcall('smembers',v); 
-        redis.pcall('del',v);
+        local ttl = redis.call('ttl', v);
+        values[#values+1] = redis.call('smembers',v); 
+        redis.call('del',v);
         for j=1,#ARGV do
-            redis.pcall('sadd',v,ARGV[j]);
+            redis.call('sadd',v,ARGV[j]);
         end
         if setTtl == 1 then
             $luaSetTtl
         elseif ttl >= 0 then
-            redis.pcall('expire',v,ttl)
+            redis.call('expire',v,ttl)
         end
     end 
     return {KEYS,values};
 LUA;
         return $script;
     }
-}
+}
diff --git a/src/Commands/GetsetStringCommand.php b/src/Commands/GetsetStringCommand.php
@@ -21,16 +21,16 @@ public function getScript()
     local values = {}; 
     local setTtl = $setTtl;
     for i,v in ipairs(KEYS) do 
-        local ttl = redis.pcall('ttl', v);
-        values[#values+1] = redis.pcall('getset',v,ARGV[1]); 
+        local ttl = redis.call('ttl', v);
+        values[#values+1] = redis.call('getset',v,ARGV[1]); 
         if setTtl == 1 then
             $luaSetTtl
         elseif ttl >= 0 then
-            redis.pcall('expire',v,ttl)
+            redis.call('expire',v,ttl)
         end
     end 
     return {KEYS,values};
 LUA;
         return $script;
     }
-}
+}
diff --git a/src/Commands/GetsetZsetCommand.php b/src/Commands/GetsetZsetCommand.php
@@ -12,22 +12,22 @@ public function getScript()
     local values = {}; 
     local setTtl = $setTtl;
     for i,v in ipairs(KEYS) do 
-        local ttl = redis.pcall('ttl', v);
-        values[#values+1] = redis.pcall('zrange', v, 0, -1); 
-        redis.pcall('del',v);
+        local ttl = redis.call('ttl', v);
+        values[#values+1] = redis.call('zrange', v, 0, -1); 
+        redis.call('del',v);
         local j=1;
         while j<#ARGV do
-            redis.pcall('zadd',v,ARGV[j],ARGV[j+1]);
+            redis.call('zadd',v,ARGV[j],ARGV[j+1]);
             j=j+2
         end
         if setTtl == 1 then
             $luaSetTtl
         elseif ttl >= 0 then
-            redis.pcall('expire',v,ttl)
+            redis.call('expire',v,ttl)
         end
     end 
     return {KEYS,values};
 LUA;
         return $script;
     }
-}
+}
diff --git a/src/Commands/HgetallCommand.php b/src/Commands/HgetallCommand.php
@@ -22,10 +22,10 @@ public function getScript()
         $script = <<<LUA
     local values = {}; 
     for i,v in ipairs(KEYS) do 
-        values[#values+1] = redis.pcall('hgetall',v); 
+        values[#values+1] = redis.call('hgetall',v); 
     end 
     return {KEYS,values};
 LUA;
         return $script;
     }
-}
+}
diff --git a/src/Commands/HmsetCommand.php b/src/Commands/HmsetCommand.php
@@ -24,21 +24,21 @@ public function getScript()
 local values = {}; 
 local setTtl = '$setTtl';
 for i,v in ipairs(KEYS) do 
-    local ttl = redis.pcall('ttl', v)
+    local ttl = redis.call('ttl', v)
     $delScript
     local j=1
     while j<#ARGV do
-        values[i]=redis.pcall('hset',v,ARGV[j],ARGV[j+1]); 
+        values[i]=redis.call('hset',v,ARGV[j],ARGV[j+1]); 
         j=j+2
     end
     if setTtl == '1' then
         $luaSetTtl
     elseif ttl > 0 then
-        redis.pcall('expire', v, ttl);
+        redis.call('expire', v, ttl);
     end
 end
 return {KEYS,values};
 LUA;
         return $script;
     }
-}
+}
diff --git a/src/Commands/KeysCommand.php b/src/Commands/KeysCommand.php
@@ -9,8 +9,8 @@ public function getScript()
     local values={} 
     for i,v in ipairs(KEYS) do 
         if string.find(v,'?')~=nil or string.find(v,'*')~=nil then
-            values[#values+1]=redis.pcall('keys',v) 
-        else if redis.pcall('exists',v)==1 then 
+            values[#values+1]=redis.call('keys',v) 
+        else if redis.call('exists',v)==1 then 
             values[#values+1] = {v}
         end
         end
@@ -36,4 +36,4 @@ public function parseResponse($data)
 
         return array_values($keys);
     }
-}
+}
diff --git a/src/Commands/LpushCommand.php b/src/Commands/LpushCommand.php
@@ -15,16 +15,16 @@ public function getScript()
 local values = {}; 
 local setTtl = '$setTtl';
 for i,v in ipairs(KEYS) do
-    local ttl = redis.pcall('ttl', v)
+    local ttl = redis.call('ttl', v)
     $delScript
     local rs
     for j=1,#ARGV do
-        rs=redis.pcall('lpush',v,ARGV[j]);
+        rs=redis.call('lpush',v,ARGV[j]);
     end
     if setTtl=='1' then
         $luaSetTtl
     elseif ttl > 0 then
-        redis.pcall('expire', v, ttl)
+        redis.call('expire', v, ttl)
     end
     values[#values+1]=rs;
 end 
@@ -33,4 +33,4 @@ public function getScript()
         return $script;
     }
 
-}
+}
diff --git a/src/Commands/LrangeCommand.php b/src/Commands/LrangeCommand.php
@@ -13,10 +13,10 @@ public function getScript()
         $script = <<<LUA
     local values = {}; 
     for i,v in ipairs(KEYS) do 
-        values[#values+1] = redis.pcall('lrange', v, 0, -1); 
+        values[#values+1] = redis.call('lrange', v, 0, -1); 
     end 
     return {KEYS,values};
 LUA;
         return $script;
     }
-}
+}
diff --git a/src/Commands/RpushCommand.php b/src/Commands/RpushCommand.php
@@ -24,16 +24,16 @@ public function getScript()
 local values = {}; 
 local setTtl = '$setTtl';
 for i,v in ipairs(KEYS) do
-    local ttl = redis.pcall('ttl', v)
+    local ttl = redis.call('ttl', v)
     $delScript
     local rs
     for j=1,#ARGV do
-        rs=redis.pcall('rpush',v,ARGV[j]);
+        rs=redis.call('rpush',v,ARGV[j]);
     end
     if setTtl=='1' then
         $luaSetTtl
     elseif ttl > 0 then
-        redis.pcall('expire', v, ttl)
+        redis.call('expire', v, ttl)
     end
     values[#values+1]=rs;
 end 
@@ -42,4 +42,4 @@ public function getScript()
         return $script;
     }
 
-}
+}
diff --git a/src/Commands/SaddCommand.php b/src/Commands/SaddCommand.php
@@ -24,17 +24,17 @@ public function getScript()
 local values = {};
 local setTtl = '$setTtl';
 for i,v in ipairs(KEYS) do
-    local ttl = redis.pcall('ttl', v)
+    local ttl = redis.call('ttl', v)
     $delScript
     local rs1
     for j=1,#ARGV do
-        rs1=redis.pcall('sadd',v,ARGV[j]);
+        rs1=redis.call('sadd',v,ARGV[j]);
     end
     if rs1 then
         if setTtl=='1' then
             $luaSetTtl
         elseif ttl > 0 then
-            redis.pcall('expire',v,ttl)
+            redis.call('expire',v,ttl)
         end
         values[#values+1]=rs1;
     else
diff --git a/src/Commands/SetCommand.php b/src/Commands/SetCommand.php
@@ -13,18 +13,18 @@ public function getScript()
 $checkScript
 local values = {}; 
 for i,v in ipairs(KEYS) do
-    local ttl = redis.pcall('ttl', v);
+    local ttl = redis.call('ttl', v);
     local setTtl = $setTtl;
-    values[#values+1] = redis.pcall('set',v,ARGV[1]);
+    values[#values+1] = redis.call('set',v,ARGV[1]);
     if setTtl == 1 then
         $luaSetTtl
     elseif ttl >= 0 then
-        redis.pcall('expire', v, ttl);
+        redis.call('expire', v, ttl);
     end
 end 
 return {KEYS,values};
 LUA;
         return $script;
     }
 
-}
+}
diff --git a/src/Commands/SmembersCommand.php b/src/Commands/SmembersCommand.php
@@ -11,9 +11,9 @@ public function getScript()
         return <<<LUA
 local values = {}; 
 for i,v in ipairs(KEYS) do 
-    values[#values+1] = redis.pcall('smembers',v); 
+    values[#values+1] = redis.call('smembers',v); 
 end 
 return {KEYS,values};
 LUA;
     }
-}
+}
diff --git a/src/Commands/Traits/Existence.php b/src/Commands/Traits/Existence.php
@@ -23,7 +23,7 @@ public function pleaseExists()
     {
         $this->existenceScript = <<<LUA
 for i,v in ipairs(KEYS) do
-    local ex = redis.pcall('exists', v);
+    local ex = redis.call('exists', v);
     if ex==0 then
         return nil
     end
@@ -36,7 +36,7 @@ public function pleaseNotExists()
     {
         $this->existenceScript = <<<LUA
 for i,v in ipairs(KEYS) do
-    local ex = redis.pcall('exists', v);
+    local ex = redis.call('exists', v);
     if ex==1 then
         return nil
     end
@@ -48,8 +48,8 @@ public function pleaseNotExists()
     public function pleaseDeleteIfExists()
     {
         $this->deleteScript = <<<LUA
-redis.pcall('del', v);
+redis.call('del', v);
 LUA;
         return $this;
     }
-}
+}
diff --git a/src/Commands/ZaddCommand.php b/src/Commands/ZaddCommand.php
diff --git a/src/Commands/ZrangeCommand.php b/src/Commands/ZrangeCommand.php
diff --git a/src/Model.php b/src/Model.php
