git/list[1] front-page[2] threads[3] people[4] search[5] about
 

Re: [PATCH 2/4] fast-export: improve speed by skipping blobs

From
Junio C Hamano <gitster@pobox.com>
Date
May 3, 2013, 21:51 UTC
Message-ID
<7vhaijybnr.fsf@alter.siamese.dyndns.org>
In-Reply-To
<1367555502-4706-3-git-send-email-felipe.contreras@gmail.com>
Felipe Contreras <felipe.contreras@gmail.com> writes:
Show 9 quoted lines
> We don't care about blobs, or any object other than commits, but in
> order to find the type of object, we are parsing the whole thing, which
> is slow, specially in big repositories with lots of big files.
>
> There's no need for that, we can query the object information with
> sha1_object_info();
>
> Before this, loading the objects of a fresh emacs import, with 260598
> blobs took 14 minutes, after this patch, it takes 3 seconds.
OK.
Show 6 quoted lines
>
> This is the way fast-import does it. Also die if the object is not
> found (like fast-import).
>
> Signed-off-by: Felipe Contreras <felipe.contreras@gmail.com>
> ---
Show 41 quoted lines
>  builtin/fast-export.c | 15 +++++++++------
>  1 file changed, 9 insertions(+), 6 deletions(-)
>
> diff --git a/builtin/fast-export.c b/builtin/fast-export.c
> index a4dee14..a5b8da8 100644
> --- a/builtin/fast-export.c
> +++ b/builtin/fast-export.c
> @@ -613,6 +613,7 @@ static void import_marks(char *input_file)
>  		char *line_end, *mark_end;
>  		unsigned char sha1[20];
>  		struct object *object;
> +		enum object_type type;
>  
>  		line_end = strchr(line, '\n');
>  		if (line[0] != ':' || !line_end)
> @@ -627,17 +628,19 @@ static void import_marks(char *input_file)
>  		if (last_idnum < mark)
>  			last_idnum = mark;
>  
> -		object = parse_object(sha1);
> -		if (!object)
> +		type = sha1_object_info(sha1, NULL);
> +		if (type < 0)
> +			die("object not found: %s", sha1_to_hex(sha1));
> +
> +		if (type != OBJ_COMMIT)
> +			/* only commits */
>  			continue;
>  
> +		object = parse_object(sha1);
> +
>  		if (object->flags & SHOWN)
>  			error("Object %s already has a mark", sha1_to_hex(sha1));
>  
> -		if (object->type != OBJ_COMMIT)
> -			/* only commits */
> -			continue;
> -
>  		mark_object(object, mark);
>  
>  		object->flags |= SHOWN;
Previous: Felipe ContrerasNext: Felipe Contreras
Message 5 of 38 in “fast-export: speed improvements”
  1. 0/4 fast-export: speed improvementsFelipe Contreras, May 3, 2013
  2. 1/4 fast-{import,export}: use get_sha1_hex() directlyFelipe Contreras, May 3, 2013
  3. Junio C HamanoMay 3, 2013
  4. 2/4 fast-export: improve speed by skipping blobsFelipe Contreras, May 3, 2013
  5. Junio C HamanoMay 3, 2013
  6. 3/4 fast-export: don't parse all the commitsFelipe Contreras, May 3, 2013
  7. Junio C HamanoMay 3, 2013
  8. Felipe ContrerasMay 4, 2013
  9. Junio C HamanoMay 4, 2013
  10. 4/4 fast-import: only store commit objectsFelipe Contreras, May 3, 2013
  11. Thomas RastMay 3, 2013
  12. Felipe ContrerasMay 3, 2013
  13. Michael HaggertyMay 6, 2013
  14. Thomas RastMay 6, 2013
  15. Michael HaggertyMay 6, 2013
  16. Junio C HamanoMay 6, 2013
  17. Felipe ContrerasMay 6, 2013
  18. Felipe ContrerasMay 6, 2013
  19. Michael HaggertyMay 7, 2013
  20. Johannes SchindelinMay 7, 2013
  21. Felipe ContrerasMay 7, 2013
  22. Michael HaggertyMay 7, 2013
  23. Felipe ContrerasMay 7, 2013
  24. Felipe ContrerasMay 6, 2013
  25. Michael HaggertyMay 7, 2013
  26. Johannes SchindelinMay 7, 2013
  27. Felipe ContrerasMay 7, 2013
  28. Felipe ContrerasMay 7, 2013
  29. Michael HaggertyMay 7, 2013
  30. Felipe ContrerasMay 7, 2013
  31. Junio C HamanoMay 7, 2013
  32. Michael HaggertyMay 7, 2013
  33. Johannes SchindelinMay 6, 2013
  34. Felipe ContrerasMay 6, 2013
  35. Junio C HamanoMay 3, 2013
  36. Felipe ContrerasMay 3, 2013
  37. Junio C HamanoMay 3, 2013
  38. Felipe ContrerasMay 4, 2013

Read the whole thread, see it on lore, or plain text.

$ cat FOOTERMessages come from the public archive at lore.kernel.org/git, fetched every hour. The front page is chosen and written each morning by an AI editor and can be wrong; the threads themselves are the record. About and API. For agents: an MCP server at https://gitlist.dev/mcp, and any thread, story or person page as Markdown by adding .md to its URL (or sending Accept: text/markdown). Details in /llms.txt.