Address review comments

Signed-off-by: Tushar Goel <tushar.goel.dav@gmail.com>

Author: TG1999

scanpipe/pipes/d2d.py

@@ -1870,14 +1870,41 @@ def map_elfs(project, logger=None):
         None
 
     """
-    map_paths(
-        project=project,
-        file_type="elfs",
-        collect_paths_func=get_elf_file_dwarf_paths,
-        map_types=["dwarf_compiled_paths", "dwarf_included_paths"],
-        logger=logger,
+    from_resources = project.codebaseresources.files().from_codebase()
+    to_resources = (
+        project.codebaseresources.files().to_codebase().has_no_relation().elfs()
+    )
+    for resource in to_resources:
+        try:
+            paths = get_elf_file_dwarf_paths(resource.location_path)
+            resource.update_extra_data(paths)
+        except Exception as e:
+            logger(f"Can not parse {resource.location_path!r} {e!r}")
+
+    if logger:
+        logger(
+            f"Mapping {to_resources.count():,d} to/ resources using paths "
+            f"with {from_resources.count():,d} from/ resources."
+        )
+
+    from_resources_index = pathmap.build_index(
+        from_resources.values_list("id", "path"), with_subpaths=True
     )
 
+    if logger:
+        logger("Done building from/ resources index.")
+
+    resource_iterator = to_resources.iterator(chunk_size=2000)
+    progress = LoopProgress(to_resources.count(), logger)
+    for to_resource in progress.iter(resource_iterator):
+        map_paths_resource(
+            to_resource,
+            from_resources,
+            from_resources_index,
+            map_types=["dwarf_compiled_paths", "dwarf_included_paths"],
+            logger=logger,
+        )
+
 
 def get_elf_file_dwarf_paths(location):
     """
@@ -1929,10 +1956,40 @@ def map_go_paths(project, logger=None):
         None
 
     """
-    map_paths(
-        project=project,
-        file_type="executable_binaries",
-        collect_paths_func=get_go_file_paths,
-        map_types=["go_file_paths"],
-        logger=logger,
+    from_resources = project.codebaseresources.files().from_codebase()
+    to_resources = (
+        project.codebaseresources.files()
+        .to_codebase()
+        .has_no_relation()
+        .executable_binaries()
     )
+    for resource in to_resources:
+        try:
+            paths = get_go_file_paths(resource.location_path)
+            resource.update_extra_data(paths)
+        except Exception as e:
+            logger(f"Can not parse {resource.location_path!r} {e!r}")
+
+    if logger:
+        logger(
+            f"Mapping {to_resources.count():,d} to/ resources using paths "
+            f"with {from_resources.count():,d} from/ resources."
+        )
+
+    from_resources_index = pathmap.build_index(
+        from_resources.values_list("id", "path"), with_subpaths=True
+    )
+
+    if logger:
+        logger("Done building from/ resources index.")
+
+    resource_iterator = to_resources.iterator(chunk_size=2000)
+    progress = LoopProgress(to_resources.count(), logger)
+    for to_resource in progress.iter(resource_iterator):
+        map_paths_resource(
+            to_resource,
+            from_resources,
+            from_resources_index,
+            map_types=["go_file_paths"],
+            logger=logger,
+        )

scanpipe/tests/data/d2d-go/to-data.zip

@@ -1484,7 +1484,6 @@ def test_scanpipe_pipes_d2d_map_elfs(self):
             recurse=True,
         )
         pipes.collect_and_create_codebase_resources(self.project1)
-        print(self.project1.codebaseresources.files().from_codebase())
         buffer = io.StringIO()
         d2d.map_elfs(project=self.project1, logger=buffer.write)
         self.assertEqual(