Improve git file to code file matching performance

Author: JohT

cypher/GitLog/Add_RESOLVES_TO_relationships_to_git_files_for_Java.cypher

@@ -6,7 +6,7 @@
 //       The differences are subtle but need to be thought through and tested carefully.
 //       Having separate files makes it obvious that there needs to be one for every new source code language.
 
-MATCH (code_file:!Git&File)
+MATCH (code_file:!Git&File&!Directory)
 WHERE  code_file.fileName IS NOT NULL
   // Use only original code files, no resolved duplicates
   AND NOT EXISTS { (code_file)-[:RESOLVES_TO]->(other_file:File&!Git) }
@@ -17,8 +17,10 @@ MATCH (git_file:Git&File)
      ,git_file
      ,coalesce(git_file.fileName, git_file.relativePath) AS gitFileName
 WHERE gitFileName ENDS WITH codeFileName
-MERGE (git_file)-[:RESOLVES_TO]->(code_file)
-  SET git_file.resolved = true
+ CALL { WITH git_file, code_file
+       MERGE (git_file)-[:RESOLVES_TO]->(code_file)
+          ON CREATE SET git_file.resolved = true
+      } IN TRANSACTIONS
 RETURN count(DISTINCT codeFileName)  AS numberOfCodeFiles
       ,collect(DISTINCT codeFileName + ' <-> ' + gitFileName + '\n')[0..4] AS examples
 // RETURN codeFileName, gitFileName

cypher/GitLog/Add_RESOLVES_TO_relationships_to_git_files_for_Typescript.cypher

@@ -3,13 +3,13 @@
 //       The differences are subtle but need to be thought through and tested carefully.
 //       Having separate files makes it obvious that there needs to be one for every new source code language.
 
-MATCH (code_file:!Git&File)
+MATCH (code_file:!Git&File&!Directory&!Scan)
 WHERE (code_file.absoluteFileName IS NOT NULL OR code_file.fileName IS NOT NULL)
-  // Use only original code files, no resolved duplicates
-  AND NOT EXISTS { (code_file)-[:RESOLVES_TO]->(other_file:File&!Git) } 
  WITH code_file
      ,coalesce(code_file.absoluteFileName, code_file.fileName) AS codeFileName
 MATCH (git_file:Git&File)
+WHERE codeFileName      ENDS WITH git_file.fileName
+   OR codeFileName      ENDS WITH git_file.relativePath
 // Use repository if available to overcome ambiguity in multi source analysis
 OPTIONAL MATCH (git_repository:Git&Repository)-[:HAS_FILE]->(git_file)
  WITH *
@@ -19,8 +19,10 @@ OPTIONAL MATCH (git_repository:Git&Repository)-[:HAS_FILE]->(git_file)
               ,coalesce(git_repository.name + '/', '')      + git_file.relativePath
       ) AS gitFileName
 WHERE codeFileName      ENDS WITH gitFileName
-MERGE (git_file)-[:RESOLVES_TO]->(code_file)
-  SET git_file.resolved = true
+ CALL { WITH git_file, code_file
+       MERGE (git_file)-[:RESOLVES_TO]->(code_file)
+          ON CREATE SET git_file.resolved = true
+      } IN TRANSACTIONS
 RETURN count(DISTINCT codeFileName)  AS numberOfCodeFiles
       ,collect(DISTINCT codeFileName + ' <-> ' + gitFileName + '\n')[0..4] AS examples
 // RETURN codeFileName, gitFileName