Page MenuHomeSoftware Heritage
Differential D996

Extract the BaseDb class from swh-storage
ClosedPublic
Actions

Authored by douardda on Jan 24 2019, 3:48 PM.

Details

Reviewers
vlorentz
Group Reviewers
Reviewers
Commits
rDCORE4f85d9c4e916: Extract the BaseDb class from swh-storage
Summary

This class is meant to be used not only to wrap storage-like db.

Also rewrite the test_logger using pytest-postgresql fixture so
we do not need pifpaf anymore.

Related to T1495

Diff Detail

Event Timeline

douardda created this revision.Jan 24 2019, 3:48 PM
Herald added a reviewer: Reviewers. · View Herald TranscriptJan 24 2019, 3:48 PM
swh-public-ci added a subscriber: swh-public-ci.Jan 24 2019, 3:51 PM

Build is green
See https://jenkins.softwareheritage.org/job/DCORE/job/tox/123/ for more details.

Harbormaster completed remote builds in B3689: Diff 3163.Jan 24 2019, 3:51 PM
vlorentz accepted this revision.Jan 24 2019, 4:02 PM
This revision is now accepted and ready to land.Jan 24 2019, 4:02 PM
douardda updated this revision to Diff 3210.Jan 28 2019, 11:13 AM

rebased

Closed by commit rDCORE4f85d9c4e916: Extract the BaseDb class from swh-storage (authored by douardda). · Explain WhyJan 28 2019, 11:14 AM
This revision was automatically updated to reflect the committed changes.
Harbormaster failed remote builds in B3746: Diff 3210!Jan 28 2019, 11:14 AM
swh-public-ci added a comment.Jan 28 2019, 11:14 AM

Build has FAILED

Link to build: https://jenkins.softwareheritage.org/job/DCORE/job/tox/124/
See console output for more information: https://jenkins.softwareheritage.org/job/DCORE/job/tox/124/console

douardda mentioned this in T1495: Move swh.storage.db.BaseDb class in swh.core.Jan 29 2019, 10:48 AM

Revision Contents
Changeset List

PathSize
3 lines
swh/
core/
db/
80 lines
218 lines
123 lines
tests/
53 lines
3 lines

Diff 3163

View Options

requirements-test.txt

Show All 13 Lines Args:
dumpfile: path fo the dump file dumpfile: path fo the dump file
dumptype: one of 'pg_dump' (for binary dumps), 'psql' (for SQL dumps) dumptype: one of 'pg_dump' (for binary dumps), 'psql' (for SQL dumps)
""" """
assert dumptype in ['pg_dump', 'psql'] assert dumptype in ['pg_dump', 'psql']
if dumptype == 'pg_dump': if dumptype == 'pg_dump':
subprocess.check_call(['pg_restore', '--no-owner', '--no-privileges', subprocess.check_call(['pg_restore', '--no-owner', '--no-privileges',
'--dbname', dbname, dumpfile]) '--dbname', dbname, dumpfile])
elif dumptype == 'psql': elif dumptype == 'psql':
subprocess.check_call(['psql', '--quiet', '-f', dumpfile, dbname]) subprocess.check_call(['psql', '--quiet',
'--no-psqlrc',
'-v', 'ON_ERROR_STOP=1',
'-f', dumpfile,
dbname])
def pg_dump(dbname, dumpfile): def pg_dump(dbname, dumpfile):
subprocess.check_call(['pg_dump', '--no-owner', '--no-privileges', '-Fc', subprocess.check_call(['pg_dump', '--no-owner', '--no-privileges', '-Fc',
'-f', dumpfile, dbname]) '-f', dumpfile, dbname])
def pg_dropdb(dbname): def pg_dropdb(dbname):
▲ Show 20 Lines • Show All 232 Lines • Show Last 20 Lines
View Options

swh/core/db/__init__.py

Show All 13 Lines Args:
dumpfile: path fo the dump file dumpfile: path fo the dump file
dumptype: one of 'pg_dump' (for binary dumps), 'psql' (for SQL dumps) dumptype: one of 'pg_dump' (for binary dumps), 'psql' (for SQL dumps)
""" """
assert dumptype in ['pg_dump', 'psql'] assert dumptype in ['pg_dump', 'psql']
if dumptype == 'pg_dump': if dumptype == 'pg_dump':
subprocess.check_call(['pg_restore', '--no-owner', '--no-privileges', subprocess.check_call(['pg_restore', '--no-owner', '--no-privileges',
'--dbname', dbname, dumpfile]) '--dbname', dbname, dumpfile])
elif dumptype == 'psql': elif dumptype == 'psql':
subprocess.check_call(['psql', '--quiet', '-f', dumpfile, dbname]) subprocess.check_call(['psql', '--quiet',
'--no-psqlrc',
'-v', 'ON_ERROR_STOP=1',
'-f', dumpfile,
dbname])
def pg_dump(dbname, dumpfile): def pg_dump(dbname, dumpfile):
subprocess.check_call(['pg_dump', '--no-owner', '--no-privileges', '-Fc', subprocess.check_call(['pg_dump', '--no-owner', '--no-privileges', '-Fc',
'-f', dumpfile, dbname]) '-f', dumpfile, dbname])
def pg_dropdb(dbname): def pg_dropdb(dbname):
▲ Show 20 Lines • Show All 232 Lines • Show Last 20 Lines
View Options

swh/core/db/common.py

Show All 13 Lines Args:
dumpfile: path fo the dump file dumpfile: path fo the dump file
dumptype: one of 'pg_dump' (for binary dumps), 'psql' (for SQL dumps) dumptype: one of 'pg_dump' (for binary dumps), 'psql' (for SQL dumps)
""" """
assert dumptype in ['pg_dump', 'psql'] assert dumptype in ['pg_dump', 'psql']
if dumptype == 'pg_dump': if dumptype == 'pg_dump':
subprocess.check_call(['pg_restore', '--no-owner', '--no-privileges', subprocess.check_call(['pg_restore', '--no-owner', '--no-privileges',
'--dbname', dbname, dumpfile]) '--dbname', dbname, dumpfile])
elif dumptype == 'psql': elif dumptype == 'psql':
subprocess.check_call(['psql', '--quiet', '-f', dumpfile, dbname]) subprocess.check_call(['psql', '--quiet',
'--no-psqlrc',
'-v', 'ON_ERROR_STOP=1',
'-f', dumpfile,
dbname])
def pg_dump(dbname, dumpfile): def pg_dump(dbname, dumpfile):
subprocess.check_call(['pg_dump', '--no-owner', '--no-privileges', '-Fc', subprocess.check_call(['pg_dump', '--no-owner', '--no-privileges', '-Fc',
'-f', dumpfile, dbname]) '-f', dumpfile, dbname])
def pg_dropdb(dbname): def pg_dropdb(dbname):
▲ Show 20 Lines • Show All 232 Lines • Show Last 20 Lines
View Options

swh/core/db/db.py

Show All 13 Lines Args:
dumpfile: path fo the dump file dumpfile: path fo the dump file
dumptype: one of 'pg_dump' (for binary dumps), 'psql' (for SQL dumps) dumptype: one of 'pg_dump' (for binary dumps), 'psql' (for SQL dumps)
""" """
assert dumptype in ['pg_dump', 'psql'] assert dumptype in ['pg_dump', 'psql']
if dumptype == 'pg_dump': if dumptype == 'pg_dump':
subprocess.check_call(['pg_restore', '--no-owner', '--no-privileges', subprocess.check_call(['pg_restore', '--no-owner', '--no-privileges',
'--dbname', dbname, dumpfile]) '--dbname', dbname, dumpfile])
elif dumptype == 'psql': elif dumptype == 'psql':
subprocess.check_call(['psql', '--quiet', '-f', dumpfile, dbname]) subprocess.check_call(['psql', '--quiet',
'--no-psqlrc',
'-v', 'ON_ERROR_STOP=1',
'-f', dumpfile,
dbname])
def pg_dump(dbname, dumpfile): def pg_dump(dbname, dumpfile):
subprocess.check_call(['pg_dump', '--no-owner', '--no-privileges', '-Fc', subprocess.check_call(['pg_dump', '--no-owner', '--no-privileges', '-Fc',
'-f', dumpfile, dbname]) '-f', dumpfile, dbname])
def pg_dropdb(dbname): def pg_dropdb(dbname):
▲ Show 20 Lines • Show All 232 Lines • Show Last 20 Lines
View Options

swh/core/db/db_utils.py

Loading...
View Options

swh/core/tests/test_logger.py

Loading...
View Options

tox.ini

Loading...
About · Developer information · Legal