X-Git-Url: http://git.rot13.org/?p=perl-Redis.git;a=blobdiff_plain;f=lib%2FRedis.pm;h=3ac761943306ec4766795a7a3fd6cb030f34d92e;hp=c5597df58503e333250181c7ee968bfdbc72cb9d;hb=62521c905dd00690390d2080aad38dff1e3b925c;hpb=5ecd629987e0a79871fdbad482628d70e33e4495

diff --git a/lib/Redis.pm b/lib/Redis.pm
index c5597df..3ac7619 100644
--- a/lib/Redis.pm
+++ b/lib/Redis.pm
@@ -51,6 +51,74 @@ 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_read_bulk {
+	my $len = <$sock>;
+	warn "## bulk len: ",dump($len);
+	return undef if $len eq "nil\r\n";
+	my $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_result_bulk {
+	my $self = shift;
+	warn "## _sock_result_bulk ",dump( @_ );
+	print $sock join(' ',@_) . "\r\n";
+	_sock_read_bulk();
+}
+
+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 {
+	__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
 
 =head2 quit
@@ -86,10 +154,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
@@ -99,17 +165,8 @@ sub set {
 =cut
 
 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;
+	my $self = shift;
+	$self->_sock_result_bulk('GET', @_);
 }
 
 =head2 incr
@@ -119,22 +176,11 @@ sub get {
 
 =cut
 
-sub sock_result {
-	my $result = <$sock>;
-	warn "# result: ",dump( $result );
-	$result =~ s{\r\n$}{} || warn "can't find cr/lf";
-	return $result;
-}
 	
 
 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
@@ -145,13 +191,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
@@ -162,8 +203,7 @@ sub decr {
 
 sub exists {
 	my ( $self, $key ) = @_;
-	print $sock "EXISTS $key\r\n";
-	sock_result();
+	$self->_sock_send( 'EXISTS', $key );
 }
 
 =head2 del
@@ -174,8 +214,187 @@ sub exists {
 
 sub del {
 	my ( $self, $key ) = @_;
-	print $sock "DEL $key\r\n";
-	sock_result();
+	$self->_sock_send( 'DEL', $key );
+}
+
+=head2 type
+
+  $r->type( 'key' ); # = string
+
+=cut
+
+sub type {
+	my ( $self, $key ) = @_;
+	$self->_sock_send( 'TYPE', $key );
+}
+
+=head1 Commands operating on the key space
+
+=head2 keys
+
+  my @keys = $r->keys( '*glob_pattern*' );
+
+=cut
+
+sub keys {
+	my ( $self, $glob ) = @_;
+	return split(/\s/, $self->_sock_result_bulk( 'KEYS', $glob ));
+}
+
+=head2 randomkey
+
+  my $key = $r->randomkey;
+
+=cut
+
+sub randomkey {
+	my ( $self ) = @_;
+	$self->_sock_send( 'RANDOMKEY' );
+}
+
+=head2 rename
+
+  my $ok = $r->rename( 'old-key', 'new-key', $new );
+
+=cut
+
+sub rename {
+	my ( $self, $old, $new, $nx ) = @_;
+	$self->_sock_send_ok( 'RENAME' . ( $nx ? 'NX' : '' ), $old, $new );
+}
+
+=head2 dbsize
+
+  my $nr_keys = $r->dbsize;
+
+=cut
+
+sub dbsize {
+	my ( $self ) = @_;
+	$self->_sock_send('DBSIZE');
+}
+
+=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);
+}
+
+=head2 lpush
+
+  $r->lpush( $key, $value );
+
+=cut
+
+sub lpush {
+	my ( $self, $key, $value ) = @_;
+	$self->_sock_send_bulk('LPUSH', $key, $value);
+}
+
+=head2 llen
+
+  $r->llen( $key );
+
+=cut
+
+sub llen {
+	my ( $self, $key ) = @_;
+	$self->_sock_send( 'LLEN', $key );
+}
+
+=head2 lrange
+
+  my @list = $r->lrange( $key, $start, $end );
+
+=cut
+
+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;
+}
+
+=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 AUTHOR