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

Re: [PATCH v2 38/43] refs: make some files backend functions public

From
Michael Haggerty <mhagger@alum.mit.edu>
Date
Oct 7, 2015, 22:47 UTC
Message-ID
<5615A0F7.9090401@alum.mit.edu>
In-Reply-To
<1444251311.8836.22.camel@twopensource.com>
On 10/07/2015 10:55 PM, David Turner wrote:
Show 26 quoted lines
> On Wed, 2015-10-07 at 18:00 +0200, Michael Haggerty wrote:
>>
>> That's a really good point.
>>
>> I hate to break it to you, but the handling of symrefs in Git is already
>> a mess. HEAD is the only symref that I would really trust to work
>> correctly all the time. So I think that changes needn't be judged on
>> whether they handle symrefs perfectly. They should just not break them
>> in any dramatic new ways.
>>
>> So, you pointed out the problem that HEAD (a per-worktree reference) can
>> be a symref that points at a shared reference. In fact, I think when
>> HEAD is symbolic it is only allowed to point at a branch under
>> refs/heads, so this particular problem is pretty well-constrained.
>>
>> Are there other cases of cross-backend writes? I suppose there could be
>> a symref elsewhere among the per-worktree references that points at a
>> shared reference. But I can't think of any cases where this is done by
>> standard Git. Not that it is forbidden; I just don't think it is done by
>> any of the standard tools.
> 
> Another case would be an update-ref command that updates both
> refs/bisect/something and refs/heads/something.  
> 
> I don't think git ever does this by default, but anyone can issue a
> weird update-ref command if they feel like it.

Oh I was mostly worried about symbolic refs reaching across the divide. If a transaction includes *non-symbolic* refs from both sides I think all you have to do is sort them into two piles and do one transaction for each pile. You would probably have to sacrifice atomicity across the dividing line, but it's a bit unfair to expect atomic updates that span two possibly completely different backends.

OK, you don't know for 100% sure that a reference is a symref before you have locked it. But we've agreed that cross-repo symref support doesn't have to be perfect (except for HEAD).

Show 14 quoted lines
>> Or there could be a symref among the shared references that points at a
>> per-worktree reference. But AFAIK the only other symrefs that are in
>> common use are the refs/remotes/*/HEAD symrefs, and they always point at
>> references within the same (shared) namespace.
>>
>> If everything that I've said is correct, then my opinion is that it
>> would be perfectly adequate if your code would handle the specific case
>> of HEAD (by hook or by crook), and if there are any other cross-backend
>> symrefs, just die with a message stating that such usage is unsupported.
>> Junio, do you think that would be acceptable?
> 
> Hm.  I don't think it's significantly  easier to handle just HEAD than
> it would be to handle all cases.  But I'll see what happens as I write
> the code.

I think the main simplification is having license not to worry about shared symrefs that could theoretically point at per-worktree references. Though I guess that's nonsensical anyway, so maybe it was already obvious that you don't have to handle it.

Show 53 quoted lines
>>> The simplest solution would be for the lmdb code to simply acquire
>>> locks, and write to lock files, and then commit those lock files just
>>> before the db transaction commits. Then the lmdb code would handle all
>>> of the orchestration without the files backend having to be rewritten to
>>> handle this case.
>>
>> Wouldn't that essentially be re-implementing the files backend? I must
>> be missing something.
> 
> There would be some amount of reimplementation, yes.  But if we assume
> that the number of per-worktree refs is relatively small, we could make
> some simplification.  But actually, see below.
> 
>>> [...]
>>
>> BTW I just realized that if one backend should delegate to another, then
>> the primary backend should be the per-worktree backend and it should
>> delegate to the common backend. I think I described things the other way
>> around in my earlier message. This makes more sense because it is
>> acceptable for per-worktree references to refer to common references but
>> not vice versa.
> 
> I think I might have a good way to deal with this:
> 
> If we're going to switch the lmdb transaction code over to accumulate
> updates and then do them as one batch, then probably all other
> backends will work the same way.  So maybe there is no need for all of
> these backend functions:
> 
> 	ref_transaction_begin_fn *transaction_begin;
> 	ref_transaction_update_fn *transaction_update;
> 	ref_transaction_create_fn *transaction_create;
> 	ref_transaction_delete_fn *transaction_delete;
> 	ref_transaction_verify_fn *transaction_verify;
> 
> Instead, the generic refs code will accumulate updates in a struct
> ref_update.  Instead of a lock, the ref_update struct will have a void
> pointer that backends can use for per-update data (such as the lock).
> The generic code can also handle rejecting duplicate ref updates.
> 
> The per-backend transaction_commit method will just take a struct
> ref_transaction (that is, what the current patchset calls a
> files_ref_transaction) -- basically, a list of ref_updates -- and
> attempt to apply it.
> 
> While we're doing this, the generic ref code can detect an update to
> HEAD, and replace it with an update to whatever HEAD points to (if HEAD
> is a symref).  Then it can call files_log_ref_write to write to HEAD's
> reflog, if the main transaction commits successfully.  If HEAD is not a
> symref, the generic code can just move the HEAD update over to the files
> backend.
> 
> Does this make sense?
That makes a lot of sense. I like it.
Michael
-- 
Michael Haggerty
mhagger@alum.mit.edu
Previous: David TurnerNext: David Turner
Message 66 of 90 in “lmdb ref backend”
  1. 00/43 lmdb ref backendDavid Turner, Sep 28, 2015
  2. 01/43 refs.c: create a public version of verify_refname_availableDavid Turner, Sep 28, 2015
  3. Torsten BögershausenOct 3, 2015
  4. David TurnerOct 3, 2015
  5. Torsten BögershausenOct 3, 2015
  6. Torsten BögershausenOct 4, 2015
  7. Michael HaggertyOct 5, 2015
  8. David TurnerOct 5, 2015
  9. 02/43 refs: make repack_without_refs and is_branch publicDavid Turner, Sep 28, 2015
  10. Michael HaggertyOct 5, 2015
  11. David TurnerOct 5, 2015
  12. 03/43 refs-be-files.c: rename refs to refs-be-filesDavid Turner, Sep 28, 2015
  13. 04/43 refs.c: add a new refs.c file to hold all common refs codeDavid Turner, Sep 28, 2015
  14. 05/43 refs.c: move update_ref to refs.cDavid Turner, Sep 28, 2015
  15. 06/43 refs.c: move delete_ref and delete_refs to the common codeDavid Turner, Sep 28, 2015
  16. 07/43 refs.c: move read_ref_at to the common refs fileDavid Turner, Sep 28, 2015
  17. 08/43 refs.c: move the hidden refs functions to the common codeDavid Turner, Sep 28, 2015
  18. 09/43 refs.c: move dwim and friend functions to the common refs codeDavid Turner, Sep 28, 2015
  19. 10/43 refs.c: move warn_if_dangling_symref* to the common codeDavid Turner, Sep 28, 2015
  20. 11/43 refs.c: move read_ref, read_ref_full and ref_exists to the common codeDavid Turner, Sep 28, 2015
  21. 12/43 refs.c: move resolve_refdup to commonDavid Turner, Sep 28, 2015
  22. 13/43 refs.c: move check_refname_format to the common codeDavid Turner, Sep 28, 2015
  23. 14/43 refs.c: move is_branch to the common codeDavid Turner, Sep 28, 2015
  24. 15/43 refs.c: move prettify_refname to the common codeDavid Turner, Sep 28, 2015
  25. 16/43 refs.c: move ref iterators to the common codeDavid Turner, Sep 28, 2015
  26. 17/43 refs.c: move head_ref_namespaced to the common codeDavid Turner, Sep 28, 2015
  27. 18/43 refs-be-files.c: add a backend method structure with transaction functionsDavid Turner, Sep 28, 2015
  28. Michael HaggertyOct 5, 2015
  29. Junio C HamanoOct 5, 2015
  30. David TurnerOct 6, 2015
  31. 19/43 refs-be-files.c: add methods for misc ref operationsDavid Turner, Sep 28, 2015
  32. 20/43 refs-be-files.c: add methods for the ref iteratorsDavid Turner, Sep 28, 2015
  33. 21/43 refs-be-files.c: add method for for_each_reftype_...David Turner, Sep 28, 2015
  34. 22/43 refs-be-files.c: add do_for_each_per_worktree_refDavid Turner, Sep 28, 2015
  35. Michael HaggertyOct 5, 2015
  36. David TurnerOct 5, 2015
  37. 23/43 refs.c: move refname_is_safe to the common codeDavid Turner, Sep 28, 2015
  38. 24/43 refs.h: document make refname_is_safe and add it to headerDavid Turner, Sep 28, 2015
  39. 25/43 refs.c: move copy_msg to the common codeDavid Turner, Sep 28, 2015
  40. 26/43 refs.c: move peel_object to the common codeDavid Turner, Sep 28, 2015
  41. 27/43 refs.c: move should_autocreate_reflog to common codeDavid Turner, Sep 28, 2015
  42. Junio C HamanoOct 2, 2015
  43. 28/43 refs.c: add ref backend init functionDavid Turner, Sep 28, 2015
  44. Michael HaggertyOct 5, 2015
  45. David TurnerOct 5, 2015
  46. 29/43 refs.c: add methods for reflogDavid Turner, Sep 28, 2015
  47. 30/43 refs-be-files.c: add method to expire reflogsDavid Turner, Sep 28, 2015
  48. Michael HaggertyOct 5, 2015
  49. 31/43 refs.c: add method for initial ref transaction commitDavid Turner, Sep 28, 2015
  50. 32/43 initdb: move safe_create_dir into common codeDavid Turner, Sep 28, 2015
  51. 33/43 refs.c: add method for initializing refs dbDavid Turner, Sep 28, 2015
  52. 34/43 refs.c: make struct ref_transaction genericDavid Turner, Sep 28, 2015
  53. Michael BlumeOct 6, 2015
  54. David TurnerOct 6, 2015
  55. 35/43 refs-be-files.c: add method to rename refsDavid Turner, Sep 28, 2015
  56. 36/43 run-command: track total number of commands runDavid Turner, Sep 28, 2015
  57. 37/43 refs: move some defines from refs-be-files.c to refs.hDavid Turner, Sep 28, 2015
  58. Michael HaggertyOct 5, 2015
  59. 38/43 refs: make some files backend functions publicDavid Turner, Sep 28, 2015
  60. Michael HaggertyOct 5, 2015
  61. David TurnerOct 6, 2015
  62. David TurnerOct 7, 2015
  63. Michael HaggertyOct 7, 2015
  64. Junio C HamanoOct 7, 2015
  65. David TurnerOct 7, 2015
  66. Michael HaggertyOct 7, 2015
  67. 39/43 refs: break out a ref conflict checkDavid Turner, Sep 28, 2015
  68. Michael HaggertyOct 5, 2015
  69. David TurnerOct 6, 2015
  70. 40/43 refs: allow ref backend to be set for cloneDavid Turner, Sep 28, 2015
  71. Michael HaggertyOct 5, 2015
  72. David TurnerOct 6, 2015
  73. Jeff KingOct 6, 2015
  74. David TurnerOct 6, 2015
  75. Carlos Martín NietoOct 12, 2015
  76. Michael HaggertyOct 5, 2015
  77. David TurnerOct 6, 2015
  78. 41/43 refs: add register_refs_backendDavid Turner, Sep 28, 2015
  79. 42/43 refs: add LMDB refs backendDavid Turner, Sep 28, 2015
  80. Junio C HamanoOct 2, 2015
  81. Michael HaggertyOct 5, 2015
  82. David TurnerOct 7, 2015
  83. Michael HaggertyOct 7, 2015
  84. Junio C HamanoOct 7, 2015
  85. David TurnerOct 7, 2015
  86. Michael HaggertyOct 7, 2015
  87. 43/43 refs: tests for db backendDavid Turner, Sep 28, 2015
  88. Dennis KaarsemakerOct 3, 2015
  89. Junio C HamanoOct 5, 2015
  90. David TurnerOct 6, 2015

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.