-## $Id: Makefile.am,v 1.65 2007-11-23 13:52:52 adam Exp $
+## $Id: Makefile.am,v 1.66 2007-11-23 13:59:14 adam Exp $
aux_libs = \
../rset/libidzebra-rset.la \
limit.c \
orddict.c orddict.h \
rank.h rank1.c ranksimilarity.c rankstatic.c \
- records.c recindex.c recindex.h recindxp.h reckeys.c reckeys.h \
- recstat.c retrieve.c \
+ records.c recindex.c recindex.h reckeys.c reckeys.h \
+ retrieve.c \
rpnscan.c rpnsearch.c rpnfacet.c sortidx.c symtab.c stream.c \
update_path.c update_file.c trunc.c untrans.c isam_methods.c \
zaptterm.c zebraapi.c zinfo.c zinfo.h zsets.c key_block.c key_block.h \
+++ /dev/null
-/* $Id: recindxp.h,v 1.23 2007-11-23 13:52:52 adam Exp $
- Copyright (C) 1995-2007
- 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 this program; if not, write to the Free Software
-Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
-
-*/
-
-#include "recindex.h"
-
-#include <idzebra/bfile.h>
-
-YAZ_BEGIN_CDECL
-
-#define REC_BLOCK_TYPES 2
-#define REC_HEAD_MAGIC "recindex"
-#define REC_VERSION 5
-
-struct records_info {
- int rw;
- int compression_method;
-
- recindex_t recindex;
-
- char *data_fname[REC_BLOCK_TYPES];
- BFile data_BFile[REC_BLOCK_TYPES];
-
- char *tmp_buf;
- int tmp_size;
-
- struct record_cache_entry *record_cache;
- int cache_size;
- int cache_cur;
- int cache_max;
-
- Zebra_mutex mutex;
-
- struct records_head {
- char magic[8];
- char version[4];
- zint block_size[REC_BLOCK_TYPES];
- zint block_free[REC_BLOCK_TYPES];
- zint block_last[REC_BLOCK_TYPES];
- zint block_used[REC_BLOCK_TYPES];
- zint block_move[REC_BLOCK_TYPES];
-
- zint total_bytes;
- zint index_last;
- zint index_free;
- zint no_records;
-
- } head;
-};
-
-enum recordCacheFlag { recordFlagNop, recordFlagWrite, recordFlagNew,
- recordFlagDelete };
-
-struct record_cache_entry {
- Record rec;
- enum recordCacheFlag flag;
-};
-
-struct record_index_entry {
- zint next; /* first block of record info / next free entry */
- int size; /* size of record or 0 if free entry */
-};
-
-Record rec_cp(Record rec);
-
-YAZ_END_CDECL
-/*
- * Local variables:
- * c-basic-offset: 4
- * indent-tabs-mode: nil
- * End:
- * vim: shiftwidth=4 tabstop=8 expandtab
- */
-
-/* $Id: records.c,v 1.1 2007-11-23 13:52:52 adam Exp $
+/* $Id: records.c,v 1.2 2007-11-23 13:59:14 adam Exp $
Copyright (C) 1995-2007
Index Data ApS
#include <string.h>
#include <yaz/yaz-util.h>
-#include "recindxp.h"
+#include <idzebra/bfile.h>
+#include "recindex.h"
#if HAVE_BZLIB_H
#include <bzlib.h>
#endif
+#define REC_BLOCK_TYPES 2
+#define REC_HEAD_MAGIC "recindex"
+#define REC_VERSION 5
+
+struct records_info {
+ int rw;
+ int compression_method;
+
+ recindex_t recindex;
+
+ char *data_fname[REC_BLOCK_TYPES];
+ BFile data_BFile[REC_BLOCK_TYPES];
+
+ char *tmp_buf;
+ int tmp_size;
+
+ struct record_cache_entry *record_cache;
+ int cache_size;
+ int cache_cur;
+ int cache_max;
+
+ Zebra_mutex mutex;
+
+ struct records_head {
+ char magic[8];
+ char version[4];
+ zint block_size[REC_BLOCK_TYPES];
+ zint block_free[REC_BLOCK_TYPES];
+ zint block_last[REC_BLOCK_TYPES];
+ zint block_used[REC_BLOCK_TYPES];
+ zint block_move[REC_BLOCK_TYPES];
+
+ zint total_bytes;
+ zint index_last;
+ zint index_free;
+ zint no_records;
+
+ } head;
+};
+
+enum recordCacheFlag { recordFlagNop, recordFlagWrite, recordFlagNew,
+ recordFlagDelete };
+
+struct record_cache_entry {
+ Record rec;
+ enum recordCacheFlag flag;
+};
+
+struct record_index_entry {
+ zint next; /* first block of record info / next free entry */
+ int size; /* size of record or 0 if free entry */
+};
+
+Record rec_cp(Record rec);
+
/* Modify argument to if below: 1=normal, 0=sysno testing */
#if 1
/* If this is used sysno are not converted (no testing) */
}
if (rw)
{
- if (recindex_write_head(p->recindex, &p->head, sizeof(p->head)) != ZEBRA_OK)
+ if (recindex_write_head(p->recindex,
+ &p->head, sizeof(p->head)) != ZEBRA_OK)
ret = ZEBRA_FAIL;
}
break;
return p;
}
+void rec_prstat(Records records)
+{
+ int i;
+ zint total_bytes = 0;
+
+ yaz_log (YLOG_LOG,
+ "Total records %8" ZINT_FORMAT0,
+ records->head.no_records);
+
+ for (i = 0; i< REC_BLOCK_TYPES; i++)
+ {
+ yaz_log (YLOG_LOG, "Record blocks of size "ZINT_FORMAT,
+ records->head.block_size[i]);
+ yaz_log (YLOG_LOG,
+ " Used/Total/Bytes used "
+ ZINT_FORMAT "/" ZINT_FORMAT "/" ZINT_FORMAT,
+ records->head.block_used[i], records->head.block_last[i]-1,
+ records->head.block_used[i] * records->head.block_size[i]);
+ total_bytes +=
+ records->head.block_used[i] * records->head.block_size[i];
+ }
+ yaz_log (YLOG_LOG,
+ "Total size of record index in bytes %8" ZINT_FORMAT0,
+ records->head.total_bytes);
+ yaz_log (YLOG_LOG,
+ "Total size with overhead %8" ZINT_FORMAT0,
+ total_bytes);
+}
+
/*
* Local variables:
* c-basic-offset: 4
+++ /dev/null
-/* $Id: recstat.c,v 1.17 2007-01-15 15:10:17 adam Exp $
- Copyright (C) 1995-2007
- 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 this program; if not, write to the Free Software
-Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
-
-*/
-
-
-#include <stdio.h>
-#include <assert.h>
-#include <string.h>
-#include <fcntl.h>
-#if HAVE_UNISTD_H
-#include <unistd.h>
-#endif
-#include "recindxp.h"
-
-void rec_prstat (Records records)
-{
- int i;
- zint total_bytes = 0;
-
- yaz_log (YLOG_LOG,
- "Total records %8" ZINT_FORMAT0,
- records->head.no_records);
-
- for (i = 0; i< REC_BLOCK_TYPES; i++)
- {
- yaz_log (YLOG_LOG, "Record blocks of size "ZINT_FORMAT,
- records->head.block_size[i]);
- yaz_log (YLOG_LOG,
- " Used/Total/Bytes used "
- ZINT_FORMAT "/" ZINT_FORMAT "/" ZINT_FORMAT,
- records->head.block_used[i], records->head.block_last[i]-1,
- records->head.block_used[i] * records->head.block_size[i]);
- total_bytes +=
- records->head.block_used[i] * records->head.block_size[i];
- }
- yaz_log (YLOG_LOG,
- "Total size of record index in bytes %8" ZINT_FORMAT0,
- records->head.total_bytes);
- yaz_log (YLOG_LOG,
- "Total size with overhead %8" ZINT_FORMAT0,
- total_bytes);
-}
-/*
- * Local variables:
- * c-basic-offset: 4
- * indent-tabs-mode: nil
- * End:
- * vim: shiftwidth=4 tabstop=8 expandtab
- */
-
projects / idzebra-moved-to-github.git / commitdiff