X-Git-Url: http://git.indexdata.com/?p=yaz-moved-to-github.git;a=blobdiff_plain;f=src%2Fzoom-memcached.c;h=cbf4a9ab0d6a88793c17fbc034ff165280275731;hp=f35e7e698860b120e18c22f5ee3e9f0a03d1d438;hb=f33b7979ed1553753c5c54819ea2b4038c783d43;hpb=a91467db0bbbaefbaf64410b657a9439104997e0

diff --git a/src/zoom-memcached.c b/src/zoom-memcached.c
index f35e7e6..cbf4a9a 100644
--- a/src/zoom-memcached.c
+++ b/src/zoom-memcached.c
@@ -20,6 +20,13 @@
 #include <yaz/log.h>
 #include <yaz/diagbib1.h>
 
+#if HAVE_LIBMEMCACHED_MEMCACHED_H
+#if HAVE_MEMCACHED_RETURN_T
+#else
+typedef memcached_return memcached_return_t;
+#endif
+#endif
+
 void ZOOM_memcached_init(ZOOM_connection c)
 {
 #if HAVE_LIBMEMCACHED_MEMCACHED_H
@@ -35,6 +42,56 @@ void ZOOM_memcached_destroy(ZOOM_connection c)
 #endif
 }
 
+#if HAVE_LIBMEMCACHED_MEMCACHED_H
+/* memcached wrapper.. Because memcached function do not exist in older libs */
+static memcached_st *yaz_memcached_wrap(const char *conf)
+{
+#if HAVE_MEMCACHED_FUNC
+    return memcached(conf, strlen(conf));
+#else
+    char **darray;
+    int i, num;
+    memcached_st *mc = memcached_create(0);
+    NMEM nmem = nmem_create();
+    memcached_return_t rc;
+
+    nmem_strsplit_blank(nmem, conf, &darray, &num);
+    for (i = 0; mc && i < num; i++)
+    {
+        if (!yaz_strncasecmp(darray[i], "--SERVER=", 9))
+        {
+            char *host = darray[i] + 9;
+            char *port = strchr(host, ':');
+            char *weight = strstr(host, "/?");
+            if (port)
+                *port++ = '\0';
+            if (weight)
+            {
+                *weight = '\0';
+                weight += 2;
+            }
+            rc = memcached_server_add(mc, host, port ? atoi(port) : 11211);
+            yaz_log(YLOG_LOG, "memcached_server_add host=%s rc=%u %s",
+                    host, (unsigned) rc, memcached_strerror(mc, rc));
+            if (rc != MEMCACHED_SUCCESS)
+            {
+                memcached_free(mc);
+                mc = 0;
+            }
+        }
+        else
+        {
+            /* bad directive */
+            memcached_free(mc);
+            mc = 0;
+        }
+    }
+    nmem_destroy(nmem);
+    return mc;
+#endif
+}
+#endif
+
 int ZOOM_memcached_configure(ZOOM_connection c)
 {
     const char *val;
@@ -49,12 +106,14 @@ int ZOOM_memcached_configure(ZOOM_connection c)
     if (val && *val)
     {
 #if HAVE_LIBMEMCACHED_MEMCACHED_H
-        c->mc_st = memcached(val, strlen(val));
+        c->mc_st = yaz_memcached_wrap(val);
         if (!c->mc_st)
         {
-            ZOOM_set_error(c, ZOOM_ERROR_MEMCACHED, val);
+            ZOOM_set_error(c, ZOOM_ERROR_MEMCACHED,
+                           "could not create memcached");
             return -1;
         }
+        memcached_behavior_set(c->mc_st, MEMCACHED_BEHAVIOR_BINARY_PROTOCOL, 1);
 #else
         ZOOM_set_error(c, ZOOM_ERROR_MEMCACHED, "not enabled");
         return -1;
@@ -95,7 +154,6 @@ void ZOOM_memcached_resultset(ZOOM_resultset r, ZOOM_query q)
 void ZOOM_memcached_search(ZOOM_connection c, ZOOM_resultset resultset)
 {
 #if HAVE_LIBMEMCACHED_MEMCACHED_H
-    /* TODO: add sorting */
     if (c->mc_st && resultset->live_set == 0)
     {
         size_t v_len;
@@ -104,19 +162,32 @@ void ZOOM_memcached_search(ZOOM_connection c, ZOOM_resultset resultset)
         char *v = memcached_get(c->mc_st, wrbuf_buf(resultset->mc_key),
                                 wrbuf_len(resultset->mc_key),
                                 &v_len, &flags, &rc);
+        /* count;precision (ASCII) + '\0' + BER buffer for otherInformation */
         if (v)
         {
             ZOOM_Event event;
-            WRBUF w = wrbuf_alloc();
+            size_t lead_len = strlen(v) + 1;
 
-            wrbuf_write(w, v, v_len);
-            free(v);
-            resultset->size = odr_atoi(wrbuf_cstr(w));
-
-            yaz_log(YLOG_LOG, "For key %s got value %s",
-                    wrbuf_cstr(resultset->mc_key), wrbuf_cstr(w));
+            resultset->size = odr_atoi(v);
 
-            wrbuf_destroy(w);
+            yaz_log(YLOG_LOG, "For key %s got value %s lead_len=%d len=%d",
+                    wrbuf_cstr(resultset->mc_key), v, (int) lead_len,
+                    (int) v_len);
+            if (v_len > lead_len)
+            {
+                Z_OtherInformation *oi = 0;
+                int oi_len = v_len - lead_len;
+                odr_setbuf(resultset->odr, v + lead_len, oi_len, 0);
+                if (!z_OtherInformation(resultset->odr, &oi, 0, 0))
+                {
+                    yaz_log(YLOG_WARN, "oi decoding failed");
+                    free(v);
+                    return;
+                }
+                ZOOM_handle_search_result(c, resultset, oi);
+                ZOOM_handle_facet_result(c, resultset, oi);
+            }
+            free(v);
             event = ZOOM_Event_create(ZOOM_EVENT_RECV_SEARCH);
             ZOOM_connection_put_event(c, event);
             resultset->live_set = 1;
@@ -125,7 +196,8 @@ void ZOOM_memcached_search(ZOOM_connection c, ZOOM_resultset resultset)
 #endif
 }
 
-void ZOOM_memcached_hitcount(ZOOM_connection c, ZOOM_resultset resultset)
+void ZOOM_memcached_hitcount(ZOOM_connection c, ZOOM_resultset resultset,
+                             Z_OtherInformation *oi, const char *precision)
 {
 #if HAVE_LIBMEMCACHED_MEMCACHED_H
     if (c->mc_st && resultset->live_set == 0)
@@ -133,15 +205,33 @@ void ZOOM_memcached_hitcount(ZOOM_connection c, ZOOM_resultset resultset)
         uint32_t flags = 0;
         memcached_return_t rc;
         time_t expiration = 36000;
-        char str[40];
+        char *str;
+        ODR odr = odr_createmem(ODR_ENCODE);
+        char *oi_buf = 0;
+        int oi_len = 0;
+        char *key;
+
+        str = odr_malloc(odr, 20 + strlen(precision));
+        /* count;precision (ASCII) + '\0' + BER buffer for otherInformation */
+        sprintf(str, ODR_INT_PRINTF ";%s", resultset->size, precision);
+        if (oi)
+        {
+            z_OtherInformation(odr, &oi, 0, 0);
+            oi_buf = odr_getbuf(odr, &oi_len, 0);
+        }
+        key = odr_malloc(odr, strlen(str) + 1 + oi_len);
+        strcpy(key, str);
+        if (oi_len)
+            memcpy(key + strlen(str) + 1, oi_buf, oi_len);
 
-        sprintf(str, ODR_INT_PRINTF, resultset->size);
         rc = memcached_set(c->mc_st,
-                           wrbuf_buf(resultset->mc_key),wrbuf_len(resultset->mc_key),
-                           str, strlen(str), expiration, flags);
-        yaz_log(YLOG_LOG, "Store hit count key=%s value=%s rc=%u %s",
-                wrbuf_cstr(resultset->mc_key), str, (unsigned) rc,
-                memcached_last_error_message(c->mc_st));
+                           wrbuf_buf(resultset->mc_key),
+                           wrbuf_len(resultset->mc_key),
+                           key, strlen(str) + 1 + oi_len, expiration, flags);
+        yaz_log(YLOG_LOG, "Store hit count key=%s value=%s oi_len=%d rc=%u %s",
+                wrbuf_cstr(resultset->mc_key), str, oi_len, (unsigned) rc,
+                memcached_strerror(c->mc_st, rc));
+        odr_destroy(odr);
     }
 #endif
 }
@@ -157,6 +247,7 @@ void ZOOM_memcached_add(ZOOM_resultset r, Z_NamePlusRecord *npr,
         !diag && npr->which == Z_NamePlusRecord_databaseRecord)
     {
         WRBUF k = wrbuf_alloc();
+        WRBUF rec_sha1 = wrbuf_alloc();
         uint32_t flags = 0;
         memcached_return_t rc;
         time_t expiration = 36000;
@@ -172,16 +263,30 @@ void ZOOM_memcached_add(ZOOM_resultset r, Z_NamePlusRecord *npr,
                      syntax ? syntax : "",
                      elementSetName ? elementSetName : "",
                      schema ? schema : "");
+
+        wrbuf_sha1_write(rec_sha1, rec_buf, rec_len, 1);
+
         rc = memcached_set(r->connection->mc_st,
-                           wrbuf_buf(k),wrbuf_len(k),
+                           wrbuf_buf(k), wrbuf_len(k),
+                           wrbuf_buf(rec_sha1), wrbuf_len(rec_sha1),
+                           expiration, flags);
+
+        yaz_log(YLOG_LOG, "Store record key=%s val=%s rc=%u %s",
+                wrbuf_cstr(k), wrbuf_cstr(rec_sha1), (unsigned) rc,
+                memcached_strerror(r->connection->mc_st, rc));
+
+        rc = memcached_add(r->connection->mc_st,
+                           wrbuf_buf(rec_sha1), wrbuf_len(rec_sha1),
                            rec_buf, rec_len,
                            expiration, flags);
 
-        yaz_log(YLOG_LOG, "Store record lkey=%s len=%d rc=%u %s",
-                wrbuf_cstr(k), rec_len, (unsigned) rc,
-                memcached_last_error_message(r->connection->mc_st));
+        yaz_log(YLOG_LOG, "Add record key=%s rec_len=%d rc=%u %s",
+                wrbuf_cstr(rec_sha1), rec_len, (unsigned) rc,
+                memcached_strerror(r->connection->mc_st, rc));
+
         odr_destroy(odr);
         wrbuf_destroy(k);
+        wrbuf_destroy(rec_sha1);
     }
 #endif
 }
@@ -195,8 +300,8 @@ Z_NamePlusRecord *ZOOM_memcached_lookup(ZOOM_resultset r, int pos,
     if (r->connection && r->connection->mc_st)
     {
         WRBUF k = wrbuf_alloc();
-        size_t v_len;
-        char *v_buf;
+        char *sha1_buf;
+        size_t sha1_len;
         uint32_t flags;
         memcached_return_t rc;
 
@@ -207,19 +312,31 @@ Z_NamePlusRecord *ZOOM_memcached_lookup(ZOOM_resultset r, int pos,
                      schema ? schema : "");
 
         yaz_log(YLOG_LOG, "Lookup record %s", wrbuf_cstr(k));
-        v_buf = memcached_get(r->connection->mc_st, wrbuf_buf(k), wrbuf_len(k),
-                              &v_len, &flags, &rc);
+        sha1_buf = memcached_get(r->connection->mc_st,
+                                 wrbuf_buf(k), wrbuf_len(k),
+                                 &sha1_len, &flags, &rc);
+
         wrbuf_destroy(k);
-        if (v_buf)
+        if (sha1_buf)
         {
-            Z_NamePlusRecord *npr = 0;
-
-            odr_setbuf(r->odr, v_buf, v_len, 0);
-            z_NamePlusRecord(r->odr, &npr, 0, 0);
-            free(v_buf);
-            if (npr)
-                yaz_log(YLOG_LOG, "returned memcached copy");
-            return npr;
+            size_t v_len;
+            char *v_buf;
+
+            yaz_log(YLOG_LOG, "Lookup record %.*s", (int) sha1_len, sha1_buf);
+            v_buf = memcached_get(r->connection->mc_st, sha1_buf, sha1_len,
+                                  &v_len, &flags, &rc);
+            free(sha1_buf);
+            if (v_buf)
+            {
+                Z_NamePlusRecord *npr = 0;
+
+                odr_setbuf(r->odr, v_buf, v_len, 0);
+                z_NamePlusRecord(r->odr, &npr, 0, 0);
+                free(v_buf);
+                if (npr)
+                    yaz_log(YLOG_LOG, "returned memcached copy");
+                return npr;
+            }
         }
     }
 #endif