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

post_filter and filter are now the same #670

Merged
merged 1 commit into from
Aug 25, 2014
Merged

post_filter and filter are now the same #670

Show file tree
Hide file tree
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
22 changes: 15 additions & 7 deletions lib/Elastica/Query.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,7 @@ public static function create($query)
return new self($query);
case $query instanceof AbstractFilter:
$newQuery = new self();
$newQuery->setFilter($query);
$newQuery->setPostFilter($query);

return $newQuery;
case empty($query):
Expand Down Expand Up @@ -132,10 +132,12 @@ public function getQuery()
*
* @param \Elastica\Filter\AbstractFilter $filter Filter object
* @return \Elastica\Query Current object
* @link https://github.com/elasticsearch/elasticsearch/issues/7422
* @deprecated
*/
public function setFilter(AbstractFilter $filter)
{
return $this->setParam('filter', $filter->toArray());
return $this->setPostFilter($filter);
}

/**
Expand Down Expand Up @@ -406,13 +408,19 @@ public function setSource(array $fields)

/**
* Sets post_filter argument for the query. The filter is applied after the query has executed
* @param array $post
* @return \Elastica\Query Current object
* @link http://www.elasticsearch.org/guide/en/elasticsearch/guide/current/_filtering_queries_and_aggregations.html#_post_filter
*
* @param array|\Elastica\Filter\AbstractFilter $filter
* @return \Elastica\Param
* @link http://www.elasticsearch.org/guide/en/elasticsearch/reference/current/search-request-post-filter.html
*/
public function setPostFilter(array $post)
public function setPostFilter($filter)
{
return $this->setParam("post_filter", $post);
if($filter instanceof AbstractFilter)
{
$filter = $filter->toArray();
}

return $this->setParam("post_filter", $filter);
}
}

Expand Down
2 changes: 1 addition & 1 deletion test/benchmark/TransportTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -79,7 +79,7 @@ public function testRandomRead(array $config, $transport)
$test = rand(1, $this->_max);
$query = new Query();
$query->setQuery(new MatchAllQuery());
$query->setFilter(new TermFilter(array('test' => $test)));
$query->setPostFilter(new TermFilter(array('test' => $test)));
$result = $type->search($query);
$times[] = $result->getResponse()->getQueryTime();
}
Expand Down
2 changes: 1 addition & 1 deletion test/lib/Elastica/Test/Filter/BoolTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -87,7 +87,7 @@ public function testBoolFilter()
$mustNotFilter->addMustNot($publisherFilter);

$mainBoolFilter->addMust(array($shouldFilter, $mustNotFilter));
$query->setFilter($mainBoolFilter);
$query->setPostFilter($mainBoolFilter);
//execute the query
$results = $index->search($query);

Expand Down
4 changes: 2 additions & 2 deletions test/lib/Elastica/Test/Filter/GeoDistanceRangeTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@ public function testGeoPoint()
);

$query = new Query(new MatchAll());
$query->setFilter($geoFilter);
$query->setPostFilter($geoFilter);
$this->assertEquals(1, $type->search($query)->count());

// Both points should be inside
Expand All @@ -64,7 +64,7 @@ public function testGeoPoint()
array('gte' => '0km', 'lte' => '40000km')
);
$query = new Query(new MatchAll());
$query->setFilter($geoFilter);
$query->setPostFilter($geoFilter);
$index->refresh();

$this->assertEquals(2, $type->search($query)->count());
Expand Down
4 changes: 2 additions & 2 deletions test/lib/Elastica/Test/Filter/GeoDistanceTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,14 +49,14 @@ public function testGeoPoint()
$geoFilter = new GeoDistance('point', array('lat' => 30, 'lon' => 40), '1km');

$query = new Query(new MatchAll());
$query->setFilter($geoFilter);
$query->setPostFilter($geoFilter);
$this->assertEquals(1, $type->search($query)->count());

// Both points should be inside
$query = new Query();
$geoFilter = new GeoDistance('point', array('lat' => 30, 'lon' => 40), '40000km');
$query = new Query(new MatchAll());
$query->setFilter($geoFilter);
$query->setPostFilter($geoFilter);
$index->refresh();

$this->assertEquals(2, $type->search($query)->count());
Expand Down
4 changes: 2 additions & 2 deletions test/lib/Elastica/Test/Filter/GeoPolygonTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ public function testGeoPoint()
$geoFilter = new GeoPolygon('location', $points);

$query = new Query(new MatchAll());
$query->setFilter($geoFilter);
$query->setPostFilter($geoFilter);
$this->assertEquals(1, $type->search($query)->count());

// Both points should be inside
Expand All @@ -58,7 +58,7 @@ public function testGeoPoint()
$geoFilter = new GeoPolygon('location', $points);

$query = new Query(new MatchAll());
$query->setFilter($geoFilter);
$query->setPostFilter($geoFilter);

$this->assertEquals(2, $type->search($query)->count());
}
Expand Down
4 changes: 2 additions & 2 deletions test/lib/Elastica/Test/Filter/GeohashCellTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,15 +42,15 @@ public function testFilter()

$filter = new GeohashCell('pin', array('lat' => 32.828326, 'lon' => -117.255854));
$query = new \Elastica\Query();
$query->setFilter($filter);
$query->setPostFilter($filter);
$results = $type->search($query);

$this->assertEquals(1, $results->count());

//test precision parameter
$filter = new GeohashCell('pin', '9', 1);
$query = new \Elastica\Query();
$query->setFilter($filter);
$query->setPostFilter($filter);
$results = $type->search($query);

$this->assertEquals(2, $results->count());
Expand Down
6 changes: 3 additions & 3 deletions test/lib/Elastica/Test/Filter/HasChildTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -77,7 +77,7 @@ public function testFilterInsideHasChildSearch()
$filter = new HasChild($f, 'child');

$searchQuery = new \Elastica\Query();
$searchQuery->setFilter($filter);
$searchQuery->setPostFilter($filter);
$searchResults = $index->search($searchQuery);

$this->assertEquals(1, $searchResults->count());
Expand All @@ -97,7 +97,7 @@ public function testQueryInsideHasChildSearch()
$filter = new HasChild($f, 'child');

$searchQuery = new \Elastica\Query();
$searchQuery->setFilter($filter);
$searchQuery->setPostFilter($filter);
$searchResults = $index->search($searchQuery);

$this->assertEquals(1, $searchResults->count());
Expand All @@ -117,7 +117,7 @@ public function testTypeInsideHasChildSearch()
$filter = new HasChild($f, 'child');

$searchQuery = new \Elastica\Query();
$searchQuery->setFilter($filter);
$searchQuery->setPostFilter($filter);
$searchResults = $index->search($searchQuery);

$this->assertEquals(1, $searchResults->count());
Expand Down
4 changes: 2 additions & 2 deletions test/lib/Elastica/Test/Filter/HasParentTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -77,7 +77,7 @@ public function testFilterInsideHasParentSearch()
$filter = new HasParent($f, 'parent');

$searchQuery = new \Elastica\Query();
$searchQuery->setFilter($filter);
$searchQuery->setPostFilter($filter);
$searchResults = $index->search($searchQuery);

$this->assertEquals(1, $searchResults->count());
Expand All @@ -97,7 +97,7 @@ public function testQueryInsideHasParentSearch()
$filter = new HasParent($f, 'parent');

$searchQuery = new \Elastica\Query();
$searchQuery->setFilter($filter);
$searchQuery->setPostFilter($filter);
$searchResults = $index->search($searchQuery);

$this->assertEquals(1, $searchResults->count());
Expand Down
2 changes: 1 addition & 1 deletion test/lib/Elastica/Test/Filter/IndicesTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,7 @@ public function testIndicesFilter()
$filter = new Indices(new BoolNot(new Term(array("color" => "blue"))), array($this->_index1->getName()));
$filter->setNoMatchFilter(new BoolNot(new Term(array("color" => "yellow"))));
$query = new Query();
$query->setFilter($filter);
$query->setPostFilter($filter);

// search over the alias
$index = $this->_getClient()->getIndex("indices_filter");
Expand Down
8 changes: 4 additions & 4 deletions test/lib/Elastica/Test/Filter/TermsTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,24 +28,24 @@ public function testLookup()
$termsFilter = new Terms();
$termsFilter->setLookup('lastName', $type2, 'led zeppelin', 'members', NULL);
$query = new \Elastica\Query();
$query->setFilter($termsFilter);
$query->setPostFilter($termsFilter);
$results = $index->search($query);
$this->assertEquals($results->count(), 4, 'Terms lookup with null index');

$termsFilter->setLookup('lastName', $type2, 'led zeppelin', 'members', $index);
$query->setFilter($termsFilter);
$query->setPostFilter($termsFilter);
$results = $index->search($query);
$this->assertEquals($results->count(), 4, 'Terms lookup with index as object');

//Query with index given as string
$termsFilter->setLookup('lastName', $type2, 'led zeppelin', 'members', $index->getName());
$query->setFilter($termsFilter);
$query->setPostFilter($termsFilter);
$results = $index->search($query);
$this->assertEquals($results->count(), 4, 'Terms lookup with index as string');

//Query with array of options
$termsFilter->setLookup('lastName', $type2, 'led zeppelin', 'members', array('index' => $index, 'cache' => false));
$query->setFilter($termsFilter);
$query->setPostFilter($termsFilter);
$results = $index->search($query);
$this->assertEquals($results->count(), 4, 'Terms lookup with options array');

Expand Down
2 changes: 1 addition & 1 deletion test/lib/Elastica/Test/TypeTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -532,7 +532,7 @@ public function testMoreLikeThisApi()
$query = new Query();
$filterTerm = new Term();
$filterTerm->setTerm('visible', true);
$query->setFilter($filterTerm);
$query->setPostFilter($filterTerm);

$resultSet = $type->moreLikeThis($document, array('min_term_freq' => '1', 'min_doc_freq' => '1'), $query);
$this->assertEquals(2, $resultSet->count());
Expand Down