Merge branch 'stable-2.9' into stable-2.10

* stable-2.9:
  Bump gwtorm to 1.14 - solves the primary key column order bug
  Update replication plugin to latest revision
  Fix ordering of 2.9.x releases in the release notes index.
  Disable Gitweb for in-memory acceptance tests
  Allow to raise BooleanQuery limit in gerrit.config.

Change-Id: I00a034bbe166eb3e6b1f2058ba46ce0a1ff47c86
This commit is contained in:
David Pursehouse
2014-11-05 09:47:15 +09:00
4 changed files with 17 additions and 5 deletions

View File

@@ -74,6 +74,7 @@ import org.apache.lucene.index.IndexWriterConfig;
import org.apache.lucene.index.IndexWriterConfig.OpenMode;
import org.apache.lucene.index.IndexableField;
import org.apache.lucene.index.Term;
import org.apache.lucene.search.BooleanQuery;
import org.apache.lucene.search.IndexSearcher;
import org.apache.lucene.search.Query;
import org.apache.lucene.search.ScoreDoc;
@@ -242,6 +243,9 @@ public class LuceneChangeIndex implements ChangeIndex {
new StandardAnalyzer(luceneVersion, CharArraySet.EMPTY_SET);
queryBuilder = new QueryBuilder(schema, analyzer);
BooleanQuery.setMaxClauseCount(cfg.getInt("index", "defaultMaxClauseCount",
BooleanQuery.getMaxClauseCount()));
GerritIndexWriterConfig openConfig =
new GerritIndexWriterConfig(luceneVersion, cfg, "changes_open");
GerritIndexWriterConfig closedConfig =