Changeset 34bb6d

Timestamp:

11/02/09 17:35:36 (3 years ago)

Author:

Tomash Brechko <tomash.brechko@…>

Branches:

master

Children:

b6ccaa

Parents:

89a74b

git-author:

Tomash Brechko <tomash.brechko@…> (11/02/09 17:35:36)

git-committer:

Tomash Brechko <tomash.brechko@…> (11/02/09 17:35:36)

Message:

Remove delay (aka expiration) parameter for delete() and delete_multi().

Files:

• Changes (modified) (1 diff)
• Fast.xs (modified) (5 diffs)
• lib/Cache/Memcached/Fast.pm (modified) (3 diffs)
• src/client.c (modified) (2 diffs)
• src/client.h (modified) (1 diff)

Changes

@@ -7 +7 @@
         Changes since 0.16:
 
-        ???
+        Warn about ignoring non-zero delete expiration time.
+        Expiration time for "delete" command has been optional in
+        older versions of memcached, and was dropped in memcached
+        1.3.2 (in an incompatible manner).  Not knowing server version
+        it's impossible to tell whether the server will handle the
+        parameter or not, so we simply do not send it at all.
+        Explicit zero passed to delete() or delete_multi() is silently
+        ignored, and a warning is given if you pass non-zero delete
+        expiration time.  Furthermore the syntax delete($key, $delay)
+        and delete_multi([$key, $delay]) is obsoleted and no more
+        documented.
 
 

Fast.xs

@@ -1044 +1044 @@
         const char *key;
         STRLEN key_len;
-        delay_type delay = 0;
     PPCODE:
         object.arg = newAV();
@@ -1053 +1052 @@
         if (items > 2)
           {
+            /* Compatibility with old [key, delay] syntax].  */
+
             /* delay doesn't have to be defined.  */
             SV *sv = ST(2);
-            if (SvOK(sv))
-              delay = SvUV(sv);
-          }
-        client_prepare_delete(memd->c, 0, key, key_len, delay);
+            if (SvOK(sv) && SvUV(sv) != 0)
+              warn("non-zero delete expiration time is ignored");
+          }
+        client_prepare_delete(memd->c, 0, key, key_len);
         client_execute(memd->c);
         if (! noreply)
@@ -1087 +1088 @@
           {
             SV *sv;
-            AV *av;
             const char *key;
             STRLEN key_len;
-            delay_type delay = 0;
 
             sv = ST(i);
@@ -1099 +1098 @@
             else
               {
+                /* Compatibility with old [key, delay] syntax].  */
+
+                AV *av;
+
                 if (SvTYPE(SvRV(sv)) != SVt_PVAV)
                   croak("Not an array reference");
@@ -1112 +1115 @@
                     /* delay doesn't have to be defined.  */
                     SV **ps = av_fetch(av, 1, 0);
-                    if (ps && SvOK(*ps))
-                      delay = SvUV(*ps);
+                    if (ps && SvOK(*ps) && SvUV(*ps) != 0)
+                      warn("non-zero delete expiration time is ignored");
                   }
               }
  
-            client_prepare_delete(memd->c, i - 1, key, key_len, delay);
+            client_prepare_delete(memd->c, i - 1, key, key_len);
           }
         client_execute(memd->c);

lib/Cache/Memcached/Fast.pm

@@ -104 +104 @@
 
   my @keys = qw(k1 k2 k3);
-  $memd->delete_multi(@keys, ['k5', 20]);
+  $memd->delete_multi(@keys);
 
   # Wait for all commands that were executed in nowait mode.
@@ -1076 +1076 @@
 
   $memd->delete($key);
-  $memd->delete($key, $delay);
-
-Delete I<$key> and its value from the cache.  I<$delay> is an optional
-non-negative integer number of seconds to delay the operation.  During
-this time L</add> and L</replace> commands will be rejected by the
-server.  When omitted, zero is assumed, i.e. delete immediately.
+
+Delete I<$key> and its value from the cache.
 
 I<Return:> boolean, true for positive server reply, false for negative
@@ -1102 +1098 @@
 =item C<delete_multi>
 
-  $memd->delete_multi(
-      @keys,
-      [$key],
-      [$key, $delay],
-      ...
-  );
+  $memd->delete_multi(@keys);
 
 Like L</delete>, but operates on more than one key.  Takes the list of
-keys and references to arrays each holding I<$key> and optional
-I<$delay>.
+keys.
 
 Note that multi commands are not all-or-nothing, some operations may

src/client.c

@@ -1992 +1992 @@
 int
 client_prepare_delete(struct client *c, int key_index,
-                      const char *key, size_t key_len, delay_type delay)
+                      const char *key, size_t key_len)
 {
   static const size_t request_size = 4;
-  static const size_t str_size = sizeof(" " DELAY_STUB " " NOREPLY "\r\n");
+  static const size_t str_size = sizeof(" " NOREPLY "\r\n");
 
   struct command_state *state;
@@ -2012 +2012 @@
   {
     char *buf = array_end(c->str_buf, char);
-    size_t str_size =
-      sprintf(buf, " " FMT_DELAY "%s\r\n", delay, get_noreply(state));
+    size_t str_size = sprintf(buf, "%s\r\n", get_noreply(state));
     iov_push(state, (void *) (long) array_size(c->str_buf), str_size);
     array_append(c->str_buf, str_size);

src/client.h

@@ -185 +185 @@
 int
 client_prepare_delete(struct client *c, int key_index,
-                      const char *key, size_t key_len, delay_type delay);
+                      const char *key, size_t key_len);
 
 extern