merge-ort: make clear_internal_opts() aware of partial clearing

In order to handle recursive merges, after merging merge-bases we need
to clear away most of the data we had built up but some of it needs to
be kept -- in particular the "output" field.  Rename the function to
reflect its future change in use.

Further, since "reinitialize" means we'll be reusing the fields
immediately, take advantage of this to only partially clear maps,
leaving the hashtable allocated and pre-sized.  (This may be slightly
out-of-order since the speedups aren't realized until there are far
more strmaps in use, but the patch submission process already went out
of order because of various questions and requests for strmap.  Anyway,
see commit 6ccdfc2a20 ("strmap: enable faster clearing and reusing of
strmaps", 2020-11-05), for performance details about the use of
strmap_partial_clear().)

Signed-off-by: Elijah Newren <newren@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

diff --git a/merge-ort.c b/merge-ort.c
index 6eac0cef491dbb1466f58083aeabced1ed0bd06e..bd237f3472e6ae8e2a4583070c4ced0d352c442c 100644 (file)
--- a/merge-ort.c
+++ b/merge-ort.c
@@ -253,10 +253,11 @@ static void free_strmap_strings(struct strmap *map)
        }
 }
 
-static void clear_internal_opts(struct merge_options_internal *opti,
-                               int reinitialize)
+static void clear_or_reinit_internal_opts(struct merge_options_internal *opti,
+                                         int reinitialize)
 {
-       assert(!reinitialize);
+       void (*strmap_func)(struct strmap *, int) =
+               reinitialize ? strmap_partial_clear : strmap_clear;
 
        /*
         * We marked opti->paths with strdup_strings = 0, so that we
@@ -266,14 +267,14 @@ static void clear_internal_opts(struct merge_options_internal *opti,
         * to deallocate them.
         */
        free_strmap_strings(&opti->paths);
-       strmap_clear(&opti->paths, 1);
+       strmap_func(&opti->paths, 1);
 
        /*
         * All keys and values in opti->conflicted are a subset of those in
         * opti->paths.  We don't want to deallocate anything twice, so we
         * don't free the keys and we pass 0 for free_values.
         */
-       strmap_clear(&opti->conflicted, 0);
+       strmap_func(&opti->conflicted, 0);
 
        /*
         * opti->paths_to_free is similar to opti->paths; we created it with
@@ -1344,7 +1345,7 @@ void merge_finalize(struct merge_options *opt,
 
        assert(opt->priv == NULL);
 
-       clear_internal_opts(opti, 0);
+       clear_or_reinit_internal_opts(opti, 0);
        FREE_AND_NULL(opti);
 }