-/* $Id: kinput.c,v 1.74 2006-05-10 08:13:22 adam Exp $
- Copyright (C) 1995-2005
+/* $Id: kinput.c,v 1.80 2006-12-06 22:52:38 adam Exp $
+ Copyright (C) 1995-2006
Index Data ApS
This file is part of the Zebra server.
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 <fcntl.h>
Res res;
};
-#if 0
+#if 1
static void pkey(const char *b, int mode)
{
key_logdump_txt(YLOG_LOG, b, mode ? "i" : "d");
f->buf_size = 0;
if (fd == -1)
{
- yaz_log (YLOG_WARN|YLOG_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)
{
- yaz_log (YLOG_WARN|YLOG_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)
{
- yaz_log (YLOG_WARN|YLOG_ERRNO, "cannot seek %s", fname);
+ yaz_log(YLOG_WARN|YLOG_ERRNO, "cannot seek %s", fname);
close(fd);
return ;
}
}
if (r == -1)
{
- yaz_log (YLOG_WARN|YLOG_ERRNO, "read of %s", fname);
+ yaz_log(YLOG_WARN|YLOG_ERRNO, "read of %s", fname);
close (fd);
return;
}
return EOF;
}
-int key_file_decode (struct key_file *f)
-{
- int c, d;
-
- c = key_file_getc (f);
- switch (c & 192)
- {
- case 0:
- d = c;
- break;
- case 64:
- d = ((c&63) << 8) + (key_file_getc (f) & 0xff);
- break;
- case 128:
- d = ((c&63) << 8) + (key_file_getc (f) & 0xff);
- d = (d << 8) + (key_file_getc (f) & 0xff);
- break;
- default: /* 192 */
- d = ((c&63) << 8) + (key_file_getc (f) & 0xff);
- d = (d << 8) + (key_file_getc (f) & 0xff);
- d = (d << 8) + (key_file_getc (f) & 0xff);
- break;
- }
- return d;
-}
-
int key_file_read (struct key_file *f, char *key)
{
int i, c;
struct zebra_register *reg;
ZebraHandle zh;
int raw_reading; /* 1=raw /mem read. 0=file reading */
- int no_diffs;
- int no_updates;
- int no_deletions;
- int no_insertions;
- int no_iterations;
+ zint no_diffs;
+ zint no_updates;
+ zint no_deletions;
+ zint no_insertions;
+ zint no_iterations;
};
-static struct heap_info *key_heap_malloc()
+static struct heap_info *key_heap_malloc(void)
{ /* malloc and clear it */
struct heap_info *hi;
hi = (struct heap_info *) xmalloc (sizeof(*hi));
}
}
-static int heap_read_one_raw(struct heap_info *hi, char *name, char *key)
-{
- 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];
- strcpy(name, cp);
- memcpy(key, cp+strlen(name)+1, KEY_SIZE);
- hi->no_iterations++;
- return 1;
-}
-
static int heap_read_one (struct heap_info *hi, char *name, char *key)
{
int n, r;
char rbuf[INP_NAME_MAX];
struct key_file *kf;
- if (hi->raw_reading)
- return heap_read_one_raw(hi, name, key);
-
if (!hi->heapnum)
return 0;
n = hi->ptr[1];
#define PR_KEY_LOW 0
#define PR_KEY_TOP 0
-#if 0
/* for debugging only */
-static void print_dict_item(ZebraHandle zh, const char *s)
+void zebra_log_dict_entry(ZebraHandle zh, const char *s)
{
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);
+ const char *string_index;
+ const char *db = 0;
+ zebraExplain_lookup_ord(zh->reg->zei,
+ ord, &index_type, &db, &string_index);
zebra_term_untrans(zh, index_type, dst, s + len);
- yaz_log(YLOG_LOG, "ord=%d term=%s", ord, dst);
+ yaz_log(YLOG_LOG, "ord=%d index_type=%c index=%s term=%s",
+ ord, index_type, string_index, dst);
}
}
-#endif
struct heap_cread_info {
char prev_name[INP_NAME_MAX];
*insertMode = p->key[0];
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);
#endif
(*dst) += sizeof(struct it_key);
*insertMode = p->key[0];
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);
#endif
(*dst) += sizeof(struct it_key);
char *dict_info;
strcpy (this_name, hci->cur_name);
- assert (hci->cur_name[1]);
+ assert (hci->cur_name[0]);
hi->no_diffs++;
if ((dict_info = dict_lookup (hi->reg->dict, hci->cur_name)))
{
int mode;
strcpy (this_name, hci->cur_name);
- assert (hci->cur_name[1]);
+ assert (hci->cur_name[0]);
hi->no_diffs++;
while (heap_cread_item2(hci, &dst, &mode))
char *dict_info;
strcpy (this_name, hci->cur_name);
- assert (hci->cur_name[1]);
+ assert (hci->cur_name[0]);
hi->no_diffs++;
#if 0
assert(hi->zh);
- print_dict_item(hi->zh, hci->cur_name);
+ zebra_log_dict_entry(hi->zh, hci->cur_name);
#endif
if ((dict_info = dict_lookup (hi->reg->dict, hci->cur_name)))
{
char *dict_info;
strcpy (this_name, hci->cur_name);
- assert (hci->cur_name[1]);
+ assert (hci->cur_name[0]);
hi->no_diffs++;
if (!(dict_info = dict_lookup (hi->reg->dict, hci->cur_name)))
{
}
else
{
- yaz_log (YLOG_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)
- yaz_log (YLOG_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
- yaz_log (YLOG_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 i, r;
struct heap_info *hi;
struct progressInfo progressInfo;
- int nkeys = zh->reg->key_file_no;
- int usefile;
- 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 */
-
- usefile = (nkeys!=0);
+ int nkeys = key_block_get_no_files(zh->reg->key_block);
- if (usefile)
+ if (nkeys == 0)
+ return;
+
+ if (nkeys < 0)
{
- if (nkeys < 0)
+ char fname[1024];
+ nkeys = 0;
+ while (1)
{
- char fname[1024];
- nkeys = 0;
- while (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));
- progressInfo.totalBytes = 0;
- progressInfo.totalOffset = 0;
- time (&progressInfo.startTime);
- time (&progressInfo.lastTime);
- for (i = 1; i<=nkeys; i++)
- {
- 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;
+ extract_get_fname_tmp (zh, fname, nkeys+1);
+ if (access (fname, R_OK) == -1)
+ break;
+ nkeys++;
}
- 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]);
- } /* use file */
- else
- { /* do not use file, read straight from buffer */
- hi = key_heap_init_raw(zh, key_qsort_compare);
- hi->reg = zh->reg;
+ if (!nkeys)
+ return ;
}
+ 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, 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_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 (1)
{
- struct heap_cread_info hci;
-
- hci.key = (char *) xmalloc (KEY_SIZE);
+ 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;
xfree (hci.key_2);
}
- if (usefile)
+ for (i = 1; i<=nkeys; i++)
{
- for (i = 1; i<=nkeys; i++)
- {
- extract_get_fname_tmp (zh, rbuf, i);
- unlink (rbuf);
- }
- for (i = 1; i<=nkeys; i++)
- key_file_destroy (kf[i]);
- xfree (kf);
+ extract_get_fname_tmp (zh, rbuf, i);
+ unlink (rbuf);
}
+ for (i = 1; i<=nkeys; i++)
+ key_file_destroy (kf[i]);
+ xfree (kf);
if (hi->no_iterations)
{ /* do not log if nothing happened */
- 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);
+ yaz_log(YLOG_LOG, "Iterations %9" ZINT_FORMAT0, hi->no_iterations);
+ yaz_log(YLOG_LOG, "Distinct words %9" ZINT_FORMAT0, hi->no_diffs);
+ yaz_log(YLOG_LOG, "Updates %9" ZINT_FORMAT0, hi->no_updates);
+ yaz_log(YLOG_LOG, "Deletions %9" ZINT_FORMAT0, hi->no_deletions);
+ yaz_log(YLOG_LOG, "Insertions %9" ZINT_FORMAT0, hi->no_insertions);
}
- zh->reg->key_file_no = 0;
-
- key_heap_destroy (hi, nkeys);
+ key_block_destroy(&zh->reg->key_block);
+ key_heap_destroy(hi, nkeys);
}
/*
* Local variables:
projects / idzebra-moved-to-github.git / blobdiff