X-Git-Url: http://git.indexdata.com/?p=idzebra-moved-to-github.git;a=blobdiff_plain;f=index%2Fkinput.c;h=4d261813b46e4f3b331f84e7665d98cb2c1f860b;hp=5fe9733371fbb44174c69c4cdb1fcf0bf6e5ffac;hb=f3f20a205132c39c9434b10086422c6b49b47faf;hpb=a3f58753865d355c9dbb283d0ac8f67956d8a1f9 diff --git a/index/kinput.c b/index/kinput.c index 5fe9733..4d26181 100644 --- a/index/kinput.c +++ b/index/kinput.c @@ -1,8 +1,5 @@ -/* $Id: kinput.c,v 1.83 2007-02-06 09:32:50 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"); @@ -63,28 +66,28 @@ static void pkey(const char *b, int mode) #endif -void getFnameTmp (Res res, char *fname, int no) +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); + + pre = res_get_def(res, "keyTmpDir", "."); + sprintf(fname, "%s/key%d.tmp", pre, no); } -void extract_get_fname_tmp (ZebraHandle zh, 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); + + pre = res_get_def(zh->res, "keyTmpDir", "."); + sprintf(fname, "%s/key%d.tmp", pre, no); } -void key_file_chunk_read (struct key_file *f) +void key_file_chunk_read(struct key_file *f) { int nr = 0, r = 0, fd; char fname[1024]; - getFnameTmp (f->res, fname, f->no); - fd = open (fname, O_BINARY|O_RDONLY); + getFnameTmp(f->res, fname, f->no); + fd = open(fname, O_BINARY|O_RDONLY); f->buf_ptr = 0; f->buf_size = 0; @@ -95,14 +98,14 @@ void key_file_chunk_read (struct key_file *f) } if (!f->length) { - if ((f->length = lseek (fd, 0L, SEEK_END)) == (off_t) -1) + if ((f->length = lseek(fd, 0L, SEEK_END)) == (off_t) -1) { yaz_log(YLOG_WARN|YLOG_ERRNO, "cannot seek %s", fname); - close (fd); + close(fd); return ; } } - if (lseek (fd, f->offset, SEEK_SET) == -1) + if (lseek(fd, f->offset, SEEK_SET) == -1) { yaz_log(YLOG_WARN|YLOG_ERRNO, "cannot seek %s", fname); close(fd); @@ -110,7 +113,7 @@ void key_file_chunk_read (struct key_file *f) } while (f->chunk - nr > 0) { - r = read (fd, f->buf + nr, f->chunk - nr); + r = read(fd, f->buf + nr, f->chunk - nr); if (r <= 0) break; nr += r; @@ -118,28 +121,28 @@ void key_file_chunk_read (struct key_file *f) if (r == -1) { yaz_log(YLOG_WARN|YLOG_ERRNO, "read of %s", fname); - close (fd); + close(fd); return; } f->buf_size = nr; if (f->readHandler) (*f->readHandler)(f, f->readInfo); - close (fd); + close(fd); } -void key_file_destroy (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); + xfree(f->buf); + xfree(f->prev_name); + xfree(f); } -struct key_file *key_file_init (int no, int chunk, Res res) +struct key_file *key_file_init(int no, int chunk, Res res) { struct key_file *f; - f = (struct key_file *) xmalloc (sizeof(*f)); + f = (struct key_file *) xmalloc(sizeof(*f)); f->res = res; f->decode_handle = iscz1_start(); f->no = no; @@ -147,28 +150,28 @@ struct key_file *key_file_init (int no, int chunk, Res res) f->offset = 0; f->length = 0; f->readHandler = NULL; - f->buf = (unsigned char *) xmalloc (f->chunk); - f->prev_name = (char *) xmalloc (INP_NAME_MAX); + f->buf = (unsigned char *) xmalloc(f->chunk); + f->prev_name = (char *) xmalloc(INP_NAME_MAX); *f->prev_name = '\0'; - key_file_chunk_read (f); + key_file_chunk_read(f); return f; } -int key_file_getc (struct key_file *f) +int key_file_getc(struct key_file *f) { if (f->buf_ptr < f->buf_size) return f->buf[(f->buf_ptr)++]; if (f->buf_size < f->chunk) return EOF; f->offset += f->buf_size; - key_file_chunk_read (f); + key_file_chunk_read(f); if (f->buf_ptr < f->buf_size) return f->buf[(f->buf_ptr)++]; else return EOF; } -int key_file_read (struct key_file *f, char *key) +int key_file_read(struct key_file *f, char *key) { int i, c; char srcbuf[128]; @@ -176,11 +179,11 @@ int key_file_read (struct key_file *f, char *key) char *dst; int j; - c = key_file_getc (f); + c = key_file_getc(f); if (c == 0) { - strcpy (key, f->prev_name); - i = 1+strlen (key); + strcpy(key, f->prev_name); + i = 1+strlen(key); } else if (c == EOF) return 0; @@ -188,9 +191,13 @@ int key_file_read (struct key_file *f, char *key) { i = 0; key[i++] = c; - while ((key[i++] = key_file_getc (f))) - ; - strcpy (f->prev_name, key); + while ((c = key_file_getc(f))) + { + if (i < INP_NAME_MAX-2) + key[i++] = c; + } + key[i++] = '\0'; + strcpy(f->prev_name, key); iscz1_reset(f->decode_handle); } c = key_file_getc(f); /* length + insert/delete combined */ @@ -224,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; @@ -235,12 +241,11 @@ struct heap_info { static struct heap_info *key_heap_malloc(void) { /* malloc and clear it */ struct heap_info *hi; - hi = (struct heap_info *) xmalloc (sizeof(*hi)); + hi = (struct heap_info *) xmalloc(sizeof(*hi)); hi->info.file = 0; 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; @@ -260,42 +265,30 @@ struct heap_info *key_heap_init_file(ZebraHandle zh, 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)); - hi->ptr = (int *) xmalloc (sizeof(*hi->ptr) * (1+nkeys)); + xmalloc(sizeof(*hi->info.file) * (1+nkeys)); + hi->info.buf = (char **) xmalloc(sizeof(*hi->info.buf) * (1+nkeys)); + hi->ptr = (int *) xmalloc(sizeof(*hi->ptr) * (1+nkeys)); hi->cmp = cmp; for (i = 0; i<= nkeys; i++) { hi->ptr[i] = i; - hi->info.buf[i] = (char *) xmalloc (INP_NAME_MAX); + hi->info.buf[i] = (char *) xmalloc(INP_NAME_MAX); } 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) +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]); - - xfree (hi->info.buf); - xfree (hi->ptr); - xfree (hi->info.file); - xfree (hi); + for (i = 0; i<=nkeys; i++) + xfree(hi->info.buf[i]); + xfree(hi->info.buf); + xfree(hi->ptr); + xfree(hi->info.file); + xfree(hi); } -static void key_heap_swap (struct heap_info *hi, int i1, int i2) +static void key_heap_swap(struct heap_info *hi, int i1, int i2) { int swap; @@ -305,13 +298,13 @@ static void key_heap_swap (struct heap_info *hi, int i1, int i2) } -static void key_heap_delete (struct heap_info *hi) +static void key_heap_delete(struct heap_info *hi) { int cur = 1, child = 2; - assert (hi->heapnum > 0); + assert(hi->heapnum > 0); - key_heap_swap (hi, 1, hi->heapnum); + key_heap_swap(hi, 1, hi->heapnum); hi->heapnum--; while (child <= hi->heapnum) { if (child < hi->heapnum && @@ -320,8 +313,8 @@ 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); + { + key_heap_swap(hi, cur, child); cur = child; child = 2*cur; } @@ -330,26 +323,28 @@ static void key_heap_delete (struct heap_info *hi) } } -static void key_heap_insert (struct heap_info *hi, const char *buf, int nbytes, +static void key_heap_insert(struct heap_info *hi, const char *buf, int nbytes, struct key_file *kf) { int cur, parent; + assert(nbytes < INP_NAME_MAX); + cur = ++(hi->heapnum); - memcpy (hi->info.buf[hi->ptr[cur]], buf, nbytes); + memcpy(hi->info.buf[hi->ptr[cur]], buf, nbytes); hi->info.file[hi->ptr[cur]] = kf; parent = cur/2; while (parent && (*hi->cmp)(&hi->info.buf[hi->ptr[parent]], &hi->info.buf[hi->ptr[cur]]) > 0) { - key_heap_swap (hi, cur, parent); + key_heap_swap(hi, cur, parent); cur = parent; parent = cur/2; } } -static int heap_read_one (struct heap_info *hi, char *name, char *key) +static int heap_read_one(struct heap_info *hi, char *name, char *key) { int n, r; char rbuf[INP_NAME_MAX]; @@ -358,27 +353,25 @@ static int heap_read_one (struct heap_info *hi, char *name, char *key) if (!hi->heapnum) return 0; n = hi->ptr[1]; - strcpy (name, hi->info.buf[n]); + strcpy(name, hi->info.buf[n]); kf = hi->info.file[n]; r = strlen(name); - memcpy (key, hi->info.buf[n] + r+1, KEY_SIZE); - key_heap_delete (hi); - if ((r = key_file_read (kf, rbuf))) - key_heap_insert (hi, rbuf, r, kf); + memcpy(key, hi->info.buf[n] + r+1, KEY_SIZE); + key_heap_delete(hi); + if ((r = key_file_read(kf, rbuf))) + key_heap_insert(hi, rbuf, r, kf); hi->no_iterations++; 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); - int index_type; + const char *index_type; if (!zh) yaz_log(YLOG_LOG, "ord=%d", ord); @@ -391,7 +384,7 @@ void zebra_log_dict_entry(ZebraHandle zh, const char *s) zebra_term_untrans(zh, index_type, dst, s + len); - yaz_log(YLOG_LOG, "ord=%d index_type=%c index=%s term=%s", + yaz_log(YLOG_LOG, "ord=%d index_type=%s index=%s term=%s", ord, index_type, string_index, dst); } } @@ -410,7 +403,7 @@ struct heap_cread_info { int look_level; }; -static int heap_cread_item (void *vp, char **dst, int *insertMode); +static int heap_cread_item(void *vp, char **dst, int *insertMode); int heap_cread_item2(void *vp, char **dst, int *insertMode) { @@ -429,8 +422,8 @@ int heap_cread_item2(void *vp, char **dst, int *insertMode) *insertMode = 0; p->look_level++; } - memcpy (*dst, p->key_1, p->sz_1); -#if 0 + memcpy(*dst, p->key_1, p->sz_1); +#if PR_KEY_TOP yaz_log(YLOG_LOG, "DUP level=%d", p->look_level); pkey(*dst, *insertMode); #endif @@ -452,7 +445,7 @@ int heap_cread_item2(void *vp, char **dst, int *insertMode) { /* lookahead in 2 . Now in 1. */ p->sz_1 = p->sz_2; p->mode_1 = p->mode_2; - memcpy (p->key_1, p->key_2, p->sz_2); + memcpy(p->key_1, p->key_2, p->sz_2); } if (p->mode_1) level = 1; /* insert */ @@ -485,7 +478,7 @@ int heap_cread_item2(void *vp, char **dst, int *insertMode) /* all the same. new round .. */ p->sz_1 = p->sz_2; p->mode_1 = p->mode_2; - memcpy (p->key_1, p->key_2, p->sz_1); + memcpy(p->key_1, p->key_2, p->sz_1); if (p->mode_1) level = 1; /* insert */ else @@ -504,15 +497,16 @@ int heap_cread_item2(void *vp, char **dst, int *insertMode) level++; } p->look_level = level; - memcpy (*dst, p->key_1, p->sz_1); -#if 0 + memcpy(*dst, p->key_1, p->sz_1); +#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) + +int heap_cread_item(void *vp, char **dst, int *insertMode) { struct heap_cread_info *p = (struct heap_cread_info *) vp; struct heap_info *hi = p->hi; @@ -520,7 +514,7 @@ int heap_cread_item (void *vp, char **dst, int *insertMode) if (p->first_in_list) { *insertMode = p->key[0]; - memcpy (*dst, p->key+1, sizeof(struct it_key)); + memcpy(*dst, p->key+1, sizeof(struct it_key)); #if PR_KEY_LOW zebra_log_dict_entry(hi->zh, p->cur_name); pkey(*dst, *insertMode); @@ -529,16 +523,16 @@ int heap_cread_item (void *vp, char **dst, int *insertMode) p->first_in_list = 0; return 1; } - strcpy (p->prev_name, p->cur_name); - if (!(p->more = heap_read_one (hi, p->cur_name, p->key))) + strcpy(p->prev_name, p->cur_name); + if (!(p->more = heap_read_one(hi, p->cur_name, p->key))) return 0; - if (*p->cur_name && strcmp (p->cur_name, p->prev_name)) + if (*p->cur_name && strcmp(p->cur_name, p->prev_name)) { p->first_in_list = 1; return 0; } *insertMode = p->key[0]; - memcpy (*dst, p->key+1, sizeof(struct it_key)); + memcpy(*dst, p->key+1, sizeof(struct it_key)); #if PR_KEY_LOW zebra_log_dict_entry(hi->zh, p->cur_name); pkey(*dst, *insertMode); @@ -547,9 +541,9 @@ int heap_cread_item (void *vp, char **dst, int *insertMode) return 1; } -int heap_inpc (struct heap_cread_info *hci, struct heap_info *hi) +int heap_inpc(struct heap_cread_info *hci, struct heap_info *hi) { - ISAMC_I *isamc_i = (ISAMC_I *) xmalloc (sizeof(*isamc_i)); + ISAMC_I *isamc_i = (ISAMC_I *) xmalloc(sizeof(*isamc_i)); isamc_i->clientData = hci; isamc_i->read_item = heap_cread_item2; @@ -560,65 +554,45 @@ int heap_inpc (struct heap_cread_info *hci, struct heap_info *hi) ISAM_P isamc_p, isamc_p2; char *dict_info; - strcpy (this_name, hci->cur_name); - assert (hci->cur_name[0]); + 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(ISAM_P)); + memcpy(&isamc_p, dict_info+1, sizeof(ISAM_P)); isamc_p2 = isamc_p; - isamc_merge (hi->reg->isamc, &isamc_p2, isamc_i); + isamc_merge(hi->reg->isamc, &isamc_p2, isamc_i); if (!isamc_p2) { hi->no_deletions++; - if (!dict_delete (hi->reg->dict, this_name)) + 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, + dict_insert(hi->reg->dict, this_name, sizeof(ISAM_P), &isamc_p2); } - } + } else { isamc_p = 0; - isamc_merge (hi->reg->isamc, &isamc_p, isamc_i); + isamc_merge(hi->reg->isamc, &isamc_p, isamc_i); hi->no_insertions++; if (isamc_p) - dict_insert (hi->reg->dict, this_name, + dict_insert(hi->reg->dict, this_name, sizeof(ISAM_P), &isamc_p); } } - 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)) - ; - } + xfree(isamc_i); return 0; -} - +} int heap_inpb(struct heap_cread_info *hci, struct heap_info *hi) { - ISAMC_I *isamc_i = (ISAMC_I *) xmalloc (sizeof(*isamc_i)); + ISAMC_I *isamc_i = (ISAMC_I *) xmalloc(sizeof(*isamc_i)); isamc_i->clientData = hci; isamc_i->read_item = heap_cread_item2; @@ -629,50 +603,50 @@ int heap_inpb(struct heap_cread_info *hci, struct heap_info *hi) ISAM_P isamc_p, isamc_p2; char *dict_info; - strcpy (this_name, hci->cur_name); - assert (hci->cur_name[0]); + strcpy(this_name, hci->cur_name); + assert(hci->cur_name[0]); hi->no_diffs++; #if 0 assert(hi->zh); zebra_log_dict_entry(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(ISAM_P)); + memcpy(&isamc_p, dict_info+1, sizeof(ISAM_P)); isamc_p2 = isamc_p; - isamb_merge (hi->reg->isamb, &isamc_p2, isamc_i); + isamb_merge(hi->reg->isamb, &isamc_p2, isamc_i); if (!isamc_p2) { hi->no_deletions++; - if (!dict_delete (hi->reg->dict, this_name)) + 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, + dict_insert(hi->reg->dict, this_name, sizeof(ISAM_P), &isamc_p2); } - } + } else { isamc_p = 0; - isamb_merge (hi->reg->isamb, &isamc_p, isamc_i); + isamb_merge(hi->reg->isamb, &isamc_p, isamc_i); hi->no_insertions++; if (isamc_p) - dict_insert (hi->reg->dict, this_name, + dict_insert(hi->reg->dict, this_name, sizeof(ISAM_P), &isamc_p); } } xfree(isamc_i); return 0; -} +} -int heap_inps (struct heap_cread_info *hci, struct heap_info *hi) +int heap_inps(struct heap_cread_info *hci, struct heap_info *hi) { - ISAMS_I isams_i = (ISAMS_I) xmalloc (sizeof(*isams_i)); + ISAMS_I isams_i = (ISAMS_I) xmalloc(sizeof(*isams_i)); isams_i->clientData = hci; isams_i->read_item = heap_cread_item; @@ -683,14 +657,14 @@ int heap_inps (struct heap_cread_info *hci, struct heap_info *hi) ISAM_P isams_p; char *dict_info; - strcpy (this_name, hci->cur_name); - assert (hci->cur_name[0]); + 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); + isams_p = isams_merge(hi->reg->isams, isams_i); hi->no_insertions++; - dict_insert (hi->reg->dict, this_name, sizeof(ISAM_P), &isams_p); + dict_insert(hi->reg->dict, this_name, sizeof(ISAM_P), &isams_p); } else { @@ -698,9 +672,9 @@ int heap_inps (struct heap_cread_info *hci, struct heap_info *hi) break; } } - xfree (isams_i); + xfree(isams_i); return 0; -} +} struct progressInfo { time_t startTime; @@ -709,7 +683,7 @@ struct progressInfo { off_t totalOffset; }; -void progressFunc (struct key_file *keyp, void *info) +void progressFunc(struct key_file *keyp, void *info) { struct progressInfo *p = (struct progressInfo *) info; time_t now, remaining; @@ -737,7 +711,7 @@ void progressFunc (struct key_file *keyp, void *info) #define R_OK 4 #endif -void zebra_index_merge (ZebraHandle zh) +void zebra_index_merge(ZebraHandle zh) { struct key_file **kf = 0; char rbuf[1024]; @@ -748,29 +722,29 @@ void zebra_index_merge (ZebraHandle zh) if (nkeys == 0) return; - + if (nkeys < 0) { char fname[1024]; nkeys = 0; while (1) { - extract_get_fname_tmp (zh, fname, nkeys+1); - if (access (fname, R_OK) == -1) + extract_get_fname_tmp (zh, fname, nkeys+1); + if (access(fname, R_OK) == -1) break; nkeys++; } if (!nkeys) return ; } - kf = (struct key_file **) xmalloc ((1+nkeys) * sizeof(*kf)); + kf = (struct key_file **) xmalloc((1+nkeys) * sizeof(*kf)); progressInfo.totalBytes = 0; progressInfo.totalOffset = 0; - time (&progressInfo.startTime); - time (&progressInfo.lastTime); + time(&progressInfo.startTime); + time(&progressInfo.lastTime); for (i = 1; i<=nkeys; i++) { - kf[i] = key_file_init (i, 8192, zh->res); + kf[i] = key_file_init(i, 8192, zh->res); kf[i]->readHandler = progressFunc; kf[i]->readInfo = &progressInfo; progressInfo.totalBytes += kf[i]->length; @@ -778,47 +752,47 @@ 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]); + if ((r = key_file_read(kf[i], rbuf))) + key_heap_insert(hi, rbuf, r, kf[i]); 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.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); - + 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); + + xfree(hci.key); + xfree(hci.key_1); + xfree(hci.key_2); } - + for (i = 1; i<=nkeys; i++) { - extract_get_fname_tmp (zh, rbuf, i); - unlink (rbuf); + extract_get_fname_tmp (zh, rbuf, i); + unlink(rbuf); } for (i = 1; i<=nkeys; i++) - key_file_destroy (kf[i]); - xfree (kf); + key_file_destroy(kf[i]); + 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: " @@ -831,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