Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Default to sqlite backend and remove support for BDB #1523

Merged
merged 3 commits into from Feb 3, 2021
Merged

Default to sqlite backend and remove support for BDB #1523

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
dd7385e
Make sqlite the default database backend
pmatilai Jan 29, 2021
cd76ba4
Remove support for Berkeley Database backend
pmatilai Jan 29, 2021
44eb3c5
Remove indirect BDB leftovers
pmatilai Feb 2, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
1 change: 0 additions & 1 deletion lib/backend/dbi.c
View file
Open in desktop
Expand Up @@ -42,7 +42,6 @@ dbiIndex dbiNew(rpmdb rdb, rpmDbiTagVal rpmtag)
dbi->dbi_rpmdb = rdb;
dbi->dbi_file = rpmTagGetName(rpmtag);
dbi->dbi_type = (rpmtag == RPMDBI_PACKAGES) ? DBI_PRIMARY : DBI_SECONDARY;
dbi->dbi_byteswapped = -1; /* -1 unknown, 0 native order, 1 alien order */
return dbi;
}

Expand Down
14 changes: 0 additions & 14 deletions lib/backend/dbi.h
View file
Open in desktop
Expand Up @@ -25,17 +25,7 @@ typedef struct dbiIndex_s * dbiIndex;
typedef struct dbiCursor_s * dbiCursor;

struct dbConfig_s {
int db_mmapsize; /*!< (10Mb) */
int db_cachesize; /*!< (128Kb) */
int db_verbose;
int db_no_fsync; /*!< no-op fsync for db */
int db_eflags; /*!< obsolete */
};

struct dbiConfig_s {
int dbi_oflags; /*!< open flags */
int dbi_no_dbsync; /*!< don't call dbiSync */
int dbi_lockdbfd; /*!< do fcntl lock on db fd */
};

struct rpmdbOps_s;
Expand Down Expand Up @@ -66,7 +56,6 @@ struct rpmdb_s {
void * db_dbenv; /*!< Backend private handle */
void * db_cache; /*!< Backend private cache handle */
struct dbConfig_s cfg;
int db_remove_env;

struct rpmop_s db_getops;
struct rpmop_s db_putops;
Expand Down Expand Up @@ -105,9 +94,6 @@ struct dbiIndex_s {
dbiIndexType dbi_type; /*! Type of dbi (primary / index) */
const char * dbi_file; /*!< file component of path */
int dbi_flags;
int dbi_byteswapped;

struct dbiConfig_s cfg;

void * dbi_db; /*!< Backend private handle */
};
Expand Down
2 changes: 0 additions & 2 deletions lib/rpmdb.c
View file
Open in desktop
Expand Up @@ -475,8 +475,6 @@ static rpmdb newRpmdb(const char * root, const char * home,
db->db_home = db_home;
db->db_root = rpmGetPath((root && *root) ? root : "/", NULL);
db->db_fullpath = rpmGenPath(db->db_root, db->db_home, NULL);
/* XXX remove environment after chrooted operations, for now... */
db->db_remove_env = (!rstreq(db->db_root, "/") ? 1 : 0);
db->db_tags = dbiTags;
db->db_ndbi = sizeof(dbiTags) / sizeof(rpmDbiTag);
db->db_indexes = xcalloc(db->db_ndbi, sizeof(*db->db_indexes));
Expand Down