make scripts static to reduce Redis cache memory usage

limen · Nov 29, 2018 · f477d1a · f477d1a
1 parent e20b7f5
commit f477d1a
Show file tree

Hide file tree

Showing 11 changed files with 48 additions and 26 deletions.
diff --git a/.gitignore b/.gitignore
@@ -1 +1,3 @@
-.idea/
+.idea/
+vendor/
+composer.lock
diff --git a/composer.json b/composer.json
@@ -20,7 +20,7 @@
   "license": "MIT",
   "require": {
     "php": ">=5.5",
-    "predis/predis": "1.1.*"
+    "predis/predis": "^1.1"
   },
   "require-dev": {
     "phpunit/phpunit": "~4.8"

diff --git a/src/Commands/GetsetHashCommand.php b/src/Commands/GetsetHashCommand.php
@@ -5,7 +5,6 @@ class GetsetHashCommand extends Command
 {
     public function getScript()
     {
-        $elementsPart = $this->joinArguments();
         $luaSetTtl = $this->luaSetTtl($this->getTtl());
         $setTtl = $luaSetTtl ? 1 : 0;
 
@@ -16,7 +15,11 @@ public function getScript()
         local ttl = redis.pcall('ttl', v);
         values[#values+1] = redis.pcall('hgetall',v); 
         redis.pcall('del',v);
-        redis.pcall('hmset',v,$elementsPart);
+        local j=1
+        while j<#ARGV do
+            redis.pcall('hset',v,ARGV[j],ARGV[j+1]);
+            j=j+2
+        end
         if setTtl == 1 then
             $luaSetTtl
         elseif ttl >= 0 then

diff --git a/src/Commands/GetsetListCommand.php b/src/Commands/GetsetListCommand.php
@@ -5,7 +5,6 @@ class GetsetListCommand extends Command
 {
     public function getScript()
     {
-        $elementsPart = $this->joinArguments();
         $luaSetTtl = $this->luaSetTtl($this->getTtl());
         $setTtl = $luaSetTtl ? 1 : 0;
 
@@ -16,7 +15,9 @@ public function getScript()
         local ttl = redis.pcall('ttl', v);
         values[#values+1] = redis.pcall('lrange',v,0,-1); 
         redis.pcall('del',v);
-        redis.pcall('rpush',v,$elementsPart);
+        for j=1,#ARGV do
+            redis.pcall('rpush',v,ARGV[j]);
+        end
         if setTtl == 1 then
             $luaSetTtl
         elseif ttl >= 0 then

diff --git a/src/Commands/GetsetSetCommand.php b/src/Commands/GetsetSetCommand.php
@@ -5,7 +5,6 @@ class GetsetSetCommand extends Command
 {
     public function getScript()
     {
-        $elementsPart = $this->joinArguments();
         $luaSetTtl = $this->luaSetTtl($this->getTtl());
         $setTtl = $luaSetTtl ? 1 : 0;
 
@@ -16,7 +15,9 @@ public function getScript()
         local ttl = redis.pcall('ttl', v);
         values[#values+1] = redis.pcall('smembers',v); 
         redis.pcall('del',v);
-        redis.pcall('sadd',v,$elementsPart);
+        for j=1,#ARGV do
+            redis.pcall('sadd',v,ARGV[j]);
+        end
         if setTtl == 1 then
             $luaSetTtl
         elseif ttl >= 0 then

diff --git a/src/Commands/GetsetZsetCommand.php b/src/Commands/GetsetZsetCommand.php
@@ -5,7 +5,6 @@ class GetsetZsetCommand extends Command
 {
     public function getScript()
     {
-        $elementsPart = $this->joinArguments();
         $luaSetTtl = $this->luaSetTtl($this->getTtl());
         $setTtl = $luaSetTtl ? 1 : 0;
 
@@ -16,7 +15,11 @@ public function getScript()
         local ttl = redis.pcall('ttl', v);
         values[#values+1] = redis.pcall('zrange', v, 0, -1); 
         redis.pcall('del',v);
-        redis.pcall('zadd', v, $elementsPart);
+        local j=1;
+        while j<#ARGV do
+            redis.pcall('zadd',v,ARGV[j],ARGV[j+1]);
+            j=j+2
+        end
         if setTtl == 1 then
             $luaSetTtl
         elseif ttl >= 0 then

diff --git a/src/Commands/HmsetCommand.php b/src/Commands/HmsetCommand.php
@@ -14,7 +14,6 @@ class HmsetCommand extends Command
 {
     public function getScript()
     {
-        $argString = $this->joinArguments();
         $luaSetTtl = $this->luaSetTtl($this->getTtl());
         $setTtl = $luaSetTtl ? 1 : 0;
         $checkExist = $this->existenceScript;
@@ -27,7 +26,11 @@ public function getScript()
 for i,v in ipairs(KEYS) do 
     local ttl = redis.pcall('ttl', v)
     $delScript
-    values[#values+1] = redis.pcall('hmset',v, $argString); 
+    local j=1
+    while j<#ARGV do
+        values[i]=redis.pcall('hset',v,ARGV[j],ARGV[j+1]); 
+        j=j+2
+    end
     if setTtl == '1' then
         $luaSetTtl
     elseif ttl > 0 then

diff --git a/src/Commands/LpushCommand.php b/src/Commands/LpushCommand.php
@@ -5,7 +5,6 @@ class LpushCommand extends Command
 {
     public function getScript()
     {
-        $elementsPart = $this->joinArguments();
         $luaSetTtl = $this->luaSetTtl($this->getTtl());
         $setTtl = $luaSetTtl ? 1 : 0;
         $checkScript = $this->existenceScript;
@@ -18,13 +17,16 @@ public function getScript()
 for i,v in ipairs(KEYS) do
     local ttl = redis.pcall('ttl', v)
     $delScript
-    local rs = redis.pcall('lpush',v,$elementsPart);
+    local rs
+    for j=1,#ARGV do
+        rs=redis.pcall('lpush',v,ARGV[j]);
+    end
     if setTtl=='1' then
         $luaSetTtl
     elseif ttl > 0 then
         redis.pcall('expire', v, ttl)
     end
-    values[#values+1] = rs;
+    values[#values+1]=rs;
 end 
 return {KEYS,values};
 LUA;

diff --git a/src/Commands/RpushCommand.php b/src/Commands/RpushCommand.php
@@ -14,8 +14,6 @@ class RpushCommand extends Command
 {
     public function getScript()
     {
-        $elementsPart = $this->joinArguments();
-
         $luaSetTtl = $this->luaSetTtl($this->getTtl());
         $setTtl = $luaSetTtl ? 1 : 0;
         $checkScript = $this->existenceScript;
@@ -28,13 +26,16 @@ public function getScript()
 for i,v in ipairs(KEYS) do
     local ttl = redis.pcall('ttl', v)
     $delScript
-    local rs = redis.pcall('rpush',v,$elementsPart);
+    local rs
+    for j=1,#ARGV do
+        rs=redis.pcall('rpush',v,ARGV[j]);
+    end
     if setTtl=='1' then
         $luaSetTtl
     elseif ttl > 0 then
         redis.pcall('expire', v, ttl)
     end
-    values[#values+1] = rs;
+    values[#values+1]=rs;
 end 
 return {KEYS,values};
 LUA;

diff --git a/src/Commands/SaddCommand.php b/src/Commands/SaddCommand.php
@@ -14,7 +14,6 @@ class SaddCommand extends Command
 {
     public function getScript()
     {
-        $elementsPart = $this->joinArguments();
         $luaSetTtl = $this->luaSetTtl($this->getTtl());
         $setTtl = $luaSetTtl ? 1 : 0;
         $checkScript = $this->existenceScript;
@@ -27,16 +26,19 @@ public function getScript()
 for i,v in ipairs(KEYS) do
     local ttl = redis.pcall('ttl', v)
     $delScript
-    local rs1 = redis.pcall('sadd', v, $elementsPart);
+    local rs1
+    for j=1,#ARGV do
+        rs1=redis.pcall('sadd',v,ARGV[j]);
+    end
     if rs1 then
         if setTtl=='1' then
             $luaSetTtl
         elseif ttl > 0 then
-            redis.pcall('expire', v, ttl)
+            redis.pcall('expire',v,ttl)
         end
-        values[#values+1] = rs1;
+        values[#values+1]=rs1;
     else
-        values[#values+1] = nil;
+        values[#values+1]=nil;
     end
 end 
 return {KEYS,values};

diff --git a/src/Commands/ZaddCommand.php b/src/Commands/ZaddCommand.php
@@ -5,7 +5,6 @@ class ZaddCommand extends Command
 {
     public function getScript()
     {
-        $elementsPart = $this->joinArguments();
         $luaSetTtl = $this->luaSetTtl($this->getTtl());
         $setTtl = $luaSetTtl ? 1 : 0;
         $checkScript = $this->existenceScript;
@@ -18,7 +17,12 @@ public function getScript()
 for i,v in ipairs(KEYS) do
     local ttl = redis.pcall('ttl', v)
     $delScript
-    local rs1 = redis.pcall('zadd', v, $elementsPart);
+    local rs1
+    local j=1
+    while j<#ARGV do
+        rs1=redis.pcall('zadd',v,ARGV[j],ARGV[j+1]);
+        j=j+2
+    end
     if rs1 then
         if setTtl=='1' then
             $luaSetTtl