Changeset 746aa9

Timestamp:

05/03/08 14:49:04 (4 years ago)

Author:

Tomash Brechko <tomash.brechko@…>

Branches:

master

Children:

3d952a

Parents:

182fc0

git-author:

Tomash Brechko <tomash.brechko@…> (05/03/08 14:49:04)

git-committer:

Tomash Brechko <tomash.brechko@…> (05/03/08 14:49:04)

Message:

Add max_size parameter.

See  http://rt.cpan.org/Ticket/Display.html?id=35588.

Files:

• Changes (modified) (1 diff)
• Fast.xs (modified) (4 diffs)
• lib/Cache/Memcached/Fast.pm (modified) (3 diffs)
• t/big_value.t (modified) (3 diffs)

Changes

@@ -6 +6 @@
         Changes since 0.10:
 
-        ???
+        Add new parameter max_size (suggested by Alex Kapranoff, see
+        http://rt.cpan.org/Ticket/Display.html?id=35588).
 
 

Fast.xs

@@ -35 +35 @@
   SV *deserialize_method;
   int utf8;
+  size_t max_size;
 };
 
@@ -277 +278 @@
   if (ps && SvOK(*ps))
     client_set_nowait(c, SvTRUE(*ps));
+
+  ps = hv_fetch(conf, "max_size", 8, 0);
+  if (ps && SvOK(*ps))
+    memd->max_size = SvUV(*ps);
+  else
+    memd->max_size = 1024 * 1024;
 
   parse_compress(memd, conf);
@@ -677 +684 @@
         sv = compress(memd, sv, &flags);
         buf = (void *) SvPV(sv, buf_len);
+        if (buf_len > memd->max_size)
+          return XSRETURN_EMPTY;
         if (items > arg)
           {
@@ -763 +772 @@
             sv = compress(memd, sv, &flags);
             buf = (void *) SvPV(sv, buf_len);
+            if (buf_len > memd->max_size)
+              continue;
             if (av_len(av) >= arg)
               {

lib/Cache/Memcached/Fast.pm

@@ -45 +45 @@
       serialize_methods => [ \&Storable::freeze, \&Storable::thaw ],
       utf8 => ($^V ge v5.8.1 ? 1 : 0),
+      max_size => 512 * 1024,
   });
 
@@ -447 +448 @@
 retrieved data is marked as being UTF-8 octet sequence).  See
 L<perlunicode|perlunicode>.
+
+
+=item I<max_size>
+
+  max_size => 512 * 1024
+  (default: 1024 * 1024)
+
+The value is a maximum size of an item to be stored in memcached.
+When trying to set a key to a value longer than I<max_size> bytes
+(after serialization and compression) nothing is sent to the server,
+and I<set> methods return I<undef>.
+
+Note that the real maximum on the server is less than 1MB, and depends
+on key length among other things.  So some values in the range
+S<I<[1MB - N bytes, 1MB]>>, where N is several hundreds, will still be
+sent to the server, and rejected there.  You may set I<max_size> to a
+smaller value to avoid this.
 
 
@@ -493 +511 @@
     serialize_methods => 1,
     utf8 => 1,
+    max_size => 1,
     check_args => 1,
 );

t/big_value.t

@@ -10 +10 @@
 
 if ($Memd::memd) {
-    plan tests => 6;
+    plan tests => 13;
 } else {
     plan skip_all => 'Not connected';
@@ -16 +16 @@
 
 
+use constant THRESHOLD => 1024 * 1024 - 1024;
+
 my $key = 'big_value';
-my $value = 'x' x 500_000;
+my $value = 'x' x THRESHOLD;
+my $small_value = 'x' x (THRESHOLD - 2048);
+my $big_value = 'x' x (THRESHOLD + 2048);
+
+my %smaller_params = %Memd::params;
+$smaller_params{max_size} = THRESHOLD - 2048;
+$smaller_params{namespace} .= 'smaller/';
+my $smaller_memd = new Cache::Memcached::Fast(\%smaller_params);
+
+my %bigger_params = %Memd::params;
+$bigger_params{max_size} = THRESHOLD + 2048;
+$bigger_params{namespace} .= 'bigger/';
+my $bigger_memd = new Cache::Memcached::Fast(\%bigger_params);
 
 $Memd::memd->enable_compress(0);
+$smaller_memd->enable_compress(0);
+$bigger_memd->enable_compress(0);
 
-ok(! $Memd::memd->set($key, $value x 4),
-   'Values over 1MB should be rejected');
 ok($Memd::memd->set($key, $value), 'Store value uncompressed');
 ok($Memd::memd->get($key) eq $value, 'Fetch');
+ok(! $smaller_memd->set($key, $value),
+   'Values equal to or greater than THRESHOLD should be rejected by module');
+ok(! $bigger_memd->set($key, $big_value),
+   'Values greater than 1MB should be rejected by server');
 
-$Memd::memd->enable_compress(1);
+my @res = $smaller_memd->set_multi(["$key-1", $small_value],
+                                   ["$key-2", $big_value],
+                                   ["$key-3", $small_value]);
+ok($res[0] and not defined $res[1] and $res[2]);
+ok($smaller_memd->delete_multi("$key-1", "$key-3"));
 
 SKIP: {
@@ -32 +54 @@
 
     {
-        local $SIG{__WARN__} = sub { $warning = $_[0] };
+        local $SIG{__WARN__} = sub { die $_[0] };
 
-        ok($Memd::memd->set($key, $value), 'Store value possibly compressed');
-    }
-
-    if (defined $warning) {
-        if ($warning =~ /^Can't find module IO::Compress::/) {
-            skip $warning, 1;
-        } else {
-            warn "$warning\n";
+        eval {
+            $Memd::memd->enable_compress(1);
+            $smaller_memd->enable_compress(1);
+            $bigger_memd->enable_compress(1);
         }
     }
 
-    ok($Memd::memd->get($key) eq $value, 'Fetch and uncompress');
+    if ($@) {
+        if ($@ =~ /^Compression module was not found/) {
+            skip $@, 6;
+        } else {
+            warn "$@\n";
+        }
+    }
+
+    ok($smaller_memd->set($key, $value), 'Store compressed value');
+    ok($bigger_memd->set($key, $big_value), 'Store compressed value');
+
+    ok($smaller_memd->get($key) eq $value, 'Fetch and uncompress');
+    ok($bigger_memd->get($key) eq $big_value, 'Fetch and uncompress');
+
+    ok($smaller_memd->delete($key), 'Delete');
+    ok($bigger_memd->delete($key), 'Delete');
 }