[livejournal] r19256: LJSUP-8959: friend_uids loading: check m...

U   trunk/cgi-bin/LJ/User.pm

Modified: trunk/cgi-bin/LJ/User.pm
===================================================================
--- trunk/cgi-bin/LJ/User.pm	2011-06-08 07:42:51 UTC (rev 19255)
+++ trunk/cgi-bin/LJ/User.pm	2011-06-08 07:56:43 UTC (rev 19256)
@@ -4508,13 +4508,13 @@
     my %args = @_;
 
     ## check cache first
-    my @res = $u->_load_friend_friendof_uids_from_memcache($args{mode}, $args{limit});
-    return @res if defined @res;
+    my $res = $u->_load_friend_friendof_uids_from_memcache($args{mode}, $args{limit});
+    return @$res if defined $res;
 
     # call normally if no gearman/not wanted
     my $gc = '';
     return $u->_friend_friendof_uids_do(skip_memcached => 1, %args) # we've already checked memcached above
-        unless 0 and LJ::conf_test($LJ::LOADFRIENDS_USING_GEARMAN, $u->id) and $gc = LJ::gearman_client();
+        unless LJ::conf_test($LJ::LOADFRIENDS_USING_GEARMAN, $u->id) and $gc = LJ::gearman_client();
 
     # invoke gearman
     my @uids;
@@ -4548,8 +4548,8 @@
 
     ## cache
     unless ($skip_memcached){
-        my @res = $u->_load_friend_friendof_uids_from_memcache($mode, $limit);
-        return @res if @res;
+        my $res = $u->_load_friend_friendof_uids_from_memcache($mode, $limit);
+        return @$res if $res;
     }
 
     ## db
@@ -4597,13 +4597,13 @@
         # have to truncate it to match the requested limit
         if ($slimit >= $limit) {
             @uids = @uids[0..$limit-1] if @uids > $limit;
-            return @uids;
+            return \@uids;
         }
 
         # value in memcache is also good if number of items is less
         # than the stored limit... because then we know it's the full
         # set that got stored, not a truncated version.
-        return @uids if @uids < $slimit;
+        return \@uids if @uids < $slimit;
     }
 
     return undef;