X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=index%2Fkcompare.c;h=00050c72e34d5757d69faef08475ba43a31fc0ab;hb=c33ea56e3771c3b80ba66ef8fda3a09cad171ebb;hp=406ea2c877ba7fdcbd1752450e49952af314c993;hpb=e415f242d2c229cac756512570795f62f0322c30;p=idzebra-moved-to-github.git

diff --git a/index/kcompare.c b/index/kcompare.c
index 406ea2c..00050c7 100644
--- a/index/kcompare.c
+++ b/index/kcompare.c
@@ -1,6 +1,6 @@
-/* $Id: kcompare.c,v 1.42 2004-05-30 18:35:12 adam Exp $
-   Copyright (C) 1995,1996,1997,1998,1999,2000,2001,2002,2003,2004
-   Index Data Aps
+/* $Id: kcompare.c,v 1.61 2006-08-16 13:16:36 adam Exp $
+   Copyright (C) 1995-2006
+   Index Data ApS
 
 This file is part of the Zebra server.
 
@@ -15,9 +15,9 @@ FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
 for more details.
 
 You should have received a copy of the GNU General Public License
-along with Zebra; see the file LICENSE.zebra.  If not, write to the
-Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA
-02111-1307, USA.
+along with this program; if not, write to the Free Software
+Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+
 */
 
 #include <stdlib.h>
@@ -27,66 +27,104 @@ Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA
 
 #include "index.h"
 
-#define INT_CODEC_NEW 0
-
+#ifdef __GNUC__
 #define CODEC_INLINE inline
+#else
+#define CODEC_INLINE
+#endif
 
-void key_logdump (int logmask, const void *p)
+void key_logdump_txt(int logmask, const void *p, const char *txt)
 {
     struct it_key key;
+    if (!txt)
+	txt = "(none)";
+    if (p)
+    {
+	char formstr[128];
+	int i;
+
+        memcpy (&key, p, sizeof(key));
+	assert(key.len > 0 && key.len <= IT_KEY_LEVEL_MAX);
+	*formstr = '\0';
+	for (i = 0; i<key.len; i++)
+	{
+	    if (i)
+		strcat(formstr, ".");
+	    sprintf(formstr + strlen(formstr), ZINT_FORMAT, key.mem[i]);
+	}
+        yaz_log(logmask, "%s %s", formstr, txt);
+    }
+    else
+        yaz_log(logmask, " (no key) %s",txt);
+}
 
-    memcpy (&key, p, sizeof(key));
-    logf (logmask, "%7d s=%-4d", key.sysno, key.seqno);
+void key_logdump(int logmask, const void *p)
+{
+    key_logdump_txt(logmask,  p, "");
 }
 
 int key_compare_it (const void *p1, const void *p2)
 {
-    if (((struct it_key *) p1)->sysno != ((struct it_key *) p2)->sysno)
-    {
-        if (((struct it_key *) p1)->sysno > ((struct it_key *) p2)->sysno)
-            return 2;
-        else
-            return -2;
-    }
-    if (((struct it_key *) p1)->seqno != ((struct it_key *) p2)->seqno)
+    int i, l = ((struct it_key *) p1)->len;
+    if (((struct it_key *) p2)->len > l)
+	l = ((struct it_key *) p2)->len;
+    assert (l <= IT_KEY_LEVEL_MAX && l > 0);
+    for (i = 0; i < l; i++)
     {
-        if (((struct it_key *) p1)->seqno > ((struct it_key *) p2)->seqno)
-            return 1;
-        else
-            return -1;
+	if (((struct it_key *) p1)->mem[i] != ((struct it_key *) p2)->mem[i])
+	{
+	    if (((struct it_key *) p1)->mem[i] > ((struct it_key *) p2)->mem[i])
+		return l-i;
+	    else
+		return i-l;
+	}
     }
     return 0;
 }
 
 char *key_print_it (const void *p, char *buf)
 {
-    const struct it_key *i = p;
-    sprintf (buf, "%d:%d", i->sysno, i->seqno);
+    strcpy(buf, "");
     return buf;
 }
 
 int key_compare (const void *p1, const void *p2)
 {
     struct it_key i1, i2;
+    int i, l;
     memcpy (&i1, p1, sizeof(i1));
     memcpy (&i2, p2, sizeof(i2));
-    if (i1.sysno != i2.sysno)
+    l = i1.len;
+    if (i2.len > l)
+	l = i2.len;
+    assert (l <= IT_KEY_LEVEL_MAX && l > 0);
+    for (i = 0; i < l; i++)
     {
-        if (i1.sysno > i2.sysno)
-            return 2;
-        else
-            return -2;
-    }
-    if (i1.seqno != i2.seqno)
-    {
-        if (i1.seqno > i2.seqno)
-            return 1;
-        else
-            return -1;
+	if (i1.mem[i] != i2.mem[i])
+	{
+	    if (i1.mem[i] > i2.mem[i])
+		return l-i;
+	    else
+		return i-l;
+	}
     }
     return 0;
 }
 
+zint key_get_seq(const void *p)
+{
+    struct it_key k;
+    memcpy (&k, p, sizeof(k));
+    return k.mem[k.len-1];
+}
+
+zint key_get_segment(const void *p)
+{
+    struct it_key k;
+    memcpy (&k, p, sizeof(k));
+    return k.mem[k.len-2];
+}
+
 int key_qsort_compare (const void *p1, const void *p2)
 {
     int r;
@@ -106,148 +144,130 @@ struct iscz1_code_info {
     struct it_key key;
 };
 
-
-static void *iscz1_code_start (int mode)
+void *iscz1_start (void)
 {
     struct iscz1_code_info *p = (struct iscz1_code_info *)
 	xmalloc (sizeof(*p));
-    p->key.sysno = 0;
-    p->key.seqno = 0;
+    iscz1_reset(p);
     return p;
 }
 
-static void iscz1_code_reset (void *vp)
+void key_init(struct it_key *key)
+{
+    int i;
+    key->len = 0;
+    for (i = 0; i < IT_KEY_LEVEL_MAX; i++)
+	key->mem[i] = 0;
+}
+
+void iscz1_reset (void *vp)
 {
     struct iscz1_code_info *p = (struct iscz1_code_info *) vp;
-    p->key.sysno = 0;
-    p->key.seqno = 0;
+    int i;
+    p->key.len = 0;
+    for (i = 0; i < IT_KEY_LEVEL_MAX; i++)
+	p->key.mem[i] = 0;
 }
 
-static void iscz1_code_stop (int mode, void *p)
+void iscz1_stop (void *p)
 {
     xfree (p);
 }
 
-#if INT_CODEC_NEW 
-CODEC_INLINE void iscz1_encode_int (unsigned d, char **dst)
+/* small encoder that works with unsigneds of any length */
+static CODEC_INLINE void iscz1_encode_int (zint d, char **dst)
 {
     unsigned char *bp = (unsigned char*) *dst;
 
     while (d > 127)
     {
-        *bp++ = 128 | (d & 127);
+        *bp++ = (unsigned) (128 | (d & 127));
 	d = d >> 7;
     }
-    *bp++ = d;
+    *bp++ = (unsigned) d;
     *dst = (char *) bp;
 }
 
-CODEC_INLINE int iscz1_decode_int (unsigned char **src)
+/* small decoder that works with unsigneds of any length */
+static CODEC_INLINE zint iscz1_decode_int (unsigned char **src)
 {
-    unsigned d = 0;
+    zint d = 0;
     unsigned char c;
     unsigned r = 0;
 
     while (((c = *(*src)++) & 128))
     {
-        d += ((c&127) << r);
+        d += ((zint) (c&127) << r);
 	r += 7;
     }
-    d += (c << r);
+    d += ((zint) c << r);
     return d;
 }
-#else
-/* ! INT_CODEC_NEW */
 
-CODEC_INLINE void iscz1_encode_int (unsigned d, char **dst)
+void iscz1_encode (void *vp, char **dst, const char **src)
 {
-    unsigned char *bp = (unsigned char*) *dst;
+    struct iscz1_code_info *p = (struct iscz1_code_info *) vp;
+    struct it_key tkey;
+    zint d;
+    int i;
 
-    if (d <= 63)
-        *bp++ = d;
-    else if (d <= 16383)
-    {
-        *bp++ = 64 | (d>>8);
-       *bp++ = d & 255;
-    }
-    else if (d <= 4194303)
+    /*   1
+	 3, 2, 9, 12
+	 3, 2, 10, 2
+	 4, 1
+	 
+	 if diff is 0, then there is more ...
+	 if diff is non-zero, then _may_ be more
+    */
+    memcpy (&tkey, *src, sizeof(struct it_key));
+
+    /* deal with leader + delta encoding .. */
+    d = 0;
+    assert(tkey.len > 0 && tkey.len <= IT_KEY_LEVEL_MAX);
+    for (i = 0; i < tkey.len; i++)
     {
-        *bp++ = 128 | (d>>16);
-        *bp++ = (d>>8) & 255;
-        *bp++ = d & 255;
+	d = tkey.mem[i] - p->key.mem[i];
+	if (d || i == tkey.len-1)
+	{  /* all have been equal until now, now make delta .. */
+	    p->key.mem[i] = tkey.mem[i];
+	    if (d > 0)
+	    {
+		iscz1_encode_int (i + (tkey.len << 3) + 64, dst);
+		i++;
+		iscz1_encode_int (d, dst);
+	    }
+	    else
+	    {
+		iscz1_encode_int (i + (tkey.len << 3), dst);
+		}
+	    break;
+	}
     }
-    else
+    /* rest uses absolute encoding ... */
+    for (; i < tkey.len; i++)
     {
-        *bp++ = 192 | (d>>24);
-        *bp++ = (d>>16) & 255;
-        *bp++ = (d>>8) & 255;
-        *bp++ = d & 255;
+	iscz1_encode_int (tkey.mem[i], dst);
+	p->key.mem[i] = tkey.mem[i];
     }
-    *dst = (char *) bp;
+    (*src) += sizeof(struct it_key);
 }
 
-CODEC_INLINE int iscz1_decode_int (unsigned char **src)
-{
-    unsigned c = *(*src)++;
-    switch (c & 192)
-    {
-    case 0:
-        return c;
-    case 64:
-        return ((c & 63) << 8) + *(*src)++;
-    case 128:
-        c = ((c & 63) << 8) + *(*src)++;
-        c = (c << 8) + *(*src)++;
-        return c;
-    }
-    if (c&32) /* expand sign bit to high bits */
-       c = ((c | 63) << 8) + *(*src)++;
-    else
-       c = ((c & 63) << 8) + *(*src)++;
-    c = (c << 8) + *(*src)++;
-    c = (c << 8) + *(*src)++;
-    
-    return c;
-}
-#endif
-
-static void iscz1_code_item (int mode, void *vp, char **dst, char **src)
+void iscz1_decode (void *vp, char **dst, const char **src)
 {
     struct iscz1_code_info *p = (struct iscz1_code_info *) vp;
-    struct it_key tkey;
-    int d;
+    int i;
 
-    if (mode == ISAMC_ENCODE)
-    {
-        memcpy (&tkey, *src, sizeof(struct it_key));
-        d = tkey.sysno - p->key.sysno;
-        if (d)
-        {
-            iscz1_encode_int (2*tkey.seqno + 1, dst);
-            iscz1_encode_int (d, dst);
-            p->key.sysno += d;
-            p->key.seqno = tkey.seqno;
-        }
-        else
-        {
-            iscz1_encode_int (2*(tkey.seqno - p->key.seqno), dst);
-            p->key.seqno = tkey.seqno;
-        }
-        (*src) += sizeof(struct it_key);
-    }
+    int leader = (int) iscz1_decode_int ((unsigned char **) src);
+    i = leader & 7;
+    if (leader & 64)
+	p->key.mem[i] += iscz1_decode_int ((unsigned char **) src);
     else
-    {
-        d = iscz1_decode_int ((unsigned char **) src);
-        if (d & 1)
-        {
-            p->key.seqno = d>>1;
-            p->key.sysno += iscz1_decode_int ((unsigned char **) src);
-        }
-        else
-            p->key.seqno += d>>1;
-        memcpy (*dst, &p->key, sizeof(struct it_key));
-        (*dst) += sizeof(struct it_key);
-    }
+	p->key.mem[i] = iscz1_decode_int ((unsigned char **) src);
+    p->key.len = (leader >> 3) & 7;
+    while (++i < p->key.len)
+	p->key.mem[i] = iscz1_decode_int ((unsigned char **) src);
+    memcpy (*dst, &p->key, sizeof(struct it_key));
+    (*dst) += sizeof(struct it_key);
 }
 
 ISAMS_M *key_isams_m (Res res, ISAMS_M *me)
@@ -255,10 +275,13 @@ ISAMS_M *key_isams_m (Res res, ISAMS_M *me)
     isams_getmethod (me);
 
     me->compare_item = key_compare;
+    me->log_item = key_logdump_txt;
 
-    me->code_start = iscz1_code_start;
-    me->code_item = iscz1_code_item;
-    me->code_stop = iscz1_code_stop;
+    me->codec.start = iscz1_start;
+    me->codec.decode = iscz1_decode;
+    me->codec.encode = iscz1_encode;
+    me->codec.stop = iscz1_stop;
+    me->codec.reset = iscz1_reset;
 
     me->debug = atoi(res_get_def (res, "isamsDebug", "0"));
 
@@ -267,36 +290,22 @@ ISAMS_M *key_isams_m (Res res, ISAMS_M *me)
 
 ISAMC_M *key_isamc_m (Res res, ISAMC_M *me)
 {
-    isc_getmethod (me);
+    isamc_getmethod (me);
 
     me->compare_item = key_compare;
+    me->log_item = key_logdump_txt;
 
-    me->code_start = iscz1_code_start;
-    me->code_item = iscz1_code_item;
-    me->code_stop = iscz1_code_stop;
-    me->code_reset = iscz1_code_reset;
+    me->codec.start = iscz1_start;
+    me->codec.decode = iscz1_decode;
+    me->codec.encode = iscz1_encode;
+    me->codec.stop = iscz1_stop;
+    me->codec.reset = iscz1_reset;
 
     me->debug = atoi(res_get_def (res, "isamcDebug", "0"));
 
     return me;
 }
 
-ISAMD_M *key_isamd_m (Res res, ISAMD_M *me)
-{
-    me = isamd_getmethod (me);
-
-    me->compare_item = key_compare;
-
-    me->code_start = iscz1_code_start;
-    me->code_item = iscz1_code_item;
-    me->code_stop = iscz1_code_stop;
-    me->code_reset = iscz1_code_reset;
-
-    me->debug = atoi(res_get_def (res, "isamdDebug", "0"));
-
-    return me;
-}
-
 int key_SU_encode (int ch, char *out)
 {
     int i;
@@ -336,3 +345,11 @@ int key_SU_decode (int *ch, const unsigned char *out)
     return len;
 }
 
+/*
+ * Local variables:
+ * c-basic-offset: 4
+ * indent-tabs-mode: nil
+ * End:
+ * vim: shiftwidth=4 tabstop=8 expandtab
+ */
+