Support Alternate Datetime Formats #268

GumpacG · 2023-05-25T00:19:00Z

Description

Supports using date/time/timestamp formats obtained from OpenSearch. Contains some changes from OpenSearchDataType rework (8b2f65d). Resolves some issues previously seen on the forum (please see Issues Resolved section below).

Formats that require only dates will return type of date. For example, the format "basic_date" will have type date in the result. Formats that require only times will return type of time. For example, the format "basic_time" will have type time in the result. Formats that can have either date or time will return type of timestamp. For example, the format "basic_date||basic_time" will have type timestamp in the result. This is also the case when using aggregation like AVG.

Out of scope

Custom formats in the index mapping will be supported in a follow-up issue

TODO: Follow up with support for user-defined formats

Based on PoC (Here: https://github.com/Bit-Quill/opensearch-project-sql/pull/169/files).

Note: With these changes, issues may be introduced where data is read differently if a user's mapping defines a format. This is because the plugin previously used a hardcoded formatter to parse the data, while with these changes it will use the formatter defined in the mapping.

Supported formats include named formats listed in: opensearch/src/main/java/org/opensearch/sql/opensearch/data/type/OpenSearchDateType.java or https://opensearch.org/docs/latest/field-types/supported-field-types/date/

Issues Resolved

opensearch-project#794
https://forum.opensearch.org/t/sql-select-fails-on-date-fields-format-epoch-second/11521

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.

…Search types Signed-off-by: Andrew Carbonetto <[email protected]>

Signed-off-by: GabeFernandez310 <[email protected]>

… With Datetime Types Signed-off-by: GabeFernandez310 <[email protected]>

Signed-off-by: GabeFernandez310 <[email protected]>

Signed-off-by: GabeFernandez310 <[email protected]> (cherry picked from commit 2c16a554573015fcd752721353b2713858caad1a)

acarbonetto · 2023-05-25T06:37:41Z

Do we need to update any doctest?

Signed-off-by: Guian Gumpac <[email protected]>

opensearch/src/main/java/org/opensearch/sql/opensearch/data/type/OpenSearchDateType.java

...n/java/org/opensearch/sql/opensearch/storage/script/aggregation/AggregationQueryBuilder.java

...search/src/main/java/org/opensearch/sql/opensearch/storage/script/core/ExpressionScript.java

opensearch/src/test/java/org/opensearch/sql/opensearch/data/type/OpenSearchDateTypeTest.java

…rage Signed-off-by: Guian Gumpac <[email protected]>

docs/user/general/datatypes.rst

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

...va/org/opensearch/sql/opensearch/storage/script/aggregation/AggregationQueryBuilderTest.java

...est/java/org/opensearch/sql/opensearch/storage/script/filter/ExpressionFilterScriptTest.java

...earch/src/main/java/org/opensearch/sql/opensearch/data/value/OpenSearchExprValueFactory.java

Signed-off-by: Andrew Carbonetto <[email protected]>

Signed-off-by: Guian Gumpac <[email protected]>

docs/user/general/datatypes.rst

Yury-Fridlyand · 2023-05-29T19:21:27Z

opensearch/src/main/java/org/opensearch/sql/opensearch/data/type/OpenSearchDataType.java

-      switch (mappingType) {
+  public static OpenSearchDataType of(MappingType mappingType, Map<String, Object> innerMap) {
+    OpenSearchDataType res = instances.getOrDefault(mappingType.toString(),
+        new OpenSearchDataType(mappingType)


Why not null here? I think instances should contain all default instances since the very beginning.

Changed in 58a8f19

Yury-Fridlyand · 2023-05-29T19:24:22Z

opensearch/src/main/java/org/opensearch/sql/opensearch/data/type/OpenSearchDateType.java

+
+  private static final OpenSearchDateType instance = new OpenSearchDateType();
+
+  private static final String FORMAT_DELIMITER = "\\|\\|";


Maybe

Suggested change

private static final String FORMAT_DELIMITER = "\\|\\|";

private static final String FORMAT_DELIMITER_REGEX = "\\|\\|";

UPD it is never used - remove?

Done in 58a8f19

Yury-Fridlyand · 2023-05-29T19:26:46Z

opensearch/src/main/java/org/opensearch/sql/opensearch/data/type/OpenSearchDateType.java

+    super(MappingType.Date);
+    this.formatString = "";
+    this.exprCoreType = exprCoreType;


You can call one constructor from another one:

Suggested change

super(MappingType.Date);

this.formatString = "";

this.exprCoreType = exprCoreType;

this();

this.exprCoreType = exprCoreType;

And the same below.

Done in 58a8f19

opensearch/src/main/java/org/opensearch/sql/opensearch/data/type/OpenSearchDateType.java

Yury-Fridlyand · 2023-05-29T19:51:29Z

...earch/src/main/java/org/opensearch/sql/opensearch/data/value/OpenSearchExprValueFactory.java

+              (c, dt) -> ExprBooleanValue.of(c.booleanValue()))
+          //Handles the creation of DATE, TIME & DATETIME
+          .put(OpenSearchDateType.of(TIME),
+              (c, dt) -> createOpenSearchDateType(c, dt))


nit

Suggested change

(c, dt) -> createOpenSearchDateType(c, dt))

this::createOpenSearchDateType

You can do the same with next 3 entries

Done in 58a8f19

...earch/src/main/java/org/opensearch/sql/opensearch/data/value/OpenSearchExprValueFactory.java

Yury-Fridlyand · 2023-05-29T19:56:53Z

...n/java/org/opensearch/sql/opensearch/storage/script/aggregation/AggregationQueryBuilder.java

+      if (OpenSearchDateType.isDateTypeCompatible(group.type())) {
+        builder.put(group.getNameOrAlias(), OpenSearchDateType.of(group.type()));


Move this logic into OpenSearchDataType.of, so it will check compatibility and return the right object.

Done in 58a8f19

Yury-Fridlyand · 2023-05-29T19:57:33Z

...search/src/main/java/org/opensearch/sql/opensearch/storage/script/core/ExpressionScript.java

+          if (OpenSearchDateType.isDateTypeCompatible(e.type())) {
+            return OpenSearchDateType.of(e.type());


The same - move compatibility check into of method

Done in 58a8f19

Signed-off-by: Guian Gumpac <[email protected]>

* Add OpenSearchDateType as a datatype for matching with Date/Time OpenSearch types Signed-off-by: Andrew Carbonetto <[email protected]> * Added IT Test Signed-off-by: GabeFernandez310 <[email protected]> * Added Basic Implementation Signed-off-by: GabeFernandez310 <[email protected]> * Added A Comment Signed-off-by: GabeFernandez310 <[email protected]> * Added Support For Default OpenSearch Formats Signed-off-by: GabeFernandez310 <[email protected]> * Code Cleanup Signed-off-by: GabeFernandez310 <[email protected]> * Refactored 'parsetimestamp' Function Signed-off-by: GabeFernandez310 <[email protected]> * Cleanup Signed-off-by: GabeFernandez310 <[email protected]> * Removed Unnecessary Try-Catch Block Signed-off-by: GabeFernandez310 <[email protected]> * Fixed Unit Tests Signed-off-by: GabeFernandez310 <[email protected]> * Fixed IT Test Signed-off-by: GabeFernandez310 <[email protected]> * Fixed Text Type and Disabled JSON Format Test Signed-off-by: GabeFernandez310 <[email protected]> * Fix Mapping Type Reporting As Date Instead Of Timestamp In Schema Signed-off-by: GabeFernandez310 <[email protected]> * Revert Breaking Test Changes Signed-off-by: GabeFernandez310 <[email protected]> * Fixed Returned ExprCoreTypes Signed-off-by: GabeFernandez310 <[email protected]> * Fixed OpenSearch Type Names In Mapping Signed-off-by: GabeFernandez310 <[email protected]> * Fixed LegacyTypeName Function And Refactored Code To Fix Calculations With Datetime Types Signed-off-by: GabeFernandez310 <[email protected]> * Changed Support For Passing Fields Into Text Type Signed-off-by: GabeFernandez310 <[email protected]> * Reverted Some Changes And Commented Out A Test Signed-off-by: GabeFernandez310 <[email protected]> * Commented Out A Breaking Change Signed-off-by: GabeFernandez310 <[email protected]> * Minor Refactoring Changes Signed-off-by: GabeFernandez310 <[email protected]> * Reworked parseTimestamp Function To Format Return Based On Enum Signed-off-by: GabeFernandez310 <[email protected]> * Fixed Returned ExprValue Signed-off-by: GabeFernandez310 <[email protected]> * Reverted Changes To Test Files Signed-off-by: GabeFernandez310 <[email protected]> * Reverted Some Changes To Enum And Reworked Code Signed-off-by: GabeFernandez310 <[email protected]> * Added Type Mapping To Allow Query To Be Parsed Signed-off-by: GabeFernandez310 <[email protected]> * Fixed Some Unit Tests Signed-off-by: GabeFernandez310 <[email protected]> * Fixed TypeActionMap To Still Support ExprCoreTypes Signed-off-by: GabeFernandez310 <[email protected]> * Wrapped Some Function Returns in ExprValueFactory Signed-off-by: GabeFernandez310 <[email protected]> * Fixed Integration Test Bug Signed-off-by: GabeFernandez310 <[email protected]> (cherry picked from commit 2c16a554573015fcd752721353b2713858caad1a) * Slight Refactoring And Code Cleanup Signed-off-by: GabeFernandez310 <[email protected]> (cherry picked from commit ebecec79c79d75e851a4a0914cf4abf5aa6d3efd) * Removed Unneeded Class Member Signed-off-by: GabeFernandez310 <[email protected]> (cherry picked from commit 14de39815ebeecd36c4155099d875a45a7e008f6) * Removed Unneccessary MappingType Parameters Signed-off-by: GabeFernandez310 <[email protected]> (cherry picked from commit e6a8bc3a6a3d7a11dacd03fc885871f3b055d2d2) * Refactored Code To Fix Integration Test Signed-off-by: GabeFernandez310 <[email protected]> (cherry picked from commit c91f48d9763499940ecf302212fcd592aecb6018) * Addressed JaCoCo Issues Signed-off-by: GabeFernandez310 <[email protected]> * Fixed Checkstyle Signed-off-by: GabeFernandez310 <[email protected]> * Changed gradle version and removed values iterator Signed-off-by: Guian Gumpac <[email protected]> * Addressed PR Comments Signed-off-by: GabeFernandez310 <[email protected]> * Update a test to match new indexResponse.aliases() type. Signed-off-by: MaxKsyunz <[email protected]> * Changed To Throw Exception When Encountering Parsing Failures Signed-off-by: GabeFernandez310 <[email protected]> * Fixed Checkstyle Signed-off-by: GabeFernandez310 <[email protected]> * Removed Unneeded Imports Signed-off-by: GabeFernandez310 <[email protected]> * Re-enabled Some Tests Signed-off-by: GabeFernandez310 <[email protected]> * Addressed PR Comments Signed-off-by: GabeFernandez310 <[email protected]> * Changed test data Signed-off-by: Guian Gumpac <[email protected]> * Pulled out support for user-defined datetime formats Signed-off-by: Guian Gumpac <[email protected]> * Modified IT test data Signed-off-by: Guian Gumpac <[email protected]> * Added IT tests Signed-off-by: Guian Gumpac <[email protected]> * Removed support for just time and just date formats Signed-off-by: Guian Gumpac <[email protected]> * Removed unsupported formats from IT Signed-off-by: Guian Gumpac <[email protected]> * Removed unit tests for date only or time only formats Signed-off-by: Guian Gumpac <[email protected]> * Addressed PR comments from previous PR Signed-off-by: Guian Gumpac <[email protected]> * Addressed PR comment regarding unnecessary OpenSearchDateType instance in OpenSearchDataType Signed-off-by: Guian Gumpac <[email protected]> * Updates to include build-in date and time formats for OpenSearchDateTypes Signed-off-by: Andrew Carbonetto <[email protected]> * Add tests and fix checkstyle Signed-off-by: Andrew Carbonetto <[email protected]> * Fixed bugs regarding custom formats Signed-off-by: Guian Gumpac <[email protected]> * Add unit test to cover custom formats Signed-off-by: Andrew Carbonetto <[email protected]> * Addressed PR comments Signed-off-by: Guian Gumpac <[email protected]> * Fixed checkstyle errors Signed-off-by: Guian Gumpac <[email protected]> * Modified integration test Signed-off-by: Guian Gumpac <[email protected]> * Fixed Date and time aggregation Signed-off-by: Guian Gumpac <[email protected]> * Fixed failing integ tests Signed-off-by: Guian Gumpac <[email protected]> * Modified integ test based on date format changes Signed-off-by: Guian Gumpac <[email protected]> * Added default formatters for date and time. Added unit tests for coverage Signed-off-by: Guian Gumpac <[email protected]> * Some minor review comments Signed-off-by: Andrew Carbonetto <[email protected]> * Addressed PR comments Signed-off-by: Guian Gumpac <[email protected]> * Fixed checktsyle and jacoco Signed-off-by: Guian Gumpac <[email protected]> * Changed link in rst file Signed-off-by: Guian Gumpac <[email protected]> * Changed link in rst file Signed-off-by: Guian Gumpac <[email protected]> * Addressed PR comments Signed-off-by: Guian Gumpac <[email protected]> --------- Signed-off-by: Andrew Carbonetto <[email protected]> Signed-off-by: GabeFernandez310 <[email protected]> Signed-off-by: Guian Gumpac <[email protected]> Signed-off-by: MaxKsyunz <[email protected]> Co-authored-by: Andrew Carbonetto <[email protected]> Co-authored-by: GabeFernandez310 <[email protected]> Co-authored-by: MaxKsyunz <[email protected]>

* Support Alternate Datetime Formats (#268) * Add OpenSearchDateType as a datatype for matching with Date/Time OpenSearch types Signed-off-by: Andrew Carbonetto <[email protected]> --------- Signed-off-by: Andrew Carbonetto <[email protected]> Signed-off-by: GabeFernandez310 <[email protected]> Signed-off-by: Guian Gumpac <[email protected]> Signed-off-by: MaxKsyunz <[email protected]> Co-authored-by: Andrew Carbonetto <[email protected]> Co-authored-by: GabeFernandez310 <[email protected]> Co-authored-by: MaxKsyunz <[email protected]>

* Support Alternate Datetime Formats (#268) * Add OpenSearchDateType as a datatype for matching with Date/Time OpenSearch types Signed-off-by: Andrew Carbonetto <[email protected]> --------- Signed-off-by: Andrew Carbonetto <[email protected]> Signed-off-by: GabeFernandez310 <[email protected]> Signed-off-by: Guian Gumpac <[email protected]> Signed-off-by: MaxKsyunz <[email protected]> Co-authored-by: Andrew Carbonetto <[email protected]> Co-authored-by: GabeFernandez310 <[email protected]> Co-authored-by: MaxKsyunz <[email protected]> Signed-off-by: Mitchell Gale <[email protected]>

…rch-project#1682) * Support Alternate Datetime Formats (#268) * Add OpenSearchDateType as a datatype for matching with Date/Time OpenSearch types Signed-off-by: Andrew Carbonetto <[email protected]> --------- Signed-off-by: Andrew Carbonetto <[email protected]> Signed-off-by: GabeFernandez310 <[email protected]> Signed-off-by: Guian Gumpac <[email protected]> Signed-off-by: MaxKsyunz <[email protected]> Co-authored-by: Andrew Carbonetto <[email protected]> Co-authored-by: GabeFernandez310 <[email protected]> Co-authored-by: MaxKsyunz <[email protected]> (cherry picked from commit 986db39) Co-authored-by: Guian Gumpac <[email protected]>

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

* 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-com[bot] <50673670+mend-for-github-com[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-com[bot] <50673670+mend-for-github-com[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 (#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-com[bot] <50673670+mend-for-github-com[bot]@users.noreply.github.com>

acarbonetto and others added 30 commits March 29, 2023 16:06

Add OpenSearchDateType as a datatype for matching with Date/Time Open…

8b2f65d

…Search types Signed-off-by: Andrew Carbonetto <[email protected]>

Added IT Test

c5ad8e0

Signed-off-by: GabeFernandez310 <[email protected]>

Added Basic Implementation

a64b93e

Signed-off-by: GabeFernandez310 <[email protected]>

Added A Comment

cbf3c38

Signed-off-by: GabeFernandez310 <[email protected]>

Added Support For Default OpenSearch Formats

a780bbd

Signed-off-by: GabeFernandez310 <[email protected]>

Code Cleanup

ffede70

Signed-off-by: GabeFernandez310 <[email protected]>

Refactored 'parsetimestamp' Function

3708a6f

Signed-off-by: GabeFernandez310 <[email protected]>

Cleanup

bc15e3a

Signed-off-by: GabeFernandez310 <[email protected]>

Removed Unnecessary Try-Catch Block

a5fac5c

Signed-off-by: GabeFernandez310 <[email protected]>

Fixed Unit Tests

9c2a7c8

Signed-off-by: GabeFernandez310 <[email protected]>

Fixed IT Test

0f01283

Signed-off-by: GabeFernandez310 <[email protected]>

Fixed Text Type and Disabled JSON Format Test

5c63d7f

Signed-off-by: GabeFernandez310 <[email protected]>

Fix Mapping Type Reporting As Date Instead Of Timestamp In Schema

675aa02

Signed-off-by: GabeFernandez310 <[email protected]>

Revert Breaking Test Changes

09d420b

Signed-off-by: GabeFernandez310 <[email protected]>

Fixed Returned ExprCoreTypes

a519501

Signed-off-by: GabeFernandez310 <[email protected]>

Fixed OpenSearch Type Names In Mapping

ed2bcbb

Signed-off-by: GabeFernandez310 <[email protected]>

Fixed LegacyTypeName Function And Refactored Code To Fix Calculations…

ef90ad6

… With Datetime Types Signed-off-by: GabeFernandez310 <[email protected]>

Changed Support For Passing Fields Into Text Type

418dc98

Signed-off-by: GabeFernandez310 <[email protected]>

Reverted Some Changes And Commented Out A Test

0670812

Signed-off-by: GabeFernandez310 <[email protected]>

Commented Out A Breaking Change

5543fd8

Signed-off-by: GabeFernandez310 <[email protected]>

Minor Refactoring Changes

9325d24

Signed-off-by: GabeFernandez310 <[email protected]>

Reworked parseTimestamp Function To Format Return Based On Enum

89cb4ce

Signed-off-by: GabeFernandez310 <[email protected]>

Fixed Returned ExprValue

2ab67ed

Signed-off-by: GabeFernandez310 <[email protected]>

Reverted Changes To Test Files

bbc6526

Signed-off-by: GabeFernandez310 <[email protected]>

Reverted Some Changes To Enum And Reworked Code

e07b4ca

Signed-off-by: GabeFernandez310 <[email protected]>

Added Type Mapping To Allow Query To Be Parsed

dc5ef5b

Signed-off-by: GabeFernandez310 <[email protected]>

Fixed Some Unit Tests

2f45ced

Signed-off-by: GabeFernandez310 <[email protected]>

Fixed TypeActionMap To Still Support ExprCoreTypes

d1057e3

Signed-off-by: GabeFernandez310 <[email protected]>

Wrapped Some Function Returns in ExprValueFactory

225e8a9

Signed-off-by: GabeFernandez310 <[email protected]>

Fixed Integration Test Bug

a7801f4

Signed-off-by: GabeFernandez310 <[email protected]> (cherry picked from commit 2c16a554573015fcd752721353b2713858caad1a)

GumpacG added 3 commits May 25, 2023 13:53

Fixed Date and time aggregation

21ed35f

Signed-off-by: Guian Gumpac <[email protected]>

Fixed failing integ tests

dde61c1

Signed-off-by: Guian Gumpac <[email protected]>

Modified integ test based on date format changes

414159f

Signed-off-by: Guian Gumpac <[email protected]>

matthewryanwells reviewed May 26, 2023

View reviewed changes

opensearch/src/main/java/org/opensearch/sql/opensearch/data/type/OpenSearchDateType.java Outdated Show resolved Hide resolved

matthewryanwells approved these changes May 26, 2023

View reviewed changes

forestmvey reviewed May 26, 2023

View reviewed changes

...n/java/org/opensearch/sql/opensearch/storage/script/aggregation/AggregationQueryBuilder.java Show resolved Hide resolved

forestmvey reviewed May 26, 2023

View reviewed changes

...n/java/org/opensearch/sql/opensearch/storage/script/aggregation/AggregationQueryBuilder.java Outdated Show resolved Hide resolved

forestmvey approved these changes May 26, 2023

View reviewed changes

MitchellGale reviewed May 26, 2023

View reviewed changes

...search/src/main/java/org/opensearch/sql/opensearch/storage/script/core/ExpressionScript.java Outdated Show resolved Hide resolved

MitchellGale reviewed May 26, 2023

View reviewed changes

opensearch/src/test/java/org/opensearch/sql/opensearch/data/type/OpenSearchDateTypeTest.java Outdated Show resolved Hide resolved

Added default formatters for date and time. Added unit tests for cove…

9250020

…rage Signed-off-by: Guian Gumpac <[email protected]>

Yury-Fridlyand reviewed May 26, 2023

View reviewed changes

MitchellGale approved these changes May 26, 2023

View reviewed changes

acarbonetto and others added 3 commits May 29, 2023 08:06

Some minor review comments

5f34b39

Signed-off-by: Andrew Carbonetto <[email protected]>

Addressed PR comments

c978699

Signed-off-by: Guian Gumpac <[email protected]>

Fixed checktsyle and jacoco

27c9dd5

Signed-off-by: Guian Gumpac <[email protected]>

Yury-Fridlyand reviewed May 29, 2023

View reviewed changes

GumpacG added 3 commits May 29, 2023 13:25

Changed link in rst file

0f0dc96

Signed-off-by: Guian Gumpac <[email protected]>

Changed link in rst file

2672a79

Signed-off-by: Guian Gumpac <[email protected]>

Addressed PR comments

58a8f19

Signed-off-by: Guian Gumpac <[email protected]>

GumpacG merged commit e64bb49 into integ-support-datetime-formats May 29, 2023

andy-k-improving pushed a commit that referenced this pull request Nov 16, 2024

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

ba16116

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

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Support Alternate Datetime Formats #268

Support Alternate Datetime Formats #268

GumpacG commented May 25, 2023 •

edited

Loading

acarbonetto commented May 25, 2023

Yury-Fridlyand May 29, 2023

GumpacG May 29, 2023

Yury-Fridlyand May 29, 2023

Yury-Fridlyand May 29, 2023

GumpacG May 29, 2023

Yury-Fridlyand May 29, 2023

GumpacG May 29, 2023

Yury-Fridlyand May 29, 2023

GumpacG May 29, 2023

Yury-Fridlyand May 29, 2023

GumpacG May 29, 2023

Yury-Fridlyand May 29, 2023

GumpacG May 29, 2023


		private static final OpenSearchDateType instance = new OpenSearchDateType();

		private static final String FORMAT_DELIMITER = "\\\|\\\|";

	(c, dt) -> createOpenSearchDateType(c, dt))
	this::createOpenSearchDateType

		if (OpenSearchDateType.isDateTypeCompatible(group.type())) {
		builder.put(group.getNameOrAlias(), OpenSearchDateType.of(group.type()));

		if (OpenSearchDateType.isDateTypeCompatible(e.type())) {
		return OpenSearchDateType.of(e.type());

Support Alternate Datetime Formats #268

Support Alternate Datetime Formats #268

Conversation

GumpacG commented May 25, 2023 • edited Loading

Description

Out of scope

Issues Resolved

Check List

acarbonetto commented May 25, 2023

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

GumpacG commented May 25, 2023 •

edited

Loading