rename, renamenx

[perl-Redis.git] / lib / Redis.pm

diff --git a/lib/Redis.pm b/lib/Redis.pm
index d25a225..2eabb7b 100644 (file)
--- a/lib/Redis.pm
+++ b/lib/Redis.pm
@@ -51,6 +51,30 @@ sub new {
        $self;
 }
 
+sub _sock_result {
+       my $result = <$sock>;
+       warn "# result: ",dump( $result );
+       $result =~ s{\r\n$}{} || warn "can't find cr/lf";
+       return $result;
+}
+
+sub _sock_result_bulk {
+       my $len = <$sock>;
+       warn "# len: ",dump($len);
+       return undef if $len eq "nil\r\n";
+       my $v;
+       read($sock, $v, $len) || die $!;
+       warn "# v: ",dump($v);
+       my $crlf;
+       read($sock, $crlf, 2); # skip cr/lf
+       return $v;
+}
+
+sub _sock_ok {
+       my $ok = <$sock>;
+       confess dump($ok) unless $ok eq "+OK\r\n";
+}
+
 =head1 Connection Handling
 
 =head2 quit
@@ -88,8 +112,7 @@ sub ping {
 sub set {
        my ( $self, $k, $v, $new ) = @_;
        print $sock ( $new ? "SETNX" : "SET" ) . " $k " . length($v) . "\r\n$v\r\n";
-       my $ok = <$sock>;
-       confess dump($ok) unless $ok eq "+OK\r\n";
+       _sock_ok();
 }
 
 =head2 get
@@ -101,15 +124,7 @@ sub set {
 sub get {
        my ( $self, $k ) = @_;
        print $sock "GET $k\r\n";
-       my $len = <$sock>;
-#      warn "# len: ",dump($len);
-       return undef if $len eq "nil\r\n";
-       my $v;
-       read($sock, $v, $len) || die $!;
-#      warn "# v: ",dump($v);
-       my $crlf;
-       read($sock, $crlf, 2); # skip cr/lf
-       return $v;
+       _sock_result_bulk();
 }
 
 =head2 incr
@@ -119,6 +134,8 @@ sub get {
 
 =cut
 
+       
+
 sub incr {
        my ( $self, $key, $value ) = @_;
        if ( defined $value ) {
@@ -126,9 +143,7 @@ sub incr {
        } else {
                print $sock "INCR $key\r\n";
        }
-       my $count = <$sock>;
-       warn "# $key = $count";
-       return $count;
+       _sock_result();
 }
 
 =head2 decr
@@ -145,9 +160,81 @@ sub decr {
        } else {
                print $sock "DECR $key\r\n";
        }
-       my $count = <$sock>;
-       warn "# $key = $count";
-       return $count;
+       _sock_result();
+}
+
+=head2 exists
+
+  $r->exists( 'key' ) && print "got key!";
+
+=cut
+
+sub exists {
+       my ( $self, $key ) = @_;
+       print $sock "EXISTS $key\r\n";
+       _sock_result();
+}
+
+=head2 del
+
+  $r->del( 'key' ) || warn "key doesn't exist";
+
+=cut
+
+sub del {
+       my ( $self, $key ) = @_;
+       print $sock "DEL $key\r\n";
+       _sock_result();
+}
+
+=head2 type
+
+  $r->type( 'key' ); # = string
+
+=cut
+
+sub type {
+       my ( $self, $key ) = @_;
+       print $sock "TYPE $key\r\n";
+       _sock_result();
+}
+
+=head1 Commands operating on the key space
+
+=head2 keys
+
+  my @keys = $r->keys( '*glob_pattern*' );
+
+=cut
+
+sub keys {
+       my ( $self, $glob ) = @_;
+       print $sock "KEYS $glob\r\n";
+       return split(/\s/, _sock_result_bulk());
+}
+
+=head2 randomkey
+
+  my $key = $r->randomkey;
+
+=cut
+
+sub randomkey {
+       my ( $self ) = @_;
+       print $sock "RANDOMKEY\r\n";
+       _sock_result();
+}
+
+=head2 rename
+
+  my $ok = $r->rename( 'old-key', 'new-key', $only_if_new );
+
+=cut
+
+sub rename {
+       my ( $self, $old, $new, $nx ) = @_;
+       print $sock "RENAME" . ( $nx ? 'NX' : '' ) . " $old $new\r\n";
+       _sock_ok();
 }
 
 =head1 AUTHOR