RPM Package Manager, CVS Repository
http://rpm5.org/cvs/
____________________________________________________________________________
Server: rpm5.org Name: Jeff Johnson
Root: /v/rpm/cvs Email: j...@rpm5.org
Module: rpm Date: 20-Sep-2009 04:00:51
Branch: HEAD Handle: 2009092002005100
Modified files:
rpm/rpmdb db3.c dbconfig.c rpmdb.h sqlite.c
Log:
- rpmdb: remove redundant parameters with DB_CONFIG.
Summary:
Revision Changes Path
1.100 +0 -86 rpm/rpmdb/db3.c
1.63 +0 -14 rpm/rpmdb/dbconfig.c
1.97 +0 -1 rpm/rpmdb/rpmdb.h
1.40 +2 -0 rpm/rpmdb/sqlite.c
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: rpm/rpmdb/db3.c
============================================================================
$ cvs diff -u -r1.99 -r1.100 db3.c
--- rpm/rpmdb/db3.c 20 Sep 2009 01:33:55 -0000 1.99
+++ rpm/rpmdb/db3.c 20 Sep 2009 02:00:51 -0000 1.100
@@ -395,88 +395,12 @@
}
/* ==== Locking: */
- /* dbenv->set_lk_conflicts(???) */
- if (dbi->dbi_lk_detect) {
- xx = dbenv->set_lk_detect(dbenv, dbi->dbi_lk_detect);
- xx = cvtdberr(dbi, "dbenv->set_lk_detect", xx, _debug);
- }
-#if !(DB_VERSION_MAJOR == 4 && DB_VERSION_MINOR >= 1)
- if (dbi->dbi_lk_max_lockers) {
- xx = dbenv->set_lk_max_lockers(dbenv, dbi->dbi_lk_max_lockers);
- xx = cvtdberr(dbi, "dbenv->set_lk_max_lockers", xx, _debug);
- }
- if (dbi->dbi_lk_max_locks) {
- xx = dbenv->set_lk_max_locks(dbenv, dbi->dbi_lk_max_locks);
- xx = cvtdberr(dbi, "dbenv->set_lk_max_locks", xx, _debug);
- }
- if (dbi->dbi_lk_max_objects) {
- xx = dbenv->set_lk_max_objects(dbenv, dbi->dbi_lk_max_objects);
- xx = cvtdberr(dbi, "dbenv->set_lk_max_objects", xx, _debug);
- }
/* ==== Logging: */
- if (dbi->dbi_lg_bsize) {
- xx = dbenv->set_lg_bsize(dbenv, dbi->dbi_lg_bsize);
- xx = cvtdberr(dbi, "dbenv->set_lg_bsize", xx, _debug);
- }
- if (dbi->dbi_lg_dir) {
- xx = dbenv->set_lg_dir(dbenv, dbi->dbi_lg_dir);
- xx = cvtdberr(dbi, "dbenv->set_lg_dir", xx, _debug);
- }
- if (dbi->dbi_lg_filemode) {
- xx = dbenv->set_lg_filemode(dbenv, dbi->dbi_lg_filemode);
- xx = cvtdberr(dbi, "dbenv->set_lg_filemode", xx, _debug);
- }
- if (dbi->dbi_lg_max) {
- xx = dbenv->set_lg_max(dbenv, dbi->dbi_lg_max);
- xx = cvtdberr(dbi, "dbenv->set_lg_max", xx, _debug);
- }
- if (dbi->dbi_lg_regionmax) {
- xx = dbenv->set_lg_regionmax(dbenv, dbi->dbi_lg_regionmax);
- xx = cvtdberr(dbi, "dbenv->set_lg_regionmax", xx, _debug);
- }
-#endif
-
/* ==== Memory pool: */
-
/* ==== Mutexes: */
- if (dbi->dbi_mutex_align) {
- xx = dbenv->mutex_set_align(dbenv, dbi->dbi_mutex_align);
- xx = cvtdberr(dbi, "dbenv->mutex_set_align", xx, _debug);
- }
- if (dbi->dbi_mutex_increment) {
- xx = dbenv->mutex_set_increment(dbenv, dbi->dbi_mutex_increment);
- xx = cvtdberr(dbi, "dbenv->mutex_set_increment", xx, _debug);
- }
- if (dbi->dbi_mutex_max) {
- xx = dbenv->mutex_set_max(dbenv, dbi->dbi_mutex_max);
- xx = cvtdberr(dbi, "dbenv->mutex_set_max", xx, _debug);
- }
- if (dbi->dbi_mutex_tas_spins) {
- xx = dbenv->mutex_set_tas_spins(dbenv, dbi->dbi_mutex_tas_spins);
- xx = cvtdberr(dbi, "dbenv->mutex_set_tas_spins", xx, _debug);
- }
-
/* ==== Replication: */
-/* dbenv->rep_set_config */
-/* dbenv->rep_set_limit */
-/* dbenv->rep_set_nsites */
-/* dbenv->rep_set_priority */
-/* dbenv->rep_set_timeout */
-/* dbenv->rep_set_transport */
-
/* ==== Sequences: */
-
/* ==== Transactions: */
- if (dbi->dbi_tx_max) {
- xx = dbenv->set_tx_max(dbenv, dbi->dbi_tx_max);
- xx = cvtdberr(dbi, "dbenv->set_tx_max", xx, _debug);
- }
-/* XXX dbenv->txn_checkpoint */
-/* XXX dbenv->txn_recover */
-/* XXX dbenv->txn_stat */
- /* 4.1 dbenv->set_timeout(???) */
- /* 4.1: dbenv->set_tx_timestamp(???) */
-
/* ==== Other: */
if (dbi->dbi_no_fsync) {
@@ -982,16 +906,6 @@
dbenv->set_errpfx(dbenv, rpmdb->db_errpfx);
/* dbenv->set_paniccall(???) */
/*...@=noeffectuncon@*/
-#if !(DB_VERSION_MAJOR == 4 && DB_VERSION_MINOR >= 3)
- xx = dbenv->set_verbose(dbenv, DB_VERB_CHKPOINT,
- (dbi->dbi_verbose & DB_VERB_CHKPOINT));
-#endif
- xx = dbenv->set_verbose(dbenv, DB_VERB_DEADLOCK,
- (dbi->dbi_verbose & DB_VERB_DEADLOCK));
- xx = dbenv->set_verbose(dbenv, DB_VERB_RECOVERY,
- (dbi->dbi_verbose & DB_VERB_RECOVERY));
- xx = dbenv->set_verbose(dbenv, DB_VERB_WAITSFOR,
- (dbi->dbi_verbose & DB_VERB_WAITSFOR));
if (dbi->dbi_tmpdir) {
/*...@-mods@*/
@@ .
patch -p0 <<'@@ .'
Index: rpm/rpmdb/dbconfig.c
============================================================================
$ cvs diff -u -r1.62 -r1.63 dbconfig.c
--- rpm/rpmdb/dbconfig.c 20 Sep 2009 01:33:55 -0000 1.62
+++ rpm/rpmdb/dbconfig.c 20 Sep 2009 02:00:51 -0000 1.63
@@ -342,9 +342,6 @@
/* ==== Logging: */
/* ==== Memory pool: */
-#if defined(WITH_DB)
-/* XXX DB_ENV->set_mp_max_openfd */
-/* XXX DB_ENV->set_mp_max_write */
/* XXX DB_MPOOLFILE->set_clear_len */
/* XXX DB_MPOOLFILE->set_fileid */
/* XXX DB_MPOOLFILE->set_ftype */
@@ -352,7 +349,6 @@
/* XXX DB_MPOOLFILE->set_maxsize */
/* XXX DB_MPOOLFILE->set_pgcookie */
/* XXX DB_MPOOLFILE->set_priority */
-#endif
/* ==== Mutexes: */
@@ -389,16 +385,6 @@
#endif
/* ==== Transactions: */
-/* XXX DB_ENV->txn_checkpoint */
-/* XXX DB_ENV->txn_recover */
-/* XXX DB_ENV->txn_stat */
-/* XXX DB_ENV->set_timeout */
-/* XXX DB_ENV->get_timeout */
-#if defined(WITH_DB)
- { "tx_max", 0,POPT_ARG_INT, &db3dbi.dbi_tx_max, 0,
- NULL, NULL },
-#endif
-/* XXX DB_ENV->set_tx_timestamp */
/* XXX set_append_recno */
/* XXX set_bt_compare */
@@ .
patch -p0 <<'@@ .'
Index: rpm/rpmdb/rpmdb.h
============================================================================
$ cvs diff -u -r1.96 -r1.97 rpmdb.h
--- rpm/rpmdb/rpmdb.h 20 Sep 2009 01:33:55 -0000 1.96
+++ rpm/rpmdb/rpmdb.h 20 Sep 2009 02:00:51 -0000 1.97
@@ -335,7 +335,6 @@
int64_t dbi_seq_max;
#endif
/* transaction sub-system parameters */
- unsigned int dbi_tx_max;
#if 0
int (*dbi_tx_recover) (DB_ENV *dbenv, DBT *log_rec,
DB_LSN *lsnp, int redo, void *info)
@@ .
patch -p0 <<'@@ .'
Index: rpm/rpmdb/sqlite.c
============================================================================
$ cvs diff -u -r1.39 -r1.40 sqlite.c
--- rpm/rpmdb/sqlite.c 27 Mar 2009 17:42:00 -0000 1.39
+++ rpm/rpmdb/sqlite.c 20 Sep 2009 02:00:51 -0000 1.40
@@ -724,6 +724,7 @@
sprintf(cmd, "PRAGMA locking_mode = EXCLUSIVE;");
xx = sqlite3_exec(sqldb->db, cmd, NULL, NULL, (char
**)&scp->pzErrmsg);
}
+#ifdef DYING
if (dbi->dbi_pagesize > 0) {
int xx;
sprintf(cmd, "PRAGMA cache_size = %d;", dbi->dbi_cachesize);
@@ -734,6 +735,7 @@
sprintf(cmd, "PRAGMA page_size = %d;", dbi->dbi_pagesize);
xx = sqlite3_exec(sqldb->db, cmd, NULL, NULL, (char
**)&scp->pzErrmsg);
}
+#endif
/* Check if the table exists... */
sprintf(cmd,
@@ .
______________________________________________________________________
RPM Package Manager http://rpm5.org
CVS Sources Repository rpm-cvs@rpm5.org
