opendev/gerrit
Code Issues Proposed changes

Introduce gerrit-index module

Browse Source 
gerrit-index module is meant to keep common parts for Lucene and
Elasticsearch indexes implementation.

Change-Id: Ie265dd9a262bdfec4b15e8abda885ffae7bb1aa4
Signed-off-by: Dariusz Luksza <dluksza@collab.net>
This commit is contained in:
Dariusz Luksza
2016-09-21 13:29:40 +02:00
committed by David Pursehouse
parent 8e72f5301b
commit 531906e16f
15 changed files with 211 additions and 137 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
gerrit-elasticsearch/src/main/java/com/google/gerrit/elasticsearch/AbstractElasticIndex.java
View File

@@ -16,11 +16,11 @@ package com.google.gerrit.elasticsearch;
import static com.google.common.base.MoreObjects.firstNonNull;
import static com.google.common.base.Preconditions.checkState;
import static com.google.gerrit.lucene.AbstractLuceneIndex.setReady;
import static org.elasticsearch.common.xcontent.XContentFactory.jsonBuilder;
import com.google.common.base.Strings;
import com.google.common.collect.Iterables;
import com.google.gerrit.index.IndexUtils;
import com.google.gerrit.server.config.GerritServerConfig;
import com.google.gerrit.server.config.SitePaths;
import com.google.gerrit.server.index.FieldDef.FillArgs;
@@ -110,7 +110,7 @@ abstract class AbstractElasticIndex<K, V> implements Index<K, V> {
@Override
public void markReady(boolean ready) throws IOException {
setReady(sitePaths, indexName, schema.getVersion(), ready);
IndexUtils.setReady(sitePaths, indexName, schema.getVersion(), ready);
}
@Override

4
gerrit-elasticsearch/src/main/java/com/google/gerrit/elasticsearch/ElasticChangeIndex.java
View File

@@ -24,7 +24,7 @@ import com.google.common.collect.ImmutableMap;
import com.google.common.collect.Lists;
import com.google.common.collect.Sets;
import com.google.gerrit.elasticsearch.ElasticMapping.MappingProperties;
import com.google.gerrit.lucene.LuceneChangeIndex;
import com.google.gerrit.index.IndexUtils;
import com.google.gerrit.reviewdb.client.Account;
import com.google.gerrit.reviewdb.client.Change;
import com.google.gerrit.reviewdb.client.Change.Id;
@@ -228,7 +228,7 @@ class ElasticChangeIndex extends AbstractElasticIndex<Change.Id, ChangeData>
sort.setIgnoreUnmapped();
}
QueryBuilder qb = queryBuilder.toQueryBuilder(p);
fields = LuceneChangeIndex.fields(opts);
fields = IndexUtils.fields(opts);
SearchSourceBuilder searchSource = new SearchSourceBuilder()
.query(qb)
.from(opts.start())

2
gerrit-elasticsearch/src/main/java/com/google/gerrit/elasticsearch/ElasticIndexModule.java
View File

@@ -14,9 +14,9 @@
package com.google.gerrit.elasticsearch;
import com.google.gerrit.index.SingleVersionModule;
import com.google.gerrit.lifecycle.LifecycleModule;
import com.google.gerrit.lucene.LuceneAccountIndex;
import com.google.gerrit.lucene.LuceneIndexModule.SingleVersionModule;
import com.google.gerrit.server.config.GerritServerConfig;
import com.google.gerrit.server.index.IndexConfig;
import com.google.gerrit.server.index.IndexModule;