-/* $Id: kinput.c,v 1.60 2004-08-04 08:35:23 adam Exp $
+/* $Id: kinput.c,v 1.63 2004-11-19 10:26:57 heikki Exp $
Copyright (C) 1995,1996,1997,1998,1999,2000,2001,2002,2003,2004
Index Data Aps
size_t chunk; /* number of bytes allocated */
size_t buf_ptr; /* current position in buffer */
char *prev_name; /* last word read */
-#if IT_KEY_NEW
void *decode_handle;
-#else
- int sysno; /* last sysno */
- int seqno; /* last seqno */
-#endif
off_t length; /* length of file */
/* handler invoked in each read */
void (*readHandler)(struct key_file *keyp, void *rinfo);
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 ;
}
}
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;
}
void key_file_destroy (struct key_file *f)
{
-#if IT_KEY_NEW
iscz1_stop(f->decode_handle);
-#endif
xfree (f->buf);
xfree (f->prev_name);
xfree (f);
f = (struct key_file *) xmalloc (sizeof(*f));
f->res = res;
-#if IT_KEY_NEW
f->decode_handle = iscz1_start();
-#else
- f->sysno = 0;
- f->seqno = 0;
-#endif
f->no = no;
f->chunk = chunk;
f->offset = 0;
{
int i, c;
char srcbuf[128];
-#if IT_KEY_NEW
const char *src = srcbuf;
char *dst;
int j;
-#else
- struct it_key itkey;
- int d;
-#endif
c = key_file_getc (f);
if (c == 0)
while ((key[i++] = key_file_getc (f)))
;
strcpy (f->prev_name, key);
-#if IT_KEY_NEW
iscz1_reset(f->decode_handle);
-#endif
}
-#if IT_KEY_NEW
c = key_file_getc(f); /* length + insert/delete combined */
key[i++] = c & 128;
c = c & 127;
dst = key + i;
iscz1_decode(f->decode_handle, &dst, &src);
return i + sizeof(struct it_key);
-#else
- 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);
-#endif
}
struct heap_info {
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);
+ yaz_log (YLOG_DEBUG, "key_heap_destroy");
+ yaz_log (YLOG_DEBUG, "key_heap_destroy nk=%d",nkeys);
if (!hi->zh)
for (i = 0; i<=nkeys; i++)
xfree (hi->info.buf[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,
+ yaz_log (YLOG_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);
*to++ = *res++;
}
*to = '\0';
- yaz_log (LOG_LOG, "%s", keybuf);
+ yaz_log (YLOG_LOG, "%s", keybuf);
}
#endif
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;
}
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;
}
}
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;
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 */
heap_inps (hi);
if (zh->reg->isamc)
heap_inpc (hi);
- if (zh->reg->isam)
- heap_inp (hi);
if (zh->reg->isamb)
heap_inpb (hi);
}
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;