/*
- * Copyright (C) 1994-1995, Index Data I/S
+ * Copyright (C) 1994-1996, Index Data I/S
* All rights reserved.
* Sebastian Hammer, Adam Dickmeiss
*
* $Log: kinput.c,v $
- * Revision 1.13 1996-02-05 12:30:00 adam
+ * 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.
*
#include <fcntl.h>
#include <unistd.h>
#include <stdlib.h>
-#include <time.h>
#include <string.h>
#include <stdio.h>
#include <ctype.h>
#include "index.h"
#define KEY_SIZE (1+sizeof(struct it_key))
-#define INP_NAME_MAX 8192
+#define INP_NAME_MAX 768
#define INP_BUF_START 60000
#define INP_BUF_ADD 400000
void key_file_chunk_read (struct key_file *f)
{
int nr = 0, r, fd;
- char fname[256];
+ char fname[1024];
getFnameTmp (fname, f->no);
fd = open (fname, O_RDONLY);
if (fd == -1)
f->length = 0;
f->readHandler = NULL;
f->buf = xmalloc (f->chunk);
- f->prev_name = xmalloc (256);
+ f->prev_name = xmalloc (INP_NAME_MAX);
*f->prev_name = '\0';
key_file_chunk_read (f);
return f;
for (i = 0; i<= nkeys; i++)
{
hi->ptr[i] = i;
- hi->info.buf[i] = xmalloc (512);
+ hi->info.buf[i] = xmalloc (INP_NAME_MAX);
}
return hi;
}
static int heap_read_one (struct heap_info *hi, char *name, char *key)
{
int n, r;
- char rbuf[512];
+ char rbuf[INP_NAME_MAX];
struct key_file *kf;
if (!hi->heapnum)
int heap_inp (Dict dict, ISAM isam, struct heap_info *hi)
{
char *info;
- char next_name[INP_NAME_MAX+1];
- char cur_name[INP_NAME_MAX+1];
+ 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;
int more;
next_key = xmalloc (KEY_SIZE);
- key_buf = xmalloc (key_buf_size * (KEY_SIZE));
+ key_buf = xmalloc (key_buf_size);
more = heap_read_one (hi, cur_name, key_buf);
while (more) /* EOF ? */
{
if (keyp->buf_size <= 0 || p->totalBytes <= 0)
return ;
- p->totalOffset += keyp->buf_size;
time (&now);
- if (now < p->lastTime+10)
- return ;
- p->lastTime = now;
- remaining = (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);
- else
- logf (LOG_LOG, "Merge %2.1f%% completed; %ld minutes remaining",
- (100.0*p->totalOffset) / p->totalBytes, (long) remaining/60);
+ if (now >= p->lastTime+10)
+ {
+ p->lastTime = now;
+ remaining = (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);
+ else
+ logf (LOG_LOG, "Merge %2.1f%% completed; %ld minutes remaining",
+ (100.0*p->totalOffset) / p->totalBytes, (long) remaining/60);
+ }
+ p->totalOffset += keyp->buf_size;
}
void key_input (const char *dict_fname, const char *isam_fname,
struct heap_info *hi;
struct progressInfo progressInfo;
+ if (nkeys < 0)
+ {
+ char fname[1024];
+ nkeys = 0;
+ while (1)
+ {
+ getFnameTmp (fname, nkeys+1);
+ if (access (fname, R_OK) == -1)
+ break;
+ nkeys++;
+ }
+ if (!nkeys)
+ return ;
+ }
dict = dict_open (dict_fname, cache, 1);
if (!dict)
{