Add support for `date_nanos` and tests. #337

Yury-Fridlyand · 2023-08-11T17:47:40Z

Description

Restore support for date_nanos type. Initially was added in opensearch-project#360 and removed in opensearch-project#1314 by mistake.

Issues Resolved

opensearch-project#1954

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.

codecov · 2023-08-11T18:06:31Z

Codecov Report

Merging #337 (25a2007) into integ-add-date-nanos-2.x (5381a6f) will increase coverage by 0.00%.
The diff coverage is 100.00%.

@@                     Coverage Diff                     @@
##             integ-add-date-nanos-2.x     #337   +/-   ##
===========================================================
  Coverage                       97.51%   97.51%           
  Complexity                       4656     4656           
===========================================================
  Files                             408      408           
  Lines                           11930    11931    +1     
  Branches                          829      829           
===========================================================
+ Hits                            11634    11635    +1     
  Misses                            289      289           
  Partials                            7        7

Flag	Coverage Δ
sql-engine	`97.51% <100.00%> (+<0.01%)`	⬆️

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

Files Changed	Coverage Δ
...h/sql/opensearch/data/type/OpenSearchDataType.java	`100.00% <100.00%> (ø)`

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

integ-test/src/test/resources/indexDefinitions/datatypes_index_mapping.json

integ-test/src/test/java/org/opensearch/sql/sql/DateTimeFormatsIT.java

acarbonetto · 2023-08-14T23:22:51Z

@Yury-Fridlyand we should add tests to parallel the expected features of date_nanos.

We should add a test that uses < or > to compare a date_nano type with a date or time.
We should include a test with date_nano type in the ORDER BY clause.
Reference: https://opensearch.org/docs/latest/field-types/supported-field-types/date-nanos/

acarbonetto · 2023-08-14T23:20:49Z

integ-test/src/test/java/org/opensearch/sql/sql/DateTimeFormatsIT.java

+        + " FROM %s", TEST_INDEX_DATE_FORMATS);
+    JSONObject result = executeQuery(query);
+    verifySchema(result,
+        schema("hour_minute_second_OR_t_time", null, "time"));


can you change this to hour_minute_second_millis instead? The point of using the date_nano type is to include fractions of a second.

I use t_time here, it includes up to 9 digits of fsp.

but the verifyDataRows doesn't include any units of precision? Maybe include data that has fractions of a second?

integ-test/src/test/java/org/opensearch/sql/sql/DateTimeFormatsIT.java

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

Yury-Fridlyand · 2023-08-16T01:19:49Z

@Yury-Fridlyand we should add tests to parallel the expected features of date_nanos.

We should add a test that uses < or > to compare a date_nano type with a date or time.

We should include a test with date_nano type in the ORDER BY clause.
Reference: https://opensearch.org/docs/latest/field-types/supported-field-types/date-nanos/

Added tests and rebased on upstream/main.

* Add support for `date_nanos` and tests. (#337) * Add support for `date_nanos` and tests. Signed-off-by: Yury-Fridlyand <yury.fridlyand@improving.com> * Add more IT. Signed-off-by: Yury-Fridlyand <yury.fridlyand@improving.com> --------- Signed-off-by: Yury-Fridlyand <yury.fridlyand@improving.com> * Typo fix in IT. Signed-off-by: Yury-Fridlyand <yury.fridlyand@improving.com> * Address PR feedback. Signed-off-by: Yury-Fridlyand <yury.fridlyand@improving.com> * Spotless Signed-off-by: Yury-Fridlyand <yury.fridlyand@improving.com> --------- Signed-off-by: Yury-Fridlyand <yury.fridlyand@improving.com>

* Add support for `date_nanos` and tests. (#337) * Add support for `date_nanos` and tests. Signed-off-by: Yury-Fridlyand <yury.fridlyand@improving.com> * Add more IT. Signed-off-by: Yury-Fridlyand <yury.fridlyand@improving.com> --------- Signed-off-by: Yury-Fridlyand <yury.fridlyand@improving.com> * Typo fix in IT. Signed-off-by: Yury-Fridlyand <yury.fridlyand@improving.com> * Address PR feedback. Signed-off-by: Yury-Fridlyand <yury.fridlyand@improving.com> * Spotless Signed-off-by: Yury-Fridlyand <yury.fridlyand@improving.com> --------- Signed-off-by: Yury-Fridlyand <yury.fridlyand@improving.com> (cherry picked from commit 752da21) Signed-off-by: Yury-Fridlyand <yury.fridlyand@improving.com>

…) (opensearch-project#2020) * Add support for `date_nanos` and tests. (#337) * Add support for `date_nanos` and tests. * Add more IT. --------- * Typo fix in IT. * Address PR feedback. * Spotless --------- (cherry picked from commit 752da21) Signed-off-by: Yury-Fridlyand <yury.fridlyand@improving.com> Signed-off-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com> Co-authored-by: github-actions[bot] <github-actions[bot]@users.noreply.github.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>

Yury-Fridlyand requested review from MitchellGale and matthewryanwells August 11, 2023 17:47

Yury-Fridlyand requested review from MaxKsyunz, forestmvey, acarbonetto and GumpacG as code owners August 11, 2023 17:47

MitchellGale approved these changes Aug 11, 2023

View reviewed changes

GumpacG reviewed Aug 11, 2023

View reviewed changes

integ-test/src/test/resources/indexDefinitions/datatypes_index_mapping.json Outdated Show resolved Hide resolved

GumpacG approved these changes Aug 14, 2023

View reviewed changes

matthewryanwells approved these changes Aug 14, 2023

View reviewed changes

acarbonetto reviewed Aug 14, 2023

View reviewed changes

integ-test/src/test/java/org/opensearch/sql/sql/DateTimeFormatsIT.java Show resolved Hide resolved

acarbonetto reviewed Aug 14, 2023

View reviewed changes

Yury-Fridlyand force-pushed the integ-add-date-nanos-2.x branch from b480916 to 5381a6f Compare August 16, 2023 00:31

Yury-Fridlyand added 2 commits August 15, 2023 17:34

Add support for date_nanos and tests.

2fa7b01

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

Add more IT.

25a2007

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

Yury-Fridlyand force-pushed the dev-add-date-nanos-2.x branch from 7a04f82 to 25a2007 Compare August 16, 2023 01:19

GumpacG approved these changes Aug 16, 2023

View reviewed changes

acarbonetto approved these changes Aug 16, 2023

View reviewed changes

Yury-Fridlyand merged commit 8ef676b into integ-add-date-nanos-2.x Aug 16, 2023

Yury-Fridlyand deleted the dev-add-date-nanos-2.x branch August 16, 2023 21:25

Yury-Fridlyand mentioned this pull request Aug 16, 2023

Add support for date_nanos and tests. (#337) opensearch-project/sql#1976

Merged

6 tasks

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Add support for `date_nanos` and tests. #337

Add support for `date_nanos` and tests. #337

Yury-Fridlyand commented Aug 11, 2023

codecov bot commented Aug 11, 2023 •

edited

Loading

acarbonetto commented Aug 14, 2023 •

edited

Loading

acarbonetto Aug 14, 2023

Yury-Fridlyand Aug 15, 2023

acarbonetto Aug 16, 2023

Yury-Fridlyand commented Aug 16, 2023

Add support for date_nanos and tests. #337

Add support for date_nanos and tests. #337

Conversation

Yury-Fridlyand commented Aug 11, 2023

Description

Issues Resolved

Check List

codecov bot commented Aug 11, 2023 • edited Loading

Codecov Report

acarbonetto commented Aug 14, 2023 • edited Loading

acarbonetto Aug 14, 2023

Choose a reason for hiding this comment

Yury-Fridlyand Aug 15, 2023

Choose a reason for hiding this comment

acarbonetto Aug 16, 2023

Choose a reason for hiding this comment

Yury-Fridlyand commented Aug 16, 2023

Add support for `date_nanos` and tests. #337

Add support for `date_nanos` and tests. #337

codecov bot commented Aug 11, 2023 •

edited

Loading

acarbonetto commented Aug 14, 2023 •

edited

Loading