X-Git-Url: http://git.indexdata.com/?p=idzebra-moved-to-github.git;a=blobdiff_plain;f=index%2Fkinput.c;h=4d261813b46e4f3b331f84e7665d98cb2c1f860b;hp=e0181bca55945b59195d826ac415db01655e9655;hb=f3f20a205132c39c9434b10086422c6b49b47faf;hpb=6b75f88ead401c95ebf4e6d6761447264789c01a diff --git a/index/kinput.c b/index/kinput.c index e0181bc..4d26181 100644 --- a/index/kinput.c +++ b/index/kinput.c @@ -1,8 +1,5 @@ -/* $Id: kinput.c,v 1.87 2008-01-09 14:53:26 adam Exp $ - Copyright (C) 1995-2007 - Index Data ApS - -This file is part of the Zebra server. +/* This file is part of the Zebra server. + Copyright (C) Index Data Zebra is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free @@ -19,7 +16,10 @@ along with this program; if not, write to the Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ - + +#if HAVE_CONFIG_H +#include +#endif #include #ifdef WIN32 #include @@ -36,8 +36,6 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA #define KEY_SIZE (1+sizeof(struct it_key)) #define INP_NAME_MAX 768 -#define INP_BUF_START 60000 -#define INP_BUF_ADD 400000 struct key_file { int no; /* file no */ @@ -55,7 +53,12 @@ struct key_file { Res res; }; -#if 0 + +#define PR_KEY_LOW 0 +#define PR_KEY_TOP 0 + +#if PR_KEY_LOW || PR_KEY_TOP + static void pkey(const char *b, int mode) { key_logdump_txt(YLOG_LOG, b, mode ? "i" : "d"); @@ -66,7 +69,7 @@ static void pkey(const char *b, int mode) void getFnameTmp(Res res, char *fname, int no) { const char *pre; - + pre = res_get_def(res, "keyTmpDir", "."); sprintf(fname, "%s/key%d.tmp", pre, no); } @@ -74,7 +77,7 @@ void getFnameTmp(Res res, char *fname, int no) void extract_get_fname_tmp(ZebraHandle zh, char *fname, int no) { const char *pre; - + pre = res_get_def(zh->res, "keyTmpDir", "."); sprintf(fname, "%s/key%d.tmp", pre, no); } @@ -190,7 +193,7 @@ int key_file_read(struct key_file *f, char *key) key[i++] = c; while ((c = key_file_getc(f))) { - if (i < IT_MAX_WORD) + if (i < INP_NAME_MAX-2) key[i++] = c; } key[i++] = '\0'; @@ -228,7 +231,6 @@ struct heap_info { int (*cmp)(const void *p1, const void *p2); struct zebra_register *reg; ZebraHandle zh; - int raw_reading; /* 1=raw /mem read. 0=file reading */ zint no_diffs; zint no_updates; zint no_deletions; @@ -244,7 +246,6 @@ static struct heap_info *key_heap_malloc(void) hi->info.buf = 0; hi->heapnum = 0; hi->ptr = 0; - hi->raw_reading = 0; hi->no_diffs = 0; hi->no_diffs = 0; hi->no_updates = 0; @@ -276,23 +277,11 @@ struct heap_info *key_heap_init_file(ZebraHandle zh, return hi; } -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->raw_reading = 1; - return hi; -} - void key_heap_destroy(struct heap_info *hi, int nkeys) { int i; - if (!hi->raw_reading) - for (i = 0; i<=nkeys; i++) - xfree(hi->info.buf[i]); - + for (i = 0; i<=nkeys; i++) + xfree(hi->info.buf[i]); xfree(hi->info.buf); xfree(hi->ptr); xfree(hi->info.file); @@ -324,7 +313,7 @@ static void key_heap_delete(struct heap_info *hi) child++; if ((*hi->cmp)(&hi->info.buf[hi->ptr[cur]], &hi->info.buf[hi->ptr[child]]) > 0) - { + { key_heap_swap(hi, cur, child); cur = child; child = 2*cur; @@ -339,6 +328,8 @@ static void key_heap_insert(struct heap_info *hi, const char *buf, int nbytes, { int cur, parent; + assert(nbytes < INP_NAME_MAX); + cur = ++(hi->heapnum); memcpy(hi->info.buf[hi->ptr[cur]], buf, nbytes); hi->info.file[hi->ptr[cur]] = kf; @@ -373,13 +364,11 @@ static int heap_read_one(struct heap_info *hi, char *name, char *key) return 1; } -#define PR_KEY_LOW 0 -#define PR_KEY_TOP 0 /* for debugging only */ void zebra_log_dict_entry(ZebraHandle zh, const char *s) { - char dst[IT_MAX_WORD+1]; + char dst[INP_NAME_MAX+1]; int ord; int len = key_SU_decode(&ord, (const unsigned char *) s); const char *index_type; @@ -434,7 +423,7 @@ int heap_cread_item2(void *vp, char **dst, int *insertMode) p->look_level++; } memcpy(*dst, p->key_1, p->sz_1); -#if 0 +#if PR_KEY_TOP yaz_log(YLOG_LOG, "DUP level=%d", p->look_level); pkey(*dst, *insertMode); #endif @@ -509,13 +498,14 @@ int heap_cread_item2(void *vp, char **dst, int *insertMode) } p->look_level = level; memcpy(*dst, p->key_1, p->sz_1); -#if 0 +#if PR_KEY_TOP + yaz_log(YLOG_LOG, "TOP"); pkey(*dst, *insertMode); #endif (*dst) += p->sz_1; return 1; } - + int heap_cread_item(void *vp, char **dst, int *insertMode) { struct heap_cread_info *p = (struct heap_cread_info *) vp; @@ -578,14 +568,14 @@ int heap_inpc(struct heap_cread_info *hci, struct heap_info *hi) if (!dict_delete(hi->reg->dict, this_name)) abort(); } - else + else { hi->no_updates++; if (isamc_p2 != isamc_p) dict_insert(hi->reg->dict, this_name, sizeof(ISAM_P), &isamc_p2); } - } + } else { isamc_p = 0; @@ -598,27 +588,7 @@ int heap_inpc(struct heap_cread_info *hci, struct heap_info *hi) } xfree(isamc_i); return 0; -} - -int heap_inp0(struct heap_cread_info *hci, struct heap_info *hi) -{ - while (hci->more) - { - 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)) - ; - } - return 0; -} - +} int heap_inpb(struct heap_cread_info *hci, struct heap_info *hi) { @@ -652,14 +622,14 @@ int heap_inpb(struct heap_cread_info *hci, struct heap_info *hi) if (!dict_delete(hi->reg->dict, this_name)) abort(); } - else + else { hi->no_updates++; if (isamc_p2 != isamc_p) dict_insert(hi->reg->dict, this_name, sizeof(ISAM_P), &isamc_p2); } - } + } else { isamc_p = 0; @@ -672,7 +642,7 @@ int heap_inpb(struct heap_cread_info *hci, struct heap_info *hi) } xfree(isamc_i); return 0; -} +} int heap_inps(struct heap_cread_info *hci, struct heap_info *hi) { @@ -704,7 +674,7 @@ int heap_inps(struct heap_cread_info *hci, struct heap_info *hi) } xfree(isams_i); return 0; -} +} struct progressInfo { time_t startTime; @@ -752,7 +722,7 @@ void zebra_index_merge(ZebraHandle zh) if (nkeys == 0) return; - + if (nkeys < 0) { char fname[1024]; @@ -782,7 +752,7 @@ void zebra_index_merge(ZebraHandle zh) } hi = key_heap_init_file(zh, nkeys, key_qsort_compare); hi->reg = zh->reg; - + for (i = 1; i<=nkeys; i++) if ((r = key_file_read(kf[i], rbuf))) key_heap_insert(hi, rbuf, r, kf[i]); @@ -790,7 +760,7 @@ void zebra_index_merge(ZebraHandle zh) 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); @@ -798,20 +768,20 @@ void zebra_index_merge(ZebraHandle zh) hci.first_in_list = 1; hci.hi = hi; hci.look_level = 0; - hci.more = heap_read_one(hi, hci.cur_name, hci.key); - + 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); } - + for (i = 1; i<=nkeys; i++) { extract_get_fname_tmp (zh, rbuf, i); @@ -822,7 +792,7 @@ void zebra_index_merge(ZebraHandle zh) xfree(kf); if (hi->no_iterations) { /* do not log if nothing happened */ - yaz_log(YLOG_LOG, "Iterations: isam/dict " + yaz_log(YLOG_LOG, "Iterations: isam/dict " ZINT_FORMAT "/" ZINT_FORMAT, hi->no_iterations, hi->no_diffs); yaz_log(YLOG_LOG, "Dict: inserts/updates/deletions: " @@ -835,6 +805,7 @@ void zebra_index_merge(ZebraHandle zh) /* * Local variables: * c-basic-offset: 4 + * c-file-style: "Stroustrup" * indent-tabs-mode: nil * End: * vim: shiftwidth=4 tabstop=8 expandtab