-/*
- * Copyright (C) 1994-1996, Index Data I/S
- * All rights reserved.
- * Sebastian Hammer, Adam Dickmeiss
- *
- * $Log: kinput.c,v $
- * Revision 1.24 1997-09-09 13:38:07 adam
- * Partial port to WIN95/NT.
- *
- * Revision 1.23 1997/09/04 13:57:39 adam
- * Added O_BINARY for open calls.
- *
- * Revision 1.22 1997/02/12 20:39:45 adam
- * Implemented options -f <n> that limits the log to the first <n>
- * records.
- * Changed some log messages also.
- *
- * Revision 1.21 1996/11/08 11:10:23 adam
- * Buffers used during file match got bigger.
- * Compressed ISAM support everywhere.
- * Bug fixes regarding masking characters in queries.
- * Redesigned Regexp-2 queries.
- *
- * Revision 1.20 1996/11/01 08:58:41 adam
- * Interface to isamc system now includes update and delete.
- *
- * Revision 1.19 1996/10/29 14:09:46 adam
- * Use of cisam system - enabled if setting isamc is 1.
- *
- * Revision 1.18 1996/06/04 10:18:59 adam
- * Minor changes - removed include of ctype.h.
- *
- * Revision 1.17 1996/05/14 15:47:07 adam
- * Cleanup of various buffer size entities.
- *
- * Revision 1.16 1996/04/09 10:05:20 adam
- * Bug fix: prev_name buffer possibly too small; allocated in key_file_init.
- *
- * Revision 1.15 1996/03/21 14:50:09 adam
- * File update uses modify-time instead of change-time.
- *
- * Revision 1.14 1996/02/07 14:06:37 adam
- * Better progress report during register merge.
- * New command: clean - removes temporary shadow files.
- *
- * Revision 1.13 1996/02/05 12:30:00 adam
- * Logging reduced a bit.
- * The remaining running time is estimated during register merge.
- *
- * Revision 1.12 1995/12/06 17:49:19 adam
- * Uses dict_delete now.
- *
- * Revision 1.11 1995/12/06 16:06:43 adam
- * Better diagnostics. Work on 'real' dictionary deletion.
- *
- * Revision 1.10 1995/12/06 12:41:22 adam
- * New command 'stat' for the index program.
- * Filenames can be read from stdin by specifying '-'.
- * Bug fix/enhancement of the transformation from terms to regular
- * expressons in the search engine.
- *
- * Revision 1.9 1995/10/10 12:24:39 adam
- * Temporary sort files are compressed.
- *
- * Revision 1.8 1995/10/04 16:57:19 adam
- * Key input and merge sort in one pass.
- *
- * Revision 1.7 1995/10/02 15:18:52 adam
- * New member in recRetrieveCtrl: diagnostic.
- *
- * Revision 1.6 1995/09/29 15:51:56 adam
- * First work on multi-way read.
- *
- * Revision 1.5 1995/09/29 14:01:43 adam
- * Bug fixes.
- *
- * Revision 1.4 1995/09/28 14:22:57 adam
- * Sort uses smaller temporary files.
- *
- * Revision 1.3 1995/09/06 16:11:17 adam
- * Option: only one word key per file.
- *
- * Revision 1.2 1995/09/04 12:33:42 adam
- * Various cleanup. YAZ util used instead.
- *
- * Revision 1.1 1995/09/04 09:10:37 adam
- * More work on index add/del/update.
- * Merge sort implemented.
- * Initial work on z39 server.
- *
- */
+/* $Id: kinput.c,v 1.53 2002-08-05 19:46:01 adam Exp $
+ Copyright (C) 1995,1996,1997,1998,1999,2000,2001,2002
+ Index Data Aps
+This file is part of the Zebra server.
+
+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
+Software Foundation; either version 2, or (at your option) any later
+version.
+
+Zebra is distributed in the hope that it will be useful, but WITHOUT ANY
+WARRANTY; without even the implied warranty of MERCHANTABILITY or
+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.
+*/
+
+
+
#include <fcntl.h>
-#ifdef WINDOWS
+#ifdef WIN32
#include <io.h>
#else
#include <unistd.h>
#define INP_BUF_START 60000
#define INP_BUF_ADD 400000
-static int no_diffs = 0;
-static int no_updates = 0;
-static int no_deletions = 0;
-static int no_insertions = 0;
-static int no_iterations = 0;
struct key_file {
int no; /* file no */
/* handler invoked in each read */
void (*readHandler)(struct key_file *keyp, void *rinfo);
void *readInfo;
+ Res res;
};
-void getFnameTmp (char *fname, int no)
+void getFnameTmp (Res res, char *fname, int no)
{
const char *pre;
- pre = res_get_def (common_resource, "keyTmpDir", ".");
+ 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)
+{
+ const char *pre;
+
+ pre = res_get_def (zh->res, "keyTmpDir", ".");
sprintf (fname, "%s/key%d.tmp", pre, no);
}
void key_file_chunk_read (struct key_file *f)
{
- int nr = 0, r, fd;
+ int nr = 0, r = 0, fd;
char fname[1024];
- getFnameTmp (fname, f->no);
+ getFnameTmp (f->res, fname, f->no);
fd = open (fname, O_BINARY|O_RDONLY);
+
+ f->buf_ptr = 0;
+ f->buf_size = 0;
if (fd == -1)
{
- logf (LOG_FATAL|LOG_ERRNO, "cannot open %s", fname);
- exit (1);
+ logf (LOG_WARN|LOG_ERRNO, "cannot open %s", fname);
+ return ;
}
if (!f->length)
{
if ((f->length = lseek (fd, 0L, SEEK_END)) == (off_t) -1)
{
- logf (LOG_FATAL|LOG_ERRNO, "cannot seek %s", fname);
- exit (1);
+ logf (LOG_WARN|LOG_ERRNO, "cannot seek %s", fname);
+ close (fd);
+ return ;
}
}
if (lseek (fd, f->offset, SEEK_SET) == -1)
{
- logf (LOG_FATAL|LOG_ERRNO, "cannot seek %s", fname);
- exit (1);
+ logf (LOG_WARN|LOG_ERRNO, "cannot seek %s", fname);
+ close(fd);
+ return ;
}
while (f->chunk - nr > 0)
{
}
if (r == -1)
{
- logf (LOG_FATAL|LOG_ERRNO, "read of %s", fname);
- exit (1);
+ logf (LOG_WARN|LOG_ERRNO, "read of %s", fname);
+ close (fd);
+ return;
}
f->buf_size = nr;
- f->buf_ptr = 0;
if (f->readHandler)
(*f->readHandler)(f, f->readInfo);
close (fd);
}
-struct key_file *key_file_init (int no, int chunk)
+void key_file_destroy (struct key_file *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 *f;
- f = xmalloc (sizeof(*f));
+ f = (struct key_file *) xmalloc (sizeof(*f));
+ f->res = res;
f->sysno = 0;
f->seqno = 0;
f->no = no;
f->offset = 0;
f->length = 0;
f->readHandler = NULL;
- f->buf = xmalloc (f->chunk);
- f->prev_name = 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);
return f;
int heapnum;
int *ptr;
int (*cmp)(const void *p1, const void *p2);
- Dict dict;
- ISAM isam;
- ISAMC isamc;
+ struct zebra_register *reg;
+
+ int no_diffs;
+ int no_updates;
+ int no_deletions;
+ int no_insertions;
+ int no_iterations;
};
struct heap_info *key_heap_init (int nkeys,
struct heap_info *hi;
int i;
- hi = xmalloc (sizeof(*hi));
- hi->info.file = xmalloc (sizeof(*hi->info.file) * (1+nkeys));
- hi->info.buf = xmalloc (sizeof(*hi->info.buf) * (1+nkeys));
+ hi = (struct heap_info *) xmalloc (sizeof(*hi));
+ 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->heapnum = 0;
- hi->ptr = xmalloc (sizeof(*hi->ptr) * (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] = xmalloc (INP_NAME_MAX);
+ hi->info.buf[i] = (char *) xmalloc (INP_NAME_MAX);
}
+ hi->no_diffs = 0;
+ hi->no_diffs = 0;
+ hi->no_updates = 0;
+ hi->no_deletions = 0;
+ hi->no_insertions = 0;
+ hi->no_iterations = 0;
return hi;
}
+void key_heap_destroy (struct heap_info *hi, int nkeys)
+{
+ int i;
+ yaz_log (LOG_DEBUG, "key_heap_destroy");
+ 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)
{
int swap;
key_heap_delete (hi);
if ((r = key_file_read (kf, rbuf)))
key_heap_insert (hi, rbuf, r, kf);
- no_iterations++;
+ hi->no_iterations++;
return 1;
}
int heap_cread_item (void *vp, char **dst, int *insertMode)
{
- struct heap_cread_info *p = vp;
+ struct heap_cread_info *p = (struct heap_cread_info *) vp;
struct heap_info *hi = p->hi;
if (p->mode == 1)
int heap_inpc (struct heap_info *hi)
{
struct heap_cread_info hci;
- ISAMC_I isamc_i = xmalloc (sizeof(*isamc_i));
+ ISAMC_I isamc_i = (ISAMC_I) xmalloc (sizeof(*isamc_i));
+
+ hci.key = (char *) xmalloc (KEY_SIZE);
+ hci.mode = 1;
+ hci.hi = hi;
+ hci.more = heap_read_one (hi, hci.cur_name, hci.key);
+
+ isamc_i->clientData = &hci;
+ isamc_i->read_item = heap_cread_item;
+
+ while (hci.more)
+ {
+ char this_name[INP_NAME_MAX];
+ ISAMC_P isamc_p, isamc_p2;
+ char *dict_info;
+
+ strcpy (this_name, hci.cur_name);
+ assert (hci.cur_name[1]);
+ hi->no_diffs++;
+ 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);
+ if (!isamc_p2)
+ {
+ hi->no_deletions++;
+ if (!dict_delete (hi->reg->dict, this_name))
+ abort();
+ }
+ else
+ {
+ hi->no_updates++;
+ if (isamc_p2 != isamc_p)
+ dict_insert (hi->reg->dict, this_name,
+ sizeof(ISAMC_P), &isamc_p2);
+ }
+ }
+ else
+ {
+ isamc_p = isc_merge (hi->reg->isamc, 0, isamc_i);
+ hi->no_insertions++;
+ dict_insert (hi->reg->dict, this_name, sizeof(ISAMC_P), &isamc_p);
+ }
+ }
+ xfree (isamc_i);
+ xfree (hci.key);
+ return 0;
+}
+
+/* for debugging only */
+static void print_dict_item (ZebraMaps zm, const char *s)
+{
+ int reg_type = s[1];
+ char keybuf[IT_MAX_WORD+1];
+ char *to = keybuf;
+ const char *from = s + 2;
+
+ while (*from)
+ {
+ const char *res = zebra_maps_output (zm, reg_type, &from);
+ if (!res)
+ *to++ = *from++;
+ else
+ while (*res)
+ *to++ = *res++;
+ }
+ *to = '\0';
+ yaz_log (LOG_LOG, "%s", keybuf);
+}
+
+int heap_inpb (struct heap_info *hi)
+{
+ struct heap_cread_info hci;
+ ISAMC_I isamc_i = (ISAMC_I) xmalloc (sizeof(*isamc_i));
- hci.key = xmalloc (KEY_SIZE);
+ hci.key = (char *) xmalloc (KEY_SIZE);
hci.mode = 1;
hci.hi = hi;
hci.more = heap_read_one (hi, hci.cur_name, hci.key);
char *dict_info;
strcpy (this_name, hci.cur_name);
- logf (LOG_DEBUG, "inserting %s", 1+hci.cur_name);
- no_diffs++;
- if ((dict_info = dict_lookup (hi->dict, hci.cur_name)))
+ assert (hci.cur_name[1]);
+ hi->no_diffs++;
+
+#if 0
+ print_dict_item (hi->reg->zebra_maps, hci.cur_name);
+#endif
+ 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->isamc, isamc_p, isamc_i);
+ isamc_p2 = isamb_merge (hi->reg->isamb, isamc_p, isamc_i);
if (!isamc_p2)
{
- no_deletions++;
- if (!dict_delete (hi->dict, this_name))
+ hi->no_deletions++;
+ if (!dict_delete (hi->reg->dict, this_name))
abort();
}
else
{
- no_updates++;
+ hi->no_updates++;
if (isamc_p2 != isamc_p)
- dict_insert (hi->dict, this_name,
+ dict_insert (hi->reg->dict, this_name,
sizeof(ISAMC_P), &isamc_p2);
}
}
else
{
- isamc_p = isc_merge (hi->isamc, 0, isamc_i);
- no_insertions++;
- dict_insert (hi->dict, this_name, sizeof(ISAMC_P), &isamc_p);
+ isamc_p = isamb_merge (hi->reg->isamb, 0, isamc_i);
+ hi->no_insertions++;
+ dict_insert (hi->reg->dict, this_name, sizeof(ISAMC_P), &isamc_p);
}
}
xfree (isamc_i);
+ xfree (hci.key);
+ 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.mode = 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);
return 0;
}
char *key_buf;
int more;
- next_key = xmalloc (KEY_SIZE);
- key_buf = xmalloc (key_buf_size);
+ 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 ? */
{
break;
memcpy (key_buf + key_buf_ptr, next_key, KEY_SIZE);
key_buf_ptr += KEY_SIZE;
- if (key_buf_ptr+KEY_SIZE >= key_buf_size)
+ if (key_buf_ptr+(int) KEY_SIZE >= key_buf_size)
{
char *new_key_buf;
- new_key_buf = xmalloc (key_buf_size + INP_BUF_ADD);
+ 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;
}
}
- no_diffs++;
+ hi->no_diffs++;
nmemb = key_buf_ptr / KEY_SIZE;
- assert (nmemb*KEY_SIZE == key_buf_ptr);
- if ((info = dict_lookup (hi->dict, cur_name)))
+ assert (nmemb * (int) KEY_SIZE == key_buf_ptr);
+ if ((info = dict_lookup (hi->reg->dict, cur_name)))
{
ISAM_P isam_p, isam_p2;
- logf (LOG_DEBUG, "updating %s", 1+cur_name);
memcpy (&isam_p, info+1, sizeof(ISAM_P));
- isam_p2 = is_merge (hi->isam, isam_p, nmemb, key_buf);
+ isam_p2 = is_merge (hi->reg->isam, isam_p, nmemb, key_buf);
if (!isam_p2)
{
- no_deletions++;
- if (!dict_delete (hi->dict, cur_name))
+ hi->no_deletions++;
+ if (!dict_delete (hi->reg->dict, cur_name))
abort ();
}
else
{
- no_updates++;
+ hi->no_updates++;
if (isam_p2 != isam_p)
- dict_insert (hi->dict, cur_name, sizeof(ISAM_P), &isam_p2);
+ dict_insert (hi->reg->dict, cur_name,
+ sizeof(ISAM_P), &isam_p2);
}
}
else
{
ISAM_P isam_p;
- logf (LOG_DEBUG, "inserting %s", 1+cur_name);
- no_insertions++;
- isam_p = is_merge (hi->isam, 0, nmemb, key_buf);
- dict_insert (hi->dict, cur_name, sizeof(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;
+ ISAMS_I isams_i = (ISAMS_I) xmalloc (sizeof(*isams_i));
+
+ hci.key = (char *) xmalloc (KEY_SIZE);
+ hci.mode = 1;
+ hci.hi = hi;
+ hci.more = heap_read_one (hi, hci.cur_name, hci.key);
+
+ isams_i->clientData = &hci;
+ isams_i->read_item = heap_cread_item;
+
+ while (hci.more)
+ {
+ char this_name[INP_NAME_MAX];
+ ISAMS_P isams_p;
+ char *dict_info;
+
+ strcpy (this_name, hci.cur_name);
+ assert (hci.cur_name[1]);
+ hi->no_diffs++;
+ 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);
+ }
+ else
+ {
+ logf (LOG_FATAL, "isams doesn't support this kind of update");
+ break;
+ }
+ }
+ xfree (isams_i);
+ return 0;
+}
+
struct progressInfo {
time_t startTime;
time_t lastTime;
void progressFunc (struct key_file *keyp, void *info)
{
- struct progressInfo *p = info;
+ struct progressInfo *p = (struct progressInfo *) info;
time_t now, remaining;
if (keyp->buf_size <= 0 || p->totalBytes <= 0)
if (now >= p->lastTime+10)
{
p->lastTime = now;
- remaining = (now - p->startTime)*
- ((double) p->totalBytes/p->totalOffset - 1.0);
+ 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",
(100.0*p->totalOffset) / p->totalBytes, (long) remaining);
#define R_OK 4
#endif
-void key_input (int nkeys, int cache)
-
+void zebra_index_merge (ZebraHandle zh)
{
- Dict dict;
- ISAM isam = NULL;
- ISAMC isamc = NULL;
struct key_file **kf;
char rbuf[1024];
int i, r;
struct heap_info *hi;
struct progressInfo progressInfo;
-
+ int nkeys = zh->reg->key_file_no;
+
if (nkeys < 0)
{
char fname[1024];
nkeys = 0;
while (1)
{
- getFnameTmp (fname, nkeys+1);
+ extract_get_fname_tmp (zh, fname, nkeys+1);
if (access (fname, R_OK) == -1)
break;
nkeys++;
if (!nkeys)
return ;
}
- dict = dict_open (FNAME_DICT, cache, 1);
- if (!dict)
- {
- logf (LOG_FATAL, "dict_open fail");
- exit (1);
- }
- if (res_get_match (common_resource, "isam", "c", NULL))
- {
- isamc = isc_open (FNAME_ISAMC, 1, key_isamc_m ());
- if (!isamc)
- {
- logf (LOG_FATAL, "isc_open fail");
- exit (1);
- }
- }
- else
- {
- isam = is_open (FNAME_ISAM, key_compare, 1, sizeof(struct it_key));
- if (!isam)
- {
- logf (LOG_FATAL, "is_open fail");
- exit (1);
- }
- }
- kf = 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);
for (i = 1; i<=nkeys; i++)
{
- kf[i] = key_file_init (i, 32768);
+ kf[i] = key_file_init (i, 8192, zh->res);
kf[i]->readHandler = progressFunc;
kf[i]->readInfo = &progressInfo;
progressInfo.totalBytes += kf[i]->length;
progressInfo.totalOffset += kf[i]->buf_size;
}
hi = key_heap_init (nkeys, key_qsort_compare);
- hi->dict = dict;
- hi->isam = isam;
- hi->isamc = isamc;
-
+ 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 (isamc)
+ if (zh->reg->isams)
+ heap_inps (hi);
+ if (zh->reg->isamc)
heap_inpc (hi);
- else
- heap_inp (hi);
- dict_close (dict);
- if (isam)
- is_close (isam);
- if (isamc)
- isc_close (isamc);
-
+ if (zh->reg->isam)
+ heap_inp (hi);
+ if (zh->reg->isamd)
+ heap_inpd (hi);
+ if (zh->reg->isamb)
+ heap_inpb (hi);
+
for (i = 1; i<=nkeys; i++)
{
- getFnameTmp (rbuf, i);
+ extract_get_fname_tmp (zh, rbuf, i);
unlink (rbuf);
}
- logf (LOG_LOG, "Iterations . . .%7d", no_iterations);
- logf (LOG_LOG, "Distinct words .%7d", no_diffs);
- logf (LOG_LOG, "Updates. . . . .%7d", no_updates);
- logf (LOG_LOG, "Deletions. . . .%7d", no_deletions);
- logf (LOG_LOG, "Insertions . . .%7d", no_insertions);
+ 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);
+ zh->reg->key_file_no = 0;
+
+ key_heap_destroy (hi, nkeys);
+ for (i = 1; i<=nkeys; i++)
+ key_file_destroy (kf[i]);
+ xfree (kf);
}