diff --git a/sql/swh-func.sql b/sql/swh-func.sql index fd3a61bd..b0343089 100644 --- a/sql/swh-func.sql +++ b/sql/swh-func.sql @@ -1,89 +1,329 @@ -- create a temporary table called tmp_TBLNAME, mimicking existing table -- TBLNAME -- -- Args: -- tblname: name of the table to mimick create or replace function swh_mktemp(tblname regclass) returns void language plpgsql as $$ begin execute format(' create temporary table tmp_%I (like %I including defaults) on commit drop ', tblname, tblname); return; end $$; +-- create a temporary table for directory entries called tmp_TBLNAME, +-- mimicking existing table TBLNAME with an extra dir_id (sha1_git) +-- column, and dropping the id column. +-- +-- This is used to create the tmp_directory_entry_ tables. +-- +-- Args: +-- tblname: name of the table to mimick +create or replace function swh_mktemp_dir_entry(tblname regclass) + returns void + language plpgsql +as $$ +begin + execute format(' + create temporary table tmp_%I + (like %I including defaults, dir_id sha1_git) + on commit drop; + alter table tmp_%I drop column id; + ', tblname, tblname, tblname, tblname); + return; +end +$$; + +-- create a temporary table for revisions called tmp_revisions, +-- mimicking existing table revision, replacing the foreign keys to +-- people with an email and name field +-- +create or replace function swh_mktemp_revision() + returns void + language plpgsql +as $$ +begin + create temporary table tmp_revision ( + like revision including defaults, + author_name text not null default '', + author_email text not null default '', + committer_name text not null default '', + committer_email text not null default '' + ) on commit drop; + alter table tmp_revision drop column author; + alter table tmp_revision drop column committer; + return; +end +$$; -- a content signature is a set of cryptographic checksums that we use to -- uniquely identify content, for the purpose of verifying if we already have -- some content or not during content injection create type content_signature as ( sha1 sha1, sha1_git sha1_git, sha256 sha256 ); -- check which entries of tmp_content are missing from content -- -- operates in bulk: 0. swh_mktemp(content), 1. COPY to tmp_content, -- 2. call this function create or replace function swh_content_missing() returns setof content_signature language plpgsql as $$ begin return query select sha1, sha1_git, sha256 from tmp_content except select sha1, sha1_git, sha256 from content; return; end $$; -- add tmp_content entries to content, skipping duplicates -- -- operates in bulk: 0. swh_mktemp(content), 1. COPY to tmp_content, -- 2. call this function create or replace function swh_content_add() returns void language plpgsql as $$ declare rows bigint; begin insert into content (sha1, sha1_git, sha256, length, status) select distinct sha1, sha1_git, sha256, length, status from tmp_content where (sha1, sha1_git, sha256) in (select * from swh_content_missing()); -- TODO XXX use postgres 9.5 "UPSERT" support here, when available. -- Specifically, using "INSERT .. ON CONFLICT IGNORE" we can avoid -- the extra swh_content_missing() query here. return; end $$; -- check which entries of tmp_directory are missing from directory -- -- operates in bulk: 0. swh_mktemp(directory), 1. COPY to tmp_directory, -- 2. call this function create or replace function swh_directory_missing() - returns setof sha1_git + returns setof directory language plpgsql as $$ begin return query select id from tmp_directory except select id from directory; return; end $$; + +-- Add tmp_directory_entry_dir entries to directory_entry_dir and +-- directory_list_dir, skipping duplicates in directory_entry_dir. +-- +-- operates in bulk: 0. swh_mktemp_dir_entry('directory_entry_dir'), 1 COPY to +-- tmp_directory_entry_dir, 2. call this function +create or replace function swh_directory_entry_dir_add() + returns void + language plpgsql +as $$ +begin + insert into directory_entry_dir (target, name, perms, atime, mtime, ctime) + select t.target, t.name, t.perms, t.atime, t.mtime, t.ctime + from tmp_directory_entry_dir t + where not exists ( + select 1 + from directory_entry_dir i + where t.target = i.target and t.name = i.name and t.perms = i.perms and + t.atime is not distinct from i.atime and + t.mtime is not distinct from i.mtime and + t.ctime is not distinct from i.ctime); + + insert into directory_list_dir (entry_id, dir_id) + select i.id, t.dir_id + from tmp_directory_entry_dir t + inner join directory_entry_dir i + on t.target = i.target and t.name = i.name and t.perms = i.perms and + t.atime is not distinct from i.atime and + t.mtime is not distinct from i.mtime and + t.ctime is not distinct from i.ctime; + return; +end +$$; + +-- Add tmp_directory_entry_file entries to directory_entry_file and +-- directory_list_file, skipping duplicates in directory_entry_file. +-- +-- operates in bulk: 0. swh_mktemp_dir_entry('directory_entry_file'), 1 COPY to +-- tmp_directory_entry_file, 2. call this function +create or replace function swh_directory_entry_file_add() + returns void + language plpgsql +as $$ +begin + insert into directory_entry_file (target, name, perms, atime, mtime, ctime) + select t.target, t.name, t.perms, t.atime, t.mtime, t.ctime + from tmp_directory_entry_file t + where not exists ( + select 1 + from directory_entry_file i + where t.target = i.target and t.name = i.name and t.perms = i.perms and + t.atime is not distinct from i.atime and + t.mtime is not distinct from i.mtime and + t.ctime is not distinct from i.ctime); + + insert into directory_list_file (entry_id, dir_id) + select i.id, t.dir_id + from tmp_directory_entry_file t + inner join directory_entry_file i + on t.target = i.target and t.name = i.name and t.perms = i.perms and + t.atime is not distinct from i.atime and + t.mtime is not distinct from i.mtime and + t.ctime is not distinct from i.ctime; + return; +end +$$; + +-- Add tmp_directory_entry_rev entries to directory_entry_rev and +-- directory_list_rev, skipping duplicates in directory_entry_rev. +-- +-- operates in bulk: 0. swh_mktemp_dir_entry('directory_entry_rev'), 1 COPY to +-- tmp_directory_entry_rev, 2. call this function +create or replace function swh_directory_entry_rev_add() + returns void + language plpgsql +as $$ +begin + insert into directory_entry_rev (target, name, perms, atime, mtime, ctime) + select t.target, t.name, t.perms, t.atime, t.mtime, t.ctime + from tmp_directory_entry_rev t + where not exists ( + select 1 + from directory_entry_rev i + where t.target = i.target and t.name = i.name and t.perms = i.perms and + t.atime is not distinct from i.atime and + t.mtime is not distinct from i.mtime and + t.ctime is not distinct from i.ctime); + + insert into directory_list_rev (entry_id, dir_id) + select i.id, t.dir_id + from tmp_directory_entry_rev t + inner join directory_entry_rev i + on t.target = i.target and t.name = i.name and t.perms = i.perms and + t.atime is not distinct from i.atime and + t.mtime is not distinct from i.mtime and + t.ctime is not distinct from i.ctime; + return; +end +$$; + +-- a directory listing entry with all the metadata +-- +-- can be used to list a directory, and retrieve all the data in one go. +create type directory_entry as +( + dir_id sha1_git, -- id of the parent directory + type text, -- type of entry (one of 'dir', 'file', 'rev') + target sha1_git, -- id of target + name unix_path, -- path name, relative to containing dir + perms file_perms, -- unix-like permissions + atime timestamptz, -- time of last access + mtime timestamptz, -- time of last modification + ctime timestamptz -- time of last status change +); + +-- List a single level of directory walked_dir_id +create or replace function swh_directory_walk_one(walked_dir_id sha1_git) + returns setof directory_entry + language plpgsql +as $$ +begin + return query ( + select dir_id, 'dir' as type, target, name, perms, atime, mtime, ctime + from directory_list_dir l + left join directory_entry_dir d + on l.entry_id = d.id + where l.dir_id = walked_dir_id + union + select dir_id, 'file' as type, target, name, perms, atime, mtime, ctime + from directory_list_file l + left join directory_entry_file d + on l.entry_id = d.id + where l.dir_id = walked_dir_id + union + select dir_id, 'rev' as type, target, name, perms, atime, mtime, ctime + from directory_list_rev l + left join directory_entry_rev d + on l.entry_id = d.id + where l.dir_id = walked_dir_id + ) order by name; + return; +end +$$; + +-- List missing revisions from tmp_revision +create or replace function swh_revision_missing() + returns setof sha1_git + language plpgsql +as $$ +begin + return query + select id from tmp_revision + except + select id from revision; + return; +end +$$; + + +-- Create entries in person from tmp_revision +create or replace function swh_person_add_from_revision() + returns void + language plpgsql +as $$ +begin + with t as ( + select author_name as name, author_email as email from tmp_revision + union + select committer_name as name, committer_email as email from tmp_revision + ) insert into person (name, email) + select distinct name, email from t + where not exists ( + select 1 + from person p + where t.name = p.name and t.email = p.email + ); + return; +end +$$; + +-- Create entries in revision from tmp_revision +create or replace function swh_revision_add() + returns void + language plpgsql +as $$ +begin + perform swh_person_add_from_revision(); + + insert into revision (id, date, committer_date, type, directory, message, author, committer) + select t.id, t.date, t.committer_date, t.type, t.directory, t.message, a.id, c.id + from tmp_revision t + left join person a on a.name = t.author_name and a.email = t.author_email + left join person c on c.name = t.committer_name and c.email = t.committer_email; + return; +end +$$; diff --git a/sql/swh-schema.sql b/sql/swh-schema.sql index 462eedc2..66a2cc21 100644 --- a/sql/swh-schema.sql +++ b/sql/swh-schema.sql @@ -1,319 +1,325 @@ --- --- Software Heritage Data Model --- -- drop schema if exists swh cascade; -- create schema swh; -- set search_path to swh; create table dbversion ( version int primary key, release timestamptz, description text ); insert into dbversion(version, release, description) values(13, now(), 'Work In Progress'); -- a SHA1 checksum (not necessarily originating from Git) create domain sha1 as bytea check (length(value) = 20); -- a Git object ID, i.e., a SHA1 checksum create domain sha1_git as bytea check (length(value) = 20); -- a SHA256 checksum create domain sha256 as bytea check (length(value) = 32); -- UNIX path (absolute, relative, individual path component, etc.) -- TODO should this be bytea or similar to avoid encoding/decoding issues? create domain unix_path as text; -- a set of UNIX-like access permissions, as manipulated by, e.g., chmod create domain file_perms as int; create type content_status as enum ('absent', 'visible', 'hidden'); -- Checksums about actual file content. Note that the content itself is not -- stored in the DB, but on external (key-value) storage. A single checksum is -- used as key there, but the other can be used to verify that we do not inject -- content collisions not knowingly. create table content ( sha1 sha1 primary key, sha1_git sha1_git not null, sha256 sha256 not null, length bigint not null, ctime timestamptz not null default now(), -- creation time, i.e. time of (first) injection into the storage status content_status not null default 'visible' ); create unique index on content(sha1_git); -- create unique index on content(sha256); -- An organization (or part thereof) that might be in charge of running -- software projects. Examples: Debian, GNU, GitHub, Apache, The Linux -- Foundation. The data model is hierarchical (via parent_id) and might store -- sub-branches of existing organizations. The key feature of an organization -- is that it can be *listed* to retrieve information about its content, i.e: -- sub-organizations, projects, origins. create table organization ( id bigserial primary key, parent_id bigint references organization(id), name text not null, description text, homepage text, list_engine text, -- crawler to be used to org's content list_url text, -- root URL to start the listing list_params json, -- org-specific listing parameter latest_list timestamptz -- last time the org's content has been listed ); -- Log of all organization listings (i.e., organization crawling) that have -- been done in the past, or are still ongoing. Similar to fetch_history, but -- for organizations. create table list_history ( id bigserial primary key, organization bigint references organization(id), date timestamptz not null, status boolean, -- true if and only if the listing has been successful result json, -- more detailed return value, depending on status stdout text, stderr text, duration interval -- fetch duration of NULL if still ongoing ); -- An origin is a place, identified by an URL, where software can be found. We -- support different kinds of origins, e.g., git and other VCS repositories, -- web pages that list tarballs URLs (e.g., http://www.kernel.org), indirect -- tarball URLs (e.g., http://www.example.org/latest.tar.gz), etc. The key -- feature of an origin is that it can be *fetched* (wget, git clone, svn -- checkout, etc.) to retrieve all the contained software. create table origin ( id bigserial primary key, type text, -- TODO use an enum here (?) url text not null ); -- Log of all origin fetches (i.e., origin crawling) that have been done in the -- past, or are still ongoing. Similar to list_history, but for origins. create table fetch_history ( id bigserial primary key, origin bigint references origin(id), date timestamptz not null, status boolean, -- true if and only if the fetch has been successful result json, -- more detailed returned values, times, etc... stdout text, stderr text, -- null when status is true, filled otherwise duration interval -- fetch duration of NULL if still ongoing ); -- A specific software project, e.g., the Linux kernel, Apache httpd. A -- software project is version-less at this level, but is associated to several -- metadata. Metadata can evolve over time, this table only contains the most -- recent version of them; for old versions of project see table -- project_history. create table project ( id bigserial primary key, organization bigint references organization(id), -- the "owning" organization origin bigint references origin(id), -- where to find project releases name text, description text, homepage text, doap jsonb -- other kinds of metadata/software project description ontologies can be -- added here, in addition to DOAP ); -- History of project metadata. Time-sensitive version of the table project. create table project_history ( id bigserial primary key, project bigint references project(id), validity tstzrange, organization bigint references organization(id), origin bigint references origin(id), name text, description text, homepage text, doap jsonb ); -- A file-system directory. A directory is a list of directory entries (see -- tables: directory_entry_{dir,file}). -- -- To list the contents of a directory: -- 1. list the contained directory_entry_dir using table directory_list_dir -- 2. list the contained directory_entry_file using table directory_list_file -- 3. list the contained directory_entry_rev using table directory_list_rev -- 4. UNION -- -- Synonyms/mappings: -- * git: tree create table directory ( id sha1_git primary key ); -- A directory entry pointing to a sub-directory. create table directory_entry_dir ( id bigserial primary key, - target sha1_git references directory(id) deferrable initially deferred, + target sha1_git, -- references directory(id) deferrable initially deferred, -- id of target directory name unix_path, -- path name, relative to containing dir perms file_perms, -- unix-like permissions atime timestamptz, -- time of last access mtime timestamptz, -- time of last modification ctime timestamptz -- time of last status change ); +create unique index on directory_entry_dir(target, name, perms, atime, mtime, ctime); + -- Mapping between directories and contained sub-directories. create table directory_list_dir ( dir_id sha1_git references directory(id), entry_id bigint references directory_entry_dir(id), primary key (dir_id, entry_id) ); -- A directory entry pointing to a file. create table directory_entry_file ( id bigserial primary key, target sha1_git, -- id of target file name unix_path, -- path name, relative to containing dir perms file_perms, -- unix-like permissions atime timestamptz, -- time of last access mtime timestamptz, -- time of last modification ctime timestamptz -- time of last status change ); +create unique index on directory_entry_file(target, name, perms, atime, mtime, ctime); + -- Mapping between directories and contained files. create table directory_list_file ( dir_id sha1_git references directory(id), entry_id bigint references directory_entry_file(id), primary key (dir_id, entry_id) ); -- A directory entry pointing to a revision. create table directory_entry_rev ( id bigserial primary key, target sha1_git, -- id of target revision name unix_path, -- path name, relative to containing dir perms file_perms, -- unix-like permissions atime timestamptz, -- time of last access mtime timestamptz, -- time of last modification ctime timestamptz -- time of last status change ); +create unique index on directory_entry_rev(target, name, perms, atime, mtime, ctime); + -- Mapping between directories and contained files. create table directory_list_rev ( dir_id sha1_git references directory(id), entry_id bigint references directory_entry_rev(id), primary key (dir_id, entry_id) ); create table person ( id bigserial primary key, - name text, - email text + name text not null default '', + email text not null default '' ); +create unique index on person(name, email); + create type revision_type as enum ('git', 'tar', 'dsc'); -- A snapshot of a software project at a specific point in time. -- -- Synonyms/mappings: -- * git / subversion / etc: commit -- * tarball: a specific tarball -- -- Revisions are organized as DAGs. Each revision points to 0, 1, or more (in -- case of merges) parent revisions. Each revision points to a directory, i.e., -- a file-system tree containing files and directories. create table revision ( id sha1_git primary key, - -- parent_ids sha1_git[], -- either this or the revision_history table - -- note: no FK allowed from arrays to columns date timestamptz, committer_date timestamptz, type revision_type not null, directory sha1_git, -- file-system tree message text, author bigint references person(id), committer bigint references person(id) ); -- either this table or the sha1_git[] column on the revision table create table revision_history ( id sha1_git references revision(id), parent_id sha1_git, parent_rank int not null default 0, -- parent position in merge commits, 0-based primary key (id, parent_id), unique (id, parent_rank) ); -- The content of software origins is indexed starting from top-level pointers -- called "branches". Every time we fetch some origin we store in this table -- where the branches pointed to at fetch time. -- -- Synonyms/mappings: -- * git: ref (in the "git update-ref" sense) create table occurrence_history ( origin bigint references origin(id), branch text, -- e.g., "master" (for VCS), or "sid" (for Debian) revision sha1_git references revision(id), -- ref target, e.g., commit id authority bigint references organization(id) not null, -- who is claiming to have seen the occurrence. -- Note: SWH is such an authority, and has an entry in -- the organization table. validity tstzrange, -- The time validity of this table entry. If the upper -- bound is missing, the entry is still valid. exclude using gist (origin with =, branch with =, revision with =, authority with =, validity with &&), -- unicity exclusion constraint on lines where the same value is found for -- `origin`, `reference`, `revision`, `authority` and overlapping values for -- `validity`. primary key (origin, branch, revision, authority, validity) ); -- Materialized view of occurrence_history, storing the *current* value of each -- branch, as last seen by SWH. create table occurrence ( origin bigint references origin(id), branch text, revision sha1_git references revision(id), primary key(origin, branch, revision) ); -- A "memorable" point in the development history of a project. -- -- Synonyms/mappings: -- * git: tag (of the annotated kind, otherwise they are just references) -- * tarball: the release version number create table release ( id sha1_git primary key, revision sha1_git references revision(id), date timestamptz, name text, comment text, author bigint references person(id) ); diff --git a/swh/storage/db.py b/swh/storage/db.py index 57c67ffc..ace70b68 100644 --- a/swh/storage/db.py +++ b/swh/storage/db.py @@ -1,126 +1,169 @@ # Copyright (C) 2015 The Software Heritage developers # See the AUTHORS file at the top-level directory of this distribution # License: GNU General Public License version 3, or any later version # See top-level LICENSE file for more information import binascii import functools import psycopg2 import tempfile from contextlib import contextmanager TMP_CONTENT_TABLE = 'tmp_content' def stored_procedure(stored_proc): """decorator to execute remote stored procedure, specified as argument Generally, the body of the decorated function should be empty. If it is not, the stored procedure will be executed first; the function body then. """ def wrap(meth): @functools.wraps(meth) def _meth(self, *args, **kwargs): cur = kwargs.get('cur', None) self._cursor(cur).execute('SELECT %s()' % stored_proc) meth(self, *args, **kwargs) return _meth return wrap +def entry_to_bytes(entry): + """Convert an entry coming from the database to bytes""" + if isinstance(entry, memoryview): + return entry.tobytes() + return entry + + +def line_to_bytes(line): + """Convert a line coming from the database to bytes""" + return line.__class__(entry_to_bytes(entry) for entry in line) + + +def cursor_to_bytes(cursor): + """Yield all the data from a cursor as bytes""" + yield from (line_to_bytes(line) for line in cursor) + + class Db: """Proxy to the SWH DB, with wrappers around stored procedures """ @classmethod def connect(cls, *args, **kwargs): """factory method to create a DB proxy Accepts all arguments of psycopg2.connect; only some specific possibilities are reported below. Args: connstring: libpq2 connection string """ conn = psycopg2.connect(*args, **kwargs) return cls(conn) def _cursor(self, cur_arg): """get a cursor: from cur_arg if given, or a fresh one otherwise meant to avoid boilerplate if/then/else in methods that proxy stored procedures """ if cur_arg is not None: return cur_arg # elif self.cur is not None: # return self.cur else: return self.conn.cursor() def __init__(self, conn): """create a DB proxy Args: conn: psycopg2 connection to the SWH DB """ self.conn = conn @contextmanager def transaction(self): """context manager to execute within a DB transaction Yields: a psycopg2 cursor """ with self.conn.cursor() as cur: try: yield cur self.conn.commit() except: if not self.conn.closed: self.conn.rollback() raise def mktemp(self, tblname, cur=None): self._cursor(cur).execute('SELECT swh_mktemp(%s)', (tblname,)) + def mktemp_dir_entry(self, entry_type, cur=None): + self._cursor(cur).execute('SELECT swh_mktemp_dir_entry(%s)', + (('directory_entry_%s' % entry_type),)) + + @stored_procedure('swh_mktemp_revision') + def mktemp_revision(self, cur=None): pass + def copy_to(self, items, tblname, columns, cur=None, item_cb=None): def escape(data): + if data is None: + return '\\N' if isinstance(data, bytes): return '\\\\x%s' % binascii.hexlify(data).decode('ascii') else: return str(data) with tempfile.TemporaryFile('w+') as f: for d in items: if item_cb is not None: item_cb(d) - line = '\t'.join([escape(d[k]) for k in columns]) + '\n' + line = '\t'.join([escape(d.get(k)) for k in columns]) + '\n' f.write(line) f.seek(0) self._cursor(cur).copy_from(f, tblname, columns=columns) @stored_procedure('swh_content_add') def content_add_from_temp(self, cur=None): pass + @stored_procedure('swh_revision_add') + def revision_add_from_temp(self, cur=None): pass + def content_missing_from_temp(self, cur=None): cur = self._cursor(cur) cur.execute("""SELECT sha1, sha1_git, sha256 FROM swh_content_missing()""") - yield from cur + yield from cursor_to_bytes(cur) def directory_missing_from_temp(self, cur=None): cur = self._cursor(cur) cur.execute("SELECT id FROM swh_directory_missing()") - yield from cur + yield from cursor_to_bytes(cur) + + def directory_walk_one(self, directory, cur=None): + cur = self._cursor(cur) + + cur.execute('select * from swh_directory_walk_one(%s)', (directory,)) + + yield from cursor_to_bytes(cur) + + def revision_missing_from_temp(self, cur=None): + cur = self._cursor(cur) + + cur.execute("SELECT id FROM swh_revision_missing() as r(id)") + + yield from cursor_to_bytes(cur) diff --git a/swh/storage/storage.py b/swh/storage/storage.py index 95539137..4052cfdd 100644 --- a/swh/storage/storage.py +++ b/swh/storage/storage.py @@ -1,228 +1,331 @@ # Copyright (C) 2015 The Software Heritage developers # See the AUTHORS file at the top-level directory of this distribution # License: GNU General Public License version 3, or any later version # See top-level LICENSE file for more information import functools +import itertools import psycopg2 +from collections import defaultdict + from .db import Db from .objstorage import ObjStorage def db_transaction(meth): """decorator to execute Storage methods within DB transactions - Decorated methods will have access to the following attributes: - self.cur: psycopg2 DB cursor + The decorated method must accept a `cur` keyword argument + """ + @functools.wraps(meth) + def _meth(self, *args, **kwargs): + with self.db.transaction() as cur: + return meth(self, *args, cur=cur, **kwargs) + return _meth + + +def db_transaction_generator(meth): + """decorator to execute Storage methods within DB transactions, while + returning a generator + + The decorated method must accept a `cur` keyword argument """ @functools.wraps(meth) def _meth(self, *args, **kwargs): with self.db.transaction() as cur: - try: - self.cur = cur - return meth(self, *args, **kwargs) - finally: - self.cur = None + yield from meth(self, *args, cur=cur, **kwargs) return _meth class Storage(): """SWH storage proxy, encompassing DB and object storage """ def __init__(self, db_conn, obj_root): """ Args: db_conn: either a libpq connection string, or a psycopg2 connection obj_root: path to the root of the object storage """ if isinstance(db_conn, psycopg2.extensions.connection): self.db = Db(db_conn) else: self.db = Db.connect(db_conn) self.objstorage = ObjStorage(obj_root) @db_transaction - def content_add(self, content): + def content_add(self, content, cur): """Add content blobs to the storage Note: in case of DB errors, objects might have already been added to the object storage and will not be removed. Since addition to the object storage is idempotent, that should not be a problem. Args: content: iterable of dictionaries representing individual pieces of content to add. Each dictionary has the following keys: - data (bytes): the actual content - length (int): content length - one key for each checksum algorithm in swh.core.hashutil.ALGORITHMS, mapped to the corresponding checksum """ - (db, cur) = (self.db, self.cur) + db = self.db + # create temporary table for metadata injection db.mktemp('content', cur) def add_to_objstorage(cont): self.objstorage.add_bytes(cont['data'], obj_id=cont['sha1']) db.copy_to(content, 'tmp_content', ['sha1', 'sha1_git', 'sha256', 'length'], cur, item_cb=add_to_objstorage) # move metadata in place db.content_add_from_temp(cur) db.conn.commit() - @db_transaction - def content_missing(self, content): + @db_transaction_generator + def content_missing(self, content, cur): """List content missing from storage Args: content: iterable of dictionaries containing one key for each checksum algorithm in swh.core.hashutil.ALGORITHMS, mapped to the corresponding checksum, and a length key mapped to the content length. Returns: an iterable of sha1s missing from the storage Raises: TODO: an exception when we get a hash collision. """ - (db, cur) = (self.db, self.cur) + db = self.db + # Create temporary table for metadata injection db.mktemp('content', cur) db.copy_to(content, 'tmp_content', ['sha1', 'sha1_git', 'sha256', 'length'], cur) for obj in db.content_missing_from_temp(cur): - yield obj[0].tobytes() + yield obj[0] def directory_add(self, directories): """Add directories to the storage Args: directories: iterable of dictionaries representing the individual directories to add. Each dict has the following keys: - id (sha1_git): the id of the directory to add - entries (list): list of dicts for each entry in the directory. Each dict has the following keys: - name (bytes) - type (one of 'file', 'dir', 'rev'): type of the directory entry (file, directory, revision) - - id (sha1_git): id of the object pointed at by the + - target (sha1_git): id of the object pointed at by the directory entry - perms (int): entry permissions - atime (datetime.DateTime): entry access time - ctime (datetime.DateTime): entry creation time - mtime (datetime.DateTime): entry modification time """ - pass - - @db_transaction - def directory_missing(self, directories): + dirs = set() + dir_entries = { + 'file': defaultdict(list), + 'dir': defaultdict(list), + 'rev': defaultdict(list), + } + + for cur_dir in directories: + dir_id = cur_dir['id'] + dirs.add(dir_id) + for entry in cur_dir['entries']: + entry['dir_id'] = dir_id + dir_entries[entry['type']][dir_id].append(entry) + + dirs_missing = set(self.directory_missing(dirs)) + if not dirs_missing: + return + + db = self.db + with db.transaction() as cur: + dirs_missing_dict = ({'id': dir} for dir in dirs_missing) + db.copy_to(dirs_missing_dict, 'directory', ['id'], cur) + for entry_type, entry_list in dir_entries.items(): + entries = itertools.chain.from_iterable( + entries_for_dir + for dir_id, entries_for_dir + in entry_list.items() + if dir_id in dirs_missing) + + db.mktemp_dir_entry(entry_type) + + db.copy_to( + entries, + 'tmp_directory_entry_%s' % entry_type, + ['target', 'name', 'perms', 'atime', + 'mtime', 'ctime', 'dir_id'], + cur, + ) + + cur.execute('SELECT swh_directory_entry_%s_add()' % entry_type) + + @db_transaction_generator + def directory_missing(self, directories, cur): """List directories missing from storage Args: an iterable of directory ids Returns: a list of missing directory ids """ - (db, cur) = (self.db, self.cur) + db = self.db + # Create temporary table for metadata injection db.mktemp('directory', cur) - db.copy_to(directories, 'tmp_directory', ['id'], cur) + directories_dicts = ({'id': dir} for dir in directories) + + db.copy_to(directories_dicts, 'tmp_directory', ['id'], cur) for obj in db.directory_missing_from_temp(cur): - yield obj[0].tobytes() + yield obj[0] + + def directory_get(self, directory): + """Get the entries for one directory""" + yield from self.db.directory_walk_one(directory) def revision_add(self, revisions): """Add revisions to the storage Args: revisions: iterable of dictionaries representing the individual revisions to add. Each dict has the following keys: - id (sha1_git): id of the revision to add - date (datetime.DateTime): date the revision was written - - commit_date (datetime.DateTime): date the revision got added - to the origin + - committer_date (datetime.DateTime): date the revision got + added to the origin - type (one of 'git', 'tar'): type of the revision added - directory (sha1_git): the directory the revision points at - message (bytes): the message associated with the revision - author_name (bytes): the name of the revision author - author_email (bytes): the email of the revision author - committer_name (bytes): the name of the revision committer - committer_email (bytes): the email of the revision committer - parents (list of sha1_git): the parents of this revision """ - pass + db = self.db + + parents = {} + + for revision in revisions: + id = revision['id'] + cur_parents = enumerate(revision.get('parents', [])) + parents[id] = [{ + 'id': id, + 'parent_id': parent, + 'parent_rank': i + } for i, parent in cur_parents] + + revisions_missing = list(self.revision_missing(parents.keys())) + + with db.transaction() as cur: + db.mktemp_revision(cur) + + revisions_filtered = (revision for revision in revisions + if revision['id'] in revisions_missing) + + db.copy_to(revisions_filtered, 'tmp_revision', + ['id', 'date', 'committer_date', 'type', 'directory', + 'message', 'author_name', 'author_email', + 'committer_name', 'committer_email'], + cur) + + db.revision_add_from_temp(cur) - def revision_missing(self, revisions): + parents_filtered = itertools.chain.from_iterable( + parents[id] for id in revisions_missing) + + db.copy_to(parents_filtered, 'revision_history', + ['id', 'parent_id', 'parent_rank'], cur) + + @db_transaction_generator + def revision_missing(self, revisions, cur): """List revisions missing from storage Args: an iterable of revision ids Returns: a list of missing revision ids """ - pass + db = self.db + + # Create temporary table for metadata injection + db.mktemp('revision', cur) + + revisions_dicts = ({'id': dir, 'type': 'git'} for dir in revisions) + + db.copy_to(revisions_dicts, 'tmp_revision', ['id', 'type'], cur) + + for obj in db.revision_missing_from_temp(cur): + yield obj[0] def release_add(self, releases): """Add releases to the storage Args: releases: iterable of dictionaries representing the individual releases to add. Each dict has the following keys: - id (sha1_git): id of the release to add - revision (sha1_git): id of the revision the release points to - date (datetime.DateTime): the date the release was made - name (bytes): the name of the release - comment (bytes): the comment associated with the release - author_name (bytes): the name of the release author - author_email (bytes): the email of the release author """ pass def release_missing(self, releases): """List releases missing from storage Args: an iterable of release ids Returns: a list of missing release ids """ pass def occurrence_add(self, occurrences): """Add occurrences to the storage Args: occurrences: iterable of dictionaries representing the individual occurrences to add. Each dict has the following keys: - origin (int): id of the origin corresponding to the occurrence - reference (bytes): the reference name of the occurrence - revision (sha1_git): the id of the revision pointed to by the occurrence - date (datetime.DateTime): the validity date for the given occurrence """ pass def origin_add(self, origins): """Add origins to the storage Args: origins: iterable of dictionaries representing the individual origins to add. Each dict has the following keys: - type (FIXME: enum TBD): the origin type ('git', 'wget', ...) - url (bytes): the url the origin points to """ pass diff --git a/swh/storage/tests/test_storage.py b/swh/storage/tests/test_storage.py index bf0850a5..223234e1 100644 --- a/swh/storage/tests/test_storage.py +++ b/swh/storage/tests/test_storage.py @@ -1,89 +1,158 @@ # Copyright (C) 2015 The Software Heritage developers # See the AUTHORS file at the top-level directory of this distribution # License: GNU General Public License version 3, or any later version # See top-level LICENSE file for more information +import datetime import shutil import tempfile import unittest from nose.tools import istest from nose.plugins.attrib import attr from .db_testing import DbTestFixture from swh.core.hashutil import hex_to_hash from swh.storage import Storage @attr('db') class TestStorage(DbTestFixture, unittest.TestCase): def setUp(self): super().setUp() self.objroot = tempfile.mkdtemp() self.storage = Storage(self.conn, self.objroot) self.cont = { 'data': b'42\n', 'length': 3, 'sha1': hex_to_hash( '34973274ccef6ab4dfaaf86599792fa9c3fe4689'), 'sha1_git': hex_to_hash( 'd81cc0710eb6cf9efd5b920a8453e1e07157b6cd'), 'sha256': hex_to_hash( '673650f936cb3b0a2f93ce09d81be107' '48b1b203c19e8176b4eefc1964a0cf3a'), } self.cont2 = { 'data': b'4242\n', 'length': 5, 'sha1': hex_to_hash( '61c2b3a30496d329e21af70dd2d7e097046d07b7'), 'sha1_git': hex_to_hash( '36fade77193cb6d2bd826161a0979d64c28ab4fa'), 'sha256': hex_to_hash( '859f0b154fdb2d630f45e1ecae4a8629' '15435e663248bb8461d914696fc047cd'), } self.missing_cont = { 'data': b'missing\n', 'length': 8, 'sha1': hex_to_hash( 'f9c24e2abb82063a3ba2c44efd2d3c797f28ac90'), 'sha1_git': hex_to_hash( '33e45d56f88993aae6a0198013efa80716fd8919'), 'sha256': hex_to_hash( '6bbd052ab054ef222c1c87be60cd191a' 'ddedd24cc882d1f5f7f7be61dc61bb3a'), } + self.dir = { + 'id': b'12345678901234567890', + 'entries': [ + { + 'name': 'foo', + 'type': 'file', + 'target': self.cont['sha1_git'], + 'perms': 0o644, + 'atime': None, + 'ctime': None, + 'mtime': None, + }, + { + 'name': 'bar', + 'type': 'dir', + 'target': b'12345678901234567890', + 'perms': 0o2000, + 'atime': None, + 'ctime': None, + 'mtime': None, + }, + ], + } + + self.revision = { + 'id': b'56789012345678901234', + 'message': 'hello', + 'author_name': 'Nicolas Dandrimont', + 'author_email': 'nicolas@example.com', + 'committer_name': 'Stefano Zacchiroli', + 'committer_email': 'stefano@example.com', + 'parents': [b'01234567890123456789'], + 'date': datetime.datetime(2015, 1, 1, 22, 0, 0), + 'committer_date': datetime.datetime(2015, 1, 2, 22, 0, 0), + 'type': 'git', + 'directory': self.dir['id'], + } + def tearDown(self): shutil.rmtree(self.objroot) super().tearDown() @istest def content_add(self): cont = self.cont self.storage.content_add([cont]) self.assertIn(cont['sha1'], self.storage.objstorage) self.cursor.execute('SELECT sha1, sha1_git, sha256, length, status' ' FROM content WHERE sha1 = %s', (cont['sha1'],)) datum = self.cursor.fetchone() self.assertEqual( (datum[0].tobytes(), datum[1].tobytes(), datum[2].tobytes(), datum[3], datum[4]), (cont['sha1'], cont['sha1_git'], cont['sha256'], cont['length'], 'visible')) @istest def content_missing(self): cont2 = self.cont2 missing_cont = self.missing_cont self.storage.content_add([cont2]) gen = self.storage.content_missing([cont2, missing_cont]) self.assertEqual(list(gen), [missing_cont['sha1']]) + + @istest + def directory_add(self): + init_missing = list(self.storage.directory_missing([self.dir['id']])) + self.assertEqual([self.dir['id']], init_missing) + + self.storage.directory_add([self.dir]) + + stored_data = list(self.storage.directory_get(self.dir['id'])) + + data_to_store = [ + (self.dir['id'], ent['type'], ent['target'], ent['name'], + ent['perms'], ent['atime'], ent['ctime'], ent['mtime']) + for ent in sorted(self.dir['entries'], key=lambda ent: ent['name']) + ] + + self.assertEqual(data_to_store, stored_data) + + after_missing = list(self.storage.directory_missing([self.dir['id']])) + self.assertEqual([], after_missing) + + @istest + def revision_add(self): + init_missing = self.storage.revision_missing([self.revision['id']]) + self.assertEqual([self.revision['id']], list(init_missing)) + + self.storage.revision_add([self.revision]) + + end_missing = self.storage.revision_missing([self.revision['id']]) + self.assertEqual([], list(end_missing))