From 86c9b59cce7f1555ce2012fa711c011d9d2a3d10 Mon Sep 17 00:00:00 2001 From: Gang ZHANG Date: Thu, 2 Jan 2020 10:49:13 +0800 Subject: [PATCH] Revert "cache included file set of cpp" This reverts commit ac667382e1c7de19897e263e07f5130bf7babb7c. --- .../extractor/cpp/CppImportLookupStrategy.java | 16 ++-------------- 1 file changed, 2 insertions(+), 14 deletions(-) diff --git a/src/main/java/depends/extractor/cpp/CppImportLookupStrategy.java b/src/main/java/depends/extractor/cpp/CppImportLookupStrategy.java index dd7af88..d50839e 100644 --- a/src/main/java/depends/extractor/cpp/CppImportLookupStrategy.java +++ b/src/main/java/depends/extractor/cpp/CppImportLookupStrategy.java @@ -26,7 +26,6 @@ package depends.extractor.cpp; import java.util.ArrayList; import java.util.Collection; -import java.util.HashMap; import java.util.HashSet; import java.util.List; import java.util.Set; @@ -42,8 +41,6 @@ import depends.relations.ImportLookupStrategy; import depends.relations.Inferer; public class CppImportLookupStrategy implements ImportLookupStrategy { - HashMap> includedFiles = new HashMap<>(); - @Override public Entity lookupImportedType(String name, FileEntity fileEntity, EntityRepo repo, Inferer inferer) { String importedString = fileEntity.importedSuffixMatch(name); @@ -52,8 +49,8 @@ public class CppImportLookupStrategy implements ImportLookupStrategy { if (r!=null) return r; } - - HashSet fileSet = findIncludedFiles(fileEntity, repo); + HashSet fileSet = new HashSet<>(); + foundIncludedFiles(fileSet, fileEntity.getImportedFiles(),repo); for (String file:fileSet) { Entity importedItem = repo.getEntity(file); @@ -73,15 +70,6 @@ public class CppImportLookupStrategy implements ImportLookupStrategy { return null; } - private HashSet findIncludedFiles(FileEntity fileEntity, EntityRepo repo) { - HashSet fileSet = this.includedFiles.get(fileEntity.getId()); - if (fileSet!=null) return fileSet; - fileSet = new HashSet<>(); - foundIncludedFiles(fileSet, fileEntity.getImportedFiles(),repo); - includedFiles.put(fileEntity.getId(),fileSet); - return fileSet; - } - private void foundIncludedFiles(HashSet fileSet, Collection importedFiles, EntityRepo repo) { for (Entity file:importedFiles) { if (file==null ) continue;