X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=isam%2Fmemory.c;h=d7a327cd0cc4b342f00562942442809c0e32c15a;hb=85df66537199c30a492ad54be4fbe25fa77e18c8;hp=4bbb4d6545cf8914ba7a472a7639b8b88c2df909;hpb=c9c9df90cf9d66e46b177e62a4402a9def633634;p=idzebra-moved-to-github.git

diff --git a/isam/memory.c b/isam/memory.c
index 4bbb4d6..d7a327c 100644
--- a/isam/memory.c
+++ b/isam/memory.c
@@ -4,7 +4,23 @@
  * Sebastian Hammer, Adam Dickmeiss
  *
  * $Log: memory.c,v $
- * Revision 1.5  1994-09-28 16:58:33  quinn
+ * Revision 1.10  1995-12-12 14:12:47  quinn
+ * *** empty log message ***
+ *
+ * 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
@@ -26,8 +42,9 @@
  */
 
 #include <assert.h>
+#include <stdio.h>
 
-#include <util.h>
+#include <alexutil.h>
 #include <isam.h>
 
 int is_mbuf_size[3] = { 0, 1024, 4096 };
@@ -271,7 +288,7 @@ int is_m_write_record(is_mtable *tab, const void *rec)
 	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++;
@@ -326,7 +343,7 @@ int is_m_peek_record(is_mtable *tab, void *rec)
     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;
 
@@ -339,6 +356,13 @@ int is_m_read_record(is_mtable *tab, void *buf)
     {
 	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;
@@ -370,12 +394,12 @@ int is_m_seek_record(is_mtable *tab, const void *rec)
 
     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)
 	{
 	    is_m_unread_record(tab);
-	    return 1;
+	    return rs;
 	}
 	else if (rs == 0)
 	    return 0;
@@ -387,7 +411,7 @@ int is_m_num_records(is_mtable *tab)
     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;