Changeset 708

Timestamp:

02/22/08 04:57:41 (8 months ago)

Author:

dormando

Message:

Implement 'noreply' option for update commands. (Tomash Brechko <tomash.brechko@gmail.com>)

Commands add, set, replace, append, prepend, cas, delete, incr, decr,
flush_all, verbosity can take last optional parameter, 'noreply',
which instructs the server to not send the reply.

Add benchmark script for noreply parameter.

Files:

• trunk/server/devtools/bench_noreply.pl (added)
• trunk/server/doc/protocol.txt (modified) (8 diffs)
• trunk/server/memcached.c (modified) (14 diffs)
• trunk/server/memcached.h (modified) (1 diff)
• trunk/server/t/noreply.t (added)

trunk/server/doc/protocol.txt

@@ -127 +127 @@
-First, the client sends a command line which looks like this:
-
-
-
-
+
+
+
+
-
-  "set" means "store this data".  
@@ -175 +176 @@
-  when issuing "cas" updates.
-
+- "noreply" optional parameter instructs the server to not send the
+  reply.  NOTE: if the request line is malformed, the server can't
+  parse "noreply" option reliably.  In this case it may send the error
+  to the client, and not reading it on the client side will break
+  things.  Client should construct only valid requests.
+
-After this line, the client sends the data block:
-
@@ -246 +253 @@
-The command "delete" allows for explicit deletion of items:
-
-<time>
+[<time>] [noreply]
-
-- <key> is the key of the item the client wishes the server to delete
@@ -262 +269 @@
-  storage commands with this key will succeed).
-
+- "noreply" optional parameter instructs the server to not send the
+  reply.  See the note in Storage commands regarding malformed
+  requests.
+
-The response line to this command can be one of:
-
@@ -286 +297 @@
-The client sends the command line:
-
-
+ [noreply]
-
-or
-
-
+ [noreply]
-
-- <key> is the key of the item the client wishes to change
@@ -296 +307 @@
-- <value> is the amount by which the client wants to increase/decrease
-the item. It is a decimal representation of a 64-bit unsigned integer.
+
+- "noreply" optional parameter instructs the server to not send the
+  reply.  See the note in Storage commands regarding malformed
+  requests.
-
-The response will be one of:
@@ -400 +415 @@
-
-"flush_all" is a command with an optional numeric argument. It always
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
-
-The intent of flush_all with a delay, was that in a setting where you
@@ -432 +448 @@
-server.
-
-
-
-
+
+
+
+
-
-"quit" is a command with no arguments:

trunk/server/memcached.c

@@ -373 +373 @@
-    c->gen = 0;
-
+    c->noreply = false;
+
-    event_set(&c->event, sfd, event_flags, event_handler, (void *)c);
-    event_base_set(base, &c->event);
@@ -734 +736 @@
-    assert(c != NULL);
-
+    if (c->noreply) {
+        c->noreply = false;
+        conn_set_state(c, conn_read);
+        return;
+    }
+
-    if (settings.verbose > 1)
-        fprintf(stderr, ">%d %s\n", c->sfd, str);
@@ -899 +907 @@
-#define KEY_MAX_LENGTH 250
-
-7
+8
-
-/*
@@ -966 +974 @@
-    } else {
-        out_string(c, "SERVER_ERROR out of memory");
+    }
+}
+
+static inline void set_noreply_maybe(conn *c, token_t *tokens, size_t ntokens)
+{
+    int noreply_index = ntokens - 2;
+
+    /*
+      NOTE: this function is not the first place where we are going to
+      send the reply.  We could send it instead from process_command()
+      if the request line has wrong number of tokens.  However parsing
+      malformed line for "noreply" option is not reliable anyway, so
+      it can't be helped.
+    */
+    if (tokens[noreply_index].value
+        && strcmp(tokens[noreply_index].value, "noreply") == 0) {
+        c->noreply = true;
-    }
-}
@@ -1348 +1373 @@
-    assert(c != NULL);
-
+    set_noreply_maybe(c, tokens, ntokens);
+
-    if (tokens[KEY_TOKEN].length > KEY_MAX_LENGTH) {
-        out_string(c, "CLIENT_ERROR bad command line format");
@@ -1418 +1445 @@
-
-    assert(c != NULL);
+
+    set_noreply_maybe(c, tokens, ntokens);
-
-    if(tokens[KEY_TOKEN].length > KEY_MAX_LENGTH) {
@@ -1515 +1544 @@
-    assert(c != NULL);
-
+    set_noreply_maybe(c, tokens, ntokens);
+
-    if (settings.managed) {
-        int bucket = c->bucket;
@@ -1536 +1567 @@
-    }
-
-4
+(c->noreply ? 5 : 4)
-        exptime = strtol(tokens[2].value, NULL, 10);
-
@@ -1599 +1630 @@
-    assert(c != NULL);
-
+    set_noreply_maybe(c, tokens, ntokens);
+
-    level = strtoul(tokens[1].value, NULL, 10);
-    settings.verbose = level > MAX_VERBOSITY_LEVEL ? MAX_VERBOSITY_LEVEL : level;
@@ -1636 +1669 @@
-        process_get_command(c, tokens, ntokens, false);
-
-ntokens == 6
+(ntokens == 6 || ntokens == 7)
-               ((strcmp(tokens[COMMAND_TOKEN].value, "add") == 0 && (comm = NREAD_ADD)) ||
-                (strcmp(tokens[COMMAND_TOKEN].value, "set") == 0 && (comm = NREAD_SET)) ||
@@ -1645 +1678 @@
-        process_update_command(c, tokens, ntokens, comm, false);
-
-ntokens == 7
+(ntokens == 7 || ntokens == 8)
-
-        process_update_command(c, tokens, ntokens, comm, true);
-
-ntokens == 4
+(ntokens == 4 || ntokens == 5)
-
-        process_arithmetic_command(c, tokens, ntokens, 1);
@@ -1657 +1690 @@
-        process_get_command(c, tokens, ntokens, true);
-
-ntokens == 4
+(ntokens == 4 || ntokens == 5)
-
-        process_arithmetic_command(c, tokens, ntokens, 0);
-
-4
+5
-
-        process_delete_command(c, tokens, ntokens);
@@ -1730 +1763 @@
-        process_stat(c, tokens, ntokens);
-
-3
+4
-        time_t exptime = 0;
-        set_current_time();
-
-
+
+
+
-            settings.oldest_live = current_time - 1;
-            item_flush_expired();
@@ -1799 +1834 @@
-        out_string(c, "CLIENT_ERROR Slab reassignment not supported");
-#endif
-ntokens == 3
+(ntokens == 3 || ntokens == 4)
-        process_verbosity_command(c, tokens, ntokens);
-    } else {

trunk/server/memcached.h

@@ -221 +221 @@
-                         a managed instance. -1 (_not_ 0) means invalid. */
-    int    gen;       /* generation requested for the bucket */
+    bool   noreply;   /* True if the reply should not be sent. */
-    conn   *next;     /* Used for generating a list of conn structures */
-};