* Sebastian Hammer, Adam Dickmeiss
*
* $Log: memory.c,v $
- * Revision 1.5 1994-09-28 16:58:33 quinn
+ * Revision 1.9 1995-12-06 15:48:46 quinn
+ * Fixed update-problem.
+ *
+ * Revision 1.8 1995/12/06 14:48:27 quinn
+ * Fixed some strange bugs.
+ *
+ * Revision 1.7 1995/12/06 09:59:46 quinn
+ * Fixed memory-consumption bug in memory.c
+ * Added more blocksizes to the default ISAM configuration.
+ *
+ * Revision 1.6 1995/09/04 12:33:47 adam
+ * Various cleanup. YAZ util used instead.
+ *
+ * Revision 1.5 1994/09/28 16:58:33 quinn
* Small mod.
*
* Revision 1.4 1994/09/27 20:03:52 quinn
*/
#include <assert.h>
+#include <stdio.h>
-#include <util.h>
+#include <alexutil.h>
#include <isam.h>
int is_mbuf_size[3] = { 0, 1024, 4096 };
mbuf = tab->cur_mblock->cur_mbuf = mbuf->next;
mbuf->cur_record = 0;
}
- log(LOG_DEBUG, "is_m_write_rec(rec == %d)", mbuf->cur_record);
+ logf (LOG_DEBUG, "is_m_write_rec(rec == %d)", mbuf->cur_record);
memcpy(mbuf->data + mbuf->offset + mbuf->cur_record * is_keysize(tab->is),
rec, is_keysize(tab->is));
mbuf->num++;
return 1;
}
-int is_m_read_record(is_mtable *tab, void *buf)
+int is_m_read_record(is_mtable *tab, void *buf, int keep)
{
is_mbuf *mbuf;
{
if (!mbuf->next) /* end of mblock */
{
+ if (!keep && tab->cur_mblock->state == IS_MBSTATE_CLEAN &&
+ tab->cur_mblock->diskpos > 0)
+ {
+ xfree_mbufs(tab->cur_mblock->data);
+ tab->cur_mblock->data = 0;
+ tab->cur_mblock->state = IS_MBSTATE_UNREAD;
+ }
if (tab->cur_mblock->next)
{
tab->cur_mblock = tab->cur_mblock->next;
for (;;)
{
- if (is_m_read_record(tab, &peek) <= 0)
+ if (is_m_read_record(tab, &peek, 1) <= 0)
return 1;
if ((rs = (*tab->is->cmp)(peek, rec)) > 0)
{
if (tab->data->state < IS_MBSTATE_PARTIAL)
if (read_current_full(tab, tab->data) < 0)
{
- log(LOG_FATAL, "read full failed");
+ logf (LOG_FATAL, "read full failed");
exit(1);
}
return tab->num_records;