XWIKI-23824: Double search result after upgrade to 17.10.0

Author: tmortagne

xwiki-platform-core/xwiki-platform-search/xwiki-platform-search-solr/xwiki-platform-search-solr-api/src/main/java/org/xwiki/search/solr/internal/job/IndexerJob.java

@@ -67,6 +67,8 @@ public class IndexerJob extends AbstractJob<IndexerRequest, DefaultJobStatus<Ind
      */
     private static final JobGroupPath GROUP = new JobGroupPath(Arrays.asList("solr", "indexer"));
 
+    private static final String AND = " AND ";
+
     /**
      * Used to send documents to index or delete to/from Solr index.
      */
@@ -205,37 +207,33 @@ private void cleanInvalid() throws SolrServerException, IOException, SolrIndexer
     {
         StringBuilder builder = new StringBuilder();
 
+        // Filter documents based on the indicated root reference
+        builder.append('(');
+        builder.append(this.solrReferenceResolver.getQuery(getRequest().getRootReference()));
+        builder.append(')');
+
+        builder.append(AND);
+
+        builder.append('-');
         builder.append('(');
 
         // All entries which don't have a docId set
-        builder.append(notSet(FieldUtils.DOC_ID));
+        builder.append(FieldUtils.DOC_ID);
 
-        builder.append(" OR ");
+        builder.append(AND);
 
         // All entries which don't have a fullName set
-        builder.append(notSet(FieldUtils.FULLNAME));
+        builder.append(FieldUtils.FULLNAME);
 
         // TODO: Remove from the core all entries for which no corresponding DOCUMENT type entry exist (see
         // https://jira.xwiki.org/browse/XWIKI-22949)
 
         builder.append(')');
 
-        builder.append(" AND ");
-
-        // Filter documents based on the indicated root reference
-        builder.append('(');
-        builder.append(this.solrReferenceResolver.getQuery(getRequest().getRootReference()));
-        builder.append(')');
-
         // Execute the delete
         this.solrInstance.deleteByQuery(builder.toString());
 
         // Commit
         this.solrInstance.commit();
     }
-
-    private String notSet(String field)
-    {
-        return "-" + field + ":*";
-    }
 }

xwiki-platform-distribution/xwiki-platform-distribution-flavor/xwiki-platform-distribution-flavor-test/xwiki-platform-distribution-flavor-test-upgrade/xwiki-platform-distribution-flavor-test-upgrade-1610/src/test/it/org/xwiki/test/ui/Upgrade1610Test.java

@@ -19,11 +19,35 @@
  */
 package org.xwiki.test.ui;
 
+import org.xwiki.rendering.syntax.Syntax;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+
 /**
  * Execute upgrade tests.
  * 
  * @version $Id$
  */
 public class Upgrade1610Test extends UpgradeTest
 {
+    @Override
+    protected void postUpdateValidate() throws Exception
+    {
+        // Make sure the Solr migration went as planned
+        assertSolrMigration();
+    }
+
+    private void assertSolrMigration() throws Exception
+    {
+        // We expect the default Sandbox home page which id was generated based on the default locale to be removed
+        String result = getUtil().executeWikiPlain("""
+{{velocity}}
+  #if ($services.component.getInstance('org.xwiki.search.solr.internal.api.SolrInstance').get('xwiki:Sandbox.WebHome_en'))true#{else}false#end
+
+  #if ($services.component.getInstance('org.xwiki.search.solr.internal.api.SolrInstance').get('xwiki:Sandbox.WebHome_'))true#{else}false#end
+{{/velocity}}
+            """, Syntax.XWIKI_2_1);
+
+        assertEquals("false\ntrue", result.trim());
+    }
 }