Changeset 030d22

Timestamp:

02/19/08 16:11:23 (4 years ago)

Author:

Tomash Brechko <tomash.brechko@…>

Branches:

master-v0.7, master-v0.6, memcached_hash, upstream_count_limit

Children:

2340f0

Parents:

7fd3c2

git-author:

Tomash Brechko <tomash.brechko@…> (02/19/08 16:11:23)

git-committer:

Tomash Brechko <tomash.brechko@…> (02/19/08 16:11:23)

Message:

Skip namespace prefix when computing key hash.

File:

• memcached_hash/ngx_http_upstream_memcached_hash_module.c (modified) (6 diffs)

memcached_hash/ngx_http_upstream_memcached_hash_module.c

@@ -16 +16 @@
 
 #define CONTINUUM_MAX_POINT  0xffffffffU
+
+
+static ngx_str_t memcached_ns = ngx_string("memcached_namespace");
 
 
@@ -43 +46 @@
   unsigned int ketama_points;
   unsigned int scale;
+  ngx_int_t ns_index;
 };
 
@@ -50 +54 @@
   struct memcached_hash *memd;
   ngx_http_upstream_server_t *server;
-  ngx_chain_t **request_bufs;
+  ngx_http_request_t *request;
 };
 
@@ -133 +137 @@
   else
     {
+      ngx_chain_t *request_bufs = find_ctx->request->upstream->request_bufs;
+      ngx_http_variable_value_t *ns_vv =
+        ngx_http_get_indexed_variable(find_ctx->request, memd->ns_index);
+
       /*
         We take the key directly from request_buf, because there it is
         in the escaped form that will be seen by memcached server.
       */
-      key = (*find_ctx->request_bufs)->buf->start + (sizeof("get ") - 1);
-      len = (((*find_ctx->request_bufs)->buf->last - key)
-             - (sizeof("\r\n") - 1));
+      key = request_bufs->buf->start + (sizeof("get ") - 1);
+      if (ns_vv && ! ns_vv->not_found && ns_vv->len != 0)
+        {
+          key += ns_vv->len + 2 * ngx_escape_uri(NULL, ns_vv->data, ns_vv->len,
+                                                 NGX_ESCAPE_MEMCACHED);
+        }
+        
+      len = request_bufs->buf->last - key - (sizeof("\r\n") - 1);
 
       point = ngx_crc32_long(key, len);
@@ -218 +231 @@
     return NGX_ERROR;
   find_ctx->memd = memd;
-  find_ctx->request_bufs = &r->upstream->request_bufs;
+  find_ctx->request = r;
   find_ctx->server = us->servers->elts;
 
@@ -454 +467 @@
   memd->ketama_points = ketama_points;
   memd->scale = scale;
+  memd->ns_index = ngx_http_get_variable_index(cf, &memcached_ns);
+
+  if (memd->ns_index == NGX_ERROR) {
+      return NGX_CONF_ERROR;
+  }
 
   uscf->peer.data = memd;