rpush, refactor _sock_send_bulk to expect +OK

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

diff --git a/lib/Redis.pm b/lib/Redis.pm
index 039fade..484e9b1 100644 (file)
--- a/lib/Redis.pm
+++ b/lib/Redis.pm
@@ -58,6 +58,30 @@ sub _sock_result {
        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";
+}
+
+sub _sock_send_bulk {
+       my ( $self, $command, $key, $value ) = @_;
+       print $sock "$command $key " . length($value) . "\r\n$value\r\n";
+       _sock_ok();
+}
+
+
 =head1 Connection Handling
 
 =head2 quit
@@ -93,10 +117,8 @@ sub ping {
 =cut
 
 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";
+       my ( $self, $key, $value, $new ) = @_;
+       $self->_sock_send_bulk( "SET" . ( $new ? 'NX' : '' ), $key, $value );
 }
 
 =head2 get
@@ -108,15 +130,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
@@ -187,10 +201,73 @@ sub del {
 
 sub type {
        my ( $self, $key ) = @_;
-       print $sock "type $key\r\n";
+       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', $new );
+
+=cut
+
+sub rename {
+       my ( $self, $old, $new, $nx ) = @_;
+       print $sock "RENAME" . ( $nx ? 'NX' : '' ) . " $old $new\r\n";
+       _sock_ok();
+}
+
+=head2 dbsize
+
+  my $nr_keys = $r->dbsize;
+
+=cut
+
+sub dbsize {
+       my ( $self ) = @_;
+       print $sock "DBSIZE\r\n";
        _sock_result();
 }
 
+=head1 Commands operating on lists
+
+=head2 rpush
+
+  $r->rpush( $key, $value );
+
+=cut
+
+sub rpush {
+       my ( $self, $key, $value ) = @_;
+       $self->_sock_send_bulk('RPUSH', $key, $value);
+}
+
 =head1 AUTHOR
 
 Dobrica Pavlinusic, C<< <dpavlin at rot13.org> >>