X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=isamc%2Fmerge.c;h=7bfdf05dbcd3c29aed6891808d716b4c215b10d3;hb=138b954cffe470bf0e62d812cae6e859aa57cdb5;hp=80ca911efb7c76941b131b7b278cc599021f7717;hpb=c6cadd4345e1c7081473afe2b3a0ce6b62664c4e;p=idzebra-moved-to-github.git

diff --git a/isamc/merge.c b/isamc/merge.c
index 80ca911..7bfdf05 100644
--- a/isamc/merge.c
+++ b/isamc/merge.c
@@ -1,55 +1,32 @@
-/*
- * Copyright (c) 1996-1998, Index Data.
- * See the file LICENSE for details.
- * Sebastian Hammer, Adam Dickmeiss
- *
- * $Log: merge.c,v $
- * Revision 1.10  1998-03-19 12:22:09  adam
- * Minor change.
- *
- * Revision 1.9  1998/03/19 10:04:38  adam
- * Minor changes.
- *
- * Revision 1.8  1998/03/18 09:23:55  adam
- * Blocks are stored in chunks on free list - up to factor 2 in speed.
- * Fixed bug that could occur in block category rearrangemen.
- *
- * Revision 1.7  1998/03/11 11:18:18  adam
- * Changed the isc_merge to take into account the mfill (minimum-fill).
- *
- * Revision 1.6  1998/03/06 13:54:03  adam
- * Fixed two nasty bugs in isc_merge.
- *
- * Revision 1.5  1997/02/12 20:42:43  adam
- * Bug fix: during isc_merge operations, some pages weren't marked dirty
- * even though they should be. At this point the merge operation marks
- * a page dirty if the previous page changed at all. A better approach is
- * to mark it dirty if the last key written changed in previous page.
- *
- * Revision 1.4  1996/11/08 11:15:31  adam
- * Number of keys in chain are stored in first block and the function
- * to retrieve this information, isc_pp_num is implemented.
- *
- * Revision 1.3  1996/11/04 14:08:59  adam
- * Optimized free block usage.
- *
- * Revision 1.2  1996/11/01 13:36:46  adam
- * New element, max_blocks_mem, that control how many blocks of max size
- * to store in memory during isc_merge.
- * Function isc_merge now ignores delete/update of identical keys and
- * the proper blocks are then non-dirty and not written in flush_blocks.
- *
- * Revision 1.1  1996/11/01  08:59:15  adam
- * First version of isc_merge that supports update/delete.
- *
- */
+/* $Id: merge.c,v 1.23 2003-06-23 15:36:11 adam Exp $
+   Copyright (C) 1995,1996,1997,1998,1999,2000,2001,2002
+   Index Data Aps
+
+This file is part of the Zebra server.
+
+Zebra is free software; you can redistribute it and/or modify it under
+the terms of the GNU General Public License as published by the Free
+Software Foundation; either version 2, or (at your option) any later
+version.
+
+Zebra is distributed in the hope that it will be useful, but WITHOUT ANY
+WARRANTY; without even the implied warranty of MERCHANTABILITY or
+FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+for more details.
+
+You should have received a copy of the GNU General Public License
+along with Zebra; see the file LICENSE.zebra.  If not, write to the
+Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA
+02111-1307, USA.
+*/
+
+
 
 #include <stdlib.h>
 #include <assert.h>
 #include <string.h>
 #include <stdio.h>
-
-#include <log.h>
+#include <yaz/log.h>
 #include "isamc-p.h"
 
 struct isc_merge_block {
@@ -58,7 +35,9 @@ struct isc_merge_block {
     int dirty;        /* block is different from that on file */
 };
 
-static void opt_blocks (ISAMC is, struct isc_merge_block *mb, int ptr, int last)
+#if 0
+static void opt_blocks (ISAMC is, struct isc_merge_block *mb, int ptr,
+			int last)
 {
     int i, no_dirty = 0;
     for (i = 0; i<ptr; i++)
@@ -84,6 +63,7 @@ static void opt_blocks (ISAMC is, struct isc_merge_block *mb, int ptr, int last)
     if (!last)
 	mb[i].dirty = 1;
 }
+#endif
 
 static void flush_blocks (ISAMC is, struct isc_merge_block *mb, int ptr,
                           char *r_buf, int *firstpos, int cat, int last,
@@ -174,7 +154,7 @@ static int get_border (ISAMC is, struct isc_merge_block *mb, int ptr,
     return mb[ptr].offset + fill - off;
 }
 
-ISAMC_P isc_merge (ISAMC is, ISAMC_P ipos, ISAMC_I data)
+ISAMC_P isc_merge (ISAMC is, ISAMC_P ipos, ISAMC_I *data)
 {
 
     char i_item[128], *i_item_ptr;
@@ -500,3 +480,79 @@ ISAMC_P isc_merge (ISAMC is, ISAMC_P ipos, ISAMC_I data)
     return cat + firstpos * 8;
 }
 
+/*
+ * $Log: merge.c,v $
+ * Revision 1.23  2003-06-23 15:36:11  adam
+ * Implemented isamb_unlink.
+ *
+ * Revision 1.22  2003/03/05 16:41:10  adam
+ * Fix GCC warnings
+ *
+ * Revision 1.21  2002/08/02 19:26:56  adam
+ * Towards GPL
+ *
+ * Revision 1.20  1999/11/30 13:48:04  adam
+ * Improved installation. Updated for inclusion of YAZ header files.
+ *
+ * Revision 1.19  1999/07/14 12:12:07  heikki
+ * Large-block isam-h  (may not work too well... Abandoning for isam-d)
+ *
+ * Revision 1.17  1999/07/13 14:22:17  heikki
+ * Better allocation strategy in isamh_merge
+ *
+ * Revision 1.16  1999/07/08 14:23:27  heikki
+ * Fixed a bug in isamh_pp_read and cleaned up a bit
+ *
+ * Revision 1.15  1999/07/07 09:36:04  heikki
+ * Fixed an assertion in isamh
+ *
+ * Revision 1.13  1999/07/06 09:37:05  heikki
+ * Working on isamh - not ready yet.
+ *
+ * Revision 1.12  1999/06/30 15:03:55  heikki
+ * first take on isamh, the append-only isam structure
+ *
+ * Revision 1.11  1999/05/26 07:49:14  adam
+ * C++ compilation.
+ *
+ * Revision 1.10  1998/03/19 12:22:09  adam
+ * Minor change.
+ *
+ * Revision 1.9  1998/03/19 10:04:38  adam
+ * Minor changes.
+ *
+ * Revision 1.8  1998/03/18 09:23:55  adam
+ * Blocks are stored in chunks on free list - up to factor 2 in speed.
+ * Fixed bug that could occur in block category rearrangemen.
+ *
+ * Revision 1.7  1998/03/11 11:18:18  adam
+ * Changed the isc_merge to take into account the mfill (minimum-fill).
+ *
+ * Revision 1.6  1998/03/06 13:54:03  adam
+ * Fixed two nasty bugs in isc_merge.
+ *
+ * Revision 1.5  1997/02/12 20:42:43  adam
+ * Bug fix: during isc_merge operations, some pages weren't marked dirty
+ * even though they should be. At this point the merge operation marks
+ * a page dirty if the previous page changed at all. A better approach is
+ * to mark it dirty if the last key written changed in previous page.
+ *
+ * Revision 1.4  1996/11/08 11:15:31  adam
+ * Number of keys in chain are stored in first block and the function
+ * to retrieve this information, isc_pp_num is implemented.
+ *
+ * Revision 1.3  1996/11/04 14:08:59  adam
+ * Optimized free block usage.
+ *
+ * Revision 1.2  1996/11/01 13:36:46  adam
+ * New element, max_blocks_mem, that control how many blocks of max size
+ * to store in memory during isc_merge.
+ * Function isc_merge now ignores delete/update of identical keys and
+ * the proper blocks are then non-dirty and not written in flush_blocks.
+ *
+ * Revision 1.1  1996/11/01  08:59:15  adam
+ * First version of isc_merge that supports update/delete.
+ *
+ */
+
+