X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=isam%2Fisam.c;h=248a944f2d12b7a6308744aac782269a9fd4f8d7;hb=e39158d4c6147865c129d2524f1b910e4e7921ed;hp=7794edef497dc9d59f603d6816a5d3aae81238f0;hpb=2fdd6275d8becc9c2317bd2b23daa3c569926392;p=idzebra-moved-to-github.git diff --git a/isam/isam.c b/isam/isam.c index 7794ede..248a944 100644 --- a/isam/isam.c +++ b/isam/isam.c @@ -4,20 +4,92 @@ * Sebastian Hammer, Adam Dickmeiss * * $Log: isam.c,v $ - * Revision 1.1 1994-09-12 08:02:13 quinn + * Revision 1.17 1995-12-06 15:48:44 quinn + * Fixed update-problem. + * + * Revision 1.16 1995/12/06 14:48:26 quinn + * Fixed some strange bugs. + * + * Revision 1.15 1995/12/06 09:59:45 quinn + * Fixed memory-consumption bug in memory.c + * Added more blocksizes to the default ISAM configuration. + * + * Revision 1.14 1995/11/24 17:26:19 quinn + * Mostly about making some ISAM stuff in the config file optional. + * + * Revision 1.13 1995/10/17 18:03:15 adam + * Commented out qsort in is_merge. + * + * Revision 1.12 1995/09/06 16:11:41 adam + * Keysize parameter to is_open (if non-zero). + * + * Revision 1.11 1995/09/04 12:33:46 adam + * Various cleanup. YAZ util used instead. + * + * Revision 1.10 1994/09/28 16:58:32 quinn + * Small mod. + * + * Revision 1.9 1994/09/28 12:56:15 quinn + * Added access functions (ISPT) + * + * Revision 1.8 1994/09/28 12:32:17 quinn + * Trivial + * + * Revision 1.7 1994/09/28 11:56:25 quinn + * Added sort of input to is_merge + * + * Revision 1.6 1994/09/28 11:29:33 quinn + * Added cmp parameter. + * + * Revision 1.5 1994/09/27 20:03:50 quinn + * Seems relatively bug-free. + * + * Revision 1.4 1994/09/26 17:11:29 quinn + * Trivial + * + * Revision 1.3 1994/09/26 17:06:35 quinn + * Back again... + * + * Revision 1.1 1994/09/12 08:02:13 quinn * Not functional yet * */ +#include #include #include #include -#include -#include "isutil.h" +#include #include #include #include +#include "isutil.h" +#include "rootblk.h" +#include "keyops.h" + +static int (*extcmp)(const void *p1, const void *p2); +static ispt_struct *ispt_freelist = 0; + +static ISPT ispt_alloc() +{ + ISPT p; + + if (ispt_freelist) + { + p = ispt_freelist; + ispt_freelist = ispt_freelist->next; + } + else + p = xmalloc(sizeof(ispt_struct)); + return p; +} + +static void ispt_free(ISPT pt) +{ + pt->next = ispt_freelist; + ispt_freelist = pt; +} static int splitargs(const char *s, char *bf[], int max) { @@ -32,7 +104,7 @@ static int splitargs(const char *s, char *bf[], int max) ct++; if (ct > max) { - log(LOG_WARN, "Ignoring extra args to is resource"); + logf (LOG_WARN, "Ignoring extra args to is resource"); bf[ct] = '\0'; return(ct - 1); } @@ -45,21 +117,26 @@ static int splitargs(const char *s, char *bf[], int max) * Open isam file. * Process resources. */ -ISAM is_open(const char *name, int writeflag) +ISAM is_open(const char *name, int (*cmp)(const void *p1, const void *p2), + int writeflag, int keysize) { ISAM new; char *nm, *r, *pp[IS_MAX_BLOCKTYPES+1], m[2]; int num, size, rs, tmp, i; + is_type_header th; - log(LOG_DEBUG, "is_open(%s, %s)", name, writeflag ? "RW" : "RDONLY"); + logf (LOG_DEBUG, "is_open(%s, %s)", name, writeflag ? "RW" : "RDONLY"); new = xmalloc(sizeof(*new)); new->writeflag = writeflag; + for (i = 0; i < IS_MAX_BLOCKTYPES; i++) + new->types[i].index = 0; /* dummy */ /* determine number and size of blocktypes */ - if (!(r = res_get(common_resource, nm = strconcat(name, ".", - "blocktypes", 0))) || !(num = splitargs(r, pp, IS_MAX_BLOCKTYPES))) + if (!(r = res_get_def(common_resource, nm = strconcat(name, ".", + "blocktypes", 0), "64 512 4K 32K")) || + !(num = splitargs(r, pp, IS_MAX_BLOCKTYPES))) { - log(LOG_FATAL, "Failed to locate resource %s", nm); + logf (LOG_FATAL, "Failed to locate resource %s", nm); return 0; } new->num_types = num; @@ -67,7 +144,7 @@ ISAM is_open(const char *name, int writeflag) { if ((rs = sscanf(pp[i], "%d%1[bBkKmM]", &size, m)) < 1) { - log(LOG_FATAL, "Error in resource %s: %s", r, pp[i]); + logf (LOG_FATAL, "Error in resource %s: %s", r, pp[i]); return 0; } if (rs == 1) @@ -81,62 +158,137 @@ ISAM is_open(const char *name, int writeflag) case 'm': case 'M': new->types[i].blocksize = size * 1048576; break; default: - log(LOG_FATAL, "Illegal size suffix: %c", *m); + logf (LOG_FATAL, "Illegal size suffix: %c", *m); return 0; } + new->types[i].dbuf = xmalloc(new->types[i].blocksize); m[0] = 'A' + i; m[1] = '\0'; if (!(new->types[i].bf = bf_open(strconcat(name, m, 0), new->types[i].blocksize, writeflag))) { - log(LOG_FATAL, "bf_open failed"); + logf (LOG_FATAL, "bf_open failed"); return 0; } + if ((rs = is_rb_read(&new->types[i], &th)) > 0) + { + if (th.blocksize != new->types[i].blocksize) + { + logf (LOG_FATAL, "File blocksize mismatch in %s", name); + exit(1); + } + new->types[i].freelist = th.freelist; + new->types[i].top = th.top; + } + else if (writeflag) /* write dummy superblock to determine top */ + { + if ((rs = is_rb_write(&new->types[i], &th)) <=0) /* dummy */ + { + logf (LOG_FATAL, "Failed to write initial superblock."); + exit(1); + } + new->types[i].freelist = -1; + new->types[i].top = rs; + } + /* ELSE: this is an empty file opened in read-only mode. */ + } + if (keysize > 0) + new->keysize = keysize; + else + { + if (!(r = res_get_def(common_resource, nm = strconcat(name, ".", + "keysize", + 0), "4"))) + { + logf (LOG_FATAL, "Failed to locate resource %s", nm); + return 0; + } + if ((new->keysize = atoi(r)) <= 0) + { + logf (LOG_FATAL, "Must specify positive keysize."); + return 0; + } } - /* determine nice fill rates */ - if (!(r = res_get(common_resource, nm = strconcat(name, ".", - "nicefill", 0))) || !(num = splitargs(r, pp, IS_MAX_BLOCKTYPES))) + /* determine repack percent */ + if (!(r = res_get_def(common_resource, nm = strconcat(name, ".", "repack", + 0), IS_DEF_REPACK_PERCENT))) { - log(LOG_FATAL, "Failed to locate resource %s", nm); + logf (LOG_FATAL, "Failed to locate resource %s", nm); return 0; } - if (num < new->num_types) + new->repack = atoi(r); + + /* determine max keys/blocksize */ + if (!(r = res_get_def(common_resource, nm = strconcat(name, ".", + "maxkeys", 0), "50 640 10000")) || !(num = splitargs(r, pp, + IS_MAX_BLOCKTYPES))) + { + logf (LOG_FATAL, "Failed to locate resource %s", nm); + return 0; + } + if (num < new->num_types -1) { - log(LOG_FATAL, "Not enough elements in %s", nm); + logf (LOG_FATAL, "Not enough elements in %s", nm); return 0; } for (i = 0; i < num; i++) { if ((rs = sscanf(pp[i], "%d", &tmp)) < 1) { - log(LOG_FATAL, "Error in resource %s: %s", r, pp[i]); + logf (LOG_FATAL, "Error in resource %s: %s", r, pp[i]); return 0; } - new->types[i].nice_keys_block = tmp; + new->types[i].max_keys = tmp; } - /* determine max keys/blocksize */ - if (!(r = res_get(common_resource, nm = strconcat(name, ".", - "maxkeys", 0))) || !(num = splitargs(r, pp, IS_MAX_BLOCKTYPES))) + /* determine max keys/block */ + for (i = 0; i < new->num_types; i++) { - log(LOG_FATAL, "Failed to locate resource %s", nm); + if (!new->types[i].index) + { + new->types[i].max_keys_block = (new->types[i].blocksize - 2 * + sizeof(int)) / new->keysize; + new->types[i].max_keys_block0 = (new->types[i].blocksize - 3 * + sizeof(int)) / new->keysize; + } + else + new->types[i].max_keys_block = new->types[i].max_keys_block0 / + new->keysize; + if (new->types[i].max_keys_block0 < 1) + { + logf (LOG_FATAL, "Blocksize too small in %s", name); + exit(1); + } + } + + /* determine nice fill rates */ + if (!(r = res_get_def(common_resource, nm = strconcat(name, ".", + "nicefill", 0), "90 90 90 95")) || !(num = splitargs(r, pp, + IS_MAX_BLOCKTYPES))) + { + logf (LOG_FATAL, "Failed to locate resource %s", nm); return 0; } - if (num < new->num_types -1) + if (num < new->num_types) { - log(LOG_FATAL, "Not enough elements in %s", nm); + logf (LOG_FATAL, "Not enough elements in %s", nm); return 0; } for (i = 0; i < num; i++) { if ((rs = sscanf(pp[i], "%d", &tmp)) < 1) { - log(LOG_FATAL, "Error in resource %s: %s", r, pp[i]); + logf (LOG_FATAL, "Error in resource %s: %s", r, pp[i]); return 0; } - new->types[i].max_keys = tmp; + new->types[i].nice_keys_block = (new->types[i].max_keys_block0 * tmp) / + 100; + if (new->types[i].nice_keys_block < 1) + new->types[i].nice_keys_block = 1; } + + new->cmp = cmp ? cmp : is_default_cmp; return new; } @@ -145,8 +297,191 @@ ISAM is_open(const char *name, int writeflag) */ int is_close(ISAM is) { - log(LOG_DEBUG, "is_close()"); - log(LOG_LOG, "is_close needs to close individual files."); + int i; + is_type_header th; + + logf (LOG_DEBUG, "is_close()"); + for (i = 0; i < is->num_types; i++) + { + if (is->types[i].bf) + { + if (is->writeflag) + { + th.blocksize = is->types[i].blocksize; + th.keysize = is->keysize; + th.freelist = is->types[i].freelist; + th.top = is->types[i].top; + if (is_rb_write(&is->types[i], &th) < 0) + { + logf (LOG_FATAL, "Failed to write headerblock"); + exit(1); + } + } + bf_close(is->types[i].bf); + } + } xfree(is); return 0; } + +static ISAM_P is_address(int type, int pos) +{ + ISAM_P r; + + r = pos << 2; + r |= type; + return r; +} + +int sort_input(const void *p1, const void *p2) +{ + int rs; + + if ((rs = (*extcmp)(((char *)p1) + 1, ((char *)p2) + 1))) + return rs; + return *((char *)p1) - *((char*)p2); +} + +ISAM_P is_merge(ISAM is, ISAM_P pos, int num, char *data) +{ + is_mtable tab; + int res; + char keybuf[IS_MAX_RECORD]; + int oldnum, oldtype, i; + char operation, *record; + + extcmp = is->cmp; +#if 0 + qsort(data, num, is_keysize(is) + 1, sort_input); +#endif + is_m_establish_tab(is, &tab, pos); + if (pos) + if (is_m_read_full(&tab, tab.data) < 0) + { + logf (LOG_FATAL, "read_full failed"); + exit(1); + } + oldnum = tab.num_records; + oldtype = tab.pos_type; + while (num) + { + operation = *(data)++; + record = (char*) data; + data += is_keysize(is); + num--; + while (num && !memcmp(record - 1, data, is_keysize(tab.is) + 1)) + { + data += 1 + is_keysize(is); + num--; + } + if ((res = is_m_seek_record(&tab, record)) > 0) /* no match */ + { + if (operation == KEYOP_INSERT) + { + logf (LOG_DEBUG, "XXInserting new record."); + is_m_write_record(&tab, record); + } + else + logf (LOG_DEBUG, "XXDeletion failed to find match."); + } + else /* match found */ + { + if (operation == KEYOP_INSERT) + { + logf (LOG_DEBUG, "XXSkipping insertion - match found."); + continue; + } + else if (operation == KEYOP_DELETE) + { + /* try to avoid needlessly moving data */ + if (num && *(data) == KEYOP_INSERT) + { + /* next key is identical insert? - NOOP - skip it */ + if (!memcmp(record, data + 1, is_keysize(is))) + { + logf (LOG_DEBUG, "XXNoop delete. skipping."); + data += 1 + is_keysize(is); + num--; + continue; + } + /* else check if next key can fit in this position */ + is_m_peek_record(&tab, keybuf); + res = (*is->cmp)(data + 1, keybuf); + if (res < 0) + { + logf (LOG_DEBUG, "XXReplacing record."); + is_m_replace_record(&tab, data + 1); + data += 1 + is_keysize(is); + num--; + continue; + } + } + logf (LOG_DEBUG, "Deleting record."); + is_m_delete_record(&tab); + } + } + } + i = tab.pos_type; + while (i < tab.is->num_types - 1 && tab.num_records > + tab.is->types[i].max_keys) + i++; + if (i != tab.pos_type) + { + is_p_unmap(&tab); + tab.pos_type = i; + } + if (!oldnum || tab.pos_type != oldtype || (abs(oldnum - tab.num_records) * + 100) / oldnum > tab.is->repack) + is_p_remap(&tab); + else + is_p_align(&tab); + if (tab.data) + { + is_p_sync(&tab); + pos = is_address(tab.pos_type, tab.data->diskpos); + } + else + pos = 0; + is_m_release_tab(&tab); + return pos; +} + +/* + * Locate a table of keys in an isam file. The ISPT is an individual + * position marker for that table. + */ +ISPT is_position(ISAM is, ISAM_P pos) +{ + ispt_struct *p; + + p = ispt_alloc(); + is_m_establish_tab(is, &p->tab, pos); + return p; +} + +/* + * Release ISPT. + */ +void is_pt_free(ISPT ip) +{ + is_m_release_tab(&ip->tab); + ispt_free(ip); +} + +/* + * Read a key from a table. + */ +int is_readkey(ISPT ip, void *buf) +{ + return is_m_read_record(&ip->tab, buf, 0); +} + +int is_numkeys(ISPT ip) +{ + return is_m_num_records(&ip->tab); +} + +void is_rewind(ISPT ip) +{ + is_m_rewind(&ip->tab); +}