From: ZheNing Hu <adlternative@xxxxxxxxx>
When we are using some atoms such as %(raw), %(objectname),
%(objecttype), we don't need to parse the content of the object,
so we can skip parse_object_buffer() for performance optimization.
It is worth noting that in these cases, we still need to call
parse_object_buffer() for parsing:
1. The atom type is one of %(tag), %(type), %(object), %(tree),
%(numparent) or %(parent).
2. The type of the object is tag and the atom need to be
dereferenced e.g. %(*objecttype).
With this patch, `git cat-file --batch` has a 12.5% performance
improvement. But there is still a certain gap with
`git cat-file --batch` before using the logic of ref-filter.
`git cat-file --batch` is 10% worse, `git cat-file --batch-check`
is 30% worse.
Mentored-by: Christian Couder <christian.couder@xxxxxxxxx>
Mentored-by: Hariom Verma <hariom18599@xxxxxxxxx>
Signed-off-by: ZheNing Hu <adlternative@xxxxxxxxx>
---
ref-filter.c | 53 ++++++++++++++++++++++++++++++++++++++--------------
ref-filter.h | 5 +++--
2 files changed, 42 insertions(+), 16 deletions(-)
diff --git a/ref-filter.c b/ref-filter.c
index 8664d9a6f4e..1251e062ff8 100644
--- a/ref-filter.c
+++ b/ref-filter.c
@@ -1025,6 +1025,20 @@ static int reject_atom(int cat_file_mode, enum atom_type atom_type)
}
}
+static int need_parse_buffer(enum atom_type atom_type) {
+ switch (atom_type) {
+ case ATOM_TAG:
+ case ATOM_TYPE:
+ case ATOM_OBJECT:
+ case ATOM_TREE:
+ case ATOM_NUMPARENT:
+ case ATOM_PARENT:
+ return 1;
+ default:
+ return 0;
+ }
+}
+
/*
* Make sure the format string is well formed, and parse out
* the used atoms.
@@ -1045,6 +1059,8 @@ int verify_ref_format(struct ref_format *format)
at = parse_ref_filter_atom(format, sp + 2, ep, &err);
if (at < 0)
die("%s", err.buf);
+ if (need_parse_buffer(used_atom[at].atom_type))
+ format->can_skip_parse_buffer = 0;
if (reject_atom(format->cat_file_mode, used_atom[at].atom_type))
die(_("this command reject atom %%(%.*s)"), (int)(ep - sp - 2), sp + 2);
@@ -1532,14 +1548,16 @@ static void grab_values(struct atom_value *val, int deref, struct object *obj, s
{
void *buf = data->content;
- switch (obj->type) {
+ switch (data->type) {
case OBJ_TAG:
- grab_tag_values(val, deref, obj);
+ if (obj)
+ grab_tag_values(val, deref, obj);
grab_sub_body_contents(val, deref, data);
grab_person("tagger", val, deref, buf);
break;
case OBJ_COMMIT:
- grab_commit_values(val, deref, obj);
+ if (obj)
+ grab_commit_values(val, deref, obj);
grab_sub_body_contents(val, deref, data);
grab_person("author", val, deref, buf);
grab_person("committer", val, deref, buf);
@@ -1792,16 +1810,23 @@ static int get_object(struct ref_array_item *ref, int deref, struct object **obj
actual_oi = &act_oi;
}
}
- *obj = parse_object_buffer(the_repository, &actual_oi->oid, actual_oi->type, actual_oi->size, actual_oi->content, &eaten);
- if (!*obj) {
- if (!eaten)
- free(actual_oi->content);
- if (actual_oi != oi)
- free(oi->content);
- return strbuf_addf_ret(err, -1, _("parse_object_buffer failed on %s for %s"),
- oid_to_hex(&oi->oid), ref->refname);
+ if (ref->can_skip_parse_buffer &&
+ ((!deref &&
+ (!need_tagged || oi->type != OBJ_TAG)) ||
+ deref)) {
+ grab_values(ref->value, deref, NULL, actual_oi);
+ } else {
+ *obj = parse_object_buffer(the_repository, &actual_oi->oid, actual_oi->type, actual_oi->size, actual_oi->content, &eaten);
+ if (!*obj) {
+ if (!eaten)
+ free(actual_oi->content);
+ if (actual_oi != oi)
+ free(oi->content);
+ return strbuf_addf_ret(err, -1, _("parse_object_buffer failed on %s for %s"),
+ oid_to_hex(&oi->oid), ref->refname);
+ }
+ grab_values(ref->value, deref, *obj, actual_oi);
}
- grab_values(ref->value, deref, *obj, actual_oi);
}
grab_common_values(ref->value, deref, oi);
@@ -2029,7 +2054,7 @@ static int populate_value(struct ref_array_item *ref, struct strbuf *err)
* If there is no atom that wants to know about tagged
* object, we are done.
*/
- if (!need_tagged || (obj->type != OBJ_TAG))
+ if (!need_tagged || (oi.type != OBJ_TAG))
return 0;
/*
@@ -2651,7 +2676,7 @@ int format_ref_array_item(struct ref_array_item *info,
state.quote_style = format->quote_style;
push_stack_element(&state.stack);
-
+ info->can_skip_parse_buffer = format->can_skip_parse_buffer;
for (cp = format->format; *cp && (sp = find_next(cp)); cp = ep + 1) {
struct atom_value *atomv;
int pos;
diff --git a/ref-filter.h b/ref-filter.h
index 853eb554a5b..8cae9f576d5 100644
--- a/ref-filter.h
+++ b/ref-filter.h
@@ -41,6 +41,7 @@ struct ref_array_item {
const char *rest;
int cat_file_cmdmode;
int flag;
+ int can_skip_parse_buffer;
unsigned int kind;
const char *symref;
struct commit *commit;
@@ -83,12 +84,12 @@ struct ref_format {
int quote_style;
int use_rest;
int use_color;
-
+ int can_skip_parse_buffer;
/* Internal state to ref-filter */
int need_color_reset_at_eol;
};
-#define REF_FORMAT_INIT { .use_color = -1 }
+#define REF_FORMAT_INIT { .use_color = -1, .can_skip_parse_buffer = 1 }
/* Macros for checking --merged and --no-merged options */
#define _OPT_MERGED_NO_MERGED(option, filter, h) \
--
gitgitgadget
