revi-archive/phorge-phorge
1
0
Fork 0
mirror of https://we.phorge.it/source/phorge.git synced 2025-01-11 07:11:04 +01:00
Code Issues Releases Wiki Activity

Try literal search if operator search fails in elasticsearch

Browse source 
Test Plan: Searched for `[test]` in /search/ and in revision dependencies.

Reviewers: epriestley

Reviewed By: epriestley

CC: tbrzezinsky, aran, Korvin

Maniphest Tasks: T1757

Differential Revision: https://secure.phabricator.com/D3427
This commit is contained in:
vrana 2012-09-04 12:29:27 -07:00
parent ee05fe81a4
commit 285cb172e9
1 changed files with 30 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

44
src/applications/search/engine/PhabricatorSearchEngineElastic.php
View file

@ -104,8 +104,7 @@ final class PhabricatorSearchEngineElastic extends PhabricatorSearchEngine {
return $doc; return $doc;
} }
public function executeSearch(PhabricatorSearchQuery $query) { private function buildSpec(PhabricatorSearchQuery $query) {
$spec = array(); $spec = array();
$filter = array(); $filter = array();
@ -128,17 +127,6 @@ final class PhabricatorSearchEngineElastic extends PhabricatorSearchEngine {
); );
} }
$type = $query->getParameter('type');
if ($type) {
$uri = "/phabricator/{$type}/_search";
} else {
// Don't use '/phabricator/_search' for the case that there is something
// else in the index (for example if 'phabricator' is only an alias to
// some bigger index).
$types = PhabricatorSearchAbstractDocument::getSupportedTypes();
$uri = '/phabricator/' . implode(',', array_keys($types)) . '/_search';
}
$rel_mapping = array( $rel_mapping = array(
'author' => PhabricatorSearchRelationship::RELATIONSHIP_AUTHOR, 'author' => PhabricatorSearchRelationship::RELATIONSHIP_AUTHOR,
'open' => PhabricatorSearchRelationship::RELATIONSHIP_OPEN, 'open' => PhabricatorSearchRelationship::RELATIONSHIP_OPEN,
@ -191,7 +179,35 @@ final class PhabricatorSearchEngineElastic extends PhabricatorSearchEngine {
$spec['from'] = (int)$query->getParameter('offset', 0); $spec['from'] = (int)$query->getParameter('offset', 0);
$spec['size'] = (int)$query->getParameter('limit', 25); $spec['size'] = (int)$query->getParameter('limit', 25);
$response = $this->executeRequest($uri, $spec);
return $spec;
}
public function executeSearch(PhabricatorSearchQuery $query) {
$type = $query->getParameter('type');
if ($type) {
$uri = "/phabricator/{$type}/_search";
} else {
// Don't use '/phabricator/_search' for the case that there is something
// else in the index (for example if 'phabricator' is only an alias to
// some bigger index).
$types = PhabricatorSearchAbstractDocument::getSupportedTypes();
$uri = '/phabricator/' . implode(',', array_keys($types)) . '/_search';
}
try {
$response = $this->executeRequest($uri, $this->buildSpec($query));
} catch (HTTPFutureResponseStatusHTTP $ex) {
// elasticsearch probably uses Lucene query syntax:
// http://lucene.apache.org/core/3_6_1/queryparsersyntax.html
// Try literal search if operator search fails.
if (!$query->getQuery()) {
throw $ex;
}
$query = clone $query;
$query->setQuery(addcslashes($query->getQuery(), '+-&|!(){}[]^"~*?:\\'));
$response = $this->executeRequest($uri, $this->buildSpec($query));
}
$phids = ipull($response['hits']['hits'], '_id'); $phids = ipull($response['hits']['hits'], '_id');
return $phids; return $phids;