opendev/gerrit
Code Issues Proposed changes

Convert project index to use ProjectData instead of ProjectState

Browse Source 
With this change, the project index does not depend on the Gerrit
server, so that projects under non-Gerrit enabled hosts can be
indexed without dependencies on the server.

Change-Id: I07beec95d1586432bd078d492111b0f6e57c5dcb
This commit is contained in:
Dave Borowitz
2017-08-04 12:01:18 -04:00
parent 428e70e7b3
commit bca8232d83
20 changed files with 133 additions and 94 deletions
Download Patch File Download Diff File Expand all files Collapse all files

36
gerrit-elasticsearch/src/main/java/com/google/gerrit/elasticsearch/ElasticProjectIndex.java
View File

@@ -30,7 +30,7 @@ import com.google.gerrit.server.index.IndexUtils;
import com.google.gerrit.server.index.project.ProjectField; import com.google.gerrit.server.index.project.ProjectField;
import com.google.gerrit.server.index.project.ProjectIndex; import com.google.gerrit.server.index.project.ProjectIndex;
import com.google.gerrit.server.project.ProjectCache; import com.google.gerrit.server.project.ProjectCache;
import com.google.gerrit.server.project.ProjectState; import com.google.gerrit.server.project.ProjectData;
import com.google.gson.JsonArray; import com.google.gson.JsonArray;
import com.google.gson.JsonElement; import com.google.gson.JsonElement;
import com.google.gson.JsonObject; import com.google.gson.JsonObject;
@@ -56,12 +56,12 @@ import org.elasticsearch.search.builder.SearchSourceBuilder;
import org.slf4j.Logger; import org.slf4j.Logger;
import org.slf4j.LoggerFactory; import org.slf4j.LoggerFactory;
public class ElasticProjectIndex extends AbstractElasticIndex<Project.NameKey, ProjectState> public class ElasticProjectIndex extends AbstractElasticIndex<Project.NameKey, ProjectData>
implements ProjectIndex { implements ProjectIndex {
static class ProjectMapping { static class ProjectMapping {
MappingProperties projects; MappingProperties projects;
ProjectMapping(Schema<ProjectState> schema) { ProjectMapping(Schema<ProjectData> schema) {
this.projects = ElasticMapping.createMapping(schema); this.projects = ElasticMapping.createMapping(schema);
} }
} }
@@ -80,14 +80,14 @@ public class ElasticProjectIndex extends AbstractElasticIndex<Project.NameKey, P
SitePaths sitePaths, SitePaths sitePaths,
Provider<ProjectCache> projectCache, Provider<ProjectCache> projectCache,
JestClientBuilder clientBuilder, JestClientBuilder clientBuilder,
@Assisted Schema<ProjectState> schema) { @Assisted Schema<ProjectData> schema) {
super(cfg, sitePaths, schema, clientBuilder, PROJECTS_PREFIX); super(cfg, sitePaths, schema, clientBuilder, PROJECTS_PREFIX);
this.projectCache = projectCache; this.projectCache = projectCache;
this.mapping = new ProjectMapping(schema); this.mapping = new ProjectMapping(schema);
} }
@Override @Override
public void replace(ProjectState projectState) throws IOException { public void replace(ProjectData projectState) throws IOException {
Bulk bulk = Bulk bulk =
new Bulk.Builder() new Bulk.Builder()
.defaultIndex(indexName) .defaultIndex(indexName)
@@ -105,7 +105,7 @@ public class ElasticProjectIndex extends AbstractElasticIndex<Project.NameKey, P
} }
@Override @Override
public DataSource<ProjectState> getSource(Predicate<ProjectState> p, QueryOptions opts) public DataSource<ProjectData> getSource(Predicate<ProjectData> p, QueryOptions opts)
throws QueryParseException { throws QueryParseException {
return new QuerySource(p, opts); return new QuerySource(p, opts);
} }
@@ -122,15 +122,15 @@ public class ElasticProjectIndex extends AbstractElasticIndex<Project.NameKey, P
} }
@Override @Override
protected String getId(ProjectState projectState) { protected String getId(ProjectData projectState) {
return projectState.getProject().getName(); return projectState.getProject().getName();
} }
private class QuerySource implements DataSource<ProjectState> { private class QuerySource implements DataSource<ProjectData> {
private final Search search; private final Search search;
private final Set<String> fields; private final Set<String> fields;
QuerySource(Predicate<ProjectState> p, QueryOptions opts) throws QueryParseException { QuerySource(Predicate<ProjectData> p, QueryOptions opts) throws QueryParseException {
QueryBuilder qb = queryBuilder.toQueryBuilder(p); QueryBuilder qb = queryBuilder.toQueryBuilder(p);
fields = IndexUtils.projectFields(opts); fields = IndexUtils.projectFields(opts);
SearchSourceBuilder searchSource = SearchSourceBuilder searchSource =
@@ -157,9 +157,9 @@ public class ElasticProjectIndex extends AbstractElasticIndex<Project.NameKey, P
} }
@Override @Override
public ResultSet<ProjectState> read() throws OrmException { public ResultSet<ProjectData> read() throws OrmException {
try { try {
List<ProjectState> results = Collections.emptyList(); List<ProjectData> results = Collections.emptyList();
JestResult result = client.execute(search); JestResult result = client.execute(search);
if (result.isSucceeded()) { if (result.isSucceeded()) {
JsonObject obj = result.getJsonObject().getAsJsonObject("hits"); JsonObject obj = result.getJsonObject().getAsJsonObject("hits");
@@ -167,21 +167,21 @@ public class ElasticProjectIndex extends AbstractElasticIndex<Project.NameKey, P
JsonArray json = obj.getAsJsonArray("hits"); JsonArray json = obj.getAsJsonArray("hits");
results = Lists.newArrayListWithCapacity(json.size()); results = Lists.newArrayListWithCapacity(json.size());
for (int i = 0; i < json.size(); i++) { for (int i = 0; i < json.size(); i++) {
results.add(toProjectState(json.get(i))); results.add(toProjectData(json.get(i)));
} }
} }
} else { } else {
log.error(result.getErrorMessage()); log.error(result.getErrorMessage());
} }
final List<ProjectState> r = Collections.unmodifiableList(results); final List<ProjectData> r = Collections.unmodifiableList(results);
return new ResultSet<ProjectState>() { return new ResultSet<ProjectData>() {
@Override @Override
public Iterator<ProjectState> iterator() { public Iterator<ProjectData> iterator() {
return r.iterator(); return r.iterator();
} }
@Override @Override
public List<ProjectState> toList() { public List<ProjectData> toList() {
return r; return r;
} }
@@ -200,7 +200,7 @@ public class ElasticProjectIndex extends AbstractElasticIndex<Project.NameKey, P
return search.toString(); return search.toString();
} }
private ProjectState toProjectState(JsonElement json) { private ProjectData toProjectData(JsonElement json) {
JsonElement source = json.getAsJsonObject().get("_source"); JsonElement source = json.getAsJsonObject().get("_source");
if (source == null) { if (source == null) {
source = json.getAsJsonObject().get("fields"); source = json.getAsJsonObject().get("fields");
@@ -209,7 +209,7 @@ public class ElasticProjectIndex extends AbstractElasticIndex<Project.NameKey, P
Project.NameKey nameKey = Project.NameKey nameKey =
new Project.NameKey( new Project.NameKey(
source.getAsJsonObject().get(ProjectField.NAME.getName()).getAsString()); source.getAsJsonObject().get(ProjectField.NAME.getName()).getAsString());
return projectCache.get().get(nameKey); return projectCache.get().get(nameKey).toProjectData();
} }
} }
} }

4
gerrit-elasticsearch/src/test/java/com/google/gerrit/elasticsearch/ElasticTestUtils.java
View File

@@ -36,7 +36,7 @@ import com.google.gerrit.server.index.account.AccountSchemaDefinitions;
import com.google.gerrit.server.index.change.ChangeSchemaDefinitions; import com.google.gerrit.server.index.change.ChangeSchemaDefinitions;
import com.google.gerrit.server.index.group.GroupSchemaDefinitions; import com.google.gerrit.server.index.group.GroupSchemaDefinitions;
import com.google.gerrit.server.index.project.ProjectSchemaDefinitions; import com.google.gerrit.server.index.project.ProjectSchemaDefinitions;
import com.google.gerrit.server.project.ProjectState; import com.google.gerrit.server.project.ProjectData;
import com.google.gerrit.server.query.change.ChangeData; import com.google.gerrit.server.query.change.ChangeData;
import com.google.gson.FieldNamingPolicy; import com.google.gson.FieldNamingPolicy;
import com.google.gson.Gson; import com.google.gson.Gson;
@@ -162,7 +162,7 @@ final class ElasticTestUtils {
.execute() .execute()
.actionGet(); .actionGet();
Schema<ProjectState> projectSchema = ProjectSchemaDefinitions.INSTANCE.getLatest(); Schema<ProjectData> projectSchema = ProjectSchemaDefinitions.INSTANCE.getLatest();
ProjectMapping projectMapping = new ProjectMapping(projectSchema); ProjectMapping projectMapping = new ProjectMapping(projectSchema);
nodeInfo nodeInfo
.node .node

36
gerrit-lucene/src/main/java/com/google/gerrit/lucene/LuceneProjectIndex.java
View File

@@ -27,7 +27,7 @@ import com.google.gerrit.server.config.SitePaths;
import com.google.gerrit.server.index.IndexUtils; import com.google.gerrit.server.index.IndexUtils;
import com.google.gerrit.server.index.project.ProjectIndex; import com.google.gerrit.server.index.project.ProjectIndex;
import com.google.gerrit.server.project.ProjectCache; import com.google.gerrit.server.project.ProjectCache;
import com.google.gerrit.server.project.ProjectState; import com.google.gerrit.server.project.ProjectData;
import com.google.gwtorm.server.OrmException; import com.google.gwtorm.server.OrmException;
import com.google.gwtorm.server.ResultSet; import com.google.gwtorm.server.ResultSet;
import com.google.inject.Inject; import com.google.inject.Inject;
@@ -56,7 +56,7 @@ import org.eclipse.jgit.lib.Config;
import org.slf4j.Logger; import org.slf4j.Logger;
import org.slf4j.LoggerFactory; import org.slf4j.LoggerFactory;
public class LuceneProjectIndex extends AbstractLuceneIndex<Project.NameKey, ProjectState> public class LuceneProjectIndex extends AbstractLuceneIndex<Project.NameKey, ProjectData>
implements ProjectIndex { implements ProjectIndex {
private static final Logger log = LoggerFactory.getLogger(LuceneProjectIndex.class); private static final Logger log = LoggerFactory.getLogger(LuceneProjectIndex.class);
@@ -64,7 +64,7 @@ public class LuceneProjectIndex extends AbstractLuceneIndex<Project.NameKey, Pro
private static final String NAME_SORT_FIELD = sortFieldName(NAME); private static final String NAME_SORT_FIELD = sortFieldName(NAME);
private static Term idTerm(ProjectState projectState) { private static Term idTerm(ProjectData projectState) {
return idTerm(projectState.getProject().getNameKey()); return idTerm(projectState.getProject().getNameKey());
} }
@@ -73,10 +73,10 @@ public class LuceneProjectIndex extends AbstractLuceneIndex<Project.NameKey, Pro
} }
private final GerritIndexWriterConfig indexWriterConfig; private final GerritIndexWriterConfig indexWriterConfig;
private final QueryBuilder<ProjectState> queryBuilder; private final QueryBuilder<ProjectData> queryBuilder;
private final Provider<ProjectCache> projectCache; private final Provider<ProjectCache> projectCache;
private static Directory dir(Schema<ProjectState> schema, Config cfg, SitePaths sitePaths) private static Directory dir(Schema<ProjectData> schema, Config cfg, SitePaths sitePaths)
throws IOException { throws IOException {
if (LuceneIndexModule.isInMemoryTest(cfg)) { if (LuceneIndexModule.isInMemoryTest(cfg)) {
return new RAMDirectory(); return new RAMDirectory();
@@ -90,7 +90,7 @@ public class LuceneProjectIndex extends AbstractLuceneIndex<Project.NameKey, Pro
@GerritServerConfig Config cfg, @GerritServerConfig Config cfg,
SitePaths sitePaths, SitePaths sitePaths,
Provider<ProjectCache> projectCache, Provider<ProjectCache> projectCache,
@Assisted Schema<ProjectState> schema) @Assisted Schema<ProjectData> schema)
throws IOException { throws IOException {
super( super(
schema, schema,
@@ -107,7 +107,7 @@ public class LuceneProjectIndex extends AbstractLuceneIndex<Project.NameKey, Pro
} }
@Override @Override
public void replace(ProjectState projectState) throws IOException { public void replace(ProjectData projectState) throws IOException {
try { try {
replace(idTerm(projectState), toDocument(projectState)).get(); replace(idTerm(projectState), toDocument(projectState)).get();
} catch (ExecutionException | InterruptedException e) { } catch (ExecutionException | InterruptedException e) {
@@ -125,7 +125,7 @@ public class LuceneProjectIndex extends AbstractLuceneIndex<Project.NameKey, Pro
} }
@Override @Override
public DataSource<ProjectState> getSource(Predicate<ProjectState> p, QueryOptions opts) public DataSource<ProjectData> getSource(Predicate<ProjectData> p, QueryOptions opts)
throws QueryParseException { throws QueryParseException {
return new QuerySource( return new QuerySource(
opts, opts,
@@ -133,7 +133,7 @@ public class LuceneProjectIndex extends AbstractLuceneIndex<Project.NameKey, Pro
new Sort(new SortField(NAME_SORT_FIELD, SortField.Type.STRING, false))); new Sort(new SortField(NAME_SORT_FIELD, SortField.Type.STRING, false)));
} }
private class QuerySource implements DataSource<ProjectState> { private class QuerySource implements DataSource<ProjectData> {
private final QueryOptions opts; private final QueryOptions opts;
private final Query query; private final Query query;
private final Sort sort; private final Sort sort;
@@ -150,27 +150,27 @@ public class LuceneProjectIndex extends AbstractLuceneIndex<Project.NameKey, Pro
} }
@Override @Override
public ResultSet<ProjectState> read() throws OrmException { public ResultSet<ProjectData> read() throws OrmException {
IndexSearcher searcher = null; IndexSearcher searcher = null;
try { try {
searcher = acquire(); searcher = acquire();
int realLimit = opts.start() + opts.limit(); int realLimit = opts.start() + opts.limit();
TopFieldDocs docs = searcher.search(query, realLimit, sort); TopFieldDocs docs = searcher.search(query, realLimit, sort);
List<ProjectState> result = new ArrayList<>(docs.scoreDocs.length); List<ProjectData> result = new ArrayList<>(docs.scoreDocs.length);
for (int i = opts.start(); i < docs.scoreDocs.length; i++) { for (int i = opts.start(); i < docs.scoreDocs.length; i++) {
ScoreDoc sd = docs.scoreDocs[i]; ScoreDoc sd = docs.scoreDocs[i];
Document doc = searcher.doc(sd.doc, IndexUtils.projectFields(opts)); Document doc = searcher.doc(sd.doc, IndexUtils.projectFields(opts));
result.add(toProjectState(doc)); result.add(toProjectData(doc));
} }
final List<ProjectState> r = Collections.unmodifiableList(result); final List<ProjectData> r = Collections.unmodifiableList(result);
return new ResultSet<ProjectState>() { return new ResultSet<ProjectData>() {
@Override @Override
public Iterator<ProjectState> iterator() { public Iterator<ProjectData> iterator() {
return r.iterator(); return r.iterator();
} }
@Override @Override
public List<ProjectState> toList() { public List<ProjectData> toList() {
return r; return r;
} }
@@ -193,8 +193,8 @@ public class LuceneProjectIndex extends AbstractLuceneIndex<Project.NameKey, Pro
} }
} }
private ProjectState toProjectState(Document doc) { private ProjectData toProjectData(Document doc) {
Project.NameKey nameKey = new Project.NameKey(doc.getField(NAME.getName()).stringValue()); Project.NameKey nameKey = new Project.NameKey(doc.getField(NAME.getName()).stringValue());
return projectCache.get().get(nameKey); return projectCache.get().get(nameKey).toProjectData();
} }
} }

4
gerrit-server/src/main/java/com/google/gerrit/server/index/DummyIndexModule.java
View File

@@ -24,7 +24,7 @@ import com.google.gerrit.server.index.change.ChangeIndex;
import com.google.gerrit.server.index.change.DummyChangeIndex; import com.google.gerrit.server.index.change.DummyChangeIndex;
import com.google.gerrit.server.index.group.GroupIndex; import com.google.gerrit.server.index.group.GroupIndex;
import com.google.gerrit.server.index.project.ProjectIndex; import com.google.gerrit.server.index.project.ProjectIndex;
import com.google.gerrit.server.project.ProjectState; import com.google.gerrit.server.project.ProjectData;
import com.google.gerrit.server.query.change.ChangeData; import com.google.gerrit.server.query.change.ChangeData;
import com.google.inject.AbstractModule; import com.google.inject.AbstractModule;
@@ -52,7 +52,7 @@ public class DummyIndexModule extends AbstractModule {
private static class DummyProjectIndexFactory implements ProjectIndex.Factory { private static class DummyProjectIndexFactory implements ProjectIndex.Factory {
@Override @Override
public ProjectIndex create(Schema<ProjectState> schema) { public ProjectIndex create(Schema<ProjectData> schema) {
throw new UnsupportedOperationException(); throw new UnsupportedOperationException();
} }
} }

6
gerrit-server/src/main/java/com/google/gerrit/server/index/project/AllProjectsIndexer.java
View File

@@ -24,7 +24,7 @@ import com.google.gerrit.index.SiteIndexer;
import com.google.gerrit.reviewdb.client.Project; import com.google.gerrit.reviewdb.client.Project;
import com.google.gerrit.server.index.IndexExecutor; import com.google.gerrit.server.index.IndexExecutor;
import com.google.gerrit.server.project.ProjectCache; import com.google.gerrit.server.project.ProjectCache;
import com.google.gerrit.server.project.ProjectState; import com.google.gerrit.server.project.ProjectData;
import com.google.gwtorm.server.OrmException; import com.google.gwtorm.server.OrmException;
import com.google.inject.Inject; import com.google.inject.Inject;
import com.google.inject.Singleton; import com.google.inject.Singleton;
@@ -40,7 +40,7 @@ import org.slf4j.Logger;
import org.slf4j.LoggerFactory; import org.slf4j.LoggerFactory;
@Singleton @Singleton
public class AllProjectsIndexer extends SiteIndexer<Project.NameKey, ProjectState, ProjectIndex> { public class AllProjectsIndexer extends SiteIndexer<Project.NameKey, ProjectData, ProjectIndex> {
private static final Logger log = LoggerFactory.getLogger(AllProjectsIndexer.class); private static final Logger log = LoggerFactory.getLogger(AllProjectsIndexer.class);
@@ -84,7 +84,7 @@ public class AllProjectsIndexer extends SiteIndexer<Project.NameKey, ProjectStat
() -> { () -> {
try { try {
projectCache.evict(name); projectCache.evict(name);
index.replace(projectCache.get(name)); index.replace(projectCache.get(name).toProjectData());
verboseWriter.println("Reindexed " + desc); verboseWriter.println("Reindexed " + desc);
done.incrementAndGet(); done.incrementAndGet();
} catch (Exception e) { } catch (Exception e) {

8
gerrit-server/src/main/java/com/google/gerrit/server/index/project/IndexedProjectQuery.java
View File

@@ -21,13 +21,13 @@ import com.google.gerrit.index.query.DataSource;
import com.google.gerrit.index.query.Predicate; import com.google.gerrit.index.query.Predicate;
import com.google.gerrit.index.query.QueryParseException; import com.google.gerrit.index.query.QueryParseException;
import com.google.gerrit.reviewdb.client.Project; import com.google.gerrit.reviewdb.client.Project;
import com.google.gerrit.server.project.ProjectState; import com.google.gerrit.server.project.ProjectData;
public class IndexedProjectQuery extends IndexedQuery<Project.NameKey, ProjectState> public class IndexedProjectQuery extends IndexedQuery<Project.NameKey, ProjectData>
implements DataSource<ProjectState> { implements DataSource<ProjectData> {
public IndexedProjectQuery( public IndexedProjectQuery(
Index<Project.NameKey, ProjectState> index, Predicate<ProjectState> pred, QueryOptions opts) Index<Project.NameKey, ProjectData> index, Predicate<ProjectData> pred, QueryOptions opts)
throws QueryParseException { throws QueryParseException {
super(index, pred, opts.convertForBackend()); super(index, pred, opts.convertForBackend());
} }

15
gerrit-server/src/main/java/com/google/gerrit/server/index/project/ProjectField.java
View File

@@ -21,25 +21,24 @@ import static com.google.gerrit.index.FieldDef.prefix;
import com.google.common.collect.Iterables; import com.google.common.collect.Iterables;
import com.google.gerrit.index.FieldDef; import com.google.gerrit.index.FieldDef;
import com.google.gerrit.index.SchemaUtil; import com.google.gerrit.index.SchemaUtil;
import com.google.gerrit.server.project.ProjectState; import com.google.gerrit.server.project.ProjectData;
/** Index schema for projects. */ /** Index schema for projects. */
public class ProjectField { public class ProjectField {
public static final FieldDef<ProjectState, String> NAME = public static final FieldDef<ProjectData, String> NAME =
exact("name").stored().build(p -> p.getProject().getName()); exact("name").stored().build(p -> p.getProject().getName());
public static final FieldDef<ProjectState, String> DESCRIPTION = public static final FieldDef<ProjectData, String> DESCRIPTION =
fullText("description").build(p -> p.getProject().getDescription()); fullText("description").build(p -> p.getProject().getDescription());
public static final FieldDef<ProjectState, String> PARENT_NAME = public static final FieldDef<ProjectData, String> PARENT_NAME =
exact("parent_name").build(p -> p.getProject().getParentName()); exact("parent_name").build(p -> p.getProject().getParentName());
public static final FieldDef<ProjectState, Iterable<String>> NAME_PART = public static final FieldDef<ProjectData, Iterable<String>> NAME_PART =
prefix("name_part").buildRepeatable(p -> SchemaUtil.getNameParts(p.getProject().getName())); prefix("name_part").buildRepeatable(p -> SchemaUtil.getNameParts(p.getProject().getName()));
public static final FieldDef<ProjectState, Iterable<String>> ANCESTOR_NAME = public static final FieldDef<ProjectData, Iterable<String>> ANCESTOR_NAME =
exact("ancestor_name") exact("ancestor_name")
.buildRepeatable( .buildRepeatable(p -> Iterables.transform(p.getAncestors(), n -> n.get()));
p -> Iterables.transform(p.parents(), parent -> parent.getProject().getName()));
} }

8
gerrit-server/src/main/java/com/google/gerrit/server/index/project/ProjectIndex.java
View File

@@ -18,16 +18,16 @@ import com.google.gerrit.index.Index;
import com.google.gerrit.index.IndexDefinition; import com.google.gerrit.index.IndexDefinition;
import com.google.gerrit.index.query.Predicate; import com.google.gerrit.index.query.Predicate;
import com.google.gerrit.reviewdb.client.Project; import com.google.gerrit.reviewdb.client.Project;
import com.google.gerrit.server.project.ProjectState; import com.google.gerrit.server.project.ProjectData;
import com.google.gerrit.server.query.project.ProjectPredicates; import com.google.gerrit.server.query.project.ProjectPredicates;
public interface ProjectIndex extends Index<Project.NameKey, ProjectState> { public interface ProjectIndex extends Index<Project.NameKey, ProjectData> {
public interface Factory public interface Factory
extends IndexDefinition.IndexFactory<Project.NameKey, ProjectState, ProjectIndex> {} extends IndexDefinition.IndexFactory<Project.NameKey, ProjectData, ProjectIndex> {}
@Override @Override
default Predicate<ProjectState> keyPredicate(Project.NameKey nameKey) { default Predicate<ProjectData> keyPredicate(Project.NameKey nameKey) {
return ProjectPredicates.name(nameKey); return ProjectPredicates.name(nameKey);
} }
} }

4
gerrit-server/src/main/java/com/google/gerrit/server/index/project/ProjectIndexCollection.java
View File

@@ -17,13 +17,13 @@ package com.google.gerrit.server.index.project;
import com.google.common.annotations.VisibleForTesting; import com.google.common.annotations.VisibleForTesting;
import com.google.gerrit.index.IndexCollection; import com.google.gerrit.index.IndexCollection;
import com.google.gerrit.reviewdb.client.Project; import com.google.gerrit.reviewdb.client.Project;
import com.google.gerrit.server.project.ProjectState; import com.google.gerrit.server.project.ProjectData;
import com.google.inject.Inject; import com.google.inject.Inject;
import com.google.inject.Singleton; import com.google.inject.Singleton;
@Singleton @Singleton
public class ProjectIndexCollection public class ProjectIndexCollection
extends IndexCollection<Project.NameKey, ProjectState, ProjectIndex> { extends IndexCollection<Project.NameKey, ProjectData, ProjectIndex> {
@Inject @Inject
@VisibleForTesting @VisibleForTesting

4
gerrit-server/src/main/java/com/google/gerrit/server/index/project/ProjectIndexDefinition.java
View File

@@ -17,11 +17,11 @@ package com.google.gerrit.server.index.project;
import com.google.gerrit.common.Nullable; import com.google.gerrit.common.Nullable;
import com.google.gerrit.index.IndexDefinition; import com.google.gerrit.index.IndexDefinition;
import com.google.gerrit.reviewdb.client.Project; import com.google.gerrit.reviewdb.client.Project;
import com.google.gerrit.server.project.ProjectState; import com.google.gerrit.server.project.ProjectData;
import com.google.inject.Inject; import com.google.inject.Inject;
public class ProjectIndexDefinition public class ProjectIndexDefinition
extends IndexDefinition<Project.NameKey, ProjectState, ProjectIndex> { extends IndexDefinition<Project.NameKey, ProjectData, ProjectIndex> {
@Inject @Inject
ProjectIndexDefinition( ProjectIndexDefinition(

6
gerrit-server/src/main/java/com/google/gerrit/server/index/project/ProjectIndexRewriter.java
View File

@@ -20,12 +20,12 @@ import com.google.gerrit.index.IndexRewriter;
import com.google.gerrit.index.QueryOptions; import com.google.gerrit.index.QueryOptions;
import com.google.gerrit.index.query.Predicate; import com.google.gerrit.index.query.Predicate;
import com.google.gerrit.index.query.QueryParseException; import com.google.gerrit.index.query.QueryParseException;
import com.google.gerrit.server.project.ProjectState; import com.google.gerrit.server.project.ProjectData;
import com.google.inject.Inject; import com.google.inject.Inject;
import com.google.inject.Singleton; import com.google.inject.Singleton;
@Singleton @Singleton
public class ProjectIndexRewriter implements IndexRewriter<ProjectState> { public class ProjectIndexRewriter implements IndexRewriter<ProjectData> {
private final ProjectIndexCollection indexes; private final ProjectIndexCollection indexes;
@Inject @Inject
@@ -34,7 +34,7 @@ public class ProjectIndexRewriter implements IndexRewriter<ProjectState> {
} }
@Override @Override
public Predicate<ProjectState> rewrite(Predicate<ProjectState> in, QueryOptions opts) public Predicate<ProjectData> rewrite(Predicate<ProjectData> in, QueryOptions opts)
throws QueryParseException { throws QueryParseException {
ProjectIndex index = indexes.getSearchIndex(); ProjectIndex index = indexes.getSearchIndex();
checkNotNull(index, "no active search index configured for projects"); checkNotNull(index, "no active search index configured for projects");

6
gerrit-server/src/main/java/com/google/gerrit/server/index/project/ProjectIndexerImpl.java
View File

@@ -21,7 +21,7 @@ import com.google.gerrit.extensions.registration.DynamicSet;
import com.google.gerrit.index.Index; import com.google.gerrit.index.Index;
import com.google.gerrit.reviewdb.client.Project; import com.google.gerrit.reviewdb.client.Project;
import com.google.gerrit.server.project.ProjectCache; import com.google.gerrit.server.project.ProjectCache;
import com.google.gerrit.server.project.ProjectState; import com.google.gerrit.server.project.ProjectData;
import com.google.inject.assistedinject.Assisted; import com.google.inject.assistedinject.Assisted;
import com.google.inject.assistedinject.AssistedInject; import com.google.inject.assistedinject.AssistedInject;
import java.io.IOException; import java.io.IOException;
@@ -64,8 +64,8 @@ public class ProjectIndexerImpl implements ProjectIndexer {
@Override @Override
public void index(Project.NameKey nameKey) throws IOException { public void index(Project.NameKey nameKey) throws IOException {
for (Index<?, ProjectState> i : getWriteIndexes()) { for (Index<?, ProjectData> i : getWriteIndexes()) {
i.replace(projectCache.get(nameKey)); i.replace(projectCache.get(nameKey).toProjectData());
} }
fireProjectIndexedEvent(nameKey.get()); fireProjectIndexedEvent(nameKey.get());
} }

8
gerrit-server/src/main/java/com/google/gerrit/server/index/project/ProjectSchemaDefinitions.java
View File

@@ -18,11 +18,11 @@ import static com.google.gerrit.index.SchemaUtil.schema;
import com.google.gerrit.index.Schema; import com.google.gerrit.index.Schema;
import com.google.gerrit.index.SchemaDefinitions; import com.google.gerrit.index.SchemaDefinitions;
import com.google.gerrit.server.project.ProjectState; import com.google.gerrit.server.project.ProjectData;
public class ProjectSchemaDefinitions extends SchemaDefinitions<ProjectState> { public class ProjectSchemaDefinitions extends SchemaDefinitions<ProjectData> {
static final Schema<ProjectState> V1 = static final Schema<ProjectData> V1 =
schema( schema(
ProjectField.NAME, ProjectField.NAME,
ProjectField.DESCRIPTION, ProjectField.DESCRIPTION,
@@ -33,6 +33,6 @@ public class ProjectSchemaDefinitions extends SchemaDefinitions<ProjectState> {
public static final ProjectSchemaDefinitions INSTANCE = new ProjectSchemaDefinitions(); public static final ProjectSchemaDefinitions INSTANCE = new ProjectSchemaDefinitions();
private ProjectSchemaDefinitions() { private ProjectSchemaDefinitions() {
super("projects", ProjectState.class); super("projects", ProjectData.class);
} }
} }

36
gerrit-server/src/main/java/com/google/gerrit/server/project/ProjectData.java Normal file
View File

@@ -0,0 +1,36 @@
// Copyright (C) 2017 The Android Open Source Project
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
// You may obtain a copy of the License at
//
// http://www.apache.org/licenses/LICENSE-2.0
//
// Unless required by applicable law or agreed to in writing, software
// distributed under the License is distributed on an "AS IS" BASIS,
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
// See the License for the specific language governing permissions and
// limitations under the License.
package com.google.gerrit.server.project;
import com.google.common.collect.ImmutableList;
import com.google.gerrit.reviewdb.client.Project;
public class ProjectData {
private final Project project;
private final ImmutableList<Project.NameKey> ancestors;
public ProjectData(Project project, Iterable<Project.NameKey> ancestors) {
this.project = project;
this.ancestors = ImmutableList.copyOf(ancestors);
}
public Project getProject() {
return project;
}
public ImmutableList<Project.NameKey> getAncestors() {
return ancestors;
}
}

4
gerrit-server/src/main/java/com/google/gerrit/server/project/ProjectState.java
View File

@@ -553,6 +553,10 @@ public class ProjectState {
} }
} }
public ProjectData toProjectData() {
return new ProjectData(getProject(), parents().transform(s -> s.getProject().getNameKey()));
}
private String readFile(Path p) throws IOException { private String readFile(Path p) throws IOException {
return Files.exists(p) ? new String(Files.readAllBytes(p), UTF_8) : null; return Files.exists(p) ? new String(Files.readAllBytes(p), UTF_8) : null;
} }

10
gerrit-server/src/main/java/com/google/gerrit/server/project/QueryProjects.java
View File

@@ -105,12 +105,12 @@ public class QueryProjects implements RestReadView<TopLevelResource> {
} }
try { try {
QueryResult<ProjectState> result = queryProcessor.query(queryBuilder.parse(query)); QueryResult<ProjectData> result = queryProcessor.query(queryBuilder.parse(query));
List<ProjectState> projects = result.entities(); List<ProjectData> pds = result.entities();
ArrayList<ProjectInfo> projectInfos = Lists.newArrayListWithCapacity(projects.size()); ArrayList<ProjectInfo> projectInfos = Lists.newArrayListWithCapacity(pds.size());
for (ProjectState projectState : projects) { for (ProjectData pd : pds) {
projectInfos.add(json.format(projectState.getProject())); projectInfos.add(json.format(pd.getProject()));
} }
return projectInfos; return projectInfos;
} catch (QueryParseException e) { } catch (QueryParseException e) {

8
gerrit-server/src/main/java/com/google/gerrit/server/query/project/ProjectIsVisibleToPredicate.java
View File

@@ -19,11 +19,11 @@ import com.google.gerrit.server.CurrentUser;
import com.google.gerrit.server.index.IndexUtils; import com.google.gerrit.server.index.IndexUtils;
import com.google.gerrit.server.permissions.PermissionBackend; import com.google.gerrit.server.permissions.PermissionBackend;
import com.google.gerrit.server.permissions.ProjectPermission; import com.google.gerrit.server.permissions.ProjectPermission;
import com.google.gerrit.server.project.ProjectState; import com.google.gerrit.server.project.ProjectData;
import com.google.gerrit.server.query.account.AccountQueryBuilder; import com.google.gerrit.server.query.account.AccountQueryBuilder;
import com.google.gwtorm.server.OrmException; import com.google.gwtorm.server.OrmException;
public class ProjectIsVisibleToPredicate extends IsVisibleToPredicate<ProjectState> { public class ProjectIsVisibleToPredicate extends IsVisibleToPredicate<ProjectData> {
protected final PermissionBackend permissionBackend; protected final PermissionBackend permissionBackend;
protected final CurrentUser user; protected final CurrentUser user;
@@ -34,10 +34,10 @@ public class ProjectIsVisibleToPredicate extends IsVisibleToPredicate<ProjectSta
} }
@Override @Override
public boolean match(ProjectState projectState) throws OrmException { public boolean match(ProjectData pd) throws OrmException {
return permissionBackend return permissionBackend
.user(user) .user(user)
.project(projectState.getProject().getNameKey()) .project(pd.getProject().getNameKey())
.testOrFalse(ProjectPermission.READ); .testOrFalse(ProjectPermission.READ);
} }

8
gerrit-server/src/main/java/com/google/gerrit/server/query/project/ProjectPredicates.java
View File

@@ -19,15 +19,15 @@ import com.google.gerrit.index.query.IndexPredicate;
import com.google.gerrit.index.query.Predicate; import com.google.gerrit.index.query.Predicate;
import com.google.gerrit.reviewdb.client.Project; import com.google.gerrit.reviewdb.client.Project;
import com.google.gerrit.server.index.project.ProjectField; import com.google.gerrit.server.index.project.ProjectField;
import com.google.gerrit.server.project.ProjectState; import com.google.gerrit.server.project.ProjectData;
public class ProjectPredicates { public class ProjectPredicates {
public static Predicate<ProjectState> name(Project.NameKey nameKey) { public static Predicate<ProjectData> name(Project.NameKey nameKey) {
return new ProjectPredicate(ProjectField.NAME, nameKey.get()); return new ProjectPredicate(ProjectField.NAME, nameKey.get());
} }
static class ProjectPredicate extends IndexPredicate<ProjectState> { static class ProjectPredicate extends IndexPredicate<ProjectData> {
ProjectPredicate(FieldDef<ProjectState, ?> def, String value) { ProjectPredicate(FieldDef<ProjectData, ?> def, String value) {
super(def, value); super(def, value);
} }
} }

10
gerrit-server/src/main/java/com/google/gerrit/server/query/project/ProjectQueryBuilder.java
View File

@@ -20,14 +20,14 @@ import com.google.gerrit.index.query.Predicate;
import com.google.gerrit.index.query.QueryBuilder; import com.google.gerrit.index.query.QueryBuilder;
import com.google.gerrit.index.query.QueryParseException; import com.google.gerrit.index.query.QueryParseException;
import com.google.gerrit.reviewdb.client.Project; import com.google.gerrit.reviewdb.client.Project;
import com.google.gerrit.server.project.ProjectState; import com.google.gerrit.server.project.ProjectData;
import com.google.inject.Inject; import com.google.inject.Inject;
/** Parses a query string meant to be applied to project objects. */ /** Parses a query string meant to be applied to project objects. */
public class ProjectQueryBuilder extends QueryBuilder<ProjectState> { public class ProjectQueryBuilder extends QueryBuilder<ProjectData> {
public static final String FIELD_LIMIT = "limit"; public static final String FIELD_LIMIT = "limit";
private static final QueryBuilder.Definition<ProjectState, ProjectQueryBuilder> mydef = private static final QueryBuilder.Definition<ProjectData, ProjectQueryBuilder> mydef =
new QueryBuilder.Definition<>(ProjectQueryBuilder.class); new QueryBuilder.Definition<>(ProjectQueryBuilder.class);
@Inject @Inject
@@ -36,12 +36,12 @@ public class ProjectQueryBuilder extends QueryBuilder<ProjectState> {
} }
@Operator @Operator
public Predicate<ProjectState> name(String name) { public Predicate<ProjectData> name(String name) {
return ProjectPredicates.name(new Project.NameKey(name)); return ProjectPredicates.name(new Project.NameKey(name));
} }
@Operator @Operator
public Predicate<ProjectState> limit(String query) throws QueryParseException { public Predicate<ProjectData> limit(String query) throws QueryParseException {
Integer limit = Ints.tryParse(query); Integer limit = Ints.tryParse(query);
if (limit == null) { if (limit == null) {
throw error("Invalid limit: " + query); throw error("Invalid limit: " + query);

6
gerrit-server/src/main/java/com/google/gerrit/server/query/project/ProjectQueryProcessor.java
View File

@@ -29,7 +29,7 @@ import com.google.gerrit.server.index.project.ProjectIndexCollection;
import com.google.gerrit.server.index.project.ProjectIndexRewriter; import com.google.gerrit.server.index.project.ProjectIndexRewriter;
import com.google.gerrit.server.index.project.ProjectSchemaDefinitions; import com.google.gerrit.server.index.project.ProjectSchemaDefinitions;
import com.google.gerrit.server.permissions.PermissionBackend; import com.google.gerrit.server.permissions.PermissionBackend;
import com.google.gerrit.server.project.ProjectState; import com.google.gerrit.server.project.ProjectData;
import com.google.inject.Inject; import com.google.inject.Inject;
import com.google.inject.Provider; import com.google.inject.Provider;
@@ -39,7 +39,7 @@ import com.google.inject.Provider;
* <p>Instances are one-time-use. Other singleton classes should inject a Provider rather than * <p>Instances are one-time-use. Other singleton classes should inject a Provider rather than
* holding on to a single instance. * holding on to a single instance.
*/ */
public class ProjectQueryProcessor extends QueryProcessor<ProjectState> { public class ProjectQueryProcessor extends QueryProcessor<ProjectData> {
private final PermissionBackend permissionBackend; private final PermissionBackend permissionBackend;
private final Provider<CurrentUser> userProvider; private final Provider<CurrentUser> userProvider;
@@ -72,7 +72,7 @@ public class ProjectQueryProcessor extends QueryProcessor<ProjectState> {
} }
@Override @Override
protected Predicate<ProjectState> enforceVisibility(Predicate<ProjectState> pred) { protected Predicate<ProjectData> enforceVisibility(Predicate<ProjectData> pred) {
return new AndSource<>( return new AndSource<>(
pred, new ProjectIsVisibleToPredicate(permissionBackend, userProvider.get()), start); pred, new ProjectIsVisibleToPredicate(permissionBackend, userProvider.get()), start);
} }