Skip to content
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

#819 Implement multiple rescore query #820

Merged
merged 5 commits into from
May 14, 2015
Merged

#819 Implement multiple rescore query #820

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
14a6f39
#819 Implement multiple rescore query
ebuildy Apr 22, 2015
86b19f4
Fix Php 5.3 support
ebuildy Apr 23, 2015
b6c4719
#819 Add unit tests for multi rescore query
ebuildy Apr 26, 2015
1943b3b
#819 Fix multiple rescore queries tests
ebuildy Apr 27, 2015
8a50204
Add ES test
ebuildy May 14, 2015
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
15 changes: 13 additions & 2 deletions lib/Elastica/Query.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -401,12 +401,23 @@ public function setSuggest(Suggest $suggest)
/**
* Add a Rescore
*
* @param \Elastica\Rescore\AbstractRescore $rescore suggestion object
* @param mixed $rescore suggestion object
* @return $this
*/
public function setRescore($rescore)
{
return $this->setParam('rescore', $rescore->toArray());
if (is_array($rescore)) {
$buffer = array();

foreach($rescore as $rescoreQuery) {
$buffer []= $rescoreQuery->toArray();
}
}
else {
$buffer = $rescore->toArray();
}

return $this->setParam('rescore', $buffer);
}

/**
Expand Down
65 changes: 65 additions & 0 deletions test/lib/Elastica/Test/Query/RescoreTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -141,6 +141,71 @@ public function testSetWeights()
$this->assertEquals($expected, $data);
}

public function testMultipleQueries()
{
$query = new Query();
$mainQuery = new Match();
$mainQuery = $mainQuery->setFieldQuery('test1', 'foo');

$secQuery1 = new Term();
$secQuery1 = $secQuery1->setTerm('test2', 'bar', 1);
$rescoreQuery1 = new QueryRescore();
$rescoreQuery1->setRescoreQuery($secQuery1);

$secQuery2 = new Term();
$secQuery2 = $secQuery2->setTerm('test2', 'tom', 2);
$rescoreQuery2 = new QueryRescore();
$rescoreQuery2->setRescoreQuery($secQuery2);

$query->setQuery($mainQuery);
$query->setRescore(array($rescoreQuery1, $rescoreQuery2));
$data = $query->toArray();

$expected = array(
'query' => array(
'match' => array(
'test1' => array(
'query' => 'foo',
),
),
),
'rescore' => array(
array(
'query' => array(
'rescore_query' => array(
'term' => array(
'test2' => array(
'value' => 'bar',
'boost' => 1,
),
),
),
),
),
array(
'query' => array(
'rescore_query' => array(
'term' => array(
'test2' => array(
'value' => 'tom',
'boost' => 2,
),
),
),
),
),
),
);

$this->assertEquals($expected, $data);

$results = $this->_index->search($query);
$response = $results->getResponse();

$this->assertEquals(true, $response->isOk());
$this->assertEquals(0, $results->getTotalHits());
}

public function testQuery()
{
$query = new Query();
Expand Down