Update for swh-objstorage >= 2.0.0

* objstorage.add() now requires an id as second argument
* objstorage.get() now allows a dict of hashes instead of just
  sha1, and a future version will require this dict

swh/dataset/exporters/orc.py

@@ -375,11 +375,10 @@ class ORCExporter(ExporterDispatch):
         content_writer = self.get_writer_for("content")
         data = None
         if self.with_data:
-            obj_id = content[ID_HASH_ALGO]
             try:
-                data = self.objstorage.get(obj_id)
+                data = self.objstorage.get(content)
             except ObjNotFoundError:
-                logger.warning(f"Missing object {hash_to_hex(obj_id)}")
+                logger.warning("Missing object %s", hash_to_hex(content[ID_HASH_ALGO]))
 
         content_writer.write(
             (

swh/dataset/test/test_orc.py

@@ -327,7 +327,7 @@ def test_export_content_with_data(monkeypatch, tmpdir):
     obj_type = "content"
     objstorage = get_objstorage("memory")
     for content in TEST_OBJECTS[obj_type]:
-        objstorage.add(content=content.data, obj_id=content.sha1)
+        objstorage.add(content=content.data, obj_id=content.hashes())
 
     def get_objstorage_mock(**kw):
         if kw.get("cls") == "mock":