From: Philip Withnall <withnall@endlessm.com>
Date: Tue, 26 Sep 2017 14:17:47 +0000 (+0100)
Subject: lib/repo-pull: Use resolve() instead of list() in fetch_ref_contents()
X-Git-Tag: archive/raspbian/2022.1-3+rpi1~1^2~4^2~31^2~25
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=2f9f7222a411906a2e508e6aecf5a7ae30a4638c;p=ostree.git

lib/repo-pull: Use resolve() instead of list() in fetch_ref_contents()

This is more efficient in the non-collection case; in the collection
case, the implementation of ostree_repo_resolve_collection_ref() needs
to be rewritten to improve efficiency.

Signed-off-by: Philip Withnall <withnall@endlessm.com>

Closes: #1182
Approved by: cgwalters
---

diff --git a/src/libostree/ostree-repo-pull.c b/src/libostree/ostree-repo-pull.c
index 4e6031d6..4aff9e09 100644
--- a/src/libostree/ostree-repo-pull.c
+++ b/src/libostree/ostree-repo-pull.c
@@ -839,26 +839,22 @@ fetch_ref_contents (OtPullData                 *pull_data,
   if (pull_data->remote_repo_local != NULL && ref->collection_id != NULL)
     {
 #ifdef OSTREE_ENABLE_EXPERIMENTAL_API
-      g_autoptr(GHashTable) refs = NULL;  /* (element-type OstreeCollectionRef utf8) */
-      if (!ostree_repo_list_collection_refs (pull_data->remote_repo_local,
-                                             ref->collection_id, &refs,
-                                             OSTREE_REPO_LIST_REFS_EXT_NONE,
-                                             cancellable, error))
+      if (!ostree_repo_resolve_collection_ref (pull_data->remote_repo_local,
+                                               ref, TRUE  /* ignore enoent */,
+                                               OSTREE_REPO_RESOLVE_REV_EXT_NONE,
+                                               &ret_contents, cancellable, error))
         return FALSE;
-
-      ret_contents = g_strdup (g_hash_table_lookup (refs, ref));
 #else  /* if !OSTREE_ENABLE_EXPERIMENTAL_API */
       g_assert_not_reached ();
 #endif  /* !OSTREE_ENABLE_EXPERIMENTAL_API */
     }
   else if (pull_data->remote_repo_local != NULL)
     {
-      g_autoptr(GHashTable) refs = NULL;  /* (element-type utf8 utf8) */
-      if (!ostree_repo_list_refs (pull_data->remote_repo_local, NULL,
-                                  &refs, cancellable, error))
+      if (!ostree_repo_resolve_rev_ext (pull_data->remote_repo_local,
+                                        ref->ref_name, TRUE  /* ignore enoent */,
+                                        OSTREE_REPO_RESOLVE_REV_EXT_NONE,
+                                        &ret_contents, error))
         return FALSE;
-
-      ret_contents = g_strdup (g_hash_table_lookup (refs, ref->ref_name));
     }
   else
     {
@@ -877,9 +873,11 @@ fetch_ref_contents (OtPullData                 *pull_data,
     }
 
   /* Validate and return. */
-  g_strchomp (ret_contents);
+  if (ret_contents != NULL)
+    g_strchomp (ret_contents);
 
-  if (!ostree_validate_checksum_string (ret_contents, error))
+  if (ret_contents == NULL ||
+      !ostree_validate_checksum_string (ret_contents, error))
     return glnx_prefix_error (error, "Fetching checksum for ref (%s, %s)",
                               ref->collection_id ? ref->collection_id : "(empty)",
                               ref->ref_name);