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

[RFC PATCH 2/5] oidmap: add oidmap_get_next()

From
Christian Couder <christian.couder@gmail.com>
Date
Jul 7, 2019, 08:29 UTC
Message-ID
<20190707083002.7037-3-chriscool@tuxfamily.org>
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
Previous: Christian CouderNext: Christian Couder
Message 3 of 9 in “oidmap: handle entries with the same key”
  1. 0/5 oidmap: handle entries with the same keyChristian Couder, Jul 7, 2019
  2. 1/5 oidmap: add oidmap_add()Christian Couder, Jul 7, 2019
  3. 2/5 oidmap: add oidmap_get_next()Christian Couder, Jul 7, 2019
  4. 3/5 test-oidmap: add back proper 'add' subcommandChristian Couder, Jul 7, 2019
  5. 4/5 test-oidmap: add 'get_all' subcommandChristian Couder, Jul 7, 2019
  6. 5/5 t0016: add 'add' and 'get_all' subcommand testChristian Couder, Jul 7, 2019
  7. Junio C HamanoJul 8, 2019
  8. Junio C HamanoJul 12, 2019
  9. Jeff KingJul 12, 2019

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.