Optimize haste map tracking of deleted files with Watchman. (#8056)

* Optimize haste map tracking of deprecated files with Watchman. * Fix issue with not-fresh Watchman. * Update change log. * deprecatedFiles -> removedFiles * deprecated file -> removed file in comments/test descriptions. * Resolve lint error.
jestjs · Mar 6, 2019 · 547dcea · 547dcea
1 parent 3e32813
commit 547dcea
Show file tree

Hide file tree

Showing 7 changed files with 204 additions and 92 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -94,6 +94,8 @@
 
 ### Performance
 
+- `[jest-haste-map]` Optimize haste map tracking of deleted files with Watchman. ([#8056](https://github.com/facebook/jest/pull/8056))
+
 ## 24.1.0
 
 ### Features

diff --git a/packages/jest-haste-map/src/__tests__/index.test.js b/packages/jest-haste-map/src/__tests__/index.test.js
@@ -40,6 +40,7 @@ jest.mock('../crawlers/watchman', () =>
 
     const {data, ignore, rootDir, roots, computeSha1} = options;
     const list = mockChangedFiles || mockFs;
+    const removedFiles = new Map();
 
     data.clocks = mockClocks;
 
@@ -51,12 +52,19 @@ jest.mock('../crawlers/watchman', () =>
 
           data.files.set(relativeFilePath, ['', 32, 42, 0, [], hash]);
         } else {
-          data.files.delete(relativeFilePath);
+          const fileData = data.files.get(relativeFilePath);
+          if (fileData) {
+            removedFiles.set(relativeFilePath, fileData);
+            data.files.delete(relativeFilePath);
+          }
         }
       }
     }
 
-    return Promise.resolve(data);
+    return Promise.resolve({
+      hasteMap: data,
+      removedFiles,
+    });
   }),
 );
 
@@ -416,7 +424,10 @@ describe('HasteMap', () => {
             'vegetables/Melon.js': ['Melon', 32, 42, 0, [], null],
           });
 
-          return Promise.resolve(data);
+          return Promise.resolve({
+            hasteMap: data,
+            removedFiles: new Map(),
+          });
         });
 
         const hasteMap = new HasteMap({
@@ -543,7 +554,7 @@ describe('HasteMap', () => {
       ...defaultConfig,
     })
       .build()
-      .catch(({__hasteMapForTest: data}) => {
+      .catch(() => {
         expect(console.error.mock.calls[0][0]).toMatchSnapshot();
       });
   });
@@ -979,7 +990,7 @@ describe('HasteMap', () => {
       mockImpl(options).then(() => {
         const {data} = options;
         data.files.set('fruits/invalid/file.js', ['', 34, 44, 0, []]);
-        return data;
+        return {hasteMap: data, removedFiles: new Map()};
       }),
     );
     return new HasteMap(defaultConfig)
@@ -1077,7 +1088,10 @@ describe('HasteMap', () => {
       data.files = createMap({
         'fruits/Banana.js': ['', 32, 42, 0, [], null],
       });
-      return Promise.resolve(data);
+      return Promise.resolve({
+        hasteMap: data,
+        removedFiles: new Map(),
+      });
     });
 
     return new HasteMap(defaultConfig)
@@ -1108,7 +1122,10 @@ describe('HasteMap', () => {
       data.files = createMap({
         'fruits/Banana.js': ['', 32, 42, 0, [], null],
       });
-      return Promise.resolve(data);
+      return Promise.resolve({
+        hasteMap: data,
+        removedFiles: new Map(),
+      });
     });
 
     return new HasteMap(defaultConfig)

diff --git a/packages/jest-haste-map/src/crawlers/__tests__/node.test.js b/packages/jest-haste-map/src/crawlers/__tests__/node.test.js
@@ -114,7 +114,7 @@ describe('node crawler', () => {
       ignore: pearMatcher,
       rootDir,
       roots: ['/project/fruits', '/project/vegtables'],
-    }).then(data => {
+    }).then(({hasteMap, removedFiles}) => {
       expect(childProcess.spawn).lastCalledWith('find', [
         '/project/fruits',
         '/project/vegtables',
@@ -129,15 +129,17 @@ describe('node crawler', () => {
         ')',
       ]);
 
-      expect(data.files).not.toBe(null);
+      expect(hasteMap.files).not.toBe(null);
 
-      expect(data.files).toEqual(
+      expect(hasteMap.files).toEqual(
         createMap({
           'fruits/strawberry.js': ['', 32, 42, 0, [], null],
           'fruits/tomato.js': ['', 33, 42, 0, [], null],
           'vegetables/melon.json': ['', 34, 42, 0, [], null],
         }),
       );
+
+      expect(removedFiles).toEqual(new Map());
     });
 
     return promise;
@@ -161,16 +163,52 @@ describe('node crawler', () => {
       ignore: pearMatcher,
       rootDir,
       roots: ['/project/fruits'],
-    }).then(data => {
-      expect(data.files).toEqual(
+    }).then(({hasteMap, removedFiles}) => {
+      expect(hasteMap.files).toEqual(
         createMap({
           'fruits/strawberry.js': ['', 32, 42, 0, [], null],
           'fruits/tomato.js': tomato,
         }),
       );
 
       // Make sure it is the *same* unchanged object.
-      expect(data.files.get('fruits/tomato.js')).toBe(tomato);
+      expect(hasteMap.files.get('fruits/tomato.js')).toBe(tomato);
+
+      expect(removedFiles).toEqual(new Map());
+    });
+  });
+
+  it('returns removed files', () => {
+    process.platform = 'linux';
+
+    nodeCrawl = require('../node');
+
+    // In this test sample, previouslyExisted was present before and will not be
+    // when crawling this directory.
+    const files = createMap({
+      'fruits/previouslyExisted.js': ['', 30, 40, 1, [], null],
+      'fruits/strawberry.js': ['', 33, 42, 0, [], null],
+      'fruits/tomato.js': ['', 32, 42, 0, [], null],
+    });
+
+    return nodeCrawl({
+      data: {files},
+      extensions: ['js'],
+      ignore: pearMatcher,
+      rootDir,
+      roots: ['/project/fruits'],
+    }).then(({hasteMap, removedFiles}) => {
+      expect(hasteMap.files).toEqual(
+        createMap({
+          'fruits/strawberry.js': ['', 32, 42, 0, [], null],
+          'fruits/tomato.js': ['', 33, 42, 0, [], null],
+        }),
+      );
+      expect(removedFiles).toEqual(
+        createMap({
+          'fruits/previouslyExisted.js': ['', 30, 40, 1, [], null],
+        }),
+      );
     });
   });
 
@@ -187,13 +225,14 @@ describe('node crawler', () => {
       ignore: pearMatcher,
       rootDir,
       roots: ['/project/fruits'],
-    }).then(data => {
-      expect(data.files).toEqual(
+    }).then(({hasteMap, removedFiles}) => {
+      expect(hasteMap.files).toEqual(
         createMap({
           'fruits/directory/strawberry.js': ['', 33, 42, 0, [], null],
           'fruits/tomato.js': ['', 32, 42, 0, [], null],
         }),
       );
+      expect(removedFiles).toEqual(new Map());
     });
   });
 
@@ -210,13 +249,14 @@ describe('node crawler', () => {
       ignore: pearMatcher,
       rootDir,
       roots: ['/project/fruits'],
-    }).then(data => {
-      expect(data.files).toEqual(
+    }).then(({hasteMap, removedFiles}) => {
+      expect(hasteMap.files).toEqual(
         createMap({
           'fruits/directory/strawberry.js': ['', 33, 42, 0, [], null],
           'fruits/tomato.js': ['', 32, 42, 0, [], null],
         }),
       );
+      expect(removedFiles).toEqual(new Map());
     });
   });
 
@@ -233,8 +273,9 @@ describe('node crawler', () => {
       ignore: pearMatcher,
       rootDir,
       roots: [],
-    }).then(data => {
-      expect(data.files).toEqual(new Map());
+    }).then(({hasteMap, removedFiles}) => {
+      expect(hasteMap.files).toEqual(new Map());
+      expect(removedFiles).toEqual(new Map());
     });
   });
 
@@ -250,8 +291,9 @@ describe('node crawler', () => {
       ignore: pearMatcher,
       rootDir,
       roots: ['/error'],
-    }).then(data => {
-      expect(data.files).toEqual(new Map());
+    }).then(({hasteMap, removedFiles}) => {
+      expect(hasteMap.files).toEqual(new Map());
+      expect(removedFiles).toEqual(new Map());
     });
   });
 });