The Unified and Autonomous Development Platform
Use cached symbols only when version matches
robin shen35bdc6d01c1d
diff --git a/search/src/main/java/com/gitplex/server/search/DefaultIndexManager.java b/search/src/main/java/com/gitplex/server/search/DefaultIndexManager.javaindex 55464d8638..af7190900f 100644--- a/search/src/main/java/com/gitplex/server/search/DefaultIndexManager.java+++ b/search/src/main/java/com/gitplex/server/search/DefaultIndexManager.java@@ -92,7 +92,7 @@ public class DefaultIndexManager implements IndexManager {private static final int BACKEND_INDEXING_PRIORITY = 50;- private static final int INDEX_VERSION = 1;+ private static final int DATA_VERSION = 1;private final StorageManager storageManager;@@ -156,7 +156,7 @@ public class DefaultIndexManager implements IndexManager {if (topDocs.scoreDocs.length != 0) {Document doc = searcher.doc(topDocs.scoreDocs[0].doc);String lastCommitIndexVersion = doc.get(LAST_COMMIT_INDEX_VERSION.name());- if (lastCommitIndexVersion.equals(getCurrentCommitIndexVersion())) {+ if (lastCommitIndexVersion.equals(getIndexVersion())) {String lastCommitHash = doc.get(LAST_COMMIT_HASH.name());ObjectId lastCommitId = ObjectId.fromString(lastCommitHash);if (repository.hasObject(lastCommitId)) {@@ -210,7 +210,7 @@ public class DefaultIndexManager implements IndexManager {}SymbolExtractor<Symbol> extractor = SymbolExtractorRegistry.getExtractor(blobName);- String currentBlobIndexVersion = getCurrentBlobIndexVersion(extractor);+ String currentBlobIndexVersion = getIndexVersion(extractor);String blobIndexVersion = blobIndexVersionRef.get();if (blobIndexVersion != null) {if (!blobIndexVersion.equals(currentBlobIndexVersion)) {@@ -228,13 +228,13 @@ public class DefaultIndexManager implements IndexManager {// record current commit so that we know which commit has been indexedDocument document = new Document();document.add(new StringField(COMMIT_HASH.name(), commitId.getName(), Store.NO));- document.add(new StoredField(COMMIT_INDEX_VERSION.name(), getCurrentCommitIndexVersion()));+ document.add(new StoredField(COMMIT_INDEX_VERSION.name(), getIndexVersion()));writer.updateDocument(COMMIT_HASH.term(commitId.getName()), document);// record last commit so that we only need to indexing changed files for subsequent commitsdocument = new Document();document.add(new StringField(META.name(), LAST_COMMIT.name(), Store.NO));- document.add(new StoredField(LAST_COMMIT_INDEX_VERSION.name(), getCurrentCommitIndexVersion()));+ document.add(new StoredField(LAST_COMMIT_INDEX_VERSION.name(), getIndexVersion()));document.add(new StoredField(LAST_COMMIT_HASH.name(), commitId.getName()));writer.updateDocument(META.term(LAST_COMMIT.name()), document);@@ -246,7 +246,7 @@ public class DefaultIndexManager implements IndexManager {SymbolExtractor<Symbol> extractor, ObjectId blobId, String blobPath) throws IOException {Document document = new Document();- document.add(new StoredField(BLOB_INDEX_VERSION.name(), getCurrentBlobIndexVersion(extractor)));+ document.add(new StoredField(BLOB_INDEX_VERSION.name(), getIndexVersion(extractor)));document.add(new StringField(BLOB_HASH.name(), blobId.name(), Store.NO));document.add(new StringField(BLOB_PATH.name(), blobPath, Store.YES));@@ -336,7 +336,7 @@ public class DefaultIndexManager implements IndexManager {if (DirectoryReader.indexExists(directory)) {try (IndexReader reader = DirectoryReader.open(directory)) {IndexSearcher searcher = new IndexSearcher(reader);- if (getCurrentCommitIndexVersion().equals(getCommitIndexVersion(searcher, commit))) {+ if (getIndexVersion().equals(getCommitIndexVersion(searcher, commit))) {return new IndexResult(0, 0);} else {try (IndexWriter writer = new IndexWriter(directory, newIndexWriterConfig())) {@@ -370,16 +370,18 @@ public class DefaultIndexManager implements IndexManager {return indexResult;}- private String getCurrentCommitIndexVersion() {- return DigestUtils.md5Hex(INDEX_VERSION + ";" + SymbolExtractorRegistry.getVersion());+ @Override+ public String getIndexVersion() {+ return DigestUtils.md5Hex(DATA_VERSION + ";" + SymbolExtractorRegistry.getVersion());}- private String getCurrentBlobIndexVersion(SymbolExtractor<Symbol> extractor) {+ @Override+ public String getIndexVersion(SymbolExtractor<Symbol> extractor) {String version;if (extractor != null)- version = INDEX_VERSION + ";" + extractor.getClass().getName() + ":" + extractor.getVersion();+ version = DATA_VERSION + ";" + extractor.getClass().getName() + ":" + extractor.getVersion();else- version = String.valueOf(INDEX_VERSION);+ version = String.valueOf(DATA_VERSION);return DigestUtils.md5Hex(version);}@@ -390,7 +392,7 @@ public class DefaultIndexManager implements IndexManager {if (DirectoryReader.indexExists(directory)) {try (IndexReader reader = DirectoryReader.open(directory)) {IndexSearcher searcher = new IndexSearcher(reader);- return getCurrentCommitIndexVersion().equals(getCommitIndexVersion(searcher, commit));+ return getIndexVersion().equals(getCommitIndexVersion(searcher, commit));}} else {return false;diff --git a/search/src/main/java/com/gitplex/server/search/DefaultSearchManager.java b/search/src/main/java/com/gitplex/server/search/DefaultSearchManager.javaindex f0647807d9..6ef6563ae4 100644--- a/search/src/main/java/com/gitplex/server/search/DefaultSearchManager.java+++ b/search/src/main/java/com/gitplex/server/search/DefaultSearchManager.java@@ -1,6 +1,7 @@package com.gitplex.server.search;import static com.gitplex.server.search.FieldConstants.BLOB_HASH;+import static com.gitplex.server.search.FieldConstants.BLOB_INDEX_VERSION;import static com.gitplex.server.search.FieldConstants.BLOB_PATH;import static com.gitplex.server.search.FieldConstants.BLOB_SYMBOL_LIST;@@ -19,6 +20,7 @@ import javax.inject.Inject;import javax.inject.Singleton;import org.apache.commons.lang.SerializationUtils;+import org.apache.lucene.document.Document;import org.apache.lucene.index.AtomicReaderContext;import org.apache.lucene.index.BinaryDocValues;import org.apache.lucene.index.DirectoryReader;@@ -40,6 +42,7 @@ import org.slf4j.Logger;import org.slf4j.LoggerFactory;import com.gitplex.jsymbol.Symbol;+import com.gitplex.jsymbol.SymbolExtractorRegistry;import com.gitplex.launcher.loader.Listen;import com.gitplex.server.event.lifecycle.SystemStopping;import com.gitplex.server.manager.StorageManager;@@ -59,9 +62,12 @@ public class DefaultSearchManager implements SearchManager {private final Map<Long, SearcherManager> searcherManagers = new ConcurrentHashMap<>();+ private final IndexManager indexManager;+@Inject- public DefaultSearchManager(StorageManager storageManager) {+ public DefaultSearchManager(StorageManager storageManager, IndexManager indexManager) {this.storageManager = storageManager;+ this.indexManager = indexManager;}@Nullable@@ -183,7 +189,8 @@ public class DefaultSearchManager implements SearchManager {query.add(BLOB_HASH.query(blobId.name()), Occur.MUST);query.add(BLOB_PATH.query(blobPath), Occur.MUST);- final AtomicReference<List<Symbol>> symbolsRef = new AtomicReference<>(null);+ String indexVersion = indexManager.getIndexVersion(SymbolExtractorRegistry.getExtractor(blobPath));+ AtomicReference<List<Symbol>> symbolsRef = new AtomicReference<>(null);if (searcher != null) {try {searcher.search(query, new Collector() {@@ -197,12 +204,15 @@ public class DefaultSearchManager implements SearchManager {@SuppressWarnings("unchecked")@Overridepublic void collect(int doc) throws IOException {- BytesRef bytesRef = searcher.doc(context.docBase+doc).getBinaryValue(BLOB_SYMBOL_LIST.name());- if (bytesRef != null) {- try {- symbolsRef.set((List<Symbol>) SerializationUtils.deserialize(bytesRef.bytes));- } catch (Exception e) {- logger.error("Error deserializing symbols", e);+ Document document = searcher.doc(context.docBase+doc);+ if (indexVersion.equals(document.get(BLOB_INDEX_VERSION.name()))) {+ BytesRef bytesRef = document.getBinaryValue(BLOB_SYMBOL_LIST.name());+ if (bytesRef != null) {+ try {+ symbolsRef.set((List<Symbol>) SerializationUtils.deserialize(bytesRef.bytes));+ } catch (Exception e) {+ logger.error("Error deserializing symbols", e);+ }}}}diff --git a/search/src/main/java/com/gitplex/server/search/IndexManager.java b/search/src/main/java/com/gitplex/server/search/IndexManager.javaindex 984f644d44..ed0bbf46f2 100644--- a/search/src/main/java/com/gitplex/server/search/IndexManager.java+++ b/search/src/main/java/com/gitplex/server/search/IndexManager.java@@ -1,7 +1,11 @@package com.gitplex.server.search;+import javax.annotation.Nullable;+import org.eclipse.jgit.lib.ObjectId;+import com.gitplex.jsymbol.Symbol;+import com.gitplex.jsymbol.SymbolExtractor;import com.gitplex.server.model.Project;public interface IndexManager {@@ -10,4 +14,8 @@ public interface IndexManager {boolean isIndexed(Project project, ObjectId commit);+ String getIndexVersion();++ String getIndexVersion(@Nullable SymbolExtractor<Symbol> extractor);+}diff --git a/web/src/main/java/com/gitplex/server/web/page/project/blob/render/renderers/source/SourceViewPanel.java b/web/src/main/java/com/gitplex/server/web/page/project/blob/render/renderers/source/SourceViewPanel.javaindex faeec5c545..a1d373bb93 100644--- a/web/src/main/java/com/gitplex/server/web/page/project/blob/render/renderers/source/SourceViewPanel.java+++ b/web/src/main/java/com/gitplex/server/web/page/project/blob/render/renderers/source/SourceViewPanel.java@@ -159,6 +159,7 @@ public class SourceViewPanel extends BlobViewPanel implements Markable, SearchMeSearchManager searchManager = GitPlex.getInstance(SearchManager.class);List<Symbol> cachedSymbols = searchManager.getSymbols(context.getProject(), blob.getBlobId(),blob.getIdent().path);+ System.out.println(cachedSymbols);if (cachedSymbols != null)symbols.addAll(cachedSymbols);else