X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=index%2Fkinput.c;h=06607ffd6cdb6b8628de308e8ac06cf3d40b67b4;hb=e172ced0dcc937dfc433a33c7e20962b9e6b5ea0;hp=b9d7305803dedfe3ee886cdb58d1459f8905b419;hpb=23b1af194b14847f3ba187e3c5c3015797ad3c4a;p=idzebra-moved-to-github.git diff --git a/index/kinput.c b/index/kinput.c index b9d7305..06607ff 100644 --- a/index/kinput.c +++ b/index/kinput.c @@ -1,5 +1,5 @@ -/* $Id: kinput.c,v 1.57 2004-01-22 15:40:25 heikki Exp $ - Copyright (C) 1995,1996,1997,1998,1999,2000,2001,2002 +/* $Id: kinput.c,v 1.62 2004-09-15 08:13:51 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. @@ -19,8 +19,6 @@ 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. */ - - #include #ifdef WIN32 @@ -49,8 +47,7 @@ struct key_file { size_t chunk; /* number of bytes allocated */ size_t buf_ptr; /* current position in buffer */ char *prev_name; /* last word read */ - int sysno; /* last sysno */ - int seqno; /* last seqno */ + void *decode_handle; off_t length; /* length of file */ /* handler invoked in each read */ void (*readHandler)(struct key_file *keyp, void *rinfo); @@ -124,6 +121,7 @@ void key_file_chunk_read (struct key_file *f) void key_file_destroy (struct key_file *f) { + iscz1_stop(f->decode_handle); xfree (f->buf); xfree (f->prev_name); xfree (f); @@ -135,8 +133,7 @@ struct key_file *key_file_init (int no, int chunk, Res res) f = (struct key_file *) xmalloc (sizeof(*f)); f->res = res; - f->sysno = 0; - f->seqno = 0; + f->decode_handle = iscz1_start(); f->no = no; f->chunk = chunk; f->offset = 0; @@ -180,7 +177,7 @@ int key_file_decode (struct key_file *f) d = ((c&63) << 8) + (key_file_getc (f) & 0xff); d = (d << 8) + (key_file_getc (f) & 0xff); break; - case 192: + default: /* 192 */ d = ((c&63) << 8) + (key_file_getc (f) & 0xff); d = (d << 8) + (key_file_getc (f) & 0xff); d = (d << 8) + (key_file_getc (f) & 0xff); @@ -191,8 +188,11 @@ int key_file_decode (struct key_file *f) int key_file_read (struct key_file *f, char *key) { - int i, d, c; - struct it_key itkey; + int i, c; + char srcbuf[128]; + const char *src = srcbuf; + char *dst; + int j; c = key_file_getc (f); if (c == 0) @@ -209,22 +209,16 @@ int key_file_read (struct key_file *f, char *key) while ((key[i++] = key_file_getc (f))) ; strcpy (f->prev_name, key); - f->sysno = 0; + iscz1_reset(f->decode_handle); } - d = key_file_decode (f); - key[i++] = d & 1; - d = d >> 1; - itkey.sysno = d + f->sysno; - if (d) - { - f->sysno = itkey.sysno; - f->seqno = 0; - } - d = key_file_decode (f); - itkey.seqno = d + f->seqno; - f->seqno = itkey.seqno; - memcpy (key + i, &itkey, sizeof(struct it_key)); - return i + sizeof (struct it_key); + c = key_file_getc(f); /* length + insert/delete combined */ + key[i++] = c & 128; + c = c & 127; + for (j = 0; j < c; j++) + srcbuf[j] = key_file_getc(f); + dst = key + i; + iscz1_decode(f->decode_handle, &dst, &src); + return i + sizeof(struct it_key); } struct heap_info { @@ -363,12 +357,14 @@ static void key_heap_insert (struct heap_info *hi, const char *buf, int nbytes, static int heap_read_one_raw (struct heap_info *hi, char *name, char *key) { ZebraHandle zh=hi->zh; - int ptr_i = zh->reg->ptr_i--; + size_t ptr_i = zh->reg->ptr_i; char *cp; if (!ptr_i) return 0; + --(zh->reg->ptr_i); cp=(zh->reg->key_buf)[zh->reg->ptr_top - ptr_i]; - logf (LOG_DEBUG, " raw: i=%d top=%d cp=%p", ptr_i, zh->reg->ptr_top,cp); + logf (LOG_DEBUG, " raw: i=%ld top=%ld cp=%p", (long) ptr_i, + (long) zh->reg->ptr_top, cp); strcpy(name, cp); memcpy(key, cp+strlen(name)+1, KEY_SIZE); hi->no_iterations++; @@ -672,158 +668,6 @@ int heap_inpb (struct heap_info *hi) return 0; } -int heap_inpd (struct heap_info *hi) -{ - struct heap_cread_info hci; - ISAMD_I isamd_i = (ISAMD_I) xmalloc (sizeof(*isamd_i)); - - hci.key = (char *) xmalloc (KEY_SIZE); - hci.key_1 = (char *) xmalloc (KEY_SIZE); - hci.key_2 = (char *) xmalloc (KEY_SIZE); - hci.ret = -1; - hci.first_in_list = 1; - hci.hi = hi; - hci.more = heap_read_one (hi, hci.cur_name, hci.key); - - isamd_i->clientData = &hci; - isamd_i->read_item = heap_cread_item; - - while (hci.more) - { - char this_name[INP_NAME_MAX]; - char *dict_info; - char dictentry[ISAMD_MAX_DICT_LEN+1]; - char dictlen; - - strcpy (this_name, hci.cur_name); - - /* print_dict_item (hi->reg->zebra_maps, hci.cur_name); */ - /*!*/ /* FIXME: depend on isamd-debug */ - - assert (hci.cur_name[1]); - hi->no_diffs++; - if ((dict_info = dict_lookup (hi->reg->dict, hci.cur_name))) - { - dictlen=dict_info[0]; - memcpy (dictentry, dict_info+1, dictlen ); -#ifdef SKIPTHIS - logf(LOG_LOG,"dictentry before. len=%d: %d %d %d %d %d %d %d %d %d", - dictlen,dictentry[0], dictentry[1], dictentry[2], - dictentry[3], dictentry[4], dictentry[5], - dictentry[6], dictentry[7], dictentry[8]); /*!*/ -#endif - dictlen= isamd_append(hi->reg->isamd, dictentry, dictlen, isamd_i); - /* logf dictentry after */ - if (dictlen) - { - hi->no_updates++; - if ( (dictlen!=dict_info[0]) || - (0!=memcmp(dictentry, dict_info+1, dictlen)) ) - { - dict_insert(hi->reg->dict, this_name, - dictlen,dictentry); - } - } - else - { - hi->no_deletions++; - if (!dict_delete (hi->reg->dict, this_name)) - { - logf (LOG_FATAL, "dict_delete failed"); - abort(); - } - } - } - else - { - dictlen=0; - memset (dictentry, '\0', ISAMD_MAX_DICT_LEN); - dictlen= isamd_append(hi->reg->isamd, dictentry, dictlen, isamd_i); - /* logf dictentry first */ - hi->no_insertions++; - if (dictlen) - dict_insert(hi->reg->dict, this_name, - dictlen,dictentry); - } - } - xfree (isamd_i); - xfree (hci.key); - xfree (hci.key_1); - xfree (hci.key_2); - return 0; -} - -int heap_inp (struct heap_info *hi) -{ - char *info; - char next_name[INP_NAME_MAX]; - char cur_name[INP_NAME_MAX]; - int key_buf_size = INP_BUF_START; - int key_buf_ptr; - char *next_key; - char *key_buf; - int more; - - next_key = (char *) xmalloc (KEY_SIZE); - key_buf = (char *) xmalloc (key_buf_size); - more = heap_read_one (hi, cur_name, key_buf); - while (more) /* EOF ? */ - { - int nmemb; - key_buf_ptr = KEY_SIZE; - while (1) - { - if (!(more = heap_read_one (hi, next_name, next_key))) - break; - if (*next_name && strcmp (next_name, cur_name)) - break; - memcpy (key_buf + key_buf_ptr, next_key, KEY_SIZE); - key_buf_ptr += KEY_SIZE; - if (key_buf_ptr+(int) KEY_SIZE >= key_buf_size) - { - char *new_key_buf; - new_key_buf = (char *) xmalloc (key_buf_size + INP_BUF_ADD); - memcpy (new_key_buf, key_buf, key_buf_size); - key_buf_size += INP_BUF_ADD; - xfree (key_buf); - key_buf = new_key_buf; - } - } - hi->no_diffs++; - nmemb = key_buf_ptr / KEY_SIZE; - assert (nmemb * (int) KEY_SIZE == key_buf_ptr); - if ((info = dict_lookup (hi->reg->dict, cur_name))) - { - ISAM_P isam_p, isam_p2; - memcpy (&isam_p, info+1, sizeof(ISAM_P)); - isam_p2 = is_merge (hi->reg->isam, isam_p, nmemb, key_buf); - if (!isam_p2) - { - hi->no_deletions++; - if (!dict_delete (hi->reg->dict, cur_name)) - abort (); - } - else - { - hi->no_updates++; - if (isam_p2 != isam_p) - dict_insert (hi->reg->dict, cur_name, - sizeof(ISAM_P), &isam_p2); - } - } - else - { - ISAM_P isam_p; - hi->no_insertions++; - isam_p = is_merge (hi->reg->isam, 0, nmemb, key_buf); - dict_insert (hi->reg->dict, cur_name, sizeof(ISAM_P), &isam_p); - } - memcpy (key_buf, next_key, KEY_SIZE); - strcpy (cur_name, next_name); - } - return 0; -} - int heap_inps (struct heap_info *hi) { struct heap_cread_info hci; @@ -902,7 +746,7 @@ void progressFunc (struct key_file *keyp, void *info) void zebra_index_merge (ZebraHandle zh) { - struct key_file **kf; + struct key_file **kf = 0; char rbuf[1024]; int i, r; struct heap_info *hi; @@ -962,10 +806,6 @@ void zebra_index_merge (ZebraHandle zh) heap_inps (hi); if (zh->reg->isamc) heap_inpc (hi); - if (zh->reg->isam) - heap_inp (hi); - if (zh->reg->isamd) - heap_inpd (hi); if (zh->reg->isamb) heap_inpb (hi); @@ -992,5 +832,3 @@ void zebra_index_merge (ZebraHandle zh) key_heap_destroy (hi, nkeys); } - -