sinterstore

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

diff --git a/lib/Redis.pm b/lib/Redis.pm
index 8fe98d6..ed5e2ad 100644 (file)
--- a/lib/Redis.pm
+++ b/lib/Redis.pm
@@ -63,8 +63,10 @@ sub _sock_read_bulk {
        warn "## bulk len: ",dump($len);
        return undef if $len eq "nil\r\n";
        my $v;
-       read($sock, $v, $len) || die $!;
-       warn "## bulk v: ",dump($v);
+       if ( $len > 0 ) {
+               read($sock, $v, $len) || die $!;
+               warn "## bulk v: ",dump($v);
+       }
        my $crlf;
        read($sock, $crlf, 2); # skip cr/lf
        return $v;
@@ -77,8 +79,26 @@ sub _sock_result_bulk {
        _sock_read_bulk();
 }
 
-sub _sock_ok {
+sub _sock_result_bulk_list {
+       my $self = shift;
+       warn "## _sock_result_bulk_list ",dump( @_ );
+
+       my $size = $self->_sock_send( @_ );
+       confess $size unless $size > 0;
+       $size--;
+
+       my @list = ( 0 .. $size );
+       foreach ( 0 .. $size ) {
+               $list[ $_ ] = _sock_read_bulk();
+       }
+
+       warn "## list = ", dump( @list );
+       return @list;
+}
+
+sub __sock_ok {
        my $ok = <$sock>;
+       return undef if $ok eq "nil\r\n";
        confess dump($ok) unless $ok eq "+OK\r\n";
 }
 
@@ -93,15 +113,28 @@ sub _sock_send_ok {
        my $self = shift;
        warn "## _sock_send_ok ",dump( @_ );
        print $sock join(' ',@_) . "\r\n";
-       _sock_ok();
+       __sock_ok();
+}
+
+sub __sock_send_bulk_raw {
+       my $self = shift;
+       warn "## _sock_send_bulk ",dump( @_ );
+       my $value = pop;
+       $value = '' unless defined $value; # FIXME errr? nil?
+       print $sock join(' ',@_) . ' ' . length($value) . "\r\n$value\r\n"
 }
 
 sub _sock_send_bulk {
-       my ( $self, $command, $key, $value ) = @_;
-       print $sock "$command $key " . length($value) . "\r\n$value\r\n";
-       _sock_ok();
+       __sock_send_bulk_raw( @_ );
+       __sock_ok();
 }
 
+sub _sock_send_bulk_number {
+       __sock_send_bulk_raw( @_ );
+       my $v = _sock_result();
+       confess $v unless $v =~ m{^\-?\d+$};
+       return $v;
+}
 
 =head1 Connection Handling
 
@@ -301,18 +334,7 @@ sub llen {
 
 sub lrange {
        my ( $self, $key, $start, $end ) = @_;
-       my $size = $self->_sock_send('LRANGE', $key, $start, $end);
-
-       confess $size unless $size > 0;
-       $size--;
-
-       my @list = ( 0 .. $size );
-       foreach ( 0 .. $size ) {
-               $list[ $_ ] = _sock_read_bulk();
-       }
-
-       warn "## lrange $key $start $end = [$size] ", dump( @list );
-       return @list;
+       $self->_sock_result_bulk_list('LRANGE', $key, $start, $end);
 }
 
 =head2 ltrim
@@ -334,9 +356,120 @@ sub ltrim {
 
 sub lindex {
        my ( $self, $key, $index ) = @_;
-       $self->_sock_result_bulk( 'lindex', $key, $index );
+       $self->_sock_result_bulk( 'LINDEX', $key, $index );
+}
+
+=head2 lset
+
+  $r->lset( $key, $index, $value );
+
+=cut
+
+sub lset {
+       my ( $self, $key, $index, $value ) = @_;
+       $self->_sock_send_bulk( 'LSET', $key, $index, $value );
+}
+
+=head2 lrem
+
+  my $modified_count = $r->lrem( $key, $count, $value );
+
+=cut
+
+sub lrem {
+       my ( $self, $key, $count, $value ) = @_;
+       $self->_sock_send_bulk_number( 'LREM', $key, $count, $value );
+}
+
+=head2 lpop
+
+  my $value = $r->lpop( $key );
+
+=cut
+
+sub lpop {
+       my ( $self, $key ) = @_;
+       $self->_sock_result_bulk( 'LPOP', $key );
+}
+
+=head2 rpop
+
+  my $value = $r->rpop( $key );
+
+=cut
+
+sub rpop {
+       my ( $self, $key ) = @_;
+       $self->_sock_result_bulk( 'RPOP', $key );
+}
+
+=head1 Commands operating on sets
+
+=head2 sadd
+
+  $r->sadd( $key, $member );
+
+=cut
+
+sub sadd {
+       my ( $self, $key, $member ) = @_;
+       $self->_sock_send_bulk_number( 'SADD', $key, $member );
+}
+
+=head2 srem
+
+  $r->srem( $key, $member );
+
+=cut
+
+sub srem {
+       my ( $self, $key, $member ) = @_;
+       $self->_sock_send_bulk_number( 'SREM', $key, $member );
 }
 
+=head2 scard
+
+  my $elements = $r->scard( $key );
+
+=cut
+
+sub scard {
+       my ( $self, $key ) = @_;
+       $self->_sock_send( 'SCARD', $key );
+}
+
+=head2 sismember
+
+  $r->sismember( $key, $member );
+
+=cut
+
+sub sismember {
+       my ( $self, $key, $member ) = @_;
+       $self->_sock_send_bulk_number( 'SISMEMBER', $key, $member );
+}
+
+=head2 sinter
+
+  $r->sinter( $key1, $key2, ... );
+
+=cut
+
+sub sinter {
+       my $self = shift;
+       $self->_sock_result_bulk_list( 'SINTER', @_ );
+}
+
+=head2 sinterstore
+
+  my $ok = $r->sinterstore( $dstkey, $key1, $key2, ... );
+
+=cut
+
+sub sinterstore {
+       my $self = shift;
+       $self->_sock_send_ok( 'SINTERSTORE', @_ );
+}
 
 =head1 AUTHOR