X-Git-Url: https://gitweb.factorcode.org/gitweb.cgi?p=factor.git;a=blobdiff_plain;f=extra%2Fredis%2Fcommand-writer%2Fcommand-writer.factor;h=6657f64b0a5bffab56afafe7de1874912ac44aa3;hp=06a2cd92cb208d7a8d1f0f00e71d90f32780462e;hb=5060e8bd5fdc18dc1bea82f06cf1b9a2699441b6;hpb=7b1876250b95a7e9529484fa8b2f03bacb475bd7

diff --git a/extra/redis/command-writer/command-writer.factor b/extra/redis/command-writer/command-writer.factor
index 06a2cd92cb..6657f64b0a 100644
--- a/extra/redis/command-writer/command-writer.factor
+++ b/extra/redis/command-writer/command-writer.factor
@@ -1,7 +1,7 @@
 ! Copyright (C) 2009 Bruno Deferrari
 ! See http://factorcode.org/license.txt for BSD license.
-USING: arrays assocs formatting io io.crlf kernel math
-math.parser sequences strings locals ;
+USING: arrays assocs formatting kernel math math.parser
+sequences strings make ;
 IN: redis.command-writer
 
 <PRIVATE
@@ -23,14 +23,24 @@ M: sequence write-resp ( sequence -- )
     [ dup number? [ number>string ] when ] map
     write-resp ;
 
+: write-command-multi ( sequence command -- )
+    prepend
+    [ dup number? [ number>string ] when ] map
+    write-resp ;
+
+:: (script-eval) ( script keys args command -- )
+    [ script , keys length , keys % args % ] { } make
+    { command }
+    write-command-multi ;
+
 PRIVATE>
 
-#! Connection
+! Connection
 : quit ( -- ) { "QUIT" } write-resp ;
 : ping ( -- ) { "PING" } write-resp ;
 : auth ( password -- ) 1array "AUTH" write-command ;
 
-#! String values
+! String values
 : set ( value key -- ) 2array "SET" write-command ;
 : get ( key -- ) 1array "GET" write-command ;
 : getset ( value key -- ) 2array "GETSET" write-command ;
@@ -44,7 +54,7 @@ PRIVATE>
 : del ( key -- ) 1array "DEL" write-command ;
 : type ( key -- ) 1array "TYPE" write-command ;
 
-#! Key space
+! Key space
 : keys ( pattern -- ) 1array "KEYS" write-command ;
 : randomkey ( -- ) { "RANDOMKEY" } write-resp ;
 : rename ( newkey key -- ) 2array "RENAME" write-command ;
@@ -52,21 +62,21 @@ PRIVATE>
 : dbsize ( -- ) { "DBSIZE" } write-resp ;
 : expire ( integer key -- ) 2array "EXPIRE" write-command ;
 
-#! Lists
+! Lists
 : rpush ( value key -- ) 2array "RPUSH" write-command ;
 : lpush ( value key -- ) 2array "LPUSH" write-command ;
 : llen ( key -- ) 1array "LLEN" write-command ;
 : lrange ( start end key -- )
-    [ swap ] dip 3array "LRANGE" write-command ;
+    swapd 3array "LRANGE" write-command ;
 : ltrim ( start end key -- )
-    [ swap ] dip 3array "LTRIM" write-command ;
+    swapd 3array "LTRIM" write-command ;
 : lindex ( integer key -- ) 2array "LINDEX" write-command ;
 : lset ( value index key -- ) 3array "LSET" write-command ;
 : lrem ( value amount key -- ) 3array "LREM" write-command ;
 : lpop ( key -- ) 1array "LPOP" write-command ;
 : rpop ( key -- ) 1array "RPOP" write-command ;
 
-#! Sets
+! Sets
 : sadd ( member key -- ) 2array "SADD" write-command ;
 : srem  ( member key -- ) 2array "SREM" write-command ;
 : smove ( member newkey key -- )
@@ -82,7 +92,7 @@ PRIVATE>
     [ reverse ] dip suffix "SUNIONSTORE" write-command ;
 : smembers ( key -- ) 1array "SMEMBERS" write-command ;
 
-#! Hashes
+! Hashes
 : hdel ( field key -- ) 2array "HDEL" write-command ;
 : hexists ( field key -- ) 2array "HEXISTS" write-command ;
 : hget ( field key -- ) 2array "HGET" write-command ;
@@ -103,21 +113,32 @@ PRIVATE>
     3array "HSETNX" write-command ;
 : hvals ( key -- ) 1array "HVALS" write-command ;
 
-#! Multiple db
+! Multiple db
 : select ( integer -- ) 1array "SELECT" write-command ;
 : move ( integer key -- ) 2array "MOVE" write-command ;
+: swapdb ( old new -- ) 2array "SWAPDB" write-command ;
 : flushdb ( -- ) { "FLUSHDB" } write-resp ;
 : flushall ( -- ) { "FLUSHALL" } write-resp ;
 
-#! Sorting
+! Sorting
 ! sort
 
-#! Persistence control
+! Persistence control
 : save ( -- ) { "SAVE" } write-resp ;
 : bgsave ( -- ) { "BGSAVE" } write-resp ;
 : lastsave ( -- ) { "LASTSAVE" } write-resp ;
 : shutdown ( -- ) { "SHUTDOWN" } write-resp ;
 
-#! Remote server control
+! Remote server control
 : info ( -- ) { "INFO" } write-resp ;
 : monitor ( -- ) { "MONITOR" } write-resp ;
+
+! Lua
+: script-load ( script -- ) 1array { "SCRIPT" "LOAD" } write-command-multi ;
+: script-exists ( scripts -- ) { "SCRIPT" "EXISTS" } write-command-multi ;
+: script-flush ( -- ) { } { "SCRIPT" "FLUSH" } write-command-multi ;
+: script-kill ( -- ) { } { "SCRIPT" "KILL" } write-command-multi ;
+! YES | SYNC | NO
+: script-debug ( debug -- ) 1array { "SCRIPT" "DEBUG" } write-command-multi ;
+: script-evalsha ( sha keys args -- ) "EVALSHA" (script-eval) ;
+: script-eval ( script keys args -- ) "EVAL" (script-eval) ;