Loading CHANGELOG.txt +2 −0 Original line number Diff line number Diff line Search API 1.x, dev (xxxx-xx-xx): --------------------------------- - #3271256 by akalam, drunken monkey: Fixed infinite loop when indexing external entities. - #3354906 by ericchew, drunken monkey, miedward: Fixed regression in Views argument plugins (date and All Terms). - #3332036 by drunken monkey, Chris64: Fixed too narrow Drush version constraint Loading src/Plugin/search_api/datasource/ContentEntity.php +6 −2 Original line number Diff line number Diff line Loading @@ -27,6 +27,7 @@ use Drupal\Core\State\StateInterface; use Drupal\Core\TypedData\ComplexDataDefinitionInterface; use Drupal\Core\TypedData\ComplexDataInterface; use Drupal\Core\TypedData\TypedDataManagerInterface; use Drupal\external_entities\Entity\Query\External\Query as ExternalEntitiesQuery; use Drupal\field\FieldConfigInterface; use Drupal\field\FieldStorageConfigInterface; use Drupal\search_api\Datasource\DatasourcePluginBase; Loading Loading @@ -851,10 +852,13 @@ class ContentEntity extends DatasourcePluginBase implements PluginFormInterface // We only handle the case of picking up from where the last page left // off. (This will cause an infinite loop if anyone ever wants to index // Search API tasks in an index, so check for that to be on the safe // side.) // side. Also, the external_entities module doesn't reliably support // conditions on entity queries, so disable this functionality in that // case, too.) if (isset($last_ids[$context_key]) && $last_ids[$context_key]['page'] == ($page - 1) && $this->getEntityTypeId() !== 'search_api_task') { && $this->getEntityTypeId() !== 'search_api_task' && !($select instanceof ExternalEntitiesQuery)) { $select->condition($entity_id, $last_ids[$context_key]['last_id'], '>'); $offset = 0; } Loading Loading
CHANGELOG.txt +2 −0 Original line number Diff line number Diff line Search API 1.x, dev (xxxx-xx-xx): --------------------------------- - #3271256 by akalam, drunken monkey: Fixed infinite loop when indexing external entities. - #3354906 by ericchew, drunken monkey, miedward: Fixed regression in Views argument plugins (date and All Terms). - #3332036 by drunken monkey, Chris64: Fixed too narrow Drush version constraint Loading
src/Plugin/search_api/datasource/ContentEntity.php +6 −2 Original line number Diff line number Diff line Loading @@ -27,6 +27,7 @@ use Drupal\Core\State\StateInterface; use Drupal\Core\TypedData\ComplexDataDefinitionInterface; use Drupal\Core\TypedData\ComplexDataInterface; use Drupal\Core\TypedData\TypedDataManagerInterface; use Drupal\external_entities\Entity\Query\External\Query as ExternalEntitiesQuery; use Drupal\field\FieldConfigInterface; use Drupal\field\FieldStorageConfigInterface; use Drupal\search_api\Datasource\DatasourcePluginBase; Loading Loading @@ -851,10 +852,13 @@ class ContentEntity extends DatasourcePluginBase implements PluginFormInterface // We only handle the case of picking up from where the last page left // off. (This will cause an infinite loop if anyone ever wants to index // Search API tasks in an index, so check for that to be on the safe // side.) // side. Also, the external_entities module doesn't reliably support // conditions on entity queries, so disable this functionality in that // case, too.) if (isset($last_ids[$context_key]) && $last_ids[$context_key]['page'] == ($page - 1) && $this->getEntityTypeId() !== 'search_api_task') { && $this->getEntityTypeId() !== 'search_api_task' && !($select instanceof ExternalEntitiesQuery)) { $select->condition($entity_id, $last_ids[$context_key]['last_id'], '>'); $offset = 0; } Loading