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

diff --git a/lib/Redis.pm b/lib/Redis.pm
index ed5e2ad..6ead5de 100644
--- 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';
 
@@ -51,21 +53,21 @@ sub new {
 	$self;
 }
 
-sub _sock_result {
+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 {
+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,14 +76,14 @@ 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();
+	__sock_read_bulk();
 }
 
 sub _sock_result_bulk_list {
 	my $self = shift;
-	warn "## _sock_result_bulk_list ",dump( @_ );
+	warn "## _sock_result_bulk_list ",dump( @_ ) if $debug;
 
 	my $size = $self->_sock_send( @_ );
 	confess $size unless $size > 0;
@@ -89,10 +91,10 @@ sub _sock_result_bulk_list {
 
 	my @list = ( 0 .. $size );
 	foreach ( 0 .. $size ) {
-		$list[ $_ ] = _sock_read_bulk();
+		$list[ $_ ] = __sock_read_bulk();
 	}
 
-	warn "## list = ", dump( @list );
+	warn "## list = ", dump( @list ) if $debug;
 	return @list;
 }
 
@@ -104,34 +106,35 @@ 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();
+	__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"
 }
 
 sub _sock_send_bulk {
+	my $self = shift;
 	__sock_send_bulk_raw( @_ );
 	__sock_ok();
 }
 
 sub _sock_send_bulk_number {
+	my $self = shift;
 	__sock_send_bulk_raw( @_ );
-	my $v = _sock_result();
+	my $v = __sock_result();
 	confess $v unless $v =~ m{^\-?\d+$};
 	return $v;
 }
@@ -183,7 +186,18 @@ sub set {
 
 sub get {
 	my $self = shift;
-	$self->_sock_result_bulk('GET', @_);
+	$self->_sock_result_bulk('GET',@_);
+}
+
+=head2 mget
+
+  my @values = $r->get( 'foo', 'bar', 'baz' );
+
+=cut
+
+sub mget {
+	my $self = shift;
+	$self->_sock_result_bulk_list('MGET',@_);
 }
 
 =head2 incr
@@ -255,7 +269,9 @@ sub type {
 
 sub keys {
 	my ( $self, $glob ) = @_;
-	return split(/\s/, $self->_sock_result_bulk( 'KEYS', $glob ));
+	my $keys = $self->_sock_result_bulk( 'KEYS', $glob );
+	return split(/\s/, $keys) if $keys;
+	return () if wantarray;
 }
 
 =head2 randomkey
@@ -293,6 +309,8 @@ sub dbsize {
 
 =head1 Commands operating on lists
 
+See also L<Redis::List> for tie interface.
+
 =head2 rpush
 
   $r->rpush( $key, $value );
@@ -471,6 +489,79 @@ sub sinterstore {
 	$self->_sock_send_ok( 'SINTERSTORE', @_ );
 }
 
+=head1 Multiple databases handling commands
+
+=head2 select
+
+  $r->select( $dbindex ); # 0 for new clients
+
+=cut
+
+sub select {
+	my ($self,$dbindex) = @_;
+	confess dump($dbindex) . 'not number' unless $dbindex =~ m{^\d+$};
+	$self->_sock_send_ok( 'SELECT', $dbindex );
+}
+
+=head2 move
+
+  $r->move( $key, $dbindex );
+
+=cut
+
+sub move {
+	my ( $self, $key, $dbindex ) = @_;
+	$self->_sock_send( 'MOVE', $key, $dbindex );
+}
+
+=head2 flushdb
+
+  $r->flushdb;
+
+=cut
+
+sub flushdb {
+	my $self = shift;
+	$self->_sock_send_ok('FLUSHDB');
+}
+
+=head2 flushall
+
+  $r->flushall;
+
+=cut
+
+sub flushall {
+	my $self = shift;
+	$self->_sock_send_ok('flushall');
+}
+
+=head1 Sorting
+
+=head2 sort
+
+  $r->sort("key BY pattern LIMIT start end GET pattern ASC|DESC ALPHA');
+
+=cut
+
+sub sort {
+	my ( $self, $sort ) = @_;
+	$self->_sock_result_bulk_list( "SORT $sort" );
+}
+
+=head1 Persistence control commands
+
+=head2 save
+
+  $r->save;
+
+=cut
+
+sub save {
+	my $self = shift;
+	$self->_sock_send_ok( 'SAVE' );
+}
+
 =head1 AUTHOR
 
 Dobrica Pavlinusic, C<< <dpavlin at rot13.org> >>