X-Git-Url: http://git.indexdata.com/?p=idzebra-moved-to-github.git;a=blobdiff_plain;f=index%2Fkinput.c;h=7a4794f3945e706ee5afa8ab9f02173cbd4378c2;hp=06607ffd6cdb6b8628de308e8ac06cf3d40b67b4;hb=c33ea56e3771c3b80ba66ef8fda3a09cad171ebb;hpb=cef013b96c9508d5fd8552e7fd05962029b37e6f diff --git a/index/kinput.c b/index/kinput.c index 06607ff..7a4794f 100644 --- a/index/kinput.c +++ b/index/kinput.c @@ -1,6 +1,6 @@ -/* $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 +/* $Id: kinput.c,v 1.76 2006-08-14 10:40:15 adam Exp $ + Copyright (C) 1995-2006 + Index Data ApS This file is part of the Zebra server. @@ -15,15 +15,16 @@ 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 #ifdef WIN32 #include -#else +#endif +#if HAVE_UNISTD_H #include #endif #include @@ -38,7 +39,6 @@ Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA #define INP_BUF_START 60000 #define INP_BUF_ADD 400000 - struct key_file { int no; /* file no */ off_t offset; /* file offset */ @@ -55,6 +55,14 @@ struct key_file { Res res; }; +#if 0 +static void pkey(const char *b, int mode) +{ + key_logdump_txt(YLOG_LOG, b, mode ? "i" : "d"); +} +#endif + + void getFnameTmp (Res res, char *fname, int no) { const char *pre; @@ -82,21 +90,21 @@ void key_file_chunk_read (struct key_file *f) f->buf_size = 0; if (fd == -1) { - logf (LOG_WARN|LOG_ERRNO, "cannot open %s", fname); + yaz_log (YLOG_WARN|YLOG_ERRNO, "cannot open %s", fname); return ; } if (!f->length) { if ((f->length = lseek (fd, 0L, SEEK_END)) == (off_t) -1) { - logf (LOG_WARN|LOG_ERRNO, "cannot seek %s", fname); + yaz_log (YLOG_WARN|YLOG_ERRNO, "cannot seek %s", fname); close (fd); return ; } } if (lseek (fd, f->offset, SEEK_SET) == -1) { - logf (LOG_WARN|LOG_ERRNO, "cannot seek %s", fname); + yaz_log (YLOG_WARN|YLOG_ERRNO, "cannot seek %s", fname); close(fd); return ; } @@ -109,7 +117,7 @@ void key_file_chunk_read (struct key_file *f) } if (r == -1) { - logf (LOG_WARN|LOG_ERRNO, "read of %s", fname); + yaz_log (YLOG_WARN|YLOG_ERRNO, "read of %s", fname); close (fd); return; } @@ -218,6 +226,17 @@ int key_file_read (struct key_file *f, char *key) srcbuf[j] = key_file_getc(f); dst = key + i; iscz1_decode(f->decode_handle, &dst, &src); + +#if 0 + /* debugging */ + if (1) + { + struct it_key k; + memcpy(&k, key+i, sizeof(k)); + if (!k.mem[1]) + yaz_log(YLOG_LOG, "00 KEY"); + } +#endif return i + sizeof(struct it_key); } @@ -230,7 +249,8 @@ struct heap_info { int *ptr; int (*cmp)(const void *p1, const void *p2); struct zebra_register *reg; - ZebraHandle zh; /* only used for raw reading that bypasses the heaps */ + ZebraHandle zh; + int raw_reading; /* 1=raw /mem read. 0=file reading */ int no_diffs; int no_updates; int no_deletions; @@ -246,7 +266,7 @@ static struct heap_info *key_heap_malloc() hi->info.buf = 0; hi->heapnum = 0; hi->ptr = 0; - hi->zh=0; + hi->raw_reading = 0; hi->no_diffs = 0; hi->no_diffs = 0; hi->no_updates = 0; @@ -256,13 +276,15 @@ static struct heap_info *key_heap_malloc() return hi; } -struct heap_info *key_heap_init (int nkeys, - int (*cmp)(const void *p1, const void *p2)) +struct heap_info *key_heap_init_file(ZebraHandle zh, + int nkeys, + int (*cmp)(const void *p1, const void *p2)) { struct heap_info *hi; int i; hi = key_heap_malloc(); + hi->zh = zh; hi->info.file = (struct key_file **) xmalloc (sizeof(*hi->info.file) * (1+nkeys)); hi->info.buf = (char **) xmalloc (sizeof(*hi->info.buf) * (1+nkeys)); @@ -276,21 +298,20 @@ struct heap_info *key_heap_init (int nkeys, return hi; } -struct heap_info *key_heap_init_buff ( ZebraHandle zh, - int (*cmp)(const void *p1, const void *p2)) +struct heap_info *key_heap_init_raw(ZebraHandle zh, + int (*cmp)(const void *p1, const void *p2)) { struct heap_info *hi=key_heap_malloc(); - hi->cmp=cmp; - hi->zh=zh; + hi->cmp = cmp; + hi->zh = zh; + hi->raw_reading = 1; return hi; } void key_heap_destroy (struct heap_info *hi, int nkeys) { int i; - yaz_log (LOG_DEBUG, "key_heap_destroy"); - yaz_log (LOG_DEBUG, "key_heap_destroy nk=%d",nkeys); - if (!hi->zh) + if (!hi->raw_reading) for (i = 0; i<=nkeys; i++) xfree (hi->info.buf[i]); @@ -354,17 +375,15 @@ 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) +static int heap_read_one_raw(struct heap_info *hi, char *name, char *key) { - ZebraHandle zh=hi->zh; + ZebraHandle zh = hi->zh; 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=%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++; @@ -377,7 +396,7 @@ static int heap_read_one (struct heap_info *hi, char *name, char *key) char rbuf[INP_NAME_MAX]; struct key_file *kf; - if (hi->zh) /* bypass the heap stuff, we have a readymade buffer */ + if (hi->raw_reading) return heap_read_one_raw(hi, name, key); if (!hi->heapnum) @@ -394,13 +413,30 @@ static int heap_read_one (struct heap_info *hi, char *name, char *key) return 1; } -#define PR_KEY 0 +#define PR_KEY_LOW 0 +#define PR_KEY_TOP 0 -#if PR_KEY -static void pkey(const char *b, int mode) +#if 0 +/* for debugging only */ +static void print_dict_item(ZebraHandle zh, const char *s) { - struct it_key *key = (struct it_key *) b; - printf ("%c %d:%d\n", mode + 48, key->sysno, key->seqno); + char dst[IT_MAX_WORD+1]; + int ord; + int len = key_SU_decode(&ord, (const unsigned char *) s); + int index_type; + const char *db = 0; + + if (!zh) + yaz_log(YLOG_LOG, "ord=%d", ord); + else + { + zebraExplain_lookup_ord (zh->reg->zei, + ord, &index_type, &db, 0, 0, 0); + + zebra_term_untrans(zh, index_type, dst, s + len); + + yaz_log(YLOG_LOG, "ord=%d term=%s", ord, dst); + } } #endif @@ -415,15 +451,36 @@ struct heap_cread_info { int first_in_list; int more; int ret; + int look_level; }; static int heap_cread_item (void *vp, char **dst, int *insertMode); -int heap_cread_item2 (void *vp, char **dst, int *insertMode) +int heap_cread_item2(void *vp, char **dst, int *insertMode) { struct heap_cread_info *p = (struct heap_cread_info *) vp; int level = 0; + if (p->look_level) + { + if (p->look_level > 0) + { + *insertMode = 1; + p->look_level--; + } + else + { + *insertMode = 0; + p->look_level++; + } + memcpy (*dst, p->key_1, p->sz_1); +#if 0 + yaz_log(YLOG_LOG, "DUP level=%d", p->look_level); + pkey(*dst, *insertMode); +#endif + (*dst) += p->sz_1; + return 1; + } if (p->ret == 0) /* lookahead was 0?. Return that in read next round */ { p->ret = -1; @@ -457,7 +514,8 @@ int heap_cread_item2 (void *vp, char **dst, int *insertMode) return 0; } p->sz_2 = dst_2 - p->key_2; - if (p->sz_1 == p->sz_2 && memcmp(p->key_1, p->key_2, p->sz_1) == 0) + + if (key_compare(p->key_1, p->key_2) == 0) { if (p->mode_2) /* adjust level according to deletes/inserts */ level++; @@ -480,13 +538,19 @@ int heap_cread_item2 (void *vp, char **dst, int *insertMode) } /* outcome is insert (1) or delete (0) depending on final level */ if (level > 0) + { *insertMode = 1; + level--; + } else + { *insertMode = 0; + level++; + } + p->look_level = level; memcpy (*dst, p->key_1, p->sz_1); -#if PR_KEY - printf ("top: "); - pkey(*dst, *insertMode); fflush(stdout); +#if 0 + pkey(*dst, *insertMode); #endif (*dst) += p->sz_1; return 1; @@ -501,8 +565,7 @@ int heap_cread_item (void *vp, char **dst, int *insertMode) { *insertMode = p->key[0]; memcpy (*dst, p->key+1, sizeof(struct it_key)); -#if PR_KEY - printf ("sub1: "); +#if PR_KEY_LOW pkey(*dst, *insertMode); #endif (*dst) += sizeof(struct it_key); @@ -519,43 +582,34 @@ int heap_cread_item (void *vp, char **dst, int *insertMode) } *insertMode = p->key[0]; memcpy (*dst, p->key+1, sizeof(struct it_key)); -#if PR_KEY - printf ("sub2: "); +#if PR_KEY_LOW pkey(*dst, *insertMode); #endif (*dst) += sizeof(struct it_key); return 1; } -int heap_inpc (struct heap_info *hi) +int heap_inpc (struct heap_cread_info *hci, struct heap_info *hi) { - struct heap_cread_info hci; ISAMC_I *isamc_i = (ISAMC_I *) xmalloc (sizeof(*isamc_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); - - isamc_i->clientData = &hci; + isamc_i->clientData = hci; isamc_i->read_item = heap_cread_item2; - while (hci.more) + while (hci->more) { char this_name[INP_NAME_MAX]; - ISAMC_P isamc_p, isamc_p2; + ISAM_P isamc_p, isamc_p2; char *dict_info; - strcpy (this_name, hci.cur_name); - assert (hci.cur_name[1]); + strcpy (this_name, hci->cur_name); + assert (hci->cur_name[0]); hi->no_diffs++; - if ((dict_info = dict_lookup (hi->reg->dict, hci.cur_name))) + if ((dict_info = dict_lookup (hi->reg->dict, hci->cur_name))) { - memcpy (&isamc_p, dict_info+1, sizeof(ISAMC_P)); - isamc_p2 = isc_merge (hi->reg->isamc, isamc_p, isamc_i); + memcpy (&isamc_p, dict_info+1, sizeof(ISAM_P)); + isamc_p2 = isamc_p; + isamc_merge (hi->reg->isamc, &isamc_p2, isamc_i); if (!isamc_p2) { hi->no_deletions++; @@ -567,79 +621,69 @@ int heap_inpc (struct heap_info *hi) hi->no_updates++; if (isamc_p2 != isamc_p) dict_insert (hi->reg->dict, this_name, - sizeof(ISAMC_P), &isamc_p2); + sizeof(ISAM_P), &isamc_p2); } } else { - isamc_p = isc_merge (hi->reg->isamc, 0, isamc_i); + isamc_p = 0; + isamc_merge (hi->reg->isamc, &isamc_p, isamc_i); hi->no_insertions++; - dict_insert (hi->reg->dict, this_name, sizeof(ISAMC_P), &isamc_p); + if (isamc_p) + dict_insert (hi->reg->dict, this_name, + sizeof(ISAM_P), &isamc_p); } } xfree (isamc_i); - xfree (hci.key); - xfree (hci.key_1); - xfree (hci.key_2); return 0; } -#if 0 -/* for debugging only */ -static void print_dict_item (ZebraMaps zm, const char *s) +int heap_inp0(struct heap_cread_info *hci, struct heap_info *hi) { - int reg_type = s[1]; - char keybuf[IT_MAX_WORD+1]; - char *to = keybuf; - const char *from = s + 2; - - while (*from) + while (hci->more) { - const char *res = zebra_maps_output (zm, reg_type, &from); - if (!res) - *to++ = *from++; - else - while (*res) - *to++ = *res++; + char this_name[INP_NAME_MAX]; + char mybuf[1024]; + char *dst = mybuf; + int mode; + + strcpy (this_name, hci->cur_name); + assert (hci->cur_name[0]); + hi->no_diffs++; + + while (heap_cread_item2(hci, &dst, &mode)) + ; } - *to = '\0'; - yaz_log (LOG_LOG, "%s", keybuf); -} -#endif + return 0; +} -int heap_inpb (struct heap_info *hi) + +int heap_inpb(struct heap_cread_info *hci, struct heap_info *hi) { - struct heap_cread_info hci; ISAMC_I *isamc_i = (ISAMC_I *) xmalloc (sizeof(*isamc_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); - - isamc_i->clientData = &hci; + isamc_i->clientData = hci; isamc_i->read_item = heap_cread_item2; - while (hci.more) + while (hci->more) { char this_name[INP_NAME_MAX]; - ISAMC_P isamc_p, isamc_p2; + ISAM_P isamc_p, isamc_p2; char *dict_info; - strcpy (this_name, hci.cur_name); - assert (hci.cur_name[1]); + strcpy (this_name, hci->cur_name); + assert (hci->cur_name[0]); hi->no_diffs++; #if 0 - print_dict_item (hi->reg->zebra_maps, hci.cur_name); + assert(hi->zh); + print_dict_item(hi->zh, hci->cur_name); #endif - if ((dict_info = dict_lookup (hi->reg->dict, hci.cur_name))) + if ((dict_info = dict_lookup (hi->reg->dict, hci->cur_name))) { - memcpy (&isamc_p, dict_info+1, sizeof(ISAMC_P)); - isamc_p2 = isamb_merge (hi->reg->isamb, isamc_p, isamc_i); + memcpy (&isamc_p, dict_info+1, sizeof(ISAM_P)); + isamc_p2 = isamc_p; + isamb_merge (hi->reg->isamb, &isamc_p2, isamc_i); if (!isamc_p2) { hi->no_deletions++; @@ -651,57 +695,48 @@ int heap_inpb (struct heap_info *hi) hi->no_updates++; if (isamc_p2 != isamc_p) dict_insert (hi->reg->dict, this_name, - sizeof(ISAMC_P), &isamc_p2); + sizeof(ISAM_P), &isamc_p2); } } else { - isamc_p = isamb_merge (hi->reg->isamb, 0, isamc_i); + isamc_p = 0; + isamb_merge (hi->reg->isamb, &isamc_p, isamc_i); hi->no_insertions++; - dict_insert (hi->reg->dict, this_name, sizeof(ISAMC_P), &isamc_p); + if (isamc_p) + dict_insert (hi->reg->dict, this_name, + sizeof(ISAM_P), &isamc_p); } } - xfree (isamc_i); - xfree (hci.key); - xfree (hci.key_1); - xfree (hci.key_2); + xfree(isamc_i); return 0; } -int heap_inps (struct heap_info *hi) +int heap_inps (struct heap_cread_info *hci, struct heap_info *hi) { - struct heap_cread_info hci; ISAMS_I isams_i = (ISAMS_I) xmalloc (sizeof(*isams_i)); - hci.key = (char *) xmalloc (KEY_SIZE); - hci.key_1 = (char *) xmalloc (KEY_SIZE); - hci.key_2 = (char *) xmalloc (KEY_SIZE); - hci.first_in_list = 1; - hci.ret = -1; - hci.hi = hi; - hci.more = heap_read_one (hi, hci.cur_name, hci.key); - - isams_i->clientData = &hci; + isams_i->clientData = hci; isams_i->read_item = heap_cread_item; - while (hci.more) + while (hci->more) { char this_name[INP_NAME_MAX]; - ISAMS_P isams_p; + ISAM_P isams_p; char *dict_info; - strcpy (this_name, hci.cur_name); - assert (hci.cur_name[1]); + strcpy (this_name, hci->cur_name); + assert (hci->cur_name[0]); hi->no_diffs++; - if (!(dict_info = dict_lookup (hi->reg->dict, hci.cur_name))) + if (!(dict_info = dict_lookup (hi->reg->dict, hci->cur_name))) { isams_p = isams_merge (hi->reg->isams, isams_i); hi->no_insertions++; - dict_insert (hi->reg->dict, this_name, sizeof(ISAMS_P), &isams_p); + dict_insert (hi->reg->dict, this_name, sizeof(ISAM_P), &isams_p); } else { - logf (LOG_FATAL, "isams doesn't support this kind of update"); + yaz_log (YLOG_FATAL, "isams doesn't support this kind of update"); break; } } @@ -731,10 +766,10 @@ void progressFunc (struct key_file *keyp, void *info) remaining = (time_t) ((now - p->startTime)* ((double) p->totalBytes/p->totalOffset - 1.0)); if (remaining <= 130) - logf (LOG_LOG, "Merge %2.1f%% completed; %ld seconds remaining", + yaz_log (YLOG_LOG, "Merge %2.1f%% completed; %ld seconds remaining", (100.0*p->totalOffset) / p->totalBytes, (long) remaining); else - logf (LOG_LOG, "Merge %2.1f%% completed; %ld minutes remaining", + yaz_log (YLOG_LOG, "Merge %2.1f%% completed; %ld minutes remaining", (100.0*p->totalOffset) / p->totalBytes, (long) remaining/60); } p->totalOffset += keyp->buf_size; @@ -753,8 +788,7 @@ void zebra_index_merge (ZebraHandle zh) struct progressInfo progressInfo; int nkeys = zh->reg->key_file_no; int usefile; - - logf (LOG_DEBUG, " index_merge called with nk=%d b=%p", + yaz_log (YLOG_DEBUG, " index_merge called with nk=%d b=%p", nkeys, zh->reg->key_buf); if ( (nkeys==0) && (zh->reg->key_buf==0) ) return; /* nothing to merge - probably flush after end-trans */ @@ -790,7 +824,7 @@ void zebra_index_merge (ZebraHandle zh) progressInfo.totalBytes += kf[i]->length; progressInfo.totalOffset += kf[i]->buf_size; } - hi = key_heap_init (nkeys, key_qsort_compare); + hi = key_heap_init_file(zh, nkeys, key_qsort_compare); hi->reg = zh->reg; for (i = 1; i<=nkeys; i++) @@ -799,15 +833,34 @@ void zebra_index_merge (ZebraHandle zh) } /* use file */ else { /* do not use file, read straight from buffer */ - hi = key_heap_init_buff (zh,key_qsort_compare); + hi = key_heap_init_raw(zh, key_qsort_compare); hi->reg = zh->reg; } - if (zh->reg->isams) - heap_inps (hi); - if (zh->reg->isamc) - heap_inpc (hi); - if (zh->reg->isamb) - heap_inpb (hi); + + if (1) + { + struct heap_cread_info hci; + + 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.look_level = 0; + hci.more = heap_read_one (hi, hci.cur_name, hci.key); + + if (zh->reg->isams) + heap_inps(&hci, hi); + if (zh->reg->isamc) + heap_inpc(&hci, hi); + if (zh->reg->isamb) + heap_inpb(&hci, hi); + + xfree (hci.key); + xfree (hci.key_1); + xfree (hci.key_2); + } if (usefile) { @@ -822,13 +875,21 @@ void zebra_index_merge (ZebraHandle zh) } if (hi->no_iterations) { /* do not log if nothing happened */ - logf (LOG_LOG, "Iterations . . .%7d", hi->no_iterations); - logf (LOG_LOG, "Distinct words .%7d", hi->no_diffs); - logf (LOG_LOG, "Updates. . . . .%7d", hi->no_updates); - logf (LOG_LOG, "Deletions. . . .%7d", hi->no_deletions); - logf (LOG_LOG, "Insertions . . .%7d", hi->no_insertions); + yaz_log (YLOG_LOG, "Iterations . . .%7d", hi->no_iterations); + yaz_log (YLOG_LOG, "Distinct words .%7d", hi->no_diffs); + yaz_log (YLOG_LOG, "Updates. . . . .%7d", hi->no_updates); + yaz_log (YLOG_LOG, "Deletions. . . .%7d", hi->no_deletions); + yaz_log (YLOG_LOG, "Insertions . . .%7d", hi->no_insertions); } zh->reg->key_file_no = 0; key_heap_destroy (hi, nkeys); } +/* + * Local variables: + * c-basic-offset: 4 + * indent-tabs-mode: nil + * End: + * vim: shiftwidth=4 tabstop=8 expandtab + */ +