X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=index%2Fextract.c;h=be70f55e7ed43cf86f521e63b25737a781097315;hb=3d4f0f1ddbc8b1ec6df244bb400184f086e211c8;hp=e6d1aac6f326661abdd5ea6b7e08660078bda9bc;hpb=959c65fe556f2937a2c0afc7741c473a0fe1a808;p=idzebra-moved-to-github.git

diff --git a/index/extract.c b/index/extract.c
index e6d1aac..be70f55 100644
--- a/index/extract.c
+++ b/index/extract.c
@@ -1,4 +1,4 @@
-/* $Id: extract.c,v 1.124 2002-10-16 09:30:57 heikki Exp $
+/* $Id: extract.c,v 1.128 2002-10-24 13:07:02 heikki Exp $
    Copyright (C) 1995,1996,1997,1998,1999,2000,2001,2002
    Index Data Aps
 
@@ -438,7 +438,9 @@ static int recordExtract (ZebraHandle zh,
 	zh->reg->keys.prevAttrUse = -1;
 	zh->reg->keys.prevAttrSet = -1;
 	zh->reg->keys.prevSeqNo = 0;
-	zh->reg->sortKeys = 0;
+	zh->reg->sortKeys.buf_used = 0;
+	zh->reg->sortKeys.buf_max = 0;
+	zh->reg->sortKeys.buf = 0;
 	
 	recordOffset = fi->file_moffset;
 	extractCtrl.offset = fi->file_moffset;
@@ -563,8 +565,8 @@ static int recordExtract (ZebraHandle zh,
         {
             dict_insert (zh->reg->matchDict, matchStr, sizeof(*sysno), sysno);
         }
-        extract_flushRecordKeys (zh, *sysno, 1, &zh->reg->keys);
 	extract_flushSortKeys (zh, *sysno, 1, &zh->reg->sortKeys);
+        extract_flushRecordKeys (zh, *sysno, 1, &zh->reg->keys);
 
         zh->records_inserted++;
     }
@@ -572,6 +574,7 @@ static int recordExtract (ZebraHandle zh,
     {
         /* record already exists */
         struct recKeys delkeys;
+        struct sortKeys sortKeys;
 
         rec = rec_get (zh->reg->records, *sysno);
         assert (rec);
@@ -591,7 +594,11 @@ static int recordExtract (ZebraHandle zh,
 	}
         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 (deleteFlag)
         {
@@ -630,6 +637,7 @@ static int recordExtract (ZebraHandle zh,
                 if (zh->records_processed < rGroup->fileVerboseLimit)
                     logf (LOG_LOG, "update %s %s " PRINTF_OFF_T,
                         rGroup->recordType, fname, recordOffset);
+                extract_flushSortKeys (zh, *sysno, 1, &zh->reg->sortKeys);
                 extract_flushRecordKeys (zh, *sysno, 1, &zh->reg->keys);
                 zh->records_updated++;
             }
@@ -649,17 +657,10 @@ static int recordExtract (ZebraHandle zh,
     xfree (rec->info[recInfo_delKeys]);
     if (zh->reg->keys.buf_used > 0 && rGroup->flagStoreKeys == 1)
     {
-#if 1
         rec->size[recInfo_delKeys] = zh->reg->keys.buf_used;
         rec->info[recInfo_delKeys] = zh->reg->keys.buf;
         zh->reg->keys.buf = NULL;
         zh->reg->keys.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
     {
@@ -667,6 +668,14 @@ static int recordExtract (ZebraHandle zh,
         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);
@@ -934,7 +943,7 @@ int extract_rec_in_mem (ZebraHandle zh, const char *recordType,
     zh->reg->keys.prevAttrUse = -1;
     zh->reg->keys.prevAttrSet = -1;
     zh->reg->keys.prevSeqNo = 0;
-    zh->reg->sortKeys = 0;
+    zh->reg->sortKeys.buf_used = 0;
 
     extractCtrl.subType = subType;
     extractCtrl.init = extract_init;
@@ -1003,8 +1012,8 @@ int extract_rec_in_mem (ZebraHandle zh, const char *recordType,
             dict_insert (zh->reg->matchDict, matchStr,
                          sizeof(*sysno), sysno);
         }
-        extract_flushRecordKeys (zh, *sysno, 1, &zh->reg->keys);
 	extract_flushSortKeys (zh, *sysno, 1, &zh->reg->sortKeys);
+        extract_flushRecordKeys (zh, *sysno, 1, &zh->reg->keys);
     }
     else
     {
@@ -1063,6 +1072,7 @@ int extract_rec_in_mem (ZebraHandle zh, const char *recordType,
             {
 		logf (LOG_LOG, "update %s %s %ld", recordType,
 		      fname, (long) recordOffset);
+                extract_flushSortKeys (zh, *sysno, 1, &zh->reg->sortKeys);
                 extract_flushRecordKeys (zh, *sysno, 1, &zh->reg->keys);
             }
         }
@@ -1172,7 +1182,7 @@ int explain_extract (void *handle, Record rec, data1_node *n)
     zh->reg->keys.prevAttrUse = -1;
     zh->reg->keys.prevAttrSet = -1;
     zh->reg->keys.prevSeqNo = 0;
-    zh->reg->sortKeys = 0;
+    zh->reg->sortKeys.buf_used = 0;
     
     extractCtrl.init = extract_init;
     extractCtrl.tokenAdd = extract_token_add;
@@ -1189,11 +1199,15 @@ int explain_extract (void *handle, Record rec, data1_node *n)
     if (rec->size[recInfo_delKeys])
     {
 	struct recKeys delkeys;
-	struct sortKey *sortKeys = 0;
+	struct sortKeys sortkeys;
 
 	delkeys.buf_used = rec->size[recInfo_delKeys];
 	delkeys.buf = rec->info[recInfo_delKeys];
-	extract_flushSortKeys (zh, rec->sysno, 0, &sortKeys);
+
+	sortkeys.buf_used = rec->size[recInfo_sortKeys];
+	sortkeys.buf = rec->info[recInfo_sortKeys];
+
+	extract_flushSortKeys (zh, rec->sysno, 0, &sortkeys);
 	extract_flushRecordKeys (zh, rec->sysno, 0, &delkeys);
     }
     extract_flushRecordKeys (zh, rec->sysno, 1, &zh->reg->keys);
@@ -1204,6 +1218,13 @@ int explain_extract (void *handle, Record rec, data1_node *n)
     rec->info[recInfo_delKeys] = zh->reg->keys.buf;
     zh->reg->keys.buf = NULL;
     zh->reg->keys.buf_max = 0;
+
+    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;
+
     return 0;
 }
 
@@ -1222,7 +1243,14 @@ void extract_flushRecordKeys (ZebraHandle zh, SYSNO sysno,
 
     if (!zh->reg->key_buf)
     {
-	int mem = 8*1024*1024;
+	int mem= 1024*1024* atoi( res_get_def( zh->res, "memmax", "8"));
+	if (mem <= 0)
+	{
+	    logf(LOG_WARN, "Invalid memory setting, using default 8 MB");
+	    mem= 1024*1024*8;
+	}
+	/* FIXME: That "8" should be in a default settings include */
+	/* not hard-coded here! -H */
 	zh->reg->key_buf = (char**) xmalloc (mem);
 	zh->reg->ptr_top = mem/sizeof(char*);
 	zh->reg->ptr_i = 0;
@@ -1475,9 +1503,48 @@ void extract_add_index_string (RecWord *p, const char *string,
 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;
+
+        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;
+        if (p->attrSet == set && p->attrUse == use)
+            return;
+    }
+    assert (off == sk->buf_used);
+    
+    if (sk->buf_used + IT_MAX_WORD > sk->buf_max)
+    {
+        char *b;
+        
+        b = (char *) xmalloc (sk->buf_max += 128000);
+        if (sk->buf_used > 0)
+            memcpy (b, sk->buf, sk->buf_used);
+        xfree (sk->buf);
+        sk->buf = b;
+    }
+    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;
@@ -1492,6 +1559,7 @@ static void extract_add_sort_string (RecWord *p, const char *string,
 
     sk->attrSet = p->attrSet;
     sk->attrUse = p->attrUse;
+#endif
 }
 
 void extract_add_string (RecWord *p, const char *string, int length)
@@ -1616,22 +1684,28 @@ void extract_schema_add (struct recExtractCtrl *p, Odr_oid *oid)
 }
 
 void extract_flushSortKeys (ZebraHandle zh, SYSNO sysno,
-                            int cmd, struct sortKey **skp)
+                            int cmd, struct sortKeys *sk)
 {
-    struct sortKey *sk = *skp;
     SortIdx sortIdx = zh->reg->sortIdx;
+    size_t off = 0;
 
     sortIdx_sysno (sortIdx, sysno);
-    while (sk)
+
+    while (off < sk->buf_used)
     {
-	struct sortKey *sk_next = sk->next;
-	sortIdx_type (sortIdx, sk->attrUse);
-	sortIdx_add (sortIdx, sk->string, sk->length);
-	xfree (sk->string);
-	xfree (sk);
-	sk = sk_next;
+        int set, use, slen, l;
+        
+        off += key_SU_decode(&set, sk->buf + off);
+        off += key_SU_decode(&use, sk->buf + off);
+        off += key_SU_decode(&slen, sk->buf + off);
+        
+        sortIdx_type(sortIdx, use);
+        if (cmd == 1)
+            sortIdx_add(sortIdx, sk->buf + off, slen);
+        else
+            sortIdx_add(sortIdx, "", 1);
+        off += slen;
     }
-    *skp = 0;
 }
 
 void encode_key_init (struct encode_info *i)
@@ -1724,6 +1798,7 @@ void encode_key_write (char *k, struct encode_info *i, FILE *outf)
         while ((*bp++ = *k++))
             ;
 	i->keylen= bp - i->buf -1;    
+	assert(i->keylen+1+sizeof(struct it_key) < ENCODE_BUFLEN);
     }
     else
     {
@@ -1771,25 +1846,6 @@ void encode_key_write (char *k, struct encode_info *i, FILE *outf)
 	i->prevseq=key.seqno;
 	i->prevcmd=*k;
     }
-#ifdef SKIPTHIS_OLDCODE
-    bp = encode_key_int ( (key.sysno - i->sysno) * 2 + *k, bp);
-    if (i->sysno != key.sysno)
-    {
-        i->sysno = key.sysno;
-        i->seqno = 0;
-    }
-    else if (!i->seqno && !key.seqno && i->cmd == *k)
-	return;
-    bp = encode_key_int (key.seqno - i->seqno, bp);
-    i->seqno = key.seqno;
-    i->cmd = *k;
-    if (fwrite (i->buf, bp - i->buf, 1, outf) != 1)
-    {
-        logf (LOG_FATAL|LOG_ERRNO, "fwrite");
-        exit (1);
-    }
-    i->keylen=0; /* ok, it's written, forget it */
-#endif
 }
 
 void encode_key_flush (struct encode_info *i, FILE *outf)