X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=ext%2FDB_File%2FDB_File.xs;h=ed3a7fa3e044f780dbf1e74f53123b73ec7525ba;hb=3e3318e754fa4289ad1c682811dbe6a31cd59e26;hp=092958eb194e9278df9523fa36ca9e584b55fe0e;hpb=778183f34c6f9006721e20db0af0805a4bcb0227;p=p5sagit%2Fp5-mst-13.2.git diff --git a/ext/DB_File/DB_File.xs b/ext/DB_File/DB_File.xs index 092958e..ed3a7fa 100644 --- a/ext/DB_File/DB_File.xs +++ b/ext/DB_File/DB_File.xs @@ -2,13 +2,13 @@ DB_File.xs -- Perl 5 interface to Berkeley DB - written by Paul Marquess (pmarquess@bfsec.bt.co.uk) - last modified 6th Feb 1997 - version 1.11 + written by Paul Marquess + last modified 6th June 1999 + version 1.67 All comments/suggestions/problems are welcome - Copyright (c) 1995, 1996, 1997 Paul Marquess. All rights reserved. + Copyright (c) 1995-9 Paul Marquess. All rights reserved. This program is free software; you can redistribute it and/or modify it under the same terms as Perl itself. @@ -38,6 +38,39 @@ 1.10 - Fixed fd method so that it still returns -1 for in-memory files when db 1.86 is used. 1.11 - No change to DB_File.xs + 1.12 - No change to DB_File.xs + 1.13 - Tidied up a few casts. + 1.14 - Made it illegal to tie an associative array to a RECNO + database and an ordinary array to a HASH or BTREE database. + 1.50 - Make work with both DB 1.x or DB 2.x + 1.51 - Fixed a bug in mapping 1.x O_RDONLY flag to 2.x DB_RDONLY equivalent + 1.52 - Patch from Gisle Aas to suppress "use of + undefined value" warning with db_get and db_seq. + 1.53 - Added DB_RENUMBER to flags for recno. + 1.54 - Fixed bug in the fd method + 1.55 - Fix for AIX from Jarkko Hietaniemi + 1.56 - No change to DB_File.xs + 1.57 - added the #undef op to allow building with Threads support. + 1.58 - Fixed a problem with the use of sv_setpvn. When the + size is specified as 0, it does a strlen on the data. + This was ok for DB 1.x, but isn't for DB 2.x. + 1.59 - No change to DB_File.xs + 1.60 - Some code tidy up + 1.61 - added flagSet macro for DB 2.5.x + fixed typo in O_RDONLY test. + 1.62 - No change to DB_File.xs + 1.63 - Fix to alllow DB 2.6.x to build. + 1.64 - Tidied up the 1.x to 2.x flags mapping code. + Added a patch from Mark Kettenis + to fix a flag mapping problem with O_RDONLY on the Hurd + 1.65 - Fixed a bug in the PUSH logic. + Added BOOT check that using 2.3.4 or greater + 1.66 - Added DBM filter code + 1.67 - Backed off the use of newSVpvn. + Fixed DBM Filter code for Perl 5.004. + Fixed a small memory leak in the filter code. + + */ @@ -45,10 +78,129 @@ #include "perl.h" #include "XSUB.h" +#ifndef PERL_VERSION +#include "patchlevel.h" +#define PERL_REVISION 5 +#define PERL_VERSION PATCHLEVEL +#define PERL_SUBVERSION SUBVERSION +#endif + +#if PERL_REVISION == 5 && (PERL_VERSION < 4 || (PERL_VERSION == 4 && PERL_SUBVERSION <= 75 )) + +# define PL_sv_undef sv_undef +# define PL_na na + +#endif + +/* DEFSV appears first in 5.004_56 */ +#ifndef DEFSV +#define DEFSV GvSV(defgv) +#endif + +/* Being the Berkeley DB we prefer the (which will be + * shortly #included by the ) __attribute__ to the possibly + * already defined __attribute__, for example by GNUC or by Perl. */ + +#undef __attribute__ + +/* If Perl has been compiled with Threads support,the symbol op will + be defined here. This clashes with a field name in db.h, so get rid of it. + */ +#ifdef op +#undef op +#endif #include #include +/* #define TRACE */ +#define DBM_FILTERING + + + +#ifdef DB_VERSION_MAJOR + +/* map version 2 features & constants onto their version 1 equivalent */ + +#ifdef DB_Prefix_t +#undef DB_Prefix_t +#endif +#define DB_Prefix_t size_t + +#ifdef DB_Hash_t +#undef DB_Hash_t +#endif +#define DB_Hash_t u_int32_t + +/* DBTYPE stays the same */ +/* HASHINFO, RECNOINFO and BTREEINFO map to DB_INFO */ +typedef DB_INFO INFO ; + +/* version 2 has db_recno_t in place of recno_t */ +typedef db_recno_t recno_t; + + +#define R_CURSOR DB_SET_RANGE +#define R_FIRST DB_FIRST +#define R_IAFTER DB_AFTER +#define R_IBEFORE DB_BEFORE +#define R_LAST DB_LAST +#define R_NEXT DB_NEXT +#define R_NOOVERWRITE DB_NOOVERWRITE +#define R_PREV DB_PREV +#define R_SETCURSOR 0 +#define R_RECNOSYNC 0 +#define R_FIXEDLEN DB_FIXEDLEN +#define R_DUP DB_DUP + +#define db_HA_hash h_hash +#define db_HA_ffactor h_ffactor +#define db_HA_nelem h_nelem +#define db_HA_bsize db_pagesize +#define db_HA_cachesize db_cachesize +#define db_HA_lorder db_lorder + +#define db_BT_compare bt_compare +#define db_BT_prefix bt_prefix +#define db_BT_flags flags +#define db_BT_psize db_pagesize +#define db_BT_cachesize db_cachesize +#define db_BT_lorder db_lorder +#define db_BT_maxkeypage +#define db_BT_minkeypage + + +#define db_RE_reclen re_len +#define db_RE_flags flags +#define db_RE_bval re_pad +#define db_RE_bfname re_source +#define db_RE_psize db_pagesize +#define db_RE_cachesize db_cachesize +#define db_RE_lorder db_lorder + +#define TXN NULL, + +#define do_SEQ(db, key, value, flag) (db->cursor->c_get)(db->cursor, &key, &value, flag) + + +#define DBT_flags(x) x.flags = 0 +#define DB_flags(x, v) x |= v + +#if DB_VERSION_MAJOR == 2 && DB_VERSION_MINOR < 5 +#define flagSet(flags, bitmask) ((flags) & (bitmask)) +#else +#define flagSet(flags, bitmask) (((flags) & DB_OPFLAGS_MASK) == (bitmask)) +#endif + +#else /* db version 1.x */ + +typedef union INFO { + HASHINFO hash ; + RECNOINFO recno ; + BTREEINFO btree ; + } INFO ; + + #ifdef mDB_Prefix_t #ifdef DB_Prefix_t #undef DB_Prefix_t @@ -63,11 +215,66 @@ #define DB_Hash_t mDB_Hash_t #endif -union INFO { - HASHINFO hash ; - RECNOINFO recno ; - BTREEINFO btree ; - } ; +#define db_HA_hash hash.hash +#define db_HA_ffactor hash.ffactor +#define db_HA_nelem hash.nelem +#define db_HA_bsize hash.bsize +#define db_HA_cachesize hash.cachesize +#define db_HA_lorder hash.lorder + +#define db_BT_compare btree.compare +#define db_BT_prefix btree.prefix +#define db_BT_flags btree.flags +#define db_BT_psize btree.psize +#define db_BT_cachesize btree.cachesize +#define db_BT_lorder btree.lorder +#define db_BT_maxkeypage btree.maxkeypage +#define db_BT_minkeypage btree.minkeypage + +#define db_RE_reclen recno.reclen +#define db_RE_flags recno.flags +#define db_RE_bval recno.bval +#define db_RE_bfname recno.bfname +#define db_RE_psize recno.psize +#define db_RE_cachesize recno.cachesize +#define db_RE_lorder recno.lorder + +#define TXN + +#define do_SEQ(db, key, value, flag) (db->dbp->seq)(db->dbp, &key, &value, flag) +#define DBT_flags(x) +#define DB_flags(x, v) +#define flagSet(flags, bitmask) ((flags) & (bitmask)) + +#endif /* db version 1 */ + + + +#define db_DELETE(db, key, flags) ((db->dbp)->del)(db->dbp, TXN &key, flags) +#define db_STORE(db, key, value, flags) ((db->dbp)->put)(db->dbp, TXN &key, &value, flags) +#define db_FETCH(db, key, flags) ((db->dbp)->get)(db->dbp, TXN &key, &value, flags) + +#define db_sync(db, flags) ((db->dbp)->sync)(db->dbp, flags) +#define db_get(db, key, value, flags) ((db->dbp)->get)(db->dbp, TXN &key, &value, flags) + +#ifdef DB_VERSION_MAJOR +#define db_DESTROY(db) ((db->dbp)->close)(db->dbp, 0) +#define db_close(db) ((db->dbp)->close)(db->dbp, 0) +#define db_del(db, key, flags) (flagSet(flags, R_CURSOR) \ + ? ((db->cursor)->c_del)(db->cursor, 0) \ + : ((db->dbp)->del)(db->dbp, NULL, &key, flags) ) + +#else + +#define db_DESTROY(db) ((db->dbp)->close)(db->dbp) +#define db_close(db) ((db->dbp)->close)(db->dbp) +#define db_del(db, key, flags) ((db->dbp)->del)(db->dbp, &key, flags) +#define db_put(db, key, value, flags) ((db->dbp)->put)(db->dbp, &key, &value, flags) + +#endif + + +#define db_seq(db, key, value, flags) do_SEQ(db, key, value, flags) typedef struct { DBTYPE type ; @@ -76,60 +283,138 @@ typedef struct { SV * prefix ; SV * hash ; int in_memory ; - union INFO info ; + INFO info ; +#ifdef DB_VERSION_MAJOR + DBC * cursor ; +#endif +#ifdef DBM_FILTERING + SV * filter_fetch_key ; + SV * filter_store_key ; + SV * filter_fetch_value ; + SV * filter_store_value ; + int filtering ; +#endif /* DBM_FILTERING */ + } DB_File_type; typedef DB_File_type * DB_File ; typedef DBT DBTKEY ; +#ifdef DBM_FILTERING + +#define ckFilter(arg,type,name) \ + if (db->type) { \ + SV * save_defsv ; \ + /* printf("filtering %s\n", name) ;*/ \ + if (db->filtering) \ + croak("recursion detected in %s", name) ; \ + db->filtering = TRUE ; \ + save_defsv = newSVsv(DEFSV) ; \ + sv_setsv(DEFSV, arg) ; \ + PUSHMARK(sp) ; \ + (void) perl_call_sv(db->type, G_DISCARD|G_NOARGS); \ + sv_setsv(arg, DEFSV) ; \ + sv_setsv(DEFSV, save_defsv) ; \ + SvREFCNT_dec(save_defsv) ; \ + db->filtering = FALSE ; \ + /*printf("end of filtering %s\n", name) ;*/ \ + } -/* #define TRACE */ +#else -#define db_DESTROY(db) ((db->dbp)->close)(db->dbp) -#define db_DELETE(db, key, flags) ((db->dbp)->del)(db->dbp, &key, flags) -#define db_STORE(db, key, value, flags) ((db->dbp)->put)(db->dbp, &key, &value, flags) -#define db_FETCH(db, key, flags) ((db->dbp)->get)(db->dbp, &key, &value, flags) +#define ckFilter(arg,type, name) -#define db_close(db) ((db->dbp)->close)(db->dbp) -#define db_del(db, key, flags) ((db->dbp)->del)(db->dbp, &key, flags) -#define db_fd(db) (db->in_memory \ - ? -1 \ - : ((db->dbp)->fd)(db->dbp) ) -#define db_put(db, key, value, flags) ((db->dbp)->put)(db->dbp, &key, &value, flags) -#define db_get(db, key, value, flags) ((db->dbp)->get)(db->dbp, &key, &value, flags) -#define db_seq(db, key, value, flags) ((db->dbp)->seq)(db->dbp, &key, &value, flags) -#define db_sync(db, flags) ((db->dbp)->sync)(db->dbp, flags) +#endif /* DBM_FILTERING */ +#define my_sv_setpvn(sv, d, s) sv_setpvn(sv, (s ? d : (void*)""), s) -#define OutputValue(arg, name) \ - { if (RETVAL == 0) { \ - sv_setpvn(arg, name.data, name.size) ; \ - } \ +#define OutputValue(arg, name) \ + { if (RETVAL == 0) { \ + my_sv_setpvn(arg, name.data, name.size) ; \ + ckFilter(arg, filter_fetch_value,"filter_fetch_value") ; \ + } \ } -#define OutputKey(arg, name) \ - { if (RETVAL == 0) \ - { \ - if (db->type != DB_RECNO) { \ - sv_setpvn(arg, name.data, name.size); \ - } \ - else \ - sv_setiv(arg, (I32)*(I32*)name.data - 1); \ - } \ +#define OutputKey(arg, name) \ + { if (RETVAL == 0) \ + { \ + if (db->type != DB_RECNO) { \ + my_sv_setpvn(arg, name.data, name.size); \ + } \ + else \ + sv_setiv(arg, (I32)*(I32*)name.data - 1); \ + ckFilter(arg, filter_fetch_key,"filter_fetch_key") ; \ + } \ } + /* Internal Global Data */ static recno_t Value ; -static DB_File CurrentDB ; static recno_t zero = 0 ; -static DBTKEY empty = { &zero, sizeof(recno_t) } ; +static DB_File CurrentDB ; +static DBTKEY empty ; +#ifdef DB_VERSION_MAJOR static int -btree_compare(key1, key2) -const DBT * key1 ; -const DBT * key2 ; +db_put(DB_File db, DBTKEY key, DBT value, u_int flags) { + int status ; + + if (flagSet(flags, R_CURSOR)) { + status = ((db->cursor)->c_del)(db->cursor, 0); + if (status != 0) + return status ; + +#if DB_VERSION_MAJOR == 2 && DB_VERSION_MINOR < 5 + flags &= ~R_CURSOR ; +#else + flags &= ~DB_OPFLAGS_MASK ; +#endif + + } + + return ((db->dbp)->put)(db->dbp, NULL, &key, &value, flags) ; + +} + +#endif /* DB_VERSION_MAJOR */ + +static void +GetVersionInfo(pTHX) +{ + SV * ver_sv = perl_get_sv("DB_File::db_version", TRUE) ; +#ifdef DB_VERSION_MAJOR + int Major, Minor, Patch ; + + (void)db_version(&Major, &Minor, &Patch) ; + + /* check that libdb is recent enough -- we need 2.3.4 or greater */ + if (Major == 2 && (Minor < 3 || (Minor == 3 && Patch < 4))) + croak("DB_File needs Berkeley DB 2.3.4 or greater, you have %d.%d.%d\n", + Major, Minor, Patch) ; + +#if PERL_VERSION > 3 + sv_setpvf(ver_sv, "%d.%d", Major, Minor) ; +#else + { + char buffer[40] ; + sprintf(buffer, "%d.%d", Major, Minor) ; + sv_setpv(ver_sv, buffer) ; + } +#endif + +#else + sv_setiv(ver_sv, 1) ; +#endif + +} + + +static int +btree_compare(const DBT *key1, const DBT *key2) +{ + dTHX; dSP ; void * data1, * data2 ; int retval ; @@ -150,8 +435,8 @@ const DBT * key2 ; ENTER ; SAVETMPS; - PUSHMARK(sp) ; - EXTEND(sp,2) ; + PUSHMARK(SP) ; + EXTEND(SP,2) ; PUSHs(sv_2mortal(newSVpv(data1,key1->size))); PUSHs(sv_2mortal(newSVpv(data2,key2->size))); PUTBACK ; @@ -161,7 +446,7 @@ const DBT * key2 ; SPAGAIN ; if (count != 1) - croak ("DB_File btree_compare: expected 1 return value from %s, got %d\n", count) ; + croak ("DB_File btree_compare: expected 1 return value from compare sub, got %d\n", count) ; retval = POPi ; @@ -173,10 +458,9 @@ const DBT * key2 ; } static DB_Prefix_t -btree_prefix(key1, key2) -const DBT * key1 ; -const DBT * key2 ; +btree_prefix(const DBT *key1, const DBT *key2) { + dTHX; dSP ; void * data1, * data2 ; int retval ; @@ -197,8 +481,8 @@ const DBT * key2 ; ENTER ; SAVETMPS; - PUSHMARK(sp) ; - EXTEND(sp,2) ; + PUSHMARK(SP) ; + EXTEND(SP,2) ; PUSHs(sv_2mortal(newSVpv(data1,key1->size))); PUSHs(sv_2mortal(newSVpv(data2,key2->size))); PUTBACK ; @@ -208,7 +492,7 @@ const DBT * key2 ; SPAGAIN ; if (count != 1) - croak ("DB_File btree_prefix: expected 1 return value from %s, got %d\n", count) ; + croak ("DB_File btree_prefix: expected 1 return value from prefix sub, got %d\n", count) ; retval = POPi ; @@ -220,10 +504,9 @@ const DBT * key2 ; } static DB_Hash_t -hash_cb(data, size) -const void * data ; -size_t size ; +hash_cb(const void *data, size_t size) { + dTHX; dSP ; int retval ; int count ; @@ -235,7 +518,7 @@ size_t size ; ENTER ; SAVETMPS; - PUSHMARK(sp) ; + PUSHMARK(SP) ; XPUSHs(sv_2mortal(newSVpv((char*)data,size))); PUTBACK ; @@ -245,7 +528,7 @@ size_t size ; SPAGAIN ; if (count != 1) - croak ("DB_File hash_cb: expected 1 return value from %s, got %d\n", count) ; + croak ("DB_File hash_cb: expected 1 return value from hash sub, got %d\n", count) ; retval = POPi ; @@ -260,46 +543,48 @@ size_t size ; #ifdef TRACE static void -PrintHash(hash) -HASHINFO * hash ; +PrintHash(INFO *hash) { printf ("HASH Info\n") ; - printf (" hash = %s\n", (hash->hash != NULL ? "redefined" : "default")) ; - printf (" bsize = %d\n", hash->bsize) ; - printf (" ffactor = %d\n", hash->ffactor) ; - printf (" nelem = %d\n", hash->nelem) ; - printf (" cachesize = %d\n", hash->cachesize) ; - printf (" lorder = %d\n", hash->lorder) ; + printf (" hash = %s\n", + (hash->db_HA_hash != NULL ? "redefined" : "default")) ; + printf (" bsize = %d\n", hash->db_HA_bsize) ; + printf (" ffactor = %d\n", hash->db_HA_ffactor) ; + printf (" nelem = %d\n", hash->db_HA_nelem) ; + printf (" cachesize = %d\n", hash->db_HA_cachesize) ; + printf (" lorder = %d\n", hash->db_HA_lorder) ; } static void -PrintRecno(recno) -RECNOINFO * recno ; +PrintRecno(INFO *recno) { printf ("RECNO Info\n") ; - printf (" flags = %d\n", recno->flags) ; - printf (" cachesize = %d\n", recno->cachesize) ; - printf (" psize = %d\n", recno->psize) ; - printf (" lorder = %d\n", recno->lorder) ; - printf (" reclen = %d\n", recno->reclen) ; - printf (" bval = %d 0x%x\n", recno->bval, recno->bval) ; - printf (" bfname = %d [%s]\n", recno->bfname, recno->bfname) ; + printf (" flags = %d\n", recno->db_RE_flags) ; + printf (" cachesize = %d\n", recno->db_RE_cachesize) ; + printf (" psize = %d\n", recno->db_RE_psize) ; + printf (" lorder = %d\n", recno->db_RE_lorder) ; + printf (" reclen = %ul\n", (unsigned long)recno->db_RE_reclen) ; + printf (" bval = %d 0x%x\n", recno->db_RE_bval, recno->db_RE_bval) ; + printf (" bfname = %d [%s]\n", recno->db_RE_bfname, recno->db_RE_bfname) ; } static void -PrintBtree(btree) -BTREEINFO * btree ; +PrintBtree(INFO *btree) { printf ("BTREE Info\n") ; - printf (" compare = %s\n", (btree->compare ? "redefined" : "default")) ; - printf (" prefix = %s\n", (btree->prefix ? "redefined" : "default")) ; - printf (" flags = %d\n", btree->flags) ; - printf (" cachesize = %d\n", btree->cachesize) ; - printf (" psize = %d\n", btree->psize) ; - printf (" maxkeypage = %d\n", btree->maxkeypage) ; - printf (" minkeypage = %d\n", btree->minkeypage) ; - printf (" lorder = %d\n", btree->lorder) ; + printf (" compare = %s\n", + (btree->db_BT_compare ? "redefined" : "default")) ; + printf (" prefix = %s\n", + (btree->db_BT_prefix ? "redefined" : "default")) ; + printf (" flags = %d\n", btree->db_BT_flags) ; + printf (" cachesize = %d\n", btree->db_BT_cachesize) ; + printf (" psize = %d\n", btree->db_BT_psize) ; +#ifndef DB_VERSION_MAJOR + printf (" maxkeypage = %d\n", btree->db_BT_maxkeypage) ; + printf (" minkeypage = %d\n", btree->db_BT_minkeypage) ; +#endif + printf (" lorder = %d\n", btree->db_BT_lorder) ; } #else @@ -312,34 +597,33 @@ BTREEINFO * btree ; static I32 -GetArrayLength(db) -DB * db ; +GetArrayLength(pTHX_ DB_File db) { DBT key ; DBT value ; int RETVAL ; - RETVAL = (db->seq)(db, &key, &value, R_LAST) ; + DBT_flags(key) ; + DBT_flags(value) ; + RETVAL = do_SEQ(db, key, value, R_LAST) ; if (RETVAL == 0) RETVAL = *(I32 *)key.data ; - else if (RETVAL == 1) /* No key means empty file */ + else /* No key means empty file */ RETVAL = 0 ; return ((I32)RETVAL) ; } static recno_t -GetRecnoKey(db, value) -DB_File db ; -I32 value ; +GetRecnoKey(pTHX_ DB_File db, I32 value) { if (value < 0) { /* Get the length of the array */ - I32 length = GetArrayLength(db->dbp) ; + I32 length = GetArrayLength(aTHX_ db) ; /* check for attempt to write before start of array */ if (length + value + 1 <= 0) - croak("Modification of non-creatable array value attempted, subscript %d", value) ; + croak("Modification of non-creatable array value attempted, subscript %ld", (long)value) ; value = length + value + 1 ; } @@ -350,19 +634,24 @@ I32 value ; } static DB_File -ParseOpenInfo(name, flags, mode, sv) -char * name ; -int flags ; -int mode ; -SV * sv ; +ParseOpenInfo(pTHX_ int isHASH, char *name, int flags, int mode, SV *sv) { SV ** svp; HV * action ; DB_File RETVAL = (DB_File)safemalloc(sizeof(DB_File_type)) ; void * openinfo = NULL ; - union INFO * info = &RETVAL->info ; + INFO * info = &RETVAL->info ; + STRLEN n_a; + +/* printf("In ParseOpenInfo name=[%s] flags=[%d] mode = [%d]\n", name, flags, mode) ; */ + Zero(RETVAL, 1, DB_File_type) ; /* Default to HASH */ +#ifdef DBM_FILTERING + RETVAL->filtering = 0 ; + RETVAL->filter_fetch_key = RETVAL->filter_store_key = + RETVAL->filter_fetch_value = RETVAL->filter_store_value = +#endif /* DBM_FILTERING */ RETVAL->hash = RETVAL->compare = RETVAL->prefix = NULL ; RETVAL->type = DB_HASH ; @@ -385,6 +674,10 @@ SV * sv ; if (sv_isa(sv, "DB_File::HASHINFO")) { + + if (!isHASH) + croak("DB_File can only tie an associative array to a DB_HASH database") ; + RETVAL->type = DB_HASH ; openinfo = (void*)info ; @@ -392,117 +685,167 @@ SV * sv ; if (svp && SvOK(*svp)) { - info->hash.hash = hash_cb ; + info->db_HA_hash = hash_cb ; RETVAL->hash = newSVsv(*svp) ; } else - info->hash.hash = NULL ; + info->db_HA_hash = NULL ; - svp = hv_fetch(action, "bsize", 5, FALSE); - info->hash.bsize = svp ? SvIV(*svp) : 0; - svp = hv_fetch(action, "ffactor", 7, FALSE); - info->hash.ffactor = svp ? SvIV(*svp) : 0; + info->db_HA_ffactor = svp ? SvIV(*svp) : 0; svp = hv_fetch(action, "nelem", 5, FALSE); - info->hash.nelem = svp ? SvIV(*svp) : 0; + info->db_HA_nelem = svp ? SvIV(*svp) : 0; + svp = hv_fetch(action, "bsize", 5, FALSE); + info->db_HA_bsize = svp ? SvIV(*svp) : 0; + svp = hv_fetch(action, "cachesize", 9, FALSE); - info->hash.cachesize = svp ? SvIV(*svp) : 0; + info->db_HA_cachesize = svp ? SvIV(*svp) : 0; svp = hv_fetch(action, "lorder", 6, FALSE); - info->hash.lorder = svp ? SvIV(*svp) : 0; + info->db_HA_lorder = svp ? SvIV(*svp) : 0; PrintHash(info) ; } else if (sv_isa(sv, "DB_File::BTREEINFO")) { + if (!isHASH) + croak("DB_File can only tie an associative array to a DB_BTREE database"); + RETVAL->type = DB_BTREE ; openinfo = (void*)info ; svp = hv_fetch(action, "compare", 7, FALSE); if (svp && SvOK(*svp)) { - info->btree.compare = btree_compare ; + info->db_BT_compare = btree_compare ; RETVAL->compare = newSVsv(*svp) ; } else - info->btree.compare = NULL ; + info->db_BT_compare = NULL ; svp = hv_fetch(action, "prefix", 6, FALSE); if (svp && SvOK(*svp)) { - info->btree.prefix = btree_prefix ; + info->db_BT_prefix = btree_prefix ; RETVAL->prefix = newSVsv(*svp) ; } else - info->btree.prefix = NULL ; + info->db_BT_prefix = NULL ; svp = hv_fetch(action, "flags", 5, FALSE); - info->btree.flags = svp ? SvIV(*svp) : 0; + info->db_BT_flags = svp ? SvIV(*svp) : 0; svp = hv_fetch(action, "cachesize", 9, FALSE); - info->btree.cachesize = svp ? SvIV(*svp) : 0; + info->db_BT_cachesize = svp ? SvIV(*svp) : 0; +#ifndef DB_VERSION_MAJOR svp = hv_fetch(action, "minkeypage", 10, FALSE); info->btree.minkeypage = svp ? SvIV(*svp) : 0; svp = hv_fetch(action, "maxkeypage", 10, FALSE); info->btree.maxkeypage = svp ? SvIV(*svp) : 0; +#endif svp = hv_fetch(action, "psize", 5, FALSE); - info->btree.psize = svp ? SvIV(*svp) : 0; + info->db_BT_psize = svp ? SvIV(*svp) : 0; svp = hv_fetch(action, "lorder", 6, FALSE); - info->btree.lorder = svp ? SvIV(*svp) : 0; + info->db_BT_lorder = svp ? SvIV(*svp) : 0; PrintBtree(info) ; } else if (sv_isa(sv, "DB_File::RECNOINFO")) { + if (isHASH) + croak("DB_File can only tie an array to a DB_RECNO database"); + RETVAL->type = DB_RECNO ; openinfo = (void *)info ; + info->db_RE_flags = 0 ; + svp = hv_fetch(action, "flags", 5, FALSE); - info->recno.flags = (u_long) svp ? SvIV(*svp) : 0; + info->db_RE_flags = (u_long) (svp ? SvIV(*svp) : 0); + + svp = hv_fetch(action, "reclen", 6, FALSE); + info->db_RE_reclen = (size_t) (svp ? SvIV(*svp) : 0); svp = hv_fetch(action, "cachesize", 9, FALSE); - info->recno.cachesize = (u_int) svp ? SvIV(*svp) : 0; + info->db_RE_cachesize = (u_int) (svp ? SvIV(*svp) : 0); svp = hv_fetch(action, "psize", 5, FALSE); - info->recno.psize = (int) svp ? SvIV(*svp) : 0; + info->db_RE_psize = (u_int) (svp ? SvIV(*svp) : 0); svp = hv_fetch(action, "lorder", 6, FALSE); - info->recno.lorder = (int) svp ? SvIV(*svp) : 0; - - svp = hv_fetch(action, "reclen", 6, FALSE); - info->recno.reclen = (size_t) svp ? SvIV(*svp) : 0; + info->db_RE_lorder = (int) (svp ? SvIV(*svp) : 0); + +#ifdef DB_VERSION_MAJOR + info->re_source = name ; + name = NULL ; +#endif + svp = hv_fetch(action, "bfname", 6, FALSE); + if (svp && SvOK(*svp)) { + char * ptr = SvPV(*svp,n_a) ; +#ifdef DB_VERSION_MAJOR + name = (char*) n_a ? ptr : NULL ; +#else + info->db_RE_bfname = (char*) (n_a ? ptr : NULL) ; +#endif + } + else +#ifdef DB_VERSION_MAJOR + name = NULL ; +#else + info->db_RE_bfname = NULL ; +#endif svp = hv_fetch(action, "bval", 4, FALSE); +#ifdef DB_VERSION_MAJOR + if (svp && SvOK(*svp)) + { + int value ; + if (SvPOK(*svp)) + value = (int)*SvPV(*svp, n_a) ; + else + value = SvIV(*svp) ; + + if (info->flags & DB_FIXEDLEN) { + info->re_pad = value ; + info->flags |= DB_PAD ; + } + else { + info->re_delim = value ; + info->flags |= DB_DELIMITER ; + } + + } +#else if (svp && SvOK(*svp)) { if (SvPOK(*svp)) - info->recno.bval = (u_char)*SvPV(*svp, na) ; + info->db_RE_bval = (u_char)*SvPV(*svp, n_a) ; else - info->recno.bval = (u_char)(unsigned long) SvIV(*svp) ; + info->db_RE_bval = (u_char)(unsigned long) SvIV(*svp) ; + DB_flags(info->flags, DB_DELIMITER) ; + } else { - if (info->recno.flags & R_FIXEDLEN) - info->recno.bval = (u_char) ' ' ; + if (info->db_RE_flags & R_FIXEDLEN) + info->db_RE_bval = (u_char) ' ' ; else - info->recno.bval = (u_char) '\n' ; + info->db_RE_bval = (u_char) '\n' ; + DB_flags(info->flags, DB_DELIMITER) ; } - - svp = hv_fetch(action, "bfname", 6, FALSE); - if (svp && SvOK(*svp)) { - char * ptr = SvPV(*svp,na) ; - info->recno.bfname = (char*) na ? ptr : NULL ; - } - else - info->recno.bfname = NULL ; +#endif +#ifdef DB_RENUMBER + info->flags |= DB_RENUMBER ; +#endif + PrintRecno(info) ; } else @@ -517,24 +860,51 @@ SV * sv ; #endif /* __EMX__ */ #endif /* OS2 */ +#ifdef DB_VERSION_MAJOR + + { + int Flags = 0 ; + int status ; + + /* Map 1.x flags to 2.x flags */ + if ((flags & O_CREAT) == O_CREAT) + Flags |= DB_CREATE ; + +#if O_RDONLY == 0 + if (flags == O_RDONLY) +#else + if ((flags & O_RDONLY) == O_RDONLY && (flags & O_RDWR) != O_RDWR) +#endif + Flags |= DB_RDONLY ; + +#ifdef O_TRUNC + if ((flags & O_TRUNC) == O_TRUNC) + Flags |= DB_TRUNCATE ; +#endif + + status = db_open(name, RETVAL->type, Flags, mode, NULL, openinfo, &RETVAL->dbp) ; + if (status == 0) +#if DB_VERSION_MAJOR == 2 && DB_VERSION_MINOR < 6 + status = (RETVAL->dbp->cursor)(RETVAL->dbp, NULL, &RETVAL->cursor) ; +#else + status = (RETVAL->dbp->cursor)(RETVAL->dbp, NULL, &RETVAL->cursor, + 0) ; +#endif + + if (status) + RETVAL->dbp = NULL ; + + } +#else RETVAL->dbp = dbopen(name, flags, mode, RETVAL->type, openinfo) ; +#endif return (RETVAL) ; } -static int -not_here(s) -char *s; -{ - croak("DB_File::%s not implemented on this architecture", s); - return -1; -} - static double -constant(name, arg) -char *name; -int arg; +constant(char *name, int arg) { errno = 0; switch (*name) { @@ -753,12 +1123,6 @@ int arg; case 'Z': break; case '_': - if (strEQ(name, "__R_UNUSED")) -#ifdef __R_UNUSED - return __R_UNUSED; -#else - goto not_there; -#endif break; } errno = EINVAL; @@ -771,6 +1135,15 @@ not_there: MODULE = DB_File PACKAGE = DB_File PREFIX = db_ +BOOT: + { + GetVersionInfo(aTHX) ; + + empty.data = &zero ; + empty.size = sizeof(recno_t) ; + DBT_flags(empty) ; + } + double constant(name,arg) char * name @@ -778,7 +1151,8 @@ constant(name,arg) DB_File -db_DoTie_(dbtype, name=undef, flags=O_CREAT|O_RDWR, mode=0666, type=DB_HASH) +db_DoTie_(isHASH, dbtype, name=undef, flags=O_CREAT|O_RDWR, mode=0666, type=DB_HASH) + int isHASH char * dbtype int flags int mode @@ -786,14 +1160,15 @@ db_DoTie_(dbtype, name=undef, flags=O_CREAT|O_RDWR, mode=0666, type=DB_HASH) { char * name = (char *) NULL ; SV * sv = (SV *) NULL ; + STRLEN n_a; - if (items >= 2 && SvOK(ST(1))) - name = (char*) SvPV(ST(1), na) ; + if (items >= 3 && SvOK(ST(2))) + name = (char*) SvPV(ST(2), n_a) ; - if (items == 5) - sv = ST(4) ; + if (items == 6) + sv = ST(5) ; - RETVAL = ParseOpenInfo(name, flags, mode, sv) ; + RETVAL = ParseOpenInfo(aTHX_ isHASH, name, flags, mode, sv) ; if (RETVAL->dbp == NULL) RETVAL = NULL ; } @@ -812,7 +1187,21 @@ db_DESTROY(db) SvREFCNT_dec(db->compare) ; if (db->prefix) SvREFCNT_dec(db->prefix) ; +#ifdef DBM_FILTERING + if (db->filter_fetch_key) + SvREFCNT_dec(db->filter_fetch_key) ; + if (db->filter_store_key) + SvREFCNT_dec(db->filter_store_key) ; + if (db->filter_fetch_value) + SvREFCNT_dec(db->filter_fetch_value) ; + if (db->filter_store_value) + SvREFCNT_dec(db->filter_store_value) ; +#endif /* DBM_FILTERING */ Safefree(db) ; +#ifdef DB_VERSION_MAJOR + if (RETVAL > 0) + RETVAL = -1 ; +#endif int @@ -832,8 +1221,9 @@ db_EXISTS(db, key) { DBT value ; + DBT_flags(value) ; CurrentDB = db ; - RETVAL = (((db->dbp)->get)(db->dbp, &key, &value, 0) == 0) ; + RETVAL = (((db->dbp)->get)(db->dbp, TXN &key, &value, 0) == 0) ; } OUTPUT: RETVAL @@ -845,13 +1235,14 @@ db_FETCH(db, key, flags=0) u_int flags CODE: { - DBT value ; + DBT value ; + DBT_flags(value) ; CurrentDB = db ; - RETVAL = ((db->dbp)->get)(db->dbp, &key, &value, flags) ; + /* RETVAL = ((db->dbp)->get)(db->dbp, TXN &key, &value, flags) ; */ + RETVAL = db_get(db, key, value, flags) ; ST(0) = sv_newmortal(); - if (RETVAL == 0) - sv_setpvn(ST(0), value.data, value.size); + OutputValue(ST(0), value) } int @@ -869,20 +1260,15 @@ db_FIRSTKEY(db) DB_File db CODE: { - DBTKEY key ; + DBTKEY key ; DBT value ; - DB * Db = db->dbp ; + DBT_flags(key) ; + DBT_flags(value) ; CurrentDB = db ; - RETVAL = (Db->seq)(Db, &key, &value, R_FIRST) ; + RETVAL = do_SEQ(db, key, value, R_FIRST) ; ST(0) = sv_newmortal(); - if (RETVAL == 0) - { - if (Db->type != DB_RECNO) - sv_setpvn(ST(0), key.data, key.size); - else - sv_setiv(ST(0), (I32)*(I32*)key.data - 1); - } + OutputKey(ST(0), key) ; } int @@ -892,18 +1278,12 @@ db_NEXTKEY(db, key) CODE: { DBT value ; - DB * Db = db->dbp ; + DBT_flags(value) ; CurrentDB = db ; - RETVAL = (Db->seq)(Db, &key, &value, R_NEXT) ; + RETVAL = do_SEQ(db, key, value, R_NEXT) ; ST(0) = sv_newmortal(); - if (RETVAL == 0) - { - if (Db->type != DB_RECNO) - sv_setpvn(ST(0), key.data, key.size); - else - sv_setiv(ST(0), (I32)*(I32*)key.data - 1); - } + OutputKey(ST(0), key) ; } # @@ -913,6 +1293,7 @@ db_NEXTKEY(db, key) int unshift(db, ...) DB_File db + ALIAS: UNSHIFT = 1 CODE: { DBTKEY key ; @@ -920,17 +1301,30 @@ unshift(db, ...) int i ; int One ; DB * Db = db->dbp ; + STRLEN n_a; + DBT_flags(key) ; + DBT_flags(value) ; CurrentDB = db ; +#ifdef DB_VERSION_MAJOR + /* get the first value */ + RETVAL = do_SEQ(db, key, value, DB_FIRST) ; + RETVAL = 0 ; +#else RETVAL = -1 ; +#endif for (i = items-1 ; i > 0 ; --i) { - value.data = SvPV(ST(i), na) ; - value.size = na ; + value.data = SvPV(ST(i), n_a) ; + value.size = n_a ; One = 1 ; key.data = &One ; key.size = sizeof(int) ; +#ifdef DB_VERSION_MAJOR + RETVAL = (db->cursor->c_put)(db->cursor, &key, &value, DB_BEFORE) ; +#else RETVAL = (Db->put)(Db, &key, &value, R_IBEFORE) ; +#endif if (RETVAL != 0) break; } @@ -941,48 +1335,53 @@ unshift(db, ...) I32 pop(db) DB_File db + ALIAS: POP = 1 CODE: { DBTKEY key ; DBT value ; - DB * Db = db->dbp ; + DBT_flags(key) ; + DBT_flags(value) ; CurrentDB = db ; + /* First get the final value */ - RETVAL = (Db->seq)(Db, &key, &value, R_LAST) ; + RETVAL = do_SEQ(db, key, value, R_LAST) ; ST(0) = sv_newmortal(); /* Now delete it */ if (RETVAL == 0) { /* the call to del will trash value, so take a copy now */ - sv_setpvn(ST(0), value.data, value.size); - RETVAL = (Db->del)(Db, &key, R_CURSOR) ; + OutputValue(ST(0), value) ; + RETVAL = db_del(db, key, R_CURSOR) ; if (RETVAL != 0) - sv_setsv(ST(0), &sv_undef); + sv_setsv(ST(0), &PL_sv_undef); } } I32 shift(db) DB_File db + ALIAS: SHIFT = 1 CODE: { DBT value ; DBTKEY key ; - DB * Db = db->dbp ; + DBT_flags(key) ; + DBT_flags(value) ; CurrentDB = db ; /* get the first value */ - RETVAL = (Db->seq)(Db, &key, &value, R_FIRST) ; + RETVAL = do_SEQ(db, key, value, R_FIRST) ; ST(0) = sv_newmortal(); /* Now delete it */ if (RETVAL == 0) { /* the call to del will trash value, so take a copy now */ - sv_setpvn(ST(0), value.data, value.size); - RETVAL = (Db->del)(Db, &key, R_CURSOR) ; + OutputValue(ST(0), value) ; + RETVAL = db_del(db, key, R_CURSOR) ; if (RETVAL != 0) - sv_setsv (ST(0), &sv_undef) ; + sv_setsv (ST(0), &PL_sv_undef) ; } } @@ -990,30 +1389,47 @@ shift(db) I32 push(db, ...) DB_File db + ALIAS: PUSH = 1 CODE: { DBTKEY key ; - DBTKEY * keyptr = &key ; DBT value ; DB * Db = db->dbp ; int i ; + STRLEN n_a; + DBT_flags(key) ; + DBT_flags(value) ; CurrentDB = db ; +#ifdef DB_VERSION_MAJOR + RETVAL = 0 ; + key = empty ; + for (i = 1 ; i < items ; ++i) + { + value.data = SvPV(ST(i), n_a) ; + value.size = n_a ; + RETVAL = (Db->put)(Db, NULL, &key, &value, DB_APPEND) ; + if (RETVAL != 0) + break; + } +#else + /* Set the Cursor to the Last element */ - RETVAL = (Db->seq)(Db, &key, &value, R_LAST) ; + RETVAL = do_SEQ(db, key, value, R_LAST) ; if (RETVAL >= 0) { if (RETVAL == 1) - keyptr = &empty ; + key = empty ; for (i = items - 1 ; i > 0 ; --i) { - value.data = SvPV(ST(i), na) ; - value.size = na ; - RETVAL = (Db->put)(Db, keyptr, &value, R_IAFTER) ; + value.data = SvPV(ST(i), n_a) ; + value.size = n_a ; + RETVAL = (Db->put)(Db, &key, &value, R_IAFTER) ; if (RETVAL != 0) break; } } +#endif } OUTPUT: RETVAL @@ -1022,9 +1438,10 @@ push(db, ...) I32 length(db) DB_File db + ALIAS: FETCHSIZE = 1 CODE: CurrentDB = db ; - RETVAL = GetArrayLength(db->dbp) ; + RETVAL = GetArrayLength(aTHX_ db) ; OUTPUT: RETVAL @@ -1038,19 +1455,37 @@ db_del(db, key, flags=0) DB_File db DBTKEY key u_int flags - INIT: + CODE: CurrentDB = db ; + RETVAL = db_del(db, key, flags) ; +#ifdef DB_VERSION_MAJOR + if (RETVAL > 0) + RETVAL = -1 ; + else if (RETVAL == DB_NOTFOUND) + RETVAL = 1 ; +#endif + OUTPUT: + RETVAL int db_get(db, key, value, flags=0) DB_File db DBTKEY key - DBT value + DBT value = NO_INIT u_int flags - INIT: + CODE: CurrentDB = db ; + DBT_flags(value) ; + RETVAL = db_get(db, key, value, flags) ; +#ifdef DB_VERSION_MAJOR + if (RETVAL > 0) + RETVAL = -1 ; + else if (RETVAL == DB_NOTFOUND) + RETVAL = 1 ; +#endif OUTPUT: + RETVAL value int @@ -1059,34 +1494,126 @@ db_put(db, key, value, flags=0) DBTKEY key DBT value u_int flags - INIT: + CODE: CurrentDB = db ; + RETVAL = db_put(db, key, value, flags) ; +#ifdef DB_VERSION_MAJOR + if (RETVAL > 0) + RETVAL = -1 ; + else if (RETVAL == DB_KEYEXIST) + RETVAL = 1 ; +#endif OUTPUT: - key if (flags & (R_IAFTER|R_IBEFORE)) OutputKey(ST(1), key); + RETVAL + key if (flagSet(flags, R_IAFTER) || flagSet(flags, R_IBEFORE)) OutputKey(ST(1), key); int db_fd(db) DB_File db - INIT: + int status = 0 ; + CODE: CurrentDB = db ; +#ifdef DB_VERSION_MAJOR + RETVAL = -1 ; + status = (db->in_memory + ? -1 + : ((db->dbp)->fd)(db->dbp, &RETVAL) ) ; + if (status != 0) + RETVAL = -1 ; +#else + RETVAL = (db->in_memory + ? -1 + : ((db->dbp)->fd)(db->dbp) ) ; +#endif + OUTPUT: + RETVAL int db_sync(db, flags=0) DB_File db u_int flags - INIT: + CODE: CurrentDB = db ; + RETVAL = db_sync(db, flags) ; +#ifdef DB_VERSION_MAJOR + if (RETVAL > 0) + RETVAL = -1 ; +#endif + OUTPUT: + RETVAL int db_seq(db, key, value, flags) DB_File db DBTKEY key - DBT value + DBT value = NO_INIT u_int flags - INIT: + CODE: CurrentDB = db ; + DBT_flags(value) ; + RETVAL = db_seq(db, key, value, flags); +#ifdef DB_VERSION_MAJOR + if (RETVAL > 0) + RETVAL = -1 ; + else if (RETVAL == DB_NOTFOUND) + RETVAL = 1 ; +#endif OUTPUT: + RETVAL key value +#ifdef DBM_FILTERING + +#define setFilter(type) \ + { \ + if (db->type) \ + RETVAL = sv_mortalcopy(db->type) ; \ + ST(0) = RETVAL ; \ + if (db->type && (code == &PL_sv_undef)) { \ + SvREFCNT_dec(db->type) ; \ + db->type = NULL ; \ + } \ + else if (code) { \ + if (db->type) \ + sv_setsv(db->type, code) ; \ + else \ + db->type = newSVsv(code) ; \ + } \ + } + + +SV * +filter_fetch_key(db, code) + DB_File db + SV * code + SV * RETVAL = &PL_sv_undef ; + CODE: + setFilter(filter_fetch_key) ; + +SV * +filter_store_key(db, code) + DB_File db + SV * code + SV * RETVAL = &PL_sv_undef ; + CODE: + setFilter(filter_store_key) ; + +SV * +filter_fetch_value(db, code) + DB_File db + SV * code + SV * RETVAL = &PL_sv_undef ; + CODE: + setFilter(filter_fetch_value) ; + +SV * +filter_store_value(db, code) + DB_File db + SV * code + SV * RETVAL = &PL_sv_undef ; + CODE: + setFilter(filter_store_value) ; + +#endif /* DBM_FILTERING */