pathspec: save the non-wildcard length part

We mark pathspec with wildcards with the field use_wildcard. We
could do better by saving the length of the non-wildcard part, which
can be used for optimizations such as f9f6e2c (exclude: do strcmp as
much as possible before fnmatch - 2012-06-07).

Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

diff --git a/builtin/ls-files.c b/builtin/ls-files.c
index b5434af0c87741f3160388cf86904c6e3f903527..4a9ee690c7dcbaaf90f9511489b8f3b7b17b3c87 100644 (file)
--- a/builtin/ls-files.c
+++ b/builtin/ls-files.c
@@ -337,7 +337,7 @@ void overlay_tree_on_cache(const char *tree_name, const char *prefix)
                matchbuf[0] = prefix;
                matchbuf[1] = NULL;
                init_pathspec(&pathspec, matchbuf);
                matchbuf[0] = prefix;
                matchbuf[1] = NULL;
                init_pathspec(&pathspec, matchbuf);

-               pathspec.items[0].use_wildcard = 0;
+               pathspec.items[0].nowildcard_len = pathspec.items[0].len;

        } else
                init_pathspec(&pathspec, NULL);
        if (read_tree(tree, 1, &pathspec))
        } else
                init_pathspec(&pathspec, NULL);
        if (read_tree(tree, 1, &pathspec))

diff --git a/builtin/ls-tree.c b/builtin/ls-tree.c
index 235c17cc015acfb73358bc5ee5bde712fa2b0fa9..fb76e38d849fc6f7b9cc1a534f62efb605a3655c 100644 (file)
--- a/builtin/ls-tree.c
+++ b/builtin/ls-tree.c
@@ -168,7 +168,7 @@ int cmd_ls_tree(int argc, const char **argv, const char *prefix)
 
        init_pathspec(&pathspec, get_pathspec(prefix, argv + 1));
        for (i = 0; i < pathspec.nr; i++)
 
        init_pathspec(&pathspec, get_pathspec(prefix, argv + 1));
        for (i = 0; i < pathspec.nr; i++)

-               pathspec.items[i].use_wildcard = 0;
+               pathspec.items[i].nowildcard_len = pathspec.items[i].len;

        pathspec.has_wildcard = 0;
        tree = parse_tree_indirect(sha1);
        if (!tree)
        pathspec.has_wildcard = 0;
        tree = parse_tree_indirect(sha1);
        if (!tree)

diff --git a/cache.h b/cache.h
index dbd8018b5827ce40fd72ac0ba84934551a11f225..bf031f133c939ee48fa2e93a0ae3433342453c23 100644 (file)
--- a/cache.h
+++ b/cache.h
@@ -482,7 +482,7 @@ struct pathspec {
        struct pathspec_item {
                const char *match;
                int len;
        struct pathspec_item {
                const char *match;
                int len;

-               unsigned int use_wildcard:1;
+               int nowildcard_len;

        } *items;
 };
 
        } *items;
 };
 

diff --git a/dir.c b/dir.c
index 5a83aa7897f270279c403778f43aea6db1efc5af..c391d46b2fc09bb242419513b2b6f2c422859eb9 100644 (file)
--- a/dir.c
+++ b/dir.c
@@ -230,7 +230,7 @@ static int match_pathspec_item(const struct pathspec_item *item, int prefix,
                        return MATCHED_RECURSIVELY;
        }
 
                        return MATCHED_RECURSIVELY;
        }
 

-       if (item->use_wildcard && !fnmatch(match, name, 0))
+       if (item->nowildcard_len < item->len && !fnmatch(match, name, 0))

                return MATCHED_FNMATCH;
 
        return 0;
                return MATCHED_FNMATCH;
 
        return 0;


@@ -1429,8 +1429,8 @@ int init_pathspec(struct pathspec *pathspec, const char **paths)
 
                item->match = path;
                item->len = strlen(path);
 
                item->match = path;
                item->len = strlen(path);

-               item->use_wildcard = !no_wildcard(path);
-               if (item->use_wildcard)
+               item->nowildcard_len = simple_length(path);
+               if (item->nowildcard_len < item->len)

                        pathspec->has_wildcard = 1;
        }
 
                        pathspec->has_wildcard = 1;
        }
 

diff --git a/tree-walk.c b/tree-walk.c
index 3f54c02d7624c26632e3a0f81b8bb970c6ac307f..af871c50d1a4a2e4311228a82d6ac4ab52a660b5 100644 (file)
--- a/tree-walk.c
+++ b/tree-walk.c
@@ -626,7 +626,7 @@ enum interesting tree_entry_interesting(const struct name_entry *entry,
                                        &never_interesting))
                                return entry_interesting;
 
                                        &never_interesting))
                                return entry_interesting;
 

-                       if (item->use_wildcard) {
+                       if (item->nowildcard_len < item->len) {

                                if (!fnmatch(match + baselen, entry->path, 0))
                                        return entry_interesting;
 
                                if (!fnmatch(match + baselen, entry->path, 0))
                                        return entry_interesting;
 


@@ -642,7 +642,7 @@ enum interesting tree_entry_interesting(const struct name_entry *entry,
                }
 
 match_wildcards:
                }
 
 match_wildcards:

-               if (!item->use_wildcard)
+               if (item->nowildcard_len == item->len)

                        continue;
 
                /*
                        continue;
 
                /*