X-Git-Url: http://git.rot13.org/?p=perl-Redis.git;a=blobdiff_plain;f=lib%2FRedis.pm;h=36416c435e665d09b060d439937509fadcc9db38;hp=f0b21a28b0496ccf200e2a82bcbe1b0b3dd0f5a1;hb=3957dcfecc1628ff65b686a2444765c4ebeef05b;hpb=889c043608d6efadbd7363e3e7fb3571ec8e15c6
diff --git a/lib/Redis.pm b/lib/Redis.pm
index f0b21a2..36416c4 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
+This version support git version of Redis available at
+L
+
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,25 +53,92 @@ 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_result_bulk {
+sub __sock_read_bulk {
my $len = <$sock>;
- warn "# len: ",dump($len);
+ warn "## bulk len: ",dump($len) if $debug;
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) if $debug;
+ }
my $crlf;
read($sock, $crlf, 2); # skip cr/lf
return $v;
}
+sub _sock_result_bulk {
+ my $self = shift;
+ 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";
+ confess dump($ok) unless $ok eq "+OK\r\n";
+}
+
+sub _sock_send {
+ my $self = shift;
+ 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( @_ ) if $debug;
+ print $sock join(' ',@_) . "\r\n";
+ __sock_ok();
+}
+
+sub __sock_send_bulk_raw {
+ 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();
+ confess $v unless $v =~ m{^\-?\d+$};
+ return $v;
+}
+
=head1 Connection Handling
=head2 quit
@@ -105,10 +174,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
@@ -118,9 +185,19 @@ 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 mget
+
+ my @values = $r->get( 'foo', 'bar', 'baz' );
+
+=cut
+
+sub mget {
+ my $self = shift;
+ $self->_sock_result_bulk_list('MGET',@_);
}
=head2 incr
@@ -133,13 +210,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
@@ -150,13 +222,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
@@ -167,8 +234,7 @@ sub decr {
sub exists {
my ( $self, $key ) = @_;
- print $sock "EXISTS $key\r\n";
- _sock_result();
+ $self->_sock_send( 'EXISTS', $key );
}
=head2 del
@@ -179,8 +245,7 @@ sub exists {
sub del {
my ( $self, $key ) = @_;
- print $sock "DEL $key\r\n";
- _sock_result();
+ $self->_sock_send( 'DEL', $key );
}
=head2 type
@@ -191,8 +256,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
@@ -205,8 +269,271 @@ sub type {
sub keys {
my ( $self, $glob ) = @_;
- print $sock "KEYS $glob\r\n";
- return split(/\s/, _sock_result_bulk());
+ my $keys = $self->_sock_result_bulk( 'KEYS', $glob );
+ return split(/\s/, $keys) if $keys;
+ return () if wantarray;
+}
+
+=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
+
+See also L for tie interface.
+
+=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 ) = @_;
+ $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 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 AUTHOR