projects
/
idzebra-moved-to-github.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Wrap log messages for dom filter. This uses yaz_vsnprintf. Requires
[idzebra-moved-to-github.git]
/
index
/
key_block.c
diff --git
a/index/key_block.c
b/index/key_block.c
index
375e2c6
..
9ca9e7d
100644
(file)
--- a/
index/key_block.c
+++ b/
index/key_block.c
@@
-1,5
+1,5
@@
-/* $Id: key_block.c,v 1.3 2006-11-21 17:48:08 adam Exp $
- Copyright (C) 1995-2006
+/* $Id: key_block.c,v 1.9 2007-02-06 09:33:31 adam Exp $
+ Copyright (C) 1995-2007
Index Data ApS
This file is part of the Zebra server.
Index Data ApS
This file is part of the Zebra server.
@@
-22,6
+22,7
@@
Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
#include <stdio.h>
#include <stdlib.h>
#include <stdio.h>
#include <stdlib.h>
+#include <string.h>
#include <assert.h>
#include <ctype.h>
#include <assert.h>
#include <ctype.h>
@@
-29,9
+30,9
@@
Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
#include <pthread.h>
#endif
#include <pthread.h>
#endif
-#include <yaz/nmem.h>
-#include "index.h"
#include "key_block.h"
#include "key_block.h"
+#include <yaz/nmem.h>
+#include <yaz/xmalloc.h>
struct zebra_key_block {
char **key_buf;
struct zebra_key_block {
char **key_buf;
@@
-64,8
+65,6
@@
struct encode_info {
char buf[ENCODE_BUFLEN];
};
char buf[ENCODE_BUFLEN];
};
-static int log_level = 0;
-
#define USE_SHELLSORT 0
#if USE_SHELLSORT
#define USE_SHELLSORT 0
#if USE_SHELLSORT
@@
-187,6
+186,11
@@
zebra_key_block_t key_block_create(int mem, const char *key_tmp_dir,
{
zebra_key_block_t p = xmalloc(sizeof(*p));
{
zebra_key_block_t p = xmalloc(sizeof(*p));
+#if YAZ_POSIX_THREADS
+ /* we'll be making two memory areas so cut in half */
+ if (use_threads)
+ mem = mem / 2;
+#endif
p->key_buf = (char**) xmalloc (mem);
p->ptr_top = mem/sizeof(char*);
p->ptr_i = 0;
p->key_buf = (char**) xmalloc (mem);
p->ptr_top = mem/sizeof(char*);
p->ptr_i = 0;
@@
-208,7
+212,7
@@
zebra_key_block_t key_block_create(int mem, const char *key_tmp_dir,
p->alt_buf = (char**) xmalloc (mem);
#endif
}
p->alt_buf = (char**) xmalloc (mem);
#endif
}
- yaz_log(YLOG_LOG, "key_block_create t=%d", p->use_threads);
+ yaz_log(YLOG_DEBUG, "key_block_create t=%d", p->use_threads);
return p;
}
return p;
}
@@
-245,7
+249,7
@@
void key_block_destroy(zebra_key_block_t *pp)
}
}
}
}
-void key_block_write(zebra_key_block_t p, SYSNO sysno, struct it_key *key_in,
+void key_block_write(zebra_key_block_t p, zint sysno, struct it_key *key_in,
int cmd, const char *str_buf, size_t str_len,
zint staticrank, int static_rank_enable)
{
int cmd, const char *str_buf, size_t str_len,
zint staticrank, int static_rank_enable)
{
@@
-278,7
+282,10
@@
void key_block_write(zebra_key_block_t p, SYSNO sysno, struct it_key *key_in,
((char*)p->key_buf)[(p->key_buf_used)++] = cmd;
if (static_rank_enable)
((char*)p->key_buf)[(p->key_buf_used)++] = cmd;
if (static_rank_enable)
+ {
+ assert(staticrank >= 0);
key_out.mem[j++] = staticrank;
key_out.mem[j++] = staticrank;
+ }
if (key_in->mem[1]) /* filter specified record ID */
key_out.mem[j++] = key_in->mem[1];
if (key_in->mem[1]) /* filter specified record ID */
key_out.mem[j++] = key_in->mem[1];
@@
-303,10
+310,7
@@
void key_block_flush_int(zebra_key_block_t p,
struct encode_info encode_info;
(p->key_file_no)++;
struct encode_info encode_info;
(p->key_file_no)++;
- yaz_log(YLOG_LOG, "sorting section %d", (p->key_file_no));
- yaz_log(log_level, " sort_buff at %p n=%d",
- key_buf + ptr_top - ptr_i,ptr_i);
-
+ yaz_log(YLOG_DEBUG, "sorting section %d", (p->key_file_no));
#if USE_SHELLSORT
shellsort(key_buf + ptr_top - ptr_i, ptr_i,
#if USE_SHELLSORT
shellsort(key_buf + ptr_top - ptr_i, ptr_i,
@@
-322,7
+326,7
@@
void key_block_flush_int(zebra_key_block_t p,
yaz_log (YLOG_FATAL|YLOG_ERRNO, "fopen %s", out_fname);
zebra_exit("key_block_flush");
}
yaz_log (YLOG_FATAL|YLOG_ERRNO, "fopen %s", out_fname);
zebra_exit("key_block_flush");
}
- yaz_log(YLOG_LOG, "writing section %d", p->key_file_no);
+ yaz_log(YLOG_DEBUG, "writing section %d", p->key_file_no);
prevcp = cp = (key_buf)[ptr_top - ptr_i];
encode_key_init (&encode_info);
prevcp = cp = (key_buf)[ptr_top - ptr_i];
encode_key_init (&encode_info);
@@
-347,7
+351,7
@@
void key_block_flush_int(zebra_key_block_t p,
yaz_log (YLOG_FATAL|YLOG_ERRNO, "fclose %s", out_fname);
zebra_exit("key_block_flush");
}
yaz_log (YLOG_FATAL|YLOG_ERRNO, "fclose %s", out_fname);
zebra_exit("key_block_flush");
}
- yaz_log(YLOG_LOG, "finished section %d", p->key_file_no);
+ yaz_log(YLOG_DEBUG, "finished section %d", p->key_file_no);
}
void key_block_flush(zebra_key_block_t p, int is_final)
}
void key_block_flush(zebra_key_block_t p, int is_final)