You are viewing a plain text version of this content. The canonical link for it is here.
Posted to issues@lucene.apache.org by GitBox <gi...@apache.org> on 2021/07/26 21:38:45 UTC
[GitHub] [lucene] gsmiller opened a new pull request #226: LUCENE-10036: Add factory method to ScoreCachingWrappingScorer that ensures unnecessary wrapping doesn't occur
gsmiller opened a new pull request #226:
URL: https://github.com/apache/lucene/pull/226
# Description
Current users of `ScoreCachingWrappingScorer` must do their own instancetype checks if they want to avoid unnecessarily wrapping an existing `ScoreCachingWrappingScorer` instance. This change encapsulates the check in a factory method.
NOTE: There's [another PR](https://github.com/apache/lucene-solr/pull/2534) for backporting this change into 8.x, but marking the ctor as `@deprecated` to provide API back-compat.
# Solution
A factory method was added to `ScoreCachingWrappingScorer` and the ctor was made `private`.
# Tests
Added a new test that ensures a new instance isn't created when attempting to wrap an existing `ScoreCachingWrappingScorer` instance.
# Checklist
Please review the following and check all that apply:
- [x] I have reviewed the guidelines for [How to Contribute](https://wiki.apache.org/lucene/HowToContribute) and my code conforms to the standards described there to the best of my ability.
- [x] I have created a Jira issue and added the issue ID to my pull request title.
- [x] I have given Lucene maintainers [access](https://help.github.com/en/articles/allowing-changes-to-a-pull-request-branch-created-from-a-fork) to contribute to my PR branch. (optional but recommended)
- [x] I have developed this patch against the `main` branch.
- [x] I have run `./gradlew check`.
- [x] I have added tests for my changes.
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: issues-unsubscribe@lucene.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
---------------------------------------------------------------------
To unsubscribe, e-mail: issues-unsubscribe@lucene.apache.org
For additional commands, e-mail: issues-help@lucene.apache.org
[GitHub] [lucene] jpountz commented on a change in pull request #226: LUCENE-10036: Add factory method to ScoreCachingWrappingScorer that ensures unnecessary wrapping doesn't occur
Posted by GitBox <gi...@apache.org>.
jpountz commented on a change in pull request #226:
URL: https://github.com/apache/lucene/pull/226#discussion_r677348827
##########
File path: lucene/core/src/test/org/apache/lucene/search/TestScoreCachingWrappingScorer.java
##########
@@ -156,4 +156,28 @@ public void testGetScores() throws Exception {
ir.close();
directory.close();
}
+
+ public void testNoUnnecessaryWrap() throws Exception {
+ Scorable base =
+ new Scorable() {
+ @Override
+ public float score() throws IOException {
+ return -1;
+ }
+
+ @Override
+ public int docID() {
+ return -1;
+ }
+ };
+
+ // Wrapping the first time should produce a different instance:
+ Scorable wrapped = ScoreCachingWrappingScorer.wrap(base);
+ assertNotEquals(base, wrapped);
+
+ // But if we try to wrap an instance of ScoreCachingWrappingScorer, it shouldn't unnecessarily
+ // wrap again:
+ Scorable doubleWrapped = ScoreCachingWrappingScorer.wrap(wrapped);
+ assertEquals(wrapped, doubleWrapped);
Review comment:
Use `assertSame`?
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: issues-unsubscribe@lucene.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
---------------------------------------------------------------------
To unsubscribe, e-mail: issues-unsubscribe@lucene.apache.org
For additional commands, e-mail: issues-help@lucene.apache.org
[GitHub] [lucene] gsmiller merged pull request #226: LUCENE-10036: Add factory method to ScoreCachingWrappingScorer that ensures unnecessary wrapping doesn't occur
Posted by GitBox <gi...@apache.org>.
gsmiller merged pull request #226:
URL: https://github.com/apache/lucene/pull/226
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: issues-unsubscribe@lucene.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
---------------------------------------------------------------------
To unsubscribe, e-mail: issues-unsubscribe@lucene.apache.org
For additional commands, e-mail: issues-help@lucene.apache.org
[GitHub] [lucene] gsmiller commented on a change in pull request #226: LUCENE-10036: Add factory method to ScoreCachingWrappingScorer that ensures unnecessary wrapping doesn't occur
Posted by GitBox <gi...@apache.org>.
gsmiller commented on a change in pull request #226:
URL: https://github.com/apache/lucene/pull/226#discussion_r677530466
##########
File path: lucene/core/src/test/org/apache/lucene/search/TestScoreCachingWrappingScorer.java
##########
@@ -156,4 +156,28 @@ public void testGetScores() throws Exception {
ir.close();
directory.close();
}
+
+ public void testNoUnnecessaryWrap() throws Exception {
+ Scorable base =
+ new Scorable() {
+ @Override
+ public float score() throws IOException {
+ return -1;
+ }
+
+ @Override
+ public int docID() {
+ return -1;
+ }
+ };
+
+ // Wrapping the first time should produce a different instance:
+ Scorable wrapped = ScoreCachingWrappingScorer.wrap(base);
+ assertNotEquals(base, wrapped);
+
+ // But if we try to wrap an instance of ScoreCachingWrappingScorer, it shouldn't unnecessarily
+ // wrap again:
+ Scorable doubleWrapped = ScoreCachingWrappingScorer.wrap(wrapped);
+ assertEquals(wrapped, doubleWrapped);
Review comment:
Ooop, yep. Changed.
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: issues-unsubscribe@lucene.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
---------------------------------------------------------------------
To unsubscribe, e-mail: issues-unsubscribe@lucene.apache.org
For additional commands, e-mail: issues-help@lucene.apache.org