[Spotless] Fixes license headers in core/src (PR 1) #306

MitchellGale · 2023-07-21T18:26:12Z

Description

Fixes license headers in core/src.

Converts all header licenses to:

 * Copyright OpenSearch Contributors
 * SPDX-License-Identifier: Apache-2.0
 */

Check List

New functionality includes testing.
- All tests pass, including unit test, integration test and doctest
New functionality has been documented.
- New functionality has javadoc added
- New functionality has user manual doc added
Commits are signed per the DCO using --signoff

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.

Signed-off-by: Mitchell Gale <Mitchell.Gale@improving.com>

Yury-Fridlyand · 2023-07-21T19:10:48Z

core/src/main/java/org/opensearch/sql/expression/aggregation/StdDevAggregator.java

- *   express or implied. See the License for the specific language governing
- *   permissions and limitations under the License.
+ * Copyright OpenSearch Contributors
+ * SPDX-License-Identifier: Apache-2.0


We need to confirm that this file wasn't copied from another project. In that case we need to preserve the license header (or keep both).

Looks like it was part of 254510e 254510e554156ef83365e0ea68935d4d75145330

By David Cui 2021-06-25 5:47 p.m.

I found only one matching file on GH (name + license), but code is completely different.
https://github.com/apache/druid/blob/master/extensions-core/stats/src/main/java/org/apache/druid/query/aggregation/variance/VarianceAggregator.java
https://github.com/apache/druid/blob/master/extensions-core/stats/src/main/java/org/apache/druid/query/aggregation/variance/StandardDeviationPostAggregator.java

I hope it is a false alarm.

Yury-Fridlyand · 2023-07-21T19:10:55Z

core/src/main/java/org/opensearch/sql/expression/aggregation/VarianceAggregator.java

- *   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.
+ * Copyright OpenSearch Contributors


Yury-Fridlyand · 2023-07-21T19:12:49Z

core/src/test/java/org/opensearch/sql/expression/aggregation/StdDevAggregatorTest.java

- *   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.
+ * Copyright OpenSearch Contributors


Checking why this has Apache 2 license.

I guess both were by mistake: opensearch-project@8632f80

Yury-Fridlyand · 2023-07-21T19:12:56Z

core/src/test/java/org/opensearch/sql/expression/aggregation/VarianceAggregatorTest.java

- *   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.
+ * Copyright OpenSearch Contributors


codecov · 2023-07-21T19:19:21Z

Codecov Report

Merging #306 (0097d53) into integ/sl_licenseHeader (76189c9) will not change coverage.
The diff coverage is n/a.

@@                    Coverage Diff                    @@
##             integ/sl_licenseHeader     #306   +/-   ##
=========================================================
  Coverage                     97.39%   97.39%           
  Complexity                     4608     4608           
=========================================================
  Files                           401      401           
  Lines                         11408    11408           
  Branches                        843      843           
=========================================================
  Hits                          11111    11111           
  Misses                          290      290           
  Partials                          7        7

Flag	Coverage Δ
sql-engine	`97.39% <ø> (ø)`

Flags with carried forward coverage won't be shown. Click here to find out more.

Impacted Files	Coverage Δ
...alysis/DataSourceSchemaIdentifierNameResolver.java	`100.00% <ø> (ø)`
...org/opensearch/sql/analysis/HighlightAnalyzer.java	`100.00% <ø> (ø)`
...va/org/opensearch/sql/analysis/NestedAnalyzer.java	`100.00% <ø> (ø)`
.../org/opensearch/sql/data/model/ExprValueUtils.java	`100.00% <ø> (ø)`
...rg/opensearch/sql/exception/NoCursorException.java	`100.00% <ø> (ø)`
...l/exception/UnsupportedCursorRequestException.java	`100.00% <ø> (ø)`
.../org/opensearch/sql/executor/ExecutionContext.java	`100.00% <ø> (ø)`
...main/java/org/opensearch/sql/executor/QueryId.java	`100.00% <ø> (ø)`
...java/org/opensearch/sql/executor/QueryManager.java	`100.00% <ø> (ø)`
...java/org/opensearch/sql/executor/QueryService.java	`100.00% <ø> (ø)`
... and 65 more

📣 We’re building smart automated test selection to slash your CI/CD build times. Learn more

dai-chen · 2023-07-21T20:29:45Z

I think we need to find the previous guidance on this. For example, I recall old source file from ODFE has such license header: https://github.com/Bit-Quill/opensearch-project-sql/pull/308/files which we should not touch.

If you're unclear, please disable this license header check for now. Or if you want, please spend some time to double check.

MitchellGale · 2023-07-21T21:20:43Z

opensearch-project#1893
PR closed until licence addressed

* Implement creation of ip2geo feature (#257) * Update gradle version to 7.6 (#265) Signed-off-by: Vijayan Balasubramanian <balasvij@amazon.com> * Implement creation of ip2geo feature * Implementation of ip2geo datasource creation * Implementation of ip2geo processor creation Signed-off-by: Heemin Kim <heemin@amazon.com> --------- Signed-off-by: Vijayan Balasubramanian <balasvij@amazon.com> Signed-off-by: Heemin Kim <heemin@amazon.com> Co-authored-by: Vijayan Balasubramanian <balasvij@amazon.com> * Added unit tests with some refactoring of codes (#271) * Add Unit tests * Set cache true for search query * Remove in memory cache implementation (Two way door decision) * Relying on search cache without custom cache * Renamed datasource state from FAILED to CREATE_FAILED * Renamed class name from *Helper to *Facade * Changed updateIntervalInDays to updateInterval * Changed value type of default update_interval from TimeValue to Long * Read setting value from cluster settings directly Signed-off-by: Heemin Kim <heemin@amazon.com> * Sync from main (#280) * Update gradle version to 7.6 (#265) Signed-off-by: Vijayan Balasubramanian <balasvij@amazon.com> * Exclude lombok generated code from jacoco coverage report (#268) Signed-off-by: Heemin Kim <heemin@amazon.com> * Make jacoco report to be generated faster in local (#267) Signed-off-by: Heemin Kim <heemin@amazon.com> * Update dependency org.json:json to v20230227 (#273) Co-authored-by: mend-for-github-com[bot] <50673670+mend-for-github-com[bot]@users.noreply.github.com> * Baseline owners and maintainers (#275) Signed-off-by: Vijayan Balasubramanian <balasvij@amazon.com> --------- Signed-off-by: Vijayan Balasubramanian <balasvij@amazon.com> Signed-off-by: Heemin Kim <heemin@amazon.com> Co-authored-by: Vijayan Balasubramanian <balasvij@amazon.com> Co-authored-by: mend-for-github-com[bot] <50673670+mend-for-github-com[bot]@users.noreply.github.com> * Add datasource name validation (#281) Signed-off-by: Heemin Kim <heemin@amazon.com> * Refactoring of code (#282) 1. Change variable name from datasourceName to name 2. Change variable name from id to name 3. Added helper methods in test code Signed-off-by: Heemin Kim <heemin@amazon.com> * Change field name from md5 to sha256 (#285) Signed-off-by: Heemin Kim <heemin@amazon.com> * Implement get datasource api (#279) Signed-off-by: Heemin Kim <heemin@amazon.com> * Update index option (#284) 1. Make geodata index as hidden 2. Make geodata index as read only allow delete after creation is done 3. Refresh datasource index immediately after update Signed-off-by: Heemin Kim <heemin@amazon.com> * Make some fields in manifest file as mandatory (#289) Signed-off-by: Heemin Kim <heemin@amazon.com> * Create datasource index explicitly (#283) Signed-off-by: Heemin Kim <heemin@amazon.com> * Add wrapper class of job scheduler lock service (#290) Signed-off-by: Heemin Kim <heemin@amazon.com> * Remove all unused client attributes (#293) Signed-off-by: Heemin Kim <heemin@amazon.com> * Update copyright header (#298) Signed-off-by: Heemin Kim <heemin@amazon.com> * Run system index handling code with stashed thread context (#297) Signed-off-by: Heemin Kim <heemin@amazon.com> * Reduce lock duration and renew the lock during update (#299) Signed-off-by: Heemin Kim <heemin@amazon.com> * Implements delete datasource API (#291) Signed-off-by: Heemin Kim <heemin@amazon.com> * Set User-Agent in http request (#300) Signed-off-by: Heemin Kim <heemin@amazon.com> * Implement datasource update API (#292) Signed-off-by: Heemin Kim <heemin@amazon.com> * Refactoring test code (#302) Make buildGeoJSONFeatureProcessorConfig method to be more general Signed-off-by: Heemin Kim <heemin@amazon.com> * Add ip2geo processor integ test for failure case (#303) Signed-off-by: Heemin Kim <heemin@amazon.com> * Bug fix and refactoring of code (#305) 1. Bugfix: Ingest metadata can be null if there is no processor created 2. Refactoring: Moved private method to another class for better testing support 3. Refactoring: Set some private static final variable as public so that unit test can use it 4. Refactoring: Changed string value to static variable Signed-off-by: Heemin Kim <heemin@amazon.com> * Add integration test for Ip2GeoProcessor (#306) Signed-off-by: Heemin Kim <heemin@amazon.com> * Add ConcurrentModificationException (#308) Signed-off-by: Heemin Kim <heemin@amazon.com> * Add integration test for UpdateDatasource API (#307) Signed-off-by: Heemin Kim <heemin@amazon.com> * Bug fix on lock management and few performance improvements (#310) * Release lock before response back to caller for update/delete API * Release lock in background task for creation API * Change index settings to improve indexing performance Signed-off-by: Heemin Kim <heemin@amazon.com> * Change index setting from read_only_allow_delete to write (#311) read_only_allow_delete does not block write to an index. The disk-based shard allocator may add and remove this block automatically. Therefore, use index.blocks.write instead. Signed-off-by: Heemin Kim <heemin@amazon.com> * Fix bug in get datasource API and improve memory usage (#313) Signed-off-by: Heemin Kim <heemin@amazon.com> * Change package for Strings.hasText (#314) (#317) Signed-off-by: Heemin Kim <heemin@amazon.com> * Remove jitter and move index setting from DatasourceFacade to DatasourceExtension (#319) Signed-off-by: Heemin Kim <heemin@amazon.com> * Do not index blank value and do not enrich null property (#320) Signed-off-by: Heemin Kim <heemin@amazon.com> * Move index setting keys to constants (#321) Signed-off-by: Heemin Kim <heemin@amazon.com> * Return null index name for expired data (#322) Return null index name for expired data so that it can be deleted by clean up process. Clean up process exclude current index from deleting. Signed-off-by: Heemin Kim <heemin@amazon.com> * Add new fields in datasource (#325) Signed-off-by: Heemin Kim <heemin@amazon.com> * Delete index once it is expired (#326) Signed-off-by: Heemin Kim <heemin@amazon.com> * Add restoring event listener (#328) In the listener, we trigger a geoip data update Signed-off-by: Heemin Kim <heemin@amazon.com> * Reverse forcemerge and refresh order (#331) Otherwise, opensearch does not clear old segment files Signed-off-by: Heemin Kim <heemin@amazon.com> * Removed parameter and settings (#332) * Removed first_only parameter * Removed max_concurrency and batch_size setting first_only parameter was added as current geoip processor has it. However, the parameter have no benefit for ip2geo processor as we don't do a sequantial search for array data but use multi search. max_concurrency and batch_size setting is removed as these are only reveal internal implementation and could be a future blocker to improve performance later. Signed-off-by: Heemin Kim <heemin@amazon.com> * Add a field in datasource for current index name (#333) Signed-off-by: Heemin Kim <heemin@amazon.com> * Delete GeoIP data indices after restoring complete (#334) We don't want to use restored GeoIP data indices. Therefore we delete the indices once restoring process complete. When GeoIP metadata index is restored, we create a new GeoIP data index instead. Signed-off-by: Heemin Kim <heemin@amazon.com> * Use bool query for array form of IPs (#335) Signed-off-by: Heemin Kim <heemin@amazon.com> * Run update/delete request in a new thread (#337) This is not to block transport thread Signed-off-by: Heemin Kim <heemin@amazon.com> * Remove IP2Geo processor validation (#336) Cannot query index to get data to validate IP2Geo processor. Will add validation when we decide to store some of data in cluster state metadata. Signed-off-by: Heemin Kim <heemin@amazon.com> * Acquire lock sychronously (#339) By acquiring lock asychronously, the remaining part of the code is being run by transport thread which does not allow blocking code. We want only single update happen in a node using single thread. However, it cannot be acheived if I acquire lock asynchronously and pass the listener. Signed-off-by: Heemin Kim <heemin@amazon.com> * Added a cache to store datasource metadata (#338) Signed-off-by: Heemin Kim <heemin@amazon.com> * Changed class name and package (#341) Signed-off-by: Heemin Kim <heemin@amazon.com> * Refactoring of code (#342) 1. Changed class name from Ip2GeoCache to Ip2GeoCachedDao 2. Moved the Ip2GeoCachedDao from cache to dao package Signed-off-by: Heemin Kim <heemin@amazon.com> * Add geo data cache (#340) Signed-off-by: Heemin Kim <heemin@amazon.com> * Add cache layer to reduce GeoIp data retrieval latency (opensearch-project#343) Signed-off-by: Heemin Kim <heemin@amazon.com> * Use _primary in query preference and few changes (opensearch-project#347) 1. Use _primary preference to get datasource metadata so that it can read the latest data. RefreshPolicy.IMMEDIATE won't refresh replica shards immediately according to #346 2. Update datasource metadata index mapping 3. Move batch size from static value to setting Signed-off-by: Heemin Kim <heemin@amazon.com> * Wait until GeoIP data to be replicated to all data nodes (opensearch-project#348) Signed-off-by: Heemin Kim <heemin@amazon.com> * Update packages according to a change in OpenSearch core (opensearch-project#354) * Update packages according to a change in OpenSearch core Signed-off-by: Heemin Kim <heemin@amazon.com> * Update packages according to a change in OpenSearch core (opensearch-project#353) Signed-off-by: Heemin Kim <heemin@amazon.com> --------- Signed-off-by: Heemin Kim <heemin@amazon.com> --------- Signed-off-by: Vijayan Balasubramanian <balasvij@amazon.com> Signed-off-by: Heemin Kim <heemin@amazon.com> Co-authored-by: Vijayan Balasubramanian <balasvij@amazon.com> Co-authored-by: mend-for-github-com[bot] <50673670+mend-for-github-com[bot]@users.noreply.github.com>

MitchellGale requested a review from matthewryanwells July 21, 2023 18:26

MitchellGale requested review from MaxKsyunz, Yury-Fridlyand, forestmvey, acarbonetto and GumpacG as code owners July 21, 2023 18:26

MitchellGale added 3 commits July 21, 2023 11:43

Adding license header to spotless.

364d8ef

Signed-off-by: Mitchell Gale <Mitchell.Gale@improving.com>

Removed license header to spotless.

98d9cbf

Signed-off-by: Mitchell Gale <Mitchell.Gale@improving.com>

core/src license fixes

0097d53

Signed-off-by: Mitchell Gale <Mitchell.Gale@improving.com>

MitchellGale force-pushed the dev/sl_licenseHeader branch from 1340f6a to 0097d53 Compare July 21, 2023 18:44

Yury-Fridlyand approved these changes Jul 21, 2023

View reviewed changes

matthewryanwells approved these changes Jul 21, 2023

View reviewed changes

matthewryanwells mentioned this pull request Jul 21, 2023

[Spotless] Fixes license headers (PR 3) #308

Closed

6 tasks

MitchellGale closed this Jul 21, 2023

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

[Spotless] Fixes license headers in core/src (PR 1) #306

[Spotless] Fixes license headers in core/src (PR 1) #306

MitchellGale commented Jul 21, 2023 •

edited

Loading

Yury-Fridlyand Jul 21, 2023

MitchellGale Jul 21, 2023

Yury-Fridlyand Jul 21, 2023 •

edited

Loading

Yury-Fridlyand Jul 21, 2023

Yury-Fridlyand Jul 21, 2023

dai-chen Jul 21, 2023

dai-chen Jul 21, 2023

Yury-Fridlyand Jul 21, 2023

codecov bot commented Jul 21, 2023 •

edited

Loading

dai-chen commented Jul 21, 2023

MitchellGale commented Jul 21, 2023

[Spotless] Fixes license headers in core/src (PR 1) #306

[Spotless] Fixes license headers in core/src (PR 1) #306

Conversation

MitchellGale commented Jul 21, 2023 • edited Loading

Description

Check List

Yury-Fridlyand Jul 21, 2023

Choose a reason for hiding this comment

MitchellGale Jul 21, 2023

Choose a reason for hiding this comment

Yury-Fridlyand Jul 21, 2023 • edited Loading

Choose a reason for hiding this comment

Yury-Fridlyand Jul 21, 2023

Choose a reason for hiding this comment

Yury-Fridlyand Jul 21, 2023

Choose a reason for hiding this comment

dai-chen Jul 21, 2023

Choose a reason for hiding this comment

dai-chen Jul 21, 2023

Choose a reason for hiding this comment

Yury-Fridlyand Jul 21, 2023

Choose a reason for hiding this comment

codecov bot commented Jul 21, 2023 • edited Loading

Codecov Report

dai-chen commented Jul 21, 2023

MitchellGale commented Jul 21, 2023

MitchellGale commented Jul 21, 2023 •

edited

Loading

Yury-Fridlyand Jul 21, 2023 •

edited

Loading

codecov bot commented Jul 21, 2023 •

edited

Loading