-
Notifications
You must be signed in to change notification settings - Fork 730
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.
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
Allow metadata to be set on AbstractAggregation (#1677) #1678
Closed
+120
−0
Closed
Changes from all commits
Commits
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Allow metadata to be set on AbstractAggregation (#1677)
ElasticSearch allows metadata to be set on an aggregation that will be returned as-is with the aggregation result. See https://www.elastic.co/guide/en/elasticsearch/reference/6.8/agg-metadata.html Using `setParam` generates invalid query, hence these additions. See #1677
commit 5ef4d13fa35897c9d115142b65805de3d8bf561d
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,63 @@ | ||
<?php | ||
|
||
namespace Elastica\Test\Aggregation; | ||
|
||
use Elastica\Aggregation\Cardinality; | ||
use Elastica\Query; | ||
|
||
class AggregationMetadataTest extends BaseAggregationTest | ||
{ | ||
protected function _getIndexForTest() | ||
{ | ||
$index = $this->_createIndex(); | ||
|
||
$index->refresh(); | ||
|
||
return $index; | ||
} | ||
|
||
/** | ||
* @group functional | ||
*/ | ||
public function testAggregationSimpleMetadata() | ||
{ | ||
$aggName = 'mock'; | ||
$metadata = ['color' => 'blue']; | ||
|
||
$agg = new Cardinality($aggName); | ||
$agg->setField('mock_field'); | ||
$agg->setMeta($metadata); | ||
|
||
$query = new Query(); | ||
$query->addAggregation($agg); | ||
$results = $this->_getIndexForTest()->search($query)->getAggregation($aggName); | ||
|
||
$this->assertEquals($metadata, $results['meta']); | ||
} | ||
|
||
/** | ||
* @group functional | ||
*/ | ||
public function testAggregationComplexMetadata() | ||
{ | ||
$aggName = 'mock'; | ||
$metadata = [ | ||
'color' => 'blue', | ||
'status' => 'green', | ||
'users' => [ | ||
'foo' => 'bar', | ||
'moo' => 'baz', | ||
], | ||
]; | ||
|
||
$agg = new Cardinality($aggName); | ||
$agg->setField('mock_field'); | ||
$agg->setMeta($metadata); | ||
|
||
$query = new Query(); | ||
$query->addAggregation($agg); | ||
$results = $this->_getIndexForTest()->search($query)->getAggregation($aggName); | ||
|
||
$this->assertEquals($metadata, $results['meta']); | ||
} | ||
} |
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Do we need a separate
_meta
key here or could we just use the internalsetParam
?There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
After going over the code in
AbstractAggregation::toArray()
I agree the problem could be solved by usingAbstractAggregation::_setRawParam($key, $value)
.