-/* $Id: kcompare.c,v 1.41 2003-06-23 15:35:25 adam Exp $
- Copyright (C) 1995,1996,1997,1998,1999,2000,2001,2002,2003
+/* $Id: kcompare.c,v 1.46 2004-06-09 13:11:49 adam Exp $
+ Copyright (C) 1995,1996,1997,1998,1999,2000,2001,2002,2003,2004
Index Data Aps
This file is part of the Zebra server.
02111-1307, USA.
*/
-
-
-
#include <stdlib.h>
#include <string.h>
#include <stdio.h>
#include "index.h"
-void key_logdump (int logmask, const void *p)
+#define INT_CODEC_NEW 0
+#define CODEC_INLINE inline
+void key_logdump_txt (int logmask, const void *p, const char *txt)
{
struct it_key key;
+ if (p)
+ {
+ memcpy (&key, p, sizeof(key));
+ logf (logmask, "%7d:%-4d %s", key.sysno, key.seqno,txt);
+ }
+ else
+ logf(logmask, " (null) %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)
return 0;
}
+int key_get_seq(const void *p)
+{
+ struct it_key k;
+ memcpy (&k, p, sizeof(k));
+ return k.seqno;
+}
+
int key_qsort_compare (const void *p1, const void *p2)
{
int r;
return cp1[l] - cp2[l];
}
-int key_get_pos (const void *p)
-{
- struct it_key key;
- memcpy (&key, p, sizeof(key));
- return key.seqno;
-}
-
struct iscz1_code_info {
struct it_key key;
};
-static void *iscz1_code_start (int mode)
+void *iscz1_code_start (int mode)
{
struct iscz1_code_info *p = (struct iscz1_code_info *)
xmalloc (sizeof(*p));
return p;
}
-static void iscz1_code_reset (void *vp)
+void iscz1_code_reset (void *vp)
{
struct iscz1_code_info *p = (struct iscz1_code_info *) vp;
p->key.sysno = 0;
p->key.seqno = 0;
}
-static void iscz1_code_stop (int mode, void *p)
+void iscz1_code_stop (int mode, void *p)
{
xfree (p);
}
-void iscz1_encode_int (unsigned d, char **dst)
+#if INT_CODEC_NEW
+static CODEC_INLINE void iscz1_encode_int (unsigned d, char **dst)
+{
+ unsigned char *bp = (unsigned char*) *dst;
+
+ while (d > 127)
+ {
+ *bp++ = 128 | (d & 127);
+ d = d >> 7;
+ }
+ *bp++ = d;
+ *dst = (char *) bp;
+}
+
+static CODEC_INLINE int iscz1_decode_int (unsigned char **src)
+{
+ unsigned d = 0;
+ unsigned char c;
+ unsigned r = 0;
+
+ while (((c = *(*src)++) & 128))
+ {
+ d += ((c&127) << r);
+ r += 7;
+ }
+ d += (c << r);
+ return d;
+}
+#else
+/* ! INT_CODEC_NEW */
+
+static CODEC_INLINE void iscz1_encode_int (unsigned d, char **dst)
{
unsigned char *bp = (unsigned char*) *dst;
*dst = (char *) bp;
}
-int iscz1_decode_int (unsigned char **src)
+static CODEC_INLINE int iscz1_decode_int (unsigned char **src)
{
unsigned c = *(*src)++;
switch (c & 192)
return c;
}
+#endif
-static void iscz1_code_item (int mode, void *vp, char **dst, char **src)
+void iscz1_code_item (int mode, void *vp, char **dst, char **src)
{
struct iscz1_code_info *p = (struct iscz1_code_info *) vp;
struct it_key tkey;
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;
isc_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 = isamd_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;