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
Ignore idzebra.pdf
[idzebra-moved-to-github.git]
/
index
/
key_block.c
diff --git
a/index/key_block.c
b/index/key_block.c
index
375e2c6
..
d127d55
100644
(file)
--- a/
index/key_block.c
+++ b/
index/key_block.c
@@
-1,8
+1,5
@@
-/* $Id: key_block.c,v 1.3 2006-11-21 17:48:08 adam Exp $
- Copyright (C) 1995-2006
- Index Data ApS
-
-This file is part of the Zebra server.
+/* This file is part of the Zebra server.
+ Copyright (C) 1994-2011 Index Data
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
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
@@
-20,8
+17,12
@@
Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
*/
*/
+#if HAVE_CONFIG_H
+#include <config.h>
+#endif
#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
@@
-100,15
+99,21
@@
static void encode_key_init(struct encode_info *i)
i->decode_handle = iscz1_start();
}
i->decode_handle = iscz1_start();
}
-static void encode_key_write (char *k, struct encode_info *i, FILE *outf)
+static void encode_key_write(const char *k, struct encode_info *i, FILE *outf)
{
struct it_key key;
char *bp = i->buf, *bp0;
const char *src = (char *) &key;
{
struct it_key key;
char *bp = i->buf, *bp0;
const char *src = (char *) &key;
+ size_t klen = strlen(k);
+
+ if (fwrite (k, klen+1, 1, outf) != 1)
+ {
+ yaz_log (YLOG_FATAL|YLOG_ERRNO, "fwrite");
+ zebra_exit("encode_key_write");
+ }
+
+ k = k + klen+1;
- /* copy term to output buf */
- while ((*bp++ = *k++))
- ;
/* and copy & align key so we can mangle */
memcpy (&key, k+1, sizeof(struct it_key)); /* *k is insert/delete */
/* and copy & align key so we can mangle */
memcpy (&key, k+1, sizeof(struct it_key)); /* *k is insert/delete */
@@
-187,6
+192,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
+218,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
+255,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
+288,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];
@@
-295,18
+308,20
@@
void key_block_write(zebra_key_block_t p, SYSNO sysno, struct it_key *key_in,
void key_block_flush_int(zebra_key_block_t p,
void key_block_flush_int(zebra_key_block_t p,
- char **key_buf, size_t ptr_top, size_t ptr_i)
+ char **key_buf, size_t ptr_top, size_t ptr_i)
{
FILE *outf;
char out_fname[200];
char *prevcp, *cp;
struct encode_info encode_info;
{
FILE *outf;
char out_fname[200];
char *prevcp, *cp;
struct encode_info encode_info;
+ if (ptr_i == 0)
+ return ;
+
(p->key_file_no)++;
(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));
+ assert(ptr_i > 0);
#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
+337,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
+362,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)
@@
-401,6
+416,7
@@
int key_block_get_no_files(zebra_key_block_t p)
/*
* Local variables:
* c-basic-offset: 4
/*
* Local variables:
* c-basic-offset: 4
+ * c-file-style: "Stroustrup"
* indent-tabs-mode: nil
* End:
* vim: shiftwidth=4 tabstop=8 expandtab
* indent-tabs-mode: nil
* End:
* vim: shiftwidth=4 tabstop=8 expandtab