2001-08-10 Not Zed <NotZed@Ximian.com>
* wordindexmem.c (sync_cache_entry): NOOP if writing to a failed
file.
(word_index_pre): NOOP if failed file.
(ibex_create_word_index_mem): Setup blocks value.
** Added internal exception handling to libibex, in the case of
errors with on-disk data, exceptions are returned.
* block.c (ibex_block_cache_open): Detect fatal errors below us
and clean up appropriately.
(ibex_block_cache_fail): New function to handle the failure, and
keep track of it.
(ibex_block_cache_sync): Dont do anything if we've failed on this
file.
* disktail.c (tail_compress): Add blocks param so we can assert
for exceptions.
* hash.c, block.c disktail.c: g_assert->ibex_block_cache_assert
where dealing with external data.
* hash.c (hash_info): Add index param so we can assert for exceptions.
* ibex_block.c (ibex_index_buffer): Setjmp before calling into
internal routines.
(ibex_save): "
(ibex_unindex): "
(ibex_find): "
(ibex_find_name): "
(ibex_contains_name): "
(ibex_reset): Function to reset the index file if we have an
error, call when we have an error.
* block.h (ibex_block_cache_assert): Create assertion/exception
macros, and include a setjmp buffer for returning it.
2001-08-09 Not Zed <NotZed@Ximian.com>
* Makefile.am (libibex_la_SOURCES): Remove wordindex.c,
wordindexmem is what's used.
svn path=/trunk/; revision=11864
faster when starting indexing of new data.
2000-10-26 Not Zed <NotZed@HelixCode.com>
* block.c (ibex_block_cache_open): Use IBEX_VERSION rather than
hardcoded version string.
* ibex_internal.h (IBEX_VERSION): Bumped version again. This time
I did change the index format.
* hash.c (struct _hashroot): Add a linked list of keys to the table.
(struct _hashblock): Added a next pointer as a block number.
(hash_insert): Link new key blocks into the key block list.
(struct _HASHCursor): Renamed block to key and added a block item.
(hash_cursor_next): Changed to go through the linked list of all
hash items rather than through each hash chain separately. >>
faster.
(ibex_hash_dump_rec): Remove a warning.
svn path=/trunk/; revision=6192
before, and be more bugfree than ever!
2000-10-25 Not Zed <NotZed@HelixCode.com>
* ibex_internal.h (IBEX_VERSION): Bumped to another version. The
file format hasn't changed, but earlier bugs may create invalid
files.
* block.c (ibex_block_read): Use the root data directly.
(ibex_block_cache_open): As well.
(ibex_block_get): And here too.
(ibex_block_cache_sync): Sync the root block directly here.
* block.h: Pad root block out to 1024 bytes.
Added root block to struct _memcache.
* disktail.c (tail_get): Dirty the root block.
(tail_get): Fix for changes to root access.
(disk_remove): And here too.
* wordindexmem.c (sync_cache_entry): Handle the case of not having
any files in the list, which can happen now.
(word_index_pre): Make sure we set the wordid on the new cache
entry.
* ibex_block.c (ibex_save): Sigh. Pass the right argument to
index_post.
* block.c (ibex_block_cache_open): Create a word_index_mem for
indexing the words, rather than a word_index.
* ibex_block.c (ibex_index_buffer): If we haven't called index_pre
yet, do it before indexing anything.
(ibex_save): If wehave called index_pre previously, call
index_post.
(ibex_close): And same for here.
* index.h: Added a cursor class, and cursor retrieval function for
iterating through an index's keys.
* wordindexmem.c (ibex_create_word_index_mem): New word class,
similar to wordindex, but meant to be faster for updates.
(word_index_pre): Implement. We load all keys into memory.
(word_index_post): Implement. We sync and free all keys.
(find): Remove lru code, its no longer a cache, but a lookup
table.
(add_index_cache): Remove lru code here too.
(find_name): And here.
(word_flush): Flush the hashtable direct.
(word_close): Call flush to flush, rather than doing it ourselves.
(add_index_cache): If we are in an index state, we can assume a
cache miss == a new word.
(word_index_post): Maintain whether or not we are in an index
state, and the depth of the state.
(word_index_pre): Likewise. Dont reread the index if we have
already.
(cache_sanity): Fixed for struct changes.
* wordindex.h (IBEXWordClass): Added functions to prepare/cleanup
for lots of indexing. i.e. can be used to optimise indexing speed
at the cost of extra memory usage during the indexing process.
* hash.c (hash_cursor_create): Create a new cursor for iterating through a
hashtable.
(hash_cursor_close): 'close' the cursor. It is upto the
application to close any cursors it creates.
(hash_cursor_next): Goto the next key id.
(hash_cursor_next_key): Goto the next key, reutrn the key.
(hash_get_cursor): Return a cursor object.
* wordindex.c (word_index_post):
(word_index_pre): Added (empty) callbacks for pre/post functions.
svn path=/trunk/; revision=6165
2000-10-24 Not Zed <NotZed@HelixCode.com>
* dumpindex.c: Dumps the contents of indexs.
* hash.c (ibex_hash_dump_rec): Also print the word count.
* wordindex.c (unindex_name): Cross-check the cache as well.
svn path=/trunk/; revision=6139
2000-10-12 Not Zed <NotZed@HelixCode.com>
* index.h: Added some stat stuff.
* wordindex.c (struct _wordcache): Changed files[] to be a pointer
to an allocated block/or an individual item.
(find): Fix for changes to struct.
(find_name): "
(sync_cache_entry): "
(add): "
(add_list): "
(add_index_cache): Free the cache file array if it was created.
(word_flush): And here.
(word_close): And here too.
(ibex_create_word_index): Double the size of the hashtables.
(word_flush): Make sure we reset the wordcount to 0 if we remove
the list items. DOH.
(add_index_cache): Use a slightly more sohpisticated aging
algorithm to remove expired nodes.
2000-10-10 Not Zed <NotZed@HelixCode.com>
* hash.c (hash_find):
(hash_remove):
(hash_insert): Truncate key if it is too big to fit in a
single block to MAX_KEYLEN bytes.
svn path=/trunk/; revision=5882
2000-10-10 Not Zed <NotZed@HelixCode.com>
* hash.c (hash_find):
(hash_remove):
(hash_insert): Truncate key if it is too big to fit in a
single block to MAX_KEYLEN bytes.
svn path=/trunk/; revision=5815
