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

Integ/sl google java format5 #332

Merged
merged 32 commits into from
Aug 8, 2023
Merged

Conversation

MitchellGale
Copy link

Description

[Describe what this change achieves]

Issues Resolved

[List any issues this PR will resolve]

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.

MitchellGale and others added 30 commits August 2, 2023 10:07
…ensearch/sql/planner core/src/main/java/org/opensearch/sql/storage core/src/main/java/org/opensearch/sql/utils

Signed-off-by: Mitchell Gale <[email protected]>
…ava OperatorUtils.java Planner.java

Signed-off-by: Mitchell Gale <[email protected]>
Signed-off-by: Mitchell Gale <[email protected]>
Signed-off-by: Mitchell Gale <[email protected]>
Signed-off-by: Mitchell Gale <[email protected]>
Signed-off-by: Mitchell Gale <[email protected]>
# This is the 1st commit message:

Fix create_index/create_index_with_IOException issue caused by OpenSearch PR change (opensearch-project#1899)

* Added setDefaultMediaType for create_index and create_index_with_IOException

Signed-off-by: Mitchell Gale <[email protected]>
(cherry picked from commit 7b932a7)
Signed-off-by: Mitchell Gale <[email protected]>

Resolving merge conflicts for pre tag in java docs.

Signed-off-by: Mitchell Gale <[email protected]>

running spotless check on newly pre tagged javadocs.

Signed-off-by: Mitchell Gale <[email protected]>

Converts java doc table to proper java doc table.

Signed-off-by: Mitchell Gale <[email protected]>

Resolving merge conflicts for pre tag in java docs 2

Signed-off-by: Mitchell Gale <[email protected]>

running spotless check on newly pre tagged javadocs.

Signed-off-by: Mitchell Gale <[email protected]>

cherry pick 60c0018

Signed-off-by: Mitchell Gale <[email protected]>

Addressed PR comment for table format in AbstractExprValue.

Signed-off-by: Mitchell Gale <[email protected]>

Removed pre tag from ExpressionReferenceOptimizer.

Signed-off-by: Mitchell Gale <[email protected]>

Removed pre tag from AstDSL.java

Signed-off-by: Mitchell Gale <[email protected]>

Removed pre tag from AstDSL.java

Signed-off-by: Mitchell Gale <[email protected]>

Removed pre tag from SelectExpressionAnalyzer.java

Signed-off-by: Mitchell Gale <[email protected]>

fixed java doc in QualifiedName.java

Signed-off-by: Mitchell Gale <[email protected]>

Removing checkstyle test for core and added spotless for relevant directories.

Signed-off-by: Mitchell Gale <[email protected]>

# This is the commit message #2:

Fixing spacing around headers in ExpressionReferenceOptimizer.java SelectExpressionAnalyzer.java

Signed-off-by: Mitchell Gale <[email protected]>

# This is the commit message #3:

Fix breaking changes. Disable some flaky tests in legacy.

Signed-off-by: Yury-Fridlyand <[email protected]>

(cherry picked from commit 809e656)
Signed-off-by: Mitchell Gale <[email protected]>

# This is the commit message #4:

Resolving merge conflicts for pre tag in java docs.

Signed-off-by: Mitchell Gale <[email protected]>

# This is the commit message #5:

running spotless check on newly pre tagged javadocs.

Signed-off-by: Mitchell Gale <[email protected]>

# This is the commit message #6:

Fixed java doc spelling and improving string concatination.

Signed-off-by: Mitchell Gale <[email protected]>

# This is the commit message #7:

improving string concatination.

Signed-off-by: Mitchell Gale <[email protected]>

# This is the commit message #8:

Improving failure format on some functions.

Signed-off-by: Mitchell Gale <[email protected]>

# This is the commit message #9:

spotless apply and fix of build.gradle

Signed-off-by: Mitchell Gale <[email protected]>
author Mitchell Gale <[email protected]> 1691080710 -0700
committer Mitchell Gale <[email protected]> 1691080766 -0700

Fix create_index/create_index_with_IOException issue caused by OpenSearch PR change (opensearch-project#1899)

* Added setDefaultMediaType for create_index and create_index_with_IOException

Signed-off-by: Mitchell Gale <[email protected]>
(cherry picked from commit 7b932a7)
Signed-off-by: Mitchell Gale <[email protected]>

Resolving merge conflicts for pre tag in java docs.

Signed-off-by: Mitchell Gale <[email protected]>

running spotless check on newly pre tagged javadocs.

Signed-off-by: Mitchell Gale <[email protected]>

Converts java doc table to proper java doc table.

Signed-off-by: Mitchell Gale <[email protected]>

Resolving merge conflicts for pre tag in java docs 2

Signed-off-by: Mitchell Gale <[email protected]>

running spotless check on newly pre tagged javadocs.

Signed-off-by: Mitchell Gale <[email protected]>

cherry pick 60c0018

Signed-off-by: Mitchell Gale <[email protected]>

Addressed PR comment for table format in AbstractExprValue.

Signed-off-by: Mitchell Gale <[email protected]>

Removed pre tag from ExpressionReferenceOptimizer.

Signed-off-by: Mitchell Gale <[email protected]>

Removed pre tag from AstDSL.java

Signed-off-by: Mitchell Gale <[email protected]>

Removed pre tag from AstDSL.java

Signed-off-by: Mitchell Gale <[email protected]>

Removed pre tag from SelectExpressionAnalyzer.java

Signed-off-by: Mitchell Gale <[email protected]>

fixed java doc in QualifiedName.java

Signed-off-by: Mitchell Gale <[email protected]>

Removing checkstyle test for core and added spotless for relevant directories.

Signed-off-by: Mitchell Gale <[email protected]>

Fixing spacing around headers in ExpressionReferenceOptimizer.java SelectExpressionAnalyzer.java

Signed-off-by: Mitchell Gale <[email protected]>

Fix breaking changes. Disable some flaky tests in legacy.

Signed-off-by: Yury-Fridlyand <[email protected]>

(cherry picked from commit 809e656)
Signed-off-by: Mitchell Gale <[email protected]>

Resolving merge conflicts for pre tag in java docs.

Signed-off-by: Mitchell Gale <[email protected]>

running spotless check on newly pre tagged javadocs.

Signed-off-by: Mitchell Gale <[email protected]>

Fixed java doc spelling and improving string concatination.

Signed-off-by: Mitchell Gale <[email protected]>

improving string concatination.

Signed-off-by: Mitchell Gale <[email protected]>

Improving failure format on some functions.

Signed-off-by: Mitchell Gale <[email protected]>

spotless apply and fix of build.gradle

Signed-off-by: Mitchell Gale <[email protected]>

Resolving merge conflicts for pre tag in java docs.

Signed-off-by: Mitchell Gale <[email protected]>

running spotless check on newly pre tagged javadocs.

Signed-off-by: Mitchell Gale <[email protected]>

Converts java doc table to proper java doc table.

Signed-off-by: Mitchell Gale <[email protected]>

Removing unused import in OpenSearchRestClientTest.java

Signed-off-by: Mitchell Gale <[email protected]>
Signed-off-by: Mitchell Gale <[email protected]>
[Spotless] Applying Google Code Format for core/src/main files #3
[Spotless] Applying Google Code Format for core/src/main files #4
[Spotless] Applying Google Code Format for core/src/main files #2
[Spotless] Applying Google Code Format for core/src/main files #1
Signed-off-by: Mitchell Gale <[email protected]>
Signed-off-by: Mitchell Gale <[email protected]>
Signed-off-by: Mitchell Gale <[email protected]>
Signed-off-by: Mitchell Gale <[email protected]>
MitchellGale and others added 2 commits August 4, 2023 18:43
[Spotless] Applying Google Code Format for core #5
Signed-off-by: Mitchell Gale <[email protected]>
@MitchellGale MitchellGale merged commit a198b99 into integ/sl_GJF5 Aug 8, 2023
MitchellGale added a commit that referenced this pull request Aug 9, 2023
Adding core final GJF fix.

Signed-off-by: Mitchell Gale <[email protected]>
MitchellGale added a commit that referenced this pull request Aug 10, 2023
…t#1951)

* Integ/sl google java format5 (#332)

Adding core final GJF fix.

Signed-off-by: Mitchell Gale <[email protected]>

* remove repeated unused checkstyle.

Signed-off-by: Mitchell Gale <[email protected]>

* spotless apply

Signed-off-by: Mitchell Gale <[email protected]>

* replaced nbsp with pre tag.

Signed-off-by: Mitchell Gale <[email protected]>

* Add test fixtures to failure ignore in core build.gradle.

Signed-off-by: Mitchell Gale <[email protected]>

---------

Signed-off-by: Mitchell Gale <[email protected]>
MitchellGale added a commit that referenced this pull request Aug 14, 2023
…t#1951)

* Integ/sl google java format5 (#332)

Adding core final GJF fix.

Signed-off-by: Mitchell Gale <[email protected]>

* remove repeated unused checkstyle.

Signed-off-by: Mitchell Gale <[email protected]>

* spotless apply

Signed-off-by: Mitchell Gale <[email protected]>

* replaced nbsp with pre tag.

Signed-off-by: Mitchell Gale <[email protected]>

* Add test fixtures to failure ignore in core build.gradle.

Signed-off-by: Mitchell Gale <[email protected]>

---------

Signed-off-by: Mitchell Gale <[email protected]>
MitchellGale added a commit that referenced this pull request Aug 18, 2023
…t#1951)

* Integ/sl google java format5 (#332)

Adding core final GJF fix.

Signed-off-by: Mitchell Gale <[email protected]>

* remove repeated unused checkstyle.

Signed-off-by: Mitchell Gale <[email protected]>

* spotless apply

Signed-off-by: Mitchell Gale <[email protected]>

* replaced nbsp with pre tag.

Signed-off-by: Mitchell Gale <[email protected]>

* Add test fixtures to failure ignore in core build.gradle.

Signed-off-by: Mitchell Gale <[email protected]>

---------

Signed-off-by: Mitchell Gale <[email protected]>
andy-k-improving pushed a commit that referenced this pull request Nov 16, 2024
* Implement creation of ip2geo feature (#257)

* Update gradle version to 7.6 (#265)

Signed-off-by: Vijayan Balasubramanian <[email protected]>

* Implement creation of ip2geo feature

* Implementation of ip2geo datasource creation
* Implementation of ip2geo processor creation

Signed-off-by: Heemin Kim <[email protected]>
---------

Signed-off-by: Vijayan Balasubramanian <[email protected]>
Signed-off-by: Heemin Kim <[email protected]>
Co-authored-by: Vijayan Balasubramanian <[email protected]>

* 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 <[email protected]>

* Sync from main (#280)

* Update gradle version to 7.6 (#265)

Signed-off-by: Vijayan Balasubramanian <[email protected]>

* Exclude lombok generated code from jacoco coverage report (#268)

Signed-off-by: Heemin Kim <[email protected]>

* Make jacoco report to be generated faster in local (#267)

Signed-off-by: Heemin Kim <[email protected]>

* Update dependency org.json:json to v20230227 (#273)

Co-authored-by: mend-for-github.aaakk.us.kg[bot] <50673670+mend-for-github.aaakk.us.kg[bot]@users.noreply.github.com>

* Baseline owners and maintainers (#275)

Signed-off-by: Vijayan Balasubramanian <[email protected]>

---------

Signed-off-by: Vijayan Balasubramanian <[email protected]>
Signed-off-by: Heemin Kim <[email protected]>
Co-authored-by: Vijayan Balasubramanian <[email protected]>
Co-authored-by: mend-for-github.aaakk.us.kg[bot] <50673670+mend-for-github.aaakk.us.kg[bot]@users.noreply.github.com>

* Add datasource name validation (#281)

Signed-off-by: Heemin Kim <[email protected]>

* 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 <[email protected]>

* Change field name from md5 to sha256 (#285)

Signed-off-by: Heemin Kim <[email protected]>

* Implement get datasource api (#279)

Signed-off-by: Heemin Kim <[email protected]>

* 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 <[email protected]>

* Make some fields in manifest file as mandatory (#289)

Signed-off-by: Heemin Kim <[email protected]>

* Create datasource index explicitly (#283)

Signed-off-by: Heemin Kim <[email protected]>

* Add wrapper class of job scheduler lock service (#290)

Signed-off-by: Heemin Kim <[email protected]>

* Remove all unused client attributes (#293)

Signed-off-by: Heemin Kim <[email protected]>

* Update copyright header (#298)

Signed-off-by: Heemin Kim <[email protected]>

* Run system index handling code with stashed thread context (#297)

Signed-off-by: Heemin Kim <[email protected]>

* Reduce lock duration and renew the lock during update (#299)

Signed-off-by: Heemin Kim <[email protected]>

* Implements delete datasource API (#291)

Signed-off-by: Heemin Kim <[email protected]>

* Set User-Agent in http request (#300)

Signed-off-by: Heemin Kim <[email protected]>

* Implement datasource update API (#292)

Signed-off-by: Heemin Kim <[email protected]>

* Refactoring test code (#302)

Make buildGeoJSONFeatureProcessorConfig method to be more general

Signed-off-by: Heemin Kim <[email protected]>

* Add ip2geo processor integ test for failure case (#303)

Signed-off-by: Heemin Kim <[email protected]>

* 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 <[email protected]>

* Add integration test for Ip2GeoProcessor (#306)

Signed-off-by: Heemin Kim <[email protected]>

* Add ConcurrentModificationException (#308)

Signed-off-by: Heemin Kim <[email protected]>

* Add integration test for UpdateDatasource API (#307)

Signed-off-by: Heemin Kim <[email protected]>

* 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 <[email protected]>

* 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 <[email protected]>

* Fix bug in get datasource API and improve memory usage (#313)

Signed-off-by: Heemin Kim <[email protected]>

* Change package for Strings.hasText (#314) (#317)

Signed-off-by: Heemin Kim <[email protected]>

* Remove jitter and move index setting from DatasourceFacade to DatasourceExtension (#319)

Signed-off-by: Heemin Kim <[email protected]>

* Do not index blank value and do not enrich null property (#320)

Signed-off-by: Heemin Kim <[email protected]>

* Move index setting keys to constants (#321)

Signed-off-by: Heemin Kim <[email protected]>

* 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 <[email protected]>

* Add new fields in datasource (#325)

Signed-off-by: Heemin Kim <[email protected]>

* Delete index once it is expired (#326)

Signed-off-by: Heemin Kim <[email protected]>

* Add restoring event listener (#328)

In the listener, we trigger a geoip data update

Signed-off-by: Heemin Kim <[email protected]>

* Reverse forcemerge and refresh order (#331)

Otherwise, opensearch does not clear old segment files

Signed-off-by: Heemin Kim <[email protected]>

* 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 <[email protected]>

* Add a field in datasource for current index name (#333)

Signed-off-by: Heemin Kim <[email protected]>

* 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 <[email protected]>

* Use bool query for array form of IPs (#335)

Signed-off-by: Heemin Kim <[email protected]>

* Run update/delete request in a new thread (#337)

This is not to block transport thread

Signed-off-by: Heemin Kim <[email protected]>

* 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 <[email protected]>

* 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 <[email protected]>

* Added a cache to store datasource metadata (#338)

Signed-off-by: Heemin Kim <[email protected]>

* Changed class name and package (#341)

Signed-off-by: Heemin Kim <[email protected]>

* 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 <[email protected]>

* Add geo data cache (#340)

Signed-off-by: Heemin Kim <[email protected]>

* Add cache layer to reduce GeoIp data retrieval latency (opensearch-project#343)

Signed-off-by: Heemin Kim <[email protected]>

* 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 <[email protected]>

* Wait until GeoIP data to be replicated to all data nodes (opensearch-project#348)

Signed-off-by: Heemin Kim <[email protected]>

* 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 <[email protected]>

* Update packages according to a change in OpenSearch core (opensearch-project#353)

Signed-off-by: Heemin Kim <[email protected]>

---------

Signed-off-by: Heemin Kim <[email protected]>

---------

Signed-off-by: Vijayan Balasubramanian <[email protected]>
Signed-off-by: Heemin Kim <[email protected]>
Co-authored-by: Vijayan Balasubramanian <[email protected]>
Co-authored-by: mend-for-github.aaakk.us.kg[bot] <50673670+mend-for-github.aaakk.us.kg[bot]@users.noreply.github.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

1 participant