git.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Stefan Beller <sbeller@google.com>
To: ronniesahlberg@gmail.com, gitster@pobox.com,
	mhagger@alum.mit.edu, jrnieder@gmail.com, git@vger.kernel.org
Cc: Stefan Beller <sbeller@google.com>
Subject: [PATCH 0/4] Using transactions for the reflog
Date: Wed, 26 Nov 2014 21:34:41 -0800	[thread overview]
Message-ID: <1417066485-24921-1-git-send-email-sbeller@google.com> (raw)
In-Reply-To: <20141120181701.GB15945@google.com>

This is the core part of the refs-transactions-reflog series[1],
which was in discussion for a bit already.

The idea is to have the reflog being part of the transactions, which
the refs are already using, so the we're moving towards a database
like API in the long run. This makes git easier to maintain as well 
as opening the possibility to replace the backend with a real database.

The first patch is essentially just some sed magic with reformatting
the code, so the naming convention fits better, because the transactions 
will handle both the refs as well as the reflog after this series. 

The second patch introduces a new enum field to indicate, if we deal with
a ref or with a reflog entry in the transaction. 

The meat and most of the lines of code are found in the 3rd patch.
We introduce a rather lengthy function transaction_update_reflog,
which prepares all the reflog related changes.
The transaction_commit function will then also put the reflog changes
in place in a "best effort" atomic way.
Unlike in previous versions, we don't keep all the reflog in memory,
but use a temporary file in $GIT_DIR instead and the update can be done
using an atomic rename(...).

One of my todos is to make the error handling in the transaction_update_reflog
function a bit less repetitive either during the discussion of this series
or as a follow up.

The last patch in this series makes use of the transaction system in the 
user facing code, when running "git reflog expire" for example. 

I'd appreciate any comments. 

Apart from sending feedback on the list, you can find this series 
at github[2] embedded into the longer version of the series.
In that series at github there are a few more patches[3], which are already
reviewed and residing in Junios repository or considered trivial cleanups.

Thanks,
Stefan

[1] http://comments.gmane.org/gmane.comp.version-control.git/259712
[2] https://github.com/stefanbeller/git/commits/todo_sb13_ref-transactions-reflog-as-file
[3] The first 2 commits on top of Git 2.2-rc3 are origin/sb/ref-transaction-unify-to-update, 
    the third is in origin/sb/log-ref-write-fd, then comes this series in 4 patches. 
    The remaining latest 4 patches are clean up patches, mainly removing parts from the refs API
    which are no longer in use. I do not include these in this patch series, as I don't want to
    scare people away with a huge bulk of messages.

Ronnie Sahlberg (4):
  refs.c: rename the transaction functions
  refs.c: add a new update_type field to ref_update
  refs.c: add a transaction function to append a reflog entry
  reflog.c: use a reflog transaction when writing during expire

 branch.c               |  13 +--
 builtin/commit.c       |  10 +-
 builtin/fetch.c        |  12 +--
 builtin/receive-pack.c |  13 ++-
 builtin/reflog.c       |  85 ++++++++---------
 builtin/replace.c      |  10 +-
 builtin/tag.c          |  10 +-
 builtin/update-ref.c   |  26 ++---
 fast-import.c          |  22 ++---
 refs.c                 | 251 ++++++++++++++++++++++++++++++++++++++++---------
 refs.h                 |  57 +++++++----
 sequencer.c            |  12 +--
 walker.c               |  10 +-
 13 files changed, 352 insertions(+), 179 deletions(-)

-- 
2.2.0.rc3

  reply	other threads:[~2014-11-27  5:34 UTC|newest]

Thread overview: 31+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2014-11-18  1:35 [PATCH v3 00/14] ref-transactions-reflog Stefan Beller
2014-11-18  1:35 ` [PATCH v3 01/14] refs.c: make ref_transaction_create a wrapper for ref_transaction_update Stefan Beller
2014-11-18  1:35 ` [PATCH v3 02/14] refs.c: make ref_transaction_delete " Stefan Beller
2014-11-18  1:35 ` [PATCH v3 03/14] refs.c: rename the transaction functions Stefan Beller
2014-11-18  1:35 ` [PATCH v3 04/14] refs.c: add a function to append a reflog entry to a fd Stefan Beller
2014-11-18  1:35 ` [PATCH v3 05/14] refs.c: add a new update_type field to ref_update Stefan Beller
2014-11-18  1:35 ` [PATCH v3 06/14] refs.c: add a transaction function to append a reflog entry Stefan Beller
2014-11-18  1:35 ` [PATCH v3 07/14] refs.c: add a flag to allow reflog updates to truncate the log Stefan Beller
2014-11-18  1:35 ` [PATCH v3 08/14] refs.c: only write reflog update if msg is non-NULL Stefan Beller
2014-11-18  1:35 ` [PATCH v3 09/14] refs.c: allow multiple reflog updates during a single transaction Stefan Beller
2014-11-18  1:35 ` [PATCH v3 10/14] reflog.c: use a reflog transaction when writing during expire Stefan Beller
2014-11-18  1:35 ` [PATCH v3 11/14] refs.c: rename log_ref_setup to create_reflog Stefan Beller
2014-11-18  1:35 ` [PATCH v3 12/14] refs.c: Remove unlock_ref/close_ref/commit_ref from the refs api Stefan Beller
2014-11-18  1:35 ` [PATCH v3 13/14] refs.c: remove lock_any_ref_for_update Stefan Beller
2014-11-18  1:35 ` [PATCH v3 14/14] refs.c: allow deleting refs with a broken sha1 Stefan Beller
2014-11-18 11:26 ` [PATCH v3 00/14] ref-transactions-reflog Michael Haggerty
2014-11-18 18:36   ` Ronnie Sahlberg
2014-11-18 19:46     ` Michael Haggerty
2014-11-18 20:30       ` Junio C Hamano
2014-11-18 21:16         ` Michael Haggerty
2014-11-18 21:28           ` Junio C Hamano
2014-11-19 23:22             ` Stefan Beller
2014-11-20  3:24               ` Jonathan Nieder
2014-11-20 17:34                 ` Junio C Hamano
2014-11-20 10:56               ` Michael Haggerty
2014-11-20 18:17                 ` Jonathan Nieder
2014-11-27  5:34                   ` Stefan Beller [this message]
2014-11-27  5:34                     ` [PATCH 1/4] refs.c: rename the transaction functions Stefan Beller
2014-11-27  5:34                     ` [PATCH 2/4] refs.c: add a new update_type field to ref_update Stefan Beller
2014-11-27  5:34                     ` [PATCH 3/4] refs.c: add a transaction function to append a reflog entry Stefan Beller
2014-11-27  5:34                     ` [PATCH 4/4] reflog.c: use a reflog transaction when writing during expire Stefan Beller

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1417066485-24921-1-git-send-email-sbeller@google.com \
    --to=sbeller@google.com \
    --cc=git@vger.kernel.org \
    --cc=gitster@pobox.com \
    --cc=jrnieder@gmail.com \
    --cc=mhagger@alum.mit.edu \
    --cc=ronniesahlberg@gmail.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).