Skip to content

drop non-object_id hashing

Jeff King git 1 version In review

Get series with b4
b4 am [email protected]

Versions newest first

  1. v1 Latest17 patches 11 repliesIn review

Patches in v1 No applies recorded yet

#Subject and filesSizeRepliesApplied
1/17describe: fix accidental oid/hash type-punningbuiltin/describe.c+1 -12 replies
2/17upload-pack: rename a "sha1" variable to "oid"upload-pack.c+3 -30 replies
3/17pack-bitmap-write: convert some helpers to use object_idpack-bitmap-write.c+9 -90 replies
4/17pack-objects: convert packlist_find() to use object_idbuiltin/pack-objects.c pack-bitmap-write.c pack-bitmap.c +2 more+17 -160 replies
5/17pack-objects: convert locate_object_entry_hash() to object_idpack-objects.c+5 -50 replies
6/17object: convert lookup_unknown_object() to use object_idbuiltin/fsck.c builtin/pack-objects.c fsck.c +7 more+14 -140 replies
7/17object: convert lookup_object() to use object_idblob.c builtin/fast-export.c builtin/fsck.c +13 more+30 -310 replies
8/17object: convert internal hash_obj() to object_idobject.c+4 -40 replies
9/17object: convert create_object() to use object_idblob.c commit-graph.c commit.c +4 more+9 -132 replies
10/17khash: drop broken oid_map typedefkhash.h pack-bitmap.c+1 -30 replies
11/17khash: rename kh_oid_t to kh_oid_setkhash.h oidset.c oidset.h+9 -90 replies
12/17delta-islands: convert island_marks khash to use oidsdelta-islands.c+11 -112 replies
13/17pack-bitmap: convert khash_sha1 maps into kh_oid_mappack-bitmap-write.c pack-bitmap.c pack-bitmap.h+12 -120 replies
14/17khash: drop sha1-specific map typeskhash.h+0 -80 replies
15/17khash: rename oid helper functionskhash.h+5 -54 replies
16/17hash.h: move object_id definition from cache.hcache.h hash.h+24 -241 reply
17/17hashmap: convert sha1hash() to oidhash()builtin/describe.c decorate.c diffcore-rename.c +5 more+13 -110 replies

Reviews trailers per patch

No Reviewed-by, Acked-by or Tested-by trailers for v1 yet.

Read the v1 thread

Cover letter [PATCH 0/17] drop non-object_id hashing
Quoted 8 lines · Jeff King

I do think that sha1hash() will eventually go away in favor of oidhash(), but we can approach that separately, and convert oidmap along with everyone else.

It looks like we are close to being able to do that now. Grepping for sha1hash shows just about everybody dereferencing an oid object, except for the call in pack-objects.c. And skimming the callers there, they all appear to have an oid object, too.

Here are patches to do that. I decided not to build them on top of yours, just to keep things simple. When merged with yours, there's no textual conflict, but the new calls to sha1hash(key->hash) need to become oidhash(key) instead (the compiler does catch this). It would be easy to rebase, though.

I ended up with quite a few more patches than I thought I would need, but I'm actually pretty pleased with the result. A lot of these are cleanups in the packfile code that I'd been meaning to do for a while.

[01/17]: describe: fix accidental oid/hash type-punning [02/17]: upload-pack: rename a "sha1" variable to "oid"

These first two are small cleanups I noticed in sites I touched later in the series.

[03/17]: pack-bitmap-write: convert some helpers to use object_id [04/17]: pack-objects: convert packlist_find() to use object_id [05/17]: pack-objects: convert locate_object_entry_hash() to object_id [06/17]: object: convert lookup_unknown_object() to use object_id [07/17]: object: convert lookup_object() to use object_id [08/17]: object: convert internal hash_obj() to object_id [09/17]: object: convert create_object() to use object_id

These ones are all just about passing object_id structs around more consistently. In most cases, all of the callers of a particular function were already passing "oid->hash", so we could just have them pass "oid" instead.

The big one here is lookup_object(), which shockingly does not seem to create any conflicts with pu.

[10/17]: khash: drop broken oid_map typedef
[11/17]: khash: rename kh_oid_t to kh_oid_set [12/17]: delta-islands: convert island_marks khash to use oids [13/17]: pack-bitmap: convert khash_sha1 maps into kh_oid_map [14/17]: khash: drop sha1-specific map types [15/17]: khash: rename oid helper functions

Some khash cleanups and prep to stop using sha1hash() there.

[16/17]: hash.h: move object_id definition from cache.h [17/17]: hashmap: convert sha1hash() to oidhash()

And then finally we can rename the offending function. Ta-da. :)

 blob.c                           |  5 ++---
 builtin/describe.c               |  4 ++--
 builtin/fast-export.c            |  4 ++--
 builtin/fsck.c                   |  8 ++++----
 builtin/name-rev.c               |  3 +--
 builtin/pack-objects.c           | 21 +++++++++++----------
 builtin/prune.c                  |  2 +-
 builtin/unpack-objects.c         |  2 +-
 cache.h                          | 24 ------------------------
 commit-graph.c                   |  2 +-
 commit.c                         |  5 ++---
 decorate.c                       |  2 +-
 delta-islands.c                  | 24 ++++++++++++------------
 diffcore-rename.c                |  2 +-
 fetch-pack.c                     | 12 ++++++------
 fsck.c                           |  2 +-
 hash.h                           | 24 ++++++++++++++++++++++++
 hashmap.h                        |  8 +++++---
 http-push.c                      |  4 ++--
 khash.h                          | 22 ++++++----------------
 object.c                         | 26 +++++++++++++-------------
 object.h                         |  6 +++---
 oidset.c                         | 12 ++++++------
 oidset.h                         |  4 ++--
 pack-bitmap-write.c              | 30 +++++++++++++++---------------
 pack-bitmap.c                    | 16 ++++++++--------
 pack-bitmap.h                    |  2 +-
 pack-objects.c                   | 12 ++++++------
 pack-objects.h                   |  2 +-
 patch-ids.c                      |  2 +-
 reachable.c                      |  4 ++--
 refs.c                           |  2 +-
 t/helper/test-example-decorate.c |  6 +++---
 tag.c                            |  5 ++---
 tree.c                           |  5 ++---
 upload-pack.c                    |  8 ++++----
 walker.c                         |  2 +-
 37 files changed, 156 insertions(+), 168 deletions(-)

-Peff