opendev/gerrit
Code Issues Proposed changes

Move BooleanQuery static call into LuceneChangeModule

Browse Source 
This is not really related to the LuceneChangeIndex, it's general
Lucene setup that should happen once per process. Move it to
LuceneIndexModule, which is a more general place. The actual location
in that module is still somewhat arbitrary; arguably it could go in a
LifecycleListener, but that seemed like overkill.

Change-Id: I7354d4cae81a0a29568d2ee098e3e54cec49ff87
This commit is contained in:
Dave Borowitz
2016-03-16 11:51:32 +01:00
parent 9a42bccdad
commit e1601e4c42
2 changed files with 3 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
gerrit-lucene/src/main/java/com/google/gerrit/lucene/LuceneChangeIndex.java
View File

@@ -72,7 +72,6 @@ import org.apache.lucene.document.TextField;
import org.apache.lucene.index.IndexWriter; import org.apache.lucene.index.IndexWriter;
import org.apache.lucene.index.IndexableField; import org.apache.lucene.index.IndexableField;
import org.apache.lucene.index.Term; import org.apache.lucene.index.Term;
import org.apache.lucene.search.BooleanQuery;
import org.apache.lucene.search.IndexSearcher; import org.apache.lucene.search.IndexSearcher;
import org.apache.lucene.search.Query; import org.apache.lucene.search.Query;
import org.apache.lucene.search.ScoreDoc; import org.apache.lucene.search.ScoreDoc;
@@ -181,9 +180,6 @@ public class LuceneChangeIndex implements ChangeIndex {
queryBuilder = new QueryBuilder(openConfig.getAnalyzer()); queryBuilder = new QueryBuilder(openConfig.getAnalyzer());
BooleanQuery.setMaxClauseCount(cfg.getInt("index", "maxTerms",
BooleanQuery.getMaxClauseCount()));
SearcherFactory searcherFactory = new SearcherFactory(); SearcherFactory searcherFactory = new SearcherFactory();
if (cfg.getBoolean("index", "lucene", "testInmemory", false)) { if (cfg.getBoolean("index", "lucene", "testInmemory", false)) {
openIndex = new SubIndex(new RAMDirectory(), "ramOpen", openConfig, openIndex = new SubIndex(new RAMDirectory(), "ramOpen", openConfig,

3
gerrit-lucene/src/main/java/com/google/gerrit/lucene/LuceneIndexModule.java
View File

@@ -27,6 +27,7 @@ import com.google.inject.Inject;
import com.google.inject.Provides; import com.google.inject.Provides;
import com.google.inject.Singleton; import com.google.inject.Singleton;
import org.apache.lucene.search.BooleanQuery;
import org.eclipse.jgit.lib.Config; import org.eclipse.jgit.lib.Config;
public class LuceneIndexModule extends LifecycleModule { public class LuceneIndexModule extends LifecycleModule {
@@ -57,6 +58,8 @@ public class LuceneIndexModule extends LifecycleModule {
@Provides @Provides
@Singleton @Singleton
IndexConfig getIndexConfig(@GerritServerConfig Config cfg) { IndexConfig getIndexConfig(@GerritServerConfig Config cfg) {
BooleanQuery.setMaxClauseCount(cfg.getInt("index", "maxTerms",
BooleanQuery.getMaxClauseCount()));
return IndexConfig.fromConfig(cfg); return IndexConfig.fromConfig(cfg);
} }