-
Notifications
You must be signed in to change notification settings - Fork 733
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
Global Aggregation #555
Merged
Merged
Global Aggregation #555
Changes from 2 commits
Commits
Show all changes
8 commits
Select commit
Hold shift + click to select a range
f267965
Aggragations - prevent global aggregations as sub aggregations
krzaczek 4e7a585
Aggragations - prevent global aggregations as sub aggregations (chang…
krzaczek 0770bb8
Merge pull request #553 from Topface/partial-failure
ruflin 3499155
Aggragations - prevent global aggregations as sub aggregations
krzaczek 55e3ca0
Aggragations - prevent global aggregations as sub aggregations
krzaczek bdc0dcd
Aggragations - prevent global aggregations as sub aggregations (chang…
krzaczek e1f3eb0
Aggragations - prevent global aggregations as sub aggregations
krzaczek 6340b35
Merge remote-tracking branch 'origin/master'
krzaczek 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
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
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -2,8 +2,8 @@ | |
|
||
namespace Elastica\Aggregation; | ||
|
||
|
||
use Elastica\Param; | ||
use Elastica\Exception\InvalidException; | ||
|
||
abstract class AbstractAggregation extends Param | ||
{ | ||
|
@@ -57,10 +57,14 @@ public function getAggs() | |
/** | ||
* Add a sub-aggregation | ||
* @param AbstractAggregation $aggregation | ||
* @throws \Elastica\Exception\InvalidException | ||
* @return AbstractAggregation | ||
*/ | ||
public function addAggregation(AbstractAggregation $aggregation) | ||
{ | ||
if(is_a($aggregation, 'Elastica\Aggregation\GlobalAggregation')) | ||
throw new InvalidException('Global aggregators can only be placed as top level aggregators'); | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Please always use { } also for 1 line if clauses. There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Ok no problem .. will fix that |
||
|
||
$this->_aggs[$aggregation->getName()] = $aggregation->toArray(); | ||
return $this; | ||
} | ||
|
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.
Can you merge in master again and add the ticket id to the change line? Like this it is easy traceable