{"thread":{"id":"34724","subject":"[PATCH v3 00/24] Index-v5","startedAt":"2013-08-18T19:41:49Z","lastAt":"2013-11-25T15:41:11Z","messageCount":55,"participants":["Thomas Gummerer","Eric Sunshine","Ramsay Jones","Duy Nguyen","Junio C Hamano"],"isPatch":true,"patchVersion":3,"patchTotal":24},"messages":[{"id":"225401","messageId":"1376854933-31241-1-git-send-email-t.gummerer@gmail.com","threadId":"34724","inReplyTo":null,"subject":"[PATCH v3 00/24] Index-v5","fromName":"Thomas Gummerer","fromEmail":"t.gummerer@gmail.com","sentAt":"2013-08-18T19:41:49Z","receivedAt":"2013-08-18T19:41:49Z","isPatch":true,"sender":{"key":"t.gummerer@gmail.com","avatar":"https://avatars.githubusercontent.com/u/191004?v=4"},"body":"Hi,\n\nprevious rounds (without api) are at $gmane/202752, $gmane/202923,\n$gmane/203088 and $gmane/203517, the previous rounds with api were at\n$gmane/229732 and $gmane/230210. Thanks to Duy for reviewing the the\nlast round and Junio and Ramsay for additional comments.\n\nChanges since the previous round:\n\nread-cache: move index v2 specific functions to their own file\n - set istate->ops to NULL in discard_index\n\nread-cache: add index reading api\n - style fixes\n - instead of using internal_ops struct, do for_each_index_entry in\n read-cache.c\n\ngrep.c: use index api\n - remove duplicate call to match_pathspec_depth\n\nls-files.c: use index api\n - load the whole index if there is a trai\n\ndocumentation: add documentation of the index-v5 file format\n - fix typo\n - change the position of nfile and ndir in the index file\n - document that the conflicts are also stored in the fileentries\n block\n - document invalid flag\n\nread-cache: read index-v5\n - restrict partial loading a bit more, by being more careful when\n adjusting the pathspec\n - move the ondisk structs from cache.h to read-cache-v5.c\n - merge for and while loop in read_entries\n - keep a directory tree instead of a flat list when reading the\n directories\n - ce_queue_push moved to read-cache: write index-v5 using a next_ce\n pointer instead of the next pointer that's already used by\n name-hash.\n - fix reading if there are extensions that are not yet supported\n - ignore entries that have the invalid flag set\n\nread-cache: read cache-tree in index-v5\n - use the tree structure which is now used in read index-v5\n\nread-cache: write index-v5\n - simplify compile_directory_data\n\nchanges to the index file format:\n - store the number of files before the number of directories in the\n header, so that the file command still can recognize the number of\n files in the repository correctly.\n - store all staged entries in the fileentries block. Doesn't hurt\n the performance a lot but simplifies the code.\n - add an invalid flag for entries that should be ignored. currently\n unused but respected when reading. will be used once the conflict\n resolution is done by flipping a bit in the conflict entries at the\n end of the index.\n \nadded commits:\n - read-cache: use fixed width integer types\n - read-cache: clear version in discard_index()\n - read-cache: Don't compare uid, gid and ino on cygwin\n - introduce GIT_INDEX_VERSION environment variable\n - test-lib: allow setting the index format version\n\nThomas Gummerer (23):\n t2104: Don't fail for index versions other than [23]\n read-cache: use fixed width integer types\n read-cache: split index file version specific functionality\n read-cache: clear version in discard_index()\n read-cache: move index v2 specific functions to their own file\n read-cache: Don't compare uid, gid and ino on cygwin\n read-cache: Re-read index if index file changed\n add documentation for the index api\n read-cache: add index reading api\n make sure partially read index is not changed\n grep.c: use index api\n ls-files.c: use index api\n documentation: add documentation of the index-v5 file format\n read-cache: make in-memory format aware of stat_crc\n read-cache: read index-v5\n read-cache: read resolve-undo data\n read-cache: read cache-tree in index-v5\n read-cache: write index-v5\n read-cache: write index-v5 cache-tree data\n read-cache: write resolve-undo data for index-v5\n update-index.c: rewrite index when index-version is given\n introduce GIT_INDEX_VERSION environment variable\n test-lib: allow setting the index format version\n\nThomas Rast (1):\n p0003-index.sh: add perf test for the index formats\n\n Documentation/technical/api-in-core-index.txt | 54 +-\n Documentation/technical/index-file-format-v5.txt | 301 +++++\n Makefile | 10 +\n builtin/apply.c | 2 +\n builtin/grep.c | 69 +-\n builtin/ls-files.c | 36 +-\n builtin/update-index.c | 6 +-\n cache-tree.c | 2 +-\n cache-tree.h | 1 +\n cache.h | 93 +-\n read-cache-v2.c | 550 +++++++++\n read-cache-v5.c | 1417 ++++++++++++++++++++++\n read-cache.c | 685 +++--------\n read-cache.h | 61 +\n t/perf/p0003-index.sh | 63 +\n t/t2104-update-index-skip-worktree.sh | 1 +\n t/test-lib-functions.sh | 5 +\n t/test-lib.sh | 3 +\n test-index-version.c | 6 +\n unpack-trees.c | 3 +-\n 20 files changed, 2786 insertions(+), 582 deletions(-)\n create mode 100644 Documentation/technical/index-file-format-v5.txt\n create mode 100644 read-cache-v2.c\n create mode 100644 read-cache-v5.c\n create mode 100644 read-cache.h\n create mode 100755 t/perf/p0003-index.sh\n\n-- \n1.8.3.4.1231.g9fbf354.dirty\n"},{"id":"225402","messageId":"1376854933-31241-2-git-send-email-t.gummerer@gmail.com","threadId":"34724","inReplyTo":"1376854933-31241-1-git-send-email-t.gummerer@gmail.com","subject":"[PATCH v3 01/24] t2104: Don't fail for index versions other than [23]","fromName":"Thomas Gummerer","fromEmail":"t.gummerer@gmail.com","sentAt":"2013-08-18T19:41:50Z","receivedAt":"2013-08-18T19:41:50Z","isPatch":true,"sender":{"key":"t.gummerer@gmail.com","avatar":"https://avatars.githubusercontent.com/u/191004?v=4"},"body":"t2104 currently checks for the exact index version 2 or 3,\ndepending if there is a skip-worktree flag or not. Other\nindex versions do not use extended flags and thus cannot\nbe tested for version changes.\n\nMake this test update the index to version 2 at the beginning\nof the test. Testing the skip-worktree flags for the default\nindex format is still covered by t7011 and t7012.\n\nSigned-off-by: Thomas Gummerer \n---\n t/t2104-update-index-skip-worktree.sh | 1 +\n 1 file changed, 1 insertion(+)\n\ndiff --git a/t/t2104-update-index-skip-worktree.sh b/t/t2104-update-index-skip-worktree.sh\nindex 1d0879b..bd9644f 100755\n--- a/t/t2104-update-index-skip-worktree.sh\n+++ b/t/t2104-update-index-skip-worktree.sh\n@@ -22,6 +22,7 @@ H sub/2\n EOF\n \n test_expect_success 'setup' '\n+\tgit update-index --index-version=2 &&\n \tmkdir sub &&\n \ttouch ./1 ./2 sub/1 sub/2 &&\n \tgit add 1 2 sub/1 sub/2 &&\n-- \n1.8.3.4.1231.g9fbf354.dirty\n"},{"id":"225403","messageId":"1376854933-31241-3-git-send-email-t.gummerer@gmail.com","threadId":"34724","inReplyTo":"1376854933-31241-1-git-send-email-t.gummerer@gmail.com","subject":"[PATCH v3 02/24] read-cache: use fixed width integer types","fromName":"Thomas Gummerer","fromEmail":"t.gummerer@gmail.com","sentAt":"2013-08-18T19:41:51Z","receivedAt":"2013-08-18T19:41:51Z","isPatch":true,"sender":{"key":"t.gummerer@gmail.com","avatar":"https://avatars.githubusercontent.com/u/191004?v=4"},"body":"Use the fixed width integer types uint16_t and uint32_t for ondisk\nstructures, because unsigned short and unsigned int do not hae a\nguaranteed size.\n\nSigned-off-by: Thomas Gummerer \n---\n cache.h | 10 +++++-----\n read-cache.c | 30 +++++++++++++++---------------\n 2 files changed, 20 insertions(+), 20 deletions(-)\n\ndiff --git a/cache.h b/cache.h\nindex bd6fb9f..9ef778a 100644\n--- a/cache.h\n+++ b/cache.h\n@@ -101,9 +101,9 @@ unsigned long git_deflate_bound(git_zstream *, unsigned long);\n \n #define CACHE_SIGNATURE 0x44495243\t/* \"DIRC\" */\n struct cache_header {\n-\tunsigned int hdr_signature;\n-\tunsigned int hdr_version;\n-\tunsigned int hdr_entries;\n+\tuint32_t hdr_signature;\n+\tuint32_t hdr_version;\n+\tuint32_t hdr_entries;\n };\n \n #define INDEX_FORMAT_LB 2\n@@ -115,8 +115,8 @@ struct cache_header {\n * check it for equality in the 32 bits we save.\n */\n struct cache_time {\n-\tunsigned int sec;\n-\tunsigned int nsec;\n+\tuint32_t sec;\n+\tuint32_t nsec;\n };\n \n struct stat_data {\ndiff --git a/read-cache.c b/read-cache.c\nindex ceaf207..0df5b31 100644\n--- a/read-cache.c\n+++ b/read-cache.c\n@@ -1230,14 +1230,14 @@ static struct cache_entry *refresh_cache_entry(struct cache_entry *ce, int reall\n struct ondisk_cache_entry {\n \tstruct cache_time ctime;\n \tstruct cache_time mtime;\n-\tunsigned int dev;\n-\tunsigned int ino;\n-\tunsigned int mode;\n-\tunsigned int uid;\n-\tunsigned int gid;\n-\tunsigned int size;\n+\tuint32_t dev;\n+\tuint32_t ino;\n+\tuint32_t mode;\n+\tuint32_t uid;\n+\tuint32_t gid;\n+\tuint32_t size;\n \tunsigned char sha1[20];\n-\tunsigned short flags;\n+\tuint16_t flags;\n \tchar name[FLEX_ARRAY]; /* more */\n };\n \n@@ -1249,15 +1249,15 @@ struct ondisk_cache_entry {\n struct ondisk_cache_entry_extended {\n \tstruct cache_time ctime;\n \tstruct cache_time mtime;\n-\tunsigned int dev;\n-\tunsigned int ino;\n-\tunsigned int mode;\n-\tunsigned int uid;\n-\tunsigned int gid;\n-\tunsigned int size;\n+\tuint32_t dev;\n+\tuint32_t ino;\n+\tuint32_t mode;\n+\tuint32_t uid;\n+\tuint32_t gid;\n+\tuint32_t size;\n \tunsigned char sha1[20];\n-\tunsigned short flags;\n-\tunsigned short flags2;\n+\tuint16_t flags;\n+\tuint16_t flags2;\n \tchar name[FLEX_ARRAY]; /* more */\n };\n \n-- \n1.8.3.4.1231.g9fbf354.dirty\n"},{"id":"225404","messageId":"1376854933-31241-4-git-send-email-t.gummerer@gmail.com","threadId":"34724","inReplyTo":"1376854933-31241-1-git-send-email-t.gummerer@gmail.com","subject":"[PATCH v3 03/24] read-cache: split index file version specific functionality","fromName":"Thomas Gummerer","fromEmail":"t.gummerer@gmail.com","sentAt":"2013-08-18T19:41:52Z","receivedAt":"2013-08-18T19:41:52Z","isPatch":true,"sender":{"key":"t.gummerer@gmail.com","avatar":"https://avatars.githubusercontent.com/u/191004?v=4"},"body":"Split index file version specific functionality to their own functions,\nto prepare for moving the index file version specific parts to their own\nfile. This makes it easier to add a new index file format later.\n\nSigned-off-by: Thomas Gummerer \n---\n read-cache.c | 114 ++++++++++++++++++++++++++++++++++++++---------------------\n 1 file changed, 74 insertions(+), 40 deletions(-)\n\ndiff --git a/read-cache.c b/read-cache.c\nindex 0df5b31..de0bbcd 100644\n--- a/read-cache.c\n+++ b/read-cache.c\n@@ -1269,10 +1269,8 @@ struct ondisk_cache_entry_extended {\n \t\t\t ondisk_cache_entry_extended_size(ce_namelen(ce)) : \\\n \t\t\t ondisk_cache_entry_size(ce_namelen(ce)))\n \n-static int verify_hdr(struct cache_header *hdr, unsigned long size)\n+static int verify_hdr_version(struct cache_header *hdr, unsigned long size)\n {\n-\tgit_SHA_CTX c;\n-\tunsigned char sha1[20];\n \tint hdr_version;\n \n \tif (hdr->hdr_signature != htonl(CACHE_SIGNATURE))\n@@ -1280,10 +1278,21 @@ static int verify_hdr(struct cache_header *hdr, unsigned long size)\n \thdr_version = ntohl(hdr->hdr_version);\n \tif (hdr_version < INDEX_FORMAT_LB || INDEX_FORMAT_UB < hdr_version)\n \t\treturn error(\"bad index version %d\", hdr_version);\n+\treturn 0;\n+}\n+\n+static int verify_hdr(void *mmap, unsigned long size)\n+{\n+\tgit_SHA_CTX c;\n+\tunsigned char sha1[20];\n+\n+\tif (size < sizeof(struct cache_header) + 20)\n+\t\tdie(\"index file smaller than expected\");\n+\n \tgit_SHA1_Init(&c);\n-\tgit_SHA1_Update(&c, hdr, size - 20);\n+\tgit_SHA1_Update(&c, mmap, size - 20);\n \tgit_SHA1_Final(sha1, &c);\n-\tif (hashcmp(sha1, (unsigned char *)hdr + size - 20))\n+\tif (hashcmp(sha1, (unsigned char *)mmap + size - 20))\n \t\treturn error(\"bad index file sha1 signature\");\n \treturn 0;\n }\n@@ -1425,44 +1434,14 @@ static struct cache_entry *create_from_disk(struct ondisk_cache_entry *ondisk,\n \treturn ce;\n }\n \n-/* remember to discard_cache() before reading a different cache! */\n-int read_index_from(struct index_state *istate, const char *path)\n+static int read_index_v2(struct index_state *istate, void *mmap, unsigned long mmap_size)\n {\n-\tint fd, i;\n-\tstruct stat st;\n+\tint i;\n \tunsigned long src_offset;\n \tstruct cache_header *hdr;\n-\tvoid *mmap;\n-\tsize_t mmap_size;\n \tstruct strbuf previous_name_buf = STRBUF_INIT, *previous_name;\n \n-\tif (istate->initialized)\n-\t\treturn istate->cache_nr;\n-\n-\tistate->timestamp.sec = 0;\n-\tistate->timestamp.nsec = 0;\n-\tfd = open(path, O_RDONLY);\n-\tif (fd < 0) {\n-\t\tif (errno == ENOENT)\n-\t\t\treturn 0;\n-\t\tdie_errno(\"index file open failed\");\n-\t}\n-\n-\tif (fstat(fd, &st))\n-\t\tdie_errno(\"cannot stat the open index\");\n-\n-\tmmap_size = xsize_t(st.st_size);\n-\tif (mmap_size < sizeof(struct cache_header) + 20)\n-\t\tdie(\"index file smaller than expected\");\n-\n-\tmmap = xmmap(NULL, mmap_size, PROT_READ | PROT_WRITE, MAP_PRIVATE, fd, 0);\n-\tif (mmap == MAP_FAILED)\n-\t\tdie_errno(\"unable to map index file\");\n-\tclose(fd);\n-\n \thdr = mmap;\n-\tif (verify_hdr(hdr, mmap_size) < 0)\n-\t\tgoto unmap;\n \n \tistate->version = ntohl(hdr->hdr_version);\n \tistate->cache_nr = ntohl(hdr->hdr_entries);\n@@ -1488,8 +1467,6 @@ int read_index_from(struct index_state *istate, const char *path)\n \t\tsrc_offset += consumed;\n \t}\n \tstrbuf_release(&previous_name_buf);\n-\tistate->timestamp.sec = st.st_mtime;\n-\tistate->timestamp.nsec = ST_MTIME_NSEC(st);\n \n \twhile (src_offset <= mmap_size - 20 - 8) {\n \t\t/* After an array of active_nr index entries,\n@@ -1509,6 +1486,58 @@ int read_index_from(struct index_state *istate, const char *path)\n \t\tsrc_offset += 8;\n \t\tsrc_offset += extsize;\n \t}\n+\treturn 0;\n+unmap:\n+\tmunmap(mmap, mmap_size);\n+\tdie(\"index file corrupt\");\n+}\n+\n+/* remember to discard_cache() before reading a different cache! */\n+int read_index_from(struct index_state *istate, const char *path)\n+{\n+\tint fd;\n+\tstruct stat st;\n+\tstruct cache_header *hdr;\n+\tvoid *mmap;\n+\tsize_t mmap_size;\n+\n+\terrno = EBUSY;\n+\tif (istate->initialized)\n+\t\treturn istate->cache_nr;\n+\n+\terrno = ENOENT;\n+\tistate->timestamp.sec = 0;\n+\tistate->timestamp.nsec = 0;\n+\tfd = open(path, O_RDONLY);\n+\tif (fd < 0) {\n+\t\tif (errno == ENOENT)\n+\t\t\treturn 0;\n+\t\tdie_errno(\"index file open failed\");\n+\t}\n+\n+\tif (fstat(fd, &st))\n+\t\tdie_errno(\"cannot stat the open index\");\n+\n+\terrno = EINVAL;\n+\tmmap_size = xsize_t(st.st_size);\n+\tif (mmap_size < sizeof(struct cache_header) + 20)\n+\t\tdie(\"index file smaller than expected\");\n+\n+\tmmap = xmmap(NULL, mmap_size, PROT_READ | PROT_WRITE, MAP_PRIVATE, fd, 0);\n+\tclose(fd);\n+\tif (mmap == MAP_FAILED)\n+\t\tdie_errno(\"unable to map index file\");\n+\n+\thdr = mmap;\n+\tif (verify_hdr_version(hdr, mmap_size) < 0)\n+\t\tgoto unmap;\n+\n+\tif (verify_hdr(mmap, mmap_size) < 0)\n+\t\tgoto unmap;\n+\n+\tread_index_v2(istate, mmap, mmap_size);\n+\tistate->timestamp.sec = st.st_mtime;\n+\tistate->timestamp.nsec = ST_MTIME_NSEC(st);\n \tmunmap(mmap, mmap_size);\n \treturn istate->cache_nr;\n \n@@ -1772,7 +1801,7 @@ void update_index_if_able(struct index_state *istate, struct lock_file *lockfile\n \t\trollback_lock_file(lockfile);\n }\n \n-int write_index(struct index_state *istate, int newfd)\n+static int write_index_v2(struct index_state *istate, int newfd)\n {\n \tgit_SHA_CTX c;\n \tstruct cache_header hdr;\n@@ -1855,6 +1884,11 @@ int write_index(struct index_state *istate, int newfd)\n \treturn 0;\n }\n \n+int write_index(struct index_state *istate, int newfd)\n+{\n+\treturn write_index_v2(istate, newfd);\n+}\n+\n /*\n * Read the index file that is potentially unmerged into given\n * index_state, dropping any unmerged entries. Returns true if\n-- \n1.8.3.4.1231.g9fbf354.dirty\n"},{"id":"225405","messageId":"1376854933-31241-5-git-send-email-t.gummerer@gmail.com","threadId":"34724","inReplyTo":"1376854933-31241-1-git-send-email-t.gummerer@gmail.com","subject":"[PATCH v3 04/24] read-cache: clear version in discard_index()","fromName":"Thomas Gummerer","fromEmail":"t.gummerer@gmail.com","sentAt":"2013-08-18T19:41:53Z","receivedAt":"2013-08-18T19:41:53Z","isPatch":true,"sender":{"key":"t.gummerer@gmail.com","avatar":"https://avatars.githubusercontent.com/u/191004?v=4"},"body":"All fields except index_state->version are reset in discard_index.\nReset the version too.\n\nSigned-off-by: Thomas Gummerer \n---\n read-cache.c | 1 +\n 1 file changed, 1 insertion(+)\n\ndiff --git a/read-cache.c b/read-cache.c\nindex de0bbcd..1e22f6f 100644\n--- a/read-cache.c\n+++ b/read-cache.c\n@@ -1558,6 +1558,7 @@ int discard_index(struct index_state *istate)\n \tfor (i = 0; i < istate->cache_nr; i++)\n \t\tfree(istate->cache[i]);\n \tresolve_undo_clear_index(istate);\n+\tistate->version = 0;\n \tistate->cache_nr = 0;\n \tistate->cache_changed = 0;\n \tistate->timestamp.sec = 0;\n-- \n1.8.3.4.1231.g9fbf354.dirty\n"},{"id":"225406","messageId":"1376854933-31241-6-git-send-email-t.gummerer@gmail.com","threadId":"34724","inReplyTo":"1376854933-31241-1-git-send-email-t.gummerer@gmail.com","subject":"[PATCH v3 05/24] read-cache: move index v2 specific functions to their own file","fromName":"Thomas Gummerer","fromEmail":"t.gummerer@gmail.com","sentAt":"2013-08-18T19:41:54Z","receivedAt":"2013-08-18T19:41:54Z","isPatch":true,"sender":{"key":"t.gummerer@gmail.com","avatar":"https://avatars.githubusercontent.com/u/191004?v=4"},"body":"Move index version 2 specific functions to their own file. The non-index\nspecific functions will be in read-cache.c, while the index version 2\nspecific functions will be in read-cache-v2.c.\n\nHelped-by: Nguyen Thai Ngoc Duy \nSigned-off-by: Thomas Gummerer \n---\n Makefile | 2 +\n builtin/apply.c | 2 +\n builtin/update-index.c | 2 +-\n cache.h | 13 +-\n read-cache-v2.c | 544 ++++++++++++++++++++++++++++++++++++++++++++++\n read-cache.c | 576 +++++--------------------------------------------\n read-cache.h | 58 +++++\n test-index-version.c | 6 +\n unpack-trees.c | 3 +-\n 9 files changed, 669 insertions(+), 537 deletions(-)\n create mode 100644 read-cache-v2.c\n create mode 100644 read-cache.h\n\ndiff --git a/Makefile b/Makefile\nindex 6b446e7..afae23e 100644\n--- a/Makefile\n+++ b/Makefile\n@@ -712,6 +712,7 @@ LIB_H += progress.h\n LIB_H += prompt.h\n LIB_H += quote.h\n LIB_H += reachable.h\n+LIB_H += read-cache.h\n LIB_H += reflog-walk.h\n LIB_H += refs.h\n LIB_H += remote.h\n@@ -855,6 +856,7 @@ LIB_OBJS += prompt.o\n LIB_OBJS += quote.o\n LIB_OBJS += reachable.o\n LIB_OBJS += read-cache.o\n+LIB_OBJS += read-cache-v2.o\n LIB_OBJS += reflog-walk.o\n LIB_OBJS += refs.o\n LIB_OBJS += remote.o\ndiff --git a/builtin/apply.c b/builtin/apply.c\nindex 50912c9..3d5a5dc 100644\n--- a/builtin/apply.c\n+++ b/builtin/apply.c\n@@ -3682,6 +3682,8 @@ static void build_fake_ancestor(struct patch *list, const char *filename)\n \t\t\tdie (\"Could not add %s to temporary index\", name);\n \t}\n \n+\tif (!result.initialized)\n+\t\tinitialize_index(&result, 0);\n \tfd = open(filename, O_WRONLY | O_CREAT, 0666);\n \tif (fd < 0 || write_index(&result, fd) || close(fd))\n \t\tdie (\"Could not write temporary index to %s\", filename);\ndiff --git a/builtin/update-index.c b/builtin/update-index.c\nindex e3a10d7..c5bb889 100644\n--- a/builtin/update-index.c\n+++ b/builtin/update-index.c\n@@ -863,7 +863,7 @@ int cmd_update_index(int argc, const char **argv, const char *prefix)\n \n \t\tif (the_index.version != preferred_index_format)\n \t\t\tactive_cache_changed = 1;\n-\t\tthe_index.version = preferred_index_format;\n+\t\tchange_cache_version(preferred_index_format);\n \t}\n \n \tif (read_from_stdin) {\ndiff --git a/cache.h b/cache.h\nindex 9ef778a..d4dae21 100644\n--- a/cache.h\n+++ b/cache.h\n@@ -95,16 +95,8 @@ unsigned long git_deflate_bound(git_zstream *, unsigned long);\n */\n #define DEFAULT_GIT_PORT 9418\n \n-/*\n- * Basic data structures for the directory cache\n- */\n \n #define CACHE_SIGNATURE 0x44495243\t/* \"DIRC\" */\n-struct cache_header {\n-\tuint32_t hdr_signature;\n-\tuint32_t hdr_version;\n-\tuint32_t hdr_entries;\n-};\n \n #define INDEX_FORMAT_LB 2\n #define INDEX_FORMAT_UB 4\n@@ -279,6 +271,7 @@ struct index_state {\n \t\t initialized : 1;\n \tstruct hash_table name_hash;\n \tstruct hash_table dir_hash;\n+\tstruct index_ops *ops;\n };\n \n extern struct index_state the_index;\n@@ -296,6 +289,8 @@ extern void free_name_hash(struct index_state *istate);\n #define active_cache_changed (the_index.cache_changed)\n #define active_cache_tree (the_index.cache_tree)\n \n+#define initialize_cache() initialize_index(&the_index, 0)\n+#define change_cache_version(version) change_index_version(&the_index, (version))\n #define read_cache() read_index(&the_index)\n #define read_cache_from(path) read_index_from(&the_index, (path))\n #define read_cache_preload(pathspec) read_index_preload(&the_index, (pathspec))\n@@ -454,6 +449,8 @@ extern void sanitize_stdfds(void);\n \t} while (0)\n \n /* Initialize and use the cache information */\n+extern void initialize_index(struct index_state *istate, int version);\n+extern void change_index_version(struct index_state *istate, int version);\n extern int read_index(struct index_state *);\n extern int read_index_preload(struct index_state *, const struct pathspec *pathspec);\n extern int read_index_from(struct index_state *, const char *path);\ndiff --git a/read-cache-v2.c b/read-cache-v2.c\nnew file mode 100644\nindex 0000000..070d468\n--- /dev/null\n+++ b/read-cache-v2.c\n@@ -0,0 +1,544 @@\n+#include \"cache.h\"\n+#include \"read-cache.h\"\n+#include \"resolve-undo.h\"\n+#include \"cache-tree.h\"\n+#include \"varint.h\"\n+\n+/* Mask for the name length in ce_flags in the on-disk index */\n+#define CE_NAMEMASK (0x0fff)\n+\n+/*****************************************************************\n+ * Index File I/O\n+ *****************************************************************/\n+\n+/*\n+ * dev/ino/uid/gid/size are also just tracked to the low 32 bits\n+ * Again - this is just a (very strong in practice) heuristic that\n+ * the inode hasn't changed.\n+ *\n+ * We save the fields in big-endian order to allow using the\n+ * index file over NFS transparently.\n+ */\n+struct ondisk_cache_entry {\n+\tstruct cache_time ctime;\n+\tstruct cache_time mtime;\n+\tuint32_t dev;\n+\tuint32_t ino;\n+\tuint32_t mode;\n+\tuint32_t uid;\n+\tuint32_t gid;\n+\tuint32_t size;\n+\tunsigned char sha1[20];\n+\tuint16_t flags;\n+\tchar name[FLEX_ARRAY]; /* more */\n+};\n+\n+/*\n+ * This struct is used when CE_EXTENDED bit is 1\n+ * The struct must match ondisk_cache_entry exactly from\n+ * ctime till flags\n+ */\n+struct ondisk_cache_entry_extended {\n+\tstruct cache_time ctime;\n+\tstruct cache_time mtime;\n+\tuint32_t dev;\n+\tuint32_t ino;\n+\tuint32_t mode;\n+\tuint32_t uid;\n+\tuint32_t gid;\n+\tuint32_t size;\n+\tunsigned char sha1[20];\n+\tuint16_t flags;\n+\tuint16_t flags2;\n+\tchar name[FLEX_ARRAY]; /* more */\n+};\n+\n+/* These are only used for v3 or lower */\n+#define align_flex_name(STRUCT,len) ((offsetof(struct STRUCT,name) + (len) + 8) & ~7)\n+#define ondisk_cache_entry_size(len) align_flex_name(ondisk_cache_entry,len)\n+#define ondisk_cache_entry_extended_size(len) align_flex_name(ondisk_cache_entry_extended,len)\n+#define ondisk_ce_size(ce) (((ce)->ce_flags & CE_EXTENDED) ? \\\n+\t\t\t ondisk_cache_entry_extended_size(ce_namelen(ce)) : \\\n+\t\t\t ondisk_cache_entry_size(ce_namelen(ce)))\n+\n+static int verify_hdr(void *mmap, unsigned long size)\n+{\n+\tgit_SHA_CTX c;\n+\tunsigned char sha1[20];\n+\n+\tif (size < + sizeof(struct cache_header) + 20)\n+\t\tdie(\"index file smaller than expected\");\n+\n+\tgit_SHA1_Init(&c);\n+\tgit_SHA1_Update(&c, mmap, size - 20);\n+\tgit_SHA1_Final(sha1, &c);\n+\tif (hashcmp(sha1, (unsigned char *)mmap + size - 20))\n+\t\treturn error(\"bad index file sha1 signature\");\n+\treturn 0;\n+}\n+\n+static int match_stat_basic(const struct cache_entry *ce,\n+\t\t\t struct stat *st, int changed)\n+{\n+\tchanged |= match_stat_data(&ce->ce_stat_data, st);\n+\n+\t/* Racily smudged entry? */\n+\tif (!ce->ce_stat_data.sd_size) {\n+\t\tif (!is_empty_blob_sha1(ce->sha1))\n+\t\t\tchanged |= DATA_CHANGED;\n+\t}\n+\treturn changed;\n+}\n+\n+static struct cache_entry *cache_entry_from_ondisk(struct ondisk_cache_entry *ondisk,\n+\t\t\t\t\t\t unsigned int flags,\n+\t\t\t\t\t\t const char *name,\n+\t\t\t\t\t\t size_t len)\n+{\n+\tstruct cache_entry *ce = xmalloc(cache_entry_size(len));\n+\n+\tce->ce_stat_data.sd_ctime.sec = ntoh_l(ondisk->ctime.sec);\n+\tce->ce_stat_data.sd_mtime.sec = ntoh_l(ondisk->mtime.sec);\n+\tce->ce_stat_data.sd_ctime.nsec = ntoh_l(ondisk->ctime.nsec);\n+\tce->ce_stat_data.sd_mtime.nsec = ntoh_l(ondisk->mtime.nsec);\n+\tce->ce_stat_data.sd_dev = ntoh_l(ondisk->dev);\n+\tce->ce_stat_data.sd_ino = ntoh_l(ondisk->ino);\n+\tce->ce_mode = ntoh_l(ondisk->mode);\n+\tce->ce_stat_data.sd_uid = ntoh_l(ondisk->uid);\n+\tce->ce_stat_data.sd_gid = ntoh_l(ondisk->gid);\n+\tce->ce_stat_data.sd_size = ntoh_l(ondisk->size);\n+\tce->ce_flags = flags & ~CE_NAMEMASK;\n+\tce->ce_namelen = len;\n+\thashcpy(ce->sha1, ondisk->sha1);\n+\tmemcpy(ce->name, name, len);\n+\tce->name[len] = '\\0';\n+\treturn ce;\n+}\n+\n+/*\n+ * Adjacent cache entries tend to share the leading paths, so it makes\n+ * sense to only store the differences in later entries. In the v4\n+ * on-disk format of the index, each on-disk cache entry stores the\n+ * number of bytes to be stripped from the end of the previous name,\n+ * and the bytes to append to the result, to come up with its name.\n+ */\n+static unsigned long expand_name_field(struct strbuf *name, const char *cp_)\n+{\n+\tconst unsigned char *ep, *cp = (const unsigned char *)cp_;\n+\tsize_t len = decode_varint(&cp);\n+\n+\tif (name->len < len)\n+\t\tdie(\"malformed name field in the index\");\n+\tstrbuf_remove(name, name->len - len, len);\n+\tfor (ep = cp; *ep; ep++)\n+\t\t; /* find the end */\n+\tstrbuf_add(name, cp, ep - cp);\n+\treturn (const char *)ep + 1 - cp_;\n+}\n+\n+static struct cache_entry *create_from_disk(struct ondisk_cache_entry *ondisk,\n+\t\t\t\t\t unsigned long *ent_size,\n+\t\t\t\t\t struct strbuf *previous_name)\n+{\n+\tstruct cache_entry *ce;\n+\tsize_t len;\n+\tconst char *name;\n+\tunsigned int flags;\n+\n+\t/* On-disk flags are just 16 bits */\n+\tflags = ntoh_s(ondisk->flags);\n+\tlen = flags & CE_NAMEMASK;\n+\n+\tif (flags & CE_EXTENDED) {\n+\t\tstruct ondisk_cache_entry_extended *ondisk2;\n+\t\tint extended_flags;\n+\t\tondisk2 = (struct ondisk_cache_entry_extended *)ondisk;\n+\t\textended_flags = ntoh_s(ondisk2->flags2) << 16;\n+\t\t/* We do not yet understand any bit out of CE_EXTENDED_FLAGS */\n+\t\tif (extended_flags & ~CE_EXTENDED_FLAGS)\n+\t\t\tdie(\"Unknown index entry format %08x\", extended_flags);\n+\t\tflags |= extended_flags;\n+\t\tname = ondisk2->name;\n+\t}\n+\telse\n+\t\tname = ondisk->name;\n+\n+\tif (!previous_name) {\n+\t\t/* v3 and earlier */\n+\t\tif (len == CE_NAMEMASK)\n+\t\t\tlen = strlen(name);\n+\t\tce = cache_entry_from_ondisk(ondisk, flags, name, len);\n+\n+\t\t*ent_size = ondisk_ce_size(ce);\n+\t} else {\n+\t\tunsigned long consumed;\n+\t\tconsumed = expand_name_field(previous_name, name);\n+\t\tce = cache_entry_from_ondisk(ondisk, flags,\n+\t\t\t\t\t previous_name->buf,\n+\t\t\t\t\t previous_name->len);\n+\n+\t\t*ent_size = (name - ((char *)ondisk)) + consumed;\n+\t}\n+\treturn ce;\n+}\n+\n+static int read_index_extension(struct index_state *istate,\n+\t\t\t\tconst char *ext, void *data, unsigned long sz)\n+{\n+\tswitch (CACHE_EXT(ext)) {\n+\tcase CACHE_EXT_TREE:\n+\t\tistate->cache_tree = cache_tree_read(data, sz);\n+\t\tbreak;\n+\tcase CACHE_EXT_RESOLVE_UNDO:\n+\t\tistate->resolve_undo = resolve_undo_read(data, sz);\n+\t\tbreak;\n+\tdefault:\n+\t\tif (*ext < 'A' || 'Z' < *ext)\n+\t\t\treturn error(\"index uses %.4s extension, which we do not understand\",\n+\t\t\t\t ext);\n+\t\tfprintf(stderr, \"ignoring %.4s extension\\n\", ext);\n+\t\tbreak;\n+\t}\n+\treturn 0;\n+}\n+\n+static int read_index_v2(struct index_state *istate, void *mmap,\n+\t\t\t unsigned long mmap_size)\n+{\n+\tint i;\n+\tunsigned long src_offset;\n+\tstruct cache_header *hdr;\n+\tstruct strbuf previous_name_buf = STRBUF_INIT, *previous_name;\n+\n+\thdr = mmap;\n+\tistate->cache_nr = ntohl(hdr->hdr_entries);\n+\tistate->cache_alloc = alloc_nr(istate->cache_nr);\n+\tistate->cache = xcalloc(istate->cache_alloc, sizeof(struct cache_entry *));\n+\n+\tif (istate->version == 4)\n+\t\tprevious_name = &previous_name_buf;\n+\telse\n+\t\tprevious_name = NULL;\n+\n+\tsrc_offset = sizeof(*hdr);\n+\tfor (i = 0; i < istate->cache_nr; i++) {\n+\t\tstruct ondisk_cache_entry *disk_ce;\n+\t\tstruct cache_entry *ce;\n+\t\tunsigned long consumed;\n+\n+\t\tdisk_ce = (struct ondisk_cache_entry *)((char *)mmap + src_offset);\n+\t\tce = create_from_disk(disk_ce, &consumed, previous_name);\n+\t\tset_index_entry(istate, i, ce);\n+\n+\t\tsrc_offset += consumed;\n+\t}\n+\tstrbuf_release(&previous_name_buf);\n+\n+\twhile (src_offset <= mmap_size - 20 - 8) {\n+\t\t/* After an array of active_nr index entries,\n+\t\t * there can be arbitrary number of extended\n+\t\t * sections, each of which is prefixed with\n+\t\t * extension name (4-byte) and section length\n+\t\t * in 4-byte network byte order.\n+\t\t */\n+\t\tuint32_t extsize;\n+\t\tmemcpy(&extsize, (char *)mmap + src_offset + 4, 4);\n+\t\textsize = ntohl(extsize);\n+\t\tif (read_index_extension(istate,\n+\t\t\t\t\t(const char *) mmap + src_offset,\n+\t\t\t\t\t(char *) mmap + src_offset + 8,\n+\t\t\t\t\textsize) < 0)\n+\t\t\tgoto unmap;\n+\t\tsrc_offset += 8;\n+\t\tsrc_offset += extsize;\n+\t}\n+\treturn 0;\n+unmap:\n+\tmunmap(mmap, mmap_size);\n+\tdie(\"index file corrupt\");\n+}\n+\n+#define WRITE_BUFFER_SIZE 8192\n+static unsigned char write_buffer[WRITE_BUFFER_SIZE];\n+static unsigned long write_buffer_len;\n+\n+static int ce_write_flush(git_SHA_CTX *context, int fd)\n+{\n+\tunsigned int buffered = write_buffer_len;\n+\tif (buffered) {\n+\t\tgit_SHA1_Update(context, write_buffer, buffered);\n+\t\tif (write_in_full(fd, write_buffer, buffered) != buffered)\n+\t\t\treturn -1;\n+\t\twrite_buffer_len = 0;\n+\t}\n+\treturn 0;\n+}\n+\n+static int ce_write(git_SHA_CTX *context, int fd, void *data, unsigned int len)\n+{\n+\twhile (len) {\n+\t\tunsigned int buffered = write_buffer_len;\n+\t\tunsigned int partial = WRITE_BUFFER_SIZE - buffered;\n+\t\tif (partial > len)\n+\t\t\tpartial = len;\n+\t\tmemcpy(write_buffer + buffered, data, partial);\n+\t\tbuffered += partial;\n+\t\tif (buffered == WRITE_BUFFER_SIZE) {\n+\t\t\twrite_buffer_len = buffered;\n+\t\t\tif (ce_write_flush(context, fd))\n+\t\t\t\treturn -1;\n+\t\t\tbuffered = 0;\n+\t\t}\n+\t\twrite_buffer_len = buffered;\n+\t\tlen -= partial;\n+\t\tdata = (char *) data + partial;\n+\t}\n+\treturn 0;\n+}\n+\n+static int write_index_ext_header(git_SHA_CTX *context, int fd,\n+\t\t\t\t unsigned int ext, unsigned int sz)\n+{\n+\text = htonl(ext);\n+\tsz = htonl(sz);\n+\treturn ((ce_write(context, fd, &ext, 4) < 0) ||\n+\t\t(ce_write(context, fd, &sz, 4) < 0)) ? -1 : 0;\n+}\n+\n+static int ce_flush(git_SHA_CTX *context, int fd)\n+{\n+\tunsigned int left = write_buffer_len;\n+\n+\tif (left) {\n+\t\twrite_buffer_len = 0;\n+\t\tgit_SHA1_Update(context, write_buffer, left);\n+\t}\n+\n+\t/* Flush first if not enough space for SHA1 signature */\n+\tif (left + 20 > WRITE_BUFFER_SIZE) {\n+\t\tif (write_in_full(fd, write_buffer, left) != left)\n+\t\t\treturn -1;\n+\t\tleft = 0;\n+\t}\n+\n+\t/* Append the SHA1 signature at the end */\n+\tgit_SHA1_Final(write_buffer + left, context);\n+\tleft += 20;\n+\treturn (write_in_full(fd, write_buffer, left) != left) ? -1 : 0;\n+}\n+\n+static void ce_smudge_racily_clean_entry(struct index_state *istate, struct cache_entry *ce)\n+{\n+\t/*\n+\t * The only thing we care about in this function is to smudge the\n+\t * falsely clean entry due to touch-update-touch race, so we leave\n+\t * everything else as they are. We are called for entries whose\n+\t * ce_stat_data.sd_mtime match the index file mtime.\n+\t *\n+\t * Note that this actually does not do much for gitlinks, for\n+\t * which ce_match_stat_basic() always goes to the actual\n+\t * contents. The caller checks with is_racy_timestamp() which\n+\t * always says \"no\" for gitlinks, so we are not called for them ;-)\n+\t */\n+\tstruct stat st;\n+\n+\tif (lstat(ce->name, &st) < 0)\n+\t\treturn;\n+\tif (ce_match_stat_basic(istate, ce, &st))\n+\t\treturn;\n+\tif (ce_modified_check_fs(ce, &st)) {\n+\t\t/* This is \"racily clean\"; smudge it. Note that this\n+\t\t * is a tricky code. At first glance, it may appear\n+\t\t * that it can break with this sequence:\n+\t\t *\n+\t\t * $ echo xyzzy >frotz\n+\t\t * $ git-update-index --add frotz\n+\t\t * $ : >frotz\n+\t\t * $ sleep 3\n+\t\t * $ echo filfre >nitfol\n+\t\t * $ git-update-index --add nitfol\n+\t\t *\n+\t\t * but it does not. When the second update-index runs,\n+\t\t * it notices that the entry \"frotz\" has the same timestamp\n+\t\t * as index, and if we were to smudge it by resetting its\n+\t\t * size to zero here, then the object name recorded\n+\t\t * in index is the 6-byte file but the cached stat information\n+\t\t * becomes zero --- which would then match what we would\n+\t\t * obtain from the filesystem next time we stat(\"frotz\").\n+\t\t *\n+\t\t * However, the second update-index, before calling\n+\t\t * this function, notices that the cached size is 6\n+\t\t * bytes and what is on the filesystem is an empty\n+\t\t * file, and never calls us, so the cached size information\n+\t\t * for \"frotz\" stays 6 which does not match the filesystem.\n+\t\t */\n+\t\tce->ce_stat_data.sd_size = 0;\n+\t}\n+}\n+\n+/* Copy miscellaneous fields but not the name */\n+static char *copy_cache_entry_to_ondisk(struct ondisk_cache_entry *ondisk,\n+\t\t\t\t struct cache_entry *ce)\n+{\n+\tshort flags;\n+\n+\tondisk->ctime.sec = htonl(ce->ce_stat_data.sd_ctime.sec);\n+\tondisk->mtime.sec = htonl(ce->ce_stat_data.sd_mtime.sec);\n+\tondisk->ctime.nsec = htonl(ce->ce_stat_data.sd_ctime.nsec);\n+\tondisk->mtime.nsec = htonl(ce->ce_stat_data.sd_mtime.nsec);\n+\tondisk->dev = htonl(ce->ce_stat_data.sd_dev);\n+\tondisk->ino = htonl(ce->ce_stat_data.sd_ino);\n+\tondisk->mode = htonl(ce->ce_mode);\n+\tondisk->uid = htonl(ce->ce_stat_data.sd_uid);\n+\tondisk->gid = htonl(ce->ce_stat_data.sd_gid);\n+\tondisk->size = htonl(ce->ce_stat_data.sd_size);\n+\thashcpy(ondisk->sha1, ce->sha1);\n+\n+\tflags = ce->ce_flags;\n+\tflags |= (ce_namelen(ce) >= CE_NAMEMASK ? CE_NAMEMASK : ce_namelen(ce));\n+\tondisk->flags = htons(flags);\n+\tif (ce->ce_flags & CE_EXTENDED) {\n+\t\tstruct ondisk_cache_entry_extended *ondisk2;\n+\t\tondisk2 = (struct ondisk_cache_entry_extended *)ondisk;\n+\t\tondisk2->flags2 = htons((ce->ce_flags & CE_EXTENDED_FLAGS) >> 16);\n+\t\treturn ondisk2->name;\n+\t}\n+\telse {\n+\t\treturn ondisk->name;\n+\t}\n+}\n+\n+static int ce_write_entry(git_SHA_CTX *c, int fd, struct cache_entry *ce,\n+\t\t\t struct strbuf *previous_name)\n+{\n+\tint size;\n+\tstruct ondisk_cache_entry *ondisk;\n+\tchar *name;\n+\tint result;\n+\n+\tif (!previous_name) {\n+\t\tsize = ondisk_ce_size(ce);\n+\t\tondisk = xcalloc(1, size);\n+\t\tname = copy_cache_entry_to_ondisk(ondisk, ce);\n+\t\tmemcpy(name, ce->name, ce_namelen(ce));\n+\t} else {\n+\t\tint common, to_remove, prefix_size;\n+\t\tunsigned char to_remove_vi[16];\n+\t\tfor (common = 0;\n+\t\t (ce->name[common] &&\n+\t\t common < previous_name->len &&\n+\t\t ce->name[common] == previous_name->buf[common]);\n+\t\t common++)\n+\t\t\t; /* still matching */\n+\t\tto_remove = previous_name->len - common;\n+\t\tprefix_size = encode_varint(to_remove, to_remove_vi);\n+\n+\t\tif (ce->ce_flags & CE_EXTENDED)\n+\t\t\tsize = offsetof(struct ondisk_cache_entry_extended, name);\n+\t\telse\n+\t\t\tsize = offsetof(struct ondisk_cache_entry, name);\n+\t\tsize += prefix_size + (ce_namelen(ce) - common + 1);\n+\n+\t\tondisk = xcalloc(1, size);\n+\t\tname = copy_cache_entry_to_ondisk(ondisk, ce);\n+\t\tmemcpy(name, to_remove_vi, prefix_size);\n+\t\tmemcpy(name + prefix_size, ce->name + common, ce_namelen(ce) - common);\n+\n+\t\tstrbuf_splice(previous_name, common, to_remove,\n+\t\t\t ce->name + common, ce_namelen(ce) - common);\n+\t}\n+\n+\tresult = ce_write(c, fd, ondisk, size);\n+\tfree(ondisk);\n+\treturn result;\n+}\n+\n+static int write_index_v2(struct index_state *istate, int newfd)\n+{\n+\tgit_SHA_CTX c;\n+\tstruct cache_header hdr;\n+\tint i, err, removed, extended, hdr_version;\n+\tstruct cache_entry **cache = istate->cache;\n+\tint entries = istate->cache_nr;\n+\tstruct stat st;\n+\tstruct strbuf previous_name_buf = STRBUF_INIT, *previous_name;\n+\n+\tfor (i = removed = extended = 0; i < entries; i++) {\n+\t\tif (cache[i]->ce_flags & CE_REMOVE)\n+\t\t\tremoved++;\n+\n+\t\t/* reduce extended entries if possible */\n+\t\tcache[i]->ce_flags &= ~CE_EXTENDED;\n+\t\tif (cache[i]->ce_flags & CE_EXTENDED_FLAGS) {\n+\t\t\textended++;\n+\t\t\tcache[i]->ce_flags |= CE_EXTENDED;\n+\t\t}\n+\t}\n+\n+\tif (!istate->version)\n+\t\tistate->version = INDEX_FORMAT_DEFAULT;\n+\n+\t/* demote version 3 to version 2 when the latter suffices */\n+\tif (istate->version == 3 || istate->version == 2)\n+\t\tistate->version = extended ? 3 : 2;\n+\n+\thdr_version = istate->version;\n+\n+\thdr.hdr_signature = htonl(CACHE_SIGNATURE);\n+\thdr.hdr_version = htonl(hdr_version);\n+\thdr.hdr_entries = htonl(entries - removed);\n+\n+\tgit_SHA1_Init(&c);\n+\tif (ce_write(&c, newfd, &hdr, sizeof(hdr)) < 0)\n+\t\treturn -1;\n+\n+\tprevious_name = (hdr_version == 4) ? &previous_name_buf : NULL;\n+\tfor (i = 0; i < entries; i++) {\n+\t\tstruct cache_entry *ce = cache[i];\n+\t\tif (ce->ce_flags & CE_REMOVE)\n+\t\t\tcontinue;\n+\t\tif (!ce_uptodate(ce) && is_racy_timestamp(istate, ce))\n+\t\t\tce_smudge_racily_clean_entry(istate, ce);\n+\t\tif (is_null_sha1(ce->sha1))\n+\t\t\treturn error(\"cache entry has null sha1: %s\", ce->name);\n+\t\tif (ce_write_entry(&c, newfd, ce, previous_name) < 0)\n+\t\t\treturn -1;\n+\t}\n+\tstrbuf_release(&previous_name_buf);\n+\n+\t/* Write extension data here */\n+\tif (istate->cache_tree) {\n+\t\tstruct strbuf sb = STRBUF_INIT;\n+\n+\t\tcache_tree_write(&sb, istate->cache_tree);\n+\t\terr = write_index_ext_header(&c, newfd, CACHE_EXT_TREE, sb.len) < 0\n+\t\t\t|| ce_write(&c, newfd, sb.buf, sb.len) < 0;\n+\t\tstrbuf_release(&sb);\n+\t\tif (err)\n+\t\t\treturn -1;\n+\t}\n+\tif (istate->resolve_undo) {\n+\t\tstruct strbuf sb = STRBUF_INIT;\n+\n+\t\tresolve_undo_write(&sb, istate->resolve_undo);\n+\t\terr = write_index_ext_header(&c, newfd, CACHE_EXT_RESOLVE_UNDO,\n+\t\t\t\t\t sb.len) < 0\n+\t\t\t|| ce_write(&c, newfd, sb.buf, sb.len) < 0;\n+\t\tstrbuf_release(&sb);\n+\t\tif (err)\n+\t\t\treturn -1;\n+\t}\n+\n+\tif (ce_flush(&c, newfd) || fstat(newfd, &st))\n+\t\treturn -1;\n+\tistate->timestamp.sec = (unsigned int)st.st_mtime;\n+\tistate->timestamp.nsec = ST_MTIME_NSEC(st);\n+\treturn 0;\n+}\n+\n+struct index_ops v2_ops = {\n+\tmatch_stat_basic,\n+\tverify_hdr,\n+\tread_index_v2,\n+\twrite_index_v2\n+};\ndiff --git a/read-cache.c b/read-cache.c\nindex 1e22f6f..1f827de 100644\n--- a/read-cache.c\n+++ b/read-cache.c\n@@ -5,6 +5,7 @@\n */\n #define NO_THE_INDEX_COMPATIBILITY_MACROS\n #include \"cache.h\"\n+#include \"read-cache.h\"\n #include \"cache-tree.h\"\n #include \"refs.h\"\n #include \"dir.h\"\n@@ -17,26 +18,9 @@\n \n static struct cache_entry *refresh_cache_entry(struct cache_entry *ce, int really);\n \n-/* Mask for the name length in ce_flags in the on-disk index */\n-\n-#define CE_NAMEMASK (0x0fff)\n-\n-/* Index extensions.\n- *\n- * The first letter should be 'A'..'Z' for extensions that are not\n- * necessary for a correct operation (i.e. optimization data).\n- * When new extensions are added that _needs_ to be understood in\n- * order to correctly interpret the index file, pick character that\n- * is outside the range, to cause the reader to abort.\n- */\n-\n-#define CACHE_EXT(s) ( (s[0]<<24)|(s[1]<<16)|(s[2]<<8)|(s[3]) )\n-#define CACHE_EXT_TREE 0x54524545\t/* \"TREE\" */\n-#define CACHE_EXT_RESOLVE_UNDO 0x52455543 /* \"REUC\" */\n-\n struct index_state the_index;\n \n-static void set_index_entry(struct index_state *istate, int nr, struct cache_entry *ce)\n+void set_index_entry(struct index_state *istate, int nr, struct cache_entry *ce)\n {\n \tistate->cache[nr] = ce;\n \tadd_name_hash(istate, ce);\n@@ -190,7 +174,7 @@ static int ce_compare_gitlink(const struct cache_entry *ce)\n \treturn hashcmp(sha1, ce->sha1);\n }\n \n-static int ce_modified_check_fs(const struct cache_entry *ce, struct stat *st)\n+int ce_modified_check_fs(const struct cache_entry *ce, struct stat *st)\n {\n \tswitch (st->st_mode & S_IFMT) {\n \tcase S_IFREG:\n@@ -210,7 +194,18 @@ static int ce_modified_check_fs(const struct cache_entry *ce, struct stat *st)\n \treturn 0;\n }\n \n-static int ce_match_stat_basic(const struct cache_entry *ce, struct stat *st)\n+/*\n+ * Check if the reading/writing operations are set and set them\n+ * to the correct version\n+ */\n+static void set_istate_ops(struct index_state *istate)\n+{\n+\tif (istate->version >= 2 && istate->version <= 4)\n+\t\tistate->ops = &v2_ops;\n+}\n+\n+int ce_match_stat_basic(const struct index_state *istate,\n+\t\t\tconst struct cache_entry *ce, struct stat *st)\n {\n \tunsigned int changed = 0;\n \n@@ -243,19 +238,13 @@ static int ce_match_stat_basic(const struct cache_entry *ce, struct stat *st)\n \t\tdie(\"internal error: ce_mode is %o\", ce->ce_mode);\n \t}\n \n-\tchanged |= match_stat_data(&ce->ce_stat_data, st);\n-\n-\t/* Racily smudged entry? */\n-\tif (!ce->ce_stat_data.sd_size) {\n-\t\tif (!is_empty_blob_sha1(ce->sha1))\n-\t\t\tchanged |= DATA_CHANGED;\n-\t}\n-\n+\tchanged = istate->ops->match_stat_basic(ce, st, changed);\n \treturn changed;\n }\n \n-static int is_racy_timestamp(const struct index_state *istate,\n-\t\t\t const struct cache_entry *ce)\n+\n+int is_racy_timestamp(const struct index_state *istate,\n+\t\t const struct cache_entry *ce)\n {\n \treturn (!S_ISGITLINK(ce->ce_mode) &&\n \t\tistate->timestamp.sec &&\n@@ -298,7 +287,7 @@ int ie_match_stat(const struct index_state *istate,\n \tif (ce->ce_flags & CE_INTENT_TO_ADD)\n \t\treturn DATA_CHANGED | TYPE_CHANGED | MODE_CHANGED;\n \n-\tchanged = ce_match_stat_basic(ce, st);\n+\tchanged = ce_match_stat_basic(istate, ce, st);\n \n \t/*\n \t * Within 1 second of this sequence:\n@@ -982,6 +971,8 @@ int add_index_entry(struct index_state *istate, struct cache_entry *ce, int opti\n {\n \tint pos;\n \n+\tif (!istate->initialized)\n+\t\tinitialize_index(istate, INDEX_FORMAT_DEFAULT);\n \tif (option & ADD_CACHE_JUST_APPEND)\n \t\tpos = istate->cache_nr;\n \telse {\n@@ -1212,13 +1203,25 @@ static struct cache_entry *refresh_cache_entry(struct cache_entry *ce, int reall\n \treturn refresh_cache_ent(&the_index, ce, really, NULL, NULL);\n }\n \n+void initialize_index(struct index_state *istate, int version)\n+{\n+\tistate->initialized = 1;\n+\tif (!version)\n+\t\tversion = INDEX_FORMAT_DEFAULT;\n+\tistate->version = version;\n+\tset_istate_ops(istate);\n+}\n+\n+void change_index_version(struct index_state *istate, int version)\n+{\n+\tistate->version = version;\n+\tset_istate_ops(istate);\n+}\n \n /*****************************************************************\n * Index File I/O\n *****************************************************************/\n \n-#define INDEX_FORMAT_DEFAULT 3\n-\n /*\n * dev/ino/uid/gid/size are also just tracked to the low 32 bits\n * Again - this is just a (very strong in practice) heuristic that\n@@ -1269,7 +1272,8 @@ struct ondisk_cache_entry_extended {\n \t\t\t ondisk_cache_entry_extended_size(ce_namelen(ce)) : \\\n \t\t\t ondisk_cache_entry_size(ce_namelen(ce)))\n \n-static int verify_hdr_version(struct cache_header *hdr, unsigned long size)\n+static int verify_hdr_version(struct index_state *istate,\n+\t\t\t struct cache_header *hdr, unsigned long size)\n {\n \tint hdr_version;\n \n@@ -1278,42 +1282,7 @@ static int verify_hdr_version(struct cache_header *hdr, unsigned long size)\n \thdr_version = ntohl(hdr->hdr_version);\n \tif (hdr_version < INDEX_FORMAT_LB || INDEX_FORMAT_UB < hdr_version)\n \t\treturn error(\"bad index version %d\", hdr_version);\n-\treturn 0;\n-}\n-\n-static int verify_hdr(void *mmap, unsigned long size)\n-{\n-\tgit_SHA_CTX c;\n-\tunsigned char sha1[20];\n-\n-\tif (size < sizeof(struct cache_header) + 20)\n-\t\tdie(\"index file smaller than expected\");\n-\n-\tgit_SHA1_Init(&c);\n-\tgit_SHA1_Update(&c, mmap, size - 20);\n-\tgit_SHA1_Final(sha1, &c);\n-\tif (hashcmp(sha1, (unsigned char *)mmap + size - 20))\n-\t\treturn error(\"bad index file sha1 signature\");\n-\treturn 0;\n-}\n-\n-static int read_index_extension(struct index_state *istate,\n-\t\t\t\tconst char *ext, void *data, unsigned long sz)\n-{\n-\tswitch (CACHE_EXT(ext)) {\n-\tcase CACHE_EXT_TREE:\n-\t\tistate->cache_tree = cache_tree_read(data, sz);\n-\t\tbreak;\n-\tcase CACHE_EXT_RESOLVE_UNDO:\n-\t\tistate->resolve_undo = resolve_undo_read(data, sz);\n-\t\tbreak;\n-\tdefault:\n-\t\tif (*ext < 'A' || 'Z' < *ext)\n-\t\t\treturn error(\"index uses %.4s extension, which we do not understand\",\n-\t\t\t\t ext);\n-\t\tfprintf(stderr, \"ignoring %.4s extension\\n\", ext);\n-\t\tbreak;\n-\t}\n+\tinitialize_index(istate, hdr_version);\n \treturn 0;\n }\n \n@@ -1322,176 +1291,6 @@ int read_index(struct index_state *istate)\n \treturn read_index_from(istate, get_index_file());\n }\n \n-#ifndef NEEDS_ALIGNED_ACCESS\n-#define ntoh_s(var) ntohs(var)\n-#define ntoh_l(var) ntohl(var)\n-#else\n-static inline uint16_t ntoh_s_force_align(void *p)\n-{\n-\tuint16_t x;\n-\tmemcpy(&x, p, sizeof(x));\n-\treturn ntohs(x);\n-}\n-static inline uint32_t ntoh_l_force_align(void *p)\n-{\n-\tuint32_t x;\n-\tmemcpy(&x, p, sizeof(x));\n-\treturn ntohl(x);\n-}\n-#define ntoh_s(var) ntoh_s_force_align(&(var))\n-#define ntoh_l(var) ntoh_l_force_align(&(var))\n-#endif\n-\n-static struct cache_entry *cache_entry_from_ondisk(struct ondisk_cache_entry *ondisk,\n-\t\t\t\t\t\t unsigned int flags,\n-\t\t\t\t\t\t const char *name,\n-\t\t\t\t\t\t size_t len)\n-{\n-\tstruct cache_entry *ce = xmalloc(cache_entry_size(len));\n-\n-\tce->ce_stat_data.sd_ctime.sec = ntoh_l(ondisk->ctime.sec);\n-\tce->ce_stat_data.sd_mtime.sec = ntoh_l(ondisk->mtime.sec);\n-\tce->ce_stat_data.sd_ctime.nsec = ntoh_l(ondisk->ctime.nsec);\n-\tce->ce_stat_data.sd_mtime.nsec = ntoh_l(ondisk->mtime.nsec);\n-\tce->ce_stat_data.sd_dev = ntoh_l(ondisk->dev);\n-\tce->ce_stat_data.sd_ino = ntoh_l(ondisk->ino);\n-\tce->ce_mode = ntoh_l(ondisk->mode);\n-\tce->ce_stat_data.sd_uid = ntoh_l(ondisk->uid);\n-\tce->ce_stat_data.sd_gid = ntoh_l(ondisk->gid);\n-\tce->ce_stat_data.sd_size = ntoh_l(ondisk->size);\n-\tce->ce_flags = flags & ~CE_NAMEMASK;\n-\tce->ce_namelen = len;\n-\thashcpy(ce->sha1, ondisk->sha1);\n-\tmemcpy(ce->name, name, len);\n-\tce->name[len] = '\\0';\n-\treturn ce;\n-}\n-\n-/*\n- * Adjacent cache entries tend to share the leading paths, so it makes\n- * sense to only store the differences in later entries. In the v4\n- * on-disk format of the index, each on-disk cache entry stores the\n- * number of bytes to be stripped from the end of the previous name,\n- * and the bytes to append to the result, to come up with its name.\n- */\n-static unsigned long expand_name_field(struct strbuf *name, const char *cp_)\n-{\n-\tconst unsigned char *ep, *cp = (const unsigned char *)cp_;\n-\tsize_t len = decode_varint(&cp);\n-\n-\tif (name->len < len)\n-\t\tdie(\"malformed name field in the index\");\n-\tstrbuf_remove(name, name->len - len, len);\n-\tfor (ep = cp; *ep; ep++)\n-\t\t; /* find the end */\n-\tstrbuf_add(name, cp, ep - cp);\n-\treturn (const char *)ep + 1 - cp_;\n-}\n-\n-static struct cache_entry *create_from_disk(struct ondisk_cache_entry *ondisk,\n-\t\t\t\t\t unsigned long *ent_size,\n-\t\t\t\t\t struct strbuf *previous_name)\n-{\n-\tstruct cache_entry *ce;\n-\tsize_t len;\n-\tconst char *name;\n-\tunsigned int flags;\n-\n-\t/* On-disk flags are just 16 bits */\n-\tflags = ntoh_s(ondisk->flags);\n-\tlen = flags & CE_NAMEMASK;\n-\n-\tif (flags & CE_EXTENDED) {\n-\t\tstruct ondisk_cache_entry_extended *ondisk2;\n-\t\tint extended_flags;\n-\t\tondisk2 = (struct ondisk_cache_entry_extended *)ondisk;\n-\t\textended_flags = ntoh_s(ondisk2->flags2) << 16;\n-\t\t/* We do not yet understand any bit out of CE_EXTENDED_FLAGS */\n-\t\tif (extended_flags & ~CE_EXTENDED_FLAGS)\n-\t\t\tdie(\"Unknown index entry format %08x\", extended_flags);\n-\t\tflags |= extended_flags;\n-\t\tname = ondisk2->name;\n-\t}\n-\telse\n-\t\tname = ondisk->name;\n-\n-\tif (!previous_name) {\n-\t\t/* v3 and earlier */\n-\t\tif (len == CE_NAMEMASK)\n-\t\t\tlen = strlen(name);\n-\t\tce = cache_entry_from_ondisk(ondisk, flags, name, len);\n-\n-\t\t*ent_size = ondisk_ce_size(ce);\n-\t} else {\n-\t\tunsigned long consumed;\n-\t\tconsumed = expand_name_field(previous_name, name);\n-\t\tce = cache_entry_from_ondisk(ondisk, flags,\n-\t\t\t\t\t previous_name->buf,\n-\t\t\t\t\t previous_name->len);\n-\n-\t\t*ent_size = (name - ((char *)ondisk)) + consumed;\n-\t}\n-\treturn ce;\n-}\n-\n-static int read_index_v2(struct index_state *istate, void *mmap, unsigned long mmap_size)\n-{\n-\tint i;\n-\tunsigned long src_offset;\n-\tstruct cache_header *hdr;\n-\tstruct strbuf previous_name_buf = STRBUF_INIT, *previous_name;\n-\n-\thdr = mmap;\n-\n-\tistate->version = ntohl(hdr->hdr_version);\n-\tistate->cache_nr = ntohl(hdr->hdr_entries);\n-\tistate->cache_alloc = alloc_nr(istate->cache_nr);\n-\tistate->cache = xcalloc(istate->cache_alloc, sizeof(*istate->cache));\n-\tistate->initialized = 1;\n-\n-\tif (istate->version == 4)\n-\t\tprevious_name = &previous_name_buf;\n-\telse\n-\t\tprevious_name = NULL;\n-\n-\tsrc_offset = sizeof(*hdr);\n-\tfor (i = 0; i < istate->cache_nr; i++) {\n-\t\tstruct ondisk_cache_entry *disk_ce;\n-\t\tstruct cache_entry *ce;\n-\t\tunsigned long consumed;\n-\n-\t\tdisk_ce = (struct ondisk_cache_entry *)((char *)mmap + src_offset);\n-\t\tce = create_from_disk(disk_ce, &consumed, previous_name);\n-\t\tset_index_entry(istate, i, ce);\n-\n-\t\tsrc_offset += consumed;\n-\t}\n-\tstrbuf_release(&previous_name_buf);\n-\n-\twhile (src_offset <= mmap_size - 20 - 8) {\n-\t\t/* After an array of active_nr index entries,\n-\t\t * there can be arbitrary number of extended\n-\t\t * sections, each of which is prefixed with\n-\t\t * extension name (4-byte) and section length\n-\t\t * in 4-byte network byte order.\n-\t\t */\n-\t\tuint32_t extsize;\n-\t\tmemcpy(&extsize, (char *)mmap + src_offset + 4, 4);\n-\t\textsize = ntohl(extsize);\n-\t\tif (read_index_extension(istate,\n-\t\t\t\t\t (const char *) mmap + src_offset,\n-\t\t\t\t\t (char *) mmap + src_offset + 8,\n-\t\t\t\t\t extsize) < 0)\n-\t\t\tgoto unmap;\n-\t\tsrc_offset += 8;\n-\t\tsrc_offset += extsize;\n-\t}\n-\treturn 0;\n-unmap:\n-\tmunmap(mmap, mmap_size);\n-\tdie(\"index file corrupt\");\n-}\n-\n /* remember to discard_cache() before reading a different cache! */\n int read_index_from(struct index_state *istate, const char *path)\n {\n@@ -1508,10 +1307,13 @@ int read_index_from(struct index_state *istate, const char *path)\n \terrno = ENOENT;\n \tistate->timestamp.sec = 0;\n \tistate->timestamp.nsec = 0;\n+\n \tfd = open(path, O_RDONLY);\n \tif (fd < 0) {\n-\t\tif (errno == ENOENT)\n+\t\tif (errno == ENOENT) {\n+\t\t\tinitialize_index(istate, 0);\n \t\t\treturn 0;\n+\t\t}\n \t\tdie_errno(\"index file open failed\");\n \t}\n \n@@ -1520,24 +1322,23 @@ int read_index_from(struct index_state *istate, const char *path)\n \n \terrno = EINVAL;\n \tmmap_size = xsize_t(st.st_size);\n-\tif (mmap_size < sizeof(struct cache_header) + 20)\n-\t\tdie(\"index file smaller than expected\");\n-\n \tmmap = xmmap(NULL, mmap_size, PROT_READ | PROT_WRITE, MAP_PRIVATE, fd, 0);\n \tclose(fd);\n \tif (mmap == MAP_FAILED)\n \t\tdie_errno(\"unable to map index file\");\n \n \thdr = mmap;\n-\tif (verify_hdr_version(hdr, mmap_size) < 0)\n+\tif (verify_hdr_version(istate, hdr, mmap_size) < 0)\n \t\tgoto unmap;\n \n-\tif (verify_hdr(mmap, mmap_size) < 0)\n+\tif (istate->ops->verify_hdr(mmap, mmap_size) < 0)\n \t\tgoto unmap;\n \n-\tread_index_v2(istate, mmap, mmap_size);\n+\tif (istate->ops->read_index(istate, mmap, mmap_size) < 0)\n+\t\tgoto unmap;\n \tistate->timestamp.sec = st.st_mtime;\n \tistate->timestamp.nsec = ST_MTIME_NSEC(st);\n+\n \tmunmap(mmap, mmap_size);\n \treturn istate->cache_nr;\n \n@@ -1569,6 +1370,7 @@ int discard_index(struct index_state *istate)\n \tfree(istate->cache);\n \tistate->cache = NULL;\n \tistate->cache_alloc = 0;\n+\tistate->ops = NULL;\n \treturn 0;\n }\n \n@@ -1582,201 +1384,6 @@ int unmerged_index(const struct index_state *istate)\n \treturn 0;\n }\n \n-#define WRITE_BUFFER_SIZE 8192\n-static unsigned char write_buffer[WRITE_BUFFER_SIZE];\n-static unsigned long write_buffer_len;\n-\n-static int ce_write_flush(git_SHA_CTX *context, int fd)\n-{\n-\tunsigned int buffered = write_buffer_len;\n-\tif (buffered) {\n-\t\tgit_SHA1_Update(context, write_buffer, buffered);\n-\t\tif (write_in_full(fd, write_buffer, buffered) != buffered)\n-\t\t\treturn -1;\n-\t\twrite_buffer_len = 0;\n-\t}\n-\treturn 0;\n-}\n-\n-static int ce_write(git_SHA_CTX *context, int fd, void *data, unsigned int len)\n-{\n-\twhile (len) {\n-\t\tunsigned int buffered = write_buffer_len;\n-\t\tunsigned int partial = WRITE_BUFFER_SIZE - buffered;\n-\t\tif (partial > len)\n-\t\t\tpartial = len;\n-\t\tmemcpy(write_buffer + buffered, data, partial);\n-\t\tbuffered += partial;\n-\t\tif (buffered == WRITE_BUFFER_SIZE) {\n-\t\t\twrite_buffer_len = buffered;\n-\t\t\tif (ce_write_flush(context, fd))\n-\t\t\t\treturn -1;\n-\t\t\tbuffered = 0;\n-\t\t}\n-\t\twrite_buffer_len = buffered;\n-\t\tlen -= partial;\n-\t\tdata = (char *) data + partial;\n-\t}\n-\treturn 0;\n-}\n-\n-static int write_index_ext_header(git_SHA_CTX *context, int fd,\n-\t\t\t\t unsigned int ext, unsigned int sz)\n-{\n-\text = htonl(ext);\n-\tsz = htonl(sz);\n-\treturn ((ce_write(context, fd, &ext, 4) < 0) ||\n-\t\t(ce_write(context, fd, &sz, 4) < 0)) ? -1 : 0;\n-}\n-\n-static int ce_flush(git_SHA_CTX *context, int fd)\n-{\n-\tunsigned int left = write_buffer_len;\n-\n-\tif (left) {\n-\t\twrite_buffer_len = 0;\n-\t\tgit_SHA1_Update(context, write_buffer, left);\n-\t}\n-\n-\t/* Flush first if not enough space for SHA1 signature */\n-\tif (left + 20 > WRITE_BUFFER_SIZE) {\n-\t\tif (write_in_full(fd, write_buffer, left) != left)\n-\t\t\treturn -1;\n-\t\tleft = 0;\n-\t}\n-\n-\t/* Append the SHA1 signature at the end */\n-\tgit_SHA1_Final(write_buffer + left, context);\n-\tleft += 20;\n-\treturn (write_in_full(fd, write_buffer, left) != left) ? -1 : 0;\n-}\n-\n-static void ce_smudge_racily_clean_entry(struct cache_entry *ce)\n-{\n-\t/*\n-\t * The only thing we care about in this function is to smudge the\n-\t * falsely clean entry due to touch-update-touch race, so we leave\n-\t * everything else as they are. We are called for entries whose\n-\t * ce_stat_data.sd_mtime match the index file mtime.\n-\t *\n-\t * Note that this actually does not do much for gitlinks, for\n-\t * which ce_match_stat_basic() always goes to the actual\n-\t * contents. The caller checks with is_racy_timestamp() which\n-\t * always says \"no\" for gitlinks, so we are not called for them ;-)\n-\t */\n-\tstruct stat st;\n-\n-\tif (lstat(ce->name, &st) < 0)\n-\t\treturn;\n-\tif (ce_match_stat_basic(ce, &st))\n-\t\treturn;\n-\tif (ce_modified_check_fs(ce, &st)) {\n-\t\t/* This is \"racily clean\"; smudge it. Note that this\n-\t\t * is a tricky code. At first glance, it may appear\n-\t\t * that it can break with this sequence:\n-\t\t *\n-\t\t * $ echo xyzzy >frotz\n-\t\t * $ git-update-index --add frotz\n-\t\t * $ : >frotz\n-\t\t * $ sleep 3\n-\t\t * $ echo filfre >nitfol\n-\t\t * $ git-update-index --add nitfol\n-\t\t *\n-\t\t * but it does not. When the second update-index runs,\n-\t\t * it notices that the entry \"frotz\" has the same timestamp\n-\t\t * as index, and if we were to smudge it by resetting its\n-\t\t * size to zero here, then the object name recorded\n-\t\t * in index is the 6-byte file but the cached stat information\n-\t\t * becomes zero --- which would then match what we would\n-\t\t * obtain from the filesystem next time we stat(\"frotz\").\n-\t\t *\n-\t\t * However, the second update-index, before calling\n-\t\t * this function, notices that the cached size is 6\n-\t\t * bytes and what is on the filesystem is an empty\n-\t\t * file, and never calls us, so the cached size information\n-\t\t * for \"frotz\" stays 6 which does not match the filesystem.\n-\t\t */\n-\t\tce->ce_stat_data.sd_size = 0;\n-\t}\n-}\n-\n-/* Copy miscellaneous fields but not the name */\n-static char *copy_cache_entry_to_ondisk(struct ondisk_cache_entry *ondisk,\n-\t\t\t\t struct cache_entry *ce)\n-{\n-\tshort flags;\n-\n-\tondisk->ctime.sec = htonl(ce->ce_stat_data.sd_ctime.sec);\n-\tondisk->mtime.sec = htonl(ce->ce_stat_data.sd_mtime.sec);\n-\tondisk->ctime.nsec = htonl(ce->ce_stat_data.sd_ctime.nsec);\n-\tondisk->mtime.nsec = htonl(ce->ce_stat_data.sd_mtime.nsec);\n-\tondisk->dev = htonl(ce->ce_stat_data.sd_dev);\n-\tondisk->ino = htonl(ce->ce_stat_data.sd_ino);\n-\tondisk->mode = htonl(ce->ce_mode);\n-\tondisk->uid = htonl(ce->ce_stat_data.sd_uid);\n-\tondisk->gid = htonl(ce->ce_stat_data.sd_gid);\n-\tondisk->size = htonl(ce->ce_stat_data.sd_size);\n-\thashcpy(ondisk->sha1, ce->sha1);\n-\n-\tflags = ce->ce_flags;\n-\tflags |= (ce_namelen(ce) >= CE_NAMEMASK ? CE_NAMEMASK : ce_namelen(ce));\n-\tondisk->flags = htons(flags);\n-\tif (ce->ce_flags & CE_EXTENDED) {\n-\t\tstruct ondisk_cache_entry_extended *ondisk2;\n-\t\tondisk2 = (struct ondisk_cache_entry_extended *)ondisk;\n-\t\tondisk2->flags2 = htons((ce->ce_flags & CE_EXTENDED_FLAGS) >> 16);\n-\t\treturn ondisk2->name;\n-\t}\n-\telse {\n-\t\treturn ondisk->name;\n-\t}\n-}\n-\n-static int ce_write_entry(git_SHA_CTX *c, int fd, struct cache_entry *ce,\n-\t\t\t struct strbuf *previous_name)\n-{\n-\tint size;\n-\tstruct ondisk_cache_entry *ondisk;\n-\tchar *name;\n-\tint result;\n-\n-\tif (!previous_name) {\n-\t\tsize = ondisk_ce_size(ce);\n-\t\tondisk = xcalloc(1, size);\n-\t\tname = copy_cache_entry_to_ondisk(ondisk, ce);\n-\t\tmemcpy(name, ce->name, ce_namelen(ce));\n-\t} else {\n-\t\tint common, to_remove, prefix_size;\n-\t\tunsigned char to_remove_vi[16];\n-\t\tfor (common = 0;\n-\t\t (ce->name[common] &&\n-\t\t common < previous_name->len &&\n-\t\t ce->name[common] == previous_name->buf[common]);\n-\t\t common++)\n-\t\t\t; /* still matching */\n-\t\tto_remove = previous_name->len - common;\n-\t\tprefix_size = encode_varint(to_remove, to_remove_vi);\n-\n-\t\tif (ce->ce_flags & CE_EXTENDED)\n-\t\t\tsize = offsetof(struct ondisk_cache_entry_extended, name);\n-\t\telse\n-\t\t\tsize = offsetof(struct ondisk_cache_entry, name);\n-\t\tsize += prefix_size + (ce_namelen(ce) - common + 1);\n-\n-\t\tondisk = xcalloc(1, size);\n-\t\tname = copy_cache_entry_to_ondisk(ondisk, ce);\n-\t\tmemcpy(name, to_remove_vi, prefix_size);\n-\t\tmemcpy(name + prefix_size, ce->name + common, ce_namelen(ce) - common);\n-\n-\t\tstrbuf_splice(previous_name, common, to_remove,\n-\t\t\t ce->name + common, ce_namelen(ce) - common);\n-\t}\n-\n-\tresult = ce_write(c, fd, ondisk, size);\n-\tfree(ondisk);\n-\treturn result;\n-}\n-\n static int has_racy_timestamp(struct index_state *istate)\n {\n \tint entries = istate->cache_nr;\n@@ -1802,92 +1409,9 @@ void update_index_if_able(struct index_state *istate, struct lock_file *lockfile\n \t\trollback_lock_file(lockfile);\n }\n \n-static int write_index_v2(struct index_state *istate, int newfd)\n-{\n-\tgit_SHA_CTX c;\n-\tstruct cache_header hdr;\n-\tint i, err, removed, extended, hdr_version;\n-\tstruct cache_entry **cache = istate->cache;\n-\tint entries = istate->cache_nr;\n-\tstruct stat st;\n-\tstruct strbuf previous_name_buf = STRBUF_INIT, *previous_name;\n-\n-\tfor (i = removed = extended = 0; i < entries; i++) {\n-\t\tif (cache[i]->ce_flags & CE_REMOVE)\n-\t\t\tremoved++;\n-\n-\t\t/* reduce extended entries if possible */\n-\t\tcache[i]->ce_flags &= ~CE_EXTENDED;\n-\t\tif (cache[i]->ce_flags & CE_EXTENDED_FLAGS) {\n-\t\t\textended++;\n-\t\t\tcache[i]->ce_flags |= CE_EXTENDED;\n-\t\t}\n-\t}\n-\n-\tif (!istate->version)\n-\t\tistate->version = INDEX_FORMAT_DEFAULT;\n-\n-\t/* demote version 3 to version 2 when the latter suffices */\n-\tif (istate->version == 3 || istate->version == 2)\n-\t\tistate->version = extended ? 3 : 2;\n-\n-\thdr_version = istate->version;\n-\n-\thdr.hdr_signature = htonl(CACHE_SIGNATURE);\n-\thdr.hdr_version = htonl(hdr_version);\n-\thdr.hdr_entries = htonl(entries - removed);\n-\n-\tgit_SHA1_Init(&c);\n-\tif (ce_write(&c, newfd, &hdr, sizeof(hdr)) < 0)\n-\t\treturn -1;\n-\n-\tprevious_name = (hdr_version == 4) ? &previous_name_buf : NULL;\n-\tfor (i = 0; i < entries; i++) {\n-\t\tstruct cache_entry *ce = cache[i];\n-\t\tif (ce->ce_flags & CE_REMOVE)\n-\t\t\tcontinue;\n-\t\tif (!ce_uptodate(ce) && is_racy_timestamp(istate, ce))\n-\t\t\tce_smudge_racily_clean_entry(ce);\n-\t\tif (is_null_sha1(ce->sha1))\n-\t\t\treturn error(\"cache entry has null sha1: %s\", ce->name);\n-\t\tif (ce_write_entry(&c, newfd, ce, previous_name) < 0)\n-\t\t\treturn -1;\n-\t}\n-\tstrbuf_release(&previous_name_buf);\n-\n-\t/* Write extension data here */\n-\tif (istate->cache_tree) {\n-\t\tstruct strbuf sb = STRBUF_INIT;\n-\n-\t\tcache_tree_write(&sb, istate->cache_tree);\n-\t\terr = write_index_ext_header(&c, newfd, CACHE_EXT_TREE, sb.len) < 0\n-\t\t\t|| ce_write(&c, newfd, sb.buf, sb.len) < 0;\n-\t\tstrbuf_release(&sb);\n-\t\tif (err)\n-\t\t\treturn -1;\n-\t}\n-\tif (istate->resolve_undo) {\n-\t\tstruct strbuf sb = STRBUF_INIT;\n-\n-\t\tresolve_undo_write(&sb, istate->resolve_undo);\n-\t\terr = write_index_ext_header(&c, newfd, CACHE_EXT_RESOLVE_UNDO,\n-\t\t\t\t\t sb.len) < 0\n-\t\t\t|| ce_write(&c, newfd, sb.buf, sb.len) < 0;\n-\t\tstrbuf_release(&sb);\n-\t\tif (err)\n-\t\t\treturn -1;\n-\t}\n-\n-\tif (ce_flush(&c, newfd) || fstat(newfd, &st))\n-\t\treturn -1;\n-\tistate->timestamp.sec = (unsigned int)st.st_mtime;\n-\tistate->timestamp.nsec = ST_MTIME_NSEC(st);\n-\treturn 0;\n-}\n-\n int write_index(struct index_state *istate, int newfd)\n {\n-\treturn write_index_v2(istate, newfd);\n+\treturn istate->ops->write_index(istate, newfd);\n }\n \n /*\ndiff --git a/read-cache.h b/read-cache.h\nnew file mode 100644\nindex 0000000..d8debb8\n--- /dev/null\n+++ b/read-cache.h\n@@ -0,0 +1,58 @@\n+/* Index extensions.\n+ *\n+ * The first letter should be 'A'..'Z' for extensions that are not\n+ * necessary for a correct operation (i.e. optimization data).\n+ * When new extensions are added that _needs_ to be understood in\n+ * order to correctly interpret the index file, pick character that\n+ * is outside the range, to cause the reader to abort.\n+ */\n+\n+#define CACHE_EXT(s) ( (s[0]<<24)|(s[1]<<16)|(s[2]<<8)|(s[3]) )\n+#define CACHE_EXT_TREE 0x54524545\t/* \"TREE\" */\n+#define CACHE_EXT_RESOLVE_UNDO 0x52455543 /* \"REUC\" */\n+\n+#define INDEX_FORMAT_DEFAULT 3\n+\n+/*\n+ * Basic data structures for the directory cache\n+ */\n+struct cache_header {\n+\tuint32_t hdr_signature;\n+\tuint32_t hdr_version;\n+\tuint32_t hdr_entries;\n+};\n+\n+struct index_ops {\n+\tint (*match_stat_basic)(const struct cache_entry *ce, struct stat *st, int changed);\n+\tint (*verify_hdr)(void *mmap, unsigned long size);\n+\tint (*read_index)(struct index_state *istate, void *mmap, unsigned long mmap_size);\n+\tint (*write_index)(struct index_state *istate, int newfd);\n+};\n+\n+extern struct index_ops v2_ops;\n+\n+#ifndef NEEDS_ALIGNED_ACCESS\n+#define ntoh_s(var) ntohs(var)\n+#define ntoh_l(var) ntohl(var)\n+#else\n+static inline uint16_t ntoh_s_force_align(void *p)\n+{\n+\tuint16_t x;\n+\tmemcpy(&x, p, sizeof(x));\n+\treturn ntohs(x);\n+}\n+static inline uint32_t ntoh_l_force_align(void *p)\n+{\n+\tuint32_t x;\n+\tmemcpy(&x, p, sizeof(x));\n+\treturn ntohl(x);\n+}\n+#define ntoh_s(var) ntoh_s_force_align(&(var))\n+#define ntoh_l(var) ntoh_l_force_align(&(var))\n+#endif\n+\n+extern int ce_modified_check_fs(const struct cache_entry *ce, struct stat *st);\n+extern int ce_match_stat_basic(const struct index_state *istate,\n+\t\t\t const struct cache_entry *ce, struct stat *st);\n+extern int is_racy_timestamp(const struct index_state *istate, const struct cache_entry *ce);\n+extern void set_index_entry(struct index_state *istate, int nr, struct cache_entry *ce);\ndiff --git a/test-index-version.c b/test-index-version.c\nindex 05d4699..d3c0ebd 100644\n--- a/test-index-version.c\n+++ b/test-index-version.c\n@@ -1,5 +1,11 @@\n #include \"cache.h\"\n \n+struct cache_header {\n+\tuint32_t hdr_signature;\n+\tuint32_t hdr_version;\n+\tuint32_t hdr_entries;\n+};\n+\n int main(int argc, char **argv)\n {\n \tstruct cache_header hdr;\ndiff --git a/unpack-trees.c b/unpack-trees.c\nindex bf01717..71df3ad 100644\n--- a/unpack-trees.c\n+++ b/unpack-trees.c\n@@ -1035,10 +1035,9 @@ int unpack_trees(unsigned len, struct tree_desc *t, struct unpack_trees_options\n \t}\n \n \tmemset(&o->result, 0, sizeof(o->result));\n-\to->result.initialized = 1;\n+\tinitialize_index(&o->result, o->src_index->version);\n \to->result.timestamp.sec = o->src_index->timestamp.sec;\n \to->result.timestamp.nsec = o->src_index->timestamp.nsec;\n-\to->result.version = o->src_index->version;\n \to->merge_size = len;\n \tmark_all_ce_unused(o->src_index);\n \n-- \n1.8.3.4.1231.g9fbf354.dirty\n"},{"id":"225409","messageId":"1376854933-31241-7-git-send-email-t.gummerer@gmail.com","threadId":"34724","inReplyTo":"1376854933-31241-1-git-send-email-t.gummerer@gmail.com","subject":"[PATCH v3 06/24] read-cache: Don't compare uid, gid and ino on cygwin","fromName":"Thomas Gummerer","fromEmail":"t.gummerer@gmail.com","sentAt":"2013-08-18T19:41:55Z","receivedAt":"2013-08-18T19:41:55Z","isPatch":true,"sender":{"key":"t.gummerer@gmail.com","avatar":"https://avatars.githubusercontent.com/u/191004?v=4"},"body":"Cygwin doesn't have uid, gid and ino stats fields. Therefore we should\nnever check them in the match_stat_data when working on the CYGWIN\nplatform.\n\nSigned-off-by: Thomas Gummerer \n---\n\nThis patch was not tested on Cygwin yet. I think it's needed though,\nbecause the re-reading of the index if it changed will no longer use\nit's own index_changed function, but use the stat_validity_check\nfunction instead. Would be great if someone running Cygwin could test\nthis.\n\n read-cache.c | 2 ++\n 1 file changed, 2 insertions(+)\n\ndiff --git a/read-cache.c b/read-cache.c\nindex 1f827de..aa17ce7 100644\n--- a/read-cache.c\n+++ b/read-cache.c\n@@ -82,6 +82,7 @@ int match_stat_data(const struct stat_data *sd, struct stat *st)\n \t\tchanged |= CTIME_CHANGED;\n #endif\n \n+#if !defined (__CYGWIN__)\n \tif (check_stat) {\n \t\tif (sd->sd_uid != (unsigned int) st->st_uid ||\n \t\t\tsd->sd_gid != (unsigned int) st->st_gid)\n@@ -89,6 +90,7 @@ int match_stat_data(const struct stat_data *sd, struct stat *st)\n \t\tif (sd->sd_ino != (unsigned int) st->st_ino)\n \t\t\tchanged |= INODE_CHANGED;\n \t}\n+#endif\n \n #ifdef USE_STDEV\n \t/*\n-- \n1.8.3.4.1231.g9fbf354.dirty\n"},{"id":"225407","messageId":"1376854933-31241-8-git-send-email-t.gummerer@gmail.com","threadId":"34724","inReplyTo":"1376854933-31241-1-git-send-email-t.gummerer@gmail.com","subject":"[PATCH v3 07/24] read-cache: Re-read index if index file changed","fromName":"Thomas Gummerer","fromEmail":"t.gummerer@gmail.com","sentAt":"2013-08-18T19:41:56Z","receivedAt":"2013-08-18T19:41:56Z","isPatch":true,"sender":{"key":"t.gummerer@gmail.com","avatar":"https://avatars.githubusercontent.com/u/191004?v=4"},"body":"Add the possibility of re-reading the index file, if it changed\nwhile reading.\n\nThe index file might change during the read, causing outdated\ninformation to be displayed. We check if the index file changed\nby using its stat data as heuristic.\n\nHelped-by: Ramsay Jones \nSigned-off-by: Thomas Gummerer \n---\n read-cache.c | 65 +++++++++++++++++++++++++++++++-----------------------------\n 1 file changed, 34 insertions(+), 31 deletions(-)\n\ndiff --git a/read-cache.c b/read-cache.c\nindex aa17ce7..2d12601 100644\n--- a/read-cache.c\n+++ b/read-cache.c\n@@ -1296,8 +1296,8 @@ int read_index(struct index_state *istate)\n /* remember to discard_cache() before reading a different cache! */\n int read_index_from(struct index_state *istate, const char *path)\n {\n-\tint fd;\n-\tstruct stat st;\n+\tint fd, err, i;\n+\tstruct stat_validity sv;\n \tstruct cache_header *hdr;\n \tvoid *mmap;\n \tsize_t mmap_size;\n@@ -1309,43 +1309,46 @@ int read_index_from(struct index_state *istate, const char *path)\n \terrno = ENOENT;\n \tistate->timestamp.sec = 0;\n \tistate->timestamp.nsec = 0;\n-\n-\tfd = open(path, O_RDONLY);\n-\tif (fd < 0) {\n-\t\tif (errno == ENOENT) {\n-\t\t\tinitialize_index(istate, 0);\n-\t\t\treturn 0;\n+\tsv.sd = NULL;\n+\tfor (i = 0; i < 50; i++) {\n+\t\terr = 0;\n+\t\tfd = open(path, O_RDONLY);\n+\t\tif (fd < 0) {\n+\t\t\tif (errno == ENOENT) {\n+\t\t\t\tinitialize_index(istate, 0);\n+\t\t\t\treturn 0;\n+\t\t\t}\n+\t\t\tdie_errno(\"index file open failed\");\n \t\t}\n-\t\tdie_errno(\"index file open failed\");\n-\t}\n \n-\tif (fstat(fd, &st))\n-\t\tdie_errno(\"cannot stat the open index\");\n+\t\tstat_validity_update(&sv, fd);\n+\t\tif (!sv.sd)\n+\t\t\tdie_errno(\"cannot stat the open index\");\n \n-\terrno = EINVAL;\n-\tmmap_size = xsize_t(st.st_size);\n-\tmmap = xmmap(NULL, mmap_size, PROT_READ | PROT_WRITE, MAP_PRIVATE, fd, 0);\n-\tclose(fd);\n-\tif (mmap == MAP_FAILED)\n-\t\tdie_errno(\"unable to map index file\");\n+\t\terrno = EINVAL;\n+\t\tmmap_size = xsize_t(sv.sd->sd_size);\n+\t\tmmap = xmmap(NULL, mmap_size, PROT_READ | PROT_WRITE, MAP_PRIVATE, fd, 0);\n+\t\tclose(fd);\n+\t\tif (mmap == MAP_FAILED)\n+\t\t\tdie_errno(\"unable to map index file\");\n \n-\thdr = mmap;\n-\tif (verify_hdr_version(istate, hdr, mmap_size) < 0)\n-\t\tgoto unmap;\n+\t\thdr = mmap;\n+\t\tif (verify_hdr_version(istate, hdr, mmap_size) < 0)\n+\t\t\terr = 1;\n \n-\tif (istate->ops->verify_hdr(mmap, mmap_size) < 0)\n-\t\tgoto unmap;\n+\t\tif (istate->ops->verify_hdr(mmap, mmap_size) < 0)\n+\t\t\terr = 1;\n \n-\tif (istate->ops->read_index(istate, mmap, mmap_size) < 0)\n-\t\tgoto unmap;\n-\tistate->timestamp.sec = st.st_mtime;\n-\tistate->timestamp.nsec = ST_MTIME_NSEC(st);\n+\t\tif (istate->ops->read_index(istate, mmap, mmap_size) < 0)\n+\t\t\terr = 1;\n+\t\tistate->timestamp.sec = sv.sd->sd_mtime.sec;\n+\t\tistate->timestamp.nsec = sv.sd->sd_mtime.nsec;\n \n-\tmunmap(mmap, mmap_size);\n-\treturn istate->cache_nr;\n+\t\tmunmap(mmap, mmap_size);\n+\t\tif (stat_validity_check(&sv, path) && !err)\n+\t\t\treturn istate->cache_nr;\n+\t}\n \n-unmap:\n-\tmunmap(mmap, mmap_size);\n \tdie(\"index file corrupt\");\n }\n \n-- \n1.8.3.4.1231.g9fbf354.dirty\n"},{"id":"225410","messageId":"1376854933-31241-9-git-send-email-t.gummerer@gmail.com","threadId":"34724","inReplyTo":"1376854933-31241-1-git-send-email-t.gummerer@gmail.com","subject":"[PATCH v3 08/24] add documentation for the index api","fromName":"Thomas Gummerer","fromEmail":"t.gummerer@gmail.com","sentAt":"2013-08-18T19:41:57Z","receivedAt":"2013-08-18T19:41:57Z","isPatch":true,"sender":{"key":"t.gummerer@gmail.com","avatar":"https://avatars.githubusercontent.com/u/191004?v=4"},"body":"Add documentation for the index reading api. This also includes\ndocumentation for the new api functions introduced in the next patch.\n\nHelped-by: Nguyễn Thái Ngọc Duy \nSigned-off-by: Thomas Gummerer \n---\n Documentation/technical/api-in-core-index.txt | 54 +++++++++++++++++++++++++--\n 1 file changed, 50 insertions(+), 4 deletions(-)\n\ndiff --git a/Documentation/technical/api-in-core-index.txt b/Documentation/technical/api-in-core-index.txt\nindex adbdbf5..9b8c37c 100644\n--- a/Documentation/technical/api-in-core-index.txt\n+++ b/Documentation/technical/api-in-core-index.txt\n@@ -1,14 +1,60 @@\n in-core index API\n =================\n \n+Reading API\n+-----------\n+\n+`cache`::\n+\n+\tAn array of cache entries. This is used to access the cache\n+\tentries directly. Use `index_name_pos` to search for the\n+\tindex of a specific cache entry.\n+\n+`read_index_filtered`::\n+\n+\tRead a part of the index, filtered by the pathspec given in\n+\tthe opts. The function may load more than necessary, so the\n+\tcaller still responsible to apply filters appropriately. The\n+\tfiltering is only done for performance reasons, as it's\n+\tpossible to only read part of the index when the on-disk\n+\tformat is index-v5.\n+\n+\tTo iterate only over the entries that match the pathspec, use\n+\tthe for_each_index_entry function.\n+\n+`read_index`::\n+\n+\tRead the whole index file from disk.\n+\n+`index_name_pos`::\n+\n+\tFind a cache_entry with name in the index. Returns pos if an\n+\tentry is matched exactly and -1-pos if an entry is matched\n+\tpartially.\n+\te.g.\n+\tindex:\n+\tfile1\n+\tfile2\n+\tpath/file1\n+\tzzz\n+\n+\tindex_name_pos(\"path/file1\", 10) returns 2, while\n+\tindex_name_pos(\"path\", 4) returns -3\n+\n+`for_each_index_entry`::\n+\n+\tIterates over all cache_entries in the index filtered by\n+\tfilter_opts in the index_state. For each cache entry fn is\n+\texecuted with cb_data as callback data. From within the loop\n+\tdo `return 0` to continue, or `return 1` to break the loop.\n+\n+TODO\n+----\n Talk about and , things like:\n \n-* cache -> the_index macros\n-* read_index()\n * write_index()\n * ie_match_stat() and ie_modified(); how they are different and when to\n use which.\n-* index_name_pos()\n * remove_index_entry_at()\n * remove_file_from_index()\n * add_file_to_index()\n@@ -18,4 +64,4 @@ Talk about and , things like:\n * cache_tree_invalidate_path()\n * cache_tree_update()\n \n-(JC, Linus)\n+(JC, Linus, Thomas Gummerer)\n-- \n1.8.3.4.1231.g9fbf354.dirty\n"},{"id":"225408","messageId":"1376854933-31241-10-git-send-email-t.gummerer@gmail.com","threadId":"34724","inReplyTo":"1376854933-31241-1-git-send-email-t.gummerer@gmail.com","subject":"[PATCH v3 09/24] read-cache: add index reading api","fromName":"Thomas Gummerer","fromEmail":"t.gummerer@gmail.com","sentAt":"2013-08-18T19:41:58Z","receivedAt":"2013-08-18T19:41:58Z","isPatch":true,"sender":{"key":"t.gummerer@gmail.com","avatar":"https://avatars.githubusercontent.com/u/191004?v=4"},"body":"Add an api for access to the index file. Currently there is only a very\nbasic api for accessing the index file, which only allows a full read of\nthe index, and lets the users of the data filter it. The new index api\ngives the users the possibility to use only part of the index and\nprovides functions for iterating over and accessing cache entries.\n\nThis simplifies future improvements to the in-memory format, as changes\nwill be concentrated on one file, instead of the whole git source code.\n\nHelped-by: Nguyễn Thái Ngọc Duy \nSigned-off-by: Thomas Gummerer \n---\n cache.h | 41 ++++++++++++++++++++++++++++++++++++++++-\n read-cache-v2.c | 10 ++++++++--\n read-cache.c | 47 +++++++++++++++++++++++++++++++++++++++++++----\n read-cache.h | 3 ++-\n 4 files changed, 93 insertions(+), 8 deletions(-)\n\ndiff --git a/cache.h b/cache.h\nindex d4dae21..da224c9 100644\n--- a/cache.h\n+++ b/cache.h\n@@ -127,7 +127,7 @@ struct cache_entry {\n \tunsigned int ce_flags;\n \tunsigned int ce_namelen;\n \tunsigned char sha1[20];\n-\tstruct cache_entry *next;\n+\tstruct cache_entry *next; /* used by name_hash */\n \tchar name[FLEX_ARRAY]; /* more */\n };\n \n@@ -260,6 +260,29 @@ static inline unsigned int canon_mode(unsigned int mode)\n \n #define cache_entry_size(len) (offsetof(struct cache_entry,name) + (len) + 1)\n \n+/*\n+ * Options by which the index should be filtered when read partially.\n+ *\n+ * pathspec: The pathspec which the index entries have to match\n+ * seen: Used to return the seen parameter from match_pathspec()\n+ * max_prefix_len: The common prefix length of the pathspecs\n+ *\n+ * read_staged: used to indicate if the conflicted entries (entries\n+ * with a stage) should be included\n+ * read_cache_tree: used to indicate if the cache-tree should be read\n+ * read_resolve_undo: used to indicate if the resolve undo data should\n+ * be read\n+ */\n+struct filter_opts {\n+\tconst struct pathspec *pathspec;\n+\tchar *seen;\n+\tint max_prefix_len;\n+\n+\tint read_staged;\n+\tint read_cache_tree;\n+\tint read_resolve_undo;\n+};\n+\n struct index_state {\n \tstruct cache_entry **cache;\n \tunsigned int version;\n@@ -272,6 +295,7 @@ struct index_state {\n \tstruct hash_table name_hash;\n \tstruct hash_table dir_hash;\n \tstruct index_ops *ops;\n+\tstruct filter_opts *filter_opts;\n };\n \n extern struct index_state the_index;\n@@ -315,6 +339,12 @@ extern void free_name_hash(struct index_state *istate);\n #define unmerge_cache_entry_at(at) unmerge_index_entry_at(&the_index, at)\n #define unmerge_cache(pathspec) unmerge_index(&the_index, pathspec)\n #define read_blob_data_from_cache(path, sz) read_blob_data_from_index(&the_index, (path), (sz))\n+\n+/* index api */\n+#define read_cache_filtered(opts) read_index_filtered(&the_index, (opts))\n+#define read_cache_filtered_from(path, opts) read_index_filtered_from(&the_index, (path), (opts))\n+#define for_each_cache_entry(fn, cb_data) \\\n+\tfor_each_index_entry(&the_index, (fn), (cb_data))\n #endif\n \n enum object_type {\n@@ -448,6 +478,15 @@ extern void sanitize_stdfds(void);\n \t\t} \\\n \t} while (0)\n \n+/* index api */\n+extern int read_index_filtered(struct index_state *, struct filter_opts *opts);\n+extern int read_index_filtered_from(struct index_state *, const char *path, struct filter_opts *opts);\n+\n+typedef int each_cache_entry_fn(struct cache_entry *ce, void *);\n+extern int for_each_index_entry(struct index_state *istate,\n+\t\t\t\teach_cache_entry_fn, void *);\n+\n+\n /* Initialize and use the cache information */\n extern void initialize_index(struct index_state *istate, int version);\n extern void change_index_version(struct index_state *istate, int version);\ndiff --git a/read-cache-v2.c b/read-cache-v2.c\nindex 070d468..63be074 100644\n--- a/read-cache-v2.c\n+++ b/read-cache-v2.c\n@@ -3,6 +3,7 @@\n #include \"resolve-undo.h\"\n #include \"cache-tree.h\"\n #include \"varint.h\"\n+#include \"dir.h\"\n \n /* Mask for the name length in ce_flags in the on-disk index */\n #define CE_NAMEMASK (0x0fff)\n@@ -202,8 +203,14 @@ static int read_index_extension(struct index_state *istate,\n \treturn 0;\n }\n \n+/*\n+ * The performance is the same if we read the whole index or only\n+ * part of it, therefore we always read the whole index to avoid\n+ * having to re-read it later. The filter_opts will determine\n+ * what part of the index is used when retrieving the cache-entries.\n+ */\n static int read_index_v2(struct index_state *istate, void *mmap,\n-\t\t\t unsigned long mmap_size)\n+\t\t\t unsigned long mmap_size, struct filter_opts *opts)\n {\n \tint i;\n \tunsigned long src_offset;\n@@ -229,7 +236,6 @@ static int read_index_v2(struct index_state *istate, void *mmap,\n \t\tdisk_ce = (struct ondisk_cache_entry *)((char *)mmap + src_offset);\n \t\tce = create_from_disk(disk_ce, &consumed, previous_name);\n \t\tset_index_entry(istate, i, ce);\n-\n \t\tsrc_offset += consumed;\n \t}\n \tstrbuf_release(&previous_name_buf);\ndiff --git a/read-cache.c b/read-cache.c\nindex 2d12601..38b9a04 100644\n--- a/read-cache.c\n+++ b/read-cache.c\n@@ -1290,11 +1290,41 @@ static int verify_hdr_version(struct index_state *istate,\n \n int read_index(struct index_state *istate)\n {\n-\treturn read_index_from(istate, get_index_file());\n+\treturn read_index_filtered_from(istate, get_index_file(), NULL);\n }\n \n-/* remember to discard_cache() before reading a different cache! */\n-int read_index_from(struct index_state *istate, const char *path)\n+int read_index_filtered(struct index_state *istate, struct filter_opts *opts)\n+{\n+\treturn read_index_filtered_from(istate, get_index_file(), opts);\n+}\n+\n+/*\n+ * Execute fn for each index entry which is currently in istate. Data\n+ * can be given to the function using the cb_data parameter.\n+ */\n+int for_each_index_entry(struct index_state *istate, each_cache_entry_fn fn, void *cb_data)\n+{\n+\tint i, ret = 0;\n+\tstruct filter_opts *opts = istate->filter_opts;\n+\n+\tfor (i = 0; i < istate->cache_nr; i++) {\n+\t\tstruct cache_entry *ce = istate->cache[i];\n+\n+\t\tif (opts && !opts->read_staged && ce_stage(ce))\n+\t\t\tcontinue;\n+\n+\t\tif (opts && !match_pathspec_depth(opts->pathspec, ce->name, ce_namelen(ce),\n+\t\t\t\t\t\t opts->max_prefix_len, opts->seen))\n+\t\t\tcontinue;\n+\n+\t\tif ((ret = fn(istate->cache[i], cb_data)))\n+\t\t\tbreak;\n+\t}\n+\treturn ret;\n+}\n+\n+int read_index_filtered_from(struct index_state *istate, const char *path,\n+\t\t\t struct filter_opts *opts)\n {\n \tint fd, err, i;\n \tstruct stat_validity sv;\n@@ -1309,6 +1339,7 @@ int read_index_from(struct index_state *istate, const char *path)\n \terrno = ENOENT;\n \tistate->timestamp.sec = 0;\n \tistate->timestamp.nsec = 0;\n+\tistate->filter_opts = opts;\n \tsv.sd = NULL;\n \tfor (i = 0; i < 50; i++) {\n \t\terr = 0;\n@@ -1339,7 +1370,7 @@ int read_index_from(struct index_state *istate, const char *path)\n \t\tif (istate->ops->verify_hdr(mmap, mmap_size) < 0)\n \t\t\terr = 1;\n \n-\t\tif (istate->ops->read_index(istate, mmap, mmap_size) < 0)\n+\t\tif (istate->ops->read_index(istate, mmap, mmap_size, opts) < 0)\n \t\t\terr = 1;\n \t\tistate->timestamp.sec = sv.sd->sd_mtime.sec;\n \t\tistate->timestamp.nsec = sv.sd->sd_mtime.nsec;\n@@ -1352,6 +1383,13 @@ int read_index_from(struct index_state *istate, const char *path)\n \tdie(\"index file corrupt\");\n }\n \n+\n+/* remember to discard_cache() before reading a different cache! */\n+int read_index_from(struct index_state *istate, const char *path)\n+{\n+\treturn read_index_filtered_from(istate, path, NULL);\n+}\n+\n int is_index_unborn(struct index_state *istate)\n {\n \treturn (!istate->cache_nr && !istate->timestamp.sec);\n@@ -1376,6 +1414,7 @@ int discard_index(struct index_state *istate)\n \tistate->cache = NULL;\n \tistate->cache_alloc = 0;\n \tistate->ops = NULL;\n+\tistate->filter_opts = NULL;\n \treturn 0;\n }\n \ndiff --git a/read-cache.h b/read-cache.h\nindex d8debb8..644b199 100644\n--- a/read-cache.h\n+++ b/read-cache.h\n@@ -25,7 +25,8 @@ struct cache_header {\n struct index_ops {\n \tint (*match_stat_basic)(const struct cache_entry *ce, struct stat *st, int changed);\n \tint (*verify_hdr)(void *mmap, unsigned long size);\n-\tint (*read_index)(struct index_state *istate, void *mmap, unsigned long mmap_size);\n+\tint (*read_index)(struct index_state *istate, void *mmap, unsigned long mmap_size,\n+\t\t\t struct filter_opts *opts);\n \tint (*write_index)(struct index_state *istate, int newfd);\n };\n \n-- \n1.8.3.4.1231.g9fbf354.dirty\n"},{"id":"225413","messageId":"1376854933-31241-11-git-send-email-t.gummerer@gmail.com","threadId":"34724","inReplyTo":"1376854933-31241-1-git-send-email-t.gummerer@gmail.com","subject":"[PATCH v3 10/24] make sure partially read index is not changed","fromName":"Thomas Gummerer","fromEmail":"t.gummerer@gmail.com","sentAt":"2013-08-18T19:41:59Z","receivedAt":"2013-08-18T19:41:59Z","isPatch":true,"sender":{"key":"t.gummerer@gmail.com","avatar":"https://avatars.githubusercontent.com/u/191004?v=4"},"body":"A partially read index file currently cannot be written to disk. Make\nsure that never happens, by erroring out when a caller tries to write a\npartially read index. Do the same when trying to re-read a partially\nread index without having discarded it first to avoid loosing any\ninformation.\n\nForcing the caller to load the right part of the index file instead of\nre-reading it when changing it, gives a bit of a performance advantage,\nby avoiding to read parts of the index twice.\n\nSigned-off-by: Thomas Gummerer \n---\n read-cache.c | 4 ++++\n 1 file changed, 4 insertions(+)\n\ndiff --git a/read-cache.c b/read-cache.c\nindex 38b9a04..7a27f9b 100644\n--- a/read-cache.c\n+++ b/read-cache.c\n@@ -1332,6 +1332,8 @@ int read_index_filtered_from(struct index_state *istate, const char *path,\n \tvoid *mmap;\n \tsize_t mmap_size;\n \n+\tif (istate->filter_opts)\n+\t\tdie(\"BUG: Can't re-read partially read index\");\n \terrno = EBUSY;\n \tif (istate->initialized)\n \t\treturn istate->cache_nr;\n@@ -1455,6 +1457,8 @@ void update_index_if_able(struct index_state *istate, struct lock_file *lockfile\n \n int write_index(struct index_state *istate, int newfd)\n {\n+\tif (istate->filter_opts)\n+\t\tdie(\"BUG: index: cannot write a partially read index\");\n \treturn istate->ops->write_index(istate, newfd);\n }\n \n-- \n1.8.3.4.1231.g9fbf354.dirty\n"},{"id":"225412","messageId":"1376854933-31241-12-git-send-email-t.gummerer@gmail.com","threadId":"34724","inReplyTo":"1376854933-31241-1-git-send-email-t.gummerer@gmail.com","subject":"[PATCH v3 11/24] grep.c: use index api","fromName":"Thomas Gummerer","fromEmail":"t.gummerer@gmail.com","sentAt":"2013-08-18T19:42:00Z","receivedAt":"2013-08-18T19:42:00Z","isPatch":true,"sender":{"key":"t.gummerer@gmail.com","avatar":"https://avatars.githubusercontent.com/u/191004?v=4"},"body":"Signed-off-by: Thomas Gummerer \n---\n builtin/grep.c | 69 +++++++++++++++++++++++++++++-----------------------------\n 1 file changed, 35 insertions(+), 34 deletions(-)\n\ndiff --git a/builtin/grep.c b/builtin/grep.c\nindex 7dc0389..1114fe8 100644\n--- a/builtin/grep.c\n+++ b/builtin/grep.c\n@@ -369,41 +369,31 @@ static void run_pager(struct grep_opt *opt, const char *prefix)\n \tfree(argv);\n }\n \n-static int grep_cache(struct grep_opt *opt, const struct pathspec *pathspec, int cached)\n+struct grep_opts {\n+\tstruct grep_opt *opt;\n+\tconst struct pathspec *pathspec;\n+\tint cached;\n+\tint hit;\n+};\n+\n+static int grep_cache(struct cache_entry *ce, void *cb_data)\n {\n-\tint hit = 0;\n-\tint nr;\n-\tread_cache();\n+\tstruct grep_opts *opts = cb_data;\n \n-\tfor (nr = 0; nr < active_nr; nr++) {\n-\t\tconst struct cache_entry *ce = active_cache[nr];\n-\t\tif (!S_ISREG(ce->ce_mode))\n-\t\t\tcontinue;\n-\t\tif (!match_pathspec_depth(pathspec, ce->name, ce_namelen(ce), 0, NULL))\n-\t\t\tcontinue;\n-\t\t/*\n-\t\t * If CE_VALID is on, we assume worktree file and its cache entry\n-\t\t * are identical, even if worktree file has been modified, so use\n-\t\t * cache version instead\n-\t\t */\n-\t\tif (cached || (ce->ce_flags & CE_VALID) || ce_skip_worktree(ce)) {\n-\t\t\tif (ce_stage(ce))\n-\t\t\t\tcontinue;\n-\t\t\thit |= grep_sha1(opt, ce->sha1, ce->name, 0, ce->name);\n-\t\t}\n-\t\telse\n-\t\t\thit |= grep_file(opt, ce->name);\n-\t\tif (ce_stage(ce)) {\n-\t\t\tdo {\n-\t\t\t\tnr++;\n-\t\t\t} while (nr < active_nr &&\n-\t\t\t\t !strcmp(ce->name, active_cache[nr]->name));\n-\t\t\tnr--; /* compensate for loop control */\n-\t\t}\n-\t\tif (hit && opt->status_only)\n-\t\t\tbreak;\n-\t}\n-\treturn hit;\n+\tif (!S_ISREG(ce->ce_mode))\n+\t\treturn 0;\n+\t/*\n+\t * If CE_VALID is on, we assume worktree file and its cache entry\n+\t * are identical, even if worktree file has been modified, so use\n+\t * cache version instead\n+\t */\n+\tif (opts->cached || (ce->ce_flags & CE_VALID) || ce_skip_worktree(ce))\n+\t\topts->hit |= grep_sha1(opts->opt, ce->sha1, ce->name, 0, ce->name);\n+\telse\n+\t\topts->hit |= grep_file(opts->opt, ce->name);\n+\tif (opts->hit && opts->opt->status_only)\n+\t\treturn 1;\n+\treturn 0;\n }\n \n static int grep_tree(struct grep_opt *opt, const struct pathspec *pathspec,\n@@ -897,10 +887,21 @@ int cmd_grep(int argc, const char **argv, const char *prefix)\n \t} else if (0 <= opt_exclude) {\n \t\tdie(_(\"--[no-]exclude-standard cannot be used for tracked contents.\"));\n \t} else if (!list.nr) {\n+\t\tstruct grep_opts opts;\n+\t\tstruct filter_opts *filter_opts = xmalloc(sizeof(*filter_opts));\n+\n \t\tif (!cached)\n \t\t\tsetup_work_tree();\n \n-\t\thit = grep_cache(&opt, &pathspec, cached);\n+\t\tmemset(filter_opts, 0, sizeof(*filter_opts));\n+\t\tfilter_opts->pathspec = &pathspec;\n+\t\topts.opt = &opt;\n+\t\topts.pathspec = &pathspec;\n+\t\topts.cached = cached;\n+\t\topts.hit = 0;\n+\t\tread_cache_filtered(filter_opts);\n+\t\tfor_each_cache_entry(grep_cache, &opts);\n+\t\thit = opts.hit;\n \t} else {\n \t\tif (cached)\n \t\t\tdie(_(\"both --cached and trees are given.\"));\n-- \n1.8.3.4.1231.g9fbf354.dirty\n"},{"id":"225411","messageId":"1376854933-31241-13-git-send-email-t.gummerer@gmail.com","threadId":"34724","inReplyTo":"1376854933-31241-1-git-send-email-t.gummerer@gmail.com","subject":"[PATCH v3 12/24] ls-files.c: use index api","fromName":"Thomas Gummerer","fromEmail":"t.gummerer@gmail.com","sentAt":"2013-08-18T19:42:01Z","receivedAt":"2013-08-18T19:42:01Z","isPatch":true,"sender":{"key":"t.gummerer@gmail.com","avatar":"https://avatars.githubusercontent.com/u/191004?v=4"},"body":"Signed-off-by: Thomas Gummerer \n---\n builtin/ls-files.c | 36 +++++++++++++++++++++++++++++++++---\n 1 file changed, 33 insertions(+), 3 deletions(-)\n\ndiff --git a/builtin/ls-files.c b/builtin/ls-files.c\nindex bebc9c2..fbf9c47 100644\n--- a/builtin/ls-files.c\n+++ b/builtin/ls-files.c\n@@ -288,6 +288,22 @@ static void prune_cache(const char *prefix)\n \tactive_nr = last;\n }\n \n+static int needs_trailing_slash_stripped(void)\n+{\n+\tint i;\n+\n+\tif (!pathspec.nr)\n+\t\treturn 0;\n+\n+\tfor (i = 0; i < pathspec.nr; i++) {\n+\t\tint len = strlen(pathspec.items[i].original);\n+\n+\t\tif (len > 1 && (pathspec.items[i].original)[len - 1] == '/')\n+\t\t\treturn 1;\n+\t}\n+\treturn 0;\n+}\n+\n /*\n * Read the tree specified with --with-tree option\n * (typically, HEAD) into stage #1 and then\n@@ -445,6 +461,7 @@ int cmd_ls_files(int argc, const char **argv, const char *cmd_prefix)\n \tstruct dir_struct dir;\n \tstruct exclude_list *el;\n \tstruct string_list exclude_list = STRING_LIST_INIT_NODUP;\n+\tstruct filter_opts *opts = xmalloc(sizeof(*opts));\n \tstruct option builtin_ls_files_options[] = {\n \t\t{ OPTION_CALLBACK, 'z', NULL, NULL, NULL,\n \t\t\tN_(\"paths are separated with NUL character\"),\n@@ -510,9 +527,6 @@ int cmd_ls_files(int argc, const char **argv, const char *cmd_prefix)\n \t\tprefix_len = strlen(prefix);\n \tgit_config(git_default_config, NULL);\n \n-\tif (read_cache() < 0)\n-\t\tdie(\"index file corrupt\");\n-\n \targc = parse_options(argc, argv, prefix, builtin_ls_files_options,\n \t\t\tls_files_usage, 0);\n \tel = add_exclude_list(&dir, EXC_CMDL, \"--exclude option\");\n@@ -548,6 +562,22 @@ int cmd_ls_files(int argc, const char **argv, const char *cmd_prefix)\n \t\t PATHSPEC_STRIP_SUBMODULE_SLASH_CHEAP,\n \t\t prefix, argv);\n \n+\tif (!with_tree && !needs_trailing_slash_stripped()) {\n+\t\tmemset(opts, 0, sizeof(*opts));\n+\t\topts->pathspec = &pathspec;\n+\t\topts->read_staged = 1;\n+\t\tif (show_resolve_undo)\n+\t\t\topts->read_resolve_undo = 1;\n+\t\tread_cache_filtered(opts);\n+\t} else {\n+\t\tread_cache();\n+\t\tparse_pathspec(&pathspec, 0,\n+\t\t\t PATHSPEC_PREFER_CWD |\n+\t\t\t PATHSPEC_STRIP_SUBMODULE_SLASH_CHEAP,\n+\t\t\t prefix, argv);\n+\n+\t}\n+\n \t/* Find common prefix for all pathspec's */\n \tmax_prefix = common_prefix(&pathspec);\n \tmax_prefix_len = max_prefix ? strlen(max_prefix) : 0;\n-- \n1.8.3.4.1231.g9fbf354.dirty\n"},{"id":"225415","messageId":"1376854933-31241-14-git-send-email-t.gummerer@gmail.com","threadId":"34724","inReplyTo":"1376854933-31241-1-git-send-email-t.gummerer@gmail.com","subject":"[PATCH v3 13/24] documentation: add documentation of the index-v5 file format","fromName":"Thomas Gummerer","fromEmail":"t.gummerer@gmail.com","sentAt":"2013-08-18T19:42:02Z","receivedAt":"2013-08-18T19:42:02Z","isPatch":true,"sender":{"key":"t.gummerer@gmail.com","avatar":"https://avatars.githubusercontent.com/u/191004?v=4"},"body":"Add a documentation of the index file format version 5 to\nDocumentation/technical.\n\nHelped-by: Michael Haggerty \nHelped-by: Junio C Hamano \nHelped-by: Thomas Rast \nHelped-by: Nguyen Thai Ngoc Duy \nHelped-by: Robin Rosenberg \nSigned-off-by: Thomas Gummerer \n---\n Documentation/technical/index-file-format-v5.txt | 301 +++++++++++++++++++++++\n 1 file changed, 301 insertions(+)\n create mode 100644 Documentation/technical/index-file-format-v5.txt\n\ndiff --git a/Documentation/technical/index-file-format-v5.txt b/Documentation/technical/index-file-format-v5.txt\nnew file mode 100644\nindex 0000000..5209c02\n--- /dev/null\n+++ b/Documentation/technical/index-file-format-v5.txt\n@@ -0,0 +1,301 @@\n+GIT index format\n+================\n+\n+== The git index\n+\n+ The git index file (.git/index) documents the status of the files\n+ in the git staging area.\n+\n+ The staging area is used for preparing commits, merging, etc.\n+\n+== The git index file format\n+\n+ All binary numbers are in network byte order. Version 5 is described\n+ here. The index file consists of various sections. They appear in\n+ the following order in the file.\n+\n+ - header: the description of the index format, including it's signature,\n+ version and various other fields that are used internally.\n+\n+ - diroffsets (ndir entries of \"direcotry offset\"): A 4-byte offset\n+ relative to the beginning of the \"direntries block\" (see below)\n+ for each of the ndir directories in the index, sorted by pathname\n+ (of the directory it's pointing to). [1]\n+\n+ - direntries (ndir entries of \"directory offset\"): A directory entry\n+ for each of the ndir directories in the index, sorted by pathname\n+ (see below). [2]\n+\n+ - fileoffsets (nfile entries of \"file offset\"): A 4-byte offset\n+ relative to the beginning of the fileentries block (see below)\n+ for each of the nfile files in the index. [1]\n+\n+ - fileentries (nfile entries of \"file entry\"): A file entry for\n+ each of the nfile files in the index (see below).\n+\n+ - crdata: A number of entries for conflicted data/resolved conflicts\n+ (see below).\n+\n+ - Extensions (Currently none, see below in the future)\n+\n+ Extensions are identified by signature. Optional extensions can\n+ be ignored if GIT does not understand them.\n+\n+ GIT supports an arbitrary number of extension, but currently none\n+ is implemented. [3]\n+\n+ extsig (32-bits): extension signature. If the first byte is 'A'..'Z'\n+ the extension is optional and can be ignored.\n+\n+ extsize (32-bits): size of the extension, excluding the header\n+ (extsig, extsize, extchecksum).\n+\n+ extchecksum (32-bits): crc32 checksum of the extension signature\n+ and size.\n+\n+ - Extension data.\n+\n+== Header\n+ sig (32-bits): Signature:\n+ The signature is { 'D', 'I', 'R', 'C' } (stands for \"dircache\")\n+\n+ vnr (32-bits): Version number:\n+ The current supported versions are 2, 3, 4 and 5.\n+\n+ nfile (32-bits): number of file entries in the index.\n+\n+ ndir (32-bits): number of directories in the index.\n+\n+ fblockoffset (32-bits): offset to the file block, relative to the\n+ beginning of the file.\n+\n+ - Offset to the extensions.\n+\n+ nextensions (32-bits): number of extensions.\n+\n+ extoffset (32-bits): offset to the extension. (Possibly none, as\n+ many as indicated in the 4-byte number of extensions)\n+\n+ headercrc (32-bits): crc checksum including the header and the\n+ offsets to the extensions.\n+\n+\n+== Directory offsets (diroffsets)\n+\n+ diroffset (32-bits): offset to the directory relative to the\n+ beginning of the index file. There are ndir + 1 offsets in the\n+ diroffset table, the last is pointing to the end of the last\n+ direntry. With this last entry, we are able to replace the strlen\n+ of the directory name when reading the directory name, by\n+ calculating it from diroffset[n+1]-diroffset[n]-61. 61 is the\n+ size of the directory data, which follows each each directory +\n+ the crc sum + the NUL byte.\n+\n+ This part is needed for making the directory entries bisectable and\n+ thus allowing a binary search.\n+\n+== Directory entry (direntries)\n+\n+ Directory entries are sorted in lexicographic order by the name\n+ of their path starting with the root.\n+\n+ pathname (variable length, nul terminated): relative to top level\n+ directory (without the leading slash). '/' is used as path\n+ separator. A string of length 0 ('') indicates the root directory.\n+ The special path components \".\", and \"..\" (without quotes) are\n+ disallowed. The path also includes a trailing slash. [9]\n+\n+ foffset (32-bits): offset to the lexicographically first file in\n+ the file offsets (fileoffsets), relative to the beginning of\n+ the fileoffset block.\n+\n+ cr (32-bits): offset to conflicted/resolved data at the end of the\n+ index. 0 if there is no such data. [4]\n+\n+ ncr (32-bits): number of conflicted/resolved data entries at the\n+ end of the index if the offset is non 0. If cr is 0, ncr is\n+ also 0.\n+\n+ nsubtrees (32-bits): number of subtrees this tree has in the index.\n+\n+ nfiles (32-bits): number of files in the directory, that are in\n+ the index.\n+\n+ nentries (32-bits): number of entries in the index that is covered\n+ by the tree this entry represents. (-1 if the entry is invalid).\n+ This number includes all the files in this tree, recursively.\n+\n+ objname (160-bits): object name for the object that would result\n+ from writing this span of index as a tree. This is only valid\n+ if nentries is valid, meaning the cache-tree is valid.\n+\n+ flags (16-bits): 'flags' field split into (high to low bits) (For\n+ D/F conflicts)\n+\n+ stage (2-bits): stage of the directory during merge\n+\n+ 14-bit unused\n+\n+ dircrc (32-bits): crc32 checksum for each directory entry.\n+\n+ The last 24 bytes (4-byte number of entries + 160-bit object name) are\n+ for the cache tree. An entry can be in an invalidated state which is\n+ represented by having -1 in the entry_count field.\n+\n+ The entries are written out in the top-down, depth-first order. The\n+ first entry represents the root level of the repository, followed by\n+ the first subtree - let's call it A - of the root level, followed by\n+ the first subtree of A, ... There is no prefix compression for\n+ directories.\n+\n+== File offsets (fileoffsets)\n+\n+ fileoffset (32-bits): offset to the file relative to the beginning of\n+ the fileentries block.\n+\n+ This part is needed for making the file entries bisectable and\n+ thus allowing a binary search. There are nfile + 1 offsets in the\n+ fileoffset table, the last is pointing to the end of the last\n+ fileentry. With this last entry, we can replace the strlen when\n+ reading each filename, by calculating its length with the offsets.\n+\n+== File entry (fileentries)\n+\n+ File entries are sorted in ascending order on the name field, after the\n+ respective offset given by the directory entries. All file names are\n+ prefix compressed, meaning the file name is relative to the directory.\n+\n+ filename (variable length, nul terminated). The exact encoding is\n+ undefined, but the filename cannot contain a NUL byte (iow, the same\n+ encoding as a UNIX pathname).\n+\n+ flags (16-bits): 'flags' field split into (high to low bits)\n+\n+ assumevalid (1-bit): assume-valid flag\n+\n+ intenttoadd (1-bit): intent-to-add flag, used by \"git add -N\".\n+ Extended flag in index v3.\n+\n+ stage (2-bit): stage of the file during merge\n+\n+ skipworktree (1-bit): skip-worktree flag, used by sparse checkout.\n+ Extended flag in index v3.\n+\n+ smudged (1-bit): indicates if the file is racily smudged.\n+\n+ invalid (1-bit): This bit can be set to indicate that a file was\n+ deleted, but not yet removed from the index, because the index\n+ was only partially rewritten. Entries with this flags should be\n+ ignored when reading the index file.\n+\n+ 9-bit unused, must be zero [6]\n+\n+ mode (16-bits): file mode, split into (high to low bits)\n+\n+ objtype (4-bits): object type\n+ valid values in binary are 1000 (regular file), 1010 (symbolic\n+ link) and 1110 (gitlink)\n+\n+ 3-bit unused\n+\n+ permission (9-bits): unix permission. Only 0755 and 0644 are valid\n+ for regular files. Symbolic links and gitlinks have value 0 in\n+ this field.\n+\n+ mtimes (32-bits): mtime seconds, the last time a file's data changed\n+ this is stat(2) data\n+\n+ mtimens (32-bits): mtime nanosecond fractions\n+ this is stat(2) data\n+\n+ file size (32-bits): The on-disk size, trucated to 32-bit.\n+ this is stat(2) data\n+\n+ statcrc (32-bits): crc32 checksum over ctime seconds, ctime\n+ nanoseconds, ino, dev, uid, gid (All stat(2) data\n+ except mtime and file size). If the statcrc is 0 it will\n+ be ignored. [7]\n+\n+ objhash (160-bits): SHA-1 for the represented object\n+\n+ entrycrc (32-bits): crc32 checksum for the file entry. The crc code\n+ includes the offset to the offset to the file, relative to the\n+ beginning of the file.\n+\n+== Conflict data\n+\n+ A conflict is represented in the index as a set of higher stage entries.\n+ These entries are stored at the end of the index. When a conflict is\n+ resolved (e.g. with \"git add path\"). A bit is flipped, to indicate that\n+ the conflict is resolved, but the entries will be kept, so that\n+ conflicts can be recreated (e.g. with \"git checkout -m\", in case users\n+ want to redo a conflict resolution from scratch.\n+\n+ The conflicts will also be stored in the fileentries part of the index,\n+ to simplify reading and writing of the index.\n+\n+ filename (variable length, nul terminated): filename of the entry,\n+ relative to its containing directory).\n+\n+ nfileconflicts (32-bits): number of conflicts for the file [8]\n+\n+ flags (nfileconflicts entries of \"flags\") (16-bits): 'flags' field\n+ split into:\n+\n+ conflicted (1-bit): conflicted state (conflicted/resolved) (1 if\n+ conflicted)\n+\n+ stage (2-bits): stage during merge.\n+\n+ 13-bit unused\n+\n+ entry_mode (nfileconflicts entries of \"entry mode\") (16-bits):\n+ octal numbers, entry mode of eache entry in the different stages.\n+ (How many is defined by the 4-byte number before)\n+\n+ objectnames (nfileconflicts entries of \"object name\") (160-bits):\n+ object names of the different stages.\n+\n+ conflictcrc (32-bits): crc32 checksum over conflict data.\n+\n+== Design explanations\n+\n+[1] The directory and file offsets are included in the index format\n+ to enable bisectability of the index, for binary searches.Updating\n+ a single entry and partial reading will benefit from this.\n+\n+[2] The directories are saved in their own block, to be able to\n+ quickly search for a directory in the index. They include a\n+ offset to the (lexically) first file in the directory.\n+\n+[3] The data of the cache-tree extension and the resolve undo\n+ extension is now part of the index itself, but if other extensions\n+ come up in the future, there is no need to change the index, they\n+ can simply be added at the end.\n+\n+[4] To avoid rewrites of the whole index when there are conflicts or\n+ conflicts are being resolved, conflicted data will be stored at\n+ the end of the index. To mark the conflict resolved, just a bit\n+ has to be flipped. The data will still be there, if a user wants\n+ to redo the conflict resolution.\n+\n+[5] Since only 4 modes are effectively allowed in git but 32-bit are\n+ used to store them, having a two bit flag for the mode is enough\n+ and saves 4 byte per entry.\n+\n+[6] The length of the file name was dropped, since each file name is\n+ nul terminated anyway.\n+\n+[7] Since all stat data (except mtime and ctime) is just used for\n+ checking if a file has changed a checksum of the data is enough.\n+ In addition to that Thomas Rast suggested ctime could be ditched\n+ completely (core.trustctime=false) and thus included in the\n+ checksum. This would save 24 bytes per index entry, which would\n+ be about 4 MB on the Webkit index.\n+ (Thanks for the suggestion to Michael Haggerty)\n+\n+[8] Since there can be more stage #1 entries, it is necessary to know\n+ the number of conflict data entries there are.\n+\n+[9] As Michael Haggerty pointed out on the mailing list, storing the\n+ trailing slash will simplify a few operations.\n-- \n1.8.3.4.1231.g9fbf354.dirty\n"},{"id":"225414","messageId":"1376854933-31241-15-git-send-email-t.gummerer@gmail.com","threadId":"34724","inReplyTo":"1376854933-31241-1-git-send-email-t.gummerer@gmail.com","subject":"[PATCH v3 14/24] read-cache: make in-memory format aware of stat_crc","fromName":"Thomas Gummerer","fromEmail":"t.gummerer@gmail.com","sentAt":"2013-08-18T19:42:03Z","receivedAt":"2013-08-18T19:42:03Z","isPatch":true,"sender":{"key":"t.gummerer@gmail.com","avatar":"https://avatars.githubusercontent.com/u/191004?v=4"},"body":"Make the in-memory format aware of the stat_crc used by index-v5.\nIt is simply ignored by index version prior to v5.\n\nSigned-off-by: Thomas Gummerer \n---\n cache.h | 1 +\n read-cache.c | 25 +++++++++++++++++++++++++\n 2 files changed, 26 insertions(+)\n\ndiff --git a/cache.h b/cache.h\nindex da224c9..714a334 100644\n--- a/cache.h\n+++ b/cache.h\n@@ -127,6 +127,7 @@ struct cache_entry {\n \tunsigned int ce_flags;\n \tunsigned int ce_namelen;\n \tunsigned char sha1[20];\n+\tuint32_t ce_stat_crc;\n \tstruct cache_entry *next; /* used by name_hash */\n \tchar name[FLEX_ARRAY]; /* more */\n };\ndiff --git a/read-cache.c b/read-cache.c\nindex 7a27f9b..a232372 100644\n--- a/read-cache.c\n+++ b/read-cache.c\n@@ -108,6 +108,29 @@ int match_stat_data(const struct stat_data *sd, struct stat *st)\n \treturn changed;\n }\n \n+static uint32_t calculate_stat_crc(struct cache_entry *ce)\n+{\n+\tunsigned int ctimens = 0;\n+\tuint32_t stat, stat_crc;\n+\n+\tstat = htonl(ce->ce_stat_data.sd_ctime.sec);\n+\tstat_crc = crc32(0, (Bytef*)&stat, 4);\n+#ifdef USE_NSEC\n+\tctimens = ce->ce_stat_data.sd_ctime.nsec;\n+#endif\n+\tstat = htonl(ctimens);\n+\tstat_crc = crc32(stat_crc, (Bytef*)&stat, 4);\n+\tstat = htonl(ce->ce_stat_data.sd_ino);\n+\tstat_crc = crc32(stat_crc, (Bytef*)&stat, 4);\n+\tstat = htonl(ce->ce_stat_data.sd_dev);\n+\tstat_crc = crc32(stat_crc, (Bytef*)&stat, 4);\n+\tstat = htonl(ce->ce_stat_data.sd_uid);\n+\tstat_crc = crc32(stat_crc, (Bytef*)&stat, 4);\n+\tstat = htonl(ce->ce_stat_data.sd_gid);\n+\tstat_crc = crc32(stat_crc, (Bytef*)&stat, 4);\n+\treturn stat_crc;\n+}\n+\n /*\n * This only updates the \"non-critical\" parts of the directory\n * cache, ie the parts that aren't tracked by GIT, and only used\n@@ -122,6 +145,8 @@ void fill_stat_cache_info(struct cache_entry *ce, struct stat *st)\n \n \tif (S_ISREG(st->st_mode))\n \t\tce_mark_uptodate(ce);\n+\n+\tce->ce_stat_crc = calculate_stat_crc(ce);\n }\n \n static int ce_compare_data(const struct cache_entry *ce, struct stat *st)\n-- \n1.8.3.4.1231.g9fbf354.dirty\n"},{"id":"225416","messageId":"1376854933-31241-16-git-send-email-t.gummerer@gmail.com","threadId":"34724","inReplyTo":"1376854933-31241-1-git-send-email-t.gummerer@gmail.com","subject":"[PATCH v3 15/24] read-cache: read index-v5","fromName":"Thomas Gummerer","fromEmail":"t.gummerer@gmail.com","sentAt":"2013-08-18T19:42:04Z","receivedAt":"2013-08-18T19:42:04Z","isPatch":true,"sender":{"key":"t.gummerer@gmail.com","avatar":"https://avatars.githubusercontent.com/u/191004?v=4"},"body":"Make git read the index file version 5 without complaining.\n\nThis version of the reader doesn't read neither the cache-tree\nnor the resolve undo data, but doesn't choke on an index that\nincludes such data.\n\nHelped-by: Junio C Hamano \nHelped-by: Nguyen Thai Ngoc Duy \nHelped-by: Thomas Rast \nSigned-off-by: Thomas Gummerer \n---\n Makefile | 1 +\n cache.h | 32 +++-\n read-cache-v5.c | 473 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++\n read-cache.h | 1 +\n 4 files changed, 506 insertions(+), 1 deletion(-)\n create mode 100644 read-cache-v5.c\n\ndiff --git a/Makefile b/Makefile\nindex afae23e..a55206d 100644\n--- a/Makefile\n+++ b/Makefile\n@@ -857,6 +857,7 @@ LIB_OBJS += quote.o\n LIB_OBJS += reachable.o\n LIB_OBJS += read-cache.o\n LIB_OBJS += read-cache-v2.o\n+LIB_OBJS += read-cache-v5.o\n LIB_OBJS += reflog-walk.o\n LIB_OBJS += refs.o\n LIB_OBJS += remote.o\ndiff --git a/cache.h b/cache.h\nindex 714a334..89f556b 100644\n--- a/cache.h\n+++ b/cache.h\n@@ -99,7 +99,7 @@ unsigned long git_deflate_bound(git_zstream *, unsigned long);\n #define CACHE_SIGNATURE 0x44495243\t/* \"DIRC\" */\n \n #define INDEX_FORMAT_LB 2\n-#define INDEX_FORMAT_UB 4\n+#define INDEX_FORMAT_UB 5\n \n /*\n * The \"cache_time\" is just the low 32 bits of the\n@@ -121,6 +121,15 @@ struct stat_data {\n \tunsigned int sd_size;\n };\n \n+/*\n+ * The *next pointer is used in read_entries_v5 for holding\n+ * all the elements of a directory, and points to the next\n+ * cache_entry in a directory.\n+ *\n+ * It is reset by the add_name_hash call in set_index_entry\n+ * to set it to point to the next cache_entry in the\n+ * correct in-memory format ordering.\n+ */\n struct cache_entry {\n \tstruct stat_data ce_stat_data;\n \tunsigned int ce_mode;\n@@ -132,11 +141,17 @@ struct cache_entry {\n \tchar name[FLEX_ARRAY]; /* more */\n };\n \n+#define CE_NAMEMASK (0x0fff)\n #define CE_STAGEMASK (0x3000)\n #define CE_EXTENDED (0x4000)\n #define CE_VALID (0x8000)\n+#define CE_SMUDGED (0x0400) /* index v5 only flag */\n #define CE_STAGESHIFT 12\n \n+#define CONFLICT_CONFLICTED (0x8000)\n+#define CONFLICT_STAGESHIFT 13\n+#define CONFLICT_STAGEMASK (0x6000)\n+\n /*\n * Range 0xFFFF0000 in ce_flags is divided into\n * two parts: in-memory flags and on-disk ones.\n@@ -173,6 +188,19 @@ struct cache_entry {\n #define CE_EXTENDED_FLAGS (CE_INTENT_TO_ADD | CE_SKIP_WORKTREE)\n \n /*\n+ * Representation of the extended on-disk flags in the v5 format.\n+ * They must not collide with the ordinary on-disk flags, and need to\n+ * fit in 16 bits. Note however that v5 does not save the name\n+ * length.\n+ */\n+#define CE_INTENT_TO_ADD_V5 (0x4000)\n+#define CE_SKIP_WORKTREE_V5 (0x0800)\n+#define CE_INVALID_V5 (0x0200)\n+#if (CE_VALID|CE_STAGEMASK) & (CE_INTENTTOADD_V5|CE_SKIPWORKTREE_V5|CE_INVALID_V5)\n+#error \"v5 on-disk flags collide with ordinary on-disk flags\"\n+#endif\n+\n+/*\n * Safeguard to avoid saving wrong flags:\n * - CE_EXTENDED2 won't get saved until its semantic is known\n * - Bits in 0x0000FFFF have been saved in ce_flags already\n@@ -213,6 +241,8 @@ static inline unsigned create_ce_flags(unsigned stage)\n #define ce_skip_worktree(ce) ((ce)->ce_flags & CE_SKIP_WORKTREE)\n #define ce_mark_uptodate(ce) ((ce)->ce_flags |= CE_UPTODATE)\n \n+#define conflict_stage(c) ((CONFLICT_STAGEMASK & (c)->flags) >> CONFLICT_STAGESHIFT)\n+\n #define ce_permissions(mode) (((mode) & 0100) ? 0755 : 0644)\n static inline unsigned int create_ce_mode(unsigned int mode)\n {\ndiff --git a/read-cache-v5.c b/read-cache-v5.c\nnew file mode 100644\nindex 0000000..799b8e7\n--- /dev/null\n+++ b/read-cache-v5.c\n@@ -0,0 +1,473 @@\n+#include \"cache.h\"\n+#include \"read-cache.h\"\n+#include \"resolve-undo.h\"\n+#include \"cache-tree.h\"\n+#include \"dir.h\"\n+#include \"pathspec.h\"\n+\n+#define ptr_add(x,y) ((void *)(((char *)(x)) + (y)))\n+\n+struct cache_header_v5 {\n+\tuint32_t hdr_ndir;\n+\tuint32_t hdr_fblockoffset;\n+\tuint32_t hdr_nextension;\n+};\n+\n+struct directory_entry {\n+\tstruct directory_entry **sub;\n+\tstruct directory_entry *next;\n+\tstruct directory_entry *next_hash;\n+\tstruct cache_entry *ce;\n+\tstruct cache_entry *ce_last;\n+\tstruct conflict_entry *conflict;\n+\tstruct conflict_entry *conflict_last;\n+\tuint32_t conflict_size;\n+\tuint32_t de_foffset;\n+\tuint32_t de_cr;\n+\tuint32_t de_ncr;\n+\tuint32_t de_nsubtrees;\n+\tuint32_t de_nfiles;\n+\tuint32_t de_nentries;\n+\tunsigned char sha1[20];\n+\tuint16_t de_flags;\n+\tuint32_t de_pathlen;\n+\tchar pathname[FLEX_ARRAY];\n+};\n+\n+struct conflict_part {\n+\tstruct conflict_part *next;\n+\tuint16_t flags;\n+\tuint16_t entry_mode;\n+\tunsigned char sha1[20];\n+};\n+\n+struct conflict_entry {\n+\tstruct conflict_entry *next;\n+\tuint32_t nfileconflicts;\n+\tstruct conflict_part *entries;\n+\tuint32_t namelen;\n+\tuint32_t pathlen;\n+\tchar name[FLEX_ARRAY];\n+};\n+\n+#define directory_entry_size(len) (offsetof(struct directory_entry,pathname) + (len) + 1)\n+#define conflict_entry_size(len) (offsetof(struct conflict_entry,name) + (len) + 1)\n+\n+/*****************************************************************\n+ * Index File I/O\n+ *****************************************************************/\n+\n+struct ondisk_conflict_part {\n+\tuint16_t flags;\n+\tuint16_t entry_mode;\n+\tunsigned char sha1[20];\n+};\n+\n+struct ondisk_cache_entry {\n+\tuint16_t flags;\n+\tuint16_t mode;\n+\tstruct cache_time mtime;\n+\tuint32_t size;\n+\tint stat_crc;\n+\tunsigned char sha1[20];\n+};\n+\n+struct ondisk_directory_entry {\n+\tuint32_t foffset;\n+\tuint32_t cr;\n+\tuint32_t ncr;\n+\tuint32_t nsubtrees;\n+\tuint32_t nfiles;\n+\tuint32_t nentries;\n+\tunsigned char sha1[20];\n+\tuint16_t flags;\n+};\n+\n+static int check_crc32(int initialcrc,\n+\t\t\tvoid *data,\n+\t\t\tsize_t len,\n+\t\t\tunsigned int expected_crc)\n+{\n+\tint crc;\n+\n+\tcrc = crc32(initialcrc, (Bytef*)data, len);\n+\treturn crc == expected_crc;\n+}\n+\n+static int match_stat_crc(struct stat *st, uint32_t expected_crc)\n+{\n+\tuint32_t data, stat_crc = 0;\n+\tunsigned int ctimens = 0;\n+\n+\tdata = htonl(st->st_ctime);\n+\tstat_crc = crc32(0, (Bytef*)&data, 4);\n+#ifdef USE_NSEC\n+\tctimens = ST_CTIME_NSEC(*st);\n+#endif\n+\tdata = htonl(ctimens);\n+\tstat_crc = crc32(stat_crc, (Bytef*)&data, 4);\n+\tdata = htonl(st->st_ino);\n+\tstat_crc = crc32(stat_crc, (Bytef*)&data, 4);\n+\tdata = htonl(st->st_dev);\n+\tstat_crc = crc32(stat_crc, (Bytef*)&data, 4);\n+\tdata = htonl(st->st_uid);\n+\tstat_crc = crc32(stat_crc, (Bytef*)&data, 4);\n+\tdata = htonl(st->st_gid);\n+\tstat_crc = crc32(stat_crc, (Bytef*)&data, 4);\n+\n+\treturn stat_crc == expected_crc;\n+}\n+\n+static int match_stat_basic(const struct cache_entry *ce,\n+\t\t\t struct stat *st,\n+\t\t\t int changed)\n+{\n+\n+\tif (ce->ce_stat_data.sd_mtime.sec != (unsigned int)st->st_mtime)\n+\t\tchanged |= MTIME_CHANGED;\n+#ifdef USE_NSEC\n+\tif (ce->ce_stat_data.sd_mtime.nsec != ST_MTIME_NSEC(*st))\n+\t\tchanged |= MTIME_CHANGED;\n+#endif\n+\tif (ce->ce_stat_data.sd_size != (unsigned int)st->st_size)\n+\t\tchanged |= DATA_CHANGED;\n+\n+\tif (trust_ctime && ce->ce_stat_crc != 0 && !match_stat_crc(st, ce->ce_stat_crc)) {\n+\t\tchanged |= OWNER_CHANGED;\n+\t\tchanged |= INODE_CHANGED;\n+\t}\n+\t/* Racily smudged entry? */\n+\tif (ce->ce_flags & CE_SMUDGED) {\n+\t\tif (!changed && !is_empty_blob_sha1(ce->sha1) && ce_modified_check_fs(ce, st))\n+\t\t\tchanged |= DATA_CHANGED;\n+\t}\n+\treturn changed;\n+}\n+\n+static int verify_hdr(void *mmap, unsigned long size)\n+{\n+\tuint32_t *filecrc;\n+\tunsigned int header_size;\n+\tstruct cache_header *hdr;\n+\tstruct cache_header_v5 *hdr_v5;\n+\n+\tif (size < sizeof(struct cache_header)\n+\t + sizeof (struct cache_header_v5) + 4)\n+\t\tdie(\"index file smaller than expected\");\n+\n+\thdr = mmap;\n+\thdr_v5 = ptr_add(mmap, sizeof(*hdr));\n+\t/* Size of the header + the size of the extensionoffsets */\n+\theader_size = sizeof(*hdr) + sizeof(*hdr_v5) + hdr_v5->hdr_nextension * 4;\n+\t/* Initialize crc */\n+\tfilecrc = ptr_add(mmap, header_size);\n+\tif (!check_crc32(0, hdr, header_size, ntohl(*filecrc)))\n+\t\treturn error(\"bad index file header crc signature\");\n+\treturn 0;\n+}\n+\n+static struct cache_entry *cache_entry_from_ondisk(struct ondisk_cache_entry *ondisk,\n+\t\t\t\t\t\t char *pathname,\n+\t\t\t\t\t\t char *name,\n+\t\t\t\t\t\t size_t len,\n+\t\t\t\t\t\t size_t pathlen)\n+{\n+\tstruct cache_entry *ce = xmalloc(cache_entry_size(len + pathlen));\n+\tint flags;\n+\n+\tflags = ntoh_s(ondisk->flags);\n+\t/*\n+\t * This entry was invalidated in the index file,\n+\t * we don't need any data from it\n+\t */\n+\tif (flags & CE_INVALID_V5)\n+\t\treturn NULL;\n+\tce->ce_stat_data.sd_ctime.sec = 0;\n+\tce->ce_stat_data.sd_mtime.sec = ntoh_l(ondisk->mtime.sec);\n+\tce->ce_stat_data.sd_ctime.nsec = 0;\n+\tce->ce_stat_data.sd_mtime.nsec = ntoh_l(ondisk->mtime.nsec);\n+\tce->ce_stat_data.sd_dev = 0;\n+\tce->ce_stat_data.sd_ino = 0;\n+\tce->ce_stat_data.sd_uid = 0;\n+\tce->ce_stat_data.sd_gid = 0;\n+\tce->ce_stat_data.sd_size = ntoh_l(ondisk->size);\n+\tce->ce_mode = ntoh_s(ondisk->mode);\n+\tce->ce_flags = flags & CE_STAGEMASK;\n+\tce->ce_flags |= flags & CE_VALID;\n+\tce->ce_flags |= flags & CE_SMUDGED;\n+\tif (flags & CE_INTENT_TO_ADD_V5)\n+\t\tce->ce_flags |= CE_INTENT_TO_ADD;\n+\tif (flags & CE_SKIP_WORKTREE_V5)\n+\t\tce->ce_flags |= CE_SKIP_WORKTREE;\n+\tce->ce_stat_crc = ntoh_l(ondisk->stat_crc);\n+\tce->ce_namelen = len + pathlen;\n+\thashcpy(ce->sha1, ondisk->sha1);\n+\tmemcpy(ce->name, pathname, pathlen);\n+\tmemcpy(ce->name + pathlen, name, len);\n+\tce->name[len + pathlen] = '\\0';\n+\treturn ce;\n+}\n+\n+static struct directory_entry *directory_entry_from_ondisk(struct ondisk_directory_entry *ondisk,\n+\t\t\t\t\t\t const char *name,\n+\t\t\t\t\t\t size_t len)\n+{\n+\tstruct directory_entry *de = xmalloc(directory_entry_size(len));\n+\n+\tmemcpy(de->pathname, name, len);\n+\tde->pathname[len] = '\\0';\n+\tde->de_flags = ntoh_s(ondisk->flags);\n+\tde->de_foffset = ntoh_l(ondisk->foffset);\n+\tde->de_cr = ntoh_l(ondisk->cr);\n+\tde->de_ncr = ntoh_l(ondisk->ncr);\n+\tde->de_nsubtrees = ntoh_l(ondisk->nsubtrees);\n+\tde->de_nfiles = ntoh_l(ondisk->nfiles);\n+\tde->de_nentries = ntoh_l(ondisk->nentries);\n+\tde->de_pathlen = len;\n+\thashcpy(de->sha1, ondisk->sha1);\n+\treturn de;\n+}\n+\n+static struct directory_entry *read_directories(unsigned int *dir_offset,\n+\t\t\t\tunsigned int *dir_table_offset,\n+\t\t\t\tvoid *mmap,\n+\t\t\t\tint mmap_size)\n+{\n+\tint i, ondisk_directory_size;\n+\tuint32_t *filecrc, *beginning, *end;\n+\tstruct ondisk_directory_entry *disk_de;\n+\tstruct directory_entry *de;\n+\tunsigned int data_len, len;\n+\tchar *name;\n+\n+\t/*\n+\t * Length of pathname + nul byte for termination + size of\n+\t * members of ondisk_directory_entry. (Just using the size\n+\t * of the struct doesn't work, because there may be padding\n+\t * bytes for the struct)\n+\t */\n+\tondisk_directory_size = sizeof(disk_de->flags)\n+\t\t+ sizeof(disk_de->foffset)\n+\t\t+ sizeof(disk_de->cr)\n+\t\t+ sizeof(disk_de->ncr)\n+\t\t+ sizeof(disk_de->nsubtrees)\n+\t\t+ sizeof(disk_de->nfiles)\n+\t\t+ sizeof(disk_de->nentries)\n+\t\t+ sizeof(disk_de->sha1);\n+\tname = ptr_add(mmap, *dir_offset);\n+\tbeginning = ptr_add(mmap, *dir_table_offset);\n+\tend = ptr_add(mmap, *dir_table_offset + 4);\n+\tlen = ntoh_l(*end) - ntoh_l(*beginning) - ondisk_directory_size - 5;\n+\tdisk_de = ptr_add(mmap, *dir_offset + len + 1);\n+\tde = directory_entry_from_ondisk(disk_de, name, len);\n+\tde->next = NULL;\n+\tde->sub = NULL;\n+\n+\tdata_len = len + 1 + ondisk_directory_size;\n+\tfilecrc = ptr_add(mmap, *dir_offset + data_len);\n+\tif (!check_crc32(0, ptr_add(mmap, *dir_offset), data_len, ntoh_l(*filecrc)))\n+\t\tdie(\"directory crc doesn't match for '%s'\", de->pathname);\n+\n+\t*dir_table_offset += 4;\n+\t*dir_offset += data_len + 4; /* crc code */\n+\n+\tde->sub = xcalloc(de->de_nsubtrees, sizeof(struct directory_entry *));\n+\tfor (i = 0; i < de->de_nsubtrees; i++) {\n+\t\tde->sub[i] = read_directories(dir_offset, dir_table_offset,\n+\t\t\t\t\t\t mmap, mmap_size);\n+\t}\n+\n+\treturn de;\n+}\n+\n+static int read_entry(struct cache_entry **ce, char *pathname, size_t pathlen,\n+\t\t void *mmap, unsigned long mmap_size,\n+\t\t unsigned int first_entry_offset,\n+\t\t unsigned int foffsetblock)\n+{\n+\tint len, offset_to_offset;\n+\tchar *name;\n+\tuint32_t foffsetblockcrc, *filecrc, *beginning, *end, entry_offset;\n+\tstruct ondisk_cache_entry *disk_ce;\n+\n+\tbeginning = ptr_add(mmap, foffsetblock);\n+\tend = ptr_add(mmap, foffsetblock + 4);\n+\tlen = ntoh_l(*end) - ntoh_l(*beginning) - sizeof(struct ondisk_cache_entry) - 5;\n+\tentry_offset = first_entry_offset + ntoh_l(*beginning);\n+\tname = ptr_add(mmap, entry_offset);\n+\tdisk_ce = ptr_add(mmap, entry_offset + len + 1);\n+\t*ce = cache_entry_from_ondisk(disk_ce, pathname, name, len, pathlen);\n+\tfilecrc = ptr_add(mmap, entry_offset + len + 1 + sizeof(*disk_ce));\n+\toffset_to_offset = htonl(foffsetblock);\n+\tfoffsetblockcrc = crc32(0, (Bytef*)&offset_to_offset, 4);\n+\tif (!check_crc32(foffsetblockcrc,\n+\t\tptr_add(mmap, entry_offset), len + 1 + sizeof(*disk_ce),\n+\t\tntoh_l(*filecrc)))\n+\t\treturn -1;\n+\n+\treturn 0;\n+}\n+\n+struct conflict_entry *create_new_conflict(char *name, int len, int pathlen)\n+{\n+\tstruct conflict_entry *conflict_entry;\n+\n+\tif (pathlen)\n+\t\tpathlen++;\n+\tconflict_entry = xmalloc(conflict_entry_size(len));\n+\tconflict_entry->entries = NULL;\n+\tconflict_entry->nfileconflicts = 0;\n+\tconflict_entry->namelen = len;\n+\tmemcpy(conflict_entry->name, name, len);\n+\tconflict_entry->name[len] = '\\0';\n+\tconflict_entry->pathlen = pathlen;\n+\tconflict_entry->next = NULL;\n+\n+\treturn conflict_entry;\n+}\n+\n+void add_part_to_conflict_entry(struct directory_entry *de,\n+\t\t\t\t\tstruct conflict_entry *entry,\n+\t\t\t\t\tstruct conflict_part *conflict_part)\n+{\n+\n+\tstruct conflict_part *conflict_search;\n+\n+\tentry->nfileconflicts++;\n+\tde->conflict_size += sizeof(struct ondisk_conflict_part);\n+\tif (!entry->entries)\n+\t\tentry->entries = conflict_part;\n+\telse {\n+\t\tconflict_search = entry->entries;\n+\t\twhile (conflict_search->next)\n+\t\t\tconflict_search = conflict_search->next;\n+\t\tconflict_search->next = conflict_part;\n+\t}\n+}\n+\n+static int read_entries(struct index_state *istate, struct directory_entry *de,\n+\t\t\tunsigned int first_entry_offset, void *mmap,\n+\t\t\tunsigned long mmap_size, unsigned int *nr,\n+\t\t\tunsigned int foffsetblock)\n+{\n+\tstruct cache_entry *ce;\n+\tint i, subdir = 0;\n+\n+\tfor (i = 0; i < de->de_nfiles; i++) {\n+\t\tunsigned int subdir_foffsetblock = de->de_foffset + foffsetblock + (i * 4);\n+\t\tif (read_entry(&ce, de->pathname, de->de_pathlen, mmap, mmap_size,\n+\t\t\t first_entry_offset, subdir_foffsetblock) < 0)\n+\t\t\treturn -1;\n+\t\twhile (subdir < de->de_nsubtrees &&\n+\t\t cache_name_compare(ce->name + de->de_pathlen,\n+\t\t\t\t\t ce_namelen(ce) - de->de_pathlen,\n+\t\t\t\t\t de->sub[subdir]->pathname + de->de_pathlen,\n+\t\t\t\t\t de->sub[subdir]->de_pathlen - de->de_pathlen) > 0) {\n+\t\t\tread_entries(istate, de->sub[subdir], first_entry_offset, mmap,\n+\t\t\t\t mmap_size, nr, foffsetblock);\n+\t\t\tsubdir++;\n+\t\t}\n+\t\tif (!ce)\n+\t\t\tcontinue;\n+\t\tset_index_entry(istate, (*nr)++, ce);\n+\t}\n+\tfor (i = subdir; i < de->de_nsubtrees; i++) {\n+\t\tread_entries(istate, de->sub[i], first_entry_offset, mmap,\n+\t\t\t mmap_size, nr, foffsetblock);\n+\t}\n+\treturn 0;\n+}\n+\n+static struct directory_entry *read_all_directories(struct index_state *istate,\n+\t\t\t\t\t\t unsigned int *entry_offset,\n+\t\t\t\t\t\t unsigned int *foffsetblock,\n+\t\t\t\t\t\t unsigned int *ndirs,\n+\t\t\t\t\t\t void *mmap, unsigned long mmap_size)\n+{\n+\tunsigned int dir_offset, dir_table_offset;\n+\tstruct cache_header *hdr;\n+\tstruct cache_header_v5 *hdr_v5;\n+\tstruct directory_entry *root_directory;\n+\n+\thdr = mmap;\n+\thdr_v5 = ptr_add(mmap, sizeof(*hdr));\n+\tistate->cache_alloc = alloc_nr(ntohl(hdr->hdr_entries));\n+\tistate->cache = xcalloc(istate->cache_alloc, sizeof(struct cache_entry *));\n+\n+\t/* Skip size of the header + crc sum + size of offsets to extensions + size of offsets */\n+\tdir_offset = sizeof(*hdr) + sizeof(*hdr_v5) + ntohl(hdr_v5->hdr_nextension) * 4 + 4\n+\t\t+ (ntohl(hdr_v5->hdr_ndir) + 1) * 4;\n+\tdir_table_offset = sizeof(*hdr) + sizeof(*hdr_v5) + ntohl(hdr_v5->hdr_nextension) * 4 + 4;\n+\troot_directory = read_directories(&dir_offset, &dir_table_offset,\n+\t\t\t\t\t mmap, mmap_size);\n+\n+\t*entry_offset = ntohl(hdr_v5->hdr_fblockoffset);\n+\t*foffsetblock = dir_offset;\n+\t*ndirs = ntohl(hdr_v5->hdr_ndir);\n+\treturn root_directory;\n+}\n+\n+static int read_index_v5(struct index_state *istate, void *mmap,\n+\t\t\t unsigned long mmap_size, struct filter_opts *opts)\n+{\n+\tunsigned int entry_offset, ndirs, foffsetblock, nr = 0;\n+\tstruct directory_entry *root_directory, *de, *last_de;\n+\tconst char **paths = NULL;\n+\tstruct pathspec adjusted_pathspec;\n+\tint need_root = 0, i;\n+\n+\troot_directory = read_all_directories(istate, &entry_offset,\n+\t\t\t\t\t &foffsetblock, &ndirs,\n+\t\t\t\t\t mmap, mmap_size);\n+\n+\tif (opts && opts->pathspec && opts->pathspec->nr) {\n+\t\tneed_root = 0;\n+\t\tpaths = xmalloc((opts->pathspec->nr + 1)*sizeof(char *));\n+\t\tpaths[opts->pathspec->nr] = NULL;\n+\t\tfor (i = 0; i < opts->pathspec->nr; i++) {\n+\t\t\tchar *super = strdup(opts->pathspec->items[i].match);\n+\t\t\tint len = strlen(super);\n+\t\t\twhile (len && super[len - 1] == '/' && super[len - 2] == '/')\n+\t\t\t\tsuper[--len] = '\\0'; /* strip all but one trailing slash */\n+\t\t\twhile (len && super[--len] != '/')\n+\t\t\t\t; /* scan backwards to next / */\n+\t\t\tif (len >= 0)\n+\t\t\t\tsuper[len--] = '\\0';\n+\t\t\tif (len <= 0) {\n+\t\t\t\tneed_root = 1;\n+\t\t\t\tbreak;\n+\t\t\t}\n+\t\t\tpaths[i] = super;\n+\t\t}\n+\t}\n+\n+\tif (!need_root)\n+\t\tparse_pathspec(&adjusted_pathspec, PATHSPEC_ALL_MAGIC, PATHSPEC_PREFER_CWD, NULL, paths);\n+\n+\tde = root_directory;\n+\tlast_de = de;\n+\twhile (de) {\n+\t\tif (need_root ||\n+\t\t match_pathspec_depth(&adjusted_pathspec, de->pathname, de->de_pathlen, 0, NULL)) {\n+\t\t\tif (read_entries(istate, de, entry_offset,\n+\t\t\t\t\t mmap, mmap_size, &nr,\n+\t\t\t\t\t foffsetblock) < 0)\n+\t\t\t\treturn -1;\n+\t\t} else {\n+\t\t\tfor (i = 0; i < de->de_nsubtrees; i++) {\n+\t\t\t\tlast_de->next = de->sub[i];\n+\t\t\t\tlast_de = last_de->next;\n+\t\t\t}\n+\t\t}\n+\t\tde = de->next;\n+\t}\n+\tistate->cache_nr = nr;\n+\treturn 0;\n+}\n+\n+struct index_ops v5_ops = {\n+\tmatch_stat_basic,\n+\tverify_hdr,\n+\tread_index_v5,\n+\tNULL\n+};\ndiff --git a/read-cache.h b/read-cache.h\nindex 644b199..01c76de 100644\n--- a/read-cache.h\n+++ b/read-cache.h\n@@ -31,6 +31,7 @@ struct index_ops {\n };\n \n extern struct index_ops v2_ops;\n+extern struct index_ops v5_ops;\n \n #ifndef NEEDS_ALIGNED_ACCESS\n #define ntoh_s(var) ntohs(var)\n-- \n1.8.3.4.1231.g9fbf354.dirty\n"},{"id":"225417","messageId":"1376854933-31241-17-git-send-email-t.gummerer@gmail.com","threadId":"34724","inReplyTo":"1376854933-31241-1-git-send-email-t.gummerer@gmail.com","subject":"[PATCH v3 16/24] read-cache: read resolve-undo data","fromName":"Thomas Gummerer","fromEmail":"t.gummerer@gmail.com","sentAt":"2013-08-18T19:42:05Z","receivedAt":"2013-08-18T19:42:05Z","isPatch":true,"sender":{"key":"t.gummerer@gmail.com","avatar":"https://avatars.githubusercontent.com/u/191004?v=4"},"body":"Make git read the resolve-undo data from the index.\n\nSince the resolve-undo data is joined with the conflicts in\nthe ondisk format of the index file version 5, conflicts and\nresolved data is read at the same time, and the resolve-undo\ndata is then converted to the in-memory format.\n\nHelped-by: Thomas Rast \nSigned-off-by: Thomas Gummerer \n---\n read-cache-v5.c | 130 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++\n 1 file changed, 130 insertions(+)\n\ndiff --git a/read-cache-v5.c b/read-cache-v5.c\nindex 799b8e7..85a2069 100644\n--- a/read-cache-v5.c\n+++ b/read-cache-v5.c\n@@ -1,5 +1,6 @@\n #include \"cache.h\"\n #include \"read-cache.h\"\n+#include \"string-list.h\"\n #include \"resolve-undo.h\"\n #include \"cache-tree.h\"\n #include \"dir.h\"\n@@ -308,6 +309,31 @@ static int read_entry(struct cache_entry **ce, char *pathname, size_t pathlen,\n \treturn 0;\n }\n \n+static struct conflict_part *conflict_part_from_ondisk(struct ondisk_conflict_part *ondisk)\n+{\n+\tstruct conflict_part *cp = xmalloc(sizeof(struct conflict_part));\n+\n+\tcp->flags = ntoh_s(ondisk->flags);\n+\tcp->entry_mode = ntoh_s(ondisk->entry_mode);\n+\thashcpy(cp->sha1, ondisk->sha1);\n+\treturn cp;\n+}\n+\n+static void conflict_entry_push(struct conflict_entry **head,\n+\t\t\t\tstruct conflict_entry **tail,\n+\t\t\t\tstruct conflict_entry *conflict_entry)\n+{\n+\tif (!*head) {\n+\t\t*head = *tail = conflict_entry;\n+\t\t(*tail)->next = NULL;\n+\t\treturn;\n+\t}\n+\n+\t(*tail)->next = conflict_entry;\n+\tconflict_entry->next = NULL;\n+\t*tail = (*tail)->next;\n+}\n+\n struct conflict_entry *create_new_conflict(char *name, int len, int pathlen)\n {\n \tstruct conflict_entry *conflict_entry;\n@@ -345,6 +371,106 @@ void add_part_to_conflict_entry(struct directory_entry *de,\n \t}\n }\n \n+static int read_conflicts(struct conflict_entry **head,\n+\t\t\t struct directory_entry *de,\n+\t\t\t void *mmap, unsigned long mmap_size)\n+{\n+\tstruct conflict_entry *tail;\n+\tunsigned int croffset, i;\n+\tchar *full_name;\n+\n+\tcroffset = de->de_cr;\n+\ttail = NULL;\n+\tfor (i = 0; i < de->de_ncr; i++) {\n+\t\tstruct conflict_entry *conflict_new;\n+\t\tunsigned int len, *nfileconflicts;\n+\t\tchar *name;\n+\t\tvoid *crc_start;\n+\t\tint k, offset;\n+\t\tuint32_t *filecrc;\n+\n+\t\toffset = croffset;\n+\t\tcrc_start = ptr_add(mmap, offset);\n+\t\tname = ptr_add(mmap, offset);\n+\t\tlen = strlen(name);\n+\t\toffset += len + 1;\n+\t\tnfileconflicts = ptr_add(mmap, offset);\n+\t\toffset += 4;\n+\n+\t\tfull_name = xmalloc(sizeof(char) * (len + de->de_pathlen));\n+\t\tmemcpy(full_name, de->pathname, de->de_pathlen);\n+\t\tmemcpy(full_name + de->de_pathlen, name, len);\n+\t\tconflict_new = create_new_conflict(full_name,\n+\t\t\t\tlen + de->de_pathlen, de->de_pathlen);\n+\t\tfor (k = 0; k < ntoh_l(*nfileconflicts); k++) {\n+\t\t\tstruct ondisk_conflict_part *ondisk;\n+\t\t\tstruct conflict_part *cp;\n+\n+\t\t\tondisk = ptr_add(mmap, offset);\n+\t\t\tcp = conflict_part_from_ondisk(ondisk);\n+\t\t\tcp->next = NULL;\n+\t\t\tadd_part_to_conflict_entry(de, conflict_new, cp);\n+\t\t\toffset += sizeof(struct ondisk_conflict_part);\n+\t\t}\n+\t\tfilecrc = ptr_add(mmap, offset);\n+\t\tfree(full_name);\n+\t\tif (!check_crc32(0, crc_start,\n+\t\t\tlen + 1 + 4 + conflict_new->nfileconflicts\n+\t\t\t* sizeof(struct ondisk_conflict_part),\n+\t\t\tntoh_l(*filecrc)))\n+\t\t\treturn -1;\n+\t\tcroffset = offset + 4;\n+\t\tconflict_entry_push(head, &tail, conflict_new);\n+\t}\n+\treturn 0;\n+}\n+\n+static int convert_resolve_undo(struct index_state *istate,\n+\t\t\t\tstruct directory_entry *de,\n+\t\t\t\tvoid *mmap, unsigned long mmap_size)\n+{\n+\tint i;\n+\tstruct conflict_entry *conflicts = NULL;\n+\n+\tif (read_conflicts(&conflicts, de, mmap, mmap_size) < 0)\n+\t\treturn -1;\n+\n+\twhile (conflicts) {\n+\t\tstruct string_list_item *lost;\n+\t\tstruct resolve_undo_info *ui;\n+\t\tstruct conflict_part *cp;\n+\n+\t\tif (conflicts->entries &&\n+\t\t (conflicts->entries->flags & CONFLICT_CONFLICTED)) {\n+\t\t\tconflicts = conflicts->next;\n+\t\t\tcontinue;\n+\t\t}\n+\t\tif (!istate->resolve_undo) {\n+\t\t\tistate->resolve_undo = xcalloc(1, sizeof(struct string_list));\n+\t\t\tistate->resolve_undo->strdup_strings = 1;\n+\t\t}\n+\n+\t\tlost = string_list_insert(istate->resolve_undo, conflicts->name);\n+\t\tif (!lost->util)\n+\t\t\tlost->util = xcalloc(1, sizeof(*ui));\n+\t\tui = lost->util;\n+\n+\t\tcp = conflicts->entries;\n+\t\tfor (i = 0; i < 3; i++)\n+\t\t\tui->mode[i] = 0;\n+\t\twhile (cp) {\n+\t\t\tui->mode[conflict_stage(cp) - 1] = cp->entry_mode;\n+\t\t\thashcpy(ui->sha1[conflict_stage(cp) - 1], cp->sha1);\n+\t\t\tcp = cp->next;\n+\t\t}\n+\t\tconflicts = conflicts->next;\n+\t}\n+\tfor (i = 0; i < de->de_nsubtrees; i++)\n+\t\tif (convert_resolve_undo(istate, de->sub[i], mmap, mmap_size) < 0)\n+\t\t\treturn -1;\n+\treturn 0;\n+}\n+\n static int read_entries(struct index_state *istate, struct directory_entry *de,\n \t\t\tunsigned int first_entry_offset, void *mmap,\n \t\t\tunsigned long mmap_size, unsigned int *nr,\n@@ -444,6 +570,10 @@ static int read_index_v5(struct index_state *istate, void *mmap,\n \tif (!need_root)\n \t\tparse_pathspec(&adjusted_pathspec, PATHSPEC_ALL_MAGIC, PATHSPEC_PREFER_CWD, NULL, paths);\n \n+\tif (!opts || opts->read_resolve_undo)\n+\t\tif (convert_resolve_undo(istate, root_directory, mmap, mmap_size) < 0)\n+\t\t\treturn -1;\n+\n \tde = root_directory;\n \tlast_de = de;\n \twhile (de) {\n-- \n1.8.3.4.1231.g9fbf354.dirty\n"},{"id":"225418","messageId":"1376854933-31241-18-git-send-email-t.gummerer@gmail.com","threadId":"34724","inReplyTo":"1376854933-31241-1-git-send-email-t.gummerer@gmail.com","subject":"[PATCH v3 17/24] read-cache: read cache-tree in index-v5","fromName":"Thomas Gummerer","fromEmail":"t.gummerer@gmail.com","sentAt":"2013-08-18T19:42:06Z","receivedAt":"2013-08-18T19:42:06Z","isPatch":true,"sender":{"key":"t.gummerer@gmail.com","avatar":"https://avatars.githubusercontent.com/u/191004?v=4"},"body":"Since the cache-tree data is saved as part of the directory data,\nwe already read it at the beginning of the index. The cache-tree\nis only converted from this directory data.\n\nThe cache-tree data is arranged in a tree, with the children sorted by\npathlen at each node, while the ondisk format is sorted lexically.\nSo we have to rebuild this format from the on-disk directory list.\n\nSigned-off-by: Thomas Gummerer \n---\n cache-tree.c | 2 +-\n cache-tree.h | 1 +\n read-cache-v5.c | 78 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++\n 3 files changed, 80 insertions(+), 1 deletion(-)\n\ndiff --git a/cache-tree.c b/cache-tree.c\nindex 0bbec43..1209732 100644\n--- a/cache-tree.c\n+++ b/cache-tree.c\n@@ -31,7 +31,7 @@ void cache_tree_free(struct cache_tree **it_p)\n \t*it_p = NULL;\n }\n \n-static int subtree_name_cmp(const char *one, int onelen,\n+int subtree_name_cmp(const char *one, int onelen,\n \t\t\t const char *two, int twolen)\n {\n \tif (onelen < twolen)\ndiff --git a/cache-tree.h b/cache-tree.h\nindex f1923ad..9818926 100644\n--- a/cache-tree.h\n+++ b/cache-tree.h\n@@ -25,6 +25,7 @@ struct cache_tree *cache_tree(void);\n void cache_tree_free(struct cache_tree **);\n void cache_tree_invalidate_path(struct cache_tree *, const char *);\n struct cache_tree_sub *cache_tree_sub(struct cache_tree *, const char *);\n+int subtree_name_cmp(const char *, int, const char *, int);\n \n void cache_tree_write(struct strbuf *, struct cache_tree *root);\n struct cache_tree *cache_tree_read(const char *buffer, unsigned long size);\ndiff --git a/read-cache-v5.c b/read-cache-v5.c\nindex 85a2069..b14505a 100644\n--- a/read-cache-v5.c\n+++ b/read-cache-v5.c\n@@ -471,6 +471,83 @@ static int convert_resolve_undo(struct index_state *istate,\n \treturn 0;\n }\n \n+static struct cache_tree *convert_one(struct directory_entry *de)\n+{\n+\tint i;\n+\tstruct cache_tree *it;\n+\n+\tit = cache_tree();\n+\tit->entry_count = de->de_nentries;\n+\tif (0 <= it->entry_count)\n+\t\thashcpy(it->sha1, de->sha1);\n+\n+\t/*\n+\t * Just a heuristic -- we do not add directories that often but\n+\t * we do not want to have to extend it immediately when we do,\n+\t * hence +2.\n+\t */\n+\tit->subtree_alloc = de->de_nsubtrees + 2;\n+\tit->down = xcalloc(it->subtree_alloc, sizeof(struct cache_tree_sub *));\n+\tfor (i = 0; i < de->de_nsubtrees; i++) {\n+\t\tstruct cache_tree *sub;\n+\t\tstruct cache_tree_sub *subtree;\n+\t\tchar *buf, *name;\n+\n+\t\tsub = convert_one(de->sub[i]);\n+\t\tif(!sub)\n+\t\t\tgoto free_return;\n+\n+\t\tname = \"\";\n+\t\tbuf = strtok(de->sub[i]->pathname, \"/\");\n+\t\twhile (buf) {\n+\t\t\tname = buf;\n+\t\t\tbuf = strtok(NULL, \"/\");\n+\t\t}\n+\t\tsubtree = cache_tree_sub(it, name);\n+\t\tsubtree->cache_tree = sub;\n+\t}\n+\tif (de->de_nsubtrees != it->subtree_nr)\n+\t\tdie(\"cache-tree: internal error\");\n+\treturn it;\n+ free_return:\n+\tcache_tree_free(&it);\n+\treturn NULL;\n+}\n+\n+static int compare_cache_tree_elements(const void *a, const void *b)\n+{\n+\tconst struct directory_entry *de1, *de2;\n+\n+\tde1 = (const struct directory_entry *) a;\n+\tde2 = (const struct directory_entry *) b;\n+\treturn subtree_name_cmp(de1->pathname, de1->de_pathlen,\n+\t\t\t\tde2->pathname, de2->de_pathlen);\n+}\n+\n+static void sort_directories(struct directory_entry *de)\n+{\n+\tint i;\n+\n+\tfor (i = 0; i < de->de_nsubtrees; i++) {\n+\t\tif (de->sub[i]->de_nsubtrees)\n+\t\t\tsort_directories(de->sub[i]);\n+\t}\n+\tqsort(de->sub, de->de_nsubtrees, sizeof(struct directory_entry *),\n+\t compare_cache_tree_elements);\n+}\n+\n+/*\n+ * This function modifies the directory argument that is given to it.\n+ * Don't use it if the directory entries are still needed after.\n+ */\n+static struct cache_tree *cache_tree_convert_v5(struct directory_entry *de)\n+{\n+\tif (!de->de_nentries)\n+\t\treturn NULL;\n+\tsort_directories(de);\n+\treturn convert_one(de);\n+}\n+\n static int read_entries(struct index_state *istate, struct directory_entry *de,\n \t\t\tunsigned int first_entry_offset, void *mmap,\n \t\t\tunsigned long mmap_size, unsigned int *nr,\n@@ -591,6 +668,7 @@ static int read_index_v5(struct index_state *istate, void *mmap,\n \t\t}\n \t\tde = de->next;\n \t}\n+\tistate->cache_tree = cache_tree_convert_v5(root_directory);\n \tistate->cache_nr = nr;\n \treturn 0;\n }\n-- \n1.8.3.4.1231.g9fbf354.dirty\n"},{"id":"225419","messageId":"1376854933-31241-19-git-send-email-t.gummerer@gmail.com","threadId":"34724","inReplyTo":"1376854933-31241-1-git-send-email-t.gummerer@gmail.com","subject":"[PATCH v3 18/24] read-cache: write index-v5","fromName":"Thomas Gummerer","fromEmail":"t.gummerer@gmail.com","sentAt":"2013-08-18T19:42:07Z","receivedAt":"2013-08-18T19:42:07Z","isPatch":true,"sender":{"key":"t.gummerer@gmail.com","avatar":"https://avatars.githubusercontent.com/u/191004?v=4"},"body":"Write the index version 5 file format to disk. This version doesn't\nwrite the cache-tree data and resolve-undo data to the file.\n\nThe main work is done when filtering out the directories from the\ncurrent in-memory format, where in the same turn also the conflicts\nand the file data is calculated.\n\nHelped-by: Nguyen Thai Ngoc Duy \nHelped-by: Thomas Rast \nSigned-off-by: Thomas Gummerer \n---\n cache.h | 2 +\n read-cache-v5.c | 596 +++++++++++++++++++++++++++++++++++++++++++++++++++++++-\n read-cache.c | 4 +-\n read-cache.h | 1 +\n 4 files changed, 601 insertions(+), 2 deletions(-)\n\ndiff --git a/cache.h b/cache.h\nindex 89f556b..a109f35 100644\n--- a/cache.h\n+++ b/cache.h\n@@ -138,6 +138,7 @@ struct cache_entry {\n \tunsigned char sha1[20];\n \tuint32_t ce_stat_crc;\n \tstruct cache_entry *next; /* used by name_hash */\n+\tstruct cache_entry *next_ce;\n \tchar name[FLEX_ARRAY]; /* more */\n };\n \n@@ -532,6 +533,7 @@ extern int unmerged_index(const struct index_state *);\n extern int verify_path(const char *path);\n extern struct cache_entry *index_name_exists(struct index_state *istate, const char *name, int namelen, int igncase);\n extern int index_name_pos(const struct index_state *, const char *name, int namelen);\n+extern struct directory_entry *init_directory_entry(char *pathname, int len);\n #define ADD_CACHE_OK_TO_ADD 1\t\t/* Ok to add */\n #define ADD_CACHE_OK_TO_REPLACE 2\t/* Ok to replace file/directory */\n #define ADD_CACHE_SKIP_DFCHECK 4\t/* Ok to skip DF conflict checks */\ndiff --git a/read-cache-v5.c b/read-cache-v5.c\nindex b14505a..85b912b 100644\n--- a/read-cache-v5.c\n+++ b/read-cache-v5.c\n@@ -673,9 +673,603 @@ static int read_index_v5(struct index_state *istate, void *mmap,\n \treturn 0;\n }\n \n+#define WRITE_BUFFER_SIZE 8192\n+static unsigned char write_buffer[WRITE_BUFFER_SIZE];\n+static unsigned long write_buffer_len;\n+\n+static int ce_write_flush(int fd)\n+{\n+\tunsigned int buffered = write_buffer_len;\n+\tif (buffered) {\n+\t\tif (write_in_full(fd, write_buffer, buffered) != buffered)\n+\t\t\treturn -1;\n+\t\twrite_buffer_len = 0;\n+\t}\n+\treturn 0;\n+}\n+\n+static int ce_write(uint32_t *crc, int fd, void *data, unsigned int len)\n+{\n+\tif (crc)\n+\t\t*crc = crc32(*crc, (Bytef*)data, len);\n+\twhile (len) {\n+\t\tunsigned int buffered = write_buffer_len;\n+\t\tunsigned int partial = WRITE_BUFFER_SIZE - buffered;\n+\t\tif (partial > len)\n+\t\t\tpartial = len;\n+\t\tmemcpy(write_buffer + buffered, data, partial);\n+\t\tbuffered += partial;\n+\t\tif (buffered == WRITE_BUFFER_SIZE) {\n+\t\t\twrite_buffer_len = buffered;\n+\t\t\tif (ce_write_flush(fd))\n+\t\t\t\treturn -1;\n+\t\t\tbuffered = 0;\n+\t\t}\n+\t\twrite_buffer_len = buffered;\n+\t\tlen -= partial;\n+\t\tdata = (char *) data + partial;\n+\t}\n+\treturn 0;\n+}\n+\n+static int ce_flush(int fd)\n+{\n+\tunsigned int left = write_buffer_len;\n+\n+\tif (left)\n+\t\twrite_buffer_len = 0;\n+\n+\tif (write_in_full(fd, write_buffer, left) != left)\n+\t\treturn -1;\n+\n+\treturn 0;\n+}\n+\n+static void ce_smudge_racily_clean_entry(struct cache_entry *ce)\n+{\n+\t/*\n+\t * This method shall only be called if the timestamp of ce\n+\t * is racy (check with is_racy_timestamp). If the timestamp\n+\t * is racy, the writer will set the CE_SMUDGED flag.\n+\t *\n+\t * The reader (match_stat_basic) will then take care\n+\t * of checking if the entry is really changed or not, by\n+\t * taking into account the size and the stat_crc and if\n+\t * that hasn't changed checking the sha1.\n+\t */\n+\tce->ce_flags |= CE_SMUDGED;\n+}\n+\n+char *super_directory(const char *filename)\n+{\n+\tchar *slash;\n+\n+\tslash = strrchr(filename, '/');\n+\tif (slash)\n+\t\treturn xmemdupz(filename, slash-filename);\n+\treturn NULL;\n+}\n+\n+struct directory_entry *init_directory_entry(char *pathname, int len)\n+{\n+\tstruct directory_entry *de = xmalloc(directory_entry_size(len));\n+\n+\tmemcpy(de->pathname, pathname, len);\n+\tde->pathname[len] = '\\0';\n+\tde->de_flags = 0;\n+\tde->de_foffset = 0;\n+\tde->de_cr = 0;\n+\tde->de_ncr = 0;\n+\tde->de_nsubtrees = 0;\n+\tde->de_nfiles = 0;\n+\tde->de_nentries = 0;\n+\tmemset(de->sha1, 0, 20);\n+\tde->de_pathlen = len;\n+\tde->next = NULL;\n+\tde->next_hash = NULL;\n+\tde->ce = NULL;\n+\tde->ce_last = NULL;\n+\tde->conflict = NULL;\n+\tde->conflict_last = NULL;\n+\tde->conflict_size = 0;\n+\treturn de;\n+}\n+\n+static void ondisk_from_directory_entry(struct directory_entry *de,\n+\t\t\t\t\tstruct ondisk_directory_entry *ondisk)\n+{\n+\tondisk->foffset = htonl(de->de_foffset);\n+\tondisk->cr = htonl(de->de_cr);\n+\tondisk->ncr = htonl(de->de_ncr);\n+\tondisk->nsubtrees = htonl(de->de_nsubtrees);\n+\tondisk->nfiles = htonl(de->de_nfiles);\n+\tondisk->nentries = htonl(de->de_nentries);\n+\thashcpy(ondisk->sha1, de->sha1);\n+\tondisk->flags = htons(de->de_flags);\n+}\n+\n+static struct conflict_part *conflict_part_from_inmemory(struct cache_entry *ce)\n+{\n+\tstruct conflict_part *conflict;\n+\tint flags;\n+\n+\tconflict = xmalloc(sizeof(struct conflict_part));\n+\tflags = CONFLICT_CONFLICTED;\n+\tflags |= ce_stage(ce) << CONFLICT_STAGESHIFT;\n+\tconflict->flags = flags;\n+\tconflict->entry_mode = ce->ce_mode;\n+\tconflict->next = NULL;\n+\thashcpy(conflict->sha1, ce->sha1);\n+\treturn conflict;\n+}\n+\n+static void conflict_to_ondisk(struct conflict_part *cp,\n+\t\t\t\tstruct ondisk_conflict_part *ondisk)\n+{\n+\tondisk->flags = htons(cp->flags);\n+\tondisk->entry_mode = htons(cp->entry_mode);\n+\thashcpy(ondisk->sha1, cp->sha1);\n+}\n+\n+void add_conflict_to_directory_entry(struct directory_entry *de,\n+\t\t\t\t\tstruct conflict_entry *conflict_entry)\n+{\n+\tde->de_ncr++;\n+\tde->conflict_size += conflict_entry->namelen + 1 + 8 - conflict_entry->pathlen;\n+\tconflict_entry_push(&de->conflict, &de->conflict_last, conflict_entry);\n+}\n+\n+void insert_directory_entry(struct directory_entry *de,\n+\t\t\tstruct hash_table *table,\n+\t\t\tunsigned int *total_dir_len,\n+\t\t\tunsigned int *ndir,\n+\t\t\tuint32_t crc)\n+{\n+\tstruct directory_entry *insert;\n+\n+\tinsert = (struct directory_entry *)insert_hash(crc, de, table);\n+\tif (insert) {\n+\t\tde->next_hash = insert->next_hash;\n+\t\tinsert->next_hash = de;\n+\t}\n+\t(*ndir)++;\n+\tif (de->de_pathlen == 0)\n+\t\t(*total_dir_len)++;\n+\telse\n+\t\t*total_dir_len += de->de_pathlen + 2;\n+}\n+\n+static struct directory_entry *find_directory(char *dir, int dir_len, uint32_t *crc,\n+\t\t\t\t\t struct hash_table *table)\n+{\n+\tstruct directory_entry *search;\n+\n+\t*crc = crc32(0, (Bytef*)dir, dir_len);\n+\tsearch = lookup_hash(*crc, table);\n+\twhile (search && search->next_hash &&\n+\t cache_name_compare(dir, dir_len, search->pathname, search->de_pathlen))\n+\t\tsearch = search->next_hash;\n+\treturn search;\n+}\n+\n+static struct directory_entry *get_directory(char *dir, unsigned int dir_len,\n+\t\t\t\t\t struct hash_table *table,\n+\t\t\t\t\t unsigned int *total_dir_len,\n+\t\t\t\t\t unsigned int *ndir,\n+\t\t\t\t\t struct directory_entry **current)\n+{\n+\tstruct directory_entry *tmp = NULL, *search, *new, *ret;\n+\tuint32_t crc;\n+\n+\tsearch = find_directory(dir, dir_len, &crc, table);\n+\tif (search)\n+\t\treturn search;\n+\twhile (!search) {\n+\t\tnew = init_directory_entry(dir, dir_len);\n+\t\tinsert_directory_entry(new, table, total_dir_len, ndir, crc);\n+\t\tif (!tmp)\n+\t\t\tret = new;\n+\t\telse\n+\t\t\tnew->de_nsubtrees = 1;\n+\t\tnew->next = tmp;\n+\t\ttmp = new;\n+\t\tdir = super_directory(dir);\n+\t\tdir_len = dir ? strlen(dir) : 0;\n+\t\tsearch = find_directory(dir, dir_len, &crc, table);\n+\t}\n+\tsearch->de_nsubtrees++;\n+\t(*current)->next = tmp;\n+\twhile ((*current)->next)\n+\t\t*current = (*current)->next;\n+\n+\treturn ret;\n+}\n+\n+static struct conflict_entry *create_conflict_entry_from_ce(struct cache_entry *ce,\n+\t\t\t\t\t\t\t\tint pathlen)\n+{\n+\treturn create_new_conflict(ce->name, ce_namelen(ce), pathlen);\n+}\n+\n+static void ce_queue_push(struct cache_entry **head,\n+\t\t\t struct cache_entry **tail,\n+\t\t\t struct cache_entry *ce)\n+{\n+\tif (!*head) {\n+\t\t*head = *tail = ce;\n+\t\t(*tail)->next_ce = NULL;\n+\t\treturn;\n+\t}\n+\n+\t(*tail)->next_ce = ce;\n+\tce->next_ce = NULL;\n+\t*tail = (*tail)->next_ce;\n+}\n+\n+static struct directory_entry *compile_directory_data(struct index_state *istate,\n+\t\t\t\t\t\t int nfile,\n+\t\t\t\t\t\t unsigned int *ndir,\n+\t\t\t\t\t\t unsigned int *total_dir_len,\n+\t\t\t\t\t\t unsigned int *total_file_len)\n+{\n+\tint i, dir_len = -1;\n+\tchar *dir;\n+\tstruct directory_entry *de, *current, *search;\n+\tstruct cache_entry **cache = istate->cache;\n+\tstruct conflict_entry *conflict_entry;\n+\tstruct hash_table table;\n+\tuint32_t crc;\n+\n+\tinit_hash(&table);\n+\tde = init_directory_entry(\"\", 0);\n+\tcurrent = de;\n+\t*ndir = 1;\n+\t*total_dir_len = 1;\n+\tcrc = crc32(0, (Bytef*)de->pathname, de->de_pathlen);\n+\tinsert_hash(crc, de, &table);\n+\tconflict_entry = NULL;\n+\tfor (i = 0; i < nfile; i++) {\n+\t\tif (cache[i]->ce_flags & CE_REMOVE)\n+\t\t\tcontinue;\n+\n+\t\tif (dir_len < 0\n+\t\t || cache[i]->name[dir_len] != '/'\n+\t\t || strchr(cache[i]->name + dir_len + 1, '/')\n+\t\t || cache_name_compare(cache[i]->name, ce_namelen(cache[i]),\n+\t\t\t\t\t dir, dir_len)) {\n+\t\t\tdir = super_directory(cache[i]->name);\n+\t\t\tdir_len = dir ? strlen(dir) : 0;\n+\t\t\tsearch = get_directory(dir, dir_len, &table,\n+\t\t\t\t\t total_dir_len, ndir,\n+\t\t\t\t\t ¤t);\n+\t\t}\n+\t\tsearch->de_nfiles++;\n+\t\t*total_file_len += ce_namelen(cache[i]) + 1;\n+\t\tif (search->de_pathlen)\n+\t\t\t*total_file_len -= search->de_pathlen + 1;\n+\t\tce_queue_push(&(search->ce), &(search->ce_last), cache[i]);\n+\n+\t\tif (ce_stage(cache[i]) > 0) {\n+\t\t\tstruct conflict_part *conflict_part;\n+\t\t\tif (!conflict_entry ||\n+\t\t\t cache_name_compare(conflict_entry->name, conflict_entry->namelen,\n+\t\t\t\t\t cache[i]->name, ce_namelen(cache[i]))) {\n+\t\t\t\tconflict_entry = create_conflict_entry_from_ce(cache[i], search->de_pathlen);\n+\t\t\t\tadd_conflict_to_directory_entry(search, conflict_entry);\n+\t\t\t}\n+\t\t\tconflict_part = conflict_part_from_inmemory(cache[i]);\n+\t\t\tadd_part_to_conflict_entry(search, conflict_entry, conflict_part);\n+\t\t}\n+\t}\n+\treturn de;\n+}\n+\n+static void ondisk_from_cache_entry(struct cache_entry *ce,\n+\t\t\t\t struct ondisk_cache_entry *ondisk)\n+{\n+\tunsigned int flags;\n+\n+\tflags = ce->ce_flags & CE_STAGEMASK;\n+\tflags |= ce->ce_flags & CE_VALID;\n+\tflags |= ce->ce_flags & CE_SMUDGED;\n+\tif (ce->ce_flags & CE_INTENT_TO_ADD)\n+\t\tflags |= CE_INTENT_TO_ADD_V5;\n+\tif (ce->ce_flags & CE_SKIP_WORKTREE)\n+\t\tflags |= CE_SKIP_WORKTREE_V5;\n+\tondisk->flags = htons(flags);\n+\tondisk->mode = htons(ce->ce_mode);\n+\tondisk->mtime.sec = htonl(ce->ce_stat_data.sd_mtime.sec);\n+#ifdef USE_NSEC\n+\tondisk->mtime.nsec = htonl(ce->ce_stat_data.sd_mtime.nsec);\n+#else\n+\tondisk->mtime.nsec = 0;\n+#endif\n+\tondisk->size = htonl(ce->ce_stat_data.sd_size);\n+\tif (!ce->ce_stat_crc)\n+\t\tce->ce_stat_crc = calculate_stat_crc(ce);\n+\tondisk->stat_crc = htonl(ce->ce_stat_crc);\n+\thashcpy(ondisk->sha1, ce->sha1);\n+}\n+\n+static int write_directories(struct directory_entry *de, int fd, int conflict_offset)\n+{\n+\tstruct directory_entry *current;\n+\tstruct ondisk_directory_entry ondisk;\n+\tint current_offset, offset_write, ondisk_size, foffset;\n+\tuint32_t crc;\n+\n+\t/*\n+\t * This is needed because the compiler aligns structs to sizes multiple\n+\t * of 4\n+\t */\n+\tondisk_size = sizeof(ondisk.flags)\n+\t\t+ sizeof(ondisk.foffset)\n+\t\t+ sizeof(ondisk.cr)\n+\t\t+ sizeof(ondisk.ncr)\n+\t\t+ sizeof(ondisk.nsubtrees)\n+\t\t+ sizeof(ondisk.nfiles)\n+\t\t+ sizeof(ondisk.nentries)\n+\t\t+ sizeof(ondisk.sha1);\n+\tcurrent = de;\n+\tcurrent_offset = 0;\n+\tfoffset = 0;\n+\twhile (current) {\n+\t\tint pathlen;\n+\n+\t\toffset_write = htonl(current_offset);\n+\t\tif (ce_write(NULL, fd, &offset_write, 4) < 0)\n+\t\t\treturn -1;\n+\t\tif (current->de_pathlen == 0)\n+\t\t\tpathlen = 0;\n+\t\telse\n+\t\t\tpathlen = current->de_pathlen + 1;\n+\t\tcurrent_offset += pathlen + 1 + ondisk_size + 4;\n+\t\tcurrent = current->next;\n+\t}\n+\t/*\n+\t * Write one more offset, which points to the end of the entries,\n+\t * because we use it for calculating the dir length, instead of\n+\t * using strlen.\n+\t */\n+\toffset_write = htonl(current_offset);\n+\tif (ce_write(NULL, fd, &offset_write, 4) < 0)\n+\t\treturn -1;\n+\tcurrent = de;\n+\twhile (current) {\n+\t\tcrc = 0;\n+\t\tif (current->de_pathlen == 0) {\n+\t\t\tif (ce_write(&crc, fd, current->pathname, 1) < 0)\n+\t\t\t\treturn -1;\n+\t\t} else {\n+\t\t\tchar *path;\n+\t\t\tpath = xmalloc(sizeof(char) * (current->de_pathlen + 2));\n+\t\t\tmemcpy(path, current->pathname, current->de_pathlen);\n+\t\t\tmemcpy(path + current->de_pathlen, \"/\\0\", 2);\n+\t\t\tif (ce_write(&crc, fd, path, current->de_pathlen + 2) < 0)\n+\t\t\t\treturn -1;\n+\t\t}\n+\t\tcurrent->de_foffset = foffset;\n+\t\tcurrent->de_cr = conflict_offset;\n+\t\tondisk_from_directory_entry(current, &ondisk);\n+\t\tif (ce_write(&crc, fd, &ondisk, ondisk_size) < 0)\n+\t\t\treturn -1;\n+\t\tcrc = htonl(crc);\n+\t\tif (ce_write(NULL, fd, &crc, 4) < 0)\n+\t\t\treturn -1;\n+\t\tconflict_offset += current->conflict_size;\n+\t\tfoffset += current->de_nfiles * 4;\n+\t\tcurrent = current->next;\n+\t}\n+\treturn 0;\n+}\n+\n+static int write_entries(struct index_state *istate,\n+\t\t\t struct directory_entry *de,\n+\t\t\t int entries,\n+\t\t\t int fd,\n+\t\t\t int offset_to_offset)\n+{\n+\tint offset, offset_write, ondisk_size;\n+\tstruct directory_entry *current;\n+\n+\toffset = 0;\n+\tondisk_size = sizeof(struct ondisk_cache_entry);\n+\tcurrent = de;\n+\twhile (current) {\n+\t\tint pathlen;\n+\t\tstruct cache_entry *ce = current->ce;\n+\n+\t\tif (current->de_pathlen == 0)\n+\t\t\tpathlen = 0;\n+\t\telse\n+\t\t\tpathlen = current->de_pathlen + 1;\n+\t\twhile (ce) {\n+\t\t\tif (ce->ce_flags & CE_REMOVE)\n+\t\t\t\tcontinue;\n+\t\t\tif (!ce_uptodate(ce) && is_racy_timestamp(istate, ce))\n+\t\t\t\tce_smudge_racily_clean_entry(ce);\n+\t\t\tif (is_null_sha1(ce->sha1))\n+\t\t\t\treturn error(\"cache entry has null sha1: %s\", ce->name);\n+\n+\t\t\toffset_write = htonl(offset);\n+\t\t\tif (ce_write(NULL, fd, &offset_write, 4) < 0)\n+\t\t\t\treturn -1;\n+\t\t\toffset += ce_namelen(ce) - pathlen + 1 + ondisk_size + 4;\n+\t\t\tce = ce->next_ce;\n+\t\t}\n+\t\tcurrent = current->next;\n+\t}\n+\t/*\n+\t * Write one more offset, which points to the end of the entries,\n+\t * because we use it for calculating the file length, instead of\n+\t * using strlen.\n+\t */\n+\toffset_write = htonl(offset);\n+\tif (ce_write(NULL, fd, &offset_write, 4) < 0)\n+\t\treturn -1;\n+\n+\toffset = offset_to_offset;\n+\tcurrent = de;\n+\twhile (current) {\n+\t\tint pathlen;\n+\t\tstruct cache_entry *ce = current->ce;\n+\n+\t\tif (current->de_pathlen == 0)\n+\t\t\tpathlen = 0;\n+\t\telse\n+\t\t\tpathlen = current->de_pathlen + 1;\n+\t\twhile (ce) {\n+\t\t\tstruct ondisk_cache_entry ondisk;\n+\t\t\tuint32_t crc, calc_crc;\n+\n+\t\t\tif (ce->ce_flags & CE_REMOVE)\n+\t\t\t\tcontinue;\n+\t\t\tcalc_crc = htonl(offset);\n+\t\t\tcrc = crc32(0, (Bytef*)&calc_crc, 4);\n+\t\t\tif (ce_write(&crc, fd, ce->name + pathlen,\n+\t\t\t\t\tce_namelen(ce) - pathlen + 1) < 0)\n+\t\t\t\treturn -1;\n+\t\t\tondisk_from_cache_entry(ce, &ondisk);\n+\t\t\tif (ce_write(&crc, fd, &ondisk, ondisk_size) < 0)\n+\t\t\t\treturn -1;\n+\t\t\tcrc = htonl(crc);\n+\t\t\tif (ce_write(NULL, fd, &crc, 4) < 0)\n+\t\t\t\treturn -1;\n+\t\t\toffset += 4;\n+\t\t\tce = ce->next_ce;\n+\t\t}\n+\t\tcurrent = current->next;\n+\t}\n+\treturn 0;\n+}\n+\n+static int write_conflict(struct conflict_entry *conflict, int fd)\n+{\n+\tstruct conflict_entry *current;\n+\tstruct conflict_part *current_part;\n+\tuint32_t crc;\n+\n+\tcurrent = conflict;\n+\twhile (current) {\n+\t\tunsigned int to_write;\n+\n+\t\tcrc = 0;\n+\t\tif (ce_write(&crc, fd,\n+\t\t (Bytef*)(current->name + current->pathlen),\n+\t\t current->namelen - current->pathlen) < 0)\n+\t\t\treturn -1;\n+\t\tif (ce_write(&crc, fd, (Bytef*)\"\\0\", 1) < 0)\n+\t\t\treturn -1;\n+\t\tto_write = htonl(current->nfileconflicts);\n+\t\tif (ce_write(&crc, fd, (Bytef*)&to_write, 4) < 0)\n+\t\t\treturn -1;\n+\t\tcurrent_part = current->entries;\n+\t\twhile (current_part) {\n+\t\t\tstruct ondisk_conflict_part ondisk;\n+\n+\t\t\tconflict_to_ondisk(current_part, &ondisk);\n+\t\t\tif (ce_write(&crc, fd, (Bytef*)&ondisk, sizeof(struct ondisk_conflict_part)) < 0)\n+\t\t\t\treturn 0;\n+\t\t\tcurrent_part = current_part->next;\n+\t\t}\n+\t\tto_write = htonl(crc);\n+\t\tif (ce_write(NULL, fd, (Bytef*)&to_write, 4) < 0)\n+\t\t\treturn -1;\n+\t\tcurrent = current->next;\n+\t}\n+\treturn 0;\n+}\n+\n+static int write_conflicts(struct index_state *istate,\n+\t\t\t struct directory_entry *de,\n+\t\t\t int fd)\n+{\n+\tstruct directory_entry *current;\n+\n+\tcurrent = de;\n+\twhile (current) {\n+\t\tif (current->de_ncr != 0) {\n+\t\t\tif (write_conflict(current->conflict, fd) < 0)\n+\t\t\t\treturn -1;\n+\t\t}\n+\t\tcurrent = current->next;\n+\t}\n+\treturn 0;\n+}\n+\n+static int write_index_v5(struct index_state *istate, int newfd)\n+{\n+\tstruct cache_header hdr;\n+\tstruct cache_header_v5 hdr_v5;\n+\tstruct cache_entry **cache = istate->cache;\n+\tstruct directory_entry *de;\n+\tstruct ondisk_directory_entry *ondisk;\n+\tunsigned int entries = istate->cache_nr;\n+\tunsigned int i, removed, total_dir_len, ondisk_directory_size;\n+\tunsigned int total_file_len, conflict_offset, foffsetblock;\n+\tunsigned int ndir;\n+\tuint32_t crc;\n+\n+\tif (istate->filter_opts)\n+\t\tdie(\"BUG: index: cannot write a partially read index\");\n+\n+\tfor (i = removed = 0; i < entries; i++) {\n+\t\tif (cache[i]->ce_flags & CE_REMOVE)\n+\t\t\tremoved++;\n+\t}\n+\thdr.hdr_signature = htonl(CACHE_SIGNATURE);\n+\thdr.hdr_version = htonl(istate->version);\n+\thdr.hdr_entries = htonl(entries - removed);\n+\thdr_v5.hdr_nextension = htonl(0); /* Currently no extensions are supported */\n+\n+\ttotal_dir_len = 0;\n+\ttotal_file_len = 0;\n+\tde = compile_directory_data(istate, entries, &ndir,\n+\t\t\t\t &total_dir_len, &total_file_len);\n+\thdr_v5.hdr_ndir = htonl(ndir);\n+\n+\t/*\n+\t * This is needed because the compiler aligns structs to sizes multipe\n+\t * of 4\n+\t */\n+\tondisk_directory_size = sizeof(ondisk->flags)\n+\t\t+ sizeof(ondisk->foffset)\n+\t\t+ sizeof(ondisk->cr)\n+\t\t+ sizeof(ondisk->ncr)\n+\t\t+ sizeof(ondisk->nsubtrees)\n+\t\t+ sizeof(ondisk->nfiles)\n+\t\t+ sizeof(ondisk->nentries)\n+\t\t+ sizeof(ondisk->sha1);\n+\tfoffsetblock = sizeof(hdr) + sizeof(hdr_v5) + 4\n+\t\t+ (ndir + 1) * 4\n+\t\t+ total_dir_len\n+\t\t+ ndir * (ondisk_directory_size + 4);\n+\thdr_v5.hdr_fblockoffset = htonl(foffsetblock + (entries - removed + 1) * 4);\n+\tcrc = 0;\n+\tif (ce_write(&crc, newfd, &hdr, sizeof(hdr)) < 0)\n+\t\treturn -1;\n+\tif (ce_write(&crc, newfd, &hdr_v5, sizeof(hdr_v5)) < 0)\n+\t\treturn -1;\n+\tcrc = htonl(crc);\n+\tif (ce_write(NULL, newfd, &crc, 4) < 0)\n+\t\treturn -1;\n+\n+\tconflict_offset = foffsetblock +\n+\t\t+ (entries - removed + 1) * 4\n+\t\t+ total_file_len\n+\t\t+ (entries - removed) * (sizeof(struct ondisk_cache_entry) + 4);\n+\tif (write_directories(de, newfd, conflict_offset) < 0)\n+\t\treturn -1;\n+\tif (write_entries(istate, de, entries, newfd, foffsetblock) < 0)\n+\t\treturn -1;\n+\tif (write_conflicts(istate, de, newfd) < 0)\n+\t\treturn -1;\n+\treturn ce_flush(newfd);\n+}\n+\n struct index_ops v5_ops = {\n \tmatch_stat_basic,\n \tverify_hdr,\n \tread_index_v5,\n-\tNULL\n+\twrite_index_v5\n };\ndiff --git a/read-cache.c b/read-cache.c\nindex a232372..1d9b615 100644\n--- a/read-cache.c\n+++ b/read-cache.c\n@@ -108,7 +108,7 @@ int match_stat_data(const struct stat_data *sd, struct stat *st)\n \treturn changed;\n }\n \n-static uint32_t calculate_stat_crc(struct cache_entry *ce)\n+uint32_t calculate_stat_crc(struct cache_entry *ce)\n {\n \tunsigned int ctimens = 0;\n \tuint32_t stat, stat_crc;\n@@ -229,6 +229,8 @@ static void set_istate_ops(struct index_state *istate)\n {\n \tif (istate->version >= 2 && istate->version <= 4)\n \t\tistate->ops = &v2_ops;\n+\tif (istate->version == 5)\n+\t\tistate->ops = &v5_ops;\n }\n \n int ce_match_stat_basic(const struct index_state *istate,\ndiff --git a/read-cache.h b/read-cache.h\nindex 01c76de..27f862f 100644\n--- a/read-cache.h\n+++ b/read-cache.h\n@@ -58,3 +58,4 @@ extern int ce_match_stat_basic(const struct index_state *istate,\n \t\t\t const struct cache_entry *ce, struct stat *st);\n extern int is_racy_timestamp(const struct index_state *istate, const struct cache_entry *ce);\n extern void set_index_entry(struct index_state *istate, int nr, struct cache_entry *ce);\n+extern uint32_t calculate_stat_crc(struct cache_entry *ce);\n-- \n1.8.3.4.1231.g9fbf354.dirty\n"},{"id":"225420","messageId":"1376854933-31241-20-git-send-email-t.gummerer@gmail.com","threadId":"34724","inReplyTo":"1376854933-31241-1-git-send-email-t.gummerer@gmail.com","subject":"[PATCH v3 19/24] read-cache: write index-v5 cache-tree data","fromName":"Thomas Gummerer","fromEmail":"t.gummerer@gmail.com","sentAt":"2013-08-18T19:42:08Z","receivedAt":"2013-08-18T19:42:08Z","isPatch":true,"sender":{"key":"t.gummerer@gmail.com","avatar":"https://avatars.githubusercontent.com/u/191004?v=4"},"body":"Write the cache-tree data for the index version 5 file format. The\nin-memory cache-tree data is converted to the ondisk format, by adding\nit to the directory entries, that were compiled from the cache-entries\nin the step before.\n\nSigned-off-by: Thomas Gummerer \n---\n read-cache-v5.c | 53 +++++++++++++++++++++++++++++++++++++++++++++++++++++\n 1 file changed, 53 insertions(+)\n\ndiff --git a/read-cache-v5.c b/read-cache-v5.c\nindex 85b912b..ed52b7c 100644\n--- a/read-cache-v5.c\n+++ b/read-cache-v5.c\n@@ -891,6 +891,57 @@ static struct conflict_entry *create_conflict_entry_from_ce(struct cache_entry *\n \treturn create_new_conflict(ce->name, ce_namelen(ce), pathlen);\n }\n \n+static void convert_one_to_ondisk_v5(struct hash_table *table, struct cache_tree *it,\n+\t\t\t\tconst char *path, int pathlen, uint32_t crc)\n+{\n+\tint i;\n+\tstruct directory_entry *found, *search;\n+\n+\tcrc = crc32(crc, (Bytef*)path, pathlen);\n+\tfound = lookup_hash(crc, table);\n+\tsearch = found;\n+\twhile (search && strcmp(path, search->pathname + search->de_pathlen - strlen(path)) != 0)\n+\t\tsearch = search->next_hash;\n+\tif (!search)\n+\t\treturn;\n+\t/*\n+\t * The number of subtrees is already calculated by\n+\t * compile_directory_data, therefore we only need to\n+\t * add the entry_count\n+\t */\n+\tsearch->de_nentries = it->entry_count;\n+\tif (0 <= it->entry_count)\n+\t\thashcpy(search->sha1, it->sha1);\n+\tif (strcmp(path, \"\") != 0)\n+\t\tcrc = crc32(crc, (Bytef*)\"/\", 1);\n+\n+#if DEBUG\n+\tif (0 <= it->entry_count)\n+\t\tfprintf(stderr, \"cache-tree <%.*s> (%d ent, %d subtree) %s\\n\",\n+\t\t\tpathlen, path, it->entry_count, it->subtree_nr,\n+\t\t\tsha1_to_hex(it->sha1));\n+\telse\n+\t\tfprintf(stderr, \"cache-tree <%.*s> (%d subtree) invalid\\n\",\n+\t\t\tpathlen, path, it->subtree_nr);\n+#endif\n+\n+\tfor (i = 0; i < it->subtree_nr; i++) {\n+\t\tstruct cache_tree_sub *down = it->down[i];\n+\t\tif (i) {\n+\t\t\tstruct cache_tree_sub *prev = it->down[i-1];\n+\t\t\tif (subtree_name_cmp(down->name, down->namelen,\n+\t\t\t\t\t prev->name, prev->namelen) <= 0)\n+\t\t\t\tdie(\"fatal - unsorted cache subtree\");\n+\t\t}\n+\t\tconvert_one_to_ondisk_v5(table, down->cache_tree, down->name, down->namelen, crc);\n+\t}\n+}\n+\n+static void cache_tree_to_ondisk_v5(struct hash_table *table, struct cache_tree *root)\n+{\n+\tconvert_one_to_ondisk_v5(table, root, \"\", 0, 0);\n+}\n+\n static void ce_queue_push(struct cache_entry **head,\n \t\t\t struct cache_entry **tail,\n \t\t\t struct cache_entry *ce)\n@@ -961,6 +1012,8 @@ static struct directory_entry *compile_directory_data(struct index_state *istate\n \t\t\tadd_part_to_conflict_entry(search, conflict_entry, conflict_part);\n \t\t}\n \t}\n+\tif (istate->cache_tree)\n+\t\tcache_tree_to_ondisk_v5(&table, istate->cache_tree);\n \treturn de;\n }\n \n-- \n1.8.3.4.1231.g9fbf354.dirty\n"},{"id":"225421","messageId":"1376854933-31241-21-git-send-email-t.gummerer@gmail.com","threadId":"34724","inReplyTo":"1376854933-31241-1-git-send-email-t.gummerer@gmail.com","subject":"[PATCH v3 20/24] read-cache: write resolve-undo data for index-v5","fromName":"Thomas Gummerer","fromEmail":"t.gummerer@gmail.com","sentAt":"2013-08-18T19:42:09Z","receivedAt":"2013-08-18T19:42:09Z","isPatch":true,"sender":{"key":"t.gummerer@gmail.com","avatar":"https://avatars.githubusercontent.com/u/191004?v=4"},"body":"Make git read the resolve-undo data from the index.\n\nSince the resolve-undo data is joined with the conflicts in\nthe ondisk format of the index file version 5, conflicts and\nresolved data is read at the same time, and the resolve-undo\ndata is then converted to the in-memory format.\n\nHelped-by: Thomas Rast \nSigned-off-by: Thomas Gummerer \n---\n read-cache-v5.c | 89 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++\n 1 file changed, 89 insertions(+)\n\ndiff --git a/read-cache-v5.c b/read-cache-v5.c\nindex ed52b7c..10960fd 100644\n--- a/read-cache-v5.c\n+++ b/read-cache-v5.c\n@@ -942,6 +942,94 @@ static void cache_tree_to_ondisk_v5(struct hash_table *table, struct cache_tree\n \tconvert_one_to_ondisk_v5(table, root, \"\", 0, 0);\n }\n \n+static void resolve_undo_to_ondisk_v5(struct hash_table *table,\n+\t\t\t\t struct string_list *resolve_undo,\n+\t\t\t\t unsigned int *ndir,\n+\t\t\t\t unsigned int *total_dir_len,\n+\t\t\t\t struct directory_entry *de)\n+{\n+\tstruct string_list_item *item;\n+\tstruct directory_entry *search;\n+\n+\tif (!resolve_undo)\n+\t\treturn;\n+\tfor_each_string_list_item(item, resolve_undo) {\n+\t\tstruct conflict_entry *conflict_entry;\n+\t\tstruct resolve_undo_info *ui = item->util;\n+\t\tchar *super;\n+\t\tint i, dir_len, len;\n+\t\tuint32_t crc;\n+\t\tstruct directory_entry *found, *current, *new_tree;\n+\n+\t\tif (!ui)\n+\t\t\tcontinue;\n+\n+\t\tsuper = super_directory(item->string);\n+\t\tdir_len = super ? strlen(super) : 0;\n+\t\tcrc = crc32(0, (Bytef*)super, dir_len);\n+\t\tfound = lookup_hash(crc, table);\n+\t\tcurrent = NULL;\n+\t\tnew_tree = NULL;\n+\n+\t\twhile (!found) {\n+\t\t\tstruct directory_entry *new;\n+\n+\t\t\tnew = init_directory_entry(super, dir_len);\n+\t\t\tif (!current)\n+\t\t\t\tcurrent = new;\n+\t\t\tinsert_directory_entry(new, table, total_dir_len, ndir, crc);\n+\t\t\tif (new_tree != NULL)\n+\t\t\t\tnew->de_nsubtrees = 1;\n+\t\t\tnew->next = new_tree;\n+\t\t\tnew_tree = new;\n+\t\t\tsuper = super_directory(super);\n+\t\t\tdir_len = super ? strlen(super) : 0;\n+\t\t\tcrc = crc32(0, (Bytef*)super, dir_len);\n+\t\t\tfound = lookup_hash(crc, table);\n+\t\t}\n+\t\tsearch = found;\n+\t\twhile (search->next_hash && strcmp(super, search->pathname) != 0)\n+\t\t\tsearch = search->next_hash;\n+\t\tif (search && !current)\n+\t\t\tcurrent = search;\n+\t\tif (!search && !current)\n+\t\t\tcurrent = new_tree;\n+\t\tif (!super && new_tree) {\n+\t\t\tnew_tree->next = de->next;\n+\t\t\tde->next = new_tree;\n+\t\t\tde->de_nsubtrees++;\n+\t\t} else if (new_tree) {\n+\t\t\tstruct directory_entry *temp;\n+\n+\t\t\tsearch = de->next;\n+\t\t\twhile (strcmp(super, search->pathname))\n+\t\t\t\tsearch = search->next;\n+\t\t\ttemp = new_tree;\n+\t\t\twhile (temp->next)\n+\t\t\t\ttemp = temp->next;\n+\t\t\tsearch->de_nsubtrees++;\n+\t\t\ttemp->next = search->next;\n+\t\t\tsearch->next = new_tree;\n+\t\t}\n+\n+\t\tlen = strlen(item->string);\n+\t\tconflict_entry = create_new_conflict(item->string, len, current->de_pathlen);\n+\t\tadd_conflict_to_directory_entry(current, conflict_entry);\n+\t\tfor (i = 0; i < 3; i++) {\n+\t\t\tif (ui->mode[i]) {\n+\t\t\t\tstruct conflict_part *cp;\n+\n+\t\t\t\tcp = xmalloc(sizeof(struct conflict_part));\n+\t\t\t\tcp->flags = (i + 1) << CONFLICT_STAGESHIFT;\n+\t\t\t\tcp->entry_mode = ui->mode[i];\n+\t\t\t\tcp->next = NULL;\n+\t\t\t\thashcpy(cp->sha1, ui->sha1[i]);\n+\t\t\t\tadd_part_to_conflict_entry(current, conflict_entry, cp);\n+\t\t\t}\n+\t\t}\n+\t}\n+}\n+\n static void ce_queue_push(struct cache_entry **head,\n \t\t\t struct cache_entry **tail,\n \t\t\t struct cache_entry *ce)\n@@ -1014,6 +1102,7 @@ static struct directory_entry *compile_directory_data(struct index_state *istate\n \t}\n \tif (istate->cache_tree)\n \t\tcache_tree_to_ondisk_v5(&table, istate->cache_tree);\n+\tresolve_undo_to_ondisk_v5(&table, istate->resolve_undo, ndir, total_dir_len, de);\n \treturn de;\n }\n \n-- \n1.8.3.4.1231.g9fbf354.dirty\n"},{"id":"225422","messageId":"1376854933-31241-22-git-send-email-t.gummerer@gmail.com","threadId":"34724","inReplyTo":"1376854933-31241-1-git-send-email-t.gummerer@gmail.com","subject":"[PATCH v3 21/24] update-index.c: rewrite index when index-version is given","fromName":"Thomas Gummerer","fromEmail":"t.gummerer@gmail.com","sentAt":"2013-08-18T19:42:10Z","receivedAt":"2013-08-18T19:42:10Z","isPatch":true,"sender":{"key":"t.gummerer@gmail.com","avatar":"https://avatars.githubusercontent.com/u/191004?v=4"},"body":"Make update-index always rewrite the index when a index-version\nis given, even if the index already has the right version.\nThis option is used for performance testing the writer and\nreader.\n\nSigned-off-by: Thomas Gummerer \n---\n builtin/update-index.c | 4 ++--\n 1 file changed, 2 insertions(+), 2 deletions(-)\n\ndiff --git a/builtin/update-index.c b/builtin/update-index.c\nindex c5bb889..8b3f7a0 100644\n--- a/builtin/update-index.c\n+++ b/builtin/update-index.c\n@@ -6,6 +6,7 @@\n #include \"cache.h\"\n #include \"quote.h\"\n #include \"cache-tree.h\"\n+#include \"read-cache.h\"\n #include \"tree-walk.h\"\n #include \"builtin.h\"\n #include \"refs.h\"\n@@ -861,8 +862,7 @@ int cmd_update_index(int argc, const char **argv, const char *prefix)\n \t\t\t preferred_index_format,\n \t\t\t INDEX_FORMAT_LB, INDEX_FORMAT_UB);\n \n-\t\tif (the_index.version != preferred_index_format)\n-\t\t\tactive_cache_changed = 1;\n+\t\tactive_cache_changed = 1;\n \t\tchange_cache_version(preferred_index_format);\n \t}\n \n-- \n1.8.3.4.1231.g9fbf354.dirty\n"},{"id":"225423","messageId":"1376854933-31241-23-git-send-email-t.gummerer@gmail.com","threadId":"34724","inReplyTo":"1376854933-31241-1-git-send-email-t.gummerer@gmail.com","subject":"[PATCH v3 22/24] p0003-index.sh: add perf test for the index formats","fromName":"Thomas Gummerer","fromEmail":"t.gummerer@gmail.com","sentAt":"2013-08-18T19:42:11Z","receivedAt":"2013-08-18T19:42:11Z","isPatch":true,"sender":{"key":"t.gummerer@gmail.com","avatar":"https://avatars.githubusercontent.com/u/191004?v=4"},"body":"From: Thomas Rast \n\nAdd a performance test for index version [23]/4/5 by using\ngit update-index --index-version=x, thus testing both the reader\nand the writer speed of all index formats.\n\nSigned-off-by: Thomas Rast \nSigned-off-by: Thomas Gummerer \n---\n t/perf/p0003-index.sh | 63 +++++++++++++++++++++++++++++++++++++++++++++++++++\n 1 file changed, 63 insertions(+)\n create mode 100755 t/perf/p0003-index.sh\n\ndiff --git a/t/perf/p0003-index.sh b/t/perf/p0003-index.sh\nnew file mode 100755\nindex 0000000..5360175\n--- /dev/null\n+++ b/t/perf/p0003-index.sh\n@@ -0,0 +1,63 @@\n+#!/bin/sh\n+\n+test_description=\"Tests index versions [23]/4/5\"\n+\n+. ./perf-lib.sh\n+\n+test_perf_large_repo\n+\n+test_expect_success \"convert to v3\" \"\n+\tgit update-index --index-version=2\n+\"\n+\n+test_perf \"v[23]: update-index\" \"\n+\tgit update-index --index-version=2 >/dev/null\n+\"\n+\n+subdir=$(git ls-files | sed 's#/[^/]*$##' | grep -v '^$' | uniq | tail -n 30 | head -1)\n+\n+test_perf \"v[23]: grep nonexistent -- subdir\" \"\n+\ttest_must_fail git grep nonexistent -- $subdir >/dev/null\n+\"\n+\n+test_perf \"v[23]: ls-files -- subdir\" \"\n+\tgit ls-files $subdir >/dev/null\n+\"\n+\n+test_expect_success \"convert to v4\" \"\n+\tgit update-index --index-version=4\n+\"\n+\n+test_perf \"v4: update-index\" \"\n+\tgit update-index --index-version=4 >/dev/null\n+\"\n+\n+test_perf \"v4: grep nonexistent -- subdir\" \"\n+\ttest_must_fail git grep nonexistent -- $subdir >/dev/null\n+\"\n+\n+test_perf \"v4: ls-files -- subdir\" \"\n+\tgit ls-files $subdir >/dev/null\n+\"\n+\n+test_expect_success \"convert to v5\" \"\n+\tgit update-index --index-version=5\n+\"\n+\n+test_perf \"v5: update-index\" \"\n+\tgit update-index --index-version=5 >/dev/null\n+\"\n+\n+test_perf \"v5: ls-files\" \"\n+\tgit ls-files >/dev/null\n+\"\n+\n+test_perf \"v5: grep nonexistent -- subdir\" \"\n+\ttest_must_fail git grep nonexistent -- $subdir >/dev/null\n+\"\n+\n+test_perf \"v5: ls-files -- subdir\" \"\n+\tgit ls-files $subdir >/dev/null\n+\"\n+\n+test_done\n-- \n1.8.3.4.1231.g9fbf354.dirty\n"},{"id":"225424","messageId":"1376854933-31241-24-git-send-email-t.gummerer@gmail.com","threadId":"34724","inReplyTo":"1376854933-31241-1-git-send-email-t.gummerer@gmail.com","subject":"[PATCH v3 23/24] introduce GIT_INDEX_VERSION environment variable","fromName":"Thomas Gummerer","fromEmail":"t.gummerer@gmail.com","sentAt":"2013-08-18T19:42:12Z","receivedAt":"2013-08-18T19:42:12Z","isPatch":true,"sender":{"key":"t.gummerer@gmail.com","avatar":"https://avatars.githubusercontent.com/u/191004?v=4"},"body":"Respect a GIT_INDEX_VERSION environment variable, when a new index is\ninitialized. Setting the environment variable will not cause existing\nindex files to be converted to another format for additional safety.\n\nSigned-off-by: Thomas Gummerer \n---\n read-cache.c | 9 +++++++--\n 1 file changed, 7 insertions(+), 2 deletions(-)\n\ndiff --git a/read-cache.c b/read-cache.c\nindex 1d9b615..f820d8a 100644\n--- a/read-cache.c\n+++ b/read-cache.c\n@@ -1235,8 +1235,13 @@ static struct cache_entry *refresh_cache_entry(struct cache_entry *ce, int reall\n void initialize_index(struct index_state *istate, int version)\n {\n \tistate->initialized = 1;\n-\tif (!version)\n-\t\tversion = INDEX_FORMAT_DEFAULT;\n+\tif (!version) {\n+\t\tchar *envversion = getenv(\"GIT_INDEX_VERSION\");\n+\t\tif (!envversion)\n+\t\t\tversion = INDEX_FORMAT_DEFAULT;\n+\t\telse\n+\t\t\tversion = atoi(envversion);\n+\t}\n \tistate->version = version;\n \tset_istate_ops(istate);\n }\n-- \n1.8.3.4.1231.g9fbf354.dirty\n"},{"id":"225425","messageId":"1376854933-31241-25-git-send-email-t.gummerer@gmail.com","threadId":"34724","inReplyTo":"1376854933-31241-1-git-send-email-t.gummerer@gmail.com","subject":"[PATCH v3 24/24] test-lib: allow setting the index format version","fromName":"Thomas Gummerer","fromEmail":"t.gummerer@gmail.com","sentAt":"2013-08-18T19:42:13Z","receivedAt":"2013-08-18T19:42:13Z","isPatch":true,"sender":{"key":"t.gummerer@gmail.com","avatar":"https://avatars.githubusercontent.com/u/191004?v=4"},"body":"When running the test suite, it should be possible to set the default\nindex format for the tests. Do that by allowing the user to add a\nTEST_GIT_INDEX_VERSION variable in config.mak setting the index version.\n\nIf it isn't set, the default version given in the source code is\nused (currently version 3).\n\nSigned-off-by: Thomas Gummerer \n---\n Makefile | 7 +++++++\n t/test-lib-functions.sh | 5 +++++\n t/test-lib.sh | 3 +++\n 3 files changed, 15 insertions(+)\n\ndiff --git a/Makefile b/Makefile\nindex a55206d..ecae6b8 100644\n--- a/Makefile\n+++ b/Makefile\n@@ -345,6 +345,10 @@ all::\n # Define DEFAULT_HELP_FORMAT to \"man\", \"info\" or \"html\"\n # (defaults to \"man\") if you want to have a different default when\n # \"git help\" is called without a parameter specifying the format.\n+#\n+# Define TESTGIT_INDEX_FORMAT to 2, 3, 4 or 5 to run the test suite\n+# with a different indexfile format. If it isn't set the index file\n+# format used is index-v[23].\n \n GIT-VERSION-FILE: FORCE\n \t@$(SHELL_PATH) ./GIT-VERSION-GEN\n@@ -2229,6 +2233,9 @@ endif\n ifdef GIT_PERF_MAKE_OPTS\n \t@echo GIT_PERF_MAKE_OPTS=\\''$(subst ','\\'',$(subst ','\\'',$(GIT_PERF_MAKE_OPTS)))'\\' >>$@\n endif\n+ifdef TEST_GIT_INDEX_VERSION\n+\t@echo TEST_GIT_INDEX_VERSION='$(subst ','\\'',$(subst ','\\'',$(TEST_GIT_INDEX_VERSION)))' >>$@\n+endif\n \n ### Detect Python interpreter path changes\n ifndef NO_PYTHON\ndiff --git a/t/test-lib-functions.sh b/t/test-lib-functions.sh\nindex a7e9aac..19cdf0b 100644\n--- a/t/test-lib-functions.sh\n+++ b/t/test-lib-functions.sh\n@@ -31,6 +31,11 @@ test_set_editor () {\n \texport EDITOR\n }\n \n+test_set_index_version () {\n+ GIT_INDEX_VERSION=\"$1\"\n+ export GIT_INDEX_VERSION\n+}\n+\n test_decode_color () {\n \tawk '\n \t\tfunction name(n) {\ndiff --git a/t/test-lib.sh b/t/test-lib.sh\nindex 1aa27bd..9ca41e1 100644\n--- a/t/test-lib.sh\n+++ b/t/test-lib.sh\n@@ -104,6 +104,9 @@ export GIT_AUTHOR_EMAIL GIT_AUTHOR_NAME\n export GIT_COMMITTER_EMAIL GIT_COMMITTER_NAME\n export EDITOR\n \n+GIT_INDEX_VERSION=\"$TEST_GIT_INDEX_VERSION\"\n+export GIT_INDEX_VERSION\n+\n # Add libc MALLOC and MALLOC_PERTURB test\n # only if we are not executing the test with valgrind\n if expr \" $GIT_TEST_OPTS \" : \".* --valgrind \" >/dev/null ||\n-- \n1.8.3.4.1231.g9fbf354.dirty\n"},{"id":"225427","messageId":"CAPig+cSRh==3PH3qZ9GNQiZ731c0sOWhQFmu3J8sBsP_wNM6Qg@mail.gmail.com","threadId":"34724","inReplyTo":"1376854933-31241-3-git-send-email-t.gummerer@gmail.com","subject":"Re: [PATCH v3 02/24] read-cache: use fixed width integer types","fromName":"Eric Sunshine","fromEmail":"sunshine@sunshineco.com","sentAt":"2013-08-18T20:21:22Z","receivedAt":"2013-08-18T20:21:22Z","isPatch":true,"sender":{"key":"sunshine@sunshineco.com","avatar":"https://avatars.githubusercontent.com/u/163641?v=4"},"body":"On Sun, Aug 18, 2013 at 3:41 PM, Thomas Gummerer wrote:\n> Use the fixed width integer types uint16_t and uint32_t for ondisk\n> structures, because unsigned short and unsigned int do not hae a\n\ns/hae/have/\n\n> guaranteed size.\n>\n> Signed-off-by: Thomas Gummerer \n"},{"id":"225430","messageId":"6EE9A533-F8A7-444C-AFEC-0D8F9E6BCFF9@sunshineco.com","threadId":"34724","inReplyTo":"1376854933-31241-9-git-send-email-t.gummerer@gmail.com","subject":"Re: [PATCH v3 08/24] add documentation for the index api","fromName":"Eric Sunshine","fromEmail":"sunshine@sunshineco.com","sentAt":"2013-08-18T20:50:54Z","receivedAt":"2013-08-18T20:50:54Z","isPatch":true,"sender":{"key":"sunshine@sunshineco.com","avatar":"https://avatars.githubusercontent.com/u/163641?v=4"},"body":"On Aug 18, 2013, at 3:41 PM, Thomas Gummerer wrote:\n> Add documentation for the index reading api. This also includes\n> documentation for the new api functions introduced in the next patch.\n> \n> Helped-by: Nguyễn Thái Ngọc Duy \n> Signed-off-by: Thomas Gummerer \n> ---\n> Documentation/technical/api-in-core-index.txt | 54 +++++++++++++++++++++++++--\n> 1 file changed, 50 insertions(+), 4 deletions(-)\n> \n> diff --git a/Documentation/technical/api-in-core-index.txt b/Documentation/technical/api-in-core-index.txt\n> index adbdbf5..9b8c37c 100644\n> --- a/Documentation/technical/api-in-core-index.txt\n> +++ b/Documentation/technical/api-in-core-index.txt\n> @@ -1,14 +1,60 @@\n> in-core index API\n> =================\n> \n> +Reading API\n> +-----------\n> +\n> +`cache`::\n> +\n> +\tAn array of cache entries. This is used to access the cache\n> +\tentries directly. Use `index_name_pos` to search for the\n> +\tindex of a specific cache entry.\n> +\n> +`read_index_filtered`::\n> +\n> +\tRead a part of the index, filtered by the pathspec given in\n> +\tthe opts. The function may load more than necessary, so the\n> +\tcaller still responsible to apply filters appropriately. The\n\nGrammatical nit: \"...the caller is still responsible for applying…\"\n\n> +\tfiltering is only done for performance reasons, as it's\n> +\tpossible to only read part of the index when the on-disk\n> +\tformat is index-v5.\n> +\n> +\tTo iterate only over the entries that match the pathspec, use\n> +\tthe for_each_index_entry function.\n> +\n> +`read_index`::\n> +\n> +\tRead the whole index file from disk.\n> +\n> +`index_name_pos`::\n> +\n> +\tFind a cache_entry with name in the index. Returns pos if an\n> +\tentry is matched exactly and -1-pos if an entry is matched\n> +\tpartially.\n> +\te.g.\n> +\tindex:\n> +\tfile1\n> +\tfile2\n> +\tpath/file1\n> +\tzzz\n> +\n> +\tindex_name_pos(\"path/file1\", 10) returns 2, while\n> +\tindex_name_pos(\"path\", 4) returns -3\n\nA couple of these entries won't format correctly. You may want to squash in something like this (sans whitespace damage):\n\n-->8--\ndiff --git a/Documentation/technical/api-in-core-index.txt b/Documentation/technical/api-in-core-index.txt\nindex 9b8c37c..d2518c8 100644\n--- a/Documentation/technical/api-in-core-index.txt\n+++ b/Documentation/technical/api-in-core-index.txt\n@@ -18,9 +18,9 @@ Reading API\n \tfiltering is only done for performance reasons, as it's\n \tpossible to only read part of the index when the on-disk\n \tformat is index-v5.\n-\n-\tTo iterate only over the entries that match the pathspec, use\n-\tthe for_each_index_entry function.\n++\n+To iterate only over the entries that match the pathspec, use\n+the for_each_index_entry function.\n \n `read_index`::\n \n@@ -30,16 +30,18 @@ Reading API\n \n \tFind a cache_entry with name in the index. Returns pos if an\n \tentry is matched exactly and -1-pos if an entry is matched\n-\tpartially.\n-\te.g.\n-\tindex:\n+\tpartially. e.g.\n++\n+....\n+index:\n \tfile1\n \tfile2\n \tpath/file1\n \tzzz\n-\n-\tindex_name_pos(\"path/file1\", 10) returns 2, while\n-\tindex_name_pos(\"path\", 4) returns -3\n+....\n++\n+`index_name_pos(\"path/file1\", 10)` returns 2, while\n+`index_name_pos(\"path\", 4)` returns -3\n \n `for_each_index_entry`::\n \n-- \n1.8.4.rc3.500.gc3113b0\n-->8--\n\n> +\n> +`for_each_index_entry`::\n> +\n> +\tIterates over all cache_entries in the index filtered by\n> +\tfilter_opts in the index_state. For each cache entry fn is\n> +\texecuted with cb_data as callback data. From within the loop\n> +\tdo `return 0` to continue, or `return 1` to break the loop.\n> +\n> +TODO\n> +----\n> Talk about and , things like:\n> \n> -* cache -> the_index macros\n> -* read_index()\n> * write_index()\n> * ie_match_stat() and ie_modified(); how they are different and when to\n> use which.\n> -* index_name_pos()\n> * remove_index_entry_at()\n> * remove_file_from_index()\n> * add_file_to_index()\n> @@ -18,4 +64,4 @@ Talk about and , things like:\n> * cache_tree_invalidate_path()\n> * cache_tree_update()\n> \n> -(JC, Linus)\n> +(JC, Linus, Thomas Gummerer)\n> -- \n> 1.8.3.4.1231.g9fbf354.dirty\n> \n"},{"id":"225431","messageId":"CAPig+cTJQrVm+r77utWzduU3KqC5WPX_b4Vbvxyjezd0Wc4LZw@mail.gmail.com","threadId":"34724","inReplyTo":"1376854933-31241-11-git-send-email-t.gummerer@gmail.com","subject":"Re: [PATCH v3 10/24] make sure partially read index is not changed","fromName":"Eric Sunshine","fromEmail":"sunshine@sunshineco.com","sentAt":"2013-08-18T21:06:39Z","receivedAt":"2013-08-18T21:06:39Z","isPatch":true,"sender":{"key":"sunshine@sunshineco.com","avatar":"https://avatars.githubusercontent.com/u/163641?v=4"},"body":"On Sun, Aug 18, 2013 at 3:41 PM, Thomas Gummerer wrote:\n> A partially read index file currently cannot be written to disk. Make\n> sure that never happens, by erroring out when a caller tries to write a\n\ns/,//\n\n> partially read index. Do the same when trying to re-read a partially\n> read index without having discarded it first to avoid loosing any\n\ns/loosing/losing/\n\n> information.\n>\n> Forcing the caller to load the right part of the index file instead of\n> re-reading it when changing it, gives a bit of a performance advantage,\n\ns/it,/it/ (or s/file instead/file, instead/)\ns/advantage,/advantage/\n\n> by avoiding to read parts of the index twice.\n\n/to read/reading/\n\nMore below...\n\n>\n> Signed-off-by: Thomas Gummerer \n> ---\n> read-cache.c | 4 ++++\n> 1 file changed, 4 insertions(+)\n>\n> diff --git a/read-cache.c b/read-cache.c\n> index 38b9a04..7a27f9b 100644\n> --- a/read-cache.c\n> +++ b/read-cache.c\n> @@ -1332,6 +1332,8 @@ int read_index_filtered_from(struct index_state *istate, const char *path,\n> void *mmap;\n> size_t mmap_size;\n>\n> + if (istate->filter_opts)\n> + die(\"BUG: Can't re-read partially read index\");\n> errno = EBUSY;\n> if (istate->initialized)\n> return istate->cache_nr;\n> @@ -1455,6 +1457,8 @@ void update_index_if_able(struct index_state *istate, struct lock_file *lockfile\n>\n> int write_index(struct index_state *istate, int newfd)\n> {\n> + if (istate->filter_opts)\n> + die(\"BUG: index: cannot write a partially read index\");\n\nConsistency nit:\n\nIn the preceding hunk, the error message starts \"BUG: Can't...\", but\nin this hunk we have \"BUG: index: cannot...\".\n\nSo, \"BUG:\" is the prefix of one, but \"BUG: index:\" is the prefix of the other.\n\nSpelling difference: \"Can't\" vs. \"cannot\".\n\nCapitalization difference: \"Can't\" vs. \"cannot\".\n\n> return istate->ops->write_index(istate, newfd);\n> }\n>\n> --\n> 1.8.3.4.1231.g9fbf354.dirty\n>\n"},{"id":"225437","messageId":"52114C0E.4030502@ramsay1.demon.co.uk","threadId":"34724","inReplyTo":"1376854933-31241-7-git-send-email-t.gummerer@gmail.com","subject":"Re: [PATCH v3 06/24] read-cache: Don't compare uid, gid and ino on cygwin","fromName":"Ramsay Jones","fromEmail":"ramsay@ramsay1.demon.co.uk","sentAt":"2013-08-18T22:34:54Z","receivedAt":"2013-08-18T22:34:54Z","isPatch":true,"sender":{"key":"ramsay@ramsayjones.plus.com","avatar":"https://avatars.githubusercontent.com/u/33702710?v=4"},"body":"On 18/08/2013 08:41 PM, Thomas Gummerer wrote:\n> Cygwin doesn't have uid, gid and ino stats fields. Therefore we should\n> never check them in the match_stat_data when working on the CYGWIN\n> platform.\n\nHmm, this is simply not true ... ;-)\n\nThe need to omit the uid, gid and ino fields from the stat checks in\nyour original code was caused by the \"schizophrenic stat\" implementation\nin cygwin. (This was also before \"core.checkstat\" was implemented; note\nthe 'check_stat' conditional below ...)\n\nHowever, since commit f66450ae (\"cygwin: Remove the Win32 l/stat()\nimplementation\", 22-06-2013), this patch is no longer necessary and\ncan simply be dropped from this series.\n\n[I have not had time to read your new patches yet, but I seem to remember\nbeing concerned about those platforms which have UNRELIABLE_FSTAT set.\n(ie cygwin, MinGW and Windows.)]\n\nATB,\nRamsay Jones\n\n> Signed-off-by: Thomas Gummerer \n> ---\n> \n> This patch was not tested on Cygwin yet. I think it's needed though,\n> because the re-reading of the index if it changed will no longer use\n> it's own index_changed function, but use the stat_validity_check\n> function instead. Would be great if someone running Cygwin could test\n> this.\n> \n> read-cache.c | 2 ++\n> 1 file changed, 2 insertions(+)\n> \n> diff --git a/read-cache.c b/read-cache.c\n> index 1f827de..aa17ce7 100644\n> --- a/read-cache.c\n> +++ b/read-cache.c\n> @@ -82,6 +82,7 @@ int match_stat_data(const struct stat_data *sd, struct stat *st)\n> \t\tchanged |= CTIME_CHANGED;\n> #endif\n> \n> +#if !defined (__CYGWIN__)\n> \tif (check_stat) {\n> \t\tif (sd->sd_uid != (unsigned int) st->st_uid ||\n> \t\t\tsd->sd_gid != (unsigned int) st->st_gid)\n> @@ -89,6 +90,7 @@ int match_stat_data(const struct stat_data *sd, struct stat *st)\n> \t\tif (sd->sd_ino != (unsigned int) st->st_ino)\n> \t\t\tchanged |= INODE_CHANGED;\n> \t}\n> +#endif\n> \n> #ifdef USE_STDEV\n> \t/*\n> \n"},{"id":"225440","messageId":"CAPig+cSfrYpcGrSCQc-uTURtEk+g=2fO31TyChjrJUDUXKT20w@mail.gmail.com","threadId":"34724","inReplyTo":"1376854933-31241-16-git-send-email-t.gummerer@gmail.com","subject":"Re: [PATCH v3 15/24] read-cache: read index-v5","fromName":"Eric Sunshine","fromEmail":"sunshine@sunshineco.com","sentAt":"2013-08-19T01:57:08Z","receivedAt":"2013-08-19T01:57:08Z","isPatch":true,"sender":{"key":"sunshine@sunshineco.com","avatar":"https://avatars.githubusercontent.com/u/163641?v=4"},"body":"On Sun, Aug 18, 2013 at 3:42 PM, Thomas Gummerer wrote:\n> Make git read the index file version 5 without complaining.\n>\n> This version of the reader doesn't read neither the cache-tree\n> nor the resolve undo data, but doesn't choke on an index that\n> includes such data.\n\nThe double-negatives are difficult to digest. Grammatical fixup:\n\n-->8--\nThis version of the reader reads neither the cache-tree\nnor the resolve undo data, however, it won't choke on an\nindex that includes such data.\n-->8--\n\n> Helped-by: Junio C Hamano \n> Helped-by: Nguyen Thai Ngoc Duy \n> Helped-by: Thomas Rast \n> Signed-off-by: Thomas Gummerer \n"},{"id":"225441","messageId":"CAPig+cSZDGfNh0-jJeozrQhVHEZ924EeJtXXezPbhxiTZN+xaw@mail.gmail.com","threadId":"34724","inReplyTo":"1376854933-31241-17-git-send-email-t.gummerer@gmail.com","subject":"Re: [PATCH v3 16/24] read-cache: read resolve-undo data","fromName":"Eric Sunshine","fromEmail":"sunshine@sunshineco.com","sentAt":"2013-08-19T01:59:24Z","receivedAt":"2013-08-19T01:59:24Z","isPatch":true,"sender":{"key":"sunshine@sunshineco.com","avatar":"https://avatars.githubusercontent.com/u/163641?v=4"},"body":"On Sun, Aug 18, 2013 at 3:42 PM, Thomas Gummerer wrote:\n> Make git read the resolve-undo data from the index.\n>\n> Since the resolve-undo data is joined with the conflicts in\n> the ondisk format of the index file version 5, conflicts and\n> resolved data is read at the same time, and the resolve-undo\n\ns/is/are/\n\n> data is then converted to the in-memory format.\n>\n> Helped-by: Thomas Rast \n> Signed-off-by: Thomas Gummerer \n"},{"id":"225500","messageId":"87li3wiwrh.fsf@gmail.com","threadId":"34724","inReplyTo":"52114C0E.4030502@ramsay1.demon.co.uk","subject":"Re: [PATCH v3 06/24] read-cache: Don't compare uid, gid and ino on cygwin","fromName":"Thomas Gummerer","fromEmail":"t.gummerer@gmail.com","sentAt":"2013-08-20T08:36:50Z","receivedAt":"2013-08-20T08:36:50Z","isPatch":true,"sender":{"key":"t.gummerer@gmail.com","avatar":"https://avatars.githubusercontent.com/u/191004?v=4"},"body":"Ramsay Jones writes:\n\n> On 18/08/2013 08:41 PM, Thomas Gummerer wrote:\n>> Cygwin doesn't have uid, gid and ino stats fields. Therefore we should\n>> never check them in the match_stat_data when working on the CYGWIN\n>> platform.\n>\n> Hmm, this is simply not true ... ;-)\n>\n> The need to omit the uid, gid and ino fields from the stat checks in\n> your original code was caused by the \"schizophrenic stat\" implementation\n> in cygwin. (This was also before \"core.checkstat\" was implemented; note\n> the 'check_stat' conditional below ...)\n>\n> However, since commit f66450ae (\"cygwin: Remove the Win32 l/stat()\n> implementation\", 22-06-2013), this patch is no longer necessary and\n> can simply be dropped from this series.\n>\n> [I have not had time to read your new patches yet, but I seem to remember\n> being concerned about those platforms which have UNRELIABLE_FSTAT set.\n> (ie cygwin, MinGW and Windows.)]\n\nAh ok, thanks for the clarification. I misinterpreted your message in\nthe previous thread, thinking it would still be necessary. I'll drop\nthis patch.\n\nI can't recall anything about UNRELIABLE_FSTAT though.\n\n> ATB,\n> Ramsay Jones\n>\n>> Signed-off-by: Thomas Gummerer \n>> ---\n>>\n>> This patch was not tested on Cygwin yet. I think it's needed though,\n>> because the re-reading of the index if it changed will no longer use\n>> it's own index_changed function, but use the stat_validity_check\n>> function instead. Would be great if someone running Cygwin could test\n>> this.\n>>\n>> read-cache.c | 2 ++\n>> 1 file changed, 2 insertions(+)\n>>\n>> diff --git a/read-cache.c b/read-cache.c\n>> index 1f827de..aa17ce7 100644\n>> --- a/read-cache.c\n>> +++ b/read-cache.c\n>> @@ -82,6 +82,7 @@ int match_stat_data(const struct stat_data *sd, struct stat *st)\n>> \t\tchanged |= CTIME_CHANGED;\n>> #endif\n>>\n>> +#if !defined (__CYGWIN__)\n>> \tif (check_stat) {\n>> \t\tif (sd->sd_uid != (unsigned int) st->st_uid ||\n>> \t\t\tsd->sd_gid != (unsigned int) st->st_gid)\n>> @@ -89,6 +90,7 @@ int match_stat_data(const struct stat_data *sd, struct stat *st)\n>> \t\tif (sd->sd_ino != (unsigned int) st->st_ino)\n>> \t\t\tchanged |= INODE_CHANGED;\n>> \t}\n>> +#endif\n>>\n>> #ifdef USE_STDEV\n>> \t/*\n>>\n"},{"id":"225502","messageId":"87ioz0iwbn.fsf@gmail.com","threadId":"34724","inReplyTo":"CAPig+cTJQrVm+r77utWzduU3KqC5WPX_b4Vbvxyjezd0Wc4LZw@mail.gmail.com","subject":"Re: [PATCH v3 10/24] make sure partially read index is not changed","fromName":"Thomas Gummerer","fromEmail":"t.gummerer@gmail.com","sentAt":"2013-08-20T08:46:20Z","receivedAt":"2013-08-20T08:46:20Z","isPatch":true,"sender":{"key":"t.gummerer@gmail.com","avatar":"https://avatars.githubusercontent.com/u/191004?v=4"},"body":"Eric Sunshine writes:\n\n> On Sun, Aug 18, 2013 at 3:41 PM, Thomas Gummerer wrote:\n>> A partially read index file currently cannot be written to disk. Make\n>> sure that never happens, by erroring out when a caller tries to write a\n>\n> s/,//\n>\n>> partially read index. Do the same when trying to re-read a partially\n>> read index without having discarded it first to avoid loosing any\n>\n> s/loosing/losing/\n>\n>> information.\n>>\n>> Forcing the caller to load the right part of the index file instead of\n>> re-reading it when changing it, gives a bit of a performance advantage,\n>\n> s/it,/it/ (or s/file instead/file, instead/)\n> s/advantage,/advantage/\n>\n>> by avoiding to read parts of the index twice.\n>\n> /to read/reading/\n>\n> More below...\n>\n>>\n>> Signed-off-by: Thomas Gummerer \n>> ---\n>> read-cache.c | 4 ++++\n>> 1 file changed, 4 insertions(+)\n>>\n>> diff --git a/read-cache.c b/read-cache.c\n>> index 38b9a04..7a27f9b 100644\n>> --- a/read-cache.c\n>> +++ b/read-cache.c\n>> @@ -1332,6 +1332,8 @@ int read_index_filtered_from(struct index_state *istate, const char *path,\n>> void *mmap;\n>> size_t mmap_size;\n>>\n>> + if (istate->filter_opts)\n>> + die(\"BUG: Can't re-read partially read index\");\n>> errno = EBUSY;\n>> if (istate->initialized)\n>> return istate->cache_nr;\n>> @@ -1455,6 +1457,8 @@ void update_index_if_able(struct index_state *istate, struct lock_file *lockfile\n>>\n>> int write_index(struct index_state *istate, int newfd)\n>> {\n>> + if (istate->filter_opts)\n>> + die(\"BUG: index: cannot write a partially read index\");\n>\n> Consistency nit:\n>\n> In the preceding hunk, the error message starts \"BUG: Can't...\", but\n> in this hunk we have \"BUG: index: cannot...\".\n>\n> So, \"BUG:\" is the prefix of one, but \"BUG: index:\" is the prefix of the other.\n>\n> Spelling difference: \"Can't\" vs. \"cannot\".\n>\n> Capitalization difference: \"Can't\" vs. \"cannot\".\n\nThanks for catching this. From quick grepping it seems the preferred\nversion seems to be the one with only \"BUG:\" as prefix and starting with\na lower case letter after this. Both can't and cannot are used in the\ncodebase, but cannot seems to be used more often. I'll use that.\n\nWill fix this and the rest of the style/spelling/grammar fixes you\nsuggested. Thanks.\n\n>> return istate->ops->write_index(istate, newfd);\n>> }\n>>\n>> --\n>> 1.8.3.4.1231.g9fbf354.dirty\n>>\n"},{"id":"225509","messageId":"CACsJy8A1NpYa6nr6vHKLd-Tap3PObabfUB34U90MH_OdfQJN9Q@mail.gmail.com","threadId":"34724","inReplyTo":"1376854933-31241-16-git-send-email-t.gummerer@gmail.com","subject":"Re: [PATCH v3 15/24] read-cache: read index-v5","fromName":"Duy Nguyen","fromEmail":"pclouds@gmail.com","sentAt":"2013-08-20T14:01:07Z","receivedAt":"2013-08-20T14:01:07Z","isPatch":true,"sender":{"key":"pclouds@gmail.com","avatar":"https://avatars.githubusercontent.com/u/720?v=4"},"body":"General comment: a short comment before each function describing what\nthe function does would be helpful. This only applies for complex\nfunctions (read_* ones). Of course verify_hdr does not require extra\nexplanantion.\n\n On Mon, Aug 19, 2013 at 2:42 AM, Thomas Gummerer wrote:\n> +static struct directory_entry *directory_entry_from_ondisk(struct ondisk_directory_entry *ondisk,\n> + const char *name,\n> + size_t len)\n> +{\n> + struct directory_entry *de = xmalloc(directory_entry_size(len));\n> +\n> + memcpy(de->pathname, name, len);\n> + de->pathname[len] = '\\0';\n> + de->de_flags = ntoh_s(ondisk->flags);\n> + de->de_foffset = ntoh_l(ondisk->foffset);\n> + de->de_cr = ntoh_l(ondisk->cr);\n> + de->de_ncr = ntoh_l(ondisk->ncr);\n> + de->de_nsubtrees = ntoh_l(ondisk->nsubtrees);\n> + de->de_nfiles = ntoh_l(ondisk->nfiles);\n> + de->de_nentries = ntoh_l(ondisk->nentries);\n> + de->de_pathlen = len;\n> + hashcpy(de->sha1, ondisk->sha1);\n> + return de;\n> +}\n\nThis function leaves a lot of fields uninitialized..\n\n> +static struct directory_entry *read_directories(unsigned int *dir_offset,\n> + unsigned int *dir_table_offset,\n> + void *mmap,\n> + int mmap_size)\n> +{\n> ....\n> + de = directory_entry_from_ondisk(disk_de, name, len);\n> + de->next = NULL;\n> + de->sub = NULL;\n\n..and two of them are set to NULL here. Maybe\ndirectory_entry_from_ondisk() could be made to call\ninit_directory_entry() instead so that we don't need to manually reset\nsome fields here, which leaves me wondering why other fields are not\nimportant to reset. init_directory_entry() is introduced later in\n\"write index-v5\" patch, you so may want to move it up a few patches.\n\n> +static int read_entry(struct cache_entry **ce, char *pathname, size_t pathlen,\n> + void *mmap, unsigned long mmap_size,\n> + unsigned int first_entry_offset,\n> + unsigned int foffsetblock)\n> +{\n> + int len, offset_to_offset;\n> + char *name;\n> + uint32_t foffsetblockcrc, *filecrc, *beginning, *end, entry_offset;\n> + struct ondisk_cache_entry *disk_ce;\n> +\n> + beginning = ptr_add(mmap, foffsetblock);\n> + end = ptr_add(mmap, foffsetblock + 4);\n> + len = ntoh_l(*end) - ntoh_l(*beginning) - sizeof(struct ondisk_cache_entry) - 5;\n\nIt took me a while to check and figure out \" - 5\" here means minus NUL\nand the crc. A short comment would help. I think there's also another\n-5 in read_directories(). Or maybe just rename len to namelen.\n\n> +struct conflict_entry *create_new_conflict(char *name, int len, int pathlen)\n> +{\n> + struct conflict_entry *conflict_entry;\n> +\n> + if (pathlen)\n> + pathlen++;\n> + conflict_entry = xmalloc(conflict_entry_size(len));\n> + conflict_entry->entries = NULL;\n> + conflict_entry->nfileconflicts = 0;\n> + conflict_entry->namelen = len;\n> + memcpy(conflict_entry->name, name, len);\n> + conflict_entry->name[len] = '\\0';\n> + conflict_entry->pathlen = pathlen;\n> + conflict_entry->next = NULL;\n\nA memset followed by memcpy and conflict_entry->pathlen = pathlen\nwould make this shorter and won't miss new fields added in future.\n\n> +static int read_entries(struct index_state *istate, struct directory_entry *de,\n> + unsigned int first_entry_offset, void *mmap,\n> + unsigned long mmap_size, unsigned int *nr,\n> + unsigned int foffsetblock)\n> +{\n> + struct cache_entry *ce;\n> + int i, subdir = 0;\n> +\n> + for (i = 0; i < de->de_nfiles; i++) {\n> + unsigned int subdir_foffsetblock = de->de_foffset + foffsetblock + (i * 4);\n> + if (read_entry(&ce, de->pathname, de->de_pathlen, mmap, mmap_size,\n> + first_entry_offset, subdir_foffsetblock) < 0)\n> + return -1;\n\nYou read one file entry, say abc/def...\n\n> + while (subdir < de->de_nsubtrees &&\n> + cache_name_compare(ce->name + de->de_pathlen,\n> + ce_namelen(ce) - de->de_pathlen,\n> + de->sub[subdir]->pathname + de->de_pathlen,\n> + de->sub[subdir]->de_pathlen - de->de_pathlen) > 0) {\n\nOh right the entry belongs the the substree \"abc\" so..\n\n> + read_entries(istate, de->sub[subdir], first_entry_offset, mmap,\n> + mmap_size, nr, foffsetblock);\n\nyou recurse in, which will add following entries like abc/def and abc/xyz...\n\n> + subdir++;\n> + }\n> + if (!ce)\n> + continue;\n> + set_index_entry(istate, (*nr)++, ce);\n\nthen back here after recusion and add abc/def, again, after abc/xyz.\nDid I read this code correctly?\n\n> + }\n> + for (i = subdir; i < de->de_nsubtrees; i++) {\n> + read_entries(istate, de->sub[i], first_entry_offset, mmap,\n> + mmap_size, nr, foffsetblock);\n> + }\n> + return 0;\n> +}\n> +\n\n> +static int read_index_v5(struct index_state *istate, void *mmap,\n> + unsigned long mmap_size, struct filter_opts *opts)\n> +{\n> + unsigned int entry_offset, ndirs, foffsetblock, nr = 0;\n> + struct directory_entry *root_directory, *de, *last_de;\n> + const char **paths = NULL;\n> + struct pathspec adjusted_pathspec;\n> + int need_root = 0, i;\n> +\n> + root_directory = read_all_directories(istate, &entry_offset,\n> + &foffsetblock, &ndirs,\n> + mmap, mmap_size);\n> +\n> + if (opts && opts->pathspec && opts->pathspec->nr) {\n> + need_root = 0;\n\nneed_root is already initialized at declaration.\n\n> + paths = xmalloc((opts->pathspec->nr + 1)*sizeof(char *));\n> + paths[opts->pathspec->nr] = NULL;\n> + for (i = 0; i < opts->pathspec->nr; i++) {\n> + char *super = strdup(opts->pathspec->items[i].match);\n> + int len = strlen(super);\n> + while (len && super[len - 1] == '/' && super[len - 2] == '/')\n> + super[--len] = '\\0'; /* strip all but one trailing slash */\n> + while (len && super[--len] != '/')\n> + ; /* scan backwards to next / */\n> + if (len >= 0)\n> + super[len--] = '\\0';\n> + if (len <= 0) {\n> + need_root = 1;\n> + break;\n> + }\n> + paths[i] = super;\n> + }\n> + }\n> +\n> + if (!need_root)\n> + parse_pathspec(&adjusted_pathspec, PATHSPEC_ALL_MAGIC, PATHSPEC_PREFER_CWD, NULL, paths);\n> +\n> + de = root_directory;\n> + last_de = de;\n> + while (de) {\n> + if (need_root ||\n> + match_pathspec_depth(&adjusted_pathspec, de->pathname, de->de_pathlen, 0, NULL)) {\n> + if (read_entries(istate, de, entry_offset,\n> + mmap, mmap_size, &nr,\n> + foffsetblock) < 0)\n> + return -1;\n> + } else {\n> + for (i = 0; i < de->de_nsubtrees; i++) {\n> + last_de->next = de->sub[i];\n> + last_de = last_de->next;\n> + }\n> + }\n> + de = de->next;\n\nI'm missing something here. read_entries is a function that reads all\nentries inside \"de\" including subdirectories and the first \"de\" is\nroot_directory, which makes it read the whole index in. Because\nde->next is only set in this function, de->next after read_entries()\nis NULL, which termintates the loop and the else block never runs. It\ndoes not sound right..\n-- \nDuy\n"},{"id":"225511","messageId":"CACsJy8CNHNj6dScPUCiRnv=zqT9QfY+=v3ECsnUR2uR4nkFQHg@mail.gmail.com","threadId":"34724","inReplyTo":"1376854933-31241-16-git-send-email-t.gummerer@gmail.com","subject":"Re: [PATCH v3 15/24] read-cache: read index-v5","fromName":"Duy Nguyen","fromEmail":"pclouds@gmail.com","sentAt":"2013-08-20T14:16:41Z","receivedAt":"2013-08-20T14:16:41Z","isPatch":true,"sender":{"key":"pclouds@gmail.com","avatar":"https://avatars.githubusercontent.com/u/720?v=4"},"body":"On Mon, Aug 19, 2013 at 2:42 AM, Thomas Gummerer wrote:\n> +static int read_entry(struct cache_entry **ce, char *pathname, size_t pathlen,\n> + void *mmap, unsigned long mmap_size,\n> + unsigned int first_entry_offset,\n> + unsigned int foffsetblock)\n> +{\n> + int len, offset_to_offset;\n> + char *name;\n> + uint32_t foffsetblockcrc, *filecrc, *beginning, *end, entry_offset;\n> + struct ondisk_cache_entry *disk_ce;\n> +\n> + beginning = ptr_add(mmap, foffsetblock);\n> + end = ptr_add(mmap, foffsetblock + 4);\n> + len = ntoh_l(*end) - ntoh_l(*beginning) - sizeof(struct ondisk_cache_entry) - 5;\n> + entry_offset = first_entry_offset + ntoh_l(*beginning);\n> + name = ptr_add(mmap, entry_offset);\n> + disk_ce = ptr_add(mmap, entry_offset + len + 1);\n> + *ce = cache_entry_from_ondisk(disk_ce, pathname, name, len, pathlen);\n> + filecrc = ptr_add(mmap, entry_offset + len + 1 + sizeof(*disk_ce));\n> + offset_to_offset = htonl(foffsetblock);\n> + foffsetblockcrc = crc32(0, (Bytef*)&offset_to_offset, 4);\n> + if (!check_crc32(foffsetblockcrc,\n> + ptr_add(mmap, entry_offset), len + 1 + sizeof(*disk_ce),\n> + ntoh_l(*filecrc)))\n> + return -1;\n> +\n> + return 0;\n> +}\n\nLast thought before book+bed time. I wonder if moving the name part to\nthe end of the entry (i.e. chaging on disk format) would simplify this\ncode. The new ondisk_cache_entry would be something like this\n\nstruct ondisk_cache_entry {\n uint16_t flags;\n uint16_t mode;\n struct cache_time mtime;\n uint32_t size;\n int stat_crc;\n unsigned char sha1[20];\n char name[FLEX_ARRAY];\n};\n-- \nDuy\n"},{"id":"225548","messageId":"xmqqr4do5fd8.fsf@gitster.dls.corp.google.com","threadId":"34724","inReplyTo":"1376854933-31241-3-git-send-email-t.gummerer@gmail.com","subject":"Re: [PATCH v3 02/24] read-cache: use fixed width integer types","fromName":"Junio C Hamano","fromEmail":"gitster@pobox.com","sentAt":"2013-08-20T19:30:59Z","receivedAt":"2013-08-20T19:30:59Z","isPatch":true,"sender":{"key":"gitster@pobox.com","avatar":"https://avatars.githubusercontent.com/u/54884?v=4"},"body":"Thomas Gummerer writes:\n\n> Use the fixed width integer types uint16_t and uint32_t for ondisk\n> structures, because unsigned short and unsigned int do not hae a\n> guaranteed size.\n\nThis sounds like an independent fix to me. I'd queue this early\nindependent from the rest of the series.\n\nThanks.\n\n>\n> Signed-off-by: Thomas Gummerer \n> ---\n> cache.h | 10 +++++-----\n> read-cache.c | 30 +++++++++++++++---------------\n> 2 files changed, 20 insertions(+), 20 deletions(-)\n>\n> diff --git a/cache.h b/cache.h\n> index bd6fb9f..9ef778a 100644\n> --- a/cache.h\n> +++ b/cache.h\n> @@ -101,9 +101,9 @@ unsigned long git_deflate_bound(git_zstream *, unsigned long);\n> \n> #define CACHE_SIGNATURE 0x44495243\t/* \"DIRC\" */\n> struct cache_header {\n> -\tunsigned int hdr_signature;\n> -\tunsigned int hdr_version;\n> -\tunsigned int hdr_entries;\n> +\tuint32_t hdr_signature;\n> +\tuint32_t hdr_version;\n> +\tuint32_t hdr_entries;\n> };\n> \n> #define INDEX_FORMAT_LB 2\n> @@ -115,8 +115,8 @@ struct cache_header {\n> * check it for equality in the 32 bits we save.\n> */\n> struct cache_time {\n> -\tunsigned int sec;\n> -\tunsigned int nsec;\n> +\tuint32_t sec;\n> +\tuint32_t nsec;\n> };\n> \n> struct stat_data {\n> diff --git a/read-cache.c b/read-cache.c\n> index ceaf207..0df5b31 100644\n> --- a/read-cache.c\n> +++ b/read-cache.c\n> @@ -1230,14 +1230,14 @@ static struct cache_entry *refresh_cache_entry(struct cache_entry *ce, int reall\n> struct ondisk_cache_entry {\n> \tstruct cache_time ctime;\n> \tstruct cache_time mtime;\n> -\tunsigned int dev;\n> -\tunsigned int ino;\n> -\tunsigned int mode;\n> -\tunsigned int uid;\n> -\tunsigned int gid;\n> -\tunsigned int size;\n> +\tuint32_t dev;\n> +\tuint32_t ino;\n> +\tuint32_t mode;\n> +\tuint32_t uid;\n> +\tuint32_t gid;\n> +\tuint32_t size;\n> \tunsigned char sha1[20];\n> -\tunsigned short flags;\n> +\tuint16_t flags;\n> \tchar name[FLEX_ARRAY]; /* more */\n> };\n> \n> @@ -1249,15 +1249,15 @@ struct ondisk_cache_entry {\n> struct ondisk_cache_entry_extended {\n> \tstruct cache_time ctime;\n> \tstruct cache_time mtime;\n> -\tunsigned int dev;\n> -\tunsigned int ino;\n> -\tunsigned int mode;\n> -\tunsigned int uid;\n> -\tunsigned int gid;\n> -\tunsigned int size;\n> +\tuint32_t dev;\n> +\tuint32_t ino;\n> +\tuint32_t mode;\n> +\tuint32_t uid;\n> +\tuint32_t gid;\n> +\tuint32_t size;\n> \tunsigned char sha1[20];\n> -\tunsigned short flags;\n> -\tunsigned short flags2;\n> +\tuint16_t flags;\n> +\tuint16_t flags2;\n> \tchar name[FLEX_ARRAY]; /* more */\n> };\n"},{"id":"225549","messageId":"xmqqmwoc5f6t.fsf@gitster.dls.corp.google.com","threadId":"34724","inReplyTo":"1376854933-31241-5-git-send-email-t.gummerer@gmail.com","subject":"Re: [PATCH v3 04/24] read-cache: clear version in discard_index()","fromName":"Junio C Hamano","fromEmail":"gitster@pobox.com","sentAt":"2013-08-20T19:34:50Z","receivedAt":"2013-08-20T19:34:50Z","isPatch":true,"sender":{"key":"gitster@pobox.com","avatar":"https://avatars.githubusercontent.com/u/54884?v=4"},"body":"Thomas Gummerer writes:\n\n> All fields except index_state->version are reset in discard_index.\n> Reset the version too.\n\nWhat is the practical consequence of not clearing this field? I\nsomehow have a feeling that this was done deliberately, so that we\ncan stick to the version of the index file format better, once the\nuser said \"update-index --index-version $N\" to set it up. I suspect\nthat the patch would affect a codepath that does read_cache(), calls\ndiscard_index(), populates the index and then does write_cache().\nWe stick to the version the user specified earlier in our current\ncode, while the patched code will revert to whatever default built\ninto your Git binary, no?\n\n>\n> Signed-off-by: Thomas Gummerer \n> ---\n> read-cache.c | 1 +\n> 1 file changed, 1 insertion(+)\n>\n> diff --git a/read-cache.c b/read-cache.c\n> index de0bbcd..1e22f6f 100644\n> --- a/read-cache.c\n> +++ b/read-cache.c\n> @@ -1558,6 +1558,7 @@ int discard_index(struct index_state *istate)\n> \tfor (i = 0; i < istate->cache_nr; i++)\n> \t\tfree(istate->cache[i]);\n> \tresolve_undo_clear_index(istate);\n> +\tistate->version = 0;\n> \tistate->cache_nr = 0;\n> \tistate->cache_changed = 0;\n> \tistate->timestamp.sec = 0;\n"},{"id":"225557","messageId":"87wqng3wpg.fsf@gmail.com","threadId":"34724","inReplyTo":"CACsJy8A1NpYa6nr6vHKLd-Tap3PObabfUB34U90MH_OdfQJN9Q@mail.gmail.com","subject":"Re: [PATCH v3 15/24] read-cache: read index-v5","fromName":"Thomas Gummerer","fromEmail":"t.gummerer@gmail.com","sentAt":"2013-08-20T20:59:23Z","receivedAt":"2013-08-20T20:59:23Z","isPatch":true,"sender":{"key":"t.gummerer@gmail.com","avatar":"https://avatars.githubusercontent.com/u/191004?v=4"},"body":"Duy Nguyen writes:\n\n> General comment: a short comment before each function describing what\n> the function does would be helpful. This only applies for complex\n> functions (read_* ones). Of course verify_hdr does not require extra\n> explanantion.\n\nYes, makes sense, I'll do that in the re-roll.\n\n> On Mon, Aug 19, 2013 at 2:42 AM, Thomas Gummerer wrote:\n>> +static struct directory_entry *directory_entry_from_ondisk(struct ondisk_directory_entry *ondisk,\n>> + const char *name,\n>> + size_t len)\n>> +{\n>> + struct directory_entry *de = xmalloc(directory_entry_size(len));\n>> +\n>> + memcpy(de->pathname, name, len);\n>> + de->pathname[len] = '\\0';\n>> + de->de_flags = ntoh_s(ondisk->flags);\n>> + de->de_foffset = ntoh_l(ondisk->foffset);\n>> + de->de_cr = ntoh_l(ondisk->cr);\n>> + de->de_ncr = ntoh_l(ondisk->ncr);\n>> + de->de_nsubtrees = ntoh_l(ondisk->nsubtrees);\n>> + de->de_nfiles = ntoh_l(ondisk->nfiles);\n>> + de->de_nentries = ntoh_l(ondisk->nentries);\n>> + de->de_pathlen = len;\n>> + hashcpy(de->sha1, ondisk->sha1);\n>> + return de;\n>> +}\n>\n> This function leaves a lot of fields uninitialized..\n>\n>> +static struct directory_entry *read_directories(unsigned int *dir_offset,\n>> + unsigned int *dir_table_offset,\n>> + void *mmap,\n>> + int mmap_size)\n>> +{\n>> ....\n>> + de = directory_entry_from_ondisk(disk_de, name, len);\n>> + de->next = NULL;\n>> + de->sub = NULL;\n>\n> ..and two of them are set to NULL here. Maybe\n> directory_entry_from_ondisk() could be made to call\n> init_directory_entry() instead so that we don't need to manually reset\n> some fields here, which leaves me wondering why other fields are not\n> important to reset. init_directory_entry() is introduced later in\n> \"write index-v5\" patch, you so may want to move it up a few patches.\n\nThe rest of the fields are only used for compiling the data that will be\nwritten. Using init_directory_entry() here makes sense anyway though,\nthanks for the suggestion.\n\n>> +static int read_entry(struct cache_entry **ce, char *pathname, size_t pathlen,\n>> + void *mmap, unsigned long mmap_size,\n>> + unsigned int first_entry_offset,\n>> + unsigned int foffsetblock)\n>> +{\n>> + int len, offset_to_offset;\n>> + char *name;\n>> + uint32_t foffsetblockcrc, *filecrc, *beginning, *end, entry_offset;\n>> + struct ondisk_cache_entry *disk_ce;\n>> +\n>> + beginning = ptr_add(mmap, foffsetblock);\n>> + end = ptr_add(mmap, foffsetblock + 4);\n>> + len = ntoh_l(*end) - ntoh_l(*beginning) - sizeof(struct ondisk_cache_entry) - 5;\n>\n> It took me a while to check and figure out \" - 5\" here means minus NUL\n> and the crc. A short comment would help. I think there's also another\n> -5 in read_directories(). Or maybe just rename len to namelen.\n\nWill add a short comment.\n\n>> +struct conflict_entry *create_new_conflict(char *name, int len, int pathlen)\n>> +{\n>> + struct conflict_entry *conflict_entry;\n>> +\n>> + if (pathlen)\n>> + pathlen++;\n>> + conflict_entry = xmalloc(conflict_entry_size(len));\n>> + conflict_entry->entries = NULL;\n>> + conflict_entry->nfileconflicts = 0;\n>> + conflict_entry->namelen = len;\n>> + memcpy(conflict_entry->name, name, len);\n>> + conflict_entry->name[len] = '\\0';\n>> + conflict_entry->pathlen = pathlen;\n>> + conflict_entry->next = NULL;\n>\n> A memset followed by memcpy and conflict_entry->pathlen = pathlen\n> would make this shorter and won't miss new fields added in future.\n\nMakes sense, thanks.\n\n>> +static int read_entries(struct index_state *istate, struct directory_entry *de,\n>> + unsigned int first_entry_offset, void *mmap,\n>> + unsigned long mmap_size, unsigned int *nr,\n>> + unsigned int foffsetblock)\n>> +{\n>> + struct cache_entry *ce;\n>> + int i, subdir = 0;\n>> +\n>> + for (i = 0; i < de->de_nfiles; i++) {\n>> + unsigned int subdir_foffsetblock = de->de_foffset + foffsetblock + (i * 4);\n>> + if (read_entry(&ce, de->pathname, de->de_pathlen, mmap, mmap_size,\n>> + first_entry_offset, subdir_foffsetblock) < 0)\n>> + return -1;\n>\n> You read one file entry, say abc/def...\n\nYou're not quite right here. I'm reading def here, de is the root\ndirectory and de->sub[subdir] is the first sub directory, named abc/\n\n>> + while (subdir < de->de_nsubtrees &&\n>> + cache_name_compare(ce->name + de->de_pathlen,\n>> + ce_namelen(ce) - de->de_pathlen,\n>> + de->sub[subdir]->pathname + de->de_pathlen,\n>> + de->sub[subdir]->de_pathlen - de->de_pathlen) > 0) {\n>\n> Oh right the entry belongs the the substree \"abc\" so..\n\nabc/ comes before def, so lets read everything in that directory first.\n\n>> + read_entries(istate, de->sub[subdir], first_entry_offset, mmap,\n>> + mmap_size, nr, foffsetblock);\n>\n> you recurse in, which will add following entries like abc/def and abc/xyz...\n\nRecurse in, add abc/def and abc/xyz, and increase nr in the recursion,\nso the new entry gets added at the right place.\n\n>> + subdir++;\n>> + }\n>> + if (!ce)\n>> + continue;\n>> + set_index_entry(istate, (*nr)++, ce);\n>\n> then back here after recusion and add abc/def, again, after abc/xyz.\n> Did I read this code correctly?\n\nAfter the recursion add def to at the 3rd position in the index. After\nthat it looks like:\nabc/def\nabc/xyz\ndef\n\nI hope that makes it a little clearer.\n\n>> + }\n>> + for (i = subdir; i < de->de_nsubtrees; i++) {\n>> + read_entries(istate, de->sub[i], first_entry_offset, mmap,\n>> + mmap_size, nr, foffsetblock);\n>> + }\n>> + return 0;\n>> +}\n>> +\n>\n>> +static int read_index_v5(struct index_state *istate, void *mmap,\n>> + unsigned long mmap_size, struct filter_opts *opts)\n>> +{\n>> + unsigned int entry_offset, ndirs, foffsetblock, nr = 0;\n>> + struct directory_entry *root_directory, *de, *last_de;\n>> + const char **paths = NULL;\n>> + struct pathspec adjusted_pathspec;\n>> + int need_root = 0, i;\n>> +\n>> + root_directory = read_all_directories(istate, &entry_offset,\n>> + &foffsetblock, &ndirs,\n>> + mmap, mmap_size);\n>> +\n>> + if (opts && opts->pathspec && opts->pathspec->nr) {\n>> + need_root = 0;\n>\n> need_root is already initialized at declaration.\n\nRight, thanks.\n\n>> + paths = xmalloc((opts->pathspec->nr + 1)*sizeof(char *));\n>> + paths[opts->pathspec->nr] = NULL;\n>> + for (i = 0; i < opts->pathspec->nr; i++) {\n>> + char *super = strdup(opts->pathspec->items[i].match);\n>> + int len = strlen(super);\n>> + while (len && super[len - 1] == '/' && super[len - 2] == '/')\n>> + super[--len] = '\\0'; /* strip all but one trailing slash */\n>> + while (len && super[--len] != '/')\n>> + ; /* scan backwards to next / */\n>> + if (len >= 0)\n>> + super[len--] = '\\0';\n>> + if (len <= 0) {\n>> + need_root = 1;\n>> + break;\n>> + }\n>> + paths[i] = super;\n>> + }\n>> + }\n>> +\n>> + if (!need_root)\n>> + parse_pathspec(&adjusted_pathspec, PATHSPEC_ALL_MAGIC, PATHSPEC_PREFER_CWD, NULL, paths);\n>> +\n>> + de = root_directory;\n>> + last_de = de;\n>> + while (de) {\n>> + if (need_root ||\n>> + match_pathspec_depth(&adjusted_pathspec, de->pathname, de->de_pathlen, 0, NULL)) {\n>> + if (read_entries(istate, de, entry_offset,\n>> + mmap, mmap_size, &nr,\n>> + foffsetblock) < 0)\n>> + return -1;\n>> + } else {\n>> + for (i = 0; i < de->de_nsubtrees; i++) {\n>> + last_de->next = de->sub[i];\n>> + last_de = last_de->next;\n>> + }\n>> + }\n>> + de = de->next;\n>\n> I'm missing something here. read_entries is a function that reads all\n> entries inside \"de\" including subdirectories and the first \"de\" is\n> root_directory, which makes it read the whole index in.\n\nIt does, except when the adjusted_pathspec doesn't match the\nroot_directory. In that case all the subdirectories of the\nroot_directory are added to a queue, which will then be iterated over\nand tried to match with the adjusted_pathspec.\n\nThis has a bug not covered by the test suite described below when\nchecking against pathspecs with different levels.\n\n> Because\n> de->next is only set in this function, de->next after read_entries()\n> is NULL, which termintates the loop and the else block never runs. It\n> does not sound right..\n\nIf the subdirectory is read it does and the loop should terminate,\nbecause the whole index is read.\n\nIt does have a bug in the following test case though, which is not\ncovered by the test suite. I'll add this and the test and the fix to\nthe test-suite:\n\n#!/bin/sh\n\ntest_description=\"Test index-v5 specific corner cases\"\n\n. ./test-lib.sh\n\ntest_set_index_version 5\n\ntest_expect_success 'setup' '\n\tmkdir -p abc/def def &&\n\ttouch abc/def/xyz def/xyz &&\n\tgit add . &&\n\tgit commit -m \"test commit\"\n'\n\ntest_expect_success 'ls-files ordering correct' '\n\tcat <<-\\EOF >expected &&\n\tabc/def/xyz\n\tdef/xyz\n\tEOF\n\tgit ls-files abc/def/xyz def/xyz >actual &&\n\ttest_cmp expected actual\n'\n\ntest_done\n\nThis can be solved by the following:\n\ndiff --git a/read-cache-v5.c b/read-cache-v5.c\nindex 10960fd..9963d1f 100644\n--- a/read-cache-v5.c\n+++ b/read-cache-v5.c\n@@ -661,7 +661,9 @@ static int read_index_v5(struct index_state *istate, void *mmap,\n foffsetblock) < 0)\n return -1;\n } else {\n+ last_de = de;\n for (i = 0; i < de->de_nsubtrees; i++) {\n+ de->sub[i]->next = last_de->next;\n last_de->next = de->sub[i];\n last_de = last_de->next;\n }\n"},{"id":"225558","messageId":"87txik3w2f.fsf@gmail.com","threadId":"34724","inReplyTo":"CACsJy8CNHNj6dScPUCiRnv=zqT9QfY+=v3ECsnUR2uR4nkFQHg@mail.gmail.com","subject":"Re: [PATCH v3 15/24] read-cache: read index-v5","fromName":"Thomas Gummerer","fromEmail":"t.gummerer@gmail.com","sentAt":"2013-08-20T21:13:12Z","receivedAt":"2013-08-20T21:13:12Z","isPatch":true,"sender":{"key":"t.gummerer@gmail.com","avatar":"https://avatars.githubusercontent.com/u/191004?v=4"},"body":"Duy Nguyen writes:\n\n> On Mon, Aug 19, 2013 at 2:42 AM, Thomas Gummerer wrote:\n>> +static int read_entry(struct cache_entry **ce, char *pathname, size_t pathlen,\n>> + void *mmap, unsigned long mmap_size,\n>> + unsigned int first_entry_offset,\n>> + unsigned int foffsetblock)\n>> +{\n>> + int len, offset_to_offset;\n>> + char *name;\n>> + uint32_t foffsetblockcrc, *filecrc, *beginning, *end, entry_offset;\n>> + struct ondisk_cache_entry *disk_ce;\n>> +\n>> + beginning = ptr_add(mmap, foffsetblock);\n>> + end = ptr_add(mmap, foffsetblock + 4);\n>> + len = ntoh_l(*end) - ntoh_l(*beginning) - sizeof(struct ondisk_cache_entry) - 5;\n>> + entry_offset = first_entry_offset + ntoh_l(*beginning);\n>> + name = ptr_add(mmap, entry_offset);\n>> + disk_ce = ptr_add(mmap, entry_offset + len + 1);\n>> + *ce = cache_entry_from_ondisk(disk_ce, pathname, name, len, pathlen);\n>> + filecrc = ptr_add(mmap, entry_offset + len + 1 + sizeof(*disk_ce));\n>> + offset_to_offset = htonl(foffsetblock);\n>> + foffsetblockcrc = crc32(0, (Bytef*)&offset_to_offset, 4);\n>> + if (!check_crc32(foffsetblockcrc,\n>> + ptr_add(mmap, entry_offset), len + 1 + sizeof(*disk_ce),\n>> + ntoh_l(*filecrc)))\n>> + return -1;\n>> +\n>> + return 0;\n>> +}\n>\n> Last thought before book+bed time. I wonder if moving the name part to\n> the end of the entry (i.e. chaging on disk format) would simplify this\n> code. The new ondisk_cache_entry would be something like this\n>\n> struct ondisk_cache_entry {\n> uint16_t flags;\n> uint16_t mode;\n> struct cache_time mtime;\n> uint32_t size;\n> int stat_crc;\n> unsigned char sha1[20];\n> char name[FLEX_ARRAY];\n> };\n\nI think it simplifies it a bit, but not too much, the only thing I see\navoiding the use of the name variable. I think it will also simplify\nthe writing code a bit. The only negative part would be for bisecting\nthe index, but that would still be possible, and only slightly more\ncomplicated. I'll give it a try tomorrow and check if it's worth it.\n"},{"id":"225584","messageId":"CACsJy8C_5ORYvZZoKdDaD9D18MrbQApu4J6_tJ47i7bEjJd-GQ@mail.gmail.com","threadId":"34724","inReplyTo":"87wqng3wpg.fsf@gmail.com","subject":"Re: [PATCH v3 15/24] read-cache: read index-v5","fromName":"Duy Nguyen","fromEmail":"pclouds@gmail.com","sentAt":"2013-08-21T00:44:11Z","receivedAt":"2013-08-21T00:44:11Z","isPatch":true,"sender":{"key":"pclouds@gmail.com","avatar":"https://avatars.githubusercontent.com/u/720?v=4"},"body":"On Wed, Aug 21, 2013 at 3:59 AM, Thomas Gummerer wrote:\n>>> +static int read_entries(struct index_state *istate, struct directory_entry *de,\n>>> + unsigned int first_entry_offset, void *mmap,\n>>> + unsigned long mmap_size, unsigned int *nr,\n>>> + unsigned int foffsetblock)\n>>> +{\n>>> + struct cache_entry *ce;\n>>> + int i, subdir = 0;\n>>> +\n>>> + for (i = 0; i < de->de_nfiles; i++) {\n>>> + unsigned int subdir_foffsetblock = de->de_foffset + foffsetblock + (i * 4);\n>>> + if (read_entry(&ce, de->pathname, de->de_pathlen, mmap, mmap_size,\n>>> + first_entry_offset, subdir_foffsetblock) < 0)\n>>> + return -1;\n>>\n>> You read one file entry, say abc/def...\n>\n> You're not quite right here. I'm reading def here, de is the root\n> directory and de->sub[subdir] is the first sub directory, named abc/\n>\n>>> + while (subdir < de->de_nsubtrees &&\n>>> + cache_name_compare(ce->name + de->de_pathlen,\n>>> + ce_namelen(ce) - de->de_pathlen,\n>>> + de->sub[subdir]->pathname + de->de_pathlen,\n>>> + de->sub[subdir]->de_pathlen - de->de_pathlen) > 0) {\n>>\n>> Oh right the entry belongs the the substree \"abc\" so..\n>\n> abc/ comes before def, so lets read everything in that directory first.\n>\n>>> + read_entries(istate, de->sub[subdir], first_entry_offset, mmap,\n>>> + mmap_size, nr, foffsetblock);\n>>\n>> you recurse in, which will add following entries like abc/def and abc/xyz...\n>\n> Recurse in, add abc/def and abc/xyz, and increase nr in the recursion,\n> so the new entry gets added at the right place.\n>\n>>> + subdir++;\n>>> + }\n>>> + if (!ce)\n>>> + continue;\n>>> + set_index_entry(istate, (*nr)++, ce);\n>>\n>> then back here after recusion and add abc/def, again, after abc/xyz.\n>> Did I read this code correctly?\n>\n> After the recursion add def to at the 3rd position in the index. After\n> that it looks like:\n> abc/def\n> abc/xyz\n> def\n>\n> I hope that makes it a little clearer.\n\nIt does. Thanks.\n\n>>> + de = root_directory;\n>>> + last_de = de;\n>>> + while (de) {\n>>> + if (need_root ||\n>>> + match_pathspec_depth(&adjusted_pathspec, de->pathname, de->de_pathlen, 0, NULL)) {\n>>> + if (read_entries(istate, de, entry_offset,\n>>> + mmap, mmap_size, &nr,\n>>> + foffsetblock) < 0)\n>>> + return -1;\n>>> + } else {\n>>> + for (i = 0; i < de->de_nsubtrees; i++) {\n>>> + last_de->next = de->sub[i];\n>>> + last_de = last_de->next;\n>>> + }\n>>> + }\n>>> + de = de->next;\n>>\n>> I'm missing something here. read_entries is a function that reads all\n>> entries inside \"de\" including subdirectories and the first \"de\" is\n>> root_directory, which makes it read the whole index in.\n>\n> It does, except when the adjusted_pathspec doesn't match the\n> root_directory. In that case all the subdirectories of the\n> root_directory are added to a queue, which will then be iterated over\n> and tried to match with the adjusted_pathspec.\n\nThat's what I missed. Thanks.\n-- \nDuy\n"},{"id":"225586","messageId":"CACsJy8A_gJXUm2WVPCXDZbWFCusvyoEUJaGJT_ROC9uzxc_A6w@mail.gmail.com","threadId":"34724","inReplyTo":"1376854933-31241-24-git-send-email-t.gummerer@gmail.com","subject":"Re: [PATCH v3 23/24] introduce GIT_INDEX_VERSION environment variable","fromName":"Duy Nguyen","fromEmail":"pclouds@gmail.com","sentAt":"2013-08-21T00:57:51Z","receivedAt":"2013-08-21T00:57:51Z","isPatch":true,"sender":{"key":"pclouds@gmail.com","avatar":"https://avatars.githubusercontent.com/u/720?v=4"},"body":"On Mon, Aug 19, 2013 at 2:42 AM, Thomas Gummerer wrote:\n> Respect a GIT_INDEX_VERSION environment variable, when a new index is\n> initialized. Setting the environment variable will not cause existing\n> index files to be converted to another format for additional safety.\n>\n> Signed-off-by: Thomas Gummerer \n> ---\n> read-cache.c | 9 +++++++--\n> 1 file changed, 7 insertions(+), 2 deletions(-)\n\nThere should be a line or two about this variable in git.txt, section\n\"Environment variables\". We could even have core.defaultIndexVersion\nfor people who don't want to set environment variables (and set this\nkey in ~/.gitconfig instead) but this is not important now.\n-- \nDuy\n"},{"id":"225592","messageId":"87r4dn4ucc.fsf@gmail.com","threadId":"34724","inReplyTo":"xmqqr4do5fd8.fsf@gitster.dls.corp.google.com","subject":"Re: [PATCH v3 02/24] read-cache: use fixed width integer types","fromName":"Thomas Gummerer","fromEmail":"t.gummerer@gmail.com","sentAt":"2013-08-21T03:05:07Z","receivedAt":"2013-08-21T03:05:07Z","isPatch":true,"sender":{"key":"t.gummerer@gmail.com","avatar":"https://avatars.githubusercontent.com/u/191004?v=4"},"body":"Junio C Hamano writes:\n\n> Thomas Gummerer writes:\n>\n>> Use the fixed width integer types uint16_t and uint32_t for ondisk\n>> structures, because unsigned short and unsigned int do not hae a\n>> guaranteed size.\n>\n> This sounds like an independent fix to me. I'd queue this early\n> independent from the rest of the series.\n>\n> Thanks.\n\nSounds good to me. Thanks.\n\n>>\n>> Signed-off-by: Thomas Gummerer \n>> ---\n>> cache.h | 10 +++++-----\n>> read-cache.c | 30 +++++++++++++++---------------\n>> 2 files changed, 20 insertions(+), 20 deletions(-)\n>>\n>> diff --git a/cache.h b/cache.h\n>> index bd6fb9f..9ef778a 100644\n>> --- a/cache.h\n>> +++ b/cache.h\n>> @@ -101,9 +101,9 @@ unsigned long git_deflate_bound(git_zstream *, unsigned long);\n>> \n>> #define CACHE_SIGNATURE 0x44495243\t/* \"DIRC\" */\n>> struct cache_header {\n>> -\tunsigned int hdr_signature;\n>> -\tunsigned int hdr_version;\n>> -\tunsigned int hdr_entries;\n>> +\tuint32_t hdr_signature;\n>> +\tuint32_t hdr_version;\n>> +\tuint32_t hdr_entries;\n>> };\n>> \n>> #define INDEX_FORMAT_LB 2\n>> @@ -115,8 +115,8 @@ struct cache_header {\n>> * check it for equality in the 32 bits we save.\n>> */\n>> struct cache_time {\n>> -\tunsigned int sec;\n>> -\tunsigned int nsec;\n>> +\tuint32_t sec;\n>> +\tuint32_t nsec;\n>> };\n>> \n>> struct stat_data {\n>> diff --git a/read-cache.c b/read-cache.c\n>> index ceaf207..0df5b31 100644\n>> --- a/read-cache.c\n>> +++ b/read-cache.c\n>> @@ -1230,14 +1230,14 @@ static struct cache_entry *refresh_cache_entry(struct cache_entry *ce, int reall\n>> struct ondisk_cache_entry {\n>> \tstruct cache_time ctime;\n>> \tstruct cache_time mtime;\n>> -\tunsigned int dev;\n>> -\tunsigned int ino;\n>> -\tunsigned int mode;\n>> -\tunsigned int uid;\n>> -\tunsigned int gid;\n>> -\tunsigned int size;\n>> +\tuint32_t dev;\n>> +\tuint32_t ino;\n>> +\tuint32_t mode;\n>> +\tuint32_t uid;\n>> +\tuint32_t gid;\n>> +\tuint32_t size;\n>> \tunsigned char sha1[20];\n>> -\tunsigned short flags;\n>> +\tuint16_t flags;\n>> \tchar name[FLEX_ARRAY]; /* more */\n>> };\n>> \n>> @@ -1249,15 +1249,15 @@ struct ondisk_cache_entry {\n>> struct ondisk_cache_entry_extended {\n>> \tstruct cache_time ctime;\n>> \tstruct cache_time mtime;\n>> -\tunsigned int dev;\n>> -\tunsigned int ino;\n>> -\tunsigned int mode;\n>> -\tunsigned int uid;\n>> -\tunsigned int gid;\n>> -\tunsigned int size;\n>> +\tuint32_t dev;\n>> +\tuint32_t ino;\n>> +\tuint32_t mode;\n>> +\tuint32_t uid;\n>> +\tuint32_t gid;\n>> +\tuint32_t size;\n>> \tunsigned char sha1[20];\n>> -\tunsigned short flags;\n>> -\tunsigned short flags2;\n>> +\tuint16_t flags;\n>> +\tuint16_t flags2;\n>> \tchar name[FLEX_ARRAY]; /* more */\n>> };\n"},{"id":"225593","messageId":"87ob8r4ua0.fsf@gmail.com","threadId":"34724","inReplyTo":"xmqqmwoc5f6t.fsf@gitster.dls.corp.google.com","subject":"Re: [PATCH v3 04/24] read-cache: clear version in discard_index()","fromName":"Thomas Gummerer","fromEmail":"t.gummerer@gmail.com","sentAt":"2013-08-21T03:06:31Z","receivedAt":"2013-08-21T03:06:31Z","isPatch":true,"sender":{"key":"t.gummerer@gmail.com","avatar":"https://avatars.githubusercontent.com/u/191004?v=4"},"body":"Junio C Hamano writes:\n\n> Thomas Gummerer writes:\n>\n>> All fields except index_state->version are reset in discard_index.\n>> Reset the version too.\n>\n> What is the practical consequence of not clearing this field? I\n> somehow have a feeling that this was done deliberately, so that we\n> can stick to the version of the index file format better, once the\n> user said \"update-index --index-version $N\" to set it up. I suspect\n> that the patch would affect a codepath that does read_cache(), calls\n> discard_index(), populates the index and then does write_cache().\n> We stick to the version the user specified earlier in our current\n> code, while the patched code will revert to whatever default built\n> into your Git binary, no?\n\nYeah you're right, I missed that use-case. I'll drop this patch from\nthe re-roll. Sorry for the noise.\n\n>>\n>> Signed-off-by: Thomas Gummerer \n>> ---\n>> read-cache.c | 1 +\n>> 1 file changed, 1 insertion(+)\n>>\n>> diff --git a/read-cache.c b/read-cache.c\n>> index de0bbcd..1e22f6f 100644\n>> --- a/read-cache.c\n>> +++ b/read-cache.c\n>> @@ -1558,6 +1558,7 @@ int discard_index(struct index_state *istate)\n>> \tfor (i = 0; i < istate->cache_nr; i++)\n>> \t\tfree(istate->cache[i]);\n>> \tresolve_undo_clear_index(istate);\n>> +\tistate->version = 0;\n>> \tistate->cache_nr = 0;\n>> \tistate->cache_changed = 0;\n>> \tistate->timestamp.sec = 0;\n"},{"id":"225596","messageId":"87li3v4rqg.fsf@gmail.com","threadId":"34724","inReplyTo":"CACsJy8A_gJXUm2WVPCXDZbWFCusvyoEUJaGJT_ROC9uzxc_A6w@mail.gmail.com","subject":"Re: [PATCH v3 23/24] introduce GIT_INDEX_VERSION environment variable","fromName":"Thomas Gummerer","fromEmail":"t.gummerer@gmail.com","sentAt":"2013-08-21T04:01:27Z","receivedAt":"2013-08-21T04:01:27Z","isPatch":true,"sender":{"key":"t.gummerer@gmail.com","avatar":"https://avatars.githubusercontent.com/u/191004?v=4"},"body":"Duy Nguyen writes:\n\n> On Mon, Aug 19, 2013 at 2:42 AM, Thomas Gummerer wrote:\n>> Respect a GIT_INDEX_VERSION environment variable, when a new index is\n>> initialized. Setting the environment variable will not cause existing\n>> index files to be converted to another format for additional safety.\n>>\n>> Signed-off-by: Thomas Gummerer \n>> ---\n>> read-cache.c | 9 +++++++--\n>> 1 file changed, 7 insertions(+), 2 deletions(-)\n>\n> There should be a line or two about this variable in git.txt, section\n> \"Environment variables\". We could even have core.defaultIndexVersion\n> for people who don't want to set environment variables (and set this\n> key in ~/.gitconfig instead) but this is not important now.\n\nOk, I'll add it in git.txt. I agree, core.defaultIndexVersion can still\nbe done in a follow-up patch, the environment variable is the important\nthing now because it's used for testing. Existing repositories have to\nbe converted with git-update-index anyway.\n"},{"id":"225751","messageId":"CACsJy8CdEvs1o0-iDbtojLC3tMVXWp64X9zaYy7=LT5cxxN_SQ@mail.gmail.com","threadId":"34724","inReplyTo":"1376854933-31241-16-git-send-email-t.gummerer@gmail.com","subject":"Re: [PATCH v3 15/24] read-cache: read index-v5","fromName":"Duy Nguyen","fromEmail":"pclouds@gmail.com","sentAt":"2013-08-23T23:52:57Z","receivedAt":"2013-08-23T23:52:57Z","isPatch":true,"sender":{"key":"pclouds@gmail.com","avatar":"https://avatars.githubusercontent.com/u/720?v=4"},"body":"Nit, add_part_to_conflict_entry(), create_new_conflict() and related\nstructures/macros are not used in this patch. The first caller is in\nthe next patch (read resolve-undo data).\n--\nDuy\n"},{"id":"225759","messageId":"CACsJy8Br8EaEtoZeaz2eLKvxDmPJqUc02bYsL_OSLJvJ2dBU-g@mail.gmail.com","threadId":"34724","inReplyTo":"1376854933-31241-18-git-send-email-t.gummerer@gmail.com","subject":"Re: [PATCH v3 17/24] read-cache: read cache-tree in index-v5","fromName":"Duy Nguyen","fromEmail":"pclouds@gmail.com","sentAt":"2013-08-24T00:09:33Z","receivedAt":"2013-08-24T00:09:33Z","isPatch":true,"sender":{"key":"pclouds@gmail.com","avatar":"https://avatars.githubusercontent.com/u/720?v=4"},"body":"On Mon, Aug 19, 2013 at 2:42 AM, Thomas Gummerer wrote:\n> +/*\n> + * This function modifies the directory argument that is given to it.\n> + * Don't use it if the directory entries are still needed after.\n> + */\n\nThere goes my hope of keeping directory_entry* in core so that at\nwrite-time, after validation, we only need to recreate some trees\ninstead of all of them..\n\nOr we could make cache-tree keep references to directory_entry. If a\ncache-tree is not invalidated, then the attached directory_tree should\nbe reused..\n\n> +static struct cache_tree *cache_tree_convert_v5(struct directory_entry *de)\n> +{\n> + if (!de->de_nentries)\n> + return NULL;\n> + sort_directories(de);\n> + return convert_one(de);\n> +}\n> +\n> static int read_entries(struct index_state *istate, struct directory_entry *de,\n> unsigned int first_entry_offset, void *mmap,\n> unsigned long mmap_size, unsigned int *nr,\n> @@ -591,6 +668,7 @@ static int read_index_v5(struct index_state *istate, void *mmap,\n> }\n> de = de->next;\n> }\n> + istate->cache_tree = cache_tree_convert_v5(root_directory);\n> istate->cache_nr = nr;\n> return 0;\n> }\n\nOtherwise we do need to free root_directory down to the deepest\nsubtrees, I think. People have been complaining about read-cache\nleaking memory like mad, so this is a real issue. Even if you keep\nreferences in cache-tree, you still need to free it\ncache_tree_invalidate_path() to avoid leaking\n-- \nDuy\n"},{"id":"225768","messageId":"CACsJy8BocjJqgyJwa8DzwiNdmpu-yJH9vVuEPunxjtRyr-rxYA@mail.gmail.com","threadId":"34724","inReplyTo":"1376854933-31241-19-git-send-email-t.gummerer@gmail.com","subject":"Re: [PATCH v3 18/24] read-cache: write index-v5","fromName":"Duy Nguyen","fromEmail":"pclouds@gmail.com","sentAt":"2013-08-24T03:58:44Z","receivedAt":"2013-08-24T03:58:44Z","isPatch":true,"sender":{"key":"pclouds@gmail.com","avatar":"https://avatars.githubusercontent.com/u/720?v=4"},"body":"On Mon, Aug 19, 2013 at 2:42 AM, Thomas Gummerer wrote:\n> +char *super_directory(const char *filename)\n> +{\n> + char *slash;\n> +\n> + slash = strrchr(filename, '/');\n> + if (slash)\n> + return xmemdupz(filename, slash-filename);\n> + return NULL;\n> +}\n> +\n\nWhy is this function not static? There are a few other in this patch\n(I did not notice in others, but I wasn't looking for them..)\n\nBut isn't this what dirname() is?\n\nAnother point about this function is it returns a new allocated\nstring, but I see no free() anywhere in this patch. Leak alert!\n\n> +struct directory_entry *init_directory_entry(char *pathname, int len)\n> +{\n> + struct directory_entry *de = xmalloc(directory_entry_size(len));\n> +\n> + memcpy(de->pathname, pathname, len);\n> + de->pathname[len] = '\\0';\n> + de->de_flags = 0;\n> + de->de_foffset = 0;\n> + de->de_cr = 0;\n> + de->de_ncr = 0;\n> + de->de_nsubtrees = 0;\n> + de->de_nfiles = 0;\n> + de->de_nentries = 0;\n> + memset(de->sha1, 0, 20);\n> + de->de_pathlen = len;\n> + de->next = NULL;\n> + de->next_hash = NULL;\n> + de->ce = NULL;\n> + de->ce_last = NULL;\n> + de->conflict = NULL;\n> + de->conflict_last = NULL;\n> + de->conflict_size = 0;\n> + return de;\n> +}\n\nI think this function could be shortened to\n\nstruct directory_entry *de = xcalloc(1, directory_entry_size(len));\nmemcpy(de->pathname, pathname, len);\nde->de_pathlen = len;\nreturn de;\n\n> +static struct directory_entry *get_directory(char *dir, unsigned int dir_len,\n> + struct hash_table *table,\n> + unsigned int *total_dir_len,\n> + unsigned int *ndir,\n> + struct directory_entry **current)\n> +{\n> + struct directory_entry *tmp = NULL, *search, *new, *ret;\n> + uint32_t crc;\n> +\n> + search = find_directory(dir, dir_len, &crc, table);\n> + if (search)\n> + return search;\n> + while (!search) {\n> + new = init_directory_entry(dir, dir_len);\n> + insert_directory_entry(new, table, total_dir_len, ndir, crc);\n> + if (!tmp)\n> + ret = new;\n> + else\n> + new->de_nsubtrees = 1;\n> + new->next = tmp;\n> + tmp = new;\n> + dir = super_directory(dir);\n\nIt feels more natural to create directory_entry(s) from parent to\nsubdir. If you do so you could reset dir to the remaining of directory\nand perform strchr() and do not need to allocate new memory everytime\nyou call super_directory (because it relies on NUL at the end of the\nstring).\n\n> + dir_len = dir ? strlen(dir) : 0;\n> + search = find_directory(dir, dir_len, &crc, table);\n> + }\n> + search->de_nsubtrees++;\n> + (*current)->next = tmp;\n> + while ((*current)->next)\n> + *current = (*current)->next;\n> +\n> + return ret;\n> +}\n\n> +static struct directory_entry *compile_directory_data(struct index_state *istate,\n> + int nfile,\n> + unsigned int *ndir,\n> + unsigned int *total_dir_len,\n> + unsigned int *total_file_len)\n> +{\n> + int i, dir_len = -1;\n> + char *dir;\n> + struct directory_entry *de, *current, *search;\n> + struct cache_entry **cache = istate->cache;\n> + struct conflict_entry *conflict_entry;\n> + struct hash_table table;\n> + uint32_t crc;\n> +\n> + init_hash(&table);\n> + de = init_directory_entry(\"\", 0);\n> + current = de;\n> + *ndir = 1;\n> + *total_dir_len = 1;\n> + crc = crc32(0, (Bytef*)de->pathname, de->de_pathlen);\n> + insert_hash(crc, de, &table);\n> + conflict_entry = NULL;\n> + for (i = 0; i < nfile; i++) {\n> + if (cache[i]->ce_flags & CE_REMOVE)\n> + continue;\n> +\n> + if (dir_len < 0\n> + || cache[i]->name[dir_len] != '/'\n\nNeed a check to make sure name[dir_len] is not out of bound\n\n> + || strchr(cache[i]->name + dir_len + 1, '/')\n> + || cache_name_compare(cache[i]->name, ce_namelen(cache[i]),\n> + dir, dir_len)) {\n\nIn my opinon, \"if (dir_len < 0 || !(must && be && a && subdirectory))\"\nis easier to read..\n\n> + dir = super_directory(cache[i]->name);\n> + dir_len = dir ? strlen(dir) : 0;\n> + search = get_directory(dir, dir_len, &table,\n> + total_dir_len, ndir,\n> + ¤t);\n> + }\n> + search->de_nfiles++;\n> + *total_file_len += ce_namelen(cache[i]) + 1;\n> + if (search->de_pathlen)\n> + *total_file_len -= search->de_pathlen + 1;\n> + ce_queue_push(&(search->ce), &(search->ce_last), cache[i]);\n> +\n> + if (ce_stage(cache[i]) > 0) {\n> + struct conflict_part *conflict_part;\n> + if (!conflict_entry ||\n> + cache_name_compare(conflict_entry->name, conflict_entry->namelen,\n> + cache[i]->name, ce_namelen(cache[i]))) {\n> + conflict_entry = create_conflict_entry_from_ce(cache[i], search->de_pathlen);\n> + add_conflict_to_directory_entry(search, conflict_entry);\n> + }\n> + conflict_part = conflict_part_from_inmemory(cache[i]);\n> + add_part_to_conflict_entry(search, conflict_entry, conflict_part);\n> + }\n> + }\n> + return de;\n> +}\n> +\n\n> +static int write_directories(struct directory_entry *de, int fd, int conflict_offset)\n> +{\n> + struct directory_entry *current;\n> + struct ondisk_directory_entry ondisk;\n> + int current_offset, offset_write, ondisk_size, foffset;\n> + uint32_t crc;\n> +\n> + /*\n> + * This is needed because the compiler aligns structs to sizes multiple\n> + * of 4\n> + */\n> + ondisk_size = sizeof(ondisk.flags)\n> + + sizeof(ondisk.foffset)\n> + + sizeof(ondisk.cr)\n> + + sizeof(ondisk.ncr)\n> + + sizeof(ondisk.nsubtrees)\n> + + sizeof(ondisk.nfiles)\n> + + sizeof(ondisk.nentries)\n> + + sizeof(ondisk.sha1);\n> + current = de;\n> + current_offset = 0;\n> + foffset = 0;\n> + while (current) {\n> + int pathlen;\n> +\n> + offset_write = htonl(current_offset);\n> + if (ce_write(NULL, fd, &offset_write, 4) < 0)\n> + return -1;\n> + if (current->de_pathlen == 0)\n> + pathlen = 0;\n> + else\n> + pathlen = current->de_pathlen + 1;\n> + current_offset += pathlen + 1 + ondisk_size + 4;\n> + current = current->next;\n> + }\n> + /*\n> + * Write one more offset, which points to the end of the entries,\n> + * because we use it for calculating the dir length, instead of\n> + * using strlen.\n> + */\n> + offset_write = htonl(current_offset);\n> + if (ce_write(NULL, fd, &offset_write, 4) < 0)\n> + return -1;\n> + current = de;\n> + while (current) {\n> + crc = 0;\n> + if (current->de_pathlen == 0) {\n> + if (ce_write(&crc, fd, current->pathname, 1) < 0)\n> + return -1;\n> + } else {\n> + char *path;\n> + path = xmalloc(sizeof(char) * (current->de_pathlen + 2));\n> + memcpy(path, current->pathname, current->de_pathlen);\n> + memcpy(path + current->de_pathlen, \"/\\0\", 2);\n> + if (ce_write(&crc, fd, path, current->de_pathlen + 2) < 0)\n> + return -1;\n\nxmalloc without free\n\n> + }\n> + current->de_foffset = foffset;\n> + current->de_cr = conflict_offset;\n> + ondisk_from_directory_entry(current, &ondisk);\n> + if (ce_write(&crc, fd, &ondisk, ondisk_size) < 0)\n> + return -1;\n> + crc = htonl(crc);\n> + if (ce_write(NULL, fd, &crc, 4) < 0)\n> + return -1;\n> + conflict_offset += current->conflict_size;\n> + foffset += current->de_nfiles * 4;\n> + current = current->next;\n> + }\n> + return 0;\n> +}\n> +\n> +static int write_entries(struct index_state *istate,\n> + struct directory_entry *de,\n> + int entries,\n> + int fd,\n> + int offset_to_offset)\n> +{\n> + int offset, offset_write, ondisk_size;\n> + struct directory_entry *current;\n> +\n> + offset = 0;\n> + ondisk_size = sizeof(struct ondisk_cache_entry);\n> + current = de;\n> + while (current) {\n\nA short comment a the beginning of this block saying this writes\nfileoffsets table would be nice.\n\n> + int pathlen;\n> + struct cache_entry *ce = current->ce;\n> +\n> + if (current->de_pathlen == 0)\n> + pathlen = 0;\n> + else\n> + pathlen = current->de_pathlen + 1;\n> + while (ce) {\n> + if (ce->ce_flags & CE_REMOVE)\n> + continue;\n\nHow come CE_REMOVE'd entries get here? I thought they were all ignored\nat compile_directory_data()\n\n> + if (!ce_uptodate(ce) && is_racy_timestamp(istate, ce))\n> + ce_smudge_racily_clean_entry(ce);\n> + if (is_null_sha1(ce->sha1))\n> + return error(\"cache entry has null sha1: %s\", ce->name);\n> +\n> + offset_write = htonl(offset);\n> + if (ce_write(NULL, fd, &offset_write, 4) < 0)\n> + return -1;\n> + offset += ce_namelen(ce) - pathlen + 1 + ondisk_size + 4;\n> + ce = ce->next_ce;\n> + }\n> + current = current->next;\n> + }\n> + /*\n> + * Write one more offset, which points to the end of the entries,\n> + * because we use it for calculating the file length, instead of\n> + * using strlen.\n> + */\n> + offset_write = htonl(offset);\n> + if (ce_write(NULL, fd, &offset_write, 4) < 0)\n> + return -1;\n> +\n> + offset = offset_to_offset;\n> + current = de;\n> + while (current) {\n> + int pathlen;\n> + struct cache_entry *ce = current->ce;\n> +\n> + if (current->de_pathlen == 0)\n> + pathlen = 0;\n> + else\n> + pathlen = current->de_pathlen + 1;\n> + while (ce) {\n> + struct ondisk_cache_entry ondisk;\n> + uint32_t crc, calc_crc;\n> +\n> + if (ce->ce_flags & CE_REMOVE)\n> + continue;\n> + calc_crc = htonl(offset);\n> + crc = crc32(0, (Bytef*)&calc_crc, 4);\n> + if (ce_write(&crc, fd, ce->name + pathlen,\n> + ce_namelen(ce) - pathlen + 1) < 0)\n> + return -1;\n> + ondisk_from_cache_entry(ce, &ondisk);\n> + if (ce_write(&crc, fd, &ondisk, ondisk_size) < 0)\n> + return -1;\n> + crc = htonl(crc);\n> + if (ce_write(NULL, fd, &crc, 4) < 0)\n> + return -1;\n> + offset += 4;\n> + ce = ce->next_ce;\n> + }\n> + current = current->next;\n> + }\n> + return 0;\n> +}\n\n> +static int write_index_v5(struct index_state *istate, int newfd)\n> +{\n> + struct cache_header hdr;\n> + struct cache_header_v5 hdr_v5;\n> + struct cache_entry **cache = istate->cache;\n> + struct directory_entry *de;\n> + struct ondisk_directory_entry *ondisk;\n> + unsigned int entries = istate->cache_nr;\n> + unsigned int i, removed, total_dir_len, ondisk_directory_size;\n> + unsigned int total_file_len, conflict_offset, foffsetblock;\n> + unsigned int ndir;\n> + uint32_t crc;\n> +\n> + if (istate->filter_opts)\n> + die(\"BUG: index: cannot write a partially read index\");\n> +\n> + for (i = removed = 0; i < entries; i++) {\n> + if (cache[i]->ce_flags & CE_REMOVE)\n> + removed++;\n> + }\n> + hdr.hdr_signature = htonl(CACHE_SIGNATURE);\n> + hdr.hdr_version = htonl(istate->version);\n> + hdr.hdr_entries = htonl(entries - removed);\n> + hdr_v5.hdr_nextension = htonl(0); /* Currently no extensions are supported */\n> +\n> + total_dir_len = 0;\n> + total_file_len = 0;\n> + de = compile_directory_data(istate, entries, &ndir,\n> + &total_dir_len, &total_file_len);\n> + hdr_v5.hdr_ndir = htonl(ndir);\n> +\n> + /*\n> + * This is needed because the compiler aligns structs to sizes multipe\n> + * of 4\n> + */\n> + ondisk_directory_size = sizeof(ondisk->flags)\n> + + sizeof(ondisk->foffset)\n> + + sizeof(ondisk->cr)\n> + + sizeof(ondisk->ncr)\n> + + sizeof(ondisk->nsubtrees)\n> + + sizeof(ondisk->nfiles)\n> + + sizeof(ondisk->nentries)\n> + + sizeof(ondisk->sha1);\n\nThere is a similar statement in read code. This calls for a macro to\nshare this sum.\n\n> + foffsetblock = sizeof(hdr) + sizeof(hdr_v5) + 4\n> + + (ndir + 1) * 4\n> + + total_dir_len\n> + + ndir * (ondisk_directory_size + 4);\n> + hdr_v5.hdr_fblockoffset = htonl(foffsetblock + (entries - removed + 1) * 4);\n> + crc = 0;\n> + if (ce_write(&crc, newfd, &hdr, sizeof(hdr)) < 0)\n> + return -1;\n> + if (ce_write(&crc, newfd, &hdr_v5, sizeof(hdr_v5)) < 0)\n> + return -1;\n> + crc = htonl(crc);\n> + if (ce_write(NULL, newfd, &crc, 4) < 0)\n> + return -1;\n> +\n> + conflict_offset = foffsetblock +\n> + + (entries - removed + 1) * 4\n> + + total_file_len\n> + + (entries - removed) * (sizeof(struct ondisk_cache_entry) + 4);\n> + if (write_directories(de, newfd, conflict_offset) < 0)\n> + return -1;\n> + if (write_entries(istate, de, entries, newfd, foffsetblock) < 0)\n> + return -1;\n> + if (write_conflicts(istate, de, newfd) < 0)\n> + return -1;\n> + return ce_flush(newfd);\n> +}\n-- \nDuy\n"},{"id":"225773","messageId":"CACsJy8C8rpz2zNvKB_MEbUShKGMfknDO10C47y3YDV-0-hFKLg@mail.gmail.com","threadId":"34724","inReplyTo":"1376854933-31241-19-git-send-email-t.gummerer@gmail.com","subject":"Re: [PATCH v3 18/24] read-cache: write index-v5","fromName":"Duy Nguyen","fromEmail":"pclouds@gmail.com","sentAt":"2013-08-24T04:07:46Z","receivedAt":"2013-08-24T04:07:46Z","isPatch":true,"sender":{"key":"pclouds@gmail.com","avatar":"https://avatars.githubusercontent.com/u/720?v=4"},"body":"On Mon, Aug 19, 2013 at 2:42 AM, Thomas Gummerer wrote:\n> Write the index version 5 file format to disk. This version doesn't\n> write the cache-tree data and resolve-undo data to the file.\n\nI keep having things to add after sending my emails. Now that we have\nall conflicted entries in file block, the conflict data block becomes\noptional, it functions exactly (I think) like resolve-undo extension,\nwhich makes me think it might make sense to make conflict data block\nan extension.\n\nIf we make it so, we might want to move \"cr\" and \"ncr\" fields out of\ndirentries. I don't see a solution yet, but I think it's interesting\nbecause future extensions might want to attach stuff to direntries,\njust like \"cr\"/\"ncr\" from conflict extension. We may want to think now\nhow that might be done (and conflict extension is a good exercise to\nsee how it works out)\n-- \nDuy\nI\n"},{"id":"225774","messageId":"CACsJy8AkvUiJhjYVCuMrNwZPR7AiO-CZFazvOG-mVO=+Qq9O3Q@mail.gmail.com","threadId":"34724","inReplyTo":"1376854933-31241-1-git-send-email-t.gummerer@gmail.com","subject":"Re: [PATCH v3 00/24] Index-v5","fromName":"Duy Nguyen","fromEmail":"pclouds@gmail.com","sentAt":"2013-08-24T04:16:07Z","receivedAt":"2013-08-24T04:16:07Z","isPatch":true,"sender":{"key":"pclouds@gmail.com","avatar":"https://avatars.githubusercontent.com/u/720?v=4"},"body":"On Mon, Aug 19, 2013 at 2:41 AM, Thomas Gummerer wrote:\n> Hi,\n>\n> previous rounds (without api) are at $gmane/202752, $gmane/202923,\n> $gmane/203088 and $gmane/203517, the previous rounds with api were at\n> $gmane/229732 and $gmane/230210. Thanks to Duy for reviewing the the\n> last round and Junio and Ramsay for additional comments.\n\nI'm done reviewing this version (I neglected the extension writing\npatches because after spending hours on the main write patch I don't\nwant to look at them anymore :p). Now that rc period is over, with a\npartial write proof-of-concept, I think it's enough to call Junio's\nattention on the series, see if we have any chance of merging it. The\npartial write POC is needed to make sure we don't overlook anything,\njust support update-index is enough.\n-- \nDuy\n"},{"id":"225791","messageId":"CACsJy8A_Gn1996BFF4D-apc+PsfXL5EO+tKetuqZ0cFfUnqb+w@mail.gmail.com","threadId":"34724","inReplyTo":"CACsJy8C8rpz2zNvKB_MEbUShKGMfknDO10C47y3YDV-0-hFKLg@mail.gmail.com","subject":"Re: [PATCH v3 18/24] read-cache: write index-v5","fromName":"Duy Nguyen","fromEmail":"pclouds@gmail.com","sentAt":"2013-08-24T09:56:51Z","receivedAt":"2013-08-24T09:56:51Z","isPatch":true,"sender":{"key":"pclouds@gmail.com","avatar":"https://avatars.githubusercontent.com/u/720?v=4"},"body":"On Sat, Aug 24, 2013 at 11:07 AM, Duy Nguyen wrote:\n> On Mon, Aug 19, 2013 at 2:42 AM, Thomas Gummerer wrote:\n>> Write the index version 5 file format to disk. This version doesn't\n>> write the cache-tree data and resolve-undo data to the file.\n>\n> I keep having things to add after sending my emails. Now that we have\n> all conflicted entries in file block, the conflict data block becomes\n> optional, it functions exactly (I think) like resolve-undo extension,\n> which makes me think it might make sense to make conflict data block\n> an extension.\n>\n> If we make it so, we might want to move \"cr\" and \"ncr\" fields out of\n> direntries. I don't see a solution yet, but I think it's interesting\n> because future extensions might want to attach stuff to direntries,\n> just like \"cr\"/\"ncr\" from conflict extension. We may want to think now\n> how that might be done (and conflict extension is a good exercise to\n> see how it works out)\n\nAnd the solution is pretty obvious: keep resolve-undo extension as\n_extension_ just like in v2 (and no \"cr/ncr\" in direntries). The only\ndifference is the time resolve-undo extension is updated: in v2, new\nentries are added at remove_index_entry_at(), in v5 new entries are\nadded when new stage entries are detected at write_index().\n-- \nDuy\n"},{"id":"225803","messageId":"xmqq61uuo4dl.fsf@gitster.dls.corp.google.com","threadId":"34724","inReplyTo":"CACsJy8AkvUiJhjYVCuMrNwZPR7AiO-CZFazvOG-mVO=+Qq9O3Q@mail.gmail.com","subject":"Re: [PATCH v3 00/24] Index-v5","fromName":"Junio C Hamano","fromEmail":"gitster@pobox.com","sentAt":"2013-08-25T03:07:02Z","receivedAt":"2013-08-25T03:07:02Z","isPatch":true,"sender":{"key":"gitster@pobox.com","avatar":"https://avatars.githubusercontent.com/u/54884?v=4"},"body":"Duy Nguyen writes:\n\n> On Mon, Aug 19, 2013 at 2:41 AM, Thomas Gummerer wrote:\n>\n> I'm done reviewing this version (I neglected the extension writing\n> patches because after spending hours on the main write patch I don't\n> want to look at them anymore :p). Now that rc period is over, with a\n> partial write proof-of-concept, I think it's enough to call Junio's\n> attention on the series, see if we have any chance of merging it. The\n> partial write POC is needed to make sure we don't overlook anything,\n> just support update-index is enough.\n\nI've been following the review comment threads after looking at the\npatches myself when they were posted. I was hoping to see some API\nimprovement over the current \"we (have to) have everything available\nin-core in a flat array\" model, which gives a lot of convenience and\nIO overhead at the same time, that would make me say \"yes, this\noperation, that we need to do very often, will certainly be helped\nby this new API, and in order to support that style of API better,\nthe current file format is inadequate and we do need to go to the\nproposed tree like on-disk format\" for at least one, but\nunfortunately I haven't found any (yet).\n\nSo...\n"},{"id":"225821","messageId":"CACsJy8BgQxefys0h7ZfiLP3zrGnEqtkiUoe4GkBAEi+JnojT9A@mail.gmail.com","threadId":"34724","inReplyTo":"xmqq61uuo4dl.fsf@gitster.dls.corp.google.com","subject":"Re: [PATCH v3 00/24] Index-v5","fromName":"Duy Nguyen","fromEmail":"pclouds@gmail.com","sentAt":"2013-08-25T04:40:42Z","receivedAt":"2013-08-25T04:40:42Z","isPatch":true,"sender":{"key":"pclouds@gmail.com","avatar":"https://avatars.githubusercontent.com/u/720?v=4"},"body":"On Sun, Aug 25, 2013 at 10:07 AM, Junio C Hamano wrote:\n> Duy Nguyen writes:\n>\n>> On Mon, Aug 19, 2013 at 2:41 AM, Thomas Gummerer wrote:\n>>\n>> I'm done reviewing this version (I neglected the extension writing\n>> patches because after spending hours on the main write patch I don't\n>> want to look at them anymore :p). Now that rc period is over, with a\n>> partial write proof-of-concept, I think it's enough to call Junio's\n>> attention on the series, see if we have any chance of merging it. The\n>> partial write POC is needed to make sure we don't overlook anything,\n>> just support update-index is enough.\n>\n> I've been following the review comment threads after looking at the\n> patches myself when they were posted. I was hoping to see some API\n> improvement over the current \"we (have to) have everything available\n> in-core in a flat array\" model, which gives a lot of convenience and\n> IO overhead at the same time, that would make me say \"yes, this\n> operation, that we need to do very often, will certainly be helped\n> by this new API, and in order to support that style of API better,\n> the current file format is inadequate and we do need to go to the\n> proposed tree like on-disk format\" for at least one, but\n> unfortunately I haven't found any (yet).\n\nThomas is in the best position to answer this, but I'll give it a try.\nIn my opinon, v2-4 works well for moderate-sized worktrees, v5 aims to\nmake the index scale better. One way to make it scale is not to read\nthe whole index up when you only need a portion of the index.\nread_index_filtered() enables this. We could implement\nread_index_filtered() on v2 too, but because v2 lacks proper data\nstructure to support it, we need to scan through all on-disk entries.\n\"git diff\" and \"git status\" with pathspec may benefit from this (and\nfor large worktrees, people better use pathspec than whole-tree\n\"status\"). The flat (but not full) array model seems best fit because\nwe still need to support v2. Another v5 improvement is fast \"git add\n-u/git commit -a\" when partial write is implemented. I don't think\nsuch a patch is posted. There may be API addition to aid v5 code but\nit should not be big API change.\n-- \nDuy\n"},{"id":"226404","messageId":"87vc2mo2lt.fsf@gmail.com","threadId":"34724","inReplyTo":"xmqq61uuo4dl.fsf@gitster.dls.corp.google.com","subject":"Re: [PATCH v3 00/24] Index-v5","fromName":"Thomas Gummerer","fromEmail":"t.gummerer@gmail.com","sentAt":"2013-08-31T05:23:26Z","receivedAt":"2013-08-31T05:23:26Z","isPatch":true,"sender":{"key":"t.gummerer@gmail.com","avatar":"https://avatars.githubusercontent.com/u/191004?v=4"},"body":"Junio C Hamano writes:\n\n> Duy Nguyen writes:\n>\n>> On Mon, Aug 19, 2013 at 2:41 AM, Thomas Gummerer wrote:\n>>\n>> I'm done reviewing this version (I neglected the extension writing\n>> patches because after spending hours on the main write patch I don't\n>> want to look at them anymore :p). Now that rc period is over, with a\n>> partial write proof-of-concept, I think it's enough to call Junio's\n>> attention on the series, see if we have any chance of merging it. The\n>> partial write POC is needed to make sure we don't overlook anything,\n>> just support update-index is enough.\n>\n> I've been following the review comment threads after looking at the\n> patches myself when they were posted. I was hoping to see some API\n> improvement over the current \"we (have to) have everything available\n> in-core in a flat array\" model, which gives a lot of convenience and\n> IO overhead at the same time, that would make me say \"yes, this\n> operation, that we need to do very often, will certainly be helped\n> by this new API, and in order to support that style of API better,\n> the current file format is inadequate and we do need to go to the\n> proposed tree like on-disk format\" for at least one, but\n> unfortunately I haven't found any (yet).\n>\n> So...\n\nI think the issue is a bit different. The current API, with some small\nadditions (e.g. read_index_filtered()) works well as in-memory format,\neven for partial reading/writing. I will try to write a POC for partial\nwriting to show that the current in-memory format works for this too.\nAs Duy wrote in the other email, some API changes will be necessary to\nallow that, but not a big API change moving from a flat array to a tree\nbased format.\n\nI think it comes down to \"this operation will be helped by partial\nloading/writing and we need this small API changes\n(read_index_filtered() for now, more to follow) and the index format\nchange to be able to do that\".\n\nDoes that make sense, with at least Duy's comments in the review\naddressed and a POC for partial writing?\n"},{"id":"231072","messageId":"87li0co5li.fsf@gmail.com","threadId":"34724","inReplyTo":"CACsJy8BocjJqgyJwa8DzwiNdmpu-yJH9vVuEPunxjtRyr-rxYA@mail.gmail.com","subject":"Re: [PATCH v3 18/24] read-cache: write index-v5","fromName":"Thomas Gummerer","fromEmail":"t.gummerer@gmail.com","sentAt":"2013-11-25T15:37:13Z","receivedAt":"2013-11-25T15:37:13Z","isPatch":true,"sender":{"key":"t.gummerer@gmail.com","avatar":"https://avatars.githubusercontent.com/u/191004?v=4"},"body":"\n[sorry about taking so much time to get back to you, was too busy with\nother stuff to work on git]\n\nDuy Nguyen writes:\n\n> On Mon, Aug 19, 2013 at 2:42 AM, Thomas Gummerer wrote:\n>> +char *super_directory(const char *filename)\n>> +{\n>> + char *slash;\n>> +\n>> + slash = strrchr(filename, '/');\n>> + if (slash)\n>> + return xmemdupz(filename, slash-filename);\n>> + return NULL;\n>> +}\n>> +\n>\n> Why is this function not static? There are a few other in this patch\n> (I did not notice in others, but I wasn't looking for them..)\n\nThat's just an oversight, it should be static. Will look for the others\nand change them to static too.\n\n> But isn't this what dirname() is?\n>\n> Another point about this function is it returns a new allocated\n> string, but I see no free() anywhere in this patch. Leak alert!\n\nYes, you're right, I'll use dirname instead. That also solves the free\nproblem, as dirname modifies the string. I'll still use a wrapper\naround it, because dirname returns \".\" when there is no super_directory,\nbut using NULL for that makes it simpler to check it.\n\n>> +struct directory_entry *init_directory_entry(char *pathname, int len)\n>> +{\n>> + struct directory_entry *de = xmalloc(directory_entry_size(len));\n>> +\n>> + memcpy(de->pathname, pathname, len);\n>> + de->pathname[len] = '\\0';\n>> + de->de_flags = 0;\n>> + de->de_foffset = 0;\n>> + de->de_cr = 0;\n>> + de->de_ncr = 0;\n>> + de->de_nsubtrees = 0;\n>> + de->de_nfiles = 0;\n>> + de->de_nentries = 0;\n>> + memset(de->sha1, 0, 20);\n>> + de->de_pathlen = len;\n>> + de->next = NULL;\n>> + de->next_hash = NULL;\n>> + de->ce = NULL;\n>> + de->ce_last = NULL;\n>> + de->conflict = NULL;\n>> + de->conflict_last = NULL;\n>> + de->conflict_size = 0;\n>> + return de;\n>> +}\n>\n> I think this function could be shortened to\n>\n> struct directory_entry *de = xcalloc(1, directory_entry_size(len));\n> memcpy(de->pathname, pathname, len);\n> de->de_pathlen = len;\n> return de;\n\nMakes sense, thanks.\n\n>> +static struct directory_entry *get_directory(char *dir, unsigned int dir_len,\n>> + struct hash_table *table,\n>> + unsigned int *total_dir_len,\n>> + unsigned int *ndir,\n>> + struct directory_entry **current)\n>> +{\n>> + struct directory_entry *tmp = NULL, *search, *new, *ret;\n>> + uint32_t crc;\n>> +\n>> + search = find_directory(dir, dir_len, &crc, table);\n>> + if (search)\n>> + return search;\n>> + while (!search) {\n>> + new = init_directory_entry(dir, dir_len);\n>> + insert_directory_entry(new, table, total_dir_len, ndir, crc);\n>> + if (!tmp)\n>> + ret = new;\n>> + else\n>> + new->de_nsubtrees = 1;\n>> + new->next = tmp;\n>> + tmp = new;\n>> + dir = super_directory(dir);\n>\n> It feels more natural to create directory_entry(s) from parent to\n> subdir. If you do so you could reset dir to the remaining of directory\n> and perform strchr() and do not need to allocate new memory everytime\n> you call super_directory (because it relies on NUL at the end of the\n> string).\n\nI'm creating them from subdir to parent because it saves a few calls\nwhenever a superdir is already in the hash_table. And I'm using dirname\nso the new memory allocations are not a problem anymore.\n\n>> + dir_len = dir ? strlen(dir) : 0;\n>> + search = find_directory(dir, dir_len, &crc, table);\n>> + }\n>> + search->de_nsubtrees++;\n>> + (*current)->next = tmp;\n>> + while ((*current)->next)\n>> + *current = (*current)->next;\n>> +\n>> + return ret;\n>> +}\n>\n>> +static struct directory_entry *compile_directory_data(struct index_state *istate,\n>> + int nfile,\n>> + unsigned int *ndir,\n>> + unsigned int *total_dir_len,\n>> + unsigned int *total_file_len)\n>> +{\n>> + int i, dir_len = -1;\n>> + char *dir;\n>> + struct directory_entry *de, *current, *search;\n>> + struct cache_entry **cache = istate->cache;\n>> + struct conflict_entry *conflict_entry;\n>> + struct hash_table table;\n>> + uint32_t crc;\n>> +\n>> + init_hash(&table);\n>> + de = init_directory_entry(\"\", 0);\n>> + current = de;\n>> + *ndir = 1;\n>> + *total_dir_len = 1;\n>> + crc = crc32(0, (Bytef*)de->pathname, de->de_pathlen);\n>> + insert_hash(crc, de, &table);\n>> + conflict_entry = NULL;\n>> + for (i = 0; i < nfile; i++) {\n>> + if (cache[i]->ce_flags & CE_REMOVE)\n>> + continue;\n>> +\n>> + if (dir_len < 0\n>> + || cache[i]->name[dir_len] != '/'\n>\n> Need a check to make sure name[dir_len] is not out of bound\n\nThanks.\n\n>> + || strchr(cache[i]->name + dir_len + 1, '/')\n>> + || cache_name_compare(cache[i]->name, ce_namelen(cache[i]),\n>> + dir, dir_len)) {\n>\n> In my opinon, \"if (dir_len < 0 || !(must && be && a && subdirectory))\"\n> is easier to read..\n\nMakes sense, will change.\n\n>> + dir = super_directory(cache[i]->name);\n>> + dir_len = dir ? strlen(dir) : 0;\n>> + search = get_directory(dir, dir_len, &table,\n>> + total_dir_len, ndir,\n>> + ¤t);\n>> + }\n>> + search->de_nfiles++;\n>> + *total_file_len += ce_namelen(cache[i]) + 1;\n>> + if (search->de_pathlen)\n>> + *total_file_len -= search->de_pathlen + 1;\n>> + ce_queue_push(&(search->ce), &(search->ce_last), cache[i]);\n>> +\n>> + if (ce_stage(cache[i]) > 0) {\n>> + struct conflict_part *conflict_part;\n>> + if (!conflict_entry ||\n>> + cache_name_compare(conflict_entry->name, conflict_entry->namelen,\n>> + cache[i]->name, ce_namelen(cache[i]))) {\n>> + conflict_entry = create_conflict_entry_from_ce(cache[i], search->de_pathlen);\n>> + add_conflict_to_directory_entry(search, conflict_entry);\n>> + }\n>> + conflict_part = conflict_part_from_inmemory(cache[i]);\n>> + add_part_to_conflict_entry(search, conflict_entry, conflict_part);\n>> + }\n>> + }\n>> + return de;\n>> +}\n>> +\n>\n>> +static int write_directories(struct directory_entry *de, int fd, int conflict_offset)\n>> +{\n>> + struct directory_entry *current;\n>> + struct ondisk_directory_entry ondisk;\n>> + int current_offset, offset_write, ondisk_size, foffset;\n>> + uint32_t crc;\n>> +\n>> + /*\n>> + * This is needed because the compiler aligns structs to sizes multiple\n>> + * of 4\n>> + */\n>> + ondisk_size = sizeof(ondisk.flags)\n>> + + sizeof(ondisk.foffset)\n>> + + sizeof(ondisk.cr)\n>> + + sizeof(ondisk.ncr)\n>> + + sizeof(ondisk.nsubtrees)\n>> + + sizeof(ondisk.nfiles)\n>> + + sizeof(ondisk.nentries)\n>> + + sizeof(ondisk.sha1);\n>> + current = de;\n>> + current_offset = 0;\n>> + foffset = 0;\n>> + while (current) {\n>> + int pathlen;\n>> +\n>> + offset_write = htonl(current_offset);\n>> + if (ce_write(NULL, fd, &offset_write, 4) < 0)\n>> + return -1;\n>> + if (current->de_pathlen == 0)\n>> + pathlen = 0;\n>> + else\n>> + pathlen = current->de_pathlen + 1;\n>> + current_offset += pathlen + 1 + ondisk_size + 4;\n>> + current = current->next;\n>> + }\n>> + /*\n>> + * Write one more offset, which points to the end of the entries,\n>> + * because we use it for calculating the dir length, instead of\n>> + * using strlen.\n>> + */\n>> + offset_write = htonl(current_offset);\n>> + if (ce_write(NULL, fd, &offset_write, 4) < 0)\n>> + return -1;\n>> + current = de;\n>> + while (current) {\n>> + crc = 0;\n>> + if (current->de_pathlen == 0) {\n>> + if (ce_write(&crc, fd, current->pathname, 1) < 0)\n>> + return -1;\n>> + } else {\n>> + char *path;\n>> + path = xmalloc(sizeof(char) * (current->de_pathlen + 2));\n>> + memcpy(path, current->pathname, current->de_pathlen);\n>> + memcpy(path + current->de_pathlen, \"/\\0\", 2);\n>> + if (ce_write(&crc, fd, path, current->de_pathlen + 2) < 0)\n>> + return -1;\n>\n> xmalloc without free\n\nIn the new version the pathname is included at the end of the ondisk\nstruct, for which I added a free.\n\n>> + }\n>> + current->de_foffset = foffset;\n>> + current->de_cr = conflict_offset;\n>> + ondisk_from_directory_entry(current, &ondisk);\n>> + if (ce_write(&crc, fd, &ondisk, ondisk_size) < 0)\n>> + return -1;\n>> + crc = htonl(crc);\n>> + if (ce_write(NULL, fd, &crc, 4) < 0)\n>> + return -1;\n>> + conflict_offset += current->conflict_size;\n>> + foffset += current->de_nfiles * 4;\n>> + current = current->next;\n>> + }\n>> + return 0;\n>> +}\n>> +\n>> +static int write_entries(struct index_state *istate,\n>> + struct directory_entry *de,\n>> + int entries,\n>> + int fd,\n>> + int offset_to_offset)\n>> +{\n>> + int offset, offset_write, ondisk_size;\n>> + struct directory_entry *current;\n>> +\n>> + offset = 0;\n>> + ondisk_size = sizeof(struct ondisk_cache_entry);\n>> + current = de;\n>> + while (current) {\n>\n> A short comment a the beginning of this block saying this writes\n> fileoffsets table would be nice.\n\nDone, thanks.\n\n>> + int pathlen;\n>> + struct cache_entry *ce = current->ce;\n>> +\n>> + if (current->de_pathlen == 0)\n>> + pathlen = 0;\n>> + else\n>> + pathlen = current->de_pathlen + 1;\n>> + while (ce) {\n>> + if (ce->ce_flags & CE_REMOVE)\n>> + continue;\n>\n> How come CE_REMOVE'd entries get here? I thought they were all ignored\n> at compile_directory_data()\n\nThey don't, I've added this line unnecessarily. Will remove it.\n\n>> + if (!ce_uptodate(ce) && is_racy_timestamp(istate, ce))\n>> + ce_smudge_racily_clean_entry(ce);\n>> + if (is_null_sha1(ce->sha1))\n>> + return error(\"cache entry has null sha1: %s\", ce->name);\n>> +\n>> + offset_write = htonl(offset);\n>> + if (ce_write(NULL, fd, &offset_write, 4) < 0)\n>> + return -1;\n>> + offset += ce_namelen(ce) - pathlen + 1 + ondisk_size + 4;\n>> + ce = ce->next_ce;\n>> + }\n>> + current = current->next;\n>> + }\n>> + /*\n>> + * Write one more offset, which points to the end of the entries,\n>> + * because we use it for calculating the file length, instead of\n>> + * using strlen.\n>> + */\n>> + offset_write = htonl(offset);\n>> + if (ce_write(NULL, fd, &offset_write, 4) < 0)\n>> + return -1;\n>> +\n>> + offset = offset_to_offset;\n>> + current = de;\n>> + while (current) {\n>> + int pathlen;\n>> + struct cache_entry *ce = current->ce;\n>> +\n>> + if (current->de_pathlen == 0)\n>> + pathlen = 0;\n>> + else\n>> + pathlen = current->de_pathlen + 1;\n>> + while (ce) {\n>> + struct ondisk_cache_entry ondisk;\n>> + uint32_t crc, calc_crc;\n>> +\n>> + if (ce->ce_flags & CE_REMOVE)\n>> + continue;\n>> + calc_crc = htonl(offset);\n>> + crc = crc32(0, (Bytef*)&calc_crc, 4);\n>> + if (ce_write(&crc, fd, ce->name + pathlen,\n>> + ce_namelen(ce) - pathlen + 1) < 0)\n>> + return -1;\n>> + ondisk_from_cache_entry(ce, &ondisk);\n>> + if (ce_write(&crc, fd, &ondisk, ondisk_size) < 0)\n>> + return -1;\n>> + crc = htonl(crc);\n>> + if (ce_write(NULL, fd, &crc, 4) < 0)\n>> + return -1;\n>> + offset += 4;\n>> + ce = ce->next_ce;\n>> + }\n>> + current = current->next;\n>> + }\n>> + return 0;\n>> +}\n>\n>> +static int write_index_v5(struct index_state *istate, int newfd)\n>> +{\n>> + struct cache_header hdr;\n>> + struct cache_header_v5 hdr_v5;\n>> + struct cache_entry **cache = istate->cache;\n>> + struct directory_entry *de;\n>> + struct ondisk_directory_entry *ondisk;\n>> + unsigned int entries = istate->cache_nr;\n>> + unsigned int i, removed, total_dir_len, ondisk_directory_size;\n>> + unsigned int total_file_len, conflict_offset, foffsetblock;\n>> + unsigned int ndir;\n>> + uint32_t crc;\n>> +\n>> + if (istate->filter_opts)\n>> + die(\"BUG: index: cannot write a partially read index\");\n>> +\n>> + for (i = removed = 0; i < entries; i++) {\n>> + if (cache[i]->ce_flags & CE_REMOVE)\n>> + removed++;\n>> + }\n>> + hdr.hdr_signature = htonl(CACHE_SIGNATURE);\n>> + hdr.hdr_version = htonl(istate->version);\n>> + hdr.hdr_entries = htonl(entries - removed);\n>> + hdr_v5.hdr_nextension = htonl(0); /* Currently no extensions are supported */\n>> +\n>> + total_dir_len = 0;\n>> + total_file_len = 0;\n>> + de = compile_directory_data(istate, entries, &ndir,\n>> + &total_dir_len, &total_file_len);\n>> + hdr_v5.hdr_ndir = htonl(ndir);\n>> +\n>> + /*\n>> + * This is needed because the compiler aligns structs to sizes multipe\n>> + * of 4\n>> + */\n>> + ondisk_directory_size = sizeof(ondisk->flags)\n>> + + sizeof(ondisk->foffset)\n>> + + sizeof(ondisk->cr)\n>> + + sizeof(ondisk->ncr)\n>> + + sizeof(ondisk->nsubtrees)\n>> + + sizeof(ondisk->nfiles)\n>> + + sizeof(ondisk->nentries)\n>> + + sizeof(ondisk->sha1);\n>\n> There is a similar statement in read code. This calls for a macro to\n> share this sum.\n\nThis is no longer needed, as I switched the flag size to 32 bits, to\nenable adding the pathname at the end of the struct.\n\n>> + foffsetblock = sizeof(hdr) + sizeof(hdr_v5) + 4\n>> + + (ndir + 1) * 4\n>> + + total_dir_len\n>> + + ndir * (ondisk_directory_size + 4);\n>> + hdr_v5.hdr_fblockoffset = htonl(foffsetblock + (entries - removed + 1) * 4);\n>> + crc = 0;\n>> + if (ce_write(&crc, newfd, &hdr, sizeof(hdr)) < 0)\n>> + return -1;\n>> + if (ce_write(&crc, newfd, &hdr_v5, sizeof(hdr_v5)) < 0)\n>> + return -1;\n>> + crc = htonl(crc);\n>> + if (ce_write(NULL, newfd, &crc, 4) < 0)\n>> + return -1;\n>> +\n>> + conflict_offset = foffsetblock +\n>> + + (entries - removed + 1) * 4\n>> + + total_file_len\n>> + + (entries - removed) * (sizeof(struct ondisk_cache_entry) + 4);\n>> + if (write_directories(de, newfd, conflict_offset) < 0)\n>> + return -1;\n>> + if (write_entries(istate, de, entries, newfd, foffsetblock) < 0)\n>> + return -1;\n>> + if (write_conflicts(istate, de, newfd) < 0)\n>> + return -1;\n>> + return ce_flush(newfd);\n>> +}\n\nIn the re-roll the conflicted and the resolve-undo entries will also be\nwritten in an extension as you suggested in the other email. I'll\nre-roll the series with a POC for partial writing tomorrow if all goes\nwell.\n"},{"id":"231073","messageId":"87iovgo5ew.fsf@gmail.com","threadId":"34724","inReplyTo":"CACsJy8Br8EaEtoZeaz2eLKvxDmPJqUc02bYsL_OSLJvJ2dBU-g@mail.gmail.com","subject":"Re: [PATCH v3 17/24] read-cache: read cache-tree in index-v5","fromName":"Thomas Gummerer","fromEmail":"t.gummerer@gmail.com","sentAt":"2013-11-25T15:41:11Z","receivedAt":"2013-11-25T15:41:11Z","isPatch":true,"sender":{"key":"t.gummerer@gmail.com","avatar":"https://avatars.githubusercontent.com/u/191004?v=4"},"body":"Duy Nguyen writes:\n\n> On Mon, Aug 19, 2013 at 2:42 AM, Thomas Gummerer wrote:\n>> +/*\n>> + * This function modifies the directory argument that is given to it.\n>> + * Don't use it if the directory entries are still needed after.\n>> + */\n>\n> There goes my hope of keeping directory_entry* in core so that at\n> write-time, after validation, we only need to recreate some trees\n> instead of all of them..\n>\n> Or we could make cache-tree keep references to directory_entry. If a\n> cache-tree is not invalidated, then the attached directory_tree should\n> be reused..\n\nI've now re-written the algorithm that converts the directory entries to\ncache entries, and it's now no longer destructive. For now the\ndirectory entries are not needed in core, so I'll free them when done\nwith reading the index, but it's possible to keep it.\n\n>> +static struct cache_tree *cache_tree_convert_v5(struct directory_entry *de)\n>> +{\n>> + if (!de->de_nentries)\n>> + return NULL;\n>> + sort_directories(de);\n>> + return convert_one(de);\n>> +}\n>> +\n>> static int read_entries(struct index_state *istate, struct directory_entry *de,\n>> unsigned int first_entry_offset, void *mmap,\n>> unsigned long mmap_size, unsigned int *nr,\n>> @@ -591,6 +668,7 @@ static int read_index_v5(struct index_state *istate, void *mmap,\n>> }\n>> de = de->next;\n>> }\n>> + istate->cache_tree = cache_tree_convert_v5(root_directory);\n>> istate->cache_nr = nr;\n>> return 0;\n>> }\n>\n> Otherwise we do need to free root_directory down to the deepest\n> subtrees, I think. People have been complaining about read-cache\n> leaking memory like mad, so this is a real issue. Even if you keep\n> references in cache-tree, you still need to free it\n> cache_tree_invalidate_path() to avoid leaking\n\nI'm freeing them for now, as they are not used anywhere, but in the\nfuture we might want to keep them for some optimizations.\n"}]}