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

[Backport 1.3] [Refactor] Use iterative approach to evaluate Regex.simpleMatch (#11060) #11433

Merged
merged 2 commits into from
Dec 1, 2023

Conversation

cwperks
Copy link
Member

@cwperks cwperks commented Dec 1, 2023

Backport #11060 to 1.3

…search-project#11060)

* Remove adjacent duplicates to optimize regex before processing

Signed-off-by: Craig Perkins <craig5008@gmail.com>

* Add tests

Signed-off-by: Craig Perkins <craig5008@gmail.com>

* Rename to removeAdjacentDuplicates

Signed-off-by: Craig Perkins <cwperx@amazon.com>

* Add additional test case

Signed-off-by: Craig Perkins <cwperx@amazon.com>

* Add CHANGELOG entry

Signed-off-by: Craig Perkins <cwperx@amazon.com>

* Throw IllegalArgumentException if input is invalid

Signed-off-by: Craig Perkins <cwperx@amazon.com>

* Add a space

Signed-off-by: Craig Perkins <cwperx@amazon.com>

* Change error message

Signed-off-by: Craig Perkins <cwperx@amazon.com>

* Use iterative solution with 2 pointers

Signed-off-by: Craig Perkins <cwperx@amazon.com>

* Remove unused method

Signed-off-by: Craig Perkins <cwperx@amazon.com>

* add tests and changelog

Signed-off-by: Stephen Crawford <steecraw@amazon.com>

* remove bad push

Signed-off-by: Stephen Crawford <steecraw@amazon.com>

* Update CHANGELOG.md

Signed-off-by: Stephen Crawford <65832608+scrawfor99@users.noreply.github.com>

* Update CHANGELOG.md

Signed-off-by: Stephen Crawford <65832608+scrawfor99@users.noreply.github.com>

* spotless

Signed-off-by: Stephen Crawford <steecraw@amazon.com>

* Update comment

Signed-off-by: Craig Perkins <cwperx@amazon.com>

* re-run CI

Signed-off-by: Craig Perkins <cwperx@amazon.com>

---------

Signed-off-by: Craig Perkins <craig5008@gmail.com>
Signed-off-by: Craig Perkins <cwperx@amazon.com>
Signed-off-by: Stephen Crawford <steecraw@amazon.com>
Signed-off-by: Stephen Crawford <65832608+scrawfor99@users.noreply.github.com>
Co-authored-by: Stephen Crawford <steecraw@amazon.com>
Co-authored-by: Stephen Crawford <65832608+scrawfor99@users.noreply.github.com>
(cherry picked from commit 61a598b)
Signed-off-by: Craig Perkins <cwperx@amazon.com>
@cwperks
Copy link
Member Author

cwperks commented Dec 1, 2023

@reta This was merged into 1.x, but was not backported to 1.3. Can you help me get this change included before RC generation next week?

Copy link
Contributor

github-actions bot commented Dec 1, 2023

Gradle Check (Jenkins) Run Completed with:

Copy link

codecov bot commented Dec 1, 2023

Codecov Report

All modified and coverable lines are covered by tests ✅

Comparison is base (cde1cf1) 77.58% compared to head (bf8b248) 77.62%.

Additional details and impacted files
@@             Coverage Diff              @@
##                1.3   #11433      +/-   ##
============================================
+ Coverage     77.58%   77.62%   +0.04%     
+ Complexity    58783    58775       -8     
============================================
  Files          4223     4223              
  Lines        253443   253439       -4     
  Branches      38705    38701       -4     
============================================
+ Hits         196622   196721      +99     
+ Misses        40823    40697     -126     
- Partials      15998    16021      +23     

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.

@reta
Copy link
Collaborator

reta commented Dec 1, 2023

@reta This was merged into 1.x, but was not backported to 1.3. Can you help me get this change included before RC generation next week?

@cwperks my apologies I overlooked this backport, thank you

@reta reta merged commit bbf483d into opensearch-project:1.3 Dec 1, 2023
6 checks passed
@cwperks
Copy link
Member Author

cwperks commented Dec 1, 2023

TY @reta!

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.

2 participants