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.

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

Refactoring of Aggregations #14136

Merged
merged 78 commits into from Feb 15, 2016
Merged

Refactoring of Aggregations #14136

merged 78 commits into from Feb 15, 2016

Commits on Dec 21, 2015

  1. Refactor ValuesSource to separate Parsing from Factory logic

    ValuesSourceConfig is now evaluated in the ValuesSourceAggregatorFactory instead of ValueSourceParser. This means that the ValueSourceParser purely deals with parsing the XContent and the logic requiring access to the mappings etc. on the shard is left to the ValuesSourceAggregatorFactory. This means that, in the future, the parsing logic can be moved to the coordinating node.
    colings86 committed Dec 21, 2015
    Configuration menu
    Copy the full SHA
    7a3f6fc View commit details
    Browse the repository at this point in the history
  2. Preparing ValuesSourceAggregatorFactory/Parser for refactoring

    This change adds AbstractValuesSourceParser which will be the new class used to create ValuesSourceAggregatorFactory objects. AbstractValuesSourceParser parses all the parameters required for ValuesSource and passes to the sub-class to parse any other (implementation specific) parameters. After parsing is complete it will call createFactory on the implementing class to create the AggregatorFactory object and then set the ValuesSource specific parameters before returning it.
    
    ValuesSourceAggregatorFactory also now has setter methods so that it can be used as the 'builder' object in the future.
    colings86 committed Dec 21, 2015
    Configuration menu
    Copy the full SHA
    855c199 View commit details
    Browse the repository at this point in the history
  3. Aggregation refactor: make aggregationFactory implement NamedWritable

    Also makes AggregatorFactories implement Writable
    colings86 committed Dec 21, 2015
    Configuration menu
    Copy the full SHA
    712b711 View commit details
    Browse the repository at this point in the history
  4. Configuration menu
    Copy the full SHA
    8c37c6f View commit details
    Browse the repository at this point in the history
  5. Configuration menu
    Copy the full SHA
    97c2f7b View commit details
    Browse the repository at this point in the history
  6. Configuration menu
    Copy the full SHA
    5da1898 View commit details
    Browse the repository at this point in the history
  7. Configuration menu
    Copy the full SHA
    4e00895 View commit details
    Browse the repository at this point in the history
  8. Configuration menu
    Copy the full SHA
    6795a59 View commit details
    Browse the repository at this point in the history
  9. Configuration menu
    Copy the full SHA
    3aa726f View commit details
    Browse the repository at this point in the history
  10. Configuration menu
    Copy the full SHA
    ac772c7 View commit details
    Browse the repository at this point in the history
  11. Configuration menu
    Copy the full SHA
    2772e88 View commit details
    Browse the repository at this point in the history
  12. Configuration menu
    Copy the full SHA
    113df32 View commit details
    Browse the repository at this point in the history
  13. Configuration menu
    Copy the full SHA
    94e8679 View commit details
    Browse the repository at this point in the history
  14. Configuration menu
    Copy the full SHA
    8499e27 View commit details
    Browse the repository at this point in the history
  15. Configuration menu
    Copy the full SHA
    39a951f View commit details
    Browse the repository at this point in the history
  16. Configuration menu
    Copy the full SHA
    c346065 View commit details
    Browse the repository at this point in the history
  17. Configuration menu
    Copy the full SHA
    cf7e525 View commit details
    Browse the repository at this point in the history
  18. Configuration menu
    Copy the full SHA
    ea6f312 View commit details
    Browse the repository at this point in the history
  19. Configuration menu
    Copy the full SHA
    a495a75 View commit details
    Browse the repository at this point in the history
  20. Configuration menu
    Copy the full SHA
    e8e25ad View commit details
    Browse the repository at this point in the history
  21. Configuration menu
    Copy the full SHA
    b1e72d1 View commit details
    Browse the repository at this point in the history
  22. Configuration menu
    Copy the full SHA
    75f20c4 View commit details
    Browse the repository at this point in the history
  23. Aggregations Refactor: Refactor Avg Bucket, Min Bucket, Max Bucket, S…

    …um Bucket, Percentiles Bucket, Stats Bucket and Extended Stats Bucket Aggregations
    colings86 committed Dec 21, 2015
    Configuration menu
    Copy the full SHA
    a0e60bf View commit details
    Browse the repository at this point in the history
  24. Configuration menu
    Copy the full SHA
    1b89c44 View commit details
    Browse the repository at this point in the history
  25. Configuration menu
    Copy the full SHA
    80e58e3 View commit details
    Browse the repository at this point in the history
  26. Configuration menu
    Copy the full SHA
    2b5aa09 View commit details
    Browse the repository at this point in the history
  27. fixed merge errors

    colings86 committed Dec 21, 2015
    Configuration menu
    Copy the full SHA
    210be97 View commit details
    Browse the repository at this point in the history
  28. Configuration menu
    Copy the full SHA
    6b711e9 View commit details
    Browse the repository at this point in the history
  29. Configuration menu
    Copy the full SHA
    6df27fe View commit details
    Browse the repository at this point in the history
  30. merge conflict fixes

    colings86 committed Dec 21, 2015
    Configuration menu
    Copy the full SHA
    9fcf453 View commit details
    Browse the repository at this point in the history
  31. Configuration menu
    Copy the full SHA
    8f63c46 View commit details
    Browse the repository at this point in the history
  32. Configuration menu
    Copy the full SHA
    1aea0fa View commit details
    Browse the repository at this point in the history
  33. Configuration menu
    Copy the full SHA
    cac2ca8 View commit details
    Browse the repository at this point in the history

Commits on Jan 6, 2016

  1. Merge branch 'master' into feature/aggs-refactoring

    # Conflicts:
    #	core/src/main/java/org/elasticsearch/search/aggregations/bucket/children/ChildrenParser.java
    #	core/src/main/java/org/elasticsearch/search/aggregations/support/ValuesSourceParser.java
    #	test/framework/src/main/java/org/elasticsearch/test/TestSearchContext.java
    colings86 committed Jan 6, 2016
    Configuration menu
    Copy the full SHA
    2c33f78 View commit details
    Browse the repository at this point in the history

Commits on Jan 7, 2016

  1. Merge branch 'master' into feature/aggs-refactoring

    # Conflicts:
    #	core/src/main/java/org/elasticsearch/percolator/PercolatorService.java
    #	core/src/main/java/org/elasticsearch/percolator/QueryCollector.java
    colings86 committed Jan 7, 2016
    Configuration menu
    Copy the full SHA
    3b7d1b4 View commit details
    Browse the repository at this point in the history
  2. Fixed merge errors

    colings86 committed Jan 7, 2016
    Configuration menu
    Copy the full SHA
    1883317 View commit details
    Browse the repository at this point in the history

Commits on Jan 8, 2016

  1. Configuration menu
    Copy the full SHA
    7e7e4a2 View commit details
    Browse the repository at this point in the history

Commits on Jan 11, 2016

  1. Configuration menu
    Copy the full SHA
    9d7d89d View commit details
    Browse the repository at this point in the history

Commits on Jan 12, 2016

  1. Removed AvgBuilder and ExtendedStatsBuilder in place of Avgaggiegator…

    ….Factory and ExtendedStatsAggregator.Factory
    colings86 committed Jan 12, 2016
    Configuration menu
    Copy the full SHA
    000da3a View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    f429cb0 View commit details
    Browse the repository at this point in the history
  3. Configuration menu
    Copy the full SHA
    360fe98 View commit details
    Browse the repository at this point in the history

Commits on Jan 14, 2016

  1. Configuration menu
    Copy the full SHA
    8c4f0ea View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    0e866dd View commit details
    Browse the repository at this point in the history
  3. Merge branch 'master' into feature/aggs-refactoring

    # Conflicts:
    #	core/src/main/java/org/elasticsearch/common/io/stream/StreamInput.java
    #	core/src/main/java/org/elasticsearch/common/io/stream/StreamOutput.java
    colings86 committed Jan 14, 2016
    Configuration menu
    Copy the full SHA
    e6f9cbc View commit details
    Browse the repository at this point in the history

Commits on Jan 25, 2016

  1. Merge branch 'master' into feature/aggs-refactoring

    # Conflicts:
    #	core/src/main/java/org/elasticsearch/search/aggregations/bucket/filter/FilterAggregator.java
    #	core/src/main/java/org/elasticsearch/search/aggregations/bucket/filters/FiltersAggregator.java
    #	core/src/main/java/org/elasticsearch/search/SearchModule.java
    colings86 committed Jan 25, 2016
    Configuration menu
    Copy the full SHA
    cd8320b View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    d63b8a2 View commit details
    Browse the repository at this point in the history

Commits on Jan 26, 2016

  1. Merge branch 'master' into feature/aggs-refactoring

    # Conflicts:
    #	core/src/test/java/org/elasticsearch/percolator/PercolateDocumentParserTests.java
    colings86 committed Jan 26, 2016
    Configuration menu
    Copy the full SHA
    3b35754 View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    11bafa1 View commit details
    Browse the repository at this point in the history
  3. Merge branch 'master' into feature/aggs-refactoring

    # Conflicts:
    #	core/src/main/java/org/elasticsearch/common/io/stream/StreamInput.java
    #	core/src/main/java/org/elasticsearch/common/io/stream/StreamOutput.java
    #	core/src/main/java/org/elasticsearch/search/SearchModule.java
    colings86 committed Jan 26, 2016
    Configuration menu
    Copy the full SHA
    641aaab View commit details
    Browse the repository at this point in the history

Commits on Jan 27, 2016

  1. Configuration menu
    Copy the full SHA
    187009c View commit details
    Browse the repository at this point in the history

Commits on Jan 29, 2016

  1. Merge branch 'master' into feature/aggs-refactoring

    # Conflicts:
    #	core/src/main/java/org/elasticsearch/action/search/SearchRequestBuilder.java
    #	core/src/main/java/org/elasticsearch/percolator/PercolateContext.java
    #	core/src/main/java/org/elasticsearch/search/aggregations/bucket/significant/heuristics/ScriptHeuristic.java
    #	core/src/main/java/org/elasticsearch/search/internal/DefaultSearchContext.java
    #	core/src/test/java/org/elasticsearch/search/aggregations/bucket/significant/SignificanceHeuristicTests.java
    colings86 committed Jan 29, 2016
    Configuration menu
    Copy the full SHA
    859f9e6 View commit details
    Browse the repository at this point in the history

Commits on Feb 1, 2016

  1. Merge branch 'master' into feature/aggs-refactoring

    # Conflicts:
    #	core/src/test/java/org/elasticsearch/search/aggregations/AggregationsBinaryIT.java
    #	core/src/test/java/org/elasticsearch/search/aggregations/bucket/FilterIT.java
    #	core/src/test/java/org/elasticsearch/search/aggregations/bucket/FiltersIT.java
    #	core/src/test/java/org/elasticsearch/search/aggregations/bucket/GeoDistanceIT.java
    #	core/src/test/java/org/elasticsearch/search/aggregations/bucket/NestedIT.java
    #	core/src/test/java/org/elasticsearch/search/aggregations/bucket/SamplerIT.java
    #	core/src/test/java/org/elasticsearch/search/aggregations/pipeline/DerivativeIT.java
    #	modules/lang-groovy/src/test/java/org/elasticsearch/messy/tests/BucketSelectorTests.java
    #	modules/lang-groovy/src/test/java/org/elasticsearch/messy/tests/TDigestPercentileRanksTests.java
    colings86 committed Feb 1, 2016
    Configuration menu
    Copy the full SHA
    a241983 View commit details
    Browse the repository at this point in the history
  2. fixed issue from merge

    colings86 committed Feb 1, 2016
    Configuration menu
    Copy the full SHA
    2d2e9e0 View commit details
    Browse the repository at this point in the history

Commits on Feb 3, 2016

  1. Configuration menu
    Copy the full SHA
    5d9d91b View commit details
    Browse the repository at this point in the history
  2. Fixed merge errors

    colings86 committed Feb 3, 2016
    Configuration menu
    Copy the full SHA
    761adbb View commit details
    Browse the repository at this point in the history

Commits on Feb 5, 2016

  1. Merge branch 'master' into feature/aggs-refactoring

    # Conflicts:
    #	core/src/main/java/org/elasticsearch/common/io/stream/StreamInput.java
    #	core/src/main/java/org/elasticsearch/common/io/stream/StreamOutput.java
    colings86 committed Feb 5, 2016
    Configuration menu
    Copy the full SHA
    f06f17f View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    92d958c View commit details
    Browse the repository at this point in the history
  3. more line length fixes

    colings86 committed Feb 5, 2016
    Configuration menu
    Copy the full SHA
    19d9c58 View commit details
    Browse the repository at this point in the history

Commits on Feb 8, 2016

  1. Configuration menu
    Copy the full SHA
    a0b004a View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    02ecfd6 View commit details
    Browse the repository at this point in the history
  3. Configuration menu
    Copy the full SHA
    323088d View commit details
    Browse the repository at this point in the history
  4. Make AggregatorFactory fully immutable by requiring the parent, subFa…

    …ctories and metadata in the constructor
    colings86 committed Feb 8, 2016
    Configuration menu
    Copy the full SHA
    94e594c View commit details
    Browse the repository at this point in the history

Commits on Feb 9, 2016

  1. Configuration menu
    Copy the full SHA
    e5a5067 View commit details
    Browse the repository at this point in the history
  2. Merge branch 'master' into feature/aggs-refactoring

    # Conflicts:
    #	core/src/main/java/org/elasticsearch/percolator/PercolateContext.java
    #	core/src/main/java/org/elasticsearch/search/aggregations/bucket/filter/FilterParser.java
    #	core/src/main/java/org/elasticsearch/search/aggregations/bucket/filters/FiltersParser.java
    #	core/src/main/java/org/elasticsearch/search/aggregations/bucket/significant/SignificantTermsParametersParser.java
    #	core/src/main/java/org/elasticsearch/search/internal/DefaultSearchContext.java
    #	core/src/test/java/org/elasticsearch/search/aggregations/bucket/geogrid/GeoHashGridParserTests.java
    #	test/framework/src/main/java/org/elasticsearch/test/TestSearchContext.java
    colings86 committed Feb 9, 2016
    Configuration menu
    Copy the full SHA
    80bbb4a View commit details
    Browse the repository at this point in the history

Commits on Feb 10, 2016

  1. Configuration menu
    Copy the full SHA
    ccee057 View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    54e2f31 View commit details
    Browse the repository at this point in the history
  3. Made AggregatorFactory fields final and removed AggregationContext fr…

    …om createInternal() parameters
    colings86 committed Feb 10, 2016
    Configuration menu
    Copy the full SHA
    2d1f97b View commit details
    Browse the repository at this point in the history
  4. Renames PipelineAggregatorFactory to PipelineAggregatorBuilder

    Also renames all the implementations appropriately
    colings86 committed Feb 10, 2016
    Configuration menu
    Copy the full SHA
    37ce740 View commit details
    Browse the repository at this point in the history
  5. Configuration menu
    Copy the full SHA
    1f760bd View commit details
    Browse the repository at this point in the history
  6. fix merge error

    colings86 committed Feb 10, 2016
    Configuration menu
    Copy the full SHA
    cef9b01 View commit details
    Browse the repository at this point in the history

Commits on Feb 11, 2016

  1. Merge branch 'master' into feature/aggs-refactoring

    # Conflicts:
    #	core/src/main/java/org/elasticsearch/search/SearchService.java
    #	test/framework/src/main/java/org/elasticsearch/search/MockSearchService.java
    colings86 committed Feb 11, 2016
    Configuration menu
    Copy the full SHA
    4a9c84d View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    ca6058e View commit details
    Browse the repository at this point in the history

Commits on Feb 12, 2016

  1. Configuration menu
    Copy the full SHA
    ed3f790 View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    d9c1e88 View commit details
    Browse the repository at this point in the history
  3. Configuration menu
    Copy the full SHA
    86b0777 View commit details
    Browse the repository at this point in the history

Commits on Feb 15, 2016

  1. Configuration menu
    Copy the full SHA
    c3d6520 View commit details
    Browse the repository at this point in the history
  2. Merge branch 'master' into feature/aggs-refactoring

    # Conflicts:
    #	core/src/test/java/org/elasticsearch/search/builder/SearchSourceBuilderTests.java
    colings86 committed Feb 15, 2016
    Configuration menu
    Copy the full SHA
    1a46628 View commit details
    Browse the repository at this point in the history
  3. review comments

    colings86 committed Feb 15, 2016
    Configuration menu
    Copy the full SHA
    bd2e00d View commit details
    Browse the repository at this point in the history