Regression: Comment searching causes too many clauses error

   QueryFactoryResult generateIssueIdQueryFromCommentQuery(final Query commentIndexQuery, final QueryCreationContext creationContext) {
      try 
      {
         // Now we need to execute the search and build up a new query that enumerates the issue id's found by the comment search
         final Searcher commentSearcher = searchProviderFactory.getSearcher(SearchProviderFactory.COMMENT_INDEX);
         final Filter filter = getPermissionsFilter(creationContext.isSecurityOverriden(), creationContext.getUser());
         final Collection<String> ids = new HashSet<String>(10000);
         final HitCollector hitCollector = new DocumentHitCollector(commentSearcher) {
            @Override
            public void collect(Document doc) {
               ids.add(doc.get(DocumentConstants.ISSUE_ID));
            }
         };
         // JRA-19306 - lets restrict this search by the permissions filter so we can try to avoid the MAX_CLAUSES limit
         // Perform the search against the comment index
         if(filter == null) 
         {
            commentSearcher.search(commentIndexQuery, hitCollector);
         }
         else 
         {
            commentSearcher.search(commentIndexQuery, filter, hitCollector);
         }
         // Create a query that will be run against the issue index with the issue ids from the search hits
         return new QueryFactoryResult(new ConstantScoreQuery(new IssueIdFilter(ids)));
      }
      catch(final IOException e) 
      {
         log.error("Unable to search the comment index - returning false result.", e);
         return QueryFactoryResult.createFalseResult();
      }
   }