Changeset 573446

Timestamp:

12/06/07 14:07:40 (4 years ago)

Author:

Tomash Brechko <tomash.brechko@…>

Branches:

master, ketama-compat

Children:

0acb6c

Parents:

7b1ed1

git-author:

Tomash Brechko <tomash.brechko@…> (12/04/07 12:23:24)

git-committer:

Tomash Brechko <tomash.brechko@…> (12/06/07 14:07:40)

Message:

Add incr and decr commands.

Files:

• Fast.xs (modified) (1 diff)
• TODO (modified) (1 diff)
• src/client.c (modified) (4 diffs)
• src/client.h (modified) (3 diffs)
• src/reply.kw (modified) (1 diff)
• t/Cache-Memcached-Fast.t (modified) (5 diffs)

Fast.xs

@@ -340 +340 @@
 
 
+void
+incr(memd, skey, ...)
+        Cache_Memcached_Fast *  memd
+        SV *                    skey
+    ALIAS:
+        decr  =  CMD_DECR
+    PROTOTYPE: $$;$
+    PREINIT:
+        const char *key;
+        STRLEN key_len;
+        arith_type arg = 1, result;
+        int noreply, res;
+    PPCODE:
+        if (items > 2 && SvOK(ST(2)))
+          arg = SvUV(ST(2));
+        key = SvPV(skey, key_len);
+        noreply = (GIMME_V == G_VOID);
+        res = client_arith(memd, ix, key, key_len, arg, &result, noreply);
+        if (! noreply && res == MEMCACHED_SUCCESS)
+          {
+            dXSTARG;
+
+            /*
+               NOTE: arith_type is at least 64 bit, but Perl UV is 32
+               bit.
+            */
+            PUSHu(result);
+            XSRETURN(1);
+          }
+
+
 bool
 delete(memd, skey, ...)

TODO

@@ -25 +25 @@
 
 - Use better rounding in flush_all().
+
+- Disable noreply in benchmark.pl before shipping.

src/client.c

@@ -50 +50 @@
 
 
+struct arith_state
+{
+  arith_type *result;
+};
+
+
+static inline
+void
+arith_state_reset(struct arith_state *state, arith_type *result)
+{
+  state->result = result;
+}
+
+
 struct command_state;
 typedef int (*parse_reply_func)(struct command_state *state);
@@ -99 +113 @@
   parse_reply_func parse_reply;
 
-  struct value_state value;
+  union
+  {
+    struct value_state value;
+    struct arith_state arith;
+  };
 };
 
@@ -681 +699 @@
       return MEMCACHED_UNKNOWN;
     }
+}
+
+
+static
+int
+parse_arith_reply(struct command_state *state)
+{
+  int res, match_count;
+  arith_type arith;
+
+  switch (state->match)
+    {
+    case MATCH_NOT_FOUND:
+      res = swallow_eol(state, 0, 1);
+
+      return (res == MEMCACHED_SUCCESS ? MEMCACHED_FAILURE : res);
+
+    default:
+      return MEMCACHED_UNKNOWN;
+
+    case MATCH_0: case MATCH_1: case MATCH_2: case MATCH_3: case MATCH_4:
+    case MATCH_5: case MATCH_6: case MATCH_7: case MATCH_8: case MATCH_9:
+      break;
+    }
+
+  --state->pos;
+
+  res = sscanf(state->pos, FMT_ARITH "%n", &arith, &match_count);
+  if (res != 1)
+    return MEMCACHED_UNKNOWN;
+
+  state->pos += match_count;
+
+  res = swallow_eol(state, 1, 1);
+  if (res != MEMCACHED_SUCCESS)
+    return res;
+
+  *state->arith.result = arith;
+
+  return MEMCACHED_SUCCESS;
 }
 
@@ -1303 +1361 @@
 
 int
+client_arith(struct client *c, enum arith_cmd_e cmd,
+             const char *key, size_t key_len,
+             arith_type arg, arith_type *result, int noreply)
+{
+  int use_noreply = (noreply && c->noreply);
+  size_t request_size =
+    (sizeof(struct iovec) * (c->prefix_len ? 4 : 3)
+     + sizeof(" 18446744073709551616 noreply\r\n"));
+  struct command_state *state;
+  struct iovec *buf_iov;
+  char *buf;
+  int server_index, res;
+
+  client_reset_for_command(c);
+
+  server_index = client_get_server_index(c, key, key_len);
+  if (server_index == -1)
+    return MEMCACHED_CLOSED;
+
+  state = &c->servers[server_index].cmd_state;
+  command_state_reset(state, (c->prefix_len ? 2 : 1), 1,
+                      (use_noreply ? NULL : parse_arith_reply));
+  arith_state_reset(&state->arith, result);
+
+  res = iov_buf_extend(state, request_size);
+  if (res != MEMCACHED_SUCCESS)
+    return res;
+
+  switch (cmd)
+    {
+    case CMD_INCR:
+      iov_push(state, STR_WITH_LEN("incr "));
+      break;
+
+    case CMD_DECR:
+      iov_push(state, STR_WITH_LEN("decr "));
+      break;
+    }
+  if (c->prefix_len)
+    iov_push(state, c->prefix, c->prefix_len);
+  iov_push(state, (void *) key, key_len);
+
+  res = push_key(state, 0);
+  if (res != MEMCACHED_SUCCESS)
+    return res;
+
+  buf_iov = &state->iov_buf[state->iov_count];
+  iov_push(state, NULL, 0);
+  buf = (char *) &state->iov_buf[state->iov_count];
+  buf_iov->iov_base = buf;
+  buf_iov->iov_len = sprintf(buf, " " FMT_ARITH "%s\r\n", arg,
+                             (use_noreply ? " noreply" : ""));
+
+  return process_commands(c);
+
+}
+
+
+int
 client_delete(struct client *c, const char *key, size_t key_len,
               delay_type delay, int noreply)

src/client.h

@@ -19 +19 @@
 enum set_cmd_e { CMD_SET, CMD_ADD, CMD_REPLACE, CMD_APPEND, CMD_PREPEND };
 
+enum arith_cmd_e { CMD_INCR, CMD_DECR };
+
 
 typedef unsigned int flags_type;
@@ -31 +33 @@
 typedef size_t value_size_type;
 #define FMT_VALUE_SIZE "%zu"
+
+typedef unsigned long long arith_type;
+#define FMT_ARITH "%llu"
 
 
@@ -101 +106 @@
 extern
 int
+client_arith(struct client *c, enum arith_cmd_e cmd,
+             const char *key, size_t key_len,
+             arith_type arg, arith_type *result, int noreply);
+
+extern
+int
 client_delete(struct client *c, const char *key, size_t key_len,
               delay_type delay, int noreply);

src/reply.kw

@@ -29 +29 @@
 VALUE
 VERSION
+# incr and decr return non-negative number.
+0
+1
+2
+3
+4
+5
+6
+7
+8
+9

t/Cache-Memcached-Fast.t

@@ -6 +6 @@
 # change 'tests => 1' to 'tests => last_test_to_print';
 
-use Test::More tests => 35;
+use Test::More tests => 39;
 BEGIN { use_ok('Cache::Memcached::Fast') };
 
@@ -59 +59 @@
 
 
+$memd->set("arith", 10);
+is($memd->incr("arith", 5), 15);
+is($memd->decr("arith"), 14);
+is($memd->get("arith"), 14);
+
+
 $res1 = $memd->get_multi("key_no_such_key", "key1", "key_no_such_key",
                          "key2", "key_no_such_key", "key_no_such_key",
@@ -87 +93 @@
    ok(1);
    ok(1);
+   ok(1);
 } else {
     my $memd_noreply = Cache::Memcached::Fast->new({
@@ -96 +103 @@
 
     $memd_noreply->flush_all;
+
     $memd_noreply->add("k", "v");
     $memd_noreply->set("k", "v");
@@ -104 +112 @@
     $memd_noreply->delete("k");
     is($memd_noreply->get("k"), undef);
+
+    $memd_noreply->set("arith", 10);
+    $memd_noreply->incr("arith", 5);
+    $memd_noreply->decr("arith");
+    is($memd_noreply->get("arith"), 14);
+
     $memd_noreply->flush_all;
 }