diff --git a/swh/storage/cassandra/storage.py b/swh/storage/cassandra/storage.py --- a/swh/storage/cassandra/storage.py +++ b/swh/storage/cassandra/storage.py @@ -1171,23 +1171,23 @@ def raw_extrinsic_metadata_get( self, type: MetadataTargetType, - id: Union[str, SWHID], + target: Union[str, SWHID], authority: MetadataAuthority, after: Optional[datetime.datetime] = None, page_token: Optional[bytes] = None, limit: int = 1000, ) -> PagedResult[RawExtrinsicMetadata]: if type == MetadataTargetType.ORIGIN: - if isinstance(id, SWHID): + if isinstance(target, SWHID): raise StorageArgumentException( f"raw_extrinsic_metadata_get called with type='origin', " - f"but provided id is an SWHID: {id!r}" + f"but provided target is a SWHID: {target!r}" ) else: - if not isinstance(id, SWHID): + if not isinstance(target, SWHID): raise StorageArgumentException( f"raw_extrinsic_metadata_get called with type!='origin', " - f"but provided id is not an SWHID: {id!r}" + f"but provided target is not a SWHID: {target!r}" ) if page_token is not None: @@ -1199,7 +1199,7 @@ "page_token is inconsistent with the value of 'after'." ) entries = self._cql_runner.raw_extrinsic_metadata_get_after_date_and_fetcher( # noqa - str(id), + str(target), authority.type.value, authority.url, after_date, @@ -1208,11 +1208,11 @@ ) elif after is not None: entries = self._cql_runner.raw_extrinsic_metadata_get_after_date( - str(id), authority.type.value, authority.url, after + str(target), authority.type.value, authority.url, after ) else: entries = self._cql_runner.raw_extrinsic_metadata_get( - str(id), authority.type.value, authority.url + str(target), authority.type.value, authority.url ) if limit: @@ -1222,11 +1222,11 @@ for entry in entries: discovery_date = entry.discovery_date.replace(tzinfo=datetime.timezone.utc) - assert str(id) == entry.target + assert str(target) == entry.target result = RawExtrinsicMetadata( type=MetadataTargetType(entry.type), - target=id, + target=target, authority=MetadataAuthority( type=MetadataAuthorityType(entry.authority_type), url=entry.authority_url, diff --git a/swh/storage/interface.py b/swh/storage/interface.py --- a/swh/storage/interface.py +++ b/swh/storage/interface.py @@ -1100,7 +1100,7 @@ def raw_extrinsic_metadata_get( self, type: MetadataTargetType, - id: Union[str, SWHID], + target: Union[str, SWHID], authority: MetadataAuthority, after: Optional[datetime.datetime] = None, page_token: Optional[bytes] = None, @@ -1110,7 +1110,7 @@ Args: type: one of the values of swh.model.model.MetadataTargetType - id: an URL if type is 'origin', else a core SWHID + target: an URL if type is 'origin', else a core SWHID authority: a dict containing keys `type` and `url`. after: minimum discovery_date for a result to be returned page_token: opaque token, used to get the next page of results diff --git a/swh/storage/postgresql/storage.py b/swh/storage/postgresql/storage.py --- a/swh/storage/postgresql/storage.py +++ b/swh/storage/postgresql/storage.py @@ -1274,7 +1274,7 @@ def raw_extrinsic_metadata_get( self, type: MetadataTargetType, - id: Union[str, SWHID], + target: Union[str, SWHID], authority: MetadataAuthority, after: Optional[datetime.datetime] = None, page_token: Optional[bytes] = None, @@ -1283,16 +1283,16 @@ cur=None, ) -> PagedResult[RawExtrinsicMetadata]: if type == MetadataTargetType.ORIGIN: - if isinstance(id, SWHID): + if isinstance(target, SWHID): raise StorageArgumentException( f"raw_extrinsic_metadata_get called with type='origin', " - f"but provided id is an SWHID: {id!r}" + f"but provided target is a SWHID: {target!r}" ) else: - if not isinstance(id, SWHID): + if not isinstance(target, SWHID): raise StorageArgumentException( f"raw_extrinsic_metadata_get called with type!='origin', " - f"but provided id is not an SWHID: {id!r}" + f"but provided target is not a SWHID: {target!r}" ) if page_token: @@ -1310,12 +1310,12 @@ return PagedResult(next_page_token=None, results=[],) rows = db.raw_extrinsic_metadata_get( - type, str(id), authority_id, after_time, after_fetcher, limit + 1, cur, + type, str(target), authority_id, after_time, after_fetcher, limit + 1, cur, ) rows = [dict(zip(db.raw_extrinsic_metadata_get_cols, row)) for row in rows] results = [] for row in rows: - assert str(id) == row["raw_extrinsic_metadata.target"] + assert str(target) == row["raw_extrinsic_metadata.target"] results.append(converters.db_to_raw_extrinsic_metadata(row)) if len(results) > limit: