-
Notifications
You must be signed in to change notification settings - Fork 1.9k
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
_doc_count elasticsearch PR #3985
Conversation
Signed-off-by: Petar Dzepina <[email protected]>
Signed-off-by: Petar Dzepina <[email protected]>
Signed-off-by: Petar Dzepina <[email protected]>
Gradle Check (Jenkins) Run Completed with:
|
@nknize , @saratvemulapalli can you please approve workflows and also review the PR. This helps in one of our Rollup enhancement issues |
Signed-off-by: Petar Dzepina <[email protected]>
Gradle Check (Jenkins) Run Completed with:
|
Signed-off-by: Petar Dzepina <[email protected]>
Gradle Check (Jenkins) Run Completed with:
|
Signed-off-by: Petar Dzepina <[email protected]>
Gradle Check (Jenkins) Run Completed with:
|
Signed-off-by: Petar Dzepina <[email protected]>
Gradle Check (Jenkins) Run Completed with:
|
Signed-off-by: Petar Dzepina <[email protected]>
Gradle Check (Jenkins) Run Completed with:
|
Codecov Report
@@ Coverage Diff @@
## main #3985 +/- ##
============================================
+ Coverage 70.42% 70.65% +0.22%
- Complexity 56659 56817 +158
============================================
Files 4573 4575 +2
Lines 273348 273401 +53
Branches 40088 40092 +4
============================================
+ Hits 192512 193160 +648
+ Misses 64586 63998 -588
+ Partials 16250 16243 -7
Help us with your feedback. Take ten seconds to tell us how you rate us. |
@petardz these changes look similar to the PR in Elasticsearch. I didnt read up the changes, but I'll take a look. |
@saratvemulapalli , the PR was originally created before the fork and has the Apache-2 license. |
thanks @praveensameneni, but I think @saratvemulapalli is asking the right questions - why wasn't this code included in the fork if it was PRed and merged before the fork? Either way, @petardz can you please visibly confirm that your contributed code in this PR was written without looking/copying any non-APLv2 code? |
@dblock Yes, I've just re-checked. The only exception is 380_doc_count_field.yml rest-api test which didn't have any license in file.(none of these .yml files do) |
It was merged to master, not 7.x. |
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.
The source code in this PR is taken from Elastic commit 330d2b74f93c71707e4192ad07c9a6a47d451575. Since the default license for that commit is ALv2 any files w/o license headers is covered under ALv2.
We do, however, need to update all of the headers in this PR to match the other forked source files so that attribution is correct:
/*
* SPDX-License-Identifier: Apache-2.0
*
* The OpenSearch Contributors require contributions made to
* this file be licensed under the Apache-2.0 license or a
* compatible open source license.
*/
/*
* Licensed to Elasticsearch under one or more contributor
* license agreements. See the NOTICE file distributed with
* this work for additional information regarding copyright
* ownership. Elasticsearch licenses this file to you under
* the Apache License, Version 2.0 (the "License"); you may
* not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
* KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
* under the License.
*/
/*
* Modifications Copyright OpenSearch Contributors. See
* GitHub history for details.
*/
Signed-off-by: Petar Dzepina <[email protected]>
Signed-off-by: Petar Dzepina <[email protected]>
@nknize done |
Gradle Check (Jenkins) Run Completed with:
|
Gradle Check (Jenkins) Run Completed with:
|
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.
thx for the quick turnaround. Looks like one file is still missing the OpenSearch license provisions.
@@ -0,0 +1,49 @@ | |||
/* |
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.
Looks like this is the last file missing the OpenSearch license provisions
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.
ah... sorry. Should be good now.
Signed-off-by: Petar Dzepina <[email protected]>
Gradle Check (Jenkins) Run Completed with:
|
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.
LGTM
Bucket aggregations compute bucket doc_count values by incrementing the doc_count by 1 for every document collected in the bucket. When using summary fields (such as aggregate_metric_double) one field may represent more than one document. To provide this functionality this commit implements a new field mapper (named doc_count field mapper). This field is a positive integer representing the number of documents aggregated in a single summary field. Bucket aggregations check if a field of type doc_count exists in a document and take this value into consideration when computing doc counts. Note: This originated from upstream PR 64503. Signed-off-by: Petar Dzepina <[email protected]> (cherry picked from commit fb7d81a)
Bucket aggregations compute bucket doc_count values by incrementing the doc_count by 1 for every document collected in the bucket. When using summary fields (such as aggregate_metric_double) one field may represent more than one document. To provide this functionality this commit implements a new field mapper (named doc_count field mapper). This field is a positive integer representing the number of documents aggregated in a single summary field. Bucket aggregations check if a field of type doc_count exists in a document and take this value into consideration when computing doc counts. Note: This originated from upstream PR 64503. Signed-off-by: Petar Dzepina <[email protected]> (cherry picked from commit fb7d81a) Co-authored-by: Petar Dzepina <[email protected]>
Description
Merged elasticsearch _doc_count PR
Issues Resolved
3712
Check List
By submitting this pull request, I confirm that my contribution is made under the terms of the Apache 2.0 license.
For more information on following Developer Certificate of Origin and signing off your commits, please check here.