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

diff --git a/lib/Redis.pm b/lib/Redis.pm
index 6f3f3e6..6ead5de 100644
--- a/lib/Redis.pm
+++ b/lib/Redis.pm
@@ -53,14 +53,14 @@ sub new {
 	$self;
 }
 
-sub _sock_result {
+sub __sock_result {
 	my $result = <$sock>;
 	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) if $debug;
 	return undef if $len eq "nil\r\n";
@@ -78,7 +78,7 @@ sub _sock_result_bulk {
 	my $self = shift;
 	warn "## _sock_result_bulk ",dump( @_ ) if $debug;
 	print $sock join(' ',@_) . "\r\n";
-	_sock_read_bulk();
+	__sock_read_bulk();
 }
 
 sub _sock_result_bulk_list {
@@ -91,7 +91,7 @@ sub _sock_result_bulk_list {
 
 	my @list = ( 0 .. $size );
 	foreach ( 0 .. $size ) {
-		$list[ $_ ] = _sock_read_bulk();
+		$list[ $_ ] = __sock_read_bulk();
 	}
 
 	warn "## list = ", dump( @list ) if $debug;
@@ -108,7 +108,7 @@ sub _sock_send {
 	my $self = shift;
 	warn "## _sock_send ",dump( @_ ) if $debug;
 	print $sock join(' ',@_) . "\r\n";
-	_sock_result();
+	__sock_result();
 }
 
 sub _sock_send_ok {
@@ -119,7 +119,6 @@ sub _sock_send_ok {
 }
 
 sub __sock_send_bulk_raw {
-	my $self = shift;
 	warn "## _sock_send_bulk ",dump( @_ ) if $debug;
 	my $value = pop;
 	$value = '' unless defined $value; # FIXME errr? nil?
@@ -127,13 +126,15 @@ sub __sock_send_bulk_raw {
 }
 
 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;
 }
@@ -185,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
@@ -257,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
@@ -475,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> >>