Changeset 620 for trunk/server/memcached.c

Timestamp:

10/03/07 22:27:28 (2 years ago)

Author:

plindner

Message:

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

Files:

• trunk/server/memcached.c (modified) (4 diffs)

trunk/server/memcached.c

@@ -1160 +1160 @@
     int flags;
     time_t exptime;
-    int vlen;
+    int vlen, old_vlen;
     uint32_t req_memory_ptr, in_memory_ptr;
-
-    item *it;
+    item *it, *old_it;
 
     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 */
-    if(handle_cas == true)
+    if (handle_cas == true)
     {
       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)) ||
-                (strcmp(tokens[COMMAND_TOKEN].value, "replace") == 0 && (comm = NREAD_REPLACE)))) {
+                (strcmp(tokens[COMMAND_TOKEN].value, "replace") == 0 && (comm = NREAD_REPLACE)) ||
+                (strcmp(tokens[COMMAND_TOKEN].value, "append") == 0 && (comm = NREAD_APPEND)) )) {
 
         process_update_command(c, tokens, ntokens, comm, false);