ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/BDB/BDB.xs
(Generate patch)

Comparing BDB/BDB.xs (file contents):
Revision 1.56 by root, Mon Sep 29 02:59:08 2008 UTC vs.
Revision 1.64 by root, Wed Nov 12 16:52:51 2008 UTC

… …
53#if DB_VERSION_MINOR >= 3 53#if DB_VERSION_MINOR >= 3
54typedef DB_SEQUENCE DB_SEQUENCE_ornull; 54typedef DB_SEQUENCE DB_SEQUENCE_ornull;
55typedef DB_SEQUENCE DB_SEQUENCE_ornuked; 55typedef DB_SEQUENCE DB_SEQUENCE_ornuked;
56#endif 56#endif
57 57
58typedef SV SV8; /* byte-sv, used for argument-checking */
59typedef char *bdb_filename; 58typedef char *bdb_filename;
60 59
61static SV *prepare_cb; 60static SV *prepare_cb;
62 61
63#if DB_VERSION_MINOR >= 6 62#if DB_VERSION_MINOR >= 6
… …
150 149
151enum { 150enum {
152 REQ_QUIT, 151 REQ_QUIT,
153 REQ_ENV_OPEN, REQ_ENV_CLOSE, REQ_ENV_TXN_CHECKPOINT, REQ_ENV_LOCK_DETECT, 152 REQ_ENV_OPEN, REQ_ENV_CLOSE, REQ_ENV_TXN_CHECKPOINT, REQ_ENV_LOCK_DETECT,
154 REQ_ENV_MEMP_SYNC, REQ_ENV_MEMP_TRICKLE, REQ_ENV_DBREMOVE, REQ_ENV_DBRENAME, 153 REQ_ENV_MEMP_SYNC, REQ_ENV_MEMP_TRICKLE, REQ_ENV_DBREMOVE, REQ_ENV_DBRENAME,
154 REQ_ENV_LOG_ARCHIVE,
155 REQ_DB_OPEN, REQ_DB_CLOSE, REQ_DB_COMPACT, REQ_DB_SYNC, REQ_DB_UPGRADE, 155 REQ_DB_OPEN, REQ_DB_CLOSE, REQ_DB_COMPACT, REQ_DB_SYNC, REQ_DB_UPGRADE,
156 REQ_DB_PUT, REQ_DB_EXISTS, REQ_DB_GET, REQ_DB_PGET, REQ_DB_DEL, REQ_DB_KEY_RANGE, 156 REQ_DB_PUT, REQ_DB_EXISTS, REQ_DB_GET, REQ_DB_PGET, REQ_DB_DEL, REQ_DB_KEY_RANGE,
157 REQ_TXN_COMMIT, REQ_TXN_ABORT, REQ_TXN_FINISH, 157 REQ_TXN_COMMIT, REQ_TXN_ABORT, REQ_TXN_FINISH,
158 REQ_C_CLOSE, REQ_C_COUNT, REQ_C_PUT, REQ_C_GET, REQ_C_PGET, REQ_C_DEL, 158 REQ_C_CLOSE, REQ_C_COUNT, REQ_C_PUT, REQ_C_GET, REQ_C_PGET, REQ_C_DEL,
159 REQ_SEQ_OPEN, REQ_SEQ_CLOSE, REQ_SEQ_GET, REQ_SEQ_REMOVE, 159 REQ_SEQ_OPEN, REQ_SEQ_CLOSE, REQ_SEQ_GET, REQ_SEQ_REMOVE,
… …
350 abort (); 350 abort ();
351} 351}
352 352
353static int poll_cb (void); 353static int poll_cb (void);
354static void req_free (bdb_req req); 354static void req_free (bdb_req req);
355static void req_cancel (bdb_req req);
356 355
357static int req_invoke (bdb_req req) 356static int req_invoke (bdb_req req)
358{ 357{
359 switch (req->type) 358 switch (req->type)
360 { 359 {
… …
379 378
380 av_push (av, newSVnv (req->key_range.less)); 379 av_push (av, newSVnv (req->key_range.less));
381 av_push (av, newSVnv (req->key_range.equal)); 380 av_push (av, newSVnv (req->key_range.equal));
382 av_push (av, newSVnv (req->key_range.greater)); 381 av_push (av, newSVnv (req->key_range.greater));
383 382
383 av = (AV *)newRV_noinc ((SV *)av);
384
384 SvREADONLY_off (req->sv1); 385 SvREADONLY_off (req->sv1);
385 sv_setsv_mg (req->sv1, newRV_noinc ((SV *)av)); 386 sv_setsv_mg (req->sv1, newRV_noinc ((SV *)av));
387 SvREFCNT_dec (av);
386 SvREFCNT_dec (req->sv1); 388 SvREFCNT_dec (req->sv1);
387 } 389 }
388 break; 390 break;
389 391
390#if DB_VERSION_MINOR >= 3 392#if DB_VERSION_MINOR >= 3
… …
397 sv_setnv_mg (req->sv1, (NV)req->seq_t); 399 sv_setnv_mg (req->sv1, (NV)req->seq_t);
398 400
399 SvREFCNT_dec (req->sv1); 401 SvREFCNT_dec (req->sv1);
400 break; 402 break;
401#endif 403#endif
404
405 case REQ_ENV_LOG_ARCHIVE:
406 {
407 AV *av = newAV ();
408 char **listp = (char **)req->buf1;
409
410 if (listp)
411 while (*listp)
412 av_push (av, newSVpv (*listp, 0)), ++listp;
413
414 av = (AV *)newRV_noinc ((SV *)av);
415
416 SvREADONLY_off (req->sv1);
417 sv_setsv_mg (req->sv1, (SV *)av);
418 SvREFCNT_dec (av);
419 SvREFCNT_dec (req->sv1);
420 }
421 break;
402 } 422 }
403 423
404 errno = req->result; 424 errno = req->result;
405 425
406 if (req->callback) 426 if (req->callback)
… …
770 req->result = req->db->close (req->db, req->uint1); 790 req->result = req->db->close (req->db, req->uint1);
771 break; 791 break;
772 792
773#if DB_VERSION_MINOR >= 4 793#if DB_VERSION_MINOR >= 4
774 case REQ_DB_COMPACT: 794 case REQ_DB_COMPACT:
775 req->result = req->db->compact (req->db, req->txn, &req->dbt1, &req->dbt2, 0, req->uint1, 0); 795 req->result = req->db->compact (req->db, req->txn, req->dbt1.data ? &req->dbt1 : 0, req->dbt2.data ? &req->dbt2 : 0, 0, req->uint1, 0);
776 break; 796 break;
777#endif 797#endif
778 798
779 case REQ_DB_SYNC: 799 case REQ_DB_SYNC:
780 req->result = req->db->sync (req->db, req->uint1); 800 req->result = req->db->sync (req->db, req->uint1);
… …
871 891
872 case REQ_SEQ_REMOVE: 892 case REQ_SEQ_REMOVE:
873 req->result = req->seq->remove (req->seq, req->txn, req->uint1); 893 req->result = req->seq->remove (req->seq, req->txn, req->uint1);
874 break; 894 break;
875#endif 895#endif
896
897 case REQ_ENV_LOG_ARCHIVE:
898 {
899 char **listp = 0; /* DB_ARCH_REMOVE does not touch listp, contrary to docs */
900 req->result = req->env->log_archive (req->env, &listp, req->uint1);
901 req->buf1 = (char *)listp;
902 }
903 break;
876 904
877 default: 905 default:
878 req->result = ENOSYS; 906 req->result = ENOSYS;
879 break; 907 break;
880 } 908 }
… …
1135 } 1163 }
1136 1164
1137 return 0; 1165 return 0;
1138} 1166}
1139 1167
1168/*****************************************************************************/
1169
1170#if 0
1171static int
1172bt_pfxc_compare (DB *db, const DBT *dbt1, const DBT *dbt2)
1173{
1174 ssize_t size1 = dbt1->size;
1175 ssize_t size2 = dbt2->size;
1176 int res = memcmp ((void *)dbt1->data, (void *)dbt2->data,
1177 size1 <= size2 ? size1 : size2);
1178
1179 if (res)
1180 return res;
1181 else if (size1 - size2)
1182 return size1 - size2;
1183 else
1184 return 0;
1185}
1186
1187static size_t
1188bt_pfxc_prefix_x (DB *db, const DBT *dbt1, const DBT *dbt2)
1189{
1190 ssize_t size1 = dbt1->size;
1191 ssize_t size2 = dbt2->size;
1192 u_int8_t *p1 = (u_int8_t *)dbt1->data;
1193 u_int8_t *p2 = (u_int8_t *)dbt2->data;
1194 u_int8_t *pe = p1 + (size1 <= size2 ? size1 : size2);
1195
1196 while (p1 < pe)
1197 if (*p1++ != *p2++)
1198 return p1 - (u_int8_t *)dbt1->data - 1;
1199
1200 if (size1 < size2) return size1 + 1;
1201 if (size1 > size2) return size2 + 1;
1202
1203 return size1;
1204}
1205#endif
1206
1207/*****************************************************************************/
1208
1140/* stupid windoes defined CALLBACK as well */ 1209/* stupid windows defines CALLBACK as well */
1141#undef CALLBACK 1210#undef CALLBACK
1142#define CALLBACK SV *cb = pop_callback (&items, ST (items - 1)); 1211#define CALLBACK SV *cb = pop_callback (&items, ST (items - 1));
1143 1212
1144MODULE = BDB PACKAGE = BDB 1213MODULE = BDB PACKAGE = BDB
1145 1214
… …
1198 const_iv (NOSYNC) 1267 const_iv (NOSYNC)
1199 const_iv (CHKSUM) 1268 const_iv (CHKSUM)
1200 const_iv (ENCRYPT) 1269 const_iv (ENCRYPT)
1201 const_iv (DUP) 1270 const_iv (DUP)
1202 const_iv (DUPSORT) 1271 const_iv (DUPSORT)
1203 const_iv (RECNUM) 1272 //const_iv (RECNUM)
1204 const_iv (RENUMBER) 1273 const_iv (RENUMBER)
1205 const_iv (REVSPLITOFF) 1274 const_iv (REVSPLITOFF)
1206 const_iv (CONSUME) 1275 const_iv (CONSUME)
1207 const_iv (CONSUME_WAIT) 1276 const_iv (CONSUME_WAIT)
1208 const_iv (GET_BOTH) 1277 const_iv (GET_BOTH)
… …
1280 const_iv (REP_UNAVAIL) 1349 const_iv (REP_UNAVAIL)
1281 const_iv (RUNRECOVERY) 1350 const_iv (RUNRECOVERY)
1282 const_iv (SECONDARY_BAD) 1351 const_iv (SECONDARY_BAD)
1283 const_iv (VERIFY_BAD) 1352 const_iv (VERIFY_BAD)
1284 1353
1354 const_iv (ARCH_ABS)
1355 const_iv (ARCH_DATA)
1356 const_iv (ARCH_LOG)
1357 const_iv (ARCH_REMOVE)
1358
1285 const_iv (VERB_DEADLOCK) 1359 const_iv (VERB_DEADLOCK)
1286 const_iv (VERB_RECOVERY) 1360 const_iv (VERB_RECOVERY)
1287 const_iv (VERB_REPLICATION) 1361 const_iv (VERB_REPLICATION)
1288 const_iv (VERB_WAITSFOR) 1362 const_iv (VERB_WAITSFOR)
1289 1363
… …
1322 const_iv (PRIORITY_VERY_LOW) 1396 const_iv (PRIORITY_VERY_LOW)
1323 const_iv (PRIORITY_LOW) 1397 const_iv (PRIORITY_LOW)
1324 const_iv (PRIORITY_DEFAULT) 1398 const_iv (PRIORITY_DEFAULT)
1325 const_iv (PRIORITY_HIGH) 1399 const_iv (PRIORITY_HIGH)
1326 const_iv (PRIORITY_VERY_HIGH) 1400 const_iv (PRIORITY_VERY_HIGH)
1401 const_iv (IGNORE_LEASE)
1327#endif 1402#endif
1328#if DB_VERSION_MINOR >= 7 1403#if DB_VERSION_MINOR >= 7
1404 //const_iv (MULTIPLE_KEY)
1329 const_iv (LOG_DIRECT) 1405 const_iv (LOG_DIRECT)
1330 const_iv (LOG_DSYNC) 1406 const_iv (LOG_DSYNC)
1331 const_iv (LOG_AUTO_REMOVE) 1407 const_iv (LOG_AUTO_REMOVE)
1332 const_iv (LOG_IN_MEMORY) 1408 const_iv (LOG_IN_MEMORY)
1333 const_iv (LOG_ZERO) 1409 const_iv (LOG_ZERO)
… …
1637 req->buf3 = strdup_ornull (newname); 1713 req->buf3 = strdup_ornull (newname);
1638 req->uint1 = flags; 1714 req->uint1 = flags;
1639 REQ_SEND; 1715 REQ_SEND;
1640} 1716}
1641 1717
1718void
1719db_env_log_archive (DB_ENV *env, SV_mutable *listp, U32 flags = 0, SV *callback = 0)
1720 PREINIT:
1721 CALLBACK
1722 CODE:
1723{
1724 dREQ (REQ_ENV_LOG_ARCHIVE, 1);
1725 req->sv1 = SvREFCNT_inc (listp);
1726 req->env = env;
1727 req->uint1 = flags;
1728 REQ_SEND;
1729}
1730
1642DB * 1731DB *
1643db_create (DB_ENV *env = 0, U32 flags = 0) 1732db_create (DB_ENV *env = 0, U32 flags = 0)
1644 CODE: 1733 CODE:
1645{ 1734{
1646 errno = db_create (&RETVAL, env, flags); 1735 errno = db_create (&RETVAL, env, flags);
… …
1693 CODE: 1782 CODE:
1694{ 1783{
1695 dREQ (REQ_DB_COMPACT, 2); 1784 dREQ (REQ_DB_COMPACT, 2);
1696 req->db = db; 1785 req->db = db;
1697 req->txn = txn; 1786 req->txn = txn;
1698 sv_to_dbt (&req->dbt1, start); 1787 if (start) sv_to_dbt (&req->dbt1, start);
1699 sv_to_dbt (&req->dbt2, stop); 1788 if (stop ) sv_to_dbt (&req->dbt2, stop );
1700 req->uint1 = flags; 1789 req->uint1 = flags;
1701 REQ_SEND; 1790 REQ_SEND;
1702} 1791}
1703 1792
1704#endif 1793#endif
… …
1909db_c_get (DBC *dbc, SV *key, SV_mutable *data, U32 flags = 0, SV *callback = 0) 1998db_c_get (DBC *dbc, SV *key, SV_mutable *data, U32 flags = 0, SV *callback = 0)
1910 PREINIT: 1999 PREINIT:
1911 CALLBACK 2000 CALLBACK
1912 CODE: 2001 CODE:
1913{ 2002{
1914 if (flags & DB_OPFLAGS_MASK != DB_SET && SvREADONLY (key)) 2003 if ((flags & DB_OPFLAGS_MASK) != DB_SET && SvREADONLY (key))
1915 croak ("db_c_get was passed a read-only/constant 'key' argument but operation is not DB_SET"); 2004 croak ("db_c_get was passed a read-only/constant 'key' argument but operation is not DB_SET");
2005 if (SvPOKp (key) && !sv_utf8_downgrade (key, 1))
2006 croak ("argument \"%s\" must be byte/octet-encoded in %s",
2007 "key",
2008 "BDB::db_c_get");
1916 2009
2010 {
1917 dREQ (REQ_C_GET, 1); 2011 dREQ (REQ_C_GET, 1);
1918 req->dbc = dbc; 2012 req->dbc = dbc;
1919 req->uint1 = flags; 2013 req->uint1 = flags;
1920 if (flags & DB_OPFLAGS_MASK == DB_SET) 2014 if ((flags & DB_OPFLAGS_MASK) == DB_SET)
1921 sv_to_dbt (&req->dbt1, key); 2015 sv_to_dbt (&req->dbt1, key);
1922 else 2016 else
1923 { 2017 {
1924 if (flags & DB_OPFLAGS_MASK == DB_SET_RANGE) 2018 if ((flags & DB_OPFLAGS_MASK) == DB_SET_RANGE)
1925 sv_to_dbt (&req->dbt1, key); 2019 sv_to_dbt (&req->dbt1, key);
1926 else 2020 else
1927 req->dbt1.flags = DB_DBT_MALLOC; 2021 req->dbt1.flags = DB_DBT_MALLOC;
1928 2022
1929 req->sv1 = SvREFCNT_inc (key); SvREADONLY_on (key); 2023 req->sv1 = SvREFCNT_inc (key); SvREADONLY_on (key);
1930 } 2024 }
1931 2025
1932 if (flags & DB_OPFLAGS_MASK == DB_GET_BOTH 2026 if ((flags & DB_OPFLAGS_MASK) == DB_GET_BOTH
1933 || flags & DB_OPFLAGS_MASK == DB_GET_BOTH_RANGE) 2027 || (flags & DB_OPFLAGS_MASK) == DB_GET_BOTH_RANGE)
1934 sv_to_dbt (&req->dbt3, data); 2028 sv_to_dbt (&req->dbt3, data);
1935 else 2029 else
1936 req->dbt3.flags = DB_DBT_MALLOC; 2030 req->dbt3.flags = DB_DBT_MALLOC;
1937 2031
1938 req->sv3 = SvREFCNT_inc (data); SvREADONLY_on (data); 2032 req->sv3 = SvREFCNT_inc (data); SvREADONLY_on (data);
1939 REQ_SEND; 2033 REQ_SEND;
2034 }
1940} 2035}
1941 2036
1942void 2037void
1943db_c_pget (DBC *dbc, SV *key, SV_mutable *pkey, SV_mutable *data, U32 flags = 0, SV *callback = 0) 2038db_c_pget (DBC *dbc, SV *key, SV_mutable *pkey, SV_mutable *data, U32 flags = 0, SV *callback = 0)
1944 PREINIT: 2039 PREINIT:
1945 CALLBACK 2040 CALLBACK
1946 CODE: 2041 CODE:
1947{ 2042{
1948 if (flags & DB_OPFLAGS_MASK != DB_SET && SvREADONLY (key)) 2043 if ((flags & DB_OPFLAGS_MASK) != DB_SET && SvREADONLY (key))
1949 croak ("db_c_pget was passed a read-only/constant 'key' argument but operation is not DB_SET"); 2044 croak ("db_c_pget was passed a read-only/constant 'key' argument but operation is not DB_SET");
2045 if (SvPOKp (key) && !sv_utf8_downgrade (key, 1))
2046 croak ("argument \"%s\" must be byte/octet-encoded in %s",
2047 "key",
2048 "BDB::db_c_pget");
1950 2049
2050 {
1951 dREQ (REQ_C_PGET, 1); 2051 dREQ (REQ_C_PGET, 1);
1952 req->dbc = dbc; 2052 req->dbc = dbc;
1953 req->uint1 = flags; 2053 req->uint1 = flags;
1954 if (flags & DB_OPFLAGS_MASK == DB_SET) 2054 if ((flags & DB_OPFLAGS_MASK) == DB_SET)
1955 sv_to_dbt (&req->dbt1, key); 2055 sv_to_dbt (&req->dbt1, key);
1956 else 2056 else
1957 { 2057 {
1958 if (flags & DB_OPFLAGS_MASK == DB_SET_RANGE) 2058 if ((flags & DB_OPFLAGS_MASK) == DB_SET_RANGE)
1959 sv_to_dbt (&req->dbt1, key); 2059 sv_to_dbt (&req->dbt1, key);
1960 else 2060 else
1961 req->dbt1.flags = DB_DBT_MALLOC; 2061 req->dbt1.flags = DB_DBT_MALLOC;
1962 2062
1963 req->sv1 = SvREFCNT_inc (key); SvREADONLY_on (key); 2063 req->sv1 = SvREFCNT_inc (key); SvREADONLY_on (key);
1964 } 2064 }
1965 2065
1966 req->dbt2.flags = DB_DBT_MALLOC; 2066 req->dbt2.flags = DB_DBT_MALLOC;
1967 req->sv2 = SvREFCNT_inc (pkey); SvREADONLY_on (pkey); 2067 req->sv2 = SvREFCNT_inc (pkey); SvREADONLY_on (pkey);
1968 2068
1969 if (flags & DB_OPFLAGS_MASK == DB_GET_BOTH 2069 if ((flags & DB_OPFLAGS_MASK) == DB_GET_BOTH
1970 || flags & DB_OPFLAGS_MASK == DB_GET_BOTH_RANGE) 2070 || (flags & DB_OPFLAGS_MASK) == DB_GET_BOTH_RANGE)
1971 sv_to_dbt (&req->dbt3, data); 2071 sv_to_dbt (&req->dbt3, data);
1972 else 2072 else
1973 req->dbt3.flags = DB_DBT_MALLOC; 2073 req->dbt3.flags = DB_DBT_MALLOC;
1974 2074
1975 req->sv3 = SvREFCNT_inc (data); SvREADONLY_on (data); 2075 req->sv3 = SvREFCNT_inc (data); SvREADONLY_on (data);
1976 REQ_SEND; 2076 REQ_SEND;
2077 }
1977} 2078}
1978 2079
1979void 2080void
1980db_c_del (DBC *dbc, U32 flags = 0, SV *callback = 0) 2081db_c_del (DBC *dbc, U32 flags = 0, SV *callback = 0)
1981 PREINIT: 2082 PREINIT:
… …
2256 CODE: 2357 CODE:
2257 RETVAL = db->set_cachesize (db, gbytes, bytes, ncache); 2358 RETVAL = db->set_cachesize (db, gbytes, bytes, ncache);
2258 OUTPUT: 2359 OUTPUT:
2259 RETVAL 2360 RETVAL
2260 2361
2362int set_pagesize (DB *db, U32 pagesize)
2363 CODE:
2364 RETVAL = db->set_pagesize (db, pagesize);
2365 OUTPUT:
2366 RETVAL
2367
2261int set_flags (DB *db, U32 flags) 2368int set_flags (DB *db, U32 flags)
2262 CODE: 2369 CODE:
2263 RETVAL = db->set_flags (db, flags); 2370 RETVAL = db->set_flags (db, flags);
2264 OUTPUT: 2371 OUTPUT:
2265 RETVAL 2372 RETVAL

Diff Legend

– Removed lines
+ Added lines
< Changed lines
> Changed lines