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
Allow same document to be modified multiple times within one transaction.
[idzebra-moved-to-github.git]
/
index
/
extract.c
diff --git
a/index/extract.c
b/index/extract.c
index
a7fd69b
..
dcd4206
100644
(file)
--- a/
index/extract.c
+++ b/
index/extract.c
@@
-1,4
+1,4
@@
-/* $Id: extract.c,v 1.193 2005-08-26 10:13:30 adam Exp $
+/* $Id: extract.c,v 1.195 2005-09-16 09:58:38 adam Exp $
Copyright (C) 1995-2005
Index Data ApS
Copyright (C) 1995-2005
Index Data ApS
@@
-43,6
+43,8
@@
Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA
#define USE_SHELLSORT 0
#define USE_SHELLSORT 0
+#define REC_MULTI_SKIP 0
+
#if USE_SHELLSORT
static void shellsort(void *ar, int r, size_t s,
int (*cmp)(const void *a, const void *b))
#if USE_SHELLSORT
static void shellsort(void *ar, int r, size_t s,
int (*cmp)(const void *a, const void *b))
@@
-569,6
+571,7
@@
static int file_extract_record(ZebraHandle zh,
recordAttr = rec_init_attr (zh->reg->zei, rec);
recordAttr = rec_init_attr (zh->reg->zei, rec);
+#if REC_MULTI_SKIP
if (!force_update && recordAttr->runNumber ==
zebraExplain_runNumberIncrement (zh->reg->zei, 0))
{
if (!force_update && recordAttr->runNumber ==
zebraExplain_runNumberIncrement (zh->reg->zei, 0))
{
@@
-581,6
+584,7
@@
static int file_extract_record(ZebraHandle zh,
logRecord (zh);
return 1;
}
logRecord (zh);
return 1;
}
+#endif
/* flush old keys for sort&search etc. */
delkeys.buf_used = rec->size[recInfo_delKeys];
delkeys.buf = rec->info[recInfo_delKeys];
/* flush old keys for sort&search etc. */
delkeys.buf_used = rec->size[recInfo_delKeys];
delkeys.buf = rec->info[recInfo_delKeys];
@@
-1044,6
+1048,7
@@
ZEBRA_RES buffer_extract_record (ZebraHandle zh,
recordAttr = rec_init_attr (zh->reg->zei, rec);
recordAttr = rec_init_attr (zh->reg->zei, rec);
+#if REC_MULTI_SKIP
if (!force_update) {
if (recordAttr->runNumber ==
zebraExplain_runNumberIncrement (zh->reg->zei, 0))
if (!force_update) {
if (recordAttr->runNumber ==
zebraExplain_runNumberIncrement (zh->reg->zei, 0))
@@
-1057,6
+1062,7
@@
ZEBRA_RES buffer_extract_record (ZebraHandle zh,
return ZEBRA_FAIL;
}
}
return ZEBRA_FAIL;
}
}
+#endif
delkeys.buf_used = rec->size[recInfo_delKeys];
delkeys.buf = rec->info[recInfo_delKeys];
delkeys.buf_used = rec->size[recInfo_delKeys];
delkeys.buf = rec->info[recInfo_delKeys];
@@
-1539,7
+1545,7
@@
ZEBRA_RES zebra_snippets_rec_keys(ZebraHandle zh, struct recKeys *reckeys,
char *dst = (char*) &key;
char dst_buf[IT_MAX_WORD];
char *dst_term = dst_buf;
char *dst = (char*) &key;
char dst_buf[IT_MAX_WORD];
char *dst_term = dst_buf;
- int index_type, ord;
+ int index_type = 0, ord;
iscz1_decode(decode_handle, &dst, &src);
assert(key.len <= 4 && key.len > 2);
iscz1_decode(decode_handle, &dst, &src);
assert(key.len <= 4 && key.len > 2);
@@
-1549,6
+1555,7
@@
ZEBRA_RES zebra_snippets_rec_keys(ZebraHandle zh, struct recKeys *reckeys,
zebraExplain_lookup_ord(zh->reg->zei, ord, &index_type,
0/* db */, 0/* set */, 0/* use */);
zebraExplain_lookup_ord(zh->reg->zei, ord, &index_type,
0/* db */, 0/* set */, 0/* use */);
+ assert(index_type);
zebra_term_untrans_iconv(zh, nmem, index_type,
&dst_term, src);
zebra_snippets_append(snippets, seqno, ord, dst_term);
zebra_term_untrans_iconv(zh, nmem, index_type,
&dst_term, src);
zebra_snippets_append(snippets, seqno, ord, dst_term);