From: Christian Couder <christian.couder@gmail.com>
To: git@vger.kernel.org
Cc: "Junio C Hamano" <gitster@pobox.com>,
"Ævar Arnfjörð Bjarmason" <avarab@gmail.com>,
"Jonathan Tan" <jonathantanmy@google.com>,
"SZEDER Gábor" <szeder.dev@gmail.com>,
"Jeff King" <peff@peff.net>, "Derrick Stolee" <stolee@gmail.com>,
"Christian Couder" <chriscool@tuxfamily.org>
Subject: [RFC PATCH 2/5] oidmap: add oidmap_get_next()
Date: Sun, 7 Jul 2019 10:29:59 +0200 [thread overview]
Message-ID: <20190707083002.7037-3-chriscool@tuxfamily.org> (raw)
In-Reply-To: <20190707083002.7037-1-chriscool@tuxfamily.org>
For now "oidmap.h" gives us no way to get all the entries that have the
same oid key from an oidmap, as oidmap_get() will always return the first
entry. So let's add oidmap_get_next() for this purpose.
Signed-off-by: Christian Couder <chriscool@tuxfamily.org>
---
oidmap.c | 8 ++++++++
oidmap.h | 6 ++++++
2 files changed, 14 insertions(+)
diff --git a/oidmap.c b/oidmap.c
index bfb290ee01..9cf9dfd533 100644
--- a/oidmap.c
+++ b/oidmap.c
@@ -32,6 +32,14 @@ void *oidmap_get(const struct oidmap *map, const struct object_id *key)
return hashmap_get_from_hash(&map->map, oidhash(key), key);
}
+void *oidmap_get_next(const struct oidmap *map, const void *entry)
+{
+ if (!map->map.cmpfn)
+ return NULL;
+
+ return hashmap_get_next(&map->map, entry);
+}
+
void *oidmap_remove(struct oidmap *map, const struct object_id *key)
{
struct hashmap_entry entry;
diff --git a/oidmap.h b/oidmap.h
index 21d929ad79..5aad22784a 100644
--- a/oidmap.h
+++ b/oidmap.h
@@ -49,6 +49,12 @@ void oidmap_free(struct oidmap *map, int free_entries);
void *oidmap_get(const struct oidmap *map,
const struct object_id *key);
+/*
+ * Returns the next equal oidmap entry, or NULL if not found. This can be
+ * used to iterate over duplicate entries (see `oidmap_add`).
+ */
+void *oidmap_get_next(const struct oidmap *map, const void *entry);
+
/*
* Adds an oidmap entry. This allows to add duplicate entries (i.e.
* separate values with the same oid key).
--
2.22.0.514.g3228928bce.dirty
next prev parent reply other threads:[~2019-07-07 8:30 UTC|newest]
Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-07-07 8:29 [RFC PATCH 0/5] oidmap: handle entries with the same key Christian Couder
2019-07-07 8:29 ` [RFC PATCH 1/5] oidmap: add oidmap_add() Christian Couder
2019-07-07 8:29 ` Christian Couder [this message]
2019-07-07 8:30 ` [RFC PATCH 3/5] test-oidmap: add back proper 'add' subcommand Christian Couder
2019-07-07 8:30 ` [RFC PATCH 4/5] test-oidmap: add 'get_all' subcommand Christian Couder
2019-07-07 8:30 ` [RFC PATCH 5/5] t0016: add 'add' and 'get_all' subcommand test Christian Couder
2019-07-08 20:24 ` [RFC PATCH 0/5] oidmap: handle entries with the same key Junio C Hamano
2019-07-12 18:21 ` Junio C Hamano
2019-07-12 21:58 ` Jeff King
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
List information: http://vger.kernel.org/majordomo-info.html
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20190707083002.7037-3-chriscool@tuxfamily.org \
--to=christian.couder@gmail.com \
--cc=avarab@gmail.com \
--cc=chriscool@tuxfamily.org \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=jonathantanmy@google.com \
--cc=peff@peff.net \
--cc=stolee@gmail.com \
--cc=szeder.dev@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.
Code repositories for project(s) associated with this public inbox
https://80x24.org/mirrors/git.git
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 read-only IMAP folder(s) and NNTP newsgroup(s).