Remove duplicated indexing code

Progress so far. I've not been able to test this myself yet, but I'm uploading it for the testbot to check.

I'm combining an "indexing query" (gets the list of entities to index) and a "remaining count query" (gets a count of the entities to index).

Changes to indexing query

The remaining count query included ->condition('aie.status', 1), which the indexing query didn't. I assume these entities were be rejected later in the indexing process due to being unpublished, although I've not actually verified that yet. If they are not, then that means we are indexing unpublished entities which would be a bug. This condition will now apply in both places where the combined query is used, and may result in slightly faster indexing when there are unpublished entities.

Changes to count query

We now make two calls to apachesolr_get_indexer_table() as we can't reuse the variable. This is a fast function, so should not be a concern.
We are also asking db_query() for more fields and to order the results, but as we are only doing a count for this query I imagine these are optimised out by the db layer. Even if not, this should not add significantly to the load time of this page.

As far as I can tell this patch is correct. I've attached a slightly modified version that just adds an underscore to the start of the function name as it's not meant to be public.

Sorry, I was late for a call.

As I discussed with nick_vh yesterday it would be great to get this reviewed and committed, as it should make https://drupal.org/node/1828014 much easier to review. The patch can still be applied to 7.x-1.x HEAD.

When reviewing, please consider the changes that I have mentioned in #1 and confirm that you agree these are either insignificant or for the better, and confirm that I haven't made any other changes in my patch.

Thanks for the review.

I can see this on 8.x-1.x but not 7.x-1.x.

I'm getting kicked out of the room now, but I've spotted that the function I added was missing the following line:

$bundles = apachesolr_get_index_bundles($env_id, $entity_type);

I'll try and put that into a patch as soon as I can.

Here's a patch. It won't apply at the moment as the earlier patch hasn't made it to git on drupal.org.

You've committed the follow-up patch, but not the original patch from #4 (which will probably need to be committed first).

That will still need #11 to be applied. #15 will correctly remove the line from the previous commit of #11, as git has added it to the old location of the file.

Don't forget to apply #11 to 8.x