select

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

diff --git a/lib/Redis.pm b/lib/Redis.pm
index 3ac7619..14e8b8d 100644 (file)
--- a/lib/Redis.pm
+++ b/lib/Redis.pm
@@ -9,7 +9,7 @@ use Carp qw/confess/;
 
 =head1 NAME
 
-Redis - The great new Redis!
+Redis - perl binding for Redis database
 
 =cut
 
@@ -20,19 +20,21 @@ our $VERSION = '0.01';
 
 Pure perl bindings for L<http://code.google.com/p/redis/>
 
+This version support git version of Redis available at
+L<git://github.com/antirez/redis>
+
     use Redis;
 
     my $r = Redis->new();
 
-
-
-
 =head1 FUNCTIONS
 
 =head2 new
 
 =cut
 
+our $debug = $ENV{REDIS} || 0;
+
 our $sock;
 my $server = '127.0.0.1:6379';
 
@@ -53,19 +55,19 @@ sub new {
 
 sub _sock_result {
        my $result = <$sock>;
-       warn "# result: ",dump( $result );
+       warn "## result: ",dump( $result ) if $debug;
        $result =~ s{\r\n$}{} || warn "can't find cr/lf";
        return $result;
 }
 
 sub _sock_read_bulk {
        my $len = <$sock>;
-       warn "## bulk len: ",dump($len);
+       warn "## bulk len: ",dump($len) if $debug;
        return undef if $len eq "nil\r\n";
        my $v;
        if ( $len > 0 ) {
                read($sock, $v, $len) || die $!;
-               warn "## bulk v: ",dump($v);
+               warn "## bulk v: ",dump($v) if $debug;
        }
        my $crlf;
        read($sock, $crlf, 2); # skip cr/lf
@@ -74,11 +76,28 @@ sub _sock_read_bulk {
 
 sub _sock_result_bulk {
        my $self = shift;
-       warn "## _sock_result_bulk ",dump( @_ );
+       warn "## _sock_result_bulk ",dump( @_ ) if $debug;
        print $sock join(' ',@_) . "\r\n";
        _sock_read_bulk();
 }
 
+sub _sock_result_bulk_list {
+       my $self = shift;
+       warn "## _sock_result_bulk_list ",dump( @_ ) if $debug;
+
+       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 ) if $debug;
+       return @list;
+}
+
 sub __sock_ok {
        my $ok = <$sock>;
        return undef if $ok eq "nil\r\n";
@@ -87,21 +106,21 @@ sub __sock_ok {
 
 sub _sock_send {
        my $self = shift;
-       warn "## _sock_send ",dump( @_ );
+       warn "## _sock_send ",dump( @_ ) if $debug;
        print $sock join(' ',@_) . "\r\n";
        _sock_result();
 }
 
 sub _sock_send_ok {
        my $self = shift;
-       warn "## _sock_send_ok ",dump( @_ );
+       warn "## _sock_send_ok ",dump( @_ ) if $debug;
        print $sock join(' ',@_) . "\r\n";
        __sock_ok();
 }
 
 sub __sock_send_bulk_raw {
        my $self = shift;
-       warn "## _sock_send_bulk ",dump( @_ );
+       warn "## _sock_send_bulk ",dump( @_ ) if $debug;
        my $value = pop;
        $value = '' unless defined $value; # FIXME errr? nil?
        print $sock join(' ',@_) . ' ' . length($value) . "\r\n$value\r\n"
@@ -276,6 +295,8 @@ sub dbsize {
 
 =head1 Commands operating on lists
 
+See also L<Redis::List> for tie interface.
+
 =head2 rpush
 
   $r->rpush( $key, $value );
@@ -317,18 +338,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
@@ -383,7 +393,7 @@ sub lrem {
 
 sub lpop {
        my ( $self, $key ) = @_;
-       $self->_sock_result_bulk( 'lpop', $key );
+       $self->_sock_result_bulk( 'LPOP', $key );
 }
 
 =head2 rpop
@@ -394,7 +404,88 @@ sub lpop {
 
 sub rpop {
        my ( $self, $key ) = @_;
-       $self->_sock_result_bulk( 'rpop', $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 Multiple databases handling commands
+
+=head2 select
+
+  $r->select( 1 );
+
+=cut
+
+sub select {
+       my ($self,$index) = @_;
+       $self->_sock_send_ok( 'SELECT', $index );
 }
 
 =head1 AUTHOR