From 64af4a24c8afba6e53561caa02d0c0f840c14dda Mon Sep 17 00:00:00 2001
From: Dobrica Pavlinusic <dpavlin@rot13.org>
Date: Sun, 22 Mar 2009 18:39:06 +0000
Subject: [PATCH] move

git-svn-id: svn+ssh://llin/home/dpavlin/private/svn/Redis@40 447b33ff-793d-4489-8442-9bea7d161be5
---
 lib/Redis.pm | 33 +++++++++++++++++++++++----------
 t/01-Redis.t |  7 ++++++-
 2 files changed, 29 insertions(+), 11 deletions(-)

diff --git a/lib/Redis.pm b/lib/Redis.pm
index 14e8b8d..267fcc2 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;
 }
@@ -479,13 +480,25 @@ sub sinterstore {
 
 =head2 select
 
-  $r->select( 1 );
+  $r->select( $dbindex ); # 0 for new clients
 
 =cut
 
 sub select {
-	my ($self,$index) = @_;
-	$self->_sock_send_ok( 'SELECT', $index );
+	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 );
 }
 
 =head1 AUTHOR
diff --git a/t/01-Redis.t b/t/01-Redis.t
index e833a4e..2480695 100755
--- a/t/01-Redis.t
+++ b/t/01-Redis.t
@@ -3,7 +3,7 @@
 use warnings;
 use strict;
 
-use Test::More tests => 88;
+use Test::More tests => 92;
 
 use lib 'lib';
 
@@ -151,6 +151,11 @@ diag "Multiple databases handling commands";
 ok( $o->select( 1 ), 'select' );
 ok( $o->select( 0 ), 'select' );
 
+ok( $o->move( 'foo', 1 ), 'move' );
+ok( ! $o->exists( 'foo' ), 'gone' );
+
+ok( $o->select( 1 ), 'select' );
+ok( $o->exists( 'foo' ), 'exists' );
 
 diag "Connection handling";
 
-- 
2.20.1