Skip to content

Prevent multiple quotations of the same word #30614

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

Conversation

denchev
Copy link
Contributor

@denchev denchev commented Oct 23, 2020

Description (*)

When there is a long search phrase and some of the words in that phrase has quotes in it, the algorithm for creating a search with synonyms will create multiple scenarios of that phrase. But for each scenario the quoted word would be escaped over and over again. For a long phrase that builds a very large number of escape \ and reaches a limit for the regular expression.

This fix makes sure that the escape happens only once per scenario.

This also seems to be a regression introduced by this commit 38c4a3e because when reverted to ce1263d the functionality works even without the fix from this PR.

Related Pull Requests

None

Fixed Issues (if relevant)

  1. Fixes Elastic Search issue with Synonyms #30104

Manual testing scenarios (*)

  1. Enable Elasticsearch 6+
  2. Add a product with a long name with a slash / in it.
    Example: LSS 3/8"X3/4"X25' EZ-PULL 1/2" INS SWEAT LINESET W/90 END BEND SUCTION LINE INSULATED
  3. Add Search Synonyms with a word belongs to the product name.
    Example: center end boot,torpedo boot,horn boot,register boot center end,register boot torpedo
  4. Search in the frontend for that exact product.

Questions or comments

Contribution checklist (*)

  • Pull request has a meaningful description of its purpose
  • All commits are accompanied by meaningful commit messages
  • All new or changed code is covered with unit/integration tests (if applicable)
  • All automated tests passed successfully (all builds are green)

@m2-assistant
Copy link

m2-assistant bot commented Oct 23, 2020

Hi @denchev. Thank you for your contribution
Here is some useful tips how you can test your changes using Magento test environment.
Add the comment under your pull request to deploy test or vanilla Magento instance:

  • @magento give me test instance - deploy test instance based on PR changes
  • @magento give me 2.4-develop instance - deploy vanilla Magento instance

❗ Automated tests can be triggered manually with an appropriate comment:

  • @magento run all tests - run or re-run all required tests against the PR changes
  • @magento run <test-build(s)> - run or re-run specific test build(s)
    For example: @magento run Unit Tests

<test-build(s)> is a comma-separated list of build names. Allowed build names are:

  1. Database Compare
  2. Functional Tests CE
  3. Functional Tests EE,
  4. Functional Tests B2B
  5. Integration Tests
  6. Magento Health Index
  7. Sample Data Tests CE
  8. Sample Data Tests EE
  9. Sample Data Tests B2B
  10. Static Tests
  11. Unit Tests
  12. WebAPI Tests

You can find more information about the builds here

ℹ️ Please run only needed test builds instead of all when developing. Please run all test builds before sending your PR for review.

For more details, please, review the Magento Contributor Guide documentation.

⚠️ According to the Magento Contribution requirements, all Pull Requests must go through the Community Contributions Triage process. Community Contributions Triage is a public meeting.

🕙 You can find the schedule on the Magento Community Calendar page.

📞 The triage of Pull Requests happens in the queue order. If you want to speed up the delivery of your contribution, please join the Community Contributions Triage session to discuss the appropriate ticket.

🎥 You can find the recording of the previous Community Contributions Triage on the Magento Youtube Channel

✏️ Feel free to post questions/proposals/feedback related to the Community Contributions Triage process to the corresponding Slack Channel

@denchev
Copy link
Contributor Author

denchev commented Oct 23, 2020

@magento run all tests

@swnsma swnsma self-requested a review October 23, 2020 10:55
@swnsma swnsma self-assigned this Oct 23, 2020
Copy link
Contributor

@swnsma swnsma left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Hi @denchev,

Please check failed static tests.
I believe, in this case you can use:
// phpcs:disable Magento2.Functions.DiscouragedFunction

@ghost ghost added Progress: needs update Priority: P2 A defect with this priority could have functionality issues which are not to expectations. Severity: S2 Major restrictions or short-term circumventions are required until a fix is available. and removed Progress: pending review labels Oct 23, 2020
@sidolov sidolov added Severity: S2 Major restrictions or short-term circumventions are required until a fix is available. and removed Severity: S2 Major restrictions or short-term circumventions are required until a fix is available. labels Oct 23, 2020
@denchev denchev marked this pull request as draft October 24, 2020 07:18
@denchev denchev marked this pull request as ready for review October 24, 2020 13:13
@denchev
Copy link
Contributor Author

denchev commented Oct 25, 2020

@magento run Integration Tests

@engcom-Charlie engcom-Charlie self-assigned this Oct 28, 2020
@engcom-Charlie
Copy link
Contributor

@magento run all tests

@sidolov sidolov added the Auto-Tests: Covered All changes in Pull Request is covered by auto-tests label Nov 16, 2020
@magento-engcom-team
Copy link
Contributor

Hi @sidolov, thank you for the review.
ENGCOM-8466 has been created to process this Pull Request

@engcom-Delta
Copy link
Contributor

✔️ QA passed
Was checked case from Manual testing scenarios
Before:
image

✔️ After:
image

@engcom-Delta
Copy link
Contributor

Note: Automation tests are passed

@m2-assistant
Copy link

m2-assistant bot commented Nov 27, 2020

Hi @denchev, thank you for your contribution!
Please, complete Contribution Survey, it will take less than a minute.
Your feedback will help us to improve contribution process.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Auto-Tests: Covered All changes in Pull Request is covered by auto-tests Component: Search Event: MageCONF CD 2020 Priority: P2 A defect with this priority could have functionality issues which are not to expectations. Progress: accept QA: Added to Regression Scope Scenario was analysed and added to Regression Testing Scope Release Line: 2.4 Severity: S2 Major restrictions or short-term circumventions are required until a fix is available.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Elastic Search issue with Synonyms
6 participants