diff --git a/swh/storage/cassandra/cql.py b/swh/storage/cassandra/cql.py
index 140350a2..4d81f963 100644
--- a/swh/storage/cassandra/cql.py
+++ b/swh/storage/cassandra/cql.py
@@ -1,829 +1,838 @@
 # Copyright (C) 2019-2020  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 functools
 import json
 import logging
 import random
 from typing import (
     Any,
     Callable,
     Dict,
     Iterable,
     Iterator,
     List,
     Optional,
     Tuple,
     TypeVar,
 )
 
 from cassandra import CoordinationFailure
 from cassandra.cluster import Cluster, EXEC_PROFILE_DEFAULT, ExecutionProfile, ResultSet
 from cassandra.policies import DCAwareRoundRobinPolicy, TokenAwarePolicy
 from cassandra.query import PreparedStatement, BoundStatement
 from tenacity import (
     retry,
     stop_after_attempt,
     wait_random_exponential,
     retry_if_exception_type,
 )
 
 from swh.model.model import (
     Sha1Git,
     TimestampWithTimezone,
     Timestamp,
     Person,
     Content,
     SkippedContent,
     OriginVisit,
+    OriginVisitStatus,
     Origin,
 )
 
 from .common import Row, TOKEN_BEGIN, TOKEN_END, hash_url
 from .schema import CREATE_TABLES_QUERIES, HASH_ALGORITHMS
 
 
 logger = logging.getLogger(__name__)
 
 
 _execution_profiles = {
     EXEC_PROFILE_DEFAULT: ExecutionProfile(
         load_balancing_policy=TokenAwarePolicy(DCAwareRoundRobinPolicy())
     ),
 }
 # Configuration for cassandra-driver's access to servers:
 # * hit the right server directly when sending a query (TokenAwarePolicy),
 # * if there's more than one, then pick one at random that's in the same
 #   datacenter as the client (DCAwareRoundRobinPolicy)
 
 
 def create_keyspace(
     hosts: List[str], keyspace: str, port: int = 9042, *, durable_writes=True
 ):
     cluster = Cluster(hosts, port=port, execution_profiles=_execution_profiles)
     session = cluster.connect()
     extra_params = ""
     if not durable_writes:
         extra_params = "AND durable_writes = false"
     session.execute(
         """CREATE KEYSPACE IF NOT EXISTS "%s"
                        WITH REPLICATION = {
                            'class' : 'SimpleStrategy',
                            'replication_factor' : 1
                        } %s;
                     """
         % (keyspace, extra_params)
     )
     session.execute('USE "%s"' % keyspace)
     for query in CREATE_TABLES_QUERIES:
         session.execute(query)
 
 
 T = TypeVar("T")
 
 
 def _prepared_statement(query: str) -> Callable[[Callable[..., T]], Callable[..., T]]:
     """Returns a decorator usable on methods of CqlRunner, to
     inject them with a 'statement' argument, that is a prepared
     statement corresponding to the query.
 
     This only works on methods of CqlRunner, as preparing a
     statement requires a connection to a Cassandra server."""
 
     def decorator(f):
         @functools.wraps(f)
         def newf(self, *args, **kwargs) -> T:
             if f.__name__ not in self._prepared_statements:
                 statement: PreparedStatement = self._session.prepare(query)
                 self._prepared_statements[f.__name__] = statement
             return f(
                 self, *args, **kwargs, statement=self._prepared_statements[f.__name__]
             )
 
         return newf
 
     return decorator
 
 
 def _prepared_insert_statement(table_name: str, columns: List[str]):
     """Shorthand for using `_prepared_statement` for `INSERT INTO`
     statements."""
     return _prepared_statement(
         "INSERT INTO %s (%s) VALUES (%s)"
         % (table_name, ", ".join(columns), ", ".join("?" for _ in columns),)
     )
 
 
 def _prepared_exists_statement(table_name: str):
     """Shorthand for using `_prepared_statement` for queries that only
     check which ids in a list exist in the table."""
     return _prepared_statement(f"SELECT id FROM {table_name} WHERE id IN ?")
 
 
 class CqlRunner:
     """Class managing prepared statements and building queries to be sent
     to Cassandra."""
 
     def __init__(self, hosts: List[str], keyspace: str, port: int):
         self._cluster = Cluster(
             hosts, port=port, execution_profiles=_execution_profiles
         )
         self._session = self._cluster.connect(keyspace)
         self._cluster.register_user_type(
             keyspace, "microtimestamp_with_timezone", TimestampWithTimezone
         )
         self._cluster.register_user_type(keyspace, "microtimestamp", Timestamp)
         self._cluster.register_user_type(keyspace, "person", Person)
 
         self._prepared_statements: Dict[str, PreparedStatement] = {}
 
     ##########################
     # Common utility functions
     ##########################
 
     MAX_RETRIES = 3
 
     @retry(
         wait=wait_random_exponential(multiplier=1, max=10),
         stop=stop_after_attempt(MAX_RETRIES),
         retry=retry_if_exception_type(CoordinationFailure),
     )
     def _execute_with_retries(self, statement, args) -> ResultSet:
         return self._session.execute(statement, args, timeout=1000.0)
 
     @_prepared_statement(
         "UPDATE object_count SET count = count + ? "
         "WHERE partition_key = 0 AND object_type = ?"
     )
     def _increment_counter(
         self, object_type: str, nb: int, *, statement: PreparedStatement
     ) -> None:
         self._execute_with_retries(statement, [nb, object_type])
 
     def _add_one(self, statement, object_type: str, obj, keys: List[str]) -> None:
         self._increment_counter(object_type, 1)
         self._execute_with_retries(statement, [getattr(obj, key) for key in keys])
 
     def _get_random_row(self, statement) -> Optional[Row]:
         """Takes a prepared statement of the form
         "SELECT * FROM <table> WHERE token(<keys>) > ? LIMIT 1"
         and uses it to return a random row"""
         token = random.randint(TOKEN_BEGIN, TOKEN_END)
         rows = self._execute_with_retries(statement, [token])
         if not rows:
             # There are no row with a greater token; wrap around to get
             # the row with the smallest token
             rows = self._execute_with_retries(statement, [TOKEN_BEGIN])
         if rows:
             return rows.one()
         else:
             return None
 
     def _missing(self, statement, ids):
         res = self._execute_with_retries(statement, [ids])
         found_ids = {id_ for (id_,) in res}
         return [id_ for id_ in ids if id_ not in found_ids]
 
     ##########################
     # 'content' table
     ##########################
 
     _content_pk = ["sha1", "sha1_git", "sha256", "blake2s256"]
     _content_keys = [
         "sha1",
         "sha1_git",
         "sha256",
         "blake2s256",
         "length",
         "ctime",
         "status",
     ]
 
     def _content_add_finalize(self, statement: BoundStatement) -> None:
         """Returned currified by content_add_prepare, to be called when the
         content row should be added to the primary table."""
         self._execute_with_retries(statement, None)
         self._increment_counter("content", 1)
 
     @_prepared_insert_statement("content", _content_keys)
     def content_add_prepare(
         self, content, *, statement
     ) -> Tuple[int, Callable[[], None]]:
         """Prepares insertion of a Content to the main 'content' table.
         Returns a token (to be used in secondary tables), and a function to be
         called to perform the insertion in the main table."""
         statement = statement.bind(
             [getattr(content, key) for key in self._content_keys]
         )
 
         # Type used for hashing keys (usually, it will be
         # cassandra.metadata.Murmur3Token)
         token_class = self._cluster.metadata.token_map.token_class
 
         # Token of the row when it will be inserted. This is equivalent to
         # "SELECT token({', '.join(self._content_pk)}) FROM content WHERE ..."
         # after the row is inserted; but we need the token to insert in the
         # index tables *before* inserting to the main 'content' table
         token = token_class.from_key(statement.routing_key).value
         assert TOKEN_BEGIN <= token <= TOKEN_END
 
         # Function to be called after the indexes contain their respective
         # row
         finalizer = functools.partial(self._content_add_finalize, statement)
 
         return (token, finalizer)
 
     @_prepared_statement(
         "SELECT * FROM content WHERE "
         + " AND ".join(map("%s = ?".__mod__, HASH_ALGORITHMS))
     )
     def content_get_from_pk(
         self, content_hashes: Dict[str, bytes], *, statement
     ) -> Optional[Row]:
         rows = list(
             self._execute_with_retries(
                 statement, [content_hashes[algo] for algo in HASH_ALGORITHMS]
             )
         )
         assert len(rows) <= 1
         if rows:
             return rows[0]
         else:
             return None
 
     @_prepared_statement(
         "SELECT * FROM content WHERE token(" + ", ".join(_content_pk) + ") = ?"
     )
     def content_get_from_token(self, token, *, statement) -> Iterable[Row]:
         return self._execute_with_retries(statement, [token])
 
     @_prepared_statement(
         "SELECT * FROM content WHERE token(%s) > ? LIMIT 1" % ", ".join(_content_pk)
     )
     def content_get_random(self, *, statement) -> Optional[Row]:
         return self._get_random_row(statement)
 
     @_prepared_statement(
         (
             "SELECT token({0}) AS tok, {1} FROM content "
             "WHERE token({0}) >= ? AND token({0}) <= ? LIMIT ?"
         ).format(", ".join(_content_pk), ", ".join(_content_keys))
     )
     def content_get_token_range(
         self, start: int, end: int, limit: int, *, statement
     ) -> Row:
         return self._execute_with_retries(statement, [start, end, limit])
 
     ##########################
     # 'content_by_*' tables
     ##########################
 
     @_prepared_statement(
         "SELECT sha1_git FROM content_by_sha1_git " "WHERE sha1_git IN ?"
     )
     def content_missing_by_sha1_git(
         self, ids: List[bytes], *, statement
     ) -> List[bytes]:
         return self._missing(statement, ids)
 
     def content_index_add_one(self, algo: str, content: Content, token: int) -> None:
         """Adds a row mapping content[algo] to the token of the Content in
         the main 'content' table."""
         query = (
             f"INSERT INTO content_by_{algo} ({algo}, target_token) " f"VALUES (%s, %s)"
         )
         self._execute_with_retries(query, [content.get_hash(algo), token])
 
     def content_get_tokens_from_single_hash(
         self, algo: str, hash_: bytes
     ) -> Iterable[int]:
         assert algo in HASH_ALGORITHMS
         query = f"SELECT target_token FROM content_by_{algo} WHERE {algo} = %s"
         return (tok for (tok,) in self._execute_with_retries(query, [hash_]))
 
     ##########################
     # 'skipped_content' table
     ##########################
 
     _skipped_content_pk = ["sha1", "sha1_git", "sha256", "blake2s256"]
     _skipped_content_keys = [
         "sha1",
         "sha1_git",
         "sha256",
         "blake2s256",
         "length",
         "ctime",
         "status",
         "reason",
         "origin",
     ]
     _magic_null_pk = b"<null>"
     """
     NULLs (or all-empty blobs) are not allowed in primary keys; instead use a
     special value that can't possibly be a valid hash.
     """
 
     def _skipped_content_add_finalize(self, statement: BoundStatement) -> None:
         """Returned currified by skipped_content_add_prepare, to be called
         when the content row should be added to the primary table."""
         self._execute_with_retries(statement, None)
         self._increment_counter("skipped_content", 1)
 
     @_prepared_insert_statement("skipped_content", _skipped_content_keys)
     def skipped_content_add_prepare(
         self, content, *, statement
     ) -> Tuple[int, Callable[[], None]]:
         """Prepares insertion of a Content to the main 'skipped_content' table.
         Returns a token (to be used in secondary tables), and a function to be
         called to perform the insertion in the main table."""
 
         # Replace NULLs (which are not allowed in the partition key) with
         # an empty byte string
         content = content.to_dict()
         for key in self._skipped_content_pk:
             if content[key] is None:
                 content[key] = self._magic_null_pk
 
         statement = statement.bind(
             [content.get(key) for key in self._skipped_content_keys]
         )
 
         # Type used for hashing keys (usually, it will be
         # cassandra.metadata.Murmur3Token)
         token_class = self._cluster.metadata.token_map.token_class
 
         # Token of the row when it will be inserted. This is equivalent to
         # "SELECT token({', '.join(self._content_pk)})
         #  FROM skipped_content WHERE ..."
         # after the row is inserted; but we need the token to insert in the
         # index tables *before* inserting to the main 'skipped_content' table
         token = token_class.from_key(statement.routing_key).value
         assert TOKEN_BEGIN <= token <= TOKEN_END
 
         # Function to be called after the indexes contain their respective
         # row
         finalizer = functools.partial(self._skipped_content_add_finalize, statement)
 
         return (token, finalizer)
 
     @_prepared_statement(
         "SELECT * FROM skipped_content WHERE "
         + " AND ".join(map("%s = ?".__mod__, HASH_ALGORITHMS))
     )
     def skipped_content_get_from_pk(
         self, content_hashes: Dict[str, bytes], *, statement
     ) -> Optional[Row]:
         rows = list(
             self._execute_with_retries(
                 statement,
                 [
                     content_hashes[algo] or self._magic_null_pk
                     for algo in HASH_ALGORITHMS
                 ],
             )
         )
         assert len(rows) <= 1
         if rows:
             # TODO: convert _magic_null_pk back to None?
             return rows[0]
         else:
             return None
 
     ##########################
     # 'skipped_content_by_*' tables
     ##########################
 
     def skipped_content_index_add_one(
         self, algo: str, content: SkippedContent, token: int
     ) -> None:
         """Adds a row mapping content[algo] to the token of the SkippedContent
         in the main 'skipped_content' table."""
         query = (
             f"INSERT INTO skipped_content_by_{algo} ({algo}, target_token) "
             f"VALUES (%s, %s)"
         )
         self._execute_with_retries(
             query, [content.get_hash(algo) or self._magic_null_pk, token]
         )
 
     ##########################
     # 'revision' table
     ##########################
 
     _revision_keys = [
         "id",
         "date",
         "committer_date",
         "type",
         "directory",
         "message",
         "author",
         "committer",
         "synthetic",
         "metadata",
     ]
 
     @_prepared_exists_statement("revision")
     def revision_missing(self, ids: List[bytes], *, statement) -> List[bytes]:
         return self._missing(statement, ids)
 
     @_prepared_insert_statement("revision", _revision_keys)
     def revision_add_one(self, revision: Dict[str, Any], *, statement) -> None:
         self._execute_with_retries(
             statement, [revision[key] for key in self._revision_keys]
         )
         self._increment_counter("revision", 1)
 
     @_prepared_statement("SELECT id FROM revision WHERE id IN ?")
     def revision_get_ids(self, revision_ids, *, statement) -> ResultSet:
         return self._execute_with_retries(statement, [revision_ids])
 
     @_prepared_statement("SELECT * FROM revision WHERE id IN ?")
     def revision_get(self, revision_ids, *, statement) -> ResultSet:
         return self._execute_with_retries(statement, [revision_ids])
 
     @_prepared_statement("SELECT * FROM revision WHERE token(id) > ? LIMIT 1")
     def revision_get_random(self, *, statement) -> Optional[Row]:
         return self._get_random_row(statement)
 
     ##########################
     # 'revision_parent' table
     ##########################
 
     _revision_parent_keys = ["id", "parent_rank", "parent_id"]
 
     @_prepared_insert_statement("revision_parent", _revision_parent_keys)
     def revision_parent_add_one(
         self, id_: Sha1Git, parent_rank: int, parent_id: Sha1Git, *, statement
     ) -> None:
         self._execute_with_retries(statement, [id_, parent_rank, parent_id])
 
     @_prepared_statement("SELECT parent_id FROM revision_parent WHERE id = ?")
     def revision_parent_get(self, revision_id: Sha1Git, *, statement) -> ResultSet:
         return self._execute_with_retries(statement, [revision_id])
 
     ##########################
     # 'release' table
     ##########################
 
     _release_keys = [
         "id",
         "target",
         "target_type",
         "date",
         "name",
         "message",
         "author",
         "synthetic",
     ]
 
     @_prepared_exists_statement("release")
     def release_missing(self, ids: List[bytes], *, statement) -> List[bytes]:
         return self._missing(statement, ids)
 
     @_prepared_insert_statement("release", _release_keys)
     def release_add_one(self, release: Dict[str, Any], *, statement) -> None:
         self._execute_with_retries(
             statement, [release[key] for key in self._release_keys]
         )
         self._increment_counter("release", 1)
 
     @_prepared_statement("SELECT * FROM release WHERE id in ?")
     def release_get(self, release_ids: List[str], *, statement) -> None:
         return self._execute_with_retries(statement, [release_ids])
 
     @_prepared_statement("SELECT * FROM release WHERE token(id) > ? LIMIT 1")
     def release_get_random(self, *, statement) -> Optional[Row]:
         return self._get_random_row(statement)
 
     ##########################
     # 'directory' table
     ##########################
 
     _directory_keys = ["id"]
 
     @_prepared_exists_statement("directory")
     def directory_missing(self, ids: List[bytes], *, statement) -> List[bytes]:
         return self._missing(statement, ids)
 
     @_prepared_insert_statement("directory", _directory_keys)
     def directory_add_one(self, directory_id: Sha1Git, *, statement) -> None:
         """Called after all calls to directory_entry_add_one, to
         commit/finalize the directory."""
         self._execute_with_retries(statement, [directory_id])
         self._increment_counter("directory", 1)
 
     @_prepared_statement("SELECT * FROM directory WHERE token(id) > ? LIMIT 1")
     def directory_get_random(self, *, statement) -> Optional[Row]:
         return self._get_random_row(statement)
 
     ##########################
     # 'directory_entry' table
     ##########################
 
     _directory_entry_keys = ["directory_id", "name", "type", "target", "perms"]
 
     @_prepared_insert_statement("directory_entry", _directory_entry_keys)
     def directory_entry_add_one(self, entry: Dict[str, Any], *, statement) -> None:
         self._execute_with_retries(
             statement, [entry[key] for key in self._directory_entry_keys]
         )
 
     @_prepared_statement("SELECT * FROM directory_entry " "WHERE directory_id IN ?")
     def directory_entry_get(self, directory_ids, *, statement) -> ResultSet:
         return self._execute_with_retries(statement, [directory_ids])
 
     ##########################
     # 'snapshot' table
     ##########################
 
     _snapshot_keys = ["id"]
 
     @_prepared_exists_statement("snapshot")
     def snapshot_missing(self, ids: List[bytes], *, statement) -> List[bytes]:
         return self._missing(statement, ids)
 
     @_prepared_insert_statement("snapshot", _snapshot_keys)
     def snapshot_add_one(self, snapshot_id: Sha1Git, *, statement) -> None:
         self._execute_with_retries(statement, [snapshot_id])
         self._increment_counter("snapshot", 1)
 
     @_prepared_statement("SELECT * FROM snapshot " "WHERE id = ?")
     def snapshot_get(self, snapshot_id: Sha1Git, *, statement) -> ResultSet:
         return self._execute_with_retries(statement, [snapshot_id])
 
     @_prepared_statement("SELECT * FROM snapshot WHERE token(id) > ? LIMIT 1")
     def snapshot_get_random(self, *, statement) -> Optional[Row]:
         return self._get_random_row(statement)
 
     ##########################
     # 'snapshot_branch' table
     ##########################
 
     _snapshot_branch_keys = ["snapshot_id", "name", "target_type", "target"]
 
     @_prepared_insert_statement("snapshot_branch", _snapshot_branch_keys)
     def snapshot_branch_add_one(self, branch: Dict[str, Any], *, statement) -> None:
         self._execute_with_retries(
             statement, [branch[key] for key in self._snapshot_branch_keys]
         )
 
     @_prepared_statement(
         "SELECT ascii_bins_count(target_type) AS counts "
         "FROM snapshot_branch "
         "WHERE snapshot_id = ? "
     )
     def snapshot_count_branches(self, snapshot_id: Sha1Git, *, statement) -> ResultSet:
         return self._execute_with_retries(statement, [snapshot_id])
 
     @_prepared_statement(
         "SELECT * FROM snapshot_branch " "WHERE snapshot_id = ? AND name >= ?" "LIMIT ?"
     )
     def snapshot_branch_get(
         self, snapshot_id: Sha1Git, from_: bytes, limit: int, *, statement
     ) -> None:
         return self._execute_with_retries(statement, [snapshot_id, from_, limit])
 
     ##########################
     # 'origin' table
     ##########################
 
     origin_keys = ["sha1", "url", "type", "next_visit_id"]
 
     @_prepared_statement(
         "INSERT INTO origin (sha1, url, next_visit_id) "
         "VALUES (?, ?, 1) IF NOT EXISTS"
     )
     def origin_add_one(self, origin: Origin, *, statement) -> None:
         self._execute_with_retries(statement, [hash_url(origin.url), origin.url])
         self._increment_counter("origin", 1)
 
     @_prepared_statement("SELECT * FROM origin WHERE sha1 = ?")
     def origin_get_by_sha1(self, sha1: bytes, *, statement) -> ResultSet:
         return self._execute_with_retries(statement, [sha1])
 
     def origin_get_by_url(self, url: str) -> ResultSet:
         return self.origin_get_by_sha1(hash_url(url))
 
     @_prepared_statement(
         f'SELECT token(sha1) AS tok, {", ".join(origin_keys)} '
         f"FROM origin WHERE token(sha1) >= ? LIMIT ?"
     )
     def origin_list(self, start_token: int, limit: int, *, statement) -> ResultSet:
         return self._execute_with_retries(statement, [start_token, limit])
 
     @_prepared_statement("SELECT * FROM origin")
     def origin_iter_all(self, *, statement) -> ResultSet:
         return self._execute_with_retries(statement, [])
 
     @_prepared_statement("SELECT next_visit_id FROM origin WHERE sha1 = ?")
     def _origin_get_next_visit_id(self, origin_sha1: bytes, *, statement) -> int:
         rows = list(self._execute_with_retries(statement, [origin_sha1]))
         assert len(rows) == 1  # TODO: error handling
         return rows[0].next_visit_id
 
     @_prepared_statement(
         "UPDATE origin SET next_visit_id=? " "WHERE sha1 = ? IF next_visit_id=?"
     )
     def origin_generate_unique_visit_id(self, origin_url: str, *, statement) -> int:
         origin_sha1 = hash_url(origin_url)
         next_id = self._origin_get_next_visit_id(origin_sha1)
         while True:
             res = list(
                 self._execute_with_retries(
                     statement, [next_id + 1, origin_sha1, next_id]
                 )
             )
             assert len(res) == 1
             if res[0].applied:
                 # No data race
                 return next_id
             else:
                 # Someone else updated it before we did, let's try again
                 next_id = res[0].next_visit_id
                 # TODO: abort after too many attempts
 
         return next_id
 
     ##########################
     # 'origin_visit' table
     ##########################
 
     _origin_visit_keys = [
         "origin",
         "visit",
         "type",
         "date",
         "status",
         "metadata",
         "snapshot",
     ]
     _origin_visit_update_keys = ["type", "date", "status", "metadata", "snapshot"]
 
     @_prepared_statement("SELECT * FROM origin_visit " "WHERE origin = ? AND visit > ?")
     def _origin_visit_get_no_limit(
         self, origin_url: str, last_visit: int, *, statement
     ) -> ResultSet:
         return self._execute_with_retries(statement, [origin_url, last_visit])
 
     @_prepared_statement(
         "SELECT * FROM origin_visit " "WHERE origin = ? AND visit > ? LIMIT ?"
     )
     def _origin_visit_get_limit(
         self, origin_url: str, last_visit: int, limit: int, *, statement
     ) -> ResultSet:
         return self._execute_with_retries(statement, [origin_url, last_visit, limit])
 
     def origin_visit_get(
         self, origin_url: str, last_visit: Optional[int], limit: Optional[int]
     ) -> ResultSet:
         if last_visit is None:
             last_visit = -1
 
         if limit is None:
             return self._origin_visit_get_no_limit(origin_url, last_visit)
         else:
             return self._origin_visit_get_limit(origin_url, last_visit, limit)
 
-    def origin_visit_update(
-        self, origin_url: str, visit_id: int, updates: Dict[str, Any]
-    ) -> None:
-        set_parts = []
-        args: List[Any] = []
-        for (column, value) in updates.items():
-            set_parts.append(f"{column} = %s")
-            if column == "metadata":
-                args.append(json.dumps(value))
-            else:
-                args.append(value)
+    @_prepared_insert_statement("origin_visit", _origin_visit_keys)
+    def origin_visit_add_one(self, visit: OriginVisit, *, statement) -> None:
+        self._add_one(statement, "origin_visit", visit, self._origin_visit_keys)
 
-        if not set_parts:
-            return
+    _origin_visit_status_keys = [
+        "origin",
+        "visit",
+        "date",
+        "status",
+        "snapshot",
+        "metadata",
+    ]
 
-        query = (
-            "UPDATE origin_visit SET "
-            + ", ".join(set_parts)
-            + " WHERE origin = %s AND visit = %s"
+    @_prepared_insert_statement("origin_visit_status", _origin_visit_status_keys)
+    def origin_visit_status_add_one(
+        self, visit_update: OriginVisitStatus, *, statement
+    ) -> None:
+        assert self._origin_visit_status_keys[-1] == "metadata"
+        keys = self._origin_visit_status_keys
+
+        metadata = json.dumps(visit_update.metadata)
+        self._execute_with_retries(
+            statement, [getattr(visit_update, key) for key in keys[:-1]] + [metadata]
         )
-        self._execute_with_retries(query, args + [origin_url, visit_id])
 
-    @_prepared_insert_statement("origin_visit", _origin_visit_keys)
-    def origin_visit_add_one(self, visit: OriginVisit, *, statement) -> None:
-        self._add_one(statement, "origin_visit", visit, self._origin_visit_keys)
+    def _format_origin_visit_status_row(
+        self, visit_status: ResultSet
+    ) -> Dict[str, Any]:
+        """Format a row visit_status into an origin_visit_status dict
+
+        """
+        return {
+            **visit_status._asdict(),
+            "origin": visit_status.origin,
+            "date": visit_status.date.replace(tzinfo=datetime.timezone.utc),
+            "metadata": (
+                json.loads(visit_status.metadata) if visit_status.metadata else None
+            ),
+        }
+
+    @_prepared_statement(
+        "SELECT * FROM origin_visit_status "
+        "WHERE origin = ? AND visit = ? "
+        "ORDER BY date DESC "
+        "LIMIT 1"
+    )
+    def origin_visit_status_get_latest(
+        self, origin: str, visit: int, *, statement
+    ) -> Optional[Dict[str, Any]]:
+        """Given an origin visit id, return its latest origin_visit_status
+
+        """
+        rows = list(self._execute_with_retries(statement, [origin, visit]))
+        if rows:
+            return self._format_origin_visit_status_row(rows[0])
+        else:
+            return None
 
     @_prepared_statement(
         "UPDATE origin_visit SET "
         + ", ".join("%s = ?" % key for key in _origin_visit_update_keys)
         + " WHERE origin = ? AND visit = ?"
     )
     def origin_visit_upsert(self, visit: OriginVisit, *, statement) -> None:
         args: List[Any] = []
         for column in self._origin_visit_update_keys:
             if column == "metadata":
                 args.append(json.dumps(visit.metadata))
             else:
                 args.append(getattr(visit, column))
 
         self._execute_with_retries(statement, args + [visit.origin, visit.visit])
         # TODO:  check if there is already one
         self._increment_counter("origin_visit", 1)
 
     @_prepared_statement("SELECT * FROM origin_visit " "WHERE origin = ? AND visit = ?")
     def origin_visit_get_one(
         self, origin_url: str, visit_id: int, *, statement
     ) -> Optional[Row]:
         # TODO: error handling
         rows = list(self._execute_with_retries(statement, [origin_url, visit_id]))
         if rows:
             return rows[0]
         else:
             return None
 
     @_prepared_statement("SELECT * FROM origin_visit " "WHERE origin = ?")
     def origin_visit_get_all(self, origin_url: str, *, statement) -> ResultSet:
         return self._execute_with_retries(statement, [origin_url])
 
-    @_prepared_statement("SELECT * FROM origin_visit WHERE origin = ?")
-    def origin_visit_get_latest(
-        self,
-        origin: str,
-        allowed_statuses: Optional[Iterable[str]],
-        require_snapshot: bool,
-        *,
-        statement,
-    ) -> Optional[Row]:
-        # TODO: do the ordering and filtering in Cassandra
-        rows = list(self._execute_with_retries(statement, [origin]))
-
-        rows.sort(key=lambda row: (row.date, row.visit), reverse=True)
-
-        for row in rows:
-            if require_snapshot and row.snapshot is None:
-                continue
-            if allowed_statuses is not None and row.status not in allowed_statuses:
-                continue
-            if row.snapshot is not None and self.snapshot_missing([row.snapshot]):
-                raise ValueError("visit references unknown snapshot")
-            return row
-        else:
-            return None
-
     @_prepared_statement("SELECT * FROM origin_visit WHERE token(origin) >= ?")
     def _origin_visit_iter_from(self, min_token: int, *, statement) -> Iterator[Row]:
         yield from self._execute_with_retries(statement, [min_token])
 
     @_prepared_statement("SELECT * FROM origin_visit WHERE token(origin) < ?")
     def _origin_visit_iter_to(self, max_token: int, *, statement) -> Iterator[Row]:
         yield from self._execute_with_retries(statement, [max_token])
 
     def origin_visit_iter(self, start_token: int) -> Iterator[Row]:
         """Returns all origin visits in order from this token,
         and wraps around the token space."""
         yield from self._origin_visit_iter_from(start_token)
         yield from self._origin_visit_iter_to(start_token)
 
     ##########################
     # 'tool' table
     ##########################
 
     _tool_keys = ["id", "name", "version", "configuration"]
 
     @_prepared_insert_statement("tool_by_uuid", _tool_keys)
     def tool_by_uuid_add_one(self, tool: Dict[str, Any], *, statement) -> None:
         self._execute_with_retries(statement, [tool[key] for key in self._tool_keys])
 
     @_prepared_insert_statement("tool", _tool_keys)
     def tool_add_one(self, tool: Dict[str, Any], *, statement) -> None:
         self._execute_with_retries(statement, [tool[key] for key in self._tool_keys])
         self._increment_counter("tool", 1)
 
     @_prepared_statement(
         "SELECT id FROM tool " "WHERE name = ? AND version = ? " "AND configuration = ?"
     )
     def tool_get_one_uuid(
         self, name: str, version: str, configuration: Dict[str, Any], *, statement
     ) -> Optional[str]:
         rows = list(
             self._execute_with_retries(statement, [name, version, configuration])
         )
         if rows:
             assert len(rows) == 1
             return rows[0].id
         else:
             return None
 
     ##########################
     # Miscellaneous
     ##########################
 
     @_prepared_statement("SELECT uuid() FROM revision LIMIT 1;")
     def check_read(self, *, statement):
         self._execute_with_retries(statement, [])
 
     @_prepared_statement(
         "SELECT object_type, count FROM object_count " "WHERE partition_key=0"
     )
     def stat_counters(self, *, statement) -> ResultSet:
         return self._execute_with_retries(statement, [])
diff --git a/swh/storage/cassandra/schema.py b/swh/storage/cassandra/schema.py
index 597ad7f1..e50f7426 100644
--- a/swh/storage/cassandra/schema.py
+++ b/swh/storage/cassandra/schema.py
@@ -1,230 +1,240 @@
 # Copyright (C) 2019-2020  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
 
 
 CREATE_TABLES_QUERIES = """
 CREATE OR REPLACE FUNCTION ascii_bins_count_sfunc (
     state tuple<int, map<ascii, int>>, -- (nb_none, map<target_type, nb>)
     bin_name ascii
 )
 CALLED ON NULL INPUT
 RETURNS tuple<int, map<ascii, int>>
 LANGUAGE java AS
 $$
     if (bin_name == null) {
         state.setInt(0, state.getInt(0) + 1);
     }
     else {
         Map<String, Integer> counters = state.getMap(
             1, String.class, Integer.class);
         Integer nb = counters.get(bin_name);
         if (nb == null) {
             nb = 0;
         }
         counters.put(bin_name, nb + 1);
         state.setMap(1, counters, String.class, Integer.class);
     }
     return state;
 $$
 ;
 
 CREATE OR REPLACE AGGREGATE ascii_bins_count ( ascii )
 SFUNC ascii_bins_count_sfunc
 STYPE tuple<int, map<ascii, int>>
 INITCOND (0, {})
 ;
 
 CREATE TYPE IF NOT EXISTS microtimestamp (
     seconds             bigint,
     microseconds        int
 );
 
 CREATE TYPE IF NOT EXISTS microtimestamp_with_timezone (
     timestamp           frozen<microtimestamp>,
     offset              smallint,
     negative_utc        boolean
 );
 
 CREATE TYPE IF NOT EXISTS person (
     fullname    blob,
     name        blob,
     email       blob
 );
 
 CREATE TABLE IF NOT EXISTS content (
     sha1          blob,
     sha1_git      blob,
     sha256        blob,
     blake2s256    blob,
     length        bigint,
     ctime         timestamp,
         -- creation time, i.e. time of (first) injection into the storage
     status        ascii,
     PRIMARY KEY ((sha1, sha1_git, sha256, blake2s256))
 );
 
 CREATE TABLE IF NOT EXISTS skipped_content (
     sha1          blob,
     sha1_git      blob,
     sha256        blob,
     blake2s256    blob,
     length        bigint,
     ctime         timestamp,
         -- creation time, i.e. time of (first) injection into the storage
     status        ascii,
     reason        text,
     origin        text,
     PRIMARY KEY ((sha1, sha1_git, sha256, blake2s256))
 );
 
 CREATE TABLE IF NOT EXISTS revision (
     id                              blob PRIMARY KEY,
     date                            microtimestamp_with_timezone,
     committer_date                  microtimestamp_with_timezone,
     type                            ascii,
     directory                       blob,  -- source code "root" directory
     message                         blob,
     author                          person,
     committer                       person,
     synthetic                       boolean,
         -- true iff revision has been created by Software Heritage
     metadata                        text
         -- extra metadata as JSON(tarball checksums,
         -- extra commit information, etc...)
 );
 
 CREATE TABLE IF NOT EXISTS revision_parent (
     id                     blob,
     parent_rank                     int,
         -- parent position in merge commits, 0-based
     parent_id                       blob,
     PRIMARY KEY ((id), parent_rank)
 );
 
 CREATE TABLE IF NOT EXISTS release
 (
     id                              blob PRIMARY KEY,
     target_type                     ascii,
     target                          blob,
     date                            microtimestamp_with_timezone,
     name                            blob,
     message                         blob,
     author                          person,
     synthetic                       boolean,
         -- true iff release has been created by Software Heritage
 );
 
 CREATE TABLE IF NOT EXISTS directory (
     id              blob PRIMARY KEY,
 );
 
 CREATE TABLE IF NOT EXISTS directory_entry (
     directory_id    blob,
     name            blob,  -- path name, relative to containing dir
     target          blob,
     perms           int,   -- unix-like permissions
     type            ascii, -- target type
     PRIMARY KEY ((directory_id), name)
 );
 
 CREATE TABLE IF NOT EXISTS snapshot (
     id              blob PRIMARY KEY,
 );
 
 -- For a given snapshot_id, branches are sorted by their name,
 -- allowing easy pagination.
 CREATE TABLE IF NOT EXISTS snapshot_branch (
     snapshot_id     blob,
     name            blob,
     target_type     ascii,
     target          blob,
     PRIMARY KEY ((snapshot_id), name)
 );
 
 CREATE TABLE IF NOT EXISTS origin_visit (
     origin          text,
     visit           bigint,
     date            timestamp,
     type            text,
     status          ascii,
     metadata        text,
     snapshot        blob,
     PRIMARY KEY ((origin), visit)
 );
 
+CREATE TABLE IF NOT EXISTS origin_visit_status (
+    origin          text,
+    visit           bigint,
+    date            timestamp,
+    status          ascii,
+    metadata        text,
+    snapshot        blob,
+    PRIMARY KEY ((origin), visit, date)
+);
 
 CREATE TABLE IF NOT EXISTS origin (
     sha1            blob PRIMARY KEY,
     url             text,
     type            text,
     next_visit_id   int,
         -- We need integer visit ids for compatibility with the pgsql
         -- storage, so we're using lightweight transactions with this trick:
         -- https://stackoverflow.com/a/29391877/539465
 );
 
 
 CREATE TABLE IF NOT EXISTS tool_by_uuid (
     id              timeuuid PRIMARY KEY,
     name            ascii,
     version         ascii,
     configuration   blob,
 );
 
 
 CREATE TABLE IF NOT EXISTS tool (
     id              timeuuid,
     name            ascii,
     version         ascii,
     configuration   blob,
     PRIMARY KEY ((name, version, configuration))
 )
 
 
 CREATE TABLE IF NOT EXISTS object_count (
     partition_key   smallint,  -- Constant, must always be 0
     object_type     ascii,
     count           counter,
     PRIMARY KEY ((partition_key), object_type)
 );
 """.split(
     "\n\n"
 )
 
 CONTENT_INDEX_TEMPLATE = """
 -- Secondary table, used for looking up "content" from a single hash
 CREATE TABLE IF NOT EXISTS content_by_{main_algo} (
     {main_algo}   blob,
     target_token  bigint, -- value of token(pk) on the "primary" table
     PRIMARY KEY (({main_algo}), target_token)
 );
 
 CREATE TABLE IF NOT EXISTS skipped_content_by_{main_algo} (
     {main_algo}   blob,
     target_token  bigint, -- value of token(pk) on the "primary" table
     PRIMARY KEY (({main_algo}), target_token)
 );
 """
 
 TABLES = (
     "skipped_content content revision revision_parent release "
     "directory directory_entry snapshot snapshot_branch "
-    "origin_visit origin tool_by_uuid tool object_count"
+    "origin_visit origin tool_by_uuid tool object_count "
+    "origin_visit_status"
 ).split()
 
 HASH_ALGORITHMS = ["sha1", "sha1_git", "sha256", "blake2s256"]
 
 for main_algo in HASH_ALGORITHMS:
     CREATE_TABLES_QUERIES.extend(
         CONTENT_INDEX_TEMPLATE.format(
             main_algo=main_algo,
             other_algos=", ".join(
                 [algo for algo in HASH_ALGORITHMS if algo != main_algo]
             ),
         ).split("\n\n")
     )
 
     TABLES.append("content_by_%s" % main_algo)
     TABLES.append("skipped_content_by_%s" % main_algo)
diff --git a/swh/storage/cassandra/storage.py b/swh/storage/cassandra/storage.py
index 2d00e9d4..f93e9dc4 100644
--- a/swh/storage/cassandra/storage.py
+++ b/swh/storage/cassandra/storage.py
@@ -1,1013 +1,1116 @@
 # Copyright (C) 2019-2020  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 json
 import random
 import re
 from typing import Any, Dict, List, Iterable, Optional, Union
 import uuid
 
 import attr
 import dateutil
 
 from swh.model.model import (
     Revision,
     Release,
     Directory,
     DirectoryEntry,
     Content,
     SkippedContent,
     OriginVisit,
+    OriginVisitStatus,
     Snapshot,
     Origin,
 )
 from swh.model.hashutil import DEFAULT_ALGORITHMS
 from swh.storage.objstorage import ObjStorage
 from swh.storage.writer import JournalWriter
 from swh.storage.validate import convert_validation_exceptions
 from swh.storage.utils import now
 
 from ..exc import StorageArgumentException, HashCollision
 from .common import TOKEN_BEGIN, TOKEN_END
 from .converters import (
     revision_to_db,
     revision_from_db,
     release_to_db,
     release_from_db,
 )
 from .cql import CqlRunner
 from .schema import HASH_ALGORITHMS
 
 
 # Max block size of contents to return
 BULK_BLOCK_CONTENT_LEN_MAX = 10000
 
 
 class CassandraStorage:
     def __init__(self, hosts, keyspace, objstorage, port=9042, journal_writer=None):
         self._cql_runner = CqlRunner(hosts, keyspace, port)
         self.journal_writer = JournalWriter(journal_writer)
         self.objstorage = ObjStorage(objstorage)
 
     def check_config(self, *, check_write):
         self._cql_runner.check_read()
 
         return True
 
     def _content_get_from_hash(self, algo, hash_) -> Iterable:
         """From the name of a hash algorithm and a value of that hash,
         looks up the "hash -> token" secondary table (content_by_{algo})
         to get tokens.
         Then, looks up the main table (content) to get all contents with
         that token, and filters out contents whose hash doesn't match."""
         found_tokens = self._cql_runner.content_get_tokens_from_single_hash(algo, hash_)
 
         for token in found_tokens:
             # Query the main table ('content').
             res = self._cql_runner.content_get_from_token(token)
 
             for row in res:
                 # re-check the the hash (in case of murmur3 collision)
                 if getattr(row, algo) == hash_:
                     yield row
 
     def _content_add(self, contents: List[Content], with_data: bool) -> Dict:
         # Filter-out content already in the database.
         contents = [
             c for c in contents if not self._cql_runner.content_get_from_pk(c.to_dict())
         ]
 
         self.journal_writer.content_add(contents)
 
         if with_data:
             # First insert to the objstorage, if the endpoint is
             # `content_add` (as opposed to `content_add_metadata`).
             # TODO: this should probably be done in concurrently to inserting
             # in index tables (but still before the main table; so an entry is
             # only added to the main table after everything else was
             # successfully inserted.
             summary = self.objstorage.content_add(
                 c for c in contents if c.status != "absent"
             )
             content_add_bytes = summary["content:add:bytes"]
 
         content_add = 0
         for content in contents:
             content_add += 1
 
             # Check for sha1 or sha1_git collisions. This test is not atomic
             # with the insertion, so it won't detect a collision if both
             # contents are inserted at the same time, but it's good enough.
             #
             # The proper way to do it would probably be a BATCH, but this
             # would be inefficient because of the number of partitions we
             # need to affect (len(HASH_ALGORITHMS)+1, which is currently 5)
             for algo in {"sha1", "sha1_git"}:
                 collisions = []
                 # Get tokens of 'content' rows with the same value for
                 # sha1/sha1_git
                 rows = self._content_get_from_hash(algo, content.get_hash(algo))
                 for row in rows:
                     if getattr(row, algo) != content.get_hash(algo):
                         # collision of token(partition key), ignore this
                         # row
                         continue
 
                     for algo in HASH_ALGORITHMS:
                         if getattr(row, algo) != content.get_hash(algo):
                             # This hash didn't match; discard the row.
                             collisions.append(
                                 {algo: getattr(row, algo) for algo in HASH_ALGORITHMS}
                             )
 
                 if collisions:
                     collisions.append(content.hashes())
                     raise HashCollision(algo, content.get_hash(algo), collisions)
 
             (token, insertion_finalizer) = self._cql_runner.content_add_prepare(content)
 
             # Then add to index tables
             for algo in HASH_ALGORITHMS:
                 self._cql_runner.content_index_add_one(algo, content, token)
 
             # Then to the main table
             insertion_finalizer()
 
         summary = {
             "content:add": content_add,
         }
 
         if with_data:
             summary["content:add:bytes"] = content_add_bytes
 
         return summary
 
     def content_add(self, content: Iterable[Content]) -> Dict:
         contents = [attr.evolve(c, ctime=now()) for c in content]
         return self._content_add(list(contents), with_data=True)
 
     def content_update(self, content, keys=[]):
         raise NotImplementedError(
             "content_update is not supported by the Cassandra backend"
         )
 
     def content_add_metadata(self, content: Iterable[Content]) -> Dict:
         return self._content_add(list(content), with_data=False)
 
     def content_get(self, content):
         if len(content) > BULK_BLOCK_CONTENT_LEN_MAX:
             raise StorageArgumentException(
                 "Sending at most %s contents." % BULK_BLOCK_CONTENT_LEN_MAX
             )
         yield from self.objstorage.content_get(content)
 
     def content_get_partition(
         self,
         partition_id: int,
         nb_partitions: int,
         limit: int = 1000,
         page_token: str = None,
     ):
         if limit is None:
             raise StorageArgumentException("limit should not be None")
 
         # Compute start and end of the range of tokens covered by the
         # requested partition
         partition_size = (TOKEN_END - TOKEN_BEGIN) // nb_partitions
         range_start = TOKEN_BEGIN + partition_id * partition_size
         range_end = TOKEN_BEGIN + (partition_id + 1) * partition_size
 
         # offset the range start according to the `page_token`.
         if page_token is not None:
             if not (range_start <= int(page_token) <= range_end):
                 raise StorageArgumentException("Invalid page_token.")
             range_start = int(page_token)
 
         # Get the first rows of the range
         rows = self._cql_runner.content_get_token_range(range_start, range_end, limit)
         rows = list(rows)
 
         if len(rows) == limit:
             next_page_token: Optional[str] = str(rows[-1].tok + 1)
         else:
             next_page_token = None
 
         return {
             "contents": [row._asdict() for row in rows if row.status != "absent"],
             "next_page_token": next_page_token,
         }
 
     def content_get_metadata(self, contents: List[bytes]) -> Dict[bytes, List[Dict]]:
         result: Dict[bytes, List[Dict]] = {sha1: [] for sha1 in contents}
         for sha1 in contents:
             # Get all (sha1, sha1_git, sha256, blake2s256) whose sha1
             # matches the argument, from the index table ('content_by_sha1')
             for row in self._content_get_from_hash("sha1", sha1):
                 content_metadata = row._asdict()
                 content_metadata.pop("ctime")
                 result[content_metadata["sha1"]].append(content_metadata)
         return result
 
     def content_find(self, content):
         # Find an algorithm that is common to all the requested contents.
         # It will be used to do an initial filtering efficiently.
         filter_algos = list(set(content).intersection(HASH_ALGORITHMS))
         if not filter_algos:
             raise StorageArgumentException(
                 "content keys must contain at least one of: "
                 "%s" % ", ".join(sorted(HASH_ALGORITHMS))
             )
         common_algo = filter_algos[0]
 
         results = []
         rows = self._content_get_from_hash(common_algo, content[common_algo])
         for row in rows:
             # Re-check all the hashes, in case of collisions (either of the
             # hash of the partition key, or the hashes in it)
             for algo in HASH_ALGORITHMS:
                 if content.get(algo) and getattr(row, algo) != content[algo]:
                     # This hash didn't match; discard the row.
                     break
             else:
                 # All hashes match, keep this row.
                 results.append(
                     {
                         **row._asdict(),
                         "ctime": row.ctime.replace(tzinfo=datetime.timezone.utc),
                     }
                 )
         return results
 
     def content_missing(self, content, key_hash="sha1"):
         for cont in content:
             res = self.content_find(cont)
             if not res:
                 yield cont[key_hash]
             if any(c["status"] == "missing" for c in res):
                 yield cont[key_hash]
 
     def content_missing_per_sha1(self, contents):
         return self.content_missing([{"sha1": c for c in contents}])
 
     def content_missing_per_sha1_git(self, contents):
         return self.content_missing(
             [{"sha1_git": c for c in contents}], key_hash="sha1_git"
         )
 
     def content_get_random(self):
         return self._cql_runner.content_get_random().sha1_git
 
     def _skipped_content_get_from_hash(self, algo, hash_) -> Iterable:
         """From the name of a hash algorithm and a value of that hash,
         looks up the "hash -> token" secondary table
         (skipped_content_by_{algo}) to get tokens.
         Then, looks up the main table (content) to get all contents with
         that token, and filters out contents whose hash doesn't match."""
         found_tokens = self._cql_runner.skipped_content_get_tokens_from_single_hash(
             algo, hash_
         )
 
         for token in found_tokens:
             # Query the main table ('content').
             res = self._cql_runner.skipped_content_get_from_token(token)
 
             for row in res:
                 # re-check the the hash (in case of murmur3 collision)
                 if getattr(row, algo) == hash_:
                     yield row
 
     def _skipped_content_add(self, contents: Iterable[SkippedContent]) -> Dict:
         # Filter-out content already in the database.
         contents = [
             c
             for c in contents
             if not self._cql_runner.skipped_content_get_from_pk(c.to_dict())
         ]
 
         self.journal_writer.skipped_content_add(contents)
 
         for content in contents:
             # Compute token of the row in the main table
             (token, insertion_finalizer) = self._cql_runner.skipped_content_add_prepare(
                 content
             )
 
             # Then add to index tables
             for algo in HASH_ALGORITHMS:
                 self._cql_runner.skipped_content_index_add_one(algo, content, token)
 
             # Then to the main table
             insertion_finalizer()
 
         return {"skipped_content:add": len(contents)}
 
     def skipped_content_add(self, content: Iterable[SkippedContent]) -> Dict:
         contents = [attr.evolve(c, ctime=now()) for c in content]
         return self._skipped_content_add(contents)
 
     def skipped_content_missing(self, contents):
         for content in contents:
             if not self._cql_runner.skipped_content_get_from_pk(content):
                 yield {algo: content[algo] for algo in DEFAULT_ALGORITHMS}
 
     def directory_add(self, directories: Iterable[Directory]) -> Dict:
         directories = list(directories)
 
         # Filter out directories that are already inserted.
         missing = self.directory_missing([dir_.id for dir_ in directories])
         directories = [dir_ for dir_ in directories if dir_.id in missing]
 
         self.journal_writer.directory_add(directories)
 
         for directory in directories:
             # Add directory entries to the 'directory_entry' table
             for entry in directory.entries:
                 self._cql_runner.directory_entry_add_one(
                     {**entry.to_dict(), "directory_id": directory.id}
                 )
 
             # Add the directory *after* adding all the entries, so someone
             # calling snapshot_get_branch in the meantime won't end up
             # with half the entries.
             self._cql_runner.directory_add_one(directory.id)
 
         return {"directory:add": len(missing)}
 
     def directory_missing(self, directories):
         return self._cql_runner.directory_missing(directories)
 
     def _join_dentry_to_content(self, dentry):
         keys = (
             "status",
             "sha1",
             "sha1_git",
             "sha256",
             "length",
         )
         ret = dict.fromkeys(keys)
         ret.update(dentry.to_dict())
         if ret["type"] == "file":
             content = self.content_find({"sha1_git": ret["target"]})
             if content:
                 content = content[0]
                 for key in keys:
                     ret[key] = content[key]
         return ret
 
     def _directory_ls(self, directory_id, recursive, prefix=b""):
         if self.directory_missing([directory_id]):
             return
         rows = list(self._cql_runner.directory_entry_get([directory_id]))
 
         for row in rows:
             # Build and yield the directory entry dict
             entry = row._asdict()
             del entry["directory_id"]
             entry = DirectoryEntry.from_dict(entry)
             ret = self._join_dentry_to_content(entry)
             ret["name"] = prefix + ret["name"]
             ret["dir_id"] = directory_id
             yield ret
 
             if recursive and ret["type"] == "dir":
                 yield from self._directory_ls(
                     ret["target"], True, prefix + ret["name"] + b"/"
                 )
 
     def directory_entry_get_by_path(self, directory, paths):
         return self._directory_entry_get_by_path(directory, paths, b"")
 
     def _directory_entry_get_by_path(self, directory, paths, prefix):
         if not paths:
             return
 
         contents = list(self.directory_ls(directory))
 
         if not contents:
             return
 
         def _get_entry(entries, name):
             """Finds the entry with the requested name, prepends the
             prefix (to get its full path), and returns it.
 
             If no entry has that name, returns None."""
             for entry in entries:
                 if entry["name"] == name:
                     entry = entry.copy()
                     entry["name"] = prefix + entry["name"]
                     return entry
 
         first_item = _get_entry(contents, paths[0])
 
         if len(paths) == 1:
             return first_item
 
         if not first_item or first_item["type"] != "dir":
             return
 
         return self._directory_entry_get_by_path(
             first_item["target"], paths[1:], prefix + paths[0] + b"/"
         )
 
     def directory_ls(self, directory, recursive=False):
         yield from self._directory_ls(directory, recursive)
 
     def directory_get_random(self):
         return self._cql_runner.directory_get_random().id
 
     def revision_add(self, revisions: Iterable[Revision]) -> Dict:
         revisions = list(revisions)
 
         # Filter-out revisions already in the database
         missing = self.revision_missing([rev.id for rev in revisions])
         revisions = [rev for rev in revisions if rev.id in missing]
         self.journal_writer.revision_add(revisions)
 
         for revision in revisions:
             revobject = revision_to_db(revision)
             if revobject:
                 # Add parents first
                 for (rank, parent) in enumerate(revobject["parents"]):
                     self._cql_runner.revision_parent_add_one(
                         revobject["id"], rank, parent
                     )
 
                 # Then write the main revision row.
                 # Writing this after all parents were written ensures that
                 # read endpoints don't return a partial view while writing
                 # the parents
                 self._cql_runner.revision_add_one(revobject)
 
         return {"revision:add": len(revisions)}
 
     def revision_missing(self, revisions):
         return self._cql_runner.revision_missing(revisions)
 
     def revision_get(self, revisions):
         rows = self._cql_runner.revision_get(revisions)
         revs = {}
         for row in rows:
             # TODO: use a single query to get all parents?
             # (it might have lower latency, but requires more code and more
             # bandwidth, because revision id would be part of each returned
             # row)
             parent_rows = self._cql_runner.revision_parent_get(row.id)
             # parent_rank is the clustering key, so results are already
             # sorted by rank.
             parents = [row.parent_id for row in parent_rows]
             rev = revision_from_db(row, parents=parents)
             revs[rev.id] = rev.to_dict()
 
         for rev_id in revisions:
             yield revs.get(rev_id)
 
     def _get_parent_revs(self, rev_ids, seen, limit, short):
         if limit and len(seen) >= limit:
             return
         rev_ids = [id_ for id_ in rev_ids if id_ not in seen]
         if not rev_ids:
             return
         seen |= set(rev_ids)
 
         # We need this query, even if short=True, to return consistent
         # results (ie. not return only a subset of a revision's parents
         # if it is being written)
         if short:
             rows = self._cql_runner.revision_get_ids(rev_ids)
         else:
             rows = self._cql_runner.revision_get(rev_ids)
 
         for row in rows:
             # TODO: use a single query to get all parents?
             # (it might have less latency, but requires less code and more
             # bandwidth (because revision id would be part of each returned
             # row)
             parent_rows = self._cql_runner.revision_parent_get(row.id)
 
             # parent_rank is the clustering key, so results are already
             # sorted by rank.
             parents = [row.parent_id for row in parent_rows]
 
             if short:
                 yield (row.id, parents)
             else:
                 rev = revision_from_db(row, parents=parents)
                 yield rev.to_dict()
             yield from self._get_parent_revs(parents, seen, limit, short)
 
     def revision_log(self, revisions, limit=None):
         seen = set()
         yield from self._get_parent_revs(revisions, seen, limit, False)
 
     def revision_shortlog(self, revisions, limit=None):
         seen = set()
         yield from self._get_parent_revs(revisions, seen, limit, True)
 
     def revision_get_random(self):
         return self._cql_runner.revision_get_random().id
 
     def release_add(self, releases: Iterable[Release]) -> Dict:
         missing = self.release_missing([rel.id for rel in releases])
         releases = [rel for rel in releases if rel.id in missing]
 
         self.journal_writer.release_add(releases)
 
         for release in releases:
             if release:
                 self._cql_runner.release_add_one(release_to_db(release))
 
         return {"release:add": len(missing)}
 
     def release_missing(self, releases):
         return self._cql_runner.release_missing(releases)
 
     def release_get(self, releases):
         rows = self._cql_runner.release_get(releases)
         rels = {}
         for row in rows:
             release = release_from_db(row)
             rels[row.id] = release.to_dict()
 
         for rel_id in releases:
             yield rels.get(rel_id)
 
     def release_get_random(self):
         return self._cql_runner.release_get_random().id
 
     def snapshot_add(self, snapshots: Iterable[Snapshot]) -> Dict:
         missing = self._cql_runner.snapshot_missing([snp.id for snp in snapshots])
         snapshots = [snp for snp in snapshots if snp.id in missing]
 
         for snapshot in snapshots:
             self.journal_writer.snapshot_add(snapshot)
 
             # Add branches
             for (branch_name, branch) in snapshot.branches.items():
                 if branch is None:
                     target_type = None
                     target = None
                 else:
                     target_type = branch.target_type.value
                     target = branch.target
                 self._cql_runner.snapshot_branch_add_one(
                     {
                         "snapshot_id": snapshot.id,
                         "name": branch_name,
                         "target_type": target_type,
                         "target": target,
                     }
                 )
 
             # Add the snapshot *after* adding all the branches, so someone
             # calling snapshot_get_branch in the meantime won't end up
             # with half the branches.
             self._cql_runner.snapshot_add_one(snapshot.id)
 
         return {"snapshot:add": len(snapshots)}
 
     def snapshot_missing(self, snapshots):
         return self._cql_runner.snapshot_missing(snapshots)
 
     def snapshot_get(self, snapshot_id):
         return self.snapshot_get_branches(snapshot_id)
 
     def snapshot_get_by_origin_visit(self, origin, visit):
         try:
-            visit = self._cql_runner.origin_visit_get_one(origin, visit)
+            visit = self.origin_visit_get_by(origin, visit)
         except IndexError:
             return None
 
-        return self.snapshot_get(visit.snapshot)
+        return self.snapshot_get(visit["snapshot"])
 
     def snapshot_get_latest(self, origin, allowed_statuses=None):
         visit = self.origin_visit_get_latest(
             origin, allowed_statuses=allowed_statuses, require_snapshot=True
         )
 
         if visit:
             assert visit["snapshot"]
             if self._cql_runner.snapshot_missing([visit["snapshot"]]):
                 raise StorageArgumentException("Visit references unknown snapshot")
             return self.snapshot_get_branches(visit["snapshot"])
 
     def snapshot_count_branches(self, snapshot_id):
         if self._cql_runner.snapshot_missing([snapshot_id]):
             # Makes sure we don't fetch branches for a snapshot that is
             # being added.
             return None
         rows = list(self._cql_runner.snapshot_count_branches(snapshot_id))
         assert len(rows) == 1
         (nb_none, counts) = rows[0].counts
         counts = dict(counts)
         if nb_none:
             counts[None] = nb_none
         return counts
 
     def snapshot_get_branches(
         self, snapshot_id, branches_from=b"", branches_count=1000, target_types=None
     ):
         if self._cql_runner.snapshot_missing([snapshot_id]):
             # Makes sure we don't fetch branches for a snapshot that is
             # being added.
             return None
 
         branches = []
         while len(branches) < branches_count + 1:
             new_branches = list(
                 self._cql_runner.snapshot_branch_get(
                     snapshot_id, branches_from, branches_count + 1
                 )
             )
 
             if not new_branches:
                 break
 
             branches_from = new_branches[-1].name
 
             new_branches_filtered = new_branches
 
             # Filter by target_type
             if target_types:
                 new_branches_filtered = [
                     branch
                     for branch in new_branches_filtered
                     if branch.target is not None and branch.target_type in target_types
                 ]
 
             branches.extend(new_branches_filtered)
 
             if len(new_branches) < branches_count + 1:
                 break
 
         if len(branches) > branches_count:
             last_branch = branches.pop(-1).name
         else:
             last_branch = None
 
         branches = {
             branch.name: {"target": branch.target, "target_type": branch.target_type,}
             if branch.target
             else None
             for branch in branches
         }
 
         return {
             "id": snapshot_id,
             "branches": branches,
             "next_branch": last_branch,
         }
 
     def snapshot_get_random(self):
         return self._cql_runner.snapshot_get_random().id
 
     def object_find_by_sha1_git(self, ids):
         results = {id_: [] for id_ in ids}
         missing_ids = set(ids)
 
         # Mind the order, revision is the most likely one for a given ID,
         # so we check revisions first.
         queries = [
             ("revision", self._cql_runner.revision_missing),
             ("release", self._cql_runner.release_missing),
             ("content", self._cql_runner.content_missing_by_sha1_git),
             ("directory", self._cql_runner.directory_missing),
         ]
 
         for (object_type, query_fn) in queries:
             found_ids = missing_ids - set(query_fn(missing_ids))
             for sha1_git in found_ids:
                 results[sha1_git].append(
                     {"sha1_git": sha1_git, "type": object_type,}
                 )
                 missing_ids.remove(sha1_git)
 
             if not missing_ids:
                 # We found everything, skipping the next queries.
                 break
 
         return results
 
     def origin_get(self, origins):
         if isinstance(origins, dict):
             # Old API
             return_single = True
             origins = [origins]
         else:
             return_single = False
 
         if any("id" in origin for origin in origins):
             raise StorageArgumentException("Origin ids are not supported.")
 
         results = [self.origin_get_one(origin) for origin in origins]
 
         if return_single:
             assert len(results) == 1
             return results[0]
         else:
             return results
 
     def origin_get_one(self, origin: Dict[str, Any]) -> Optional[Dict[str, Any]]:
         if "id" in origin:
             raise StorageArgumentException("Origin ids are not supported.")
         if "url" not in origin:
             raise StorageArgumentException("Missing origin url")
         rows = self._cql_runner.origin_get_by_url(origin["url"])
 
         rows = list(rows)
         if rows:
             assert len(rows) == 1
             result = rows[0]._asdict()
             return {
                 "url": result["url"],
             }
         else:
             return None
 
     def origin_get_by_sha1(self, sha1s):
         results = []
         for sha1 in sha1s:
             rows = self._cql_runner.origin_get_by_sha1(sha1)
             if rows:
                 results.append({"url": rows.one().url})
             else:
                 results.append(None)
         return results
 
     def origin_list(self, page_token: Optional[str] = None, limit: int = 100) -> dict:
         # Compute what token to begin the listing from
         start_token = TOKEN_BEGIN
         if page_token:
             start_token = int(page_token)
             if not (TOKEN_BEGIN <= start_token <= TOKEN_END):
                 raise StorageArgumentException("Invalid page_token.")
 
         rows = self._cql_runner.origin_list(start_token, limit)
         rows = list(rows)
 
         if len(rows) == limit:
             next_page_token: Optional[str] = str(rows[-1].tok + 1)
         else:
             next_page_token = None
 
         return {
             "origins": [{"url": row.url} for row in rows],
             "next_page_token": next_page_token,
         }
 
     def origin_search(
         self, url_pattern, offset=0, limit=50, regexp=False, with_visit=False
     ):
         # TODO: remove this endpoint, swh-search should be used instead.
         origins = self._cql_runner.origin_iter_all()
         if regexp:
             pat = re.compile(url_pattern)
             origins = [orig for orig in origins if pat.search(orig.url)]
         else:
             origins = [orig for orig in origins if url_pattern in orig.url]
 
         if with_visit:
             origins = [orig for orig in origins if orig.next_visit_id > 1]
 
         return [{"url": orig.url,} for orig in origins[offset : offset + limit]]
 
     def origin_add(self, origins: Iterable[Origin]) -> List[Dict]:
         results = []
         for origin in origins:
             self.origin_add_one(origin)
             results.append(origin.to_dict())
         return results
 
     def origin_add_one(self, origin: Origin) -> str:
         known_origin = self.origin_get_one(origin.to_dict())
 
         if known_origin:
             origin_url = known_origin["url"]
         else:
             self.journal_writer.origin_add_one(origin)
 
             self._cql_runner.origin_add_one(origin)
             origin_url = origin.url
 
         return origin_url
 
     def origin_visit_add(
         self, origin_url: str, date: Union[str, datetime.datetime], type: str
     ) -> OriginVisit:
         if isinstance(date, str):
             # FIXME: Converge on iso8601 at some point
             date = dateutil.parser.parse(date)
         elif not isinstance(date, datetime.datetime):
             raise StorageArgumentException("Date must be a datetime or a string")
 
         if not self.origin_get_one({"url": origin_url}):
             raise StorageArgumentException("Unknown origin %s", origin_url)
 
         visit_id = self._cql_runner.origin_generate_unique_visit_id(origin_url)
-
+        visit_state = "ongoing"
         with convert_validation_exceptions():
             visit = OriginVisit.from_dict(
                 {
                     "origin": origin_url,
                     "date": date,
                     "type": type,
-                    "status": "ongoing",
+                    "status": visit_state,
                     "snapshot": None,
                     "metadata": None,
                     "visit": visit_id,
                 }
             )
 
         self.journal_writer.origin_visit_add(visit)
         self._cql_runner.origin_visit_add_one(visit)
+
+        with convert_validation_exceptions():
+            visit_status = OriginVisitStatus(
+                origin=origin_url,
+                visit=visit_id,
+                date=date,
+                status=visit_state,
+                snapshot=None,
+                metadata=None,
+            )
+        self._origin_visit_status_add(visit_status)
+
         return visit
 
+    def _origin_visit_status_add(self, visit_status: OriginVisitStatus) -> None:
+        """Add an origin visit status"""
+        self._cql_runner.origin_visit_status_add_one(visit_status)
+
     def origin_visit_update(
         self,
         origin: str,
         visit_id: int,
         status: str,
         metadata: Optional[Dict] = None,
         snapshot: Optional[bytes] = None,
         date: Optional[datetime.datetime] = None,
     ):
         origin_url = origin  # TODO: rename the argument
 
         # Get the existing data of the visit
-        row = self._cql_runner.origin_visit_get_one(origin_url, visit_id)
-        if not row:
+        visit_ = self.origin_visit_get_by(origin_url, visit_id)
+        if not visit_:
             raise StorageArgumentException("This origin visit does not exist.")
         with convert_validation_exceptions():
-            visit = OriginVisit.from_dict(self._format_origin_visit_row(row))
+            visit = OriginVisit.from_dict(visit_)
 
         updates: Dict[str, Any] = {"status": status}
-        if metadata:
+        if metadata and metadata != visit.metadata:
             updates["metadata"] = metadata
-        if snapshot:
+        if snapshot and snapshot != visit.snapshot:
             updates["snapshot"] = snapshot
 
         with convert_validation_exceptions():
             visit = attr.evolve(visit, **updates)
 
         self.journal_writer.origin_visit_update(visit)
 
-        self._cql_runner.origin_visit_update(origin_url, visit_id, updates)
+        last_visit_update = self._origin_visit_get_updated(visit.origin, visit.visit)
+        assert last_visit_update is not None
+
+        with convert_validation_exceptions():
+            visit_status = OriginVisitStatus(
+                origin=origin_url,
+                visit=visit_id,
+                date=date or now(),
+                status=status,
+                snapshot=snapshot or last_visit_update["snapshot"],
+                metadata=metadata or last_visit_update["metadata"],
+            )
+        self._origin_visit_status_add(visit_status)
+
+    def _origin_visit_merge(
+        self, visit: Dict[str, Any], visit_status: Dict[str, Any]
+    ) -> Dict[str, Any]:
+        """Merge origin_visit and visit_status together.
+
+        """
+        return OriginVisit.from_dict(
+            {
+                # default to the values in visit
+                **visit,
+                # override with the last update
+                **visit_status,
+                # visit['origin'] is the URL (via a join), while
+                # visit_status['origin'] is only an id.
+                "origin": visit["origin"],
+                # but keep the date of the creation of the origin visit
+                "date": visit["date"],
+            }
+        ).to_dict()
+
+    def _origin_visit_apply_last_status(self, visit: Dict[str, Any]) -> Dict[str, Any]:
+        """Retrieve the latest visit status information for the origin visit.
+        Then merge it with the visit and return it.
+
+        """
+        visit_status = self._cql_runner.origin_visit_status_get_latest(
+            visit["origin"], visit["visit"]
+        )
+        assert visit_status is not None
+        return self._origin_visit_merge(visit, visit_status)
+
+    def _origin_visit_get_updated(self, origin: str, visit_id: int) -> Dict[str, Any]:
+        """Retrieve origin visit and latest origin visit status and merge them
+        into an origin visit.
+
+        """
+        row_visit = self._cql_runner.origin_visit_get_one(origin, visit_id)
+        assert row_visit is not None
+        visit = self._format_origin_visit_row(row_visit)
+        return self._origin_visit_apply_last_status(visit)
 
     def origin_visit_upsert(self, visits: Iterable[OriginVisit]) -> None:
         for visit in visits:
             if visit.visit is None:
                 raise StorageArgumentException(f"Missing visit id for visit {visit}")
 
         self.journal_writer.origin_visit_upsert(visits)
         for visit in visits:
+            assert visit.visit is not None
             self._cql_runner.origin_visit_upsert(visit)
+            with convert_validation_exceptions():
+                visit_status = OriginVisitStatus(
+                    origin=visit.origin,
+                    visit=visit.visit,
+                    date=now(),
+                    status=visit.status,
+                    snapshot=visit.snapshot,
+                    metadata=visit.metadata,
+                )
+            self._origin_visit_status_add(visit_status)
 
     @staticmethod
     def _format_origin_visit_row(visit):
         return {
             **visit._asdict(),
             "origin": visit.origin,
             "date": visit.date.replace(tzinfo=datetime.timezone.utc),
             "metadata": (json.loads(visit.metadata) if visit.metadata else None),
         }
 
     def origin_visit_get(
         self, origin: str, last_visit: Optional[int] = None, limit: Optional[int] = None
     ) -> Iterable[Dict[str, Any]]:
         rows = self._cql_runner.origin_visit_get(origin, last_visit, limit)
-
-        yield from map(self._format_origin_visit_row, rows)
+        for row in rows:
+            visit = self._format_origin_visit_row(row)
+            yield self._origin_visit_apply_last_status(visit)
 
     def origin_visit_find_by_date(
         self, origin: str, visit_date: datetime.datetime
     ) -> Optional[Dict[str, Any]]:
         # Iterator over all the visits of the origin
         # This should be ok for now, as there aren't too many visits
         # per origin.
-        visits = list(self._cql_runner.origin_visit_get_all(origin))
+        rows = list(self._cql_runner.origin_visit_get_all(origin))
 
         def key(visit):
             dt = visit.date.replace(tzinfo=datetime.timezone.utc) - visit_date
             return (abs(dt), -visit.visit)
 
-        if visits:
-            visit = min(visits, key=key)
-            return visit._asdict()
+        if rows:
+            row = min(rows, key=key)
+            visit = self._format_origin_visit_row(row)
+            return self._origin_visit_apply_last_status(visit)
         return None
 
     def origin_visit_get_by(self, origin: str, visit: int) -> Optional[Dict[str, Any]]:
-        visit = self._cql_runner.origin_visit_get_one(origin, visit)
-        if visit:
-            return self._format_origin_visit_row(visit)
+        row = self._cql_runner.origin_visit_get_one(origin, visit)
+        if row:
+            visit_ = self._format_origin_visit_row(row)
+            return self._origin_visit_apply_last_status(visit_)
         return None
 
     def origin_visit_get_latest(
         self,
         origin: str,
         allowed_statuses: Optional[List[str]] = None,
         require_snapshot: bool = False,
     ) -> Optional[Dict[str, Any]]:
-        visit = self._cql_runner.origin_visit_get_latest(
-            origin, allowed_statuses=allowed_statuses, require_snapshot=require_snapshot
-        )
-        if visit:
-            return self._format_origin_visit_row(visit)
-        return None
+        # TODO: Do not fetch all visits
+        rows = self._cql_runner.origin_visit_get_all(origin)
+        latest_visit = None
+        for row in rows:
+            visit = self._format_origin_visit_row(row)
+            updated_visit = self._origin_visit_apply_last_status(visit)
+            if allowed_statuses and updated_visit["status"] not in allowed_statuses:
+                continue
+            if require_snapshot and updated_visit["snapshot"] is None:
+                continue
+
+            # updated_visit is a candidate
+            if latest_visit is not None:
+                if updated_visit["date"] < latest_visit["date"]:
+                    continue
+                if updated_visit["visit"] < latest_visit["visit"]:
+                    continue
+
+            latest_visit = updated_visit
+
+        return latest_visit
 
     def origin_visit_get_random(self, type: str) -> Optional[Dict[str, Any]]:
         back_in_the_day = now() - datetime.timedelta(weeks=12)  # 3 months back
 
         # Random position to start iteration at
         start_token = random.randint(TOKEN_BEGIN, TOKEN_END)
 
         # Iterator over all visits, ordered by token(origins) then visit_id
         rows = self._cql_runner.origin_visit_iter(start_token)
         for row in rows:
             visit = self._format_origin_visit_row(row)
-            if visit["date"] > back_in_the_day and visit["status"] == "full":
-                return visit
+            visit_status = self._origin_visit_apply_last_status(visit)
+            if (
+                visit_status["date"] > back_in_the_day
+                and visit_status["status"] == "full"
+            ):
+                return visit_status
         else:
             return None
 
     def tool_add(self, tools):
         inserted = []
         for tool in tools:
             tool = tool.copy()
             tool_json = tool.copy()
             tool_json["configuration"] = json.dumps(
                 tool["configuration"], sort_keys=True
             ).encode()
             id_ = self._cql_runner.tool_get_one_uuid(**tool_json)
             if not id_:
                 id_ = uuid.uuid1()
                 tool_json["id"] = id_
                 self._cql_runner.tool_by_uuid_add_one(tool_json)
                 self._cql_runner.tool_add_one(tool_json)
             tool["id"] = id_
             inserted.append(tool)
         return inserted
 
     def tool_get(self, tool):
         id_ = self._cql_runner.tool_get_one_uuid(
             tool["name"],
             tool["version"],
             json.dumps(tool["configuration"], sort_keys=True).encode(),
         )
         if id_:
             tool = tool.copy()
             tool["id"] = id_
             return tool
         else:
             return None
 
     def stat_counters(self):
         rows = self._cql_runner.stat_counters()
         keys = (
             "content",
             "directory",
             "origin",
             "origin_visit",
             "release",
             "revision",
             "skipped_content",
             "snapshot",
         )
         stats = {key: 0 for key in keys}
         stats.update({row.object_type: row.count for row in rows})
         return stats
 
     def refresh_stat_counters(self):
         pass
 
     def origin_metadata_add(self, origin_url, ts, provider, tool, metadata):
         # TODO
         raise NotImplementedError("not yet supported for Cassandra")
 
     def origin_metadata_get_by(self, origin_url, provider_type=None):
         # TODO
         raise NotImplementedError("not yet supported for Cassandra")
 
     def metadata_provider_add(
         self, provider_name, provider_type, provider_url, metadata
     ):
         # TODO
         raise NotImplementedError("not yet supported for Cassandra")
 
     def metadata_provider_get(self, provider_id):
         # TODO
         raise NotImplementedError("not yet supported for Cassandra")
 
     def metadata_provider_get_by(self, provider):
         # TODO
         raise NotImplementedError("not yet supported for Cassandra")
 
     def clear_buffers(self, object_types: Optional[Iterable[str]] = None) -> None:
         """Do nothing
 
         """
         return None
 
     def flush(self, object_types: Optional[Iterable[str]] = None) -> Dict:
         return {}