Changeset 620

Timestamp:

10/03/07 22:27:28 (1 year ago)

Author:

plindner

Message:

Add append command support written by Filipe Laborde. Tests/protocol doc updates by me.

Files:

• trunk/server/ChangeLog (modified) (1 diff)
• trunk/server/doc/protocol.txt (modified) (4 diffs)
• trunk/server/memcached.c (modified) (4 diffs)
• trunk/server/memcached.h (modified) (1 diff)

trunk/server/ChangeLog

@@ -15 +15 @@
-        * Switch to unsigned 64-bit increment/decrement counters
-          from Evan Miller and Dusgtin Sallings.
+
+        * Add append command support written by Filipe Laborde.
+          Tests/protocol doc updates by myself.
-
-2007-08-21 Paul Lindner <lindner@inuus.com>

trunk/server/doc/protocol.txt

@@ -54 +54 @@
-There are three types of commands. 
-
-
-
-
-
+
+
+
+
+
-
-Retrieval commands (there are two: "get" and "gets") ask the server to
@@ -128 +129 @@
-<command name> <key> <flags> <exptime> <bytes> [<unqiue>]\r\n
-
-
+"append", 
-
-  "set" means "store this data".  
@@ -137 +138 @@
-  "replace" means "store this data, but only if the server *does*
-  already hold data for this key".
+
+  "append" means "add this data to an existing key".
-
-  "cas" is a check and set operation which means "store this data but
@@ -183 +186 @@
-- "EXISTS\r\n" to indicate that the item you are trying to store with
-a "cas" command has been modified since you last fetched it.
+
-
-Retrieval command:

trunk/server/memcached.c

@@ -1160 +1160 @@
-    int flags;
-    time_t exptime;
-
+, old_vlen
-    uint32_t req_memory_ptr, in_memory_ptr;
-
-
+
-
-    assert(c != NULL);
@@ -1207 +1206 @@
-    }
-
+    /* Check if append -- if yes, search for previous entry, and allocate memory for both */
+    if( comm == NREAD_APPEND ){
+       old_it = assoc_find(key,nkey);
+
+       if( old_it && (old_it->nbytes)>2 ){ // previous must be more than \r\n
+          old_vlen = old_it->nbytes - 2;
+          vlen += old_vlen;                // append the length of old data
+       } else {
+          comm = NREAD_REPLACE;            // no old entry: treat as replace
+       }
+    }
+
-    it = item_alloc(key, nkey, flags, realtime(exptime), vlen+2);
-
-    /* HANDLE_CAS VALIDATION */
-
+ 
-    {
-      item *itmp=item_get(key, it->nkey);
@@ -1252 +1263 @@
-    }
-
-    c->item_comm = comm;
-    c->item = it;
-    c->ritem = ITEM_data(it);
-    c->rlbytes = it->nbytes;
+
+
+    /* If append, prepend old data before new - adjust item, rlbytes variables too
+     * Now that data has been merged, treat simply as a replace command
+     */
+    if (comm == NREAD_APPEND ){
+       memcpy( c->ritem, ITEM_data(old_it), old_vlen );
+       c->ritem += old_vlen;
+       c->rlbytes -= old_vlen;
+       comm = NREAD_REPLACE;
+    }
+
+    c->item_comm = comm;
-    conn_set_state(c, conn_nread);
-}
@@ -1488 +1511 @@
-               ((strcmp(tokens[COMMAND_TOKEN].value, "add") == 0 && (comm = NREAD_ADD)) ||
-                (strcmp(tokens[COMMAND_TOKEN].value, "set") == 0 && (comm = NREAD_SET)) ||
-
+
+
-
-        process_update_command(c, tokens, ntokens, comm, false);

trunk/server/memcached.h

@@ -138 +138 @@
-#define NREAD_SET 2
-#define NREAD_REPLACE 3
+#define NREAD_APPEND 4
-
-typedef struct {