Changeset 7fd3c2

Timestamp:

02/19/08 15:45:00 (4 years ago)

Author:

Tomash Brechko <tomash.brechko@…>

Branches:

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

Children:

030d22

Parents:

9bc63b (diff), 7bf8e1 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

git-author:

Tomash Brechko <tomash.brechko@…> (02/19/08 15:45:00)

git-committer:

Tomash Brechko <tomash.brechko@…> (02/19/08 15:45:00)

Message:

Merge branch 'memcached_namespace' into memcached_hash

Files:

• memcached_hash/Changes (added)
• memcached_hash/README (added)
• memcached_hash/TODO (added)
• memcached_hash/config (added)
• memcached_hash/dist.sh (added)
• memcached_hash/nginx.conf (added)
• memcached_hash/ngx_http_upstream_memcached_hash_module.c (added)
• memcached_hash/populate.pl (added)
• server/src/core/nginx.c (modified) (1 diff)
• server/src/core/ngx_crc32.c (modified) (1 diff)
• server/src/core/ngx_crc32.h (modified) (1 diff)
• server/src/core/ngx_string.h (modified) (1 diff)
• server/src/http/modules/ngx_http_memcached_module.c (modified) (7 diffs)
• server/src/http/ngx_http_upstream.c (modified) (1 diff)
• server/src/http/ngx_http_upstream.h (modified) (1 diff)
• server/src/http/ngx_http_variables.c (modified) (2 diffs)

server/src/core/nginx.c

@@ -274 +274 @@
     }
 
-    /* ngx_crc32_init() requires ngx_cacheline_size set in ngx_os_init() */
-
-    if (ngx_crc32_init() != NGX_OK) {
+    /*
+     * ngx_crc32_table_init() requires ngx_cacheline_size set in ngx_os_init()
+     */
+
+    if (ngx_crc32_table_init() != NGX_OK) {
         return 1;
     }

server/src/core/ngx_crc32.c

@@ -103 +103 @@
 
 ngx_int_t
-ngx_crc32_init(void)
+ngx_crc32_table_init(void)
 {
     void  *p;

server/src/core/ngx_crc32.h

@@ -50 +50 @@
 
 
-ngx_int_t ngx_crc32_init(void);
+#define ngx_crc32_init(crc)                                                   \
+    crc = 0xffffffff
+
+
+static ngx_inline void
+ngx_crc32_update(uint32_t *crc, u_char *p, size_t len)
+{
+    uint32_t  c;
+
+    c = *crc;
+
+    while (len--) {
+        c = ngx_crc32_table256[(c ^ *p++) & 0xff] ^ (c >> 8);
+    }
+
+    *crc = c;
+}
+
+
+#define ngx_crc32_final(crc)                                                  \
+    crc ^= 0xffffffff
+
+
+ngx_int_t ngx_crc32_table_init(void);
 
 

server/src/core/ngx_string.h

@@ -64 +64 @@
 #define ngx_memset(buf, c, n)     (void) memset(buf, c, n)
 
+#define ngx_memmove(dst, src, n)  (void) memmove(dst, src, n)
 
 #if (NGX_MEMCPY_LIMIT)

server/src/http/modules/ngx_http_memcached_module.c

@@ -14 +14 @@
     ngx_http_upstream_conf_t   upstream;
     ngx_int_t                  index;
+    ngx_int_t                  ns_index;
 } ngx_http_memcached_loc_conf_t;
 
@@ -150 +151 @@
 
 static ngx_str_t  ngx_http_memcached_key = ngx_string("memcached_key");
+static ngx_str_t  ngx_http_memcached_ns = ngx_string("memcached_namespace");
 
 
@@ -227 +229 @@
 {
     size_t                          len;
-    uintptr_t                       escape;
+    uintptr_t                       escape, ns_escape = 0;
     ngx_buf_t                      *b;
     ngx_chain_t                    *cl;
     ngx_http_memcached_ctx_t       *ctx;
-    ngx_http_variable_value_t      *vv;
+    ngx_http_variable_value_t      *vv, *ns_vv;
     ngx_http_memcached_loc_conf_t  *mlcf;
 
@@ -246 +248 @@
     escape = 2 * ngx_escape_uri(NULL, vv->data, vv->len, NGX_ESCAPE_MEMCACHED);
 
-    len = sizeof("get ") - 1 + vv->len + escape + sizeof(CRLF) - 1;
+    ns_vv = ngx_http_get_indexed_variable(r, mlcf->ns_index);
+
+    if (ns_vv != NULL && !ns_vv->not_found && ns_vv->len != 0) {
+        ns_escape = 2 * ngx_escape_uri(NULL, ns_vv->data,
+                                       ns_vv->len, NGX_ESCAPE_MEMCACHED);
+    }
+
+    len = sizeof("get ") - 1 + ns_vv->len + ns_escape
+                             + vv->len + escape + sizeof(CRLF) - 1;
 
     b = ngx_create_temp_buf(r->pool, len);
@@ -268 +278 @@
 
     ctx->key.data = b->last;
+
+    if (ns_vv != NULL && !ns_vv->not_found && ns_vv->len != 0) {
+        if (ns_escape == 0) {
+            b->last = ngx_copy(b->last, ns_vv->data, ns_vv->len);
+        } else {
+            b->last = (u_char *) ngx_escape_uri(b->last, ns_vv->data,
+                                                ns_vv->len,
+                                                NGX_ESCAPE_MEMCACHED);
+        }
+    }
 
     if (escape == 0) {
@@ -525 +545 @@
      *
      *     conf->index = 0;
+     *     conf->ns_index = 0;
      */
 
@@ -629 +650 @@
     }
 
+    lcf->ns_index = ngx_http_get_variable_index(cf, &ngx_http_memcached_ns);
+
+    if (lcf->ns_index == NGX_ERROR) {
+        return NGX_CONF_ERROR;
+    }
+
     return NGX_CONF_OK;
 }

server/src/http/ngx_http_upstream.c

@@ -3139 +3139 @@
     }
 
+    us->name = u.url;
     us->addrs = u.addrs;
     us->naddrs = u.naddrs;

server/src/http/ngx_http_upstream.h

@@ -65 +65 @@
 
 typedef struct {
+    ngx_str_t                       name;
     ngx_peer_addr_t                *addrs;
     ngx_uint_t                      naddrs;

server/src/http/ngx_http_variables.c

@@ -1313 +1313 @@
 
 
+static ngx_int_t
+ngx_http_optional_variable(ngx_http_request_t *r,
+    ngx_http_variable_value_t *v, uintptr_t data)
+{
+    *v = ngx_http_variable_null_value;
+    return NGX_OK;
+}
+
+
 ngx_int_t
 ngx_http_variables_init_vars(ngx_conf_t *cf)
@@ -1374 +1383 @@
         }
 
+        if (ngx_strncmp(v[i].name.data, "memcached_namespace", 19) == 0) {
+            v[i].get_handler = ngx_http_optional_variable;
+
+            continue;
+        }
+
         ngx_log_error(NGX_LOG_EMERG, cf->log, 0,
                       "unknown \"%V\" variable", &v[i].name);