-/* $Id: extract.c,v 1.128 2002-10-24 13:07:02 heikki Exp $
+/* $Id: extract.c,v 1.130 2002-11-07 09:07:07 adam Exp $
Copyright (C) 1995,1996,1997,1998,1999,2000,2001,2002
Index Data Aps
zh->reg->keys.prevAttrSet = -1;
zh->reg->keys.prevSeqNo = 0;
zh->reg->sortKeys.buf_used = 0;
+ zh->reg->sortKeys.buf_max = 0;
+ zh->reg->sortKeys.buf = 0;
extractCtrl.subType = subType;
extractCtrl.init = extract_init;
}
extract_flushSortKeys (zh, *sysno, 1, &zh->reg->sortKeys);
extract_flushRecordKeys (zh, *sysno, 1, &zh->reg->keys);
+
+ zh->records_inserted++;
}
else
{
/* record already exists */
struct recKeys delkeys;
+ struct sortKeys sortKeys;
rec = rec_get (zh->reg->records, *sysno);
assert (rec);
{
logf (LOG_LOG, "skipped %s %s %ld", recordType,
fname, (long) recordOffset);
+ extract_flushSortKeys (zh, *sysno, -1, &zh->reg->sortKeys);
rec_rm (&rec);
+ logRecord(zh);
return 1;
}
delkeys.buf_used = rec->size[recInfo_delKeys];
delkeys.buf = rec->info[recInfo_delKeys];
- extract_flushSortKeys (zh, *sysno, 0, &zh->reg->sortKeys);
+
+ sortKeys.buf_used = rec->size[recInfo_sortKeys];
+ sortKeys.buf = rec->info[recInfo_sortKeys];
+
+ extract_flushSortKeys (zh, *sysno, 0, &sortKeys);
extract_flushRecordKeys (zh, *sysno, 0, &delkeys);
if (delete_flag)
{
{
logf (LOG_LOG, "delete %s %s %ld", recordType,
fname, (long) recordOffset);
+ zh->records_deleted++;
#if 0
if (matchStr)
dict_delete (matchDict, matchStr);
rec_del (zh->reg->records, &rec);
}
rec_rm (&rec);
+ logRecord(zh);
return 1;
}
else
fname, (long) recordOffset);
extract_flushSortKeys (zh, *sysno, 1, &zh->reg->sortKeys);
extract_flushRecordKeys (zh, *sysno, 1, &zh->reg->keys);
+ zh->records_updated++;
}
}
}
rec->size[recInfo_delKeys] = 0;
}
+ /* update sort keys */
+ xfree (rec->info[recInfo_sortKeys]);
+
+ rec->size[recInfo_sortKeys] = zh->reg->sortKeys.buf_used;
+ rec->info[recInfo_sortKeys] = zh->reg->sortKeys.buf;
+ zh->reg->sortKeys.buf = NULL;
+ zh->reg->sortKeys.buf_max = 0;
+
/* save file size of original record */
zebraExplain_recordBytesIncrement (zh->reg->zei,
- recordAttr->recordSize);
/* commit this record */
rec_put (zh->reg->records, &rec);
+ logRecord(zh);
return 0;
}
static void extract_add_sort_string (RecWord *p, const char *string,
int length)
{
-#if 1
ZebraHandle zh = p->extractCtrl->handle;
struct sortKeys *sk = &zh->reg->sortKeys;
size_t off = 0;
- int slen;
while (off < sk->buf_used)
{
- int set, use, l;
+ int set, use, slen;
- l = key_SU_decode(&set, sk->buf + off);
- off += l;
- l = key_SU_decode(&use, sk->buf + off);
- off += l;
- l = key_SU_decode(&slen, sk->buf + off);
- off += l + slen;
+ off += key_SU_decode(&set, sk->buf + off);
+ off += key_SU_decode(&use, sk->buf + off);
+ off += key_SU_decode(&slen, sk->buf + off);
+ off += slen;
if (p->attrSet == set && p->attrUse == use)
return;
}
}
off += key_SU_encode(p->attrSet, sk->buf + off);
off += key_SU_encode(p->attrUse, sk->buf + off);
- slen = strlen(string);
- off += key_SU_encode(slen, sk->buf + off);
- memcpy (sk->buf + off, string, slen);
- sk->buf_used = off + slen;
-#else
- struct sortKey *sk;
- ZebraHandle zh = p->extractCtrl->handle;
-
-
- for (sk = zh->reg->sortKeys; sk; sk = sk->next)
- if (sk->attrSet == p->attrSet && sk->attrUse == p->attrUse)
- return;
-
- sk = (struct sortKey *) xmalloc (sizeof(*sk));
- sk->next = zh->reg->sortKeys;
- zh->reg->sortKeys = sk;
-
- sk->string = (char *) xmalloc (length);
- sk->length = length;
- memcpy (sk->string, string, length);
-
- sk->attrSet = p->attrSet;
- sk->attrUse = p->attrUse;
-#endif
+ off += key_SU_encode(length, sk->buf + off);
+ memcpy (sk->buf + off, string, length);
+ sk->buf_used = off + length;
}
void extract_add_string (RecWord *p, const char *string, int length)