Enable CDB access as default.

Remove unused int from dbiIndexSet.

CVS patchset: 5443
CVS date: 2002/05/21 16:33:33

diff --git a/macros.in b/macros.in
index 99b5a44..0157790 100644 (file)
--- a/macros.in
+++ b/macros.in
@@ -1,7 +1,7 @@
 #/*! \page config_macros Default configuration: /usr/lib/rpm/macros
 # \verbatim
 #
-# $Id: macros.in,v 1.99 2002/05/02 23:34:20 jbj Exp $
+# $Id: macros.in,v 1.100 2002/05/21 16:33:33 jbj Exp $
 #
 # This is a global RPM configuration file. All changes made here will
 # be lost when the rpm package is upgraded. Any per-system configuration
@@ -373,15 +373,14 @@
 #   ht_dup     +++     (hash only) DB_DUP
 #   ht_dupsort +++     (hash only) DB_DUPSORT
 #----------------------- rpmdb specific configuration:
-#   usecursors         (always on) Use db3 cursors in get/put/del ?
 #   usedbenv           (always on) Use db3 environment?
-#   verify             (always on, db3 only) Verify db after close?
+#   verify             (always on, db3 only) Verify Packages db after RW close?
 #   lockdbfd           (always on for Packages) Use fcntl(2) locking ?
 #   nofsync            Disable fsync(2) call performed after db3 writes?
 #   temporary          Unlink file when closing.
 #
 # XXX Use a CDB database model for concurrent access (under development,
-# cursor teardown with signals needs work, much more besides.)
+# cursor teardown with signals needs work.)
 #%__dbi_other                  usedbenv create joinenv cdb mpool \
 #                              mp_mmapsize=8Mb mp_size=512Kb verify
 
@@ -389,8 +388,7 @@
 #%__dbi_other                  usedbenv create joinenv mpool txn log \
 #                              mp_mmapsize=8Mb mp_size=512Kb verify
 
-# XXX enable at your own risk, CDB access to rpmdb isn't cooked yet.
-#%__dbi_cdb                    create joinenv cdb mpool
+%__dbi_cdb                     create cdb
 
 # XXX The "traditional" rpmdb shared/exclusive fcntl(2) lock on Packages model:
 %__dbi_other                   %{?_tmppath:tmpdir=%{_tmppath}} %{?__dbi_cdb}

diff --git a/rpm.spec.in b/rpm.spec.in
index 6fda8dc..5f7a5e2 100644 (file)
--- a/rpm.spec.in
+++ b/rpm.spec.in
@@ -6,9 +6,6 @@
 %define with_internal_db       @WITH_INTERNAL_DB@%{nil}
 %define strip_binaries         1
 
-# XXX enable at your own risk, CDB access to rpmdb isn't cooked yet.
-%define        enable_cdb              create cdb
-
 # XXX legacy requires './' payload prefix to be omitted from rpm packages.
 %define        _noPayloadPrefix        1
 
@@ -195,9 +192,6 @@ mkdir -p $RPM_BUILD_ROOT/etc/rpm
 cat << E_O_F > $RPM_BUILD_ROOT/etc/rpm/macros.db1
 %%_dbapi               1
 E_O_F
-cat << E_O_F > $RPM_BUILD_ROOT/etc/rpm/macros.cdb
-%{?enable_cdb:%%__dbi_cdb      %{enable_cdb}}
-E_O_F
 
 mkdir -p $RPM_BUILD_ROOT/var/lib/rpm
 for dbi in \

diff --git a/rpmdb/rpmdb.c b/rpmdb/rpmdb.c
index 2665cf1..d9a09ac 100644 (file)
--- a/rpmdb/rpmdb.c
+++ b/rpmdb/rpmdb.c
@@ -364,7 +364,6 @@ static int dbt2set(dbiIndex dbi, DBT * data, /*@out@*/ dbiIndexSet * setp)
            set->recs[i].hdrNum = hdrNum.ui;
            set->recs[i].tagNum = tagNum.ui;
            set->recs[i].fpNum = 0;
-           set->recs[i].dbNum = 0;
        }
        break;
     case 1*sizeof(int_32):
@@ -379,7 +378,6 @@ static int dbt2set(dbiIndex dbi, DBT * data, /*@out@*/ dbiIndexSet * setp)
            set->recs[i].hdrNum = hdrNum.ui;
            set->recs[i].tagNum = 0;
            set->recs[i].fpNum = 0;
-           set->recs[i].dbNum = 0;
        }
        break;
     }

diff --git a/rpmdb/rpmdb.h b/rpmdb/rpmdb.h
index 815264c..d91b366 100644 (file)
--- a/rpmdb/rpmdb.h
+++ b/rpmdb/rpmdb.h
@@ -55,7 +55,6 @@ struct _dbiIndexItem {
     unsigned int hdrNum;               /*!< header instance in db */
     unsigned int tagNum;               /*!< tag index in header */
     unsigned int fpNum;                        /*!< finger print index */
-    unsigned int dbNum;                        /*!< database index */
 };
 
 /** \ingroup dbi

diff --git a/rpmrc.in b/rpmrc.in
index 3c36ab2..9550ae0 100644 (file)
--- a/rpmrc.in
+++ b/rpmrc.in
@@ -1,7 +1,7 @@
 #/*! \page config_rpmrc Default configuration: /usr/lib/rpm/rpmrc
 # \verbatim
 #
-# $Id: rpmrc.in,v 2.47 2002/01/23 00:58:47 jbj Exp $
+# $Id: rpmrc.in,v 2.48 2002/05/21 16:33:33 jbj Exp $
 #
 # This is a global RPM configuration file. All changes made here will
 # be lost when the rpm package is upgraded. Any per-system configuration
@@ -343,7 +343,7 @@ buildarch_compat: ia64: noarch
 buildarch_compat: s390: noarch
 buildarch_compat: s390x: noarch
 
-macrofiles:    @RPMCONFIGDIR@/macros:@RPMCONFIGDIR@/%{_target}/macros:@SYSCONFIGDIR@/macros.specspo:@SYSCONFIGDIR@/macros.db1:@SYSCONFIGDIR@/macros.cdb:@SYSCONFIGDIR@/macros:@SYSCONFIGDIR@/%{_target}/macros:~/.rpmmacros
+macrofiles:    @RPMCONFIGDIR@/macros:@RPMCONFIGDIR@/%{_target}/macros:@SYSCONFIGDIR@/macros.specspo:@SYSCONFIGDIR@/macros:@SYSCONFIGDIR@/%{_target}/macros:~/.rpmmacros
 
 # \endverbatim
 #*/