X-Git-Url: http://git.rot13.org/?p=perl-Redis.git;a=blobdiff_plain;f=lib%2FRedis.pm;h=ed5e2ad094a10e777a8d8f221e9798d38fffb234;hp=5a62fbf117299316d63b906848fa3896467bcfdf;hb=c6feb7aa4faf446b401231c3e85f94a8d2ae3654;hpb=9cfdc80967211c3b14fb981b5e0b012f43447599

diff --git a/lib/Redis.pm b/lib/Redis.pm
index 5a62fbf..ed5e2ad 100644
--- a/lib/Redis.pm
+++ b/lib/Redis.pm
@@ -58,35 +58,83 @@ sub _sock_result {
 	return $result;
 }
 
-sub _sock_result_bulk {
+sub _sock_read_bulk {
 	my $len = <$sock>;
-	warn "# len: ",dump($len);
+	warn "## bulk len: ",dump($len);
 	return undef if $len eq "nil\r\n";
 	my $v;
-	read($sock, $v, $len) || die $!;
-	warn "# 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;
 }
 
-sub _sock_ok {
+sub _sock_result_bulk {
+	my $self = shift;
+	warn "## _sock_result_bulk ",dump( @_ );
+	print $sock join(' ',@_) . "\r\n";
+	_sock_read_bulk();
+}
+
+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";
 }
 
 sub _sock_send {
 	my $self = shift;
+	warn "## _sock_send ",dump( @_ );
 	print $sock join(' ',@_) . "\r\n";
 	_sock_result();
 }
 
+sub _sock_send_ok {
+	my $self = shift;
+	warn "## _sock_send_ok ",dump( @_ );
+	print $sock join(' ',@_) . "\r\n";
+	__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
 
@@ -134,9 +182,8 @@ sub set {
 =cut
 
 sub get {
-	my ( $self, $k ) = @_;
-	print $sock "GET $k\r\n";
-	_sock_result_bulk();
+	my $self = shift;
+	$self->_sock_result_bulk('GET', @_);
 }
 
 =head2 incr
@@ -149,13 +196,8 @@ sub get {
 	
 
 sub incr {
-	my ( $self, $key, $value ) = @_;
-	if ( defined $value ) {
-		print $sock "INCRBY $key $value\r\n";
-	} else {
-		print $sock "INCR $key\r\n";
-	}
-	_sock_result();
+	my $self = shift;
+	$self->_sock_send( 'INCR' . ( $#_ ? 'BY' : '' ), @_ );
 }
 
 =head2 decr
@@ -166,13 +208,8 @@ sub incr {
 =cut
 
 sub decr {
-	my ( $self, $key, $value ) = @_;
-	if ( defined $value ) {
-		print $sock "DECRBY $key $value\r\n";
-	} else {
-		print $sock "DECR $key\r\n";
-	}
-	_sock_result();
+	my $self = shift;
+	$self->_sock_send( 'DECR' . ( $#_ ? 'BY' : '' ), @_ );
 }
 
 =head2 exists
@@ -183,8 +220,7 @@ sub decr {
 
 sub exists {
 	my ( $self, $key ) = @_;
-	print $sock "EXISTS $key\r\n";
-	_sock_result();
+	$self->_sock_send( 'EXISTS', $key );
 }
 
 =head2 del
@@ -195,8 +231,7 @@ sub exists {
 
 sub del {
 	my ( $self, $key ) = @_;
-	print $sock "DEL $key\r\n";
-	_sock_result();
+	$self->_sock_send( 'DEL', $key );
 }
 
 =head2 type
@@ -207,8 +242,7 @@ sub del {
 
 sub type {
 	my ( $self, $key ) = @_;
-	print $sock "TYPE $key\r\n";
-	_sock_result();
+	$self->_sock_send( 'TYPE', $key );
 }
 
 =head1 Commands operating on the key space
@@ -221,8 +255,7 @@ sub type {
 
 sub keys {
 	my ( $self, $glob ) = @_;
-	print $sock "KEYS $glob\r\n";
-	return split(/\s/, _sock_result_bulk());
+	return split(/\s/, $self->_sock_result_bulk( 'KEYS', $glob ));
 }
 
 =head2 randomkey
@@ -233,8 +266,7 @@ sub keys {
 
 sub randomkey {
 	my ( $self ) = @_;
-	print $sock "RANDOMKEY\r\n";
-	_sock_result();
+	$self->_sock_send( 'RANDOMKEY' );
 }
 
 =head2 rename
@@ -245,8 +277,7 @@ sub randomkey {
 
 sub rename {
 	my ( $self, $old, $new, $nx ) = @_;
-	print $sock "RENAME" . ( $nx ? 'NX' : '' ) . " $old $new\r\n";
-	_sock_ok();
+	$self->_sock_send_ok( 'RENAME' . ( $nx ? 'NX' : '' ), $old, $new );
 }
 
 =head2 dbsize
@@ -257,8 +288,7 @@ sub rename {
 
 sub dbsize {
 	my ( $self ) = @_;
-	print $sock "DBSIZE\r\n";
-	_sock_result();
+	$self->_sock_send('DBSIZE');
 }
 
 =head1 Commands operating on lists
@@ -293,7 +323,152 @@ sub lpush {
 
 sub llen {
 	my ( $self, $key ) = @_;
-	$self->_sock_send( 'llen', $key );
+	$self->_sock_send( 'LLEN', $key );
+}
+
+=head2 lrange
+
+  my @list = $r->lrange( $key, $start, $end );
+
+=cut
+
+sub lrange {
+	my ( $self, $key, $start, $end ) = @_;
+	$self->_sock_result_bulk_list('LRANGE', $key, $start, $end);
+}
+
+=head2 ltrim
+
+  my $ok = $r->ltrim( $key, $start, $end );
+
+=cut
+
+sub ltrim {
+	my ( $self, $key, $start, $end ) = @_;
+	$self->_sock_send_ok( 'LTRIM', $key, $start, $end );
+}
+
+=head2 lindex
+
+  $r->lindex( $key, $index );
+
+=cut
+
+sub lindex {
+	my ( $self, $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