Skip to content

dev/core#6679 - Full-text search: let each MATCH drive its own FULLTEXT index #36451

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
dstorozhuk wants to merge 1 commit into
base: master
Choose a base branch
from
+22 −12
Open

dev/core#6679 - Full-text search: let each MATCH drive its own FULLTEXT index #36451

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
34 changes: 22 additions & 12 deletions ext/legacycustomsearches/CRM/Contact/Form/Search/Custom/FullText/Activity.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,19 +57,29 @@ public function prepareQueries($queryText, $entityIDTableName) {

$contactSQL = [];

// The contact and e-mail branches are separate queries joined by UNION
// rather than one query with an OR. MySQL cannot use a FULLTEXT index as an
// access path for a MATCH that is only one side of an OR, so with
// enable_innodb_fts on the OR form scanned every non-deleted activity and
// multiplied it by civicrm_activity_contact and by every activity_type
// option value. As a UNION each branch drives its own index.
$contactSQL[] = "
SELECT distinct ca.id
FROM civicrm_activity ca
INNER JOIN civicrm_activity_contact cat ON cat.activity_id = ca.id
INNER JOIN civicrm_contact c ON cat.contact_id = c.id
LEFT JOIN civicrm_email e ON cat.contact_id = e.contact_id
LEFT JOIN civicrm_option_group og ON og.name = 'activity_type'
LEFT JOIN civicrm_option_value ov ON ( ov.option_group_id = og.id )
WHERE (
({$this->matchText('civicrm_contact c', ['sort_name', 'display_name', 'nick_name'], $queryText)})
OR
({$this->matchText('civicrm_email e', 'email', $queryText)} AND ca.activity_type_id = ov.value AND ov.name IN ('Inbound Email', 'Email') )
)
SELECT ca.id
FROM civicrm_contact c
INNER JOIN civicrm_activity_contact cat ON cat.contact_id = c.id
INNER JOIN civicrm_activity ca ON ca.id = cat.activity_id
WHERE ({$this->matchText('civicrm_contact c', ['sort_name', 'display_name', 'nick_name'], $queryText)})
AND (ca.is_deleted = 0 OR ca.is_deleted IS NULL)
AND (c.is_deleted = 0 OR c.is_deleted IS NULL)
UNION
SELECT ca.id
FROM civicrm_email e
INNER JOIN civicrm_activity_contact cat ON cat.contact_id = e.contact_id
INNER JOIN civicrm_activity ca ON ca.id = cat.activity_id
INNER JOIN civicrm_contact c ON c.id = cat.contact_id
INNER JOIN civicrm_option_value ov ON ov.value = ca.activity_type_id AND ov.name IN ('Inbound Email', 'Email')
INNER JOIN civicrm_option_group og ON og.id = ov.option_group_id AND og.name = 'activity_type'
WHERE ({$this->matchText('civicrm_email e', 'email', $queryText)})
AND (ca.is_deleted = 0 OR ca.is_deleted IS NULL)
AND (c.is_deleted = 0 OR c.is_deleted IS NULL)
";
Expand Down