X-Git-Url: http://jsfdemo.indexdata.com/?a=blobdiff_plain;ds=sidebyside;f=index%2Fextract.c;h=662b52800da2c170ed8aec782f0036311cdc93df;hb=95ff8b9c4821c47dad5d3f2e38ae0d3f6e461f74;hp=6f7686c25ecd63fb43f0567f2da98c0bc67587e6;hpb=5997f85a9dbeab93bae3492139ed20fea878372c;p=idzebra-moved-to-github.git diff --git a/index/extract.c b/index/extract.c index 6f7686c..662b528 100644 --- a/index/extract.c +++ b/index/extract.c @@ -4,7 +4,22 @@ * Sebastian Hammer, Adam Dickmeiss * * $Log: extract.c,v $ - * Revision 1.47 1996-01-17 14:57:48 adam + * Revision 1.51 1996-03-19 11:08:42 adam + * Bug fix: Log preamble wasn't always turned off after recordExtract. + * + * Revision 1.50 1996/02/12 18:45:36 adam + * New fileVerboseFlag in record group control. + * + * Revision 1.49 1996/02/05 12:29:57 adam + * Logging reduced a bit. + * The remaining running time is estimated during register merge. + * + * Revision 1.48 1996/02/01 20:53:26 adam + * The temporary per-record keys are compacted a little, and duplication + * of the per-records keys are avoided when they are saved in the record + * information buffer. + * + * Revision 1.47 1996/01/17 14:57:48 adam * Prototype changed for reader functions in extract/retrieve. File * is identified by 'void *' instead of 'int. * @@ -346,6 +361,8 @@ struct recKeys { int buf_used; int buf_max; char *buf; + char prevAttrSet; + short prevAttrUse; } reckeys; static void addRecordKey (const RecWord *p) @@ -354,29 +371,46 @@ static void addRecordKey (const RecWord *p) char attrSet; short attrUse; size_t i; + int lead = 0; if (reckeys.buf_used+1024 > reckeys.buf_max) { char *b; - b = xmalloc (reckeys.buf_max += 65000); + b = xmalloc (reckeys.buf_max += 128000); if (reckeys.buf_used > 0) memcpy (b, reckeys.buf, reckeys.buf_used); xfree (reckeys.buf); reckeys.buf = b; } dst = reckeys.buf + reckeys.buf_used; + + attrSet = p->attrSet; + if (reckeys.buf_used > 0 && reckeys.prevAttrSet == attrSet) + lead |= 1; + else + reckeys.prevAttrSet = attrSet; + attrUse = p->attrUse; + if (reckeys.buf_used > 0 && reckeys.prevAttrUse == attrUse) + lead |= 2; + else + reckeys.prevAttrUse = attrUse; + switch (p->which) { case Word_String: - attrSet = p->attrSet; - memcpy (dst, &attrSet, sizeof(attrSet)); - dst += sizeof(attrSet); + *dst++ = lead; - attrUse = p->attrUse; - memcpy (dst, &attrUse, sizeof(attrUse)); - dst += sizeof(attrUse); - + if (!(lead & 1)) + { + memcpy (dst, &attrSet, sizeof(attrSet)); + dst += sizeof(attrSet); + } + if (!(lead & 2)) + { + memcpy (dst, &attrUse, sizeof(attrUse)); + dst += sizeof(attrUse); + } for (i = 0; p->u.string[i]; i++) *dst++ = p->u.string[i]; *dst++ = '\0'; @@ -394,20 +428,27 @@ static void addRecordKey (const RecWord *p) static void flushRecordKeys (SYSNO sysno, int cmd, struct recKeys *reckeys, const char *databaseName) { + char attrSet = -1; + short attrUse = -1; int off = 0; while (off < reckeys->buf_used) { const char *src = reckeys->buf + off; - char attrSet; - short attrUse; struct it_key key; - - memcpy (&attrSet, src, sizeof(attrSet)); - src += sizeof(attrSet); - - memcpy (&attrUse, src, sizeof(attrUse)); - src += sizeof(attrUse); + int lead; + + lead = *src++; + if (!(lead & 1)) + { + memcpy (&attrSet, src, sizeof(attrSet)); + src += sizeof(attrSet); + } + if (!(lead & 2)) + { + memcpy (&attrUse, src, sizeof(attrUse)); + src += sizeof(attrUse); + } if (key_buf_used + 1024 > (ptr_top-ptr_i)*sizeof(char*)) key_flush (); ++ptr_i; @@ -665,8 +706,8 @@ static char *fileMatchStr (struct recKeys *reckeys, struct recordGroup *rGroup, } if (first) { - logf (LOG_WARN, "Record in file %s didn't contain match" - " fields in (%d,%d)", fname, attrSet, attrUse); + logf (LOG_WARN, "Record didn't contain match" + " fields in (%d,%d)", attrSet, attrUse); return NULL; } } @@ -736,6 +777,25 @@ static char *fileMatchStr (struct recKeys *reckeys, struct recordGroup *rGroup, return dstBuf; } +struct recordLogInfo { + const char *fname; + char *op; + struct recordGroup *rGroup; +}; + +static void recordLogPreamble (int level, const char *msg, void *info) +{ + struct recordLogInfo *p = info; + FILE *outf = log_file (); + + if (level & LOG_LOG) + return ; + if (p->op) + fprintf (outf, "%s of ", p->op); + fprintf (outf, "%s type %s\n", p->rGroup->recordType, p->fname); + log_event_start (NULL, NULL); +} + static int recordExtract (SYSNO *sysno, const char *fname, struct recordGroup *rGroup, int deleteFlag, struct file_read_info *fi, RecType recType, @@ -746,7 +806,13 @@ static int recordExtract (SYSNO *sysno, const char *fname, char *matchStr; SYSNO sysnotmp; Record rec; + struct recordLogInfo logInfo; + logInfo.fname = fname; + logInfo.op = NULL; + logInfo.rGroup = rGroup; + log_event_start (recordLogPreamble, &logInfo); + if (fi->fd != -1) { extractCtrl.fh = fi; @@ -756,6 +822,8 @@ static int recordExtract (SYSNO *sysno, const char *fname, extractCtrl.add = addRecordKeyAny; reckeys.buf_used = 0; + reckeys.prevAttrUse = -1; + reckeys.prevAttrSet = -1; extractCtrl.readf = file_read; r = (*recType->extract)(&extractCtrl); @@ -787,7 +855,7 @@ static int recordExtract (SYSNO *sysno, const char *fname, } else { - logf (LOG_WARN, "Record not inserted"); + logf (LOG_WARN, "Bad match criteria"); return 0; } } @@ -798,10 +866,12 @@ static int recordExtract (SYSNO *sysno, const char *fname, { if (deleteFlag) { - logf (LOG_LOG, "? %s", fname); + logf (LOG_LOG, "Cannot delete new record"); return 1; } - logf (LOG_LOG, "add %s %s", rGroup->recordType, fname); + logInfo.op = "add"; + if (rGroup->fileVerboseFlag) + logf (LOG_LOG, "add %s %s", rGroup->recordType, fname); rec = rec_new (records); *sysno = rec->sysno; @@ -824,14 +894,15 @@ static int recordExtract (SYSNO *sysno, const char *fname, flushRecordKeys (*sysno, 0, &delkeys, rec->info[recInfo_databaseName]); if (deleteFlag) { + logInfo.op = "delete"; if (!delkeys.buf_used) { - logf (LOG_WARN, "cannot delete %s: storeKeys false", - fname); + logf (LOG_WARN, "cannot delete; storeKeys false"); } else { - logf (LOG_LOG, "delete %s %s", rGroup->recordType, fname); + if (rGroup->fileVerboseFlag) + logf (LOG_LOG, "delete %s %s", rGroup->recordType, fname); records_deleted++; if (matchStr) dict_delete (matchDict, matchStr); @@ -841,15 +912,15 @@ static int recordExtract (SYSNO *sysno, const char *fname, } else { + logInfo.op = "update"; if (!delkeys.buf_used) { - logf (LOG_WARN, "cannot update %s: storeKeys false", - fname); + logf (LOG_WARN, "cannot update; storeKeys false"); } else { - logf (LOG_LOG, "update %s %s", rGroup->recordType, - fname); + if (rGroup->fileVerboseFlag) + logf (LOG_LOG, "update %s %s", rGroup->recordType, fname); flushRecordKeys (*sysno, 1, &reckeys, rGroup->databaseName); records_updated++; } @@ -866,10 +937,17 @@ static int recordExtract (SYSNO *sysno, const char *fname, xfree (rec->info[recInfo_delKeys]); if (reckeys.buf_used > 0 && rGroup->flagStoreKeys == 1) { +#if 1 + rec->size[recInfo_delKeys] = reckeys.buf_used; + rec->info[recInfo_delKeys] = reckeys.buf; + reckeys.buf = NULL; + reckeys.buf_max = 0; +#else rec->info[recInfo_delKeys] = xmalloc (reckeys.buf_used); rec->size[recInfo_delKeys] = reckeys.buf_used; memcpy (rec->info[recInfo_delKeys], reckeys.buf, rec->size[recInfo_delKeys]); +#endif } else { @@ -959,14 +1037,16 @@ int fileExtract (SYSNO *sysno, const char *fname, sprintf (ext_res, "%srecordType", gprefix); if (!(rGroup->recordType = res_get (common_resource, ext_res))) { - logf (LOG_LOG, "? %s", fname); + if (rGroup->fileVerboseFlag) + logf (LOG_LOG, "? %s", fname); return 0; } } } if (!rGroup->recordType) { - logf (LOG_LOG, "? record %s", fname); + if (rGroup->fileVerboseFlag) + logf (LOG_LOG, "? record %s", fname); return 0; } if (!(recType = recType_byName (rGroup->recordType, subType))) @@ -1038,6 +1118,7 @@ int fileExtract (SYSNO *sysno, const char *fname, } fi = file_read_start (fd); recordExtract (sysno, fname, rGroup, deleteFlag, fi, recType, subType); + log_event_start (NULL, NULL); file_read_stop (fi); if (fd != -1) close (fd);