From 8788af003e1e416acf742a80abdbf1a3b61831bf Mon Sep 17 00:00:00 2001
From: agazzarini <a.gazzarini@sease.io>
Date: Mon, 24 Feb 2020 08:59:44 +0100
Subject: [PATCH] [ SEARCH-2090 ] Removed checks before deletes

---
 .../alfresco/solr/SolrInformationServer.java  | 34 +++++--------------
 1 file changed, 9 insertions(+), 25 deletions(-)

diff --git a/search-services/alfresco-search/src/main/java/org/alfresco/solr/SolrInformationServer.java b/search-services/alfresco-search/src/main/java/org/alfresco/solr/SolrInformationServer.java
index b1805465d..c664c48af 100644
--- a/search-services/alfresco-search/src/main/java/org/alfresco/solr/SolrInformationServer.java
+++ b/search-services/alfresco-search/src/main/java/org/alfresco/solr/SolrInformationServer.java
@@ -2297,17 +2297,16 @@ public class SolrInformationServer implements InformationServer
 
     private void deleteErrorNode(UpdateRequestProcessor processor, SolrQueryRequest request, Node node) throws IOException
     {
-        String errorDocId = PREFIX_ERROR + node.getId();
+        DeleteUpdateCommand delErrorDocCmd = new DeleteUpdateCommand(request);
+        delErrorDocCmd.setId(FIELD_SOLR4_ID + ":" + PREFIX_ERROR + node.getId());
+        processor.processDelete(delErrorDocCmd);
+    }
 
-        // Try finding the node before performing removal operation
-        DocSet docSet = request.getSearcher().getDocSet(new TermQuery(new Term(FIELD_SOLR4_ID, errorDocId)));
-
-        if (docSet.size() > 0)
-        {
-            DeleteUpdateCommand delErrorDocCmd = new DeleteUpdateCommand(request);
-            delErrorDocCmd.setId(errorDocId);
-            processor.processDelete(delErrorDocCmd);
-        }
+    private void deleteNode(UpdateRequestProcessor processor, SolrQueryRequest request, long dbid) throws IOException
+    {
+        DeleteUpdateCommand delDocCmd = new DeleteUpdateCommand(request);
+        delDocCmd.setQuery(FIELD_DBID + ":" + dbid);
+        processor.processDelete(delDocCmd);
     }
 
     private void deleteNode(UpdateRequestProcessor processor, SolrQueryRequest request, Node node) throws IOException
@@ -2315,26 +2314,11 @@ public class SolrInformationServer implements InformationServer
         LOGGER.debug("Node {} is being deleted", node.getId());
 
         deleteErrorNode(processor, request, node);
-        // MNT-13767 fix, remove by node DBID.
         deleteNode(processor, request, node.getId());
 
         LOGGER.debug("Node {} deletion correctly sent", node.getId());
     }
 
-    private void deleteNode(UpdateRequestProcessor processor, SolrQueryRequest request, long dbid) throws IOException
-    {
-
-        // Try finding the node before performing removal operation
-        DocSet docSet = request.getSearcher().getDocSet(LongPoint.newExactQuery(FIELD_DBID, dbid));
-
-        if (docSet.size() > 0)
-        {
-            DeleteUpdateCommand delDocCmd = new DeleteUpdateCommand(request);
-            delDocCmd.setQuery(FIELD_DBID + ":" + dbid);
-            processor.processDelete(delDocCmd);
-        }
-    }
-
     private boolean isContentIndexedForNode(Map<QName, PropertyValue> properties)
     {
         return ofNullable(properties)