|
50 | 50 | * |
51 | 51 | * Gregory P. Smith <greg@krypto.org> was once again the maintainer. |
52 | 52 | * |
53 | | - * Since January 2008, new maintainer is Jesus Cea <jcea@argo.es>. |
| 53 | + * Since January 2008, new maintainer is Jesus Cea <jcea@jcea.es>. |
54 | 54 | * Jesus Cea licenses this code to PSF under a Contributor Agreement. |
55 | 55 | * |
56 | 56 | * Use the pybsddb-users@lists.sf.net mailing list for all questions. |
@@ -4129,6 +4129,26 @@ DBEnv_set_flags(DBEnvObject* self, PyObject* args) |
4129 | 4129 | } |
4130 | 4130 |
|
4131 | 4131 |
|
| 4132 | +#if (DBVER >= 47) |
| 4133 | +static PyObject* |
| 4134 | +DBEnv_log_set_config(DBEnvObject* self, PyObject* args) |
| 4135 | +{ |
| 4136 | + int err, flags, onoff; |
| 4137 | + |
| 4138 | + if (!PyArg_ParseTuple(args, "ii:log_set_config", |
| 4139 | + &flags, &onoff)) |
| 4140 | + return NULL; |
| 4141 | + CHECK_ENV_NOT_CLOSED(self); |
| 4142 | + |
| 4143 | + MYDB_BEGIN_ALLOW_THREADS; |
| 4144 | + err = self->db_env->log_set_config(self->db_env, flags, onoff); |
| 4145 | + MYDB_END_ALLOW_THREADS; |
| 4146 | + RETURN_IF_ERR(); |
| 4147 | + RETURN_NONE(); |
| 4148 | +} |
| 4149 | +#endif /* DBVER >= 47 */ |
| 4150 | + |
| 4151 | + |
4132 | 4152 | static PyObject* |
4133 | 4153 | DBEnv_set_data_dir(DBEnvObject* self, PyObject* args) |
4134 | 4154 | { |
@@ -4779,8 +4799,13 @@ DBEnv_lock_stat(DBEnvObject* self, PyObject* args) |
4779 | 4799 | MAKE_ENTRY(objs_nowait); |
4780 | 4800 | MAKE_ENTRY(lockers_wait); |
4781 | 4801 | MAKE_ENTRY(lockers_nowait); |
| 4802 | +#if (DBVER >= 47) |
| 4803 | + MAKE_ENTRY(lock_wait); |
| 4804 | + MAKE_ENTRY(lock_nowait); |
| 4805 | +#else |
4782 | 4806 | MAKE_ENTRY(locks_wait); |
4783 | 4807 | MAKE_ENTRY(locks_nowait); |
| 4808 | +#endif |
4784 | 4809 | MAKE_ENTRY(hash_len); |
4785 | 4810 | #endif |
4786 | 4811 | MAKE_ENTRY(regsize); |
@@ -4943,6 +4968,30 @@ DBEnv_set_get_returns_none(DBEnvObject* self, PyObject* args) |
4943 | 4968 | return PyInt_FromLong(oldValue); |
4944 | 4969 | } |
4945 | 4970 |
|
| 4971 | +#if (DBVER >= 40) |
| 4972 | +static PyObject* |
| 4973 | +DBEnv_set_rpc_server(DBEnvObject* self, PyObject* args, PyObject* kwargs) |
| 4974 | +{ |
| 4975 | + int err; |
| 4976 | + char *host; |
| 4977 | + long cl_timeout=0, sv_timeout=0; |
| 4978 | + |
| 4979 | + static char* kwnames[] = { "host", "cl_timeout", "sv_timeout", NULL}; |
| 4980 | + |
| 4981 | + if (!PyArg_ParseTupleAndKeywords(args, kwargs, "s|ll:set_rpc_server", kwnames, |
| 4982 | + &host, &cl_timeout, &sv_timeout)) |
| 4983 | + return NULL; |
| 4984 | + CHECK_ENV_NOT_CLOSED(self); |
| 4985 | + |
| 4986 | + MYDB_BEGIN_ALLOW_THREADS; |
| 4987 | + err = self->db_env->set_rpc_server(self->db_env, NULL, host, cl_timeout, |
| 4988 | + sv_timeout, 0); |
| 4989 | + MYDB_END_ALLOW_THREADS; |
| 4990 | + RETURN_IF_ERR(); |
| 4991 | + RETURN_NONE(); |
| 4992 | +} |
| 4993 | +#endif |
| 4994 | + |
4946 | 4995 | #if (DBVER >= 40) |
4947 | 4996 | static PyObject* |
4948 | 4997 | DBEnv_set_verbose(DBEnvObject* self, PyObject* args) |
@@ -5075,7 +5124,11 @@ static PyObject* |
5075 | 5124 | DBEnv_rep_get_nsites(DBEnvObject* self, PyObject* args) |
5076 | 5125 | { |
5077 | 5126 | int err; |
| 5127 | +#if (DBVER >= 47) |
| 5128 | + u_int32_t nsites; |
| 5129 | +#else |
5078 | 5130 | int nsites; |
| 5131 | +#endif |
5079 | 5132 |
|
5080 | 5133 | if (!PyArg_ParseTuple(args, ":rep_get_nsites")) { |
5081 | 5134 | return NULL; |
@@ -5109,7 +5162,11 @@ static PyObject* |
5109 | 5162 | DBEnv_rep_get_priority(DBEnvObject* self, PyObject* args) |
5110 | 5163 | { |
5111 | 5164 | int err; |
| 5165 | +#if (DBVER >= 47) |
| 5166 | + u_int32_t priority; |
| 5167 | +#else |
5112 | 5168 | int priority; |
| 5169 | +#endif |
5113 | 5170 |
|
5114 | 5171 | if (!PyArg_ParseTuple(args, ":rep_get_priority")) { |
5115 | 5172 | return NULL; |
@@ -6094,6 +6151,9 @@ static PyMethodDef DBEnv_methods[] = { |
6094 | 6151 | {"set_cachesize", (PyCFunction)DBEnv_set_cachesize, METH_VARARGS}, |
6095 | 6152 | {"set_data_dir", (PyCFunction)DBEnv_set_data_dir, METH_VARARGS}, |
6096 | 6153 | {"set_flags", (PyCFunction)DBEnv_set_flags, METH_VARARGS}, |
| 6154 | +#if (DBVER >= 47) |
| 6155 | + {"log_set_config", (PyCFunction)DBEnv_log_set_config, METH_VARARGS}, |
| 6156 | +#endif |
6097 | 6157 | {"set_lg_bsize", (PyCFunction)DBEnv_set_lg_bsize, METH_VARARGS}, |
6098 | 6158 | {"set_lg_dir", (PyCFunction)DBEnv_set_lg_dir, METH_VARARGS}, |
6099 | 6159 | {"set_lg_max", (PyCFunction)DBEnv_set_lg_max, METH_VARARGS}, |
@@ -6139,6 +6199,10 @@ static PyMethodDef DBEnv_methods[] = { |
6139 | 6199 | #if (DBVER >= 40) |
6140 | 6200 | {"txn_recover", (PyCFunction)DBEnv_txn_recover, METH_VARARGS}, |
6141 | 6201 | #endif |
| 6202 | +#if (DBVER >= 40) |
| 6203 | + {"set_rpc_server", (PyCFunction)DBEnv_set_rpc_server, |
| 6204 | + METH_VARARGS||METH_KEYWORDS}, |
| 6205 | +#endif |
6142 | 6206 | #if (DBVER >= 40) |
6143 | 6207 | {"set_verbose", (PyCFunction)DBEnv_set_verbose, METH_VARARGS}, |
6144 | 6208 | #if (DBVER >= 42) |
@@ -6760,6 +6824,7 @@ DL_EXPORT(void) init_bsddb(void) |
6760 | 6824 | #if (DBVER < 45) |
6761 | 6825 | ADD_INT(d, DB_CACHED_COUNTS); |
6762 | 6826 | #endif |
| 6827 | + |
6763 | 6828 | #if (DBVER >= 41) |
6764 | 6829 | _addIntToDict(d, "DB_CHECKPOINT", 0); |
6765 | 6830 | #else |
@@ -6858,14 +6923,25 @@ DL_EXPORT(void) init_bsddb(void) |
6858 | 6923 | ADD_INT(d, DB_TIME_NOTGRANTED); |
6859 | 6924 | ADD_INT(d, DB_TXN_NOT_DURABLE); |
6860 | 6925 | ADD_INT(d, DB_TXN_WRITE_NOSYNC); |
6861 | | - ADD_INT(d, DB_LOG_AUTOREMOVE); |
6862 | | - ADD_INT(d, DB_DIRECT_LOG); |
6863 | 6926 | ADD_INT(d, DB_DIRECT_DB); |
6864 | 6927 | ADD_INT(d, DB_INIT_REP); |
6865 | 6928 | ADD_INT(d, DB_ENCRYPT); |
6866 | 6929 | ADD_INT(d, DB_CHKSUM); |
6867 | 6930 | #endif |
6868 | 6931 |
|
| 6932 | +#if (DBVER >= 42) && (DBVER < 47) |
| 6933 | + ADD_INT(d, DB_LOG_AUTOREMOVE); |
| 6934 | + ADD_INT(d, DB_DIRECT_LOG); |
| 6935 | +#endif |
| 6936 | + |
| 6937 | +#if (DBVER >= 47) |
| 6938 | + ADD_INT(d, DB_LOG_DIRECT); |
| 6939 | + ADD_INT(d, DB_LOG_DSYNC); |
| 6940 | + ADD_INT(d, DB_LOG_IN_MEMORY); |
| 6941 | + ADD_INT(d, DB_LOG_AUTO_REMOVE); |
| 6942 | + ADD_INT(d, DB_LOG_ZERO); |
| 6943 | +#endif |
| 6944 | + |
6869 | 6945 | #if (DBVER >= 44) |
6870 | 6946 | ADD_INT(d, DB_DSYNC_DB); |
6871 | 6947 | #endif |
@@ -6935,14 +7011,17 @@ DL_EXPORT(void) init_bsddb(void) |
6935 | 7011 | #endif |
6936 | 7012 |
|
6937 | 7013 | #if (DBVER >= 43) |
6938 | | - ADD_INT(d, DB_DSYNC_LOG); |
6939 | | - ADD_INT(d, DB_LOG_INMEMORY); |
6940 | 7014 | ADD_INT(d, DB_BUFFER_SMALL); |
6941 | 7015 | ADD_INT(d, DB_SEQ_DEC); |
6942 | 7016 | ADD_INT(d, DB_SEQ_INC); |
6943 | 7017 | ADD_INT(d, DB_SEQ_WRAP); |
6944 | 7018 | #endif |
6945 | 7019 |
|
| 7020 | +#if (DBVER >= 43) && (DBVER < 47) |
| 7021 | + ADD_INT(d, DB_LOG_INMEMORY); |
| 7022 | + ADD_INT(d, DB_DSYNC_LOG); |
| 7023 | +#endif |
| 7024 | + |
6946 | 7025 | #if (DBVER >= 41) |
6947 | 7026 | ADD_INT(d, DB_ENCRYPT_AES); |
6948 | 7027 | ADD_INT(d, DB_AUTO_COMMIT); |
|
0 commit comments