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

Allow TrimFilter to be used in custom normalizers #27758

Merged
merged 2 commits into from
Dec 18, 2017
Merged

Allow TrimFilter to be used in custom normalizers #27758

merged 2 commits into from
Dec 18, 2017

Conversation

romseygeek
Copy link
Contributor

@romseygeek romseygeek commented Dec 11, 2017

Closes #27310

@romseygeek
Copy link
Contributor Author

cc @jpountz

@romseygeek romseygeek requested a review from jpountz December 11, 2017 17:57
@jpountz
Copy link
Contributor

jpountz commented Dec 12, 2017

Test fail because they check whether our own factories are in sync with Lucene, which is not the case since Lucene doesn't have MultiTermAwareComponent on its TrimFilterFactory. So we need to add an exception to the test if we want to do that, ideally linking to a Lucene issue so that both factories converge one day.

@romseygeek
Copy link
Contributor Author

I opened https://issues.apache.org/jira/browse/LUCENE-8093 for the upstream fix

AnalysisFactoryTestCase checks that the ES custom token filter multi-term
awareness matches the underlying lucene factory.  For the trim filter this
won't be the case until LUCENE-8093 is released in 7.3, so we add a
temporary exclusion
@romseygeek
Copy link
Contributor Author

The test failures above seem to be unrelated to the change. @jpountz is there a standard way of adding version-related test special cases? I've bodged something together for this one but I'm sure there's a nicer way of doing it.

Copy link
Contributor

@jimczi jimczi left a comment

Choose a reason for hiding this comment

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

LGTM

@romseygeek romseygeek merged commit af3f636 into elastic:master Dec 18, 2017
@romseygeek romseygeek deleted the fix/27310-trimfilter branch December 18, 2017 14:27
romseygeek added a commit that referenced this pull request Dec 18, 2017
AnalysisFactoryTestCase checks that the ES custom token filter multi-term
awareness matches the underlying lucene factory.  For the trim filter this
won't be the case until LUCENE-8093 is released in 7.3, so we add a
temporary exclusion

Closes #27310
martijnvg added a commit that referenced this pull request Dec 18, 2017
* es/6.x: (170 commits)
  Allow TrimFilter to be used in custom normalizers (#27758)
  recovery from snapshot should fill gaps (#27850)
  Remove unused class PreBuiltTokenFilters (#27839)
  Reject scroll query if size is 0 (#22552) (#27842)
  Mutes ‘Rollover no condition matched’ YAML test
  Make randomNonNegativeLong() draw from a uniform distribution (#27856)
  Adapt rest test after backport. Relates #27833
  Handle case where the hole vertex is south of the containing polygon(s) (#27685)
  Move range field mapper back to core
  Fix publication of elasticsearch-cli to Maven
  Do not use system properties when building the HttpAsyncClient (#27829)
  Optimize version map for append-only indexing (#27752)
  Add NioGroup for use in different transports (#27737)
  adapt field collapsing skip test version. relates #27833
  Add version support for inner hits in field collapsing (#27822) (#27833)
  Clarify that number of threads is set by packages
  Register HTTP read timeout setting
  Fixes Checkstyle
  Remove `operationThreaded` from Java API (#27836)
  Fixes failing BytesSizeValues tests
  ...
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants