On 8/8/2020 10:53 PM, Abhishek Kumar via GitGitGadget wrote:
> From: Abhishek Kumar <abhishekkumar8222@xxxxxxxxx>
>
> With most of preparations done, let's implement corrected commit date
> offset. We add a new commit-slab to store topogical levels while
> writing commit graph and upgrade the generation member in struct
> commit_graph_data to a 64-bit timestamp. We store topological levels to
> ensure that older versions of Git will still have the performance
> benefits from generation number v2.
>
> Signed-off-by: Abhishek Kumar <abhishekkumar8222@xxxxxxxxx>
> ---
> @@ -767,7 +764,10 @@ static void fill_commit_graph_info(struct commit *item, struct commit_graph *g,
> item->date = (timestamp_t)((date_high << 32) | date_low);
>
> if (g->chunk_generation_data)
> - graph_data->generation = get_be32(g->chunk_generation_data + sizeof(uint32_t) * lex_index);
> + {
> + graph_data->generation = item->date +
> + (timestamp_t) get_be32(g->chunk_generation_data + sizeof(uint32_t) * lex_index);
> + }
You don't need curly braces here, since this is only one line
in the block. Even if you did, these braces are in the wrong
location.
There is a subtle issue with this interpretation, and it
involves the case where the following happens:
1. A new version of Git writes a commit-graph using the
GDAT chunk.
2. An older version of Git adds a new layer without the
GDAT chunk.
At that point, the tip commit-graph does not have GDAT,
so the commits in that layer will get "generation" set
with the topological level, which is likely to be much
lower than the corrected commit dates set in the
"generation" field for commits in the lower layer.
The crux of the issue is that we are only considering
the current layer when interpreting the generation number
value.
The patch below inserts a flag into fill_commit_graph_info()
corresponding to the "global" state of whether the top
commit-graph layer has a GDAT chunk. By your later protection
to not write GDAT chunks on top of commit-graphs without
a GDAT chunk, this top commit-graph has all of the information
we need for this check.
Thanks,
-Stolee
--- >8 ---
>From 62189709fad3b051cedbd36193f5244fcce17e1f Mon Sep 17 00:00:00 2001
From: Derrick Stolee <dstolee@xxxxxxxxxxxxx>
Date: Mon, 10 Aug 2020 10:06:47 -0400
Subject: [PATCH] commit-graph: use generation v2 only if entire chain does
Since there are released versions of Git that understand generation
numbers in the commit-graph's CDAT chunk but do not understand the GDAT
chunk, the following scenario is possible:
1. "New" Git writes a commit-graph with the GDAT chunk.
2. "Old" Git writes a split commit-graph on top without a GDAT chunk.
Because of the current use of inspecting the current layer for a
generation_data_chunk pointer, the commits in the lower layer will be
interpreted as having very large generation values (commit date plus
offset) compared to the generation numbers in the top layer (topological
level). This violates the expectation that the generation of a parent is
strictly smaller than the generation of a child.
It is difficult to expose this issue in a test. Since we _start_ with
artificially low generation numbers, any commit walk that prioritizes
generation numbers will walk all of the commits with high generation
number before walking the commits with low generation number. In all the
cases I tried, the commit-graph layers themselves "protect" any
incorrect behavior since none of the commits in the lower layer can
reach the commits in the upper layer.
This issue would manifest itself as a performance problem in this
case, especially with something like "git log --graph" since the low
generation numbers would cause the in-degree queue to walk all of the
commits in the lower layer before allowing the topo-order queue to write
anything to output (depending on the size of the upper layer).
Signed-off-by: Derrick Stolee <dstolee@xxxxxxxxxxxxx>
---
commit-graph.c | 24 ++++++++++++++++++------
1 file changed, 18 insertions(+), 6 deletions(-)
diff --git a/commit-graph.c b/commit-graph.c
index eb78af3dad..17623274d9 100644
--- a/commit-graph.c
+++ b/commit-graph.c
@@ -762,7 +762,9 @@ static struct commit_list **insert_parent_or_die(struct repository *r,
return &commit_list_insert(c, pptr)->next;
}
-static void fill_commit_graph_info(struct commit *item, struct commit_graph *g, uint32_t pos)
+#define COMMIT_GRAPH_GENERATION_V2 (1 << 0)
+
+static void fill_commit_graph_info(struct commit *item, struct commit_graph *g, uint32_t pos, int flags)
{
const unsigned char *commit_data;
struct commit_graph_data *graph_data;
@@ -785,11 +787,9 @@ static void fill_commit_graph_info(struct commit *item, struct commit_graph *g,
date_low = get_be32(commit_data + g->hash_len + 12);
item->date = (timestamp_t)((date_high << 32) | date_low);
- if (g->chunk_generation_data)
- {
+ if (g->chunk_generation_data && (flags & COMMIT_GRAPH_GENERATION_V2))
graph_data->generation = item->date +
(timestamp_t) get_be32(g->chunk_generation_data + sizeof(uint32_t) * lex_index);
- }
else
graph_data->generation = get_be32(commit_data + g->hash_len + 8) >> 2;
}
@@ -799,6 +799,10 @@ static inline void set_commit_tree(struct commit *c, struct tree *t)
c->maybe_tree = t;
}
+/*
+ * In the case of a split commit-graph, this method expects the given
+ * commit-graph 'g' to be the top layer.
+ */
static int fill_commit_in_graph(struct repository *r,
struct commit *item,
struct commit_graph *g, uint32_t pos)
@@ -808,11 +812,15 @@ static int fill_commit_in_graph(struct repository *r,
struct commit_list **pptr;
const unsigned char *commit_data;
uint32_t lex_index;
+ int flags = 0;
+
+ if (g->chunk_generation_data)
+ flags |= COMMIT_GRAPH_GENERATION_V2;
while (pos < g->num_commits_in_base)
g = g->base_graph;
- fill_commit_graph_info(item, g, pos);
+ fill_commit_graph_info(item, g, pos, flags);
lex_index = pos - g->num_commits_in_base;
commit_data = g->chunk_commit_data + GRAPH_DATA_WIDTH * lex_index;
@@ -904,10 +912,14 @@ int parse_commit_in_graph(struct repository *r, struct commit *item)
void load_commit_graph_info(struct repository *r, struct commit *item)
{
uint32_t pos;
+ int flags = 0;
+
if (!prepare_commit_graph(r))
return;
+ if (r->objects->commit_graph->chunk_generation_data)
+ flags |= COMMIT_GRAPH_GENERATION_V2;
if (find_commit_in_graph(item, r->objects->commit_graph, &pos))
- fill_commit_graph_info(item, r->objects->commit_graph, pos);
+ fill_commit_graph_info(item, r->objects->commit_graph, pos, flags);
}
static struct tree *load_tree_for_commit(struct repository *r,
--
2.28.0.38.gc6f546511c1
