+ 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;
+ for (j = 0; j < c; j++)
+ srcbuf[j] = key_file_getc(f);
+ 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 {
+ struct {
+ struct key_file **file;
+ char **buf;
+ } info;
+ int heapnum;
+ int *ptr;
+ int (*cmp)(const void *p1, const void *p2);
+ struct zebra_register *reg;
+ ZebraHandle zh; /* only used for raw reading that bypasses the heaps */
+ int no_diffs;
+ int no_updates;
+ int no_deletions;
+ int no_insertions;
+ int no_iterations;
+};
+
+static struct heap_info *key_heap_malloc()
+{ /* malloc and clear it */
+ struct heap_info *hi;
+ hi = (struct heap_info *) xmalloc (sizeof(*hi));
+ hi->info.file = 0;
+ hi->info.buf = 0;
+ hi->heapnum = 0;
+ hi->ptr = 0;
+ hi->zh=0;
+ hi->no_diffs = 0;
+ hi->no_diffs = 0;
+ hi->no_updates = 0;
+ hi->no_deletions = 0;
+ hi->no_insertions = 0;
+ hi->no_iterations = 0;
+ return hi;
+}
+
+struct heap_info *key_heap_init (int nkeys,
+ int (*cmp)(const void *p1, const void *p2))
+{
+ struct heap_info *hi;
+ int i;
+
+ hi = key_heap_malloc();
+ hi->info.file = (struct key_file **)
+ xmalloc (sizeof(*hi->info.file) * (1+nkeys));
+ hi->info.buf = (char **) xmalloc (sizeof(*hi->info.buf) * (1+nkeys));
+ hi->ptr = (int *) xmalloc (sizeof(*hi->ptr) * (1+nkeys));
+ hi->cmp = cmp;
+ for (i = 0; i<= nkeys; i++)
+ {
+ hi->ptr[i] = i;
+ hi->info.buf[i] = (char *) xmalloc (INP_NAME_MAX);
+ }
+ return hi;
+}
+
+struct heap_info *key_heap_init_buff ( ZebraHandle zh,
+ int (*cmp)(const void *p1, const void *p2))
+{
+ struct heap_info *hi=key_heap_malloc();
+ hi->cmp=cmp;
+ hi->zh=zh;
+ return hi;
+}
+
+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);
+ if (!hi->zh)
+ for (i = 0; i<=nkeys; i++)
+ xfree (hi->info.buf[i]);
+
+ xfree (hi->info.buf);
+ xfree (hi->ptr);
+ xfree (hi->info.file);
+ xfree (hi);
+}
+
+static void key_heap_swap (struct heap_info *hi, int i1, int i2)
+{
+ int swap;
+
+ swap = hi->ptr[i1];
+ hi->ptr[i1] = hi->ptr[i2];
+ hi->ptr[i2] = swap;
+}
+
+
+static void key_heap_delete (struct heap_info *hi)
+{
+ int cur = 1, child = 2;
+
+ assert (hi->heapnum > 0);
+
+ key_heap_swap (hi, 1, hi->heapnum);
+ hi->heapnum--;
+ while (child <= hi->heapnum) {
+ if (child < hi->heapnum &&
+ (*hi->cmp)(&hi->info.buf[hi->ptr[child]],
+ &hi->info.buf[hi->ptr[child+1]]) > 0)
+ child++;
+ if ((*hi->cmp)(&hi->info.buf[hi->ptr[cur]],
+ &hi->info.buf[hi->ptr[child]]) > 0)
+ {
+ key_heap_swap (hi, cur, child);
+ cur = child;
+ child = 2*cur;
+ }
+ else
+ break;
+ }
+}
+
+static void key_heap_insert (struct heap_info *hi, const char *buf, int nbytes,
+ struct key_file *kf)
+{
+ int cur, parent;
+
+ cur = ++(hi->heapnum);
+ memcpy (hi->info.buf[hi->ptr[cur]], buf, nbytes);
+ hi->info.file[hi->ptr[cur]] = kf;
+
+ parent = cur/2;
+ while (parent && (*hi->cmp)(&hi->info.buf[hi->ptr[parent]],
+ &hi->info.buf[hi->ptr[cur]]) > 0)
+ {
+ key_heap_swap (hi, cur, parent);
+ cur = parent;
+ parent = cur/2;
+ }
+}
+
+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];
+ logf (LOG_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);
+ 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->zh) /* bypass the heap stuff, we have a readymade buffer */
+ return heap_read_one_raw(hi, name, key);
+
+ if (!hi->heapnum)
+ return 0;
+ n = hi->ptr[1];
+ strcpy (name, hi->info.buf[n]);
+ kf = hi->info.file[n];
+ r = strlen(name);
+ memcpy (key, hi->info.buf[n] + r+1, KEY_SIZE);
+ key_heap_delete (hi);
+ if ((r = key_file_read (kf, rbuf)))
+ key_heap_insert (hi, rbuf, r, kf);
+ hi->no_iterations++;
+ return 1;
+}
+
+#define PR_KEY 0
+
+#if PR_KEY
+static void pkey(const char *b, int mode)
+{
+ struct it_key *key = (struct it_key *) b;
+ printf ("%c %d:%d\n", mode + 48, key->sysno, key->seqno);
+}
+#endif
+
+struct heap_cread_info {
+ char prev_name[INP_NAME_MAX];
+ char cur_name[INP_NAME_MAX];
+ char *key;
+ char *key_1, *key_2;
+ int mode_1, mode_2;
+ int sz_1, sz_2;
+ struct heap_info *hi;
+ int first_in_list;
+ int more;
+ int ret;
+};
+
+static int heap_cread_item (void *vp, char **dst, int *insertMode);
+
+int heap_cread_item2 (void *vp, char **dst, int *insertMode)
+{
+ struct heap_cread_info *p = (struct heap_cread_info *) vp;
+ int level = 0;
+
+ if (p->ret == 0) /* lookahead was 0?. Return that in read next round */
+ {
+ p->ret = -1;
+ return 0;
+ }
+ else if (p->ret == -1) /* Must read new item ? */
+ {
+ char *dst_1 = p->key_1;
+ p->ret = heap_cread_item(vp, &dst_1, &p->mode_1);
+ p->sz_1 = dst_1 - p->key_1;
+ }
+ else
+ { /* lookahead in 2 . Now in 1. */
+ p->sz_1 = p->sz_2;
+ p->mode_1 = p->mode_2;
+ memcpy (p->key_1, p->key_2, p->sz_2);
+ }
+ if (p->mode_1)
+ level = 1; /* insert */
+ else
+ level = -1; /* delete */
+ while(1)
+ {
+ char *dst_2 = p->key_2;
+ p->ret = heap_cread_item(vp, &dst_2, &p->mode_2);
+ if (!p->ret)
+ {
+ if (level)
+ break;
+ p->ret = -1;
+ return 0;
+ }
+ p->sz_2 = dst_2 - p->key_2;
+ if (p->sz_1 == p->sz_2 && memcmp(p->key_1, p->key_2, p->sz_1) == 0)
+ {
+ if (p->mode_2) /* adjust level according to deletes/inserts */
+ level++;
+ else
+ level--;
+ }
+ else
+ {
+ if (level)
+ break;
+ /* all the same. new round .. */
+ p->sz_1 = p->sz_2;
+ p->mode_1 = p->mode_2;
+ memcpy (p->key_1, p->key_2, p->sz_1);
+ if (p->mode_1)
+ level = 1; /* insert */
+ else
+ level = -1; /* delete */
+ }