DatabaseDeleteHandler: Delete changes from the secondary index
If changes are not deleted from the secondary index, they will still
appear in dashboards and query results. Clicking on those changes will
then result in a 404 error.
Change-Id: I5639ae1c504ed57b871d3cb4ec5fc4e6a7748cfd
diff --git a/src/main/java/com/googlesource/gerrit/plugins/deleteproject/database/DatabaseDeleteHandler.java b/src/main/java/com/googlesource/gerrit/plugins/deleteproject/database/DatabaseDeleteHandler.java
index f1ce3ef..0377b4b 100644
--- a/src/main/java/com/googlesource/gerrit/plugins/deleteproject/database/DatabaseDeleteHandler.java
+++ b/src/main/java/com/googlesource/gerrit/plugins/deleteproject/database/DatabaseDeleteHandler.java
@@ -19,6 +19,7 @@
import com.google.gerrit.reviewdb.client.PatchSet;
import com.google.gerrit.reviewdb.client.Project;
import com.google.gerrit.reviewdb.server.ReviewDb;
+import com.google.gerrit.server.index.ChangeIndexer;
import com.google.gerrit.server.query.change.ChangeData;
import com.google.gerrit.server.query.change.InternalChangeQuery;
import com.google.gwtorm.jdbc.JdbcSchema;
@@ -29,6 +30,10 @@
import com.googlesource.gerrit.plugins.deleteproject.CannotDeleteProjectException;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import java.io.IOException;
import java.sql.Connection;
import java.sql.SQLException;
import java.util.Collection;
@@ -36,14 +41,20 @@
import java.util.List;
public class DatabaseDeleteHandler {
+ private static final Logger log =
+ LoggerFactory.getLogger(DatabaseDeleteHandler.class);
+
private final ReviewDb db;
private final Provider<InternalChangeQuery> queryProvider;
+ private final ChangeIndexer indexer;
@Inject
public DatabaseDeleteHandler(ReviewDb db,
- Provider<InternalChangeQuery> queryProvider) {
+ Provider<InternalChangeQuery> queryProvider,
+ ChangeIndexer indexer) {
this.db = db;
this.queryProvider = queryProvider;
+ this.indexer = indexer;
}
public Collection<String> getWarnings(Project project) throws OrmException {
@@ -97,6 +108,14 @@
db.changeMessages().delete(db.changeMessages().byChange(id));
db.starredChanges().delete(db.starredChanges().byChange(id));
db.changes().delete(Collections.singleton(cd.change()));
+
+ // Delete from the secondary index
+ try {
+ indexer.delete(id);
+ } catch (IOException e) {
+ log.error(
+ String.format("Failed to delete change %s from index", id), e);
+ }
}
}
