X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=isam%2Fisam.c;h=248a944f2d12b7a6308744aac782269a9fd4f8d7;hb=e39158d4c6147865c129d2524f1b910e4e7921ed;hp=7fee0142e4e000ed305ecf14ce43285a93c098d6;hpb=c2bc863fadfe038670d50483df9a3e80562108a5;p=idzebra-moved-to-github.git diff --git a/isam/isam.c b/isam/isam.c index 7fee014..248a944 100644 --- a/isam/isam.c +++ b/isam/isam.c @@ -4,7 +4,35 @@ * Sebastian Hammer, Adam Dickmeiss * * $Log: isam.c,v $ - * Revision 1.8 1994-09-28 12:32:17 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 @@ -27,11 +55,12 @@ * */ +#include #include #include #include -#include +#include #include #include #include @@ -40,6 +69,27 @@ #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) { @@ -54,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); } @@ -68,24 +118,25 @@ static int splitargs(const char *s, char *bf[], int max) * Process resources. */ ISAM is_open(const char *name, int (*cmp)(const void *p1, const void *p2), - int writeflag) + 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; @@ -93,7 +144,7 @@ ISAM is_open(const char *name, int (*cmp)(const void *p1, const void *p2), { 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) @@ -107,7 +158,7 @@ ISAM is_open(const char *name, int (*cmp)(const void *p1, const void *p2), 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); @@ -116,14 +167,14 @@ ISAM is_open(const char *name, int (*cmp)(const void *p1, const void *p2), 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) { - log(LOG_FATAL, "File blocksize mismatch in %s", name); + logf (LOG_FATAL, "File blocksize mismatch in %s", name); exit(1); } new->types[i].freelist = th.freelist; @@ -133,7 +184,7 @@ ISAM is_open(const char *name, int (*cmp)(const void *p1, const void *p2), { if ((rs = is_rb_write(&new->types[i], &th)) <=0) /* dummy */ { - log(LOG_FATAL, "Failed to write initial superblock."); + logf (LOG_FATAL, "Failed to write initial superblock."); exit(1); } new->types[i].freelist = -1; @@ -141,44 +192,51 @@ ISAM is_open(const char *name, int (*cmp)(const void *p1, const void *p2), } /* ELSE: this is an empty file opened in read-only mode. */ } - if (!(r = res_get_def(common_resource, nm = strconcat(name, ".", "keysize", - 0), "4"))) - { - log(LOG_FATAL, "Failed to locate resource %s", nm); - return 0; - } - if ((new->keysize = atoi(r)) <= 0) + if (keysize > 0) + new->keysize = keysize; + else { - log(LOG_FATAL, "Must specify positive keysize."); - return 0; + 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 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; } new->repack = atoi(r); /* determine max keys/blocksize */ - if (!(r = res_get(common_resource, nm = strconcat(name, ".", - "maxkeys", 0))) || !(num = splitargs(r, pp, IS_MAX_BLOCKTYPES))) + if (!(r = res_get_def(common_resource, nm = strconcat(name, ".", + "maxkeys", 0), "50 640 10000")) || !(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; } 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].max_keys = tmp; @@ -199,28 +257,29 @@ ISAM is_open(const char *name, int (*cmp)(const void *p1, const void *p2), new->keysize; if (new->types[i].max_keys_block0 < 1) { - log(LOG_FATAL, "Blocksize too small in %s", name); + logf (LOG_FATAL, "Blocksize too small in %s", name); exit(1); } } /* determine nice fill rates */ - if (!(r = res_get(common_resource, nm = strconcat(name, ".", - "nicefill", 0))) || !(num = splitargs(r, pp, IS_MAX_BLOCKTYPES))) + if (!(r = res_get_def(common_resource, nm = strconcat(name, ".", + "nicefill", 0), "90 90 90 95")) || !(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; } 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].nice_keys_block = (new->types[i].max_keys_block0 * tmp) / @@ -241,7 +300,7 @@ int is_close(ISAM is) int i; is_type_header th; - log(LOG_DEBUG, "is_close()"); + logf (LOG_DEBUG, "is_close()"); for (i = 0; i < is->num_types; i++) { if (is->types[i].bf) @@ -254,7 +313,7 @@ int is_close(ISAM is) th.top = is->types[i].top; if (is_rb_write(&is->types[i], &th) < 0) { - log(LOG_FATAL, "Failed to write headerblock"); + logf (LOG_FATAL, "Failed to write headerblock"); exit(1); } } @@ -292,12 +351,14 @@ ISAM_P is_merge(ISAM is, ISAM_P pos, int num, char *data) 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) { - log(LOG_FATAL, "read_full failed"); + logf (LOG_FATAL, "read_full failed"); exit(1); } oldnum = tab.num_records; @@ -317,17 +378,17 @@ ISAM_P is_merge(ISAM is, ISAM_P pos, int num, char *data) { if (operation == KEYOP_INSERT) { - log(LOG_DEBUG, "XXInserting new record."); + logf (LOG_DEBUG, "XXInserting new record."); is_m_write_record(&tab, record); } else - log(LOG_DEBUG, "XXDeletion failed to find match."); + logf (LOG_DEBUG, "XXDeletion failed to find match."); } else /* match found */ { if (operation == KEYOP_INSERT) { - log(LOG_DEBUG, "XXSkipping insertion - match found."); + logf (LOG_DEBUG, "XXSkipping insertion - match found."); continue; } else if (operation == KEYOP_DELETE) @@ -338,7 +399,7 @@ ISAM_P is_merge(ISAM is, ISAM_P pos, int num, char *data) /* next key is identical insert? - NOOP - skip it */ if (!memcmp(record, data + 1, is_keysize(is))) { - log(LOG_DEBUG, "XXNoop delete. skipping."); + logf (LOG_DEBUG, "XXNoop delete. skipping."); data += 1 + is_keysize(is); num--; continue; @@ -348,14 +409,14 @@ ISAM_P is_merge(ISAM is, ISAM_P pos, int num, char *data) res = (*is->cmp)(data + 1, keybuf); if (res < 0) { - log(LOG_DEBUG, "XXReplacing record."); + logf (LOG_DEBUG, "XXReplacing record."); is_m_replace_record(&tab, data + 1); data += 1 + is_keysize(is); num--; continue; } } - log(LOG_DEBUG, "Deleting record."); + logf (LOG_DEBUG, "Deleting record."); is_m_delete_record(&tab); } } @@ -389,9 +450,38 @@ ISAM_P is_merge(ISAM is, ISAM_P pos, int num, char *data) * 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 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); +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); +}