Statically init `typeActionMap` in `OpenSearchExprValueFactory`. #310

Yury-Fridlyand · 2023-07-24T16:53:15Z

Description

OpenSearchExprValueFactory created for every query for every index and it creates a constant typeActionMap every time from the scratch.
Current fix makes typeActionMap initiated statically, so it will be created only once. This slightly increases query processing performance.

Issues Resolved

Performance boost.

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: Yury-Fridlyand <yury.fridlyand@improving.com>

codecov · 2023-07-24T17:17:08Z

Codecov Report

Merging #310 (6088e3f) into integ-static-init-ExprValueFactory (f4883c9) will not change coverage.
The diff coverage is 100.00%.

@@                          Coverage Diff                          @@
##             integ-static-init-ExprValueFactory     #310   +/-   ##
=====================================================================
  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% <100.00%> (ø)`

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

Impacted Files	Coverage Δ
...nsearch/data/value/OpenSearchExprValueFactory.java	`100.00% <100.00%> (ø)`

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

… (opensearch-project#1897) Signed-off-by: Yury-Fridlyand <yury.fridlyand@improving.com>

…y`. (#310) (opensearch-project#1897)" This reverts commit c8d42a7.

… (opensearch-project#1897) Signed-off-by: Yury-Fridlyand <yury.fridlyand@improving.com> Added support of timestamp/date/time using curly brackets (opensearch-project#1894) * Added support of timestamp/date/time using curly brackets (#297) * added bracketed time/date/timestamp input, tests, and documentation Signed-off-by: Matthew Wells <matthew.wells@improving.com> * improved failing tests Signed-off-by: Matthew Wells <matthew.wells@improving.com> * simplified tests for checking for failure Signed-off-by: Matthew Wells <matthew.wells@improving.com> * fixed redundant tests and improved tests that should fail Signed-off-by: Matthew Wells <matthew.wells@improving.com> --------- Signed-off-by: Matthew Wells <matthew.wells@improving.com> Bump bwc version (opensearch-project#1876) Signed-off-by: Vamsi Manohar <reddyvam@amazon.com> Prometheus Query Exemplars (opensearch-project#1782) Signed-off-by: Vamsi Manohar <reddyvam@amazon.com> Adding google code changes for core/src/main/java/org/opensearch/sql/analysis core/src/main/java/org/opensearch/sql/ast core/src/main/java/org/opensearch/sql/data core/src/main/java/org/opensearch/sql/datasource Signed-off-by: Mitchell Gale <Mitchell.Gale@improving.com> Disable checkstyle fore core module and enable spotless check for the files being checked. Signed-off-by: Mitchell Gale <Mitchell.Gale@improving.com> Added back core checkstyle test in sql-test-workflow.yml Signed-off-by: Mitchell Gale <Mitchell.Gale@improving.com> Revert "Prometheus Query Exemplars (opensearch-project#1782)" This reverts commit 430d7a9. Revert "Bump bwc version (opensearch-project#1876)" This reverts commit 501392e. Revert "Added support of timestamp/date/time using curly brackets (opensearch-project#1894)" This reverts commit 1a7134b. Revert "Statically init `typeActionMap` in `OpenSearchExprValueFactory`. (#310) (opensearch-project#1897)" This reverts commit c8d42a7. Revert "Fix create_index/create_index_with_IOException issue caused by OpenSearch PR change (opensearch-project#1899)" This reverts commit 7b932a7.

… (opensearch-project#1897) Signed-off-by: Yury-Fridlyand <yury.fridlyand@improving.com> (cherry picked from commit c8d42a7)

… (opensearch-project#1897) Signed-off-by: Yury-Fridlyand <yury.fridlyand@improving.com> Added support of timestamp/date/time using curly brackets (opensearch-project#1894) * Added support of timestamp/date/time using curly brackets (#297) * added bracketed time/date/timestamp input, tests, and documentation Signed-off-by: Matthew Wells <matthew.wells@improving.com> * improved failing tests Signed-off-by: Matthew Wells <matthew.wells@improving.com> * simplified tests for checking for failure Signed-off-by: Matthew Wells <matthew.wells@improving.com> * fixed redundant tests and improved tests that should fail Signed-off-by: Matthew Wells <matthew.wells@improving.com> --------- Signed-off-by: Matthew Wells <matthew.wells@improving.com> Bump bwc version (opensearch-project#1876) Signed-off-by: Vamsi Manohar <reddyvam@amazon.com> Prometheus Query Exemplars (opensearch-project#1782) Signed-off-by: Vamsi Manohar <reddyvam@amazon.com> Adding google code changes for core/src/main/java/org/opensearch/sql/analysis core/src/main/java/org/opensearch/sql/ast core/src/main/java/org/opensearch/sql/data core/src/main/java/org/opensearch/sql/datasource Signed-off-by: Mitchell Gale <Mitchell.Gale@improving.com> Disable checkstyle fore core module and enable spotless check for the files being checked. Signed-off-by: Mitchell Gale <Mitchell.Gale@improving.com> Added back core checkstyle test in sql-test-workflow.yml Signed-off-by: Mitchell Gale <Mitchell.Gale@improving.com> Revert "Prometheus Query Exemplars (opensearch-project#1782)" This reverts commit 430d7a9. Revert "Bump bwc version (opensearch-project#1876)" This reverts commit 501392e. Revert "Added support of timestamp/date/time using curly brackets (opensearch-project#1894)" This reverts commit 1a7134b. Revert "Statically init `typeActionMap` in `OpenSearchExprValueFactory`. (#310) (opensearch-project#1897)" This reverts commit c8d42a7. Revert "Fix create_index/create_index_with_IOException issue caused by OpenSearch PR change (opensearch-project#1899)" This reverts commit 7b932a7. Signed-off-by: Mitchell Gale <Mitchell.Gale@improving.com>

… (opensearch-project#1897) Signed-off-by: Yury-Fridlyand <yury.fridlyand@improving.com> Signed-off-by: Mitchell Gale <Mitchell.Gale@improving.com>

… (opensearch-project#1897) Signed-off-by: Yury-Fridlyand <yury.fridlyand@improving.com> Added support of timestamp/date/time using curly brackets (opensearch-project#1894) * Added support of timestamp/date/time using curly brackets (#297) * added bracketed time/date/timestamp input, tests, and documentation Signed-off-by: Matthew Wells <matthew.wells@improving.com> * improved failing tests Signed-off-by: Matthew Wells <matthew.wells@improving.com> * simplified tests for checking for failure Signed-off-by: Matthew Wells <matthew.wells@improving.com> * fixed redundant tests and improved tests that should fail Signed-off-by: Matthew Wells <matthew.wells@improving.com> --------- Signed-off-by: Matthew Wells <matthew.wells@improving.com> Bump bwc version (opensearch-project#1876) Signed-off-by: Vamsi Manohar <reddyvam@amazon.com> Prometheus Query Exemplars (opensearch-project#1782) Signed-off-by: Vamsi Manohar <reddyvam@amazon.com> Adding google code changes for core/src/main/java/org/opensearch/sql/analysis core/src/main/java/org/opensearch/sql/ast core/src/main/java/org/opensearch/sql/data core/src/main/java/org/opensearch/sql/datasource Signed-off-by: Mitchell Gale <Mitchell.Gale@improving.com> Disable checkstyle fore core module and enable spotless check for the files being checked. Signed-off-by: Mitchell Gale <Mitchell.Gale@improving.com> Added back core checkstyle test in sql-test-workflow.yml Signed-off-by: Mitchell Gale <Mitchell.Gale@improving.com> Revert "Prometheus Query Exemplars (opensearch-project#1782)" This reverts commit 430d7a9. Revert "Bump bwc version (opensearch-project#1876)" This reverts commit 501392e. Revert "Added support of timestamp/date/time using curly brackets (opensearch-project#1894)" This reverts commit 1a7134b. Revert "Statically init `typeActionMap` in `OpenSearchExprValueFactory`. (#310) (opensearch-project#1897)" This reverts commit c8d42a7. Revert "Fix create_index/create_index_with_IOException issue caused by OpenSearch PR change (opensearch-project#1899)" This reverts commit 7b932a7. Signed-off-by: Mitchell Gale <Mitchell.Gale@improving.com>

* 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 (#343) Signed-off-by: Heemin Kim <heemin@amazon.com> * Use _primary in query preference and few changes (#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 (#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>

Statically init typeActionMap in OpenSearchExprValueFactory.

6088e3f

Signed-off-by: Yury-Fridlyand <yury.fridlyand@improving.com>

Yury-Fridlyand requested review from MitchellGale and matthewryanwells July 24, 2023 16:53

Yury-Fridlyand requested review from MaxKsyunz, forestmvey, acarbonetto and GumpacG as code owners July 24, 2023 16:53

MaxKsyunz approved these changes Jul 24, 2023

View reviewed changes

MitchellGale approved these changes Jul 24, 2023

View reviewed changes

matthewryanwells approved these changes Jul 24, 2023

View reviewed changes

Yury-Fridlyand merged commit eccd238 into integ-static-init-ExprValueFactory Jul 24, 2023

Yury-Fridlyand deleted the dev-static-init-ExprValueFactory branch July 24, 2023 18:59

Yury-Fridlyand added a commit that referenced this pull request Jul 26, 2023

Statically init typeActionMap in OpenSearchExprValueFactory. (#310)…

c8d42a7

… (opensearch-project#1897) Signed-off-by: Yury-Fridlyand <yury.fridlyand@improving.com>

MitchellGale added a commit that referenced this pull request Jul 27, 2023

Revert "Statically init typeActionMap in `OpenSearchExprValueFactor…

03127d0

…y`. (#310) (opensearch-project#1897)" This reverts commit c8d42a7.

matthewryanwells pushed a commit that referenced this pull request Jul 27, 2023

Statically init typeActionMap in OpenSearchExprValueFactory. (#310)…

52f1c99

… (opensearch-project#1897) Signed-off-by: Yury-Fridlyand <yury.fridlyand@improving.com> (cherry picked from commit c8d42a7)

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Statically init `typeActionMap` in `OpenSearchExprValueFactory`. #310

Statically init `typeActionMap` in `OpenSearchExprValueFactory`. #310

Yury-Fridlyand commented Jul 24, 2023 •

edited

Loading

codecov bot commented Jul 24, 2023 •

edited

Loading

Statically init typeActionMap in OpenSearchExprValueFactory. #310

Statically init typeActionMap in OpenSearchExprValueFactory. #310

Conversation

Yury-Fridlyand commented Jul 24, 2023 • edited Loading

Description

Issues Resolved

Check List

codecov bot commented Jul 24, 2023 • edited Loading

Codecov Report

Statically init `typeActionMap` in `OpenSearchExprValueFactory`. #310

Statically init `typeActionMap` in `OpenSearchExprValueFactory`. #310

Yury-Fridlyand commented Jul 24, 2023 •

edited

Loading

codecov bot commented Jul 24, 2023 •

edited

Loading