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

Comparing BDB/BDB.xs (file contents):
Revision 1.59 by root, Mon Oct 20 02:31:51 2008 UTC vs.
Revision 1.63 by root, Tue Oct 21 02:21:25 2008 UTC

… …
149 149
150enum { 150enum {
151 REQ_QUIT, 151 REQ_QUIT,
152 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,
153 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,
154 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,
155 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,
156 REQ_TXN_COMMIT, REQ_TXN_ABORT, REQ_TXN_FINISH, 157 REQ_TXN_COMMIT, REQ_TXN_ABORT, REQ_TXN_FINISH,
157 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,
158 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,
… …
377 378
378 av_push (av, newSVnv (req->key_range.less)); 379 av_push (av, newSVnv (req->key_range.less));
379 av_push (av, newSVnv (req->key_range.equal)); 380 av_push (av, newSVnv (req->key_range.equal));
380 av_push (av, newSVnv (req->key_range.greater)); 381 av_push (av, newSVnv (req->key_range.greater));
381 382
383 av = (AV *)newRV_noinc ((SV *)av);
384
382 SvREADONLY_off (req->sv1); 385 SvREADONLY_off (req->sv1);
383 sv_setsv_mg (req->sv1, newRV_noinc ((SV *)av)); 386 sv_setsv_mg (req->sv1, newRV_noinc ((SV *)av));
387 SvREFCNT_dec (av);
384 SvREFCNT_dec (req->sv1); 388 SvREFCNT_dec (req->sv1);
385 } 389 }
386 break; 390 break;
387 391
388#if DB_VERSION_MINOR >= 3 392#if DB_VERSION_MINOR >= 3
… …
395 sv_setnv_mg (req->sv1, (NV)req->seq_t); 399 sv_setnv_mg (req->sv1, (NV)req->seq_t);
396 400
397 SvREFCNT_dec (req->sv1); 401 SvREFCNT_dec (req->sv1);
398 break; 402 break;
399#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;
400 } 422 }
401 423
402 errno = req->result; 424 errno = req->result;
403 425
404 if (req->callback) 426 if (req->callback)
… …
768 req->result = req->db->close (req->db, req->uint1); 790 req->result = req->db->close (req->db, req->uint1);
769 break; 791 break;
770 792
771#if DB_VERSION_MINOR >= 4 793#if DB_VERSION_MINOR >= 4
772 case REQ_DB_COMPACT: 794 case REQ_DB_COMPACT:
773 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);
774 break; 796 break;
775#endif 797#endif
776 798
777 case REQ_DB_SYNC: 799 case REQ_DB_SYNC:
778 req->result = req->db->sync (req->db, req->uint1); 800 req->result = req->db->sync (req->db, req->uint1);
… …
869 891
870 case REQ_SEQ_REMOVE: 892 case REQ_SEQ_REMOVE:
871 req->result = req->seq->remove (req->seq, req->txn, req->uint1); 893 req->result = req->seq->remove (req->seq, req->txn, req->uint1);
872 break; 894 break;
873#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;
874 904
875 default: 905 default:
876 req->result = ENOSYS; 906 req->result = ENOSYS;
877 break; 907 break;
878 } 908 }
… …
1196 const_iv (NOSYNC) 1226 const_iv (NOSYNC)
1197 const_iv (CHKSUM) 1227 const_iv (CHKSUM)
1198 const_iv (ENCRYPT) 1228 const_iv (ENCRYPT)
1199 const_iv (DUP) 1229 const_iv (DUP)
1200 const_iv (DUPSORT) 1230 const_iv (DUPSORT)
1201 const_iv (RECNUM) 1231 //const_iv (RECNUM)
1202 const_iv (RENUMBER) 1232 const_iv (RENUMBER)
1203 const_iv (REVSPLITOFF) 1233 const_iv (REVSPLITOFF)
1204 const_iv (CONSUME) 1234 const_iv (CONSUME)
1205 const_iv (CONSUME_WAIT) 1235 const_iv (CONSUME_WAIT)
1206 const_iv (GET_BOTH) 1236 const_iv (GET_BOTH)
… …
1278 const_iv (REP_UNAVAIL) 1308 const_iv (REP_UNAVAIL)
1279 const_iv (RUNRECOVERY) 1309 const_iv (RUNRECOVERY)
1280 const_iv (SECONDARY_BAD) 1310 const_iv (SECONDARY_BAD)
1281 const_iv (VERIFY_BAD) 1311 const_iv (VERIFY_BAD)
1282 1312
1313 const_iv (ARCH_ABS)
1314 const_iv (ARCH_DATA)
1315 const_iv (ARCH_LOG)
1316 const_iv (ARCH_REMOVE)
1317
1283 const_iv (VERB_DEADLOCK) 1318 const_iv (VERB_DEADLOCK)
1284 const_iv (VERB_RECOVERY) 1319 const_iv (VERB_RECOVERY)
1285 const_iv (VERB_REPLICATION) 1320 const_iv (VERB_REPLICATION)
1286 const_iv (VERB_WAITSFOR) 1321 const_iv (VERB_WAITSFOR)
1287 1322
… …
1320 const_iv (PRIORITY_VERY_LOW) 1355 const_iv (PRIORITY_VERY_LOW)
1321 const_iv (PRIORITY_LOW) 1356 const_iv (PRIORITY_LOW)
1322 const_iv (PRIORITY_DEFAULT) 1357 const_iv (PRIORITY_DEFAULT)
1323 const_iv (PRIORITY_HIGH) 1358 const_iv (PRIORITY_HIGH)
1324 const_iv (PRIORITY_VERY_HIGH) 1359 const_iv (PRIORITY_VERY_HIGH)
1360 const_iv (IGNORE_LEASE)
1325#endif 1361#endif
1326#if DB_VERSION_MINOR >= 7 1362#if DB_VERSION_MINOR >= 7
1363 //const_iv (MULTIPLE_KEY)
1327 const_iv (LOG_DIRECT) 1364 const_iv (LOG_DIRECT)
1328 const_iv (LOG_DSYNC) 1365 const_iv (LOG_DSYNC)
1329 const_iv (LOG_AUTO_REMOVE) 1366 const_iv (LOG_AUTO_REMOVE)
1330 const_iv (LOG_IN_MEMORY) 1367 const_iv (LOG_IN_MEMORY)
1331 const_iv (LOG_ZERO) 1368 const_iv (LOG_ZERO)
… …
1635 req->buf3 = strdup_ornull (newname); 1672 req->buf3 = strdup_ornull (newname);
1636 req->uint1 = flags; 1673 req->uint1 = flags;
1637 REQ_SEND; 1674 REQ_SEND;
1638} 1675}
1639 1676
1677void
1678db_env_log_archive (DB_ENV *env, SV_mutable *listp, U32 flags = 0, SV *callback = 0)
1679 PREINIT:
1680 CALLBACK
1681 CODE:
1682{
1683 dREQ (REQ_ENV_LOG_ARCHIVE, 1);
1684 req->sv1 = SvREFCNT_inc (listp);
1685 req->env = env;
1686 req->uint1 = flags;
1687 REQ_SEND;
1688}
1689
1640DB * 1690DB *
1641db_create (DB_ENV *env = 0, U32 flags = 0) 1691db_create (DB_ENV *env = 0, U32 flags = 0)
1642 CODE: 1692 CODE:
1643{ 1693{
1644 errno = db_create (&RETVAL, env, flags); 1694 errno = db_create (&RETVAL, env, flags);
… …
1691 CODE: 1741 CODE:
1692{ 1742{
1693 dREQ (REQ_DB_COMPACT, 2); 1743 dREQ (REQ_DB_COMPACT, 2);
1694 req->db = db; 1744 req->db = db;
1695 req->txn = txn; 1745 req->txn = txn;
1696 sv_to_dbt (&req->dbt1, start); 1746 if (start) sv_to_dbt (&req->dbt1, start);
1697 sv_to_dbt (&req->dbt2, stop); 1747 if (stop ) sv_to_dbt (&req->dbt2, stop );
1698 req->uint1 = flags; 1748 req->uint1 = flags;
1699 REQ_SEND; 1749 REQ_SEND;
1700} 1750}
1701 1751
1702#endif 1752#endif
… …
1907db_c_get (DBC *dbc, SV *key, SV_mutable *data, U32 flags = 0, SV *callback = 0) 1957db_c_get (DBC *dbc, SV *key, SV_mutable *data, U32 flags = 0, SV *callback = 0)
1908 PREINIT: 1958 PREINIT:
1909 CALLBACK 1959 CALLBACK
1910 CODE: 1960 CODE:
1911{ 1961{
1912 if (flags & DB_OPFLAGS_MASK != DB_SET && SvREADONLY (key)) 1962 if ((flags & DB_OPFLAGS_MASK) != DB_SET && SvREADONLY (key))
1913 croak ("db_c_get was passed a read-only/constant 'key' argument but operation is not DB_SET"); 1963 croak ("db_c_get was passed a read-only/constant 'key' argument but operation is not DB_SET");
1914 if (SvPOKp (key) && !sv_utf8_downgrade (key, 1)) 1964 if (SvPOKp (key) && !sv_utf8_downgrade (key, 1))
1915 croak ("argument \"%s\" must be byte/octet-encoded in %s", 1965 croak ("argument \"%s\" must be byte/octet-encoded in %s",
1916 "key", 1966 "key",
1917 "BDB::db_c_get"); 1967 "BDB::db_c_get");
1918 1968
1919 { 1969 {
1920 dREQ (REQ_C_GET, 1); 1970 dREQ (REQ_C_GET, 1);
1921 req->dbc = dbc; 1971 req->dbc = dbc;
1922 req->uint1 = flags; 1972 req->uint1 = flags;
1923 if (flags & DB_OPFLAGS_MASK == DB_SET) 1973 if ((flags & DB_OPFLAGS_MASK) == DB_SET)
1924 sv_to_dbt (&req->dbt1, key); 1974 sv_to_dbt (&req->dbt1, key);
1925 else 1975 else
1926 { 1976 {
1927 if (flags & DB_OPFLAGS_MASK == DB_SET_RANGE) 1977 if ((flags & DB_OPFLAGS_MASK) == DB_SET_RANGE)
1928 sv_to_dbt (&req->dbt1, key); 1978 sv_to_dbt (&req->dbt1, key);
1929 else 1979 else
1930 req->dbt1.flags = DB_DBT_MALLOC; 1980 req->dbt1.flags = DB_DBT_MALLOC;
1931 1981
1932 req->sv1 = SvREFCNT_inc (key); SvREADONLY_on (key); 1982 req->sv1 = SvREFCNT_inc (key); SvREADONLY_on (key);
1933 } 1983 }
1934 1984
1935 if (flags & DB_OPFLAGS_MASK == DB_GET_BOTH 1985 if ((flags & DB_OPFLAGS_MASK) == DB_GET_BOTH
1936 || flags & DB_OPFLAGS_MASK == DB_GET_BOTH_RANGE) 1986 || (flags & DB_OPFLAGS_MASK) == DB_GET_BOTH_RANGE)
1937 sv_to_dbt (&req->dbt3, data); 1987 sv_to_dbt (&req->dbt3, data);
1938 else 1988 else
1939 req->dbt3.flags = DB_DBT_MALLOC; 1989 req->dbt3.flags = DB_DBT_MALLOC;
1940 1990
1941 req->sv3 = SvREFCNT_inc (data); SvREADONLY_on (data); 1991 req->sv3 = SvREFCNT_inc (data); SvREADONLY_on (data);
… …
1947db_c_pget (DBC *dbc, SV *key, SV_mutable *pkey, SV_mutable *data, U32 flags = 0, SV *callback = 0) 1997db_c_pget (DBC *dbc, SV *key, SV_mutable *pkey, SV_mutable *data, U32 flags = 0, SV *callback = 0)
1948 PREINIT: 1998 PREINIT:
1949 CALLBACK 1999 CALLBACK
1950 CODE: 2000 CODE:
1951{ 2001{
1952 if (flags & DB_OPFLAGS_MASK != DB_SET && SvREADONLY (key)) 2002 if ((flags & DB_OPFLAGS_MASK) != DB_SET && SvREADONLY (key))
1953 croak ("db_c_pget was passed a read-only/constant 'key' argument but operation is not DB_SET"); 2003 croak ("db_c_pget was passed a read-only/constant 'key' argument but operation is not DB_SET");
1954 if (SvPOKp (key) && !sv_utf8_downgrade (key, 1)) 2004 if (SvPOKp (key) && !sv_utf8_downgrade (key, 1))
1955 croak ("argument \"%s\" must be byte/octet-encoded in %s", 2005 croak ("argument \"%s\" must be byte/octet-encoded in %s",
1956 "key", 2006 "key",
1957 "BDB::db_c_pget"); 2007 "BDB::db_c_pget");
1958 2008
1959 { 2009 {
1960 dREQ (REQ_C_PGET, 1); 2010 dREQ (REQ_C_PGET, 1);
1961 req->dbc = dbc; 2011 req->dbc = dbc;
1962 req->uint1 = flags; 2012 req->uint1 = flags;
1963 if (flags & DB_OPFLAGS_MASK == DB_SET) 2013 if ((flags & DB_OPFLAGS_MASK) == DB_SET)
1964 sv_to_dbt (&req->dbt1, key); 2014 sv_to_dbt (&req->dbt1, key);
1965 else 2015 else
1966 { 2016 {
1967 if (flags & DB_OPFLAGS_MASK == DB_SET_RANGE) 2017 if ((flags & DB_OPFLAGS_MASK) == DB_SET_RANGE)
1968 sv_to_dbt (&req->dbt1, key); 2018 sv_to_dbt (&req->dbt1, key);
1969 else 2019 else
1970 req->dbt1.flags = DB_DBT_MALLOC; 2020 req->dbt1.flags = DB_DBT_MALLOC;
1971 2021
1972 req->sv1 = SvREFCNT_inc (key); SvREADONLY_on (key); 2022 req->sv1 = SvREFCNT_inc (key); SvREADONLY_on (key);
1973 } 2023 }
1974 2024
1975 req->dbt2.flags = DB_DBT_MALLOC; 2025 req->dbt2.flags = DB_DBT_MALLOC;
1976 req->sv2 = SvREFCNT_inc (pkey); SvREADONLY_on (pkey); 2026 req->sv2 = SvREFCNT_inc (pkey); SvREADONLY_on (pkey);
1977 2027
1978 if (flags & DB_OPFLAGS_MASK == DB_GET_BOTH 2028 if ((flags & DB_OPFLAGS_MASK) == DB_GET_BOTH
1979 || flags & DB_OPFLAGS_MASK == DB_GET_BOTH_RANGE) 2029 || (flags & DB_OPFLAGS_MASK) == DB_GET_BOTH_RANGE)
1980 sv_to_dbt (&req->dbt3, data); 2030 sv_to_dbt (&req->dbt3, data);
1981 else 2031 else
1982 req->dbt3.flags = DB_DBT_MALLOC; 2032 req->dbt3.flags = DB_DBT_MALLOC;
1983 2033
1984 req->sv3 = SvREFCNT_inc (data); SvREADONLY_on (data); 2034 req->sv3 = SvREFCNT_inc (data); SvREADONLY_on (data);
… …
2266 CODE: 2316 CODE:
2267 RETVAL = db->set_cachesize (db, gbytes, bytes, ncache); 2317 RETVAL = db->set_cachesize (db, gbytes, bytes, ncache);
2268 OUTPUT: 2318 OUTPUT:
2269 RETVAL 2319 RETVAL
2270 2320
2321int set_pagesize (DB *db, U32 pagesize)
2322 CODE:
2323 RETVAL = db->set_pagesize (db, pagesize);
2324 OUTPUT:
2325 RETVAL
2326
2271int set_flags (DB *db, U32 flags) 2327int set_flags (DB *db, U32 flags)
2272 CODE: 2328 CODE:
2273 RETVAL = db->set_flags (db, flags); 2329 RETVAL = db->set_flags (db, flags);
2274 OUTPUT: 2330 OUTPUT:
2275 RETVAL 2331 RETVAL

Diff Legend

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