From: Jeff Hostetler <git@jeffhostetler.com>
To: git@vger.kernel.org
Cc: gitster@pobox.com, peff@peff.net, jonathantanmy@google.com,
Jeff Hostetler <jeffhost@microsoft.com>
Subject: [PATCH 02/13] list-objects-filter-map: extend oidmap to collect omitted objects
Date: Tue, 24 Oct 2017 18:53:21 +0000 [thread overview]
Message-ID: <20171024185332.57261-3-git@jeffhostetler.com> (raw)
In-Reply-To: <20171024185332.57261-1-git@jeffhostetler.com>
From: Jeff Hostetler <jeffhost@microsoft.com>
Create helper class to extend oidmap to collect a list of
omitted or missing objects during traversal.
This will be used in a later commit by the list-object filtering
code.
Signed-off-by: Jeff Hostetler <jeffhost@microsoft.com>
---
Makefile | 1 +
list-objects-filter-map.c | 63 +++++++++++++++++++++++++++++++++++++++++++++++
list-objects-filter-map.h | 26 +++++++++++++++++++
3 files changed, 90 insertions(+)
create mode 100644 list-objects-filter-map.c
create mode 100644 list-objects-filter-map.h
diff --git a/Makefile b/Makefile
index cd75985..e59f12d 100644
--- a/Makefile
+++ b/Makefile
@@ -807,6 +807,7 @@ LIB_OBJS += levenshtein.o
LIB_OBJS += line-log.o
LIB_OBJS += line-range.o
LIB_OBJS += list-objects.o
+LIB_OBJS += list-objects-filter-map.o
LIB_OBJS += ll-merge.o
LIB_OBJS += lockfile.o
LIB_OBJS += log-tree.o
diff --git a/list-objects-filter-map.c b/list-objects-filter-map.c
new file mode 100644
index 0000000..7e496b3
--- /dev/null
+++ b/list-objects-filter-map.c
@@ -0,0 +1,63 @@
+#include "cache.h"
+#include "list-objects-filter-map.h"
+
+int list_objects_filter_map_insert(struct oidmap *map,
+ const struct object_id *oid,
+ const char *pathname, enum object_type type)
+{
+ size_t len, size;
+ struct list_objects_filter_map_entry *e;
+
+ if (oidmap_get(map, oid))
+ return 1;
+
+ len = ((pathname && *pathname) ? strlen(pathname) : 0);
+ size = (offsetof(struct list_objects_filter_map_entry, pathname) + len + 1);
+ e = xcalloc(1, size);
+
+ oidcpy(&e->entry.oid, oid);
+ e->type = type;
+ if (pathname && *pathname)
+ strcpy(e->pathname, pathname);
+
+ oidmap_put(map, e);
+ return 0;
+}
+
+static int my_cmp(const void *a, const void *b)
+{
+ const struct oidmap_entry *ea, *eb;
+
+ ea = *(const struct oidmap_entry **)a;
+ eb = *(const struct oidmap_entry **)b;
+
+ return oidcmp(&ea->oid, &eb->oid);
+}
+
+void list_objects_filter_map_foreach(struct oidmap *map,
+ list_objects_filter_map_foreach_cb cb,
+ void *cb_data)
+{
+ struct hashmap_iter iter;
+ struct list_objects_filter_map_entry **array;
+ struct list_objects_filter_map_entry *e;
+ int k, nr;
+
+ nr = hashmap_get_size(&map->map);
+ if (!nr)
+ return;
+
+ array = xcalloc(nr, sizeof(*e));
+
+ k = 0;
+ hashmap_iter_init(&map->map, &iter);
+ while ((e = hashmap_iter_next(&iter)))
+ array[k++] = e;
+
+ QSORT(array, nr, my_cmp);
+
+ for (k = 0; k < nr; k++)
+ cb(k, nr, array[k], cb_data);
+
+ free(array);
+}
diff --git a/list-objects-filter-map.h b/list-objects-filter-map.h
new file mode 100644
index 0000000..794fc81
--- /dev/null
+++ b/list-objects-filter-map.h
@@ -0,0 +1,26 @@
+#ifndef LIST_OBJECTS_FILTER_MAP_H
+#define LIST_OBJECTS_FILTER_MAP_H
+
+#include "oidmap.h"
+
+struct list_objects_filter_map_entry {
+ struct oidmap_entry entry; /* must be first */
+ enum object_type type;
+ char pathname[FLEX_ARRAY];
+};
+
+extern int list_objects_filter_map_insert(
+ struct oidmap *map,
+ const struct object_id *oid,
+ const char *pathname, enum object_type type);
+
+typedef void (*list_objects_filter_map_foreach_cb)(
+ int i, int i_limit,
+ struct list_objects_filter_map_entry *e, void *cb_data);
+
+extern void list_objects_filter_map_foreach(
+ struct oidmap *map,
+ list_objects_filter_map_foreach_cb cb,
+ void *cb_data);
+
+#endif /* LIST_OBJECTS_FILTER_MAP_H */
--
2.9.3
next prev parent reply other threads:[~2017-10-24 18:54 UTC|newest]
Thread overview: 37+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-10-24 18:53 [PATCH 00/13] WIP Partial clone part 1: object filtering Jeff Hostetler
2017-10-24 18:53 ` [PATCH 01/13] dir: allow exclusions from blob in addition to file Jeff Hostetler
2017-10-25 4:05 ` Eric Sunshine
2017-10-25 6:43 ` Junio C Hamano
2017-10-25 14:54 ` Jeff Hostetler
2017-10-26 3:47 ` Junio C Hamano
2017-10-26 18:11 ` Jeff Hostetler
2017-10-24 18:53 ` Jeff Hostetler [this message]
2017-10-25 7:10 ` [PATCH 02/13] list-objects-filter-map: extend oidmap to collect omitted objects Junio C Hamano
2017-10-25 19:22 ` Jeff Hostetler
2017-10-26 4:12 ` Junio C Hamano
2017-10-24 18:53 ` [PATCH 03/13] list-objects: filter objects in traverse_commit_list Jeff Hostetler
2017-10-25 4:05 ` Jonathan Tan
2017-10-25 19:25 ` Jeff Hostetler
2017-10-24 18:53 ` [PATCH 04/13] list-objects-filter-blobs-none: add filter to omit all blobs Jeff Hostetler
2017-10-24 18:53 ` [PATCH 05/13] list-objects-filter-blobs-limit: add large blob filtering Jeff Hostetler
2017-10-24 18:53 ` [PATCH 06/13] list-objects-filter-sparse: add sparse filter Jeff Hostetler
2017-10-24 18:53 ` [PATCH 07/13] list-objects-filter-options: common argument parsing Jeff Hostetler
2017-10-25 4:14 ` Jonathan Tan
2017-10-25 19:28 ` Jeff Hostetler
2017-10-24 18:53 ` [PATCH 08/13] list-objects: add traverse_commit_list_filtered method Jeff Hostetler
2017-10-25 4:24 ` Jonathan Tan
2017-10-25 19:29 ` Jeff Hostetler
2017-10-24 18:53 ` [PATCH 09/13] extension.partialclone: introduce partial clone extension Jeff Hostetler
2017-10-24 18:53 ` [PATCH 10/13] rev-list: add list-objects filtering support Jeff Hostetler
2017-10-25 4:41 ` Jonathan Tan
2017-10-25 19:37 ` Jeff Hostetler
2017-10-24 18:53 ` [PATCH 11/13] t6112: rev-list object filtering test Jeff Hostetler
2017-10-24 18:53 ` [PATCH 12/13] pack-objects: add list-objects filtering Jeff Hostetler
2017-10-24 18:53 ` [PATCH 13/13] t5317: pack-objects object filtering test Jeff Hostetler
2017-10-25 4:57 ` [PATCH 00/13] WIP Partial clone part 1: object filtering Jonathan Tan
2017-10-25 5:00 ` Junio C Hamano
2017-10-25 6:46 ` Jonathan Tan
2017-10-25 15:39 ` Jeff Hostetler
2017-10-26 2:09 ` Junio C Hamano
2017-10-26 2:01 ` Junio C Hamano
2017-10-30 22:27 ` Jonathan Nieder
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=20171024185332.57261-3-git@jeffhostetler.com \
--to=git@jeffhostetler.com \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=jeffhost@microsoft.com \
--cc=jonathantanmy@google.com \
--cc=peff@peff.net \
/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).