Merge branch 'stable-2.9' into stable-2.10

* stable-2.9:
  Remove uneeded dependency in ChangesCollection
  Delete a change from the index when it is not in the DB

Change-Id: Ifed2fc5073071e9d4f457aa02b73caa2b6173599

gerrit-lucene/src/main/java/com/google/gerrit/lucene/LuceneChangeIndex.java

@@ -336,6 +336,19 @@ public class LuceneChangeIndex implements ChangeIndex {
     }
   }
 
+  @SuppressWarnings("unchecked")
+  @Override
+  public void delete(int id) throws IOException {
+    Term idTerm = QueryBuilder.idTerm(id);
+    try {
+      Futures.allAsList(
+          openIndex.delete(idTerm),
+          closedIndex.delete(idTerm)).get();
+    } catch (ExecutionException | InterruptedException e) {
+      throw new IOException(e);
+    }
+  }
+
   @Override
   public void deleteAll() throws IOException {
     openIndex.deleteAll();

gerrit-lucene/src/main/java/com/google/gerrit/lucene/QueryBuilder.java

@@ -56,6 +56,10 @@ public class QueryBuilder {
     return intTerm(ID_FIELD, cd.getId().get());
   }
 
+  public static Term idTerm(int id) {
+    return intTerm(ID_FIELD, id);
+  }
+
   private final Schema<ChangeData> schema;
   private final org.apache.lucene.util.QueryBuilder queryBuilder;