From: Horie Issei <is2ei.horie@gmail.com>
Date: Wed, 27 Jun 2018 15:32:36 +0000 (+0900)
Subject: Bug 1275545 - Use Sereal for Cache::Memcached::Fast
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=bb9a5cddcc03d754d44dbba13194ddd071202238;p=thirdparty%2Fbugzilla.git

Bug 1275545 - Use Sereal for Cache::Memcached::Fast
---

diff --git a/Bugzilla/Memcached.pm b/Bugzilla/Memcached.pm
index d34aaa595..bc0e2cfb7 100644
--- a/Bugzilla/Memcached.pm
+++ b/Bugzilla/Memcached.pm
@@ -34,17 +34,19 @@ sub _new {
     # disabled.
     my $servers = Bugzilla->localconfig->{memcached_servers};
     if (Bugzilla->feature('memcached') && $servers) {
+        require Sereal;
         $self->{namespace} = Bugzilla->localconfig->{memcached_namespace};
         TRACE("connecting servers: $servers, namespace: $self->{namespace}");
         $self->{memcached} = Cache::Memcached::Fast->new(
             {
-                servers         => [ _parse_memcached_server_list($servers) ],
-                namespace       => $self->{namespace},
-                max_size        => 1024 * 1024 * 4,
-                max_failures    => 1,
-                failure_timeout => 60,
-                io_timeout      => 0.2,
-                connect_timeout => 0.2,
+                servers           => [ _parse_memcached_server_list($servers) ],
+                namespace         => $self->{namespace},
+                serialize_methods => { \&Sereal::Encoder::encode_sereal, \&Sereal::Decoder::decode_sereal },
+                max_size          => 1024 * 1024 * 4,
+                max_failures      => 1,
+                failure_timeout   => 60,
+                io_timeout        => 0.2,
+                connect_timeout   => 0.2,
             }
         );
         my $versions = $self->{memcached}->server_versions;
diff --git a/Makefile.PL b/Makefile.PL
index 46228ab56..5c3e9257c 100755
--- a/Makefile.PL
+++ b/Makefile.PL
@@ -161,7 +161,12 @@ my %optional_features = (
     memcached => {
         description => 'Memcached Support',
         prereqs     => {
-            runtime => { requires => { 'Cache::Memcached::Fast' => '0.17' } }
+            runtime => {
+                requires => {
+                    'Cache::Memcached::Fast' => '0.17',
+                    'Sereal' => '4.005'
+                }
+            }
         }
     },
     updates => {