Changeset 1944

Timestamp:

10/21/07 16:57:52 (9 months ago)

Author:

jmruiz

Message:

Remove old db_native code.

Files:

• swish-e/branches/2.6/src/array.c (deleted)
• swish-e/branches/2.6/src/array.h (deleted)
• swish-e/branches/2.6/src/btree.c (deleted)
• swish-e/branches/2.6/src/btree.h (deleted)
• swish-e/branches/2.6/src/compress.c (modified) (1 diff)
• swish-e/branches/2.6/src/config.h (modified) (1 diff)
• swish-e/branches/2.6/src/db_native.c (modified) (90 diffs)
• swish-e/branches/2.6/src/db_native.h (modified) (7 diffs)
• swish-e/branches/2.6/src/db_read.c (modified) (15 diffs)
• swish-e/branches/2.6/src/db_write.c (modified) (12 diffs)
• swish-e/branches/2.6/src/dump.c (modified) (8 diffs)
• swish-e/branches/2.6/src/extprog.c (modified) (2 diffs)
• swish-e/branches/2.6/src/fhash.c (deleted)
• swish-e/branches/2.6/src/fhash.h (deleted)
• swish-e/branches/2.6/src/index.c (modified) (9 diffs)
• swish-e/branches/2.6/src/list.c (modified) (1 diff)
• swish-e/branches/2.6/src/merge.c (modified) (3 diffs)
• swish-e/branches/2.6/src/proplimit.c (modified) (1 diff)
• swish-e/branches/2.6/src/ramdisk.c (deleted)
• swish-e/branches/2.6/src/ramdisk.h (deleted)
• swish-e/branches/2.6/src/result_sort.c (modified) (1 diff)
• swish-e/branches/2.6/src/search.c (modified) (15 diffs)
• swish-e/branches/2.6/src/sw_db.h (modified) (6 diffs)
• swish-e/branches/2.6/src/swish.c (modified) (6 diffs)
• swish-e/branches/2.6/src/swish.h (modified) (2 diffs)
• swish-e/branches/2.6/src/worddata.c (deleted)
• swish-e/branches/2.6/src/worddata.h (deleted)

swish-e/branches/2.6/src/compress.c

@@ -47 +47 @@
-#include "index.h"
-#include "hash.h"
-#include "ramdisk.h"
-#include "swish_qsort.h"
-#include "file.h"

swish-e/branches/2.6/src/config.h

@@ -374 +374 @@
-#define SORT_FILENAMES 0
-
-/* 2001/10 jmruiz -- Added BTREE schema to store words */
-
-//#define USE_BTREE  /* use --enable-incremental at configure time */
-
-/* If USE_BTREE then enable the ARRAY code for the pre-sorted indexes */
-
-#define sw_fopen fopen
-#define sw_fclose fclose

swish-e/branches/2.6/src/db_native.c

@@ -42 +42 @@
-#include "sw_db.h"
-#include "swish_qsort.h"
-#include "ramdisk.h"
-#include "db_native.h"
-
-#ifdef USE_BTREE
-#define WRITE_WORDS_RAMDISK 0
-#else
-#define WRITE_WORDS_RAMDISK 1
-#endif
-
-/* MAX_PATH used by Herman's NEAR feature but it seems to be a Windoze thing 
@@ -72 +66 @@
-    Db->DB_name = (char *) estrdup("native");
-
-    Db->DB_Create = DB_Create_Native;
-    Db->DB_Open = DB_Open_Native;
-    Db->DB_Close = DB_Close_Native;
-    Db->DB_Remove = DB_Remove_Native;
-
-    Db->DB_InitWriteHeader = DB_InitWriteHeader_Native;
-    Db->DB_WriteHeaderData = DB_WriteHeaderData_Native;
-    Db->DB_EndWriteHeader = DB_EndWriteHeader_Native;
-
-    Db->DB_InitReadHeader = DB_InitReadHeader_Native;
-    Db->DB_ReadHeaderData = DB_ReadHeaderData_Native;
-    Db->DB_EndReadHeader = DB_EndReadHeader_Native;
-
-    Db->DB_InitWriteWords = DB_InitWriteWords_Native;
-    Db->DB_GetWordID = DB_GetWordID_Native;
-    Db->DB_WriteWord = DB_WriteWord_Native;
-
-#ifndef USE_BTREE
-    Db->DB_WriteWordHash = DB_WriteWordHash_Native;
-#else
-    Db->DB_UpdateWordID = DB_UpdateWordID_Native;
-    Db->DB_DeleteWordData = DB_DeleteWordData_Native;
-#endif
-
-    Db->DB_WriteWordData = DB_WriteWordData_Native;
-    Db->DB_EndWriteWords = DB_EndWriteWords_Native;
-
-    Db->DB_InitReadWords = DB_InitReadWords_Native;
-    Db->DB_ReadWordHash = DB_ReadWordHash_Native;
-    Db->DB_ReadFirstWordInvertedIndex = DB_ReadFirstWordInvertedIndex_Native;
-    Db->DB_ReadNextWordInvertedIndex = DB_ReadNextWordInvertedIndex_Native;
-    Db->DB_ReadWordData = DB_ReadWordData_Native;
-    Db->DB_EndReadWords = DB_EndReadWords_Native;
-
-    Db->DB_WriteFileNum = DB_WriteFileNum_Native;
-    Db->DB_ReadFileNum = DB_ReadFileNum_Native;
-    Db->DB_CheckFileNum = DB_CheckFileNum_Native;
-    Db->DB_RemoveFileNum = DB_RemoveFileNum_Native;
-
-    Db->DB_InitWriteSortedIndex = DB_InitWriteSortedIndex_Native;
-    Db->DB_WriteSortedIndex = DB_WriteSortedIndex_Native;
-    Db->DB_EndWriteSortedIndex = DB_EndWriteSortedIndex_Native;
-
-    Db->DB_InitReadSortedIndex = DB_InitReadSortedIndex_Native;
-    Db->DB_ReadSortedIndex = DB_ReadSortedIndex_Native;
-    Db->DB_ReadSortedData = DB_ReadSortedData_Native;
-    Db->DB_EndReadSortedIndex = DB_EndReadSortedIndex_Native;
-
-    Db->DB_InitWriteProperties = DB_InitWriteProperties_Native;
-    Db->DB_WriteProperty = DB_WriteProperty_Native;
-    Db->DB_WritePropPositions = DB_WritePropPositions_Native;
-    Db->DB_ReadProperty = DB_ReadProperty_Native;
-    Db->DB_ReadPropPositions = DB_ReadPropPositions_Native;
-    Db->DB_Reopen_PropertiesForRead = DB_Reopen_PropertiesForRead_Native;
-
-#ifdef USE_BTREE
-    Db->DB_WriteTotalWordsPerFile = DB_WriteTotalWordsPerFile_Native;
-    Db->DB_ReadTotalWordsPerFile = DB_ReadTotalWordsPerFile_Native;
-#endif
-
-    sw->Db = Db;
-
@@ -161 +95 @@
-*/
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
-    long propindex, totwords, presorted, header;
-    SW_DB->unique_ID = readlong(SW_DB->fp_prop, sw_fread);
@@ -217 +129 @@
-        return;
-    }
-#endif
-}
-
@@ -230 +141 @@
-    SW_DB->sw = sw;  /* for error messages */
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
-
-    SW_DB->dbname = estrdup(dbname);
@@ -296 +194 @@
-}
-
-
-
+
+
+
+
+
+
+
+
+
+
-{
-DB *dbp;
@@ -303 +209 @@
-    if((db_ret = db_create(&dbp, NULL, 0)))
-        progerrno("Couldn't create BERKELEY DB resource");
+    if(dup)
+    {
+        if((db_ret = dbp->set_flags(dbp, DB_DUPSORT)))
+            progerrno("Couldn't set DB_DUPSORT in DB Berkeley file \"%s\": ", filename);
+        if((db_ret = dbp->set_dup_compare(dbp,compare_packed_long)))
+            progerrno("Couldn't set DB_DUPSORT_ROUTINE in DB Berkeley file \"%s\": ", filename);
+    }
-    if((db_ret = dbp->open(dbp,NULL,filename,NULL,db_type,db_flags,0)))
-    {
@@ -312 +225 @@
-}
-
-
-
-
+, int dup
+
+, dup
-}
-
@@ -346 +259 @@
-    }
-}
-
-
-
-
-
-
-
+
+
+
-{
-    long    swish_magic;
-    char   *filename;
-#ifdef USE_BTREE
-    FILE   *fp_tmp;
-#else
-    int     i;
-#endif
-    struct Handle_DBNative *SW_DB;
-
@@ -384 +289 @@
-
-
-    /* Create index File */
-#ifndef USE_BTREE
-    CreateEmptyFile(filename);
-    if (!(SW_DB->fp = openIndexFILEForReadAndWrite(filename)))
-        progerrno("Couldn't create the index file \"%s\": ", filename);
-
-    SW_DB->cur_index_file = estrdup(filename);
-    printlong(SW_DB->fp, swish_magic, sw_fwrite);
-    printlong(SW_DB->fp, SW_DB->unique_ID, sw_fwrite);
-#endif
-
-    /* Create property File */
-    strcpy(filename, dbname);
@@ -411 +305 @@
-    printlong(SW_DB->fp_prop, SW_DB->unique_ID, sw_fwrite);
-
-
-
-
+
-    strcpy(filename, dbname);
-    strcat(filename, BTREE_EXTENSION);
@@ -420 +312 @@
-    SW_DB->tmp_btree = 1;
-#endif
-
+
+
-    SW_DB->cur_btree_file = estrdup(filename);
-
@@ -431 +324 @@
-    SW_DB->tmp_worddata = 1;
-#endif
-
+,0
-    SW_DB->cur_worddata_file = estrdup(filename);
-
@@ -501 +394 @@
-    SW_DB->tmp_hashfile = 1;
-#endif
-
+,0
-    SW_DB->cur_hashfile_file = estrdup(filename);
-
-
-#endif
-
-    efree(filename);
-
-#ifndef USE_BTREE
-    for (i = 0; i < MAXCHARS; i++)
-        SW_DB->offsets[i] = (sw_off_t)0;
-    for (i = 0; i < VERYBIGHASHSIZE; i++)
-        SW_DB->hashoffsets[i] = (sw_off_t)0;
-    for (i = 0; i < VERYBIGHASHSIZE; i++)
-        SW_DB->lasthashval[i] = (sw_off_t)0;
-
-    /* Reserve space for offset pointers */
-    SW_DB->offsetstart = sw_ftell(SW_DB->fp);
-    for (i = 0; i < MAXCHARS; i++)
-        printfileoffset(SW_DB->fp, (sw_off_t) 0, sw_fwrite);
-
-    SW_DB->hashstart = sw_ftell(SW_DB->fp);
-    for (i = 0; i < VERYBIGHASHSIZE; i++)
-        printfileoffset(SW_DB->fp, (sw_off_t) 0, sw_fwrite);
-#endif
-
-    return (void *) SW_DB;
-}
@@ -532 +404 @@
-
-/*******************************************************************
-DB_Open_Native
+_DB_Open
-*
-*******************************************************************/
-
-DB_Open_Native
+_DB_Open
-{
-    struct Handle_DBNative *SW_DB;
-    FILE   *(*openRoutine)(char *) = NULL;
-    char   *s;
-#ifdef USE_BTREE
-    u_int32_t db_flags;
-#else
-    int     i;
-#endif
-
-    switch(mode)
@@ -551 +419 @@
-    case DB_READ:
-        openRoutine = openIndexFILEForRead;
-#ifdef USE_BTREE
-        db_flags = DB_RDONLY;
-#endif
-        break;
-    case DB_READWRITE:
-        openRoutine = openIndexFILEForReadAndWrite;
-#ifdef USE_BTREE
-        db_flags = 0;
-#endif
-        break;
-    default:
-        openRoutine = openIndexFILEForRead;
-#ifdef USE_BTREE
-        db_flags = DB_RDONLY;
-#endif
-    }
-
@@ -571 +433 @@
-    SW_DB->mode = mode;
-
-#ifndef USE_BTREE
-    /* Open index File */
-    if (!(SW_DB->fp = openRoutine(dbname)))
-    {
-        set_progerrno(INDEX_FILE_ERROR, SW_DB->sw, "Could not open the index file '%s': ", dbname);
-        return (void *) SW_DB;
-    }
-
-    SW_DB->cur_index_file = estrdup(dbname);
-#endif
-
-    s = emalloc(strlen(dbname) + strlen(PROPFILE_EXTENSION) + 1);
-
@@ -594 +445 @@
-
-    SW_DB->cur_prop_file = s;
-
-#ifdef USE_BTREE
-
-    s = emalloc(strlen(dbname) + strlen(BTREE_EXTENSION) + 1);
-    strcpy(s, dbname);
-    strcat(s, BTREE_EXTENSION);
-
+, 1
-
-    SW_DB->cur_btree_file = s;
@@ -659 +508 @@
-    strcpy(s, dbname);
-    strcat(s, WORDDATA_EXTENSION);
-
+, 0
-    SW_DB->cur_worddata_file = s;
-
@@ -665 +514 @@
-    strcpy(s, dbname);
-    strcat(s, HASHFILE_EXTENSION);
-
+, 0
-    SW_DB->cur_hashfile_file = s;
-
-
-#endif
-
-    /* Validate index files */
-
+_
-    if ( SW_DB->sw->lasterror )
-        return (void *) SW_DB;
-
-#ifndef USE_BTREE
-    /* Read offsets lookuptable */
-    SW_DB->offsetstart = sw_ftell(SW_DB->fp);
-    for (i = 0; i < MAXCHARS; i++)
-        SW_DB->offsets[i] = readfileoffset(SW_DB->fp, sw_fread);
-
-    /* Read hashoffsets lookuptable */
-    SW_DB->hashstart = sw_ftell(SW_DB->fp);
-    for (i = 0; i < VERYBIGHASHSIZE; i++)
-        SW_DB->hashoffsets[i] = readfileoffset(SW_DB->fp, sw_fread);
-#else
-
-    /* Put the file pointer of props, propindex and totwords files 
@@ -696 +530 @@
-    sw_fseek(SW_DB->fp_propindex,(sw_off_t)0,SEEK_END);
-    sw_fseek(SW_DB->fp_totwords,(sw_off_t)0,SEEK_END);
-#endif
-
-    return (void *) SW_DB;
@@ -708 +541 @@
-*****************************************************************/
-
-DB_Close_File_Nativ
+_DB_Close_Fil
-{
-#if defined(_WIN32) && !defined(__CYGWIN__)
@@ -763 +596 @@
-
-
-DB_Close_Nativ
+_DB_Clos
-{
-    struct Handle_DBNative *SW_DB = (struct Handle_DBNative *) db;
-#ifndef USE_BTREE
-    int     i;
-    FILE   *fp = SW_DB->fp;
-#endif
-
-
-    /* Close (and rename) property file, if it's open */
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
-
-    /* Close (and rename) worddata file, if it's open */
@@ -805 +613 @@
-    {
-        /* Close (and rename) property file, if it's open */
-DB_Close_File_Nativ
+_DB_Close_Fil
-    }
-    /* Close (and rename) totwords file, if it's open */
@@ -811 +619 @@
-    {
-        /* Close (and rename) totwords file, if it's open */
-DB_Close_File_Nativ
+_DB_Close_Fil
-    }
-    /* Close (and rename) presorted index file, if it's open */
-    if(SW_DB->fp_presorted)
-    {
-DB_Close_File_Nativ
+_DB_Close_Fil
-    }
-    /* Close (and rename) header index file, if it's open */
-    if(SW_DB->fp_header)
-    {
-DB_Close_File_Nativ
+_DB_Close_Fil
-    }
-
-    /* Close (and rename) hash-file index file, if it's open */
-    CloseBerkeleyFile(&SW_DB->db_hashfile, &SW_DB->cur_hashfile_file, &SW_DB->tmp_hashfile);
-#endif
-
-
-    if (SW_DB->dbname)
@@ -834 +640 @@
-}
-
-DB_Remove_Nati
+_DB_Remo
-{
-    struct Handle_DBNative *SW_DB = (struct Handle_DBNative *) db;
@@ -856 +662 @@
-/*--------------------------------------------*/
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-    /* End of header delimiter */
@@ -891 +687 @@
-}
-
-
-
-
-
-
-
-
-
+
+
+
+
-
-    compress1(id, fp, sw_fputc);
@@ -909 +701 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-    tmp = uncompress1(fp, sw_fgetc);
@@ -951 +737 @@
-}
-
-DB_EndReadHeader_Native
+_DB_EndReadHeader
-{
-    return 0;
@@ -962 +748 @@
-/*--------------------------------------------*/
-
-
-
-
-
-
-
-
-
+
+
-    return 0;
-}
@@ -984 +764 @@
-}
-
-
-
-
+
+
+
+
+
+
+
-    struct Handle_DBNative *SW_DB = (struct Handle_DBNative *) db;
-    FILE   *fp = (FILE *) SW_DB->fp;
-    int     i,
-            wordlen;
-    sw_off_t wordID, word_pos;
-    sw_off_t f_hash_offset, f_offset;
-
-    /* Free hash zone */
-    Mem_ZoneFree(&SW_DB->hashzone);
-
-    /* Now update word's data offset into the list of words */
-    /* Simple check  words and worddata must match */
-
-    if (! SW_DB->num_words)
-        progerr("No unique words indexed");
-
-    if (SW_DB->num_words != SW_DB->wordhash_counter)
-        progerrno("Internal DB_native error - SW_DB->num_words != SW_DB->wordhash_counter: ");
-
-    if (SW_DB->num_words != SW_DB->worddata_counter)
-        progerrno("Internal DB_native error - SW_DB->num_words != SW_DB->worddata_counter: ");
-
-    /* Sort wordhashdata to be written to allow sequential writes */
-    swish_qsort(SW_DB->wordhashdata, SW_DB->num_words, 3 * sizeof(sw_off_t), cmp_wordhashdata);
-
-    if (WRITE_WORDS_RAMDISK)
-    {
-        fp = (FILE *) SW_DB->rd;
-    }
-    for (i = 0; i < SW_DB->num_words; i++)
-    {
-        wordID = SW_DB->wordhashdata[3 * i];
-        f_hash_offset = SW_DB->wordhashdata[3 * i + 1];
-        f_offset = SW_DB->wordhashdata[3 * i + 2];
-
-        word_pos = wordID;
-        if (WRITE_WORDS_RAMDISK)
-        {
-            word_pos -= SW_DB->offsets[WORDPOS];
-        }
-        /* Position file pointer in word */
-        SW_DB->w_seek(fp, word_pos, SEEK_SET);
-        /* Jump over word length and word */
-        wordlen = uncompress1(fp, SW_DB->w_getc); /* Get Word length */
-        SW_DB->w_seek(fp, (sw_off_t) wordlen, SEEK_CUR); /* Jump Word */
-        /* Write offset to next chain */
-        printfileoffset(fp, f_hash_offset, SW_DB->w_write);
-        /* Write offset to word data */
-        printfileoffset(fp, f_offset, SW_DB->w_write);
-    }
-
-    efree(SW_DB->wordhashdata);
-    SW_DB->wordhashdata = NULL;
-    SW_DB->worddata_counter = 0;
-    SW_DB->wordhash_counter = 0;
-
-    if (WRITE_WORDS_RAMDISK)
-    {
-        unsigned char buffer[4096];
-        sw_off_t    ramdisk_size;
-        long    read = 0;
-
-        ramdisk_seek((FILE *) SW_DB->rd, (sw_off_t)0, SEEK_END);
-        ramdisk_size = ramdisk_tell((FILE *) SW_DB->rd);
-        /* Write ramdisk to fp end free it */
-        sw_fseek((FILE *) SW_DB->fp, SW_DB->offsets[WORDPOS], SEEK_SET);
-        ramdisk_seek((FILE *) SW_DB->rd, (sw_off_t)0, SEEK_SET);
-        while (ramdisk_size)
-        {
-            read = ramdisk_read(buffer, 4096, 1, (FILE *) SW_DB->rd);
-            if ( sw_fwrite(buffer, read, 1, SW_DB->fp) != 1 )
-                progerrno("Error while flushing ramdisk to disk:");
-
-            ramdisk_size -= (sw_off_t)read;
-        }
-        ramdisk_close((FILE *) SW_DB->rd);
-    }
-    /* Get last word file offset - For the last word, this will be
-    ** used to delimite the last word in the index file
-    ** In other words. This is the file offset where no more words
-    ** are added.
-    */
-    SW_DB->offsets[ENDWORDPOS] = sw_ftell(SW_DB->fp);
-
-    /* Restore file pointer at the end of file */
-    sw_fseek(SW_DB->fp, (sw_off_t)0, SEEK_END);
-    if ( sw_fputc(0, SW_DB->fp) == EOF )           /* End of words mark */
-        progerrno("sw_fputc() failed writing null: ");
-
-#endif
-
-    return 0;
-}
-
-#ifndef USE_BTREE
-sw_off_t    DB_GetWordID_Native(void *db)
-{
-    struct Handle_DBNative *SW_DB = (struct Handle_DBNative *) db;
-    FILE   *fp = SW_DB->fp;
-    sw_off_t    pos = (sw_off_t)0;
-
-    if (WRITE_WORDS_RAMDISK)
-    {
-        if (!SW_DB->rd)
-        {
-            /* ramdisk size as suggested by Bill Meier */
-            SW_DB->rd = ramdisk_create("RAM Disk: write words", 32 * 4096);
-        }
-        pos = SW_DB->offsets[WORDPOS];
-        fp = (FILE *) SW_DB->rd;
-    }
-    pos += SW_DB->w_tell(fp);
-
-    return pos;                 /* Native database uses position as a Word ID */
-}
-
-int     DB_WriteWord_Native(char *word, sw_off_t wordID, void *db)
-{
-    int     i,
-            wordlen;
-    struct Handle_DBNative *SW_DB = (struct Handle_DBNative *) db;
-
-    FILE   *fp = SW_DB->fp;
-
-    i = (int) ((unsigned char) word[0]);
-
-    if (!SW_DB->offsets[i])
-        SW_DB->offsets[i] = wordID;
-
-
-    /* Write word length, word and a NULL offset */
-    wordlen = strlen(word);
-
-    if (WRITE_WORDS_RAMDISK)
-    {
-        fp = (FILE *) SW_DB->rd;
-    }
-    compress1(wordlen, fp, SW_DB->w_putc);
-    SW_DB->w_write(word, wordlen, sizeof(char), fp);
-
-    printfileoffset(fp, (sw_off_t) 0, SW_DB->w_write); /* hash chain */
-    printfileoffset(fp, (sw_off_t) 0, SW_DB->w_write); /* word's data pointer */
-
-    SW_DB->num_words++;
-
-    return 0;
-}
-
-int offsethash(sw_off_t offset)
-{
-    return (int)(offset % (sw_off_t) BIGHASHSIZE);
-}
-
-long    DB_WriteWordData_Native(sw_off_t wordID, unsigned char *worddata, int data_size, int saved_bytes, void *db)
-{
-    struct Handle_DBNative *SW_DB = (struct Handle_DBNative *) db;
-    FILE   *fp = SW_DB->fp;
-    struct numhash *numhash;
-    int     numhashval;
-
-    /* We must be at the end of the file */
-
-    if (!SW_DB->worddata_counter)
-    {
-        /* We are starting writing worddata */
-        /* If inside a ramdisk we must preserve its space */
-        if (WRITE_WORDS_RAMDISK)
-        {
-            sw_off_t    ramdisk_size;
-
-            ramdisk_seek((FILE *) SW_DB->rd, (sw_off_t)0, SEEK_END);
-            ramdisk_size = ramdisk_tell((FILE *) SW_DB->rd);
-            /* Preserve ramdisk size in DB file  */
-            /* it will be written later */
-            sw_fseek((FILE *) SW_DB->fp, ramdisk_size, SEEK_END);
-        }
-    }
-    /* Search for word's ID */
-    numhashval = offsethash(wordID);
-    for (numhash = SW_DB->hash[numhashval]; numhash; numhash = numhash->next)
-        if (SW_DB->wordhashdata[3 * numhash->index] == wordID)
-            break;
-    if (!numhash)
-        progerrno("Internal db_native.c error in DB_WriteWordData_Native: ");
-    SW_DB->wordhashdata[3 * numhash->index + 2] = sw_ftell(fp);
-
-    SW_DB->worddata_counter++;
-
-    /* Write the worddata to disk */
-    /* Write in the form:  <data_size><saved_bytes><worddata> */
-    /* If there is not any compression then saved_bytes is 0 */
-    compress1(data_size, fp, sw_fputc);
-    compress1(saved_bytes, fp, sw_fputc);
-    if ( sw_fwrite(worddata, data_size, 1, fp) != 1 )
-        progerrno("Error writing to device while trying to write %d bytes: ", data_size );
-
-
-    /* A NULL byte to indicate end of word data */
-    if ( sw_fputc(0, fp) == EOF )
-        progerrno( "sw_fputc() returned error writing null: ");
-
-
-
-    return 0;
-}
-
-#else
-
-sw_off_t    DB_GetWordID_Native(void *db)
-{
-    struct Handle_DBNative *SW_DB = (struct Handle_DBNative *) db;
-
-    return (sw_off_t) SW_DB->worddata_counter;
-}
-
-DB_WriteWord_Native
+_DB_WriteWord
-{
-    struct Handle_DBNative *SW_DB = (struct Handle_DBNative *) db;
@@ -1218 +792 @@
-    data.size = sizeof(wordID);
-
-DB_NOOVERWRITE
+0
-
-    if(ret != 0)
@@ -1229 +803 @@
-}
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
-{
-    unsigned char stack_buffer[8192]; /* just to avoid emalloc,efree overhead */
@@ -1270 +810 @@
-    DBT key,data;
-    db_recno_t recno;
+    int ret;
-
-    struct Handle_DBNative *SW_DB = (struct Handle_DBNative *) db;
@@ -1285 +826 @@
-    /* Put bytes worddata buf */
-    memcpy(p,worddata,data_size);
-
-    SW_DB->worddata_counter++;
-
-    /* Write the worddata to disk */
@@ -1296 +835 @@
-    data.data = buf;
-    data.size = buf_size;
-
-
+
+
+
+
+
+
+
+
+
+
+
-
-    if(buf != stack_buffer)
@@ -1304 +852 @@
-}
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-