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.64 by root, Wed Nov 12 16:52:51 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 }
… …
1132 } 1162 }
1133 } 1163 }
1134 1164
1135 return 0; 1165 return 0;
1136} 1166}
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/*****************************************************************************/
1137 1208
1138/* stupid windows defines CALLBACK as well */ 1209/* stupid windows defines CALLBACK as well */
1139#undef CALLBACK 1210#undef CALLBACK
1140#define CALLBACK SV *cb = pop_callback (&items, ST (items - 1)); 1211#define CALLBACK SV *cb = pop_callback (&items, ST (items - 1));
1141 1212
… …
1196 const_iv (NOSYNC) 1267 const_iv (NOSYNC)
1197 const_iv (CHKSUM) 1268 const_iv (CHKSUM)
1198 const_iv (ENCRYPT) 1269 const_iv (ENCRYPT)
1199 const_iv (DUP) 1270 const_iv (DUP)
1200 const_iv (DUPSORT) 1271 const_iv (DUPSORT)
1201 const_iv (RECNUM) 1272 //const_iv (RECNUM)
1202 const_iv (RENUMBER) 1273 const_iv (RENUMBER)
1203 const_iv (REVSPLITOFF) 1274 const_iv (REVSPLITOFF)
1204 const_iv (CONSUME) 1275 const_iv (CONSUME)
1205 const_iv (CONSUME_WAIT) 1276 const_iv (CONSUME_WAIT)
1206 const_iv (GET_BOTH) 1277 const_iv (GET_BOTH)
… …
1278 const_iv (REP_UNAVAIL) 1349 const_iv (REP_UNAVAIL)
1279 const_iv (RUNRECOVERY) 1350 const_iv (RUNRECOVERY)
1280 const_iv (SECONDARY_BAD) 1351 const_iv (SECONDARY_BAD)
1281 const_iv (VERIFY_BAD) 1352 const_iv (VERIFY_BAD)
1282 1353
1354 const_iv (ARCH_ABS)
1355 const_iv (ARCH_DATA)
1356 const_iv (ARCH_LOG)
1357 const_iv (ARCH_REMOVE)
1358
1283 const_iv (VERB_DEADLOCK) 1359 const_iv (VERB_DEADLOCK)
1284 const_iv (VERB_RECOVERY) 1360 const_iv (VERB_RECOVERY)
1285 const_iv (VERB_REPLICATION) 1361 const_iv (VERB_REPLICATION)
1286 const_iv (VERB_WAITSFOR) 1362 const_iv (VERB_WAITSFOR)
1287 1363
… …
1320 const_iv (PRIORITY_VERY_LOW) 1396 const_iv (PRIORITY_VERY_LOW)
1321 const_iv (PRIORITY_LOW) 1397 const_iv (PRIORITY_LOW)
1322 const_iv (PRIORITY_DEFAULT) 1398 const_iv (PRIORITY_DEFAULT)
1323 const_iv (PRIORITY_HIGH) 1399 const_iv (PRIORITY_HIGH)
1324 const_iv (PRIORITY_VERY_HIGH) 1400 const_iv (PRIORITY_VERY_HIGH)
1401 const_iv (IGNORE_LEASE)
1325#endif 1402#endif
1326#if DB_VERSION_MINOR >= 7 1403#if DB_VERSION_MINOR >= 7
1404 //const_iv (MULTIPLE_KEY)
1327 const_iv (LOG_DIRECT) 1405 const_iv (LOG_DIRECT)
1328 const_iv (LOG_DSYNC) 1406 const_iv (LOG_DSYNC)
1329 const_iv (LOG_AUTO_REMOVE) 1407 const_iv (LOG_AUTO_REMOVE)
1330 const_iv (LOG_IN_MEMORY) 1408 const_iv (LOG_IN_MEMORY)
1331 const_iv (LOG_ZERO) 1409 const_iv (LOG_ZERO)
… …
1635 req->buf3 = strdup_ornull (newname); 1713 req->buf3 = strdup_ornull (newname);
1636 req->uint1 = flags; 1714 req->uint1 = flags;
1637 REQ_SEND; 1715 REQ_SEND;
1638} 1716}
1639 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
1640DB * 1731DB *
1641db_create (DB_ENV *env = 0, U32 flags = 0) 1732db_create (DB_ENV *env = 0, U32 flags = 0)
1642 CODE: 1733 CODE:
1643{ 1734{
1644 errno = db_create (&RETVAL, env, flags); 1735 errno = db_create (&RETVAL, env, flags);
… …
1691 CODE: 1782 CODE:
1692{ 1783{
1693 dREQ (REQ_DB_COMPACT, 2); 1784 dREQ (REQ_DB_COMPACT, 2);
1694 req->db = db; 1785 req->db = db;
1695 req->txn = txn; 1786 req->txn = txn;
1696 sv_to_dbt (&req->dbt1, start); 1787 if (start) sv_to_dbt (&req->dbt1, start);
1697 sv_to_dbt (&req->dbt2, stop); 1788 if (stop ) sv_to_dbt (&req->dbt2, stop );
1698 req->uint1 = flags; 1789 req->uint1 = flags;
1699 REQ_SEND; 1790 REQ_SEND;
1700} 1791}
1701 1792
1702#endif 1793#endif
… …
1907db_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)
1908 PREINIT: 1999 PREINIT:
1909 CALLBACK 2000 CALLBACK
1910 CODE: 2001 CODE:
1911{ 2002{
1912 if (flags & DB_OPFLAGS_MASK != DB_SET && SvREADONLY (key)) 2003 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"); 2004 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)) 2005 if (SvPOKp (key) && !sv_utf8_downgrade (key, 1))
1915 croak ("argument \"%s\" must be byte/octet-encoded in %s", 2006 croak ("argument \"%s\" must be byte/octet-encoded in %s",
1916 "key", 2007 "key",
1917 "BDB::db_c_get"); 2008 "BDB::db_c_get");
1918 2009
1919 { 2010 {
1920 dREQ (REQ_C_GET, 1); 2011 dREQ (REQ_C_GET, 1);
1921 req->dbc = dbc; 2012 req->dbc = dbc;
1922 req->uint1 = flags; 2013 req->uint1 = flags;
1923 if (flags & DB_OPFLAGS_MASK == DB_SET) 2014 if ((flags & DB_OPFLAGS_MASK) == DB_SET)
1924 sv_to_dbt (&req->dbt1, key); 2015 sv_to_dbt (&req->dbt1, key);
1925 else 2016 else
1926 { 2017 {
1927 if (flags & DB_OPFLAGS_MASK == DB_SET_RANGE) 2018 if ((flags & DB_OPFLAGS_MASK) == DB_SET_RANGE)
1928 sv_to_dbt (&req->dbt1, key); 2019 sv_to_dbt (&req->dbt1, key);
1929 else 2020 else
1930 req->dbt1.flags = DB_DBT_MALLOC; 2021 req->dbt1.flags = DB_DBT_MALLOC;
1931 2022
1932 req->sv1 = SvREFCNT_inc (key); SvREADONLY_on (key); 2023 req->sv1 = SvREFCNT_inc (key); SvREADONLY_on (key);
1933 } 2024 }
1934 2025
1935 if (flags & DB_OPFLAGS_MASK == DB_GET_BOTH 2026 if ((flags & DB_OPFLAGS_MASK) == DB_GET_BOTH
1936 || flags & DB_OPFLAGS_MASK == DB_GET_BOTH_RANGE) 2027 || (flags & DB_OPFLAGS_MASK) == DB_GET_BOTH_RANGE)
1937 sv_to_dbt (&req->dbt3, data); 2028 sv_to_dbt (&req->dbt3, data);
1938 else 2029 else
1939 req->dbt3.flags = DB_DBT_MALLOC; 2030 req->dbt3.flags = DB_DBT_MALLOC;
1940 2031
1941 req->sv3 = SvREFCNT_inc (data); SvREADONLY_on (data); 2032 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) 2038db_c_pget (DBC *dbc, SV *key, SV_mutable *pkey, SV_mutable *data, U32 flags = 0, SV *callback = 0)
1948 PREINIT: 2039 PREINIT:
1949 CALLBACK 2040 CALLBACK
1950 CODE: 2041 CODE:
1951{ 2042{
1952 if (flags & DB_OPFLAGS_MASK != DB_SET && SvREADONLY (key)) 2043 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"); 2044 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)) 2045 if (SvPOKp (key) && !sv_utf8_downgrade (key, 1))
1955 croak ("argument \"%s\" must be byte/octet-encoded in %s", 2046 croak ("argument \"%s\" must be byte/octet-encoded in %s",
1956 "key", 2047 "key",
1957 "BDB::db_c_pget"); 2048 "BDB::db_c_pget");
1958 2049
1959 { 2050 {
1960 dREQ (REQ_C_PGET, 1); 2051 dREQ (REQ_C_PGET, 1);
1961 req->dbc = dbc; 2052 req->dbc = dbc;
1962 req->uint1 = flags; 2053 req->uint1 = flags;
1963 if (flags & DB_OPFLAGS_MASK == DB_SET) 2054 if ((flags & DB_OPFLAGS_MASK) == DB_SET)
1964 sv_to_dbt (&req->dbt1, key); 2055 sv_to_dbt (&req->dbt1, key);
1965 else 2056 else
1966 { 2057 {
1967 if (flags & DB_OPFLAGS_MASK == DB_SET_RANGE) 2058 if ((flags & DB_OPFLAGS_MASK) == DB_SET_RANGE)
1968 sv_to_dbt (&req->dbt1, key); 2059 sv_to_dbt (&req->dbt1, key);
1969 else 2060 else
1970 req->dbt1.flags = DB_DBT_MALLOC; 2061 req->dbt1.flags = DB_DBT_MALLOC;
1971 2062
1972 req->sv1 = SvREFCNT_inc (key); SvREADONLY_on (key); 2063 req->sv1 = SvREFCNT_inc (key); SvREADONLY_on (key);
1973 } 2064 }
1974 2065
1975 req->dbt2.flags = DB_DBT_MALLOC; 2066 req->dbt2.flags = DB_DBT_MALLOC;
1976 req->sv2 = SvREFCNT_inc (pkey); SvREADONLY_on (pkey); 2067 req->sv2 = SvREFCNT_inc (pkey); SvREADONLY_on (pkey);
1977 2068
1978 if (flags & DB_OPFLAGS_MASK == DB_GET_BOTH 2069 if ((flags & DB_OPFLAGS_MASK) == DB_GET_BOTH
1979 || flags & DB_OPFLAGS_MASK == DB_GET_BOTH_RANGE) 2070 || (flags & DB_OPFLAGS_MASK) == DB_GET_BOTH_RANGE)
1980 sv_to_dbt (&req->dbt3, data); 2071 sv_to_dbt (&req->dbt3, data);
1981 else 2072 else
1982 req->dbt3.flags = DB_DBT_MALLOC; 2073 req->dbt3.flags = DB_DBT_MALLOC;
1983 2074
1984 req->sv3 = SvREFCNT_inc (data); SvREADONLY_on (data); 2075 req->sv3 = SvREFCNT_inc (data); SvREADONLY_on (data);
… …
2266 CODE: 2357 CODE:
2267 RETVAL = db->set_cachesize (db, gbytes, bytes, ncache); 2358 RETVAL = db->set_cachesize (db, gbytes, bytes, ncache);
2268 OUTPUT: 2359 OUTPUT:
2269 RETVAL 2360 RETVAL
2270 2361
2362int set_pagesize (DB *db, U32 pagesize)
2363 CODE:
2364 RETVAL = db->set_pagesize (db, pagesize);
2365 OUTPUT:
2366 RETVAL
2367
2271int set_flags (DB *db, U32 flags) 2368int set_flags (DB *db, U32 flags)
2272 CODE: 2369 CODE:
2273 RETVAL = db->set_flags (db, flags); 2370 RETVAL = db->set_flags (db, flags);
2274 OUTPUT: 2371 OUTPUT:
2275 RETVAL 2372 RETVAL

Diff Legend

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