Adapt to Gerrit API updated in I0cf954f05f9679e5e35a38611fa25e7011590257 Change-Id: Ibaaa67c5fa99380104575d0e7d7991fab0c5fd58
diff --git a/src/main/java/com/google/gerrit/opensearch/AbstractOpenSearchIndex.java b/src/main/java/com/google/gerrit/opensearch/AbstractOpenSearchIndex.java index 29aff43..52eeec8 100644 --- a/src/main/java/com/google/gerrit/opensearch/AbstractOpenSearchIndex.java +++ b/src/main/java/com/google/gerrit/opensearch/AbstractOpenSearchIndex.java
@@ -48,7 +48,7 @@ import com.google.gerrit.opensearch.builders.SearchSourceBuilder; import com.google.gerrit.opensearch.bulk.DeleteRequest; import com.google.gerrit.proto.Protos; -import com.google.gerrit.server.config.SitePaths; +import com.google.gerrit.server.index.IndexDir; import com.google.gerrit.server.index.IndexUtils; import com.google.gerrit.server.index.options.AutoFlush; import com.google.gerrit.server.logging.Metadata; @@ -66,6 +66,7 @@ import java.io.Reader; import java.io.UnsupportedEncodingException; import java.net.URLEncoder; +import java.nio.file.Path; import java.sql.Timestamp; import java.util.Collections; import java.util.List; @@ -133,7 +134,7 @@ private final OpenSearchConfiguration config; private final Schema<V> schema; - private final SitePaths sitePaths; + private final Path indexDir; private final String indexNameRaw; private final Map<String, String> refreshParam; @@ -145,14 +146,14 @@ AbstractOpenSearchIndex( OpenSearchConfiguration config, - SitePaths sitePaths, + @IndexDir Path indexDir, Schema<V> schema, RestClientProvider client, String indexName, AutoFlush autoFlush, Function<V, K> valueToKeyFunction) { this.config = config; - this.sitePaths = sitePaths; + this.indexDir = indexDir; this.schema = schema; this.gson = new GsonBuilder().setFieldNamingPolicy(LOWER_CASE_WITH_UNDERSCORES).create(); this.queryBuilder = new OpenSearchQueryBuilder(); @@ -188,7 +189,7 @@ @Override public void markReady(boolean ready) { - IndexUtils.setReady(sitePaths, indexNameRaw, schema.getVersion(), ready); + IndexUtils.setReady(indexDir, indexNameRaw, schema.getVersion(), ready); } @Override
diff --git a/src/main/java/com/google/gerrit/opensearch/IndexVersionManager.java b/src/main/java/com/google/gerrit/opensearch/IndexVersionManager.java index a57b960..4369b44 100644 --- a/src/main/java/com/google/gerrit/opensearch/IndexVersionManager.java +++ b/src/main/java/com/google/gerrit/opensearch/IndexVersionManager.java
@@ -22,12 +22,14 @@ import com.google.gerrit.server.config.GerritServerConfig; import com.google.gerrit.server.config.SitePaths; import com.google.gerrit.server.index.GerritIndexStatus; +import com.google.gerrit.server.index.IndexDir; import com.google.gerrit.server.index.OnlineUpgradeListener; import com.google.gerrit.server.index.VersionManager; import com.google.gerrit.server.plugincontext.PluginSetContext; import com.google.inject.Inject; import com.google.inject.Singleton; import java.io.IOException; +import java.nio.file.Path; import java.util.Collection; import java.util.List; import java.util.TreeMap; @@ -45,11 +47,13 @@ @GerritServerConfig Config cfg, OpenSearchConfiguration openCfg, SitePaths sitePaths, + @IndexDir Path indexDir, PluginSetContext<OnlineUpgradeListener> listeners, Collection<IndexDefinition<?, ?, ?>> defs, IndexVersionDiscovery versionDiscovery) { super( sitePaths, + indexDir, listeners, defs, VersionManager.shouldPerformOnlineUpgrade(cfg),
diff --git a/src/main/java/com/google/gerrit/opensearch/OpenSearchAccountIndex.java b/src/main/java/com/google/gerrit/opensearch/OpenSearchAccountIndex.java index 93582ea..fca47c4 100644 --- a/src/main/java/com/google/gerrit/opensearch/OpenSearchAccountIndex.java +++ b/src/main/java/com/google/gerrit/opensearch/OpenSearchAccountIndex.java
@@ -28,7 +28,7 @@ import com.google.gerrit.opensearch.bulk.UpdateRequest; import com.google.gerrit.server.account.AccountCache; import com.google.gerrit.server.account.AccountState; -import com.google.gerrit.server.config.SitePaths; +import com.google.gerrit.server.index.IndexDir; import com.google.gerrit.server.index.IndexUtils; import com.google.gerrit.server.index.account.AccountField; import com.google.gerrit.server.index.account.AccountIndex; @@ -39,6 +39,7 @@ import com.google.inject.Inject; import com.google.inject.Provider; import com.google.inject.assistedinject.Assisted; +import java.nio.file.Path; import java.util.Set; import org.apache.hc.core5.http.HttpStatus; import org.opensearch.client.Response; @@ -62,12 +63,12 @@ @Inject OpenSearchAccountIndex( OpenSearchConfiguration cfg, - SitePaths sitePaths, + @IndexDir Path indexDir, Provider<AccountCache> accountCache, RestClientProvider client, AutoFlush autoFlush, @Assisted Schema<AccountState> schema) { - super(cfg, sitePaths, schema, client, ACCOUNTS, autoFlush, AccountIndex.ENTITY_TO_KEY); + super(cfg, indexDir, schema, client, ACCOUNTS, autoFlush, AccountIndex.ENTITY_TO_KEY); this.accountCache = accountCache; this.mapping = new AccountMapping(schema, client.adapter()); this.schema = schema;
diff --git a/src/main/java/com/google/gerrit/opensearch/OpenSearchChangeIndex.java b/src/main/java/com/google/gerrit/opensearch/OpenSearchChangeIndex.java index f3298db..b2c9115 100644 --- a/src/main/java/com/google/gerrit/opensearch/OpenSearchChangeIndex.java +++ b/src/main/java/com/google/gerrit/opensearch/OpenSearchChangeIndex.java
@@ -37,7 +37,7 @@ import com.google.gerrit.opensearch.bulk.UpdateRequest; import com.google.gerrit.server.change.MergeabilityComputationBehavior; import com.google.gerrit.server.config.GerritServerConfig; -import com.google.gerrit.server.config.SitePaths; +import com.google.gerrit.server.index.IndexDir; import com.google.gerrit.server.index.IndexUtils; import com.google.gerrit.server.index.change.ChangeField; import com.google.gerrit.server.index.change.ChangeIndex; @@ -49,6 +49,7 @@ import com.google.gson.JsonObject; import com.google.inject.Inject; import com.google.inject.assistedinject.Assisted; +import java.nio.file.Path; import java.util.Set; import org.apache.hc.core5.http.HttpStatus; import org.eclipse.jgit.lib.Config; @@ -78,12 +79,12 @@ OpenSearchChangeIndex( OpenSearchConfiguration cfg, ChangeData.Factory changeDataFactory, - SitePaths sitePaths, + @IndexDir Path indexDir, RestClientProvider clientBuilder, @GerritServerConfig Config gerritConfig, AutoFlush autoFlush, @Assisted Schema<ChangeData> schema) { - super(cfg, sitePaths, schema, clientBuilder, CHANGES, autoFlush, ChangeIndex.ENTITY_TO_KEY); + super(cfg, indexDir, schema, clientBuilder, CHANGES, autoFlush, ChangeIndex.ENTITY_TO_KEY); this.changeDataFactory = changeDataFactory; this.mapping = new ChangeMapping(schema, client.adapter()); this.schema = schema;
diff --git a/src/main/java/com/google/gerrit/opensearch/OpenSearchGroupIndex.java b/src/main/java/com/google/gerrit/opensearch/OpenSearchGroupIndex.java index 3515936..58fb32f 100644 --- a/src/main/java/com/google/gerrit/opensearch/OpenSearchGroupIndex.java +++ b/src/main/java/com/google/gerrit/opensearch/OpenSearchGroupIndex.java
@@ -28,7 +28,7 @@ import com.google.gerrit.opensearch.bulk.IndexRequest; import com.google.gerrit.opensearch.bulk.UpdateRequest; import com.google.gerrit.server.account.GroupCache; -import com.google.gerrit.server.config.SitePaths; +import com.google.gerrit.server.index.IndexDir; import com.google.gerrit.server.index.IndexUtils; import com.google.gerrit.server.index.group.GroupField; import com.google.gerrit.server.index.group.GroupIndex; @@ -39,6 +39,7 @@ import com.google.inject.Inject; import com.google.inject.Provider; import com.google.inject.assistedinject.Assisted; +import java.nio.file.Path; import java.util.Set; import org.apache.hc.core5.http.HttpStatus; import org.opensearch.client.Response; @@ -62,12 +63,12 @@ @Inject OpenSearchGroupIndex( OpenSearchConfiguration cfg, - SitePaths sitePaths, + @IndexDir Path indexDir, Provider<GroupCache> groupCache, RestClientProvider client, AutoFlush autoFlush, @Assisted Schema<InternalGroup> schema) { - super(cfg, sitePaths, schema, client, GROUPS, autoFlush, GroupIndex.ENTITY_TO_KEY); + super(cfg, indexDir, schema, client, GROUPS, autoFlush, GroupIndex.ENTITY_TO_KEY); this.groupCache = groupCache; this.mapping = new GroupMapping(schema, client.adapter()); this.schema = schema;
diff --git a/src/main/java/com/google/gerrit/opensearch/OpenSearchProjectIndex.java b/src/main/java/com/google/gerrit/opensearch/OpenSearchProjectIndex.java index 5509da3..e5e5683 100644 --- a/src/main/java/com/google/gerrit/opensearch/OpenSearchProjectIndex.java +++ b/src/main/java/com/google/gerrit/opensearch/OpenSearchProjectIndex.java
@@ -29,7 +29,7 @@ import com.google.gerrit.opensearch.bulk.BulkRequest; import com.google.gerrit.opensearch.bulk.IndexRequest; import com.google.gerrit.opensearch.bulk.UpdateRequest; -import com.google.gerrit.server.config.SitePaths; +import com.google.gerrit.server.index.IndexDir; import com.google.gerrit.server.index.IndexUtils; import com.google.gerrit.server.index.options.AutoFlush; import com.google.gerrit.server.project.ProjectCache; @@ -40,6 +40,7 @@ import com.google.inject.Inject; import com.google.inject.Provider; import com.google.inject.assistedinject.Assisted; +import java.nio.file.Path; import java.util.Optional; import java.util.Set; import org.apache.hc.core5.http.HttpStatus; @@ -64,12 +65,12 @@ @Inject OpenSearchProjectIndex( OpenSearchConfiguration cfg, - SitePaths sitePaths, + @IndexDir Path indexDir, Provider<ProjectCache> projectCache, RestClientProvider client, AutoFlush autoFlush, @Assisted Schema<ProjectData> schema) { - super(cfg, sitePaths, schema, client, PROJECTS, autoFlush, ProjectIndex.ENTITY_TO_KEY); + super(cfg, indexDir, schema, client, PROJECTS, autoFlush, ProjectIndex.ENTITY_TO_KEY); this.projectCache = projectCache; this.mapping = new ProjectMapping(schema, client.adapter()); this.schema = schema;
diff --git a/src/main/java/com/google/gerrit/opensearch/init/InitOpenSearchIndex.java b/src/main/java/com/google/gerrit/opensearch/init/InitOpenSearchIndex.java index bb53502..ef6499d 100644 --- a/src/main/java/com/google/gerrit/opensearch/init/InitOpenSearchIndex.java +++ b/src/main/java/com/google/gerrit/opensearch/init/InitOpenSearchIndex.java
@@ -22,6 +22,7 @@ import com.google.gerrit.pgm.init.api.InitStep; import com.google.gerrit.pgm.init.api.Section; import com.google.gerrit.server.config.SitePaths; +import com.google.gerrit.server.index.IndexDir; import com.google.gerrit.server.index.IndexModule; import com.google.gerrit.server.index.IndexUtils; import com.google.inject.Inject; @@ -34,16 +35,23 @@ private final ConsoleUI ui; private final Section index; private final SitePaths site; + private final Path indexDir; private final InitFlags initFlags; private final Section gerrit; private final Section.Factory sections; @Inject - InitOpenSearchIndex(ConsoleUI ui, Section.Factory sections, SitePaths site, InitFlags initFlags) { + InitOpenSearchIndex( + ConsoleUI ui, + Section.Factory sections, + SitePaths site, + @IndexDir Path indexDir, + InitFlags initFlags) { this.ui = ui; this.index = sections.get("index", null); this.gerrit = sections.get("gerrit", null); this.site = site; + this.indexDir = indexDir; this.initFlags = initFlags; this.sections = sections; } @@ -62,7 +70,7 @@ if ((site.isNew || isEmptySite()) && type.isLucene()) { for (SchemaDefinitions<?> def : IndexModule.ALL_SCHEMA_DEFS) { - IndexUtils.setReady(site, def.getName(), def.getLatest().getVersion(), true); + IndexUtils.setReady(indexDir, def.getName(), def.getLatest().getVersion(), true); } } else { String message =