Skip to content

Commit fe7b695

Browse files
committed
PR feedback: make names more generic in QueryFilterLeafReader
It's not tied to a shard splitting query anymore.
1 parent e44e3c7 commit fe7b695

File tree

1 file changed

+11
-11
lines changed
  • server/src/main/java/org/elasticsearch/common/lucene

1 file changed

+11
-11
lines changed

server/src/main/java/org/elasticsearch/common/lucene/Lucene.java

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1051,7 +1051,7 @@ private static class QueryFilterLeafReader extends SequentialStoredFieldsLeafRea
10511051
private final Query query;
10521052

10531053
private int numDocs = -1;
1054-
private BitSet unownedDocs;
1054+
private BitSet filteredDocs;
10551055

10561056
protected QueryFilterLeafReader(LeafReader in, Query query) {
10571057
super(in);
@@ -1064,24 +1064,24 @@ protected QueryFilterLeafReader(LeafReader in, Query query) {
10641064
*/
10651065
@Override
10661066
public Bits getLiveDocs() {
1067-
ensureUnownedDocumentsPresent();
1067+
ensureFilteredDocumentsPresent();
10681068
Bits actualLiveDocs = in.getLiveDocs();
10691069

1070-
if (unownedDocs == null) {
1070+
if (filteredDocs == null) {
10711071
return actualLiveDocs;
10721072
}
10731073

1074-
if (unownedDocs instanceof MatchAllBitSet) {
1074+
if (filteredDocs instanceof MatchAllBitSet) {
10751075
return new Bits.MatchNoBits(in.maxDoc());
10761076
}
10771077

10781078
var liveDocsBitsWithAllLiveCheck = actualLiveDocs == null ? new MatchAllBitSet(in.maxDoc()) : actualLiveDocs;
1079-
return new FilterBits(liveDocsBitsWithAllLiveCheck, unownedDocs);
1079+
return new FilterBits(liveDocsBitsWithAllLiveCheck, filteredDocs);
10801080
}
10811081

10821082
@Override
10831083
public int numDocs() {
1084-
ensureUnownedDocumentsPresent();
1084+
ensureFilteredDocumentsPresent();
10851085
return numDocs;
10861086
}
10871087

@@ -1107,22 +1107,22 @@ public CacheHelper getReaderCacheHelper() {
11071107
return null;
11081108
}
11091109

1110-
private void ensureUnownedDocumentsPresent() {
1110+
private void ensureFilteredDocumentsPresent() {
11111111
if (numDocs == -1) {
11121112
synchronized (this) {
11131113
if (numDocs == -1) {
11141114
try {
1115-
unownedDocs = queryUnownedDocs();
1116-
numDocs = calculateNumDocs(in, unownedDocs);
1115+
filteredDocs = queryFilteredDocs();
1116+
numDocs = calculateNumDocs(in, filteredDocs);
11171117
} catch (Exception e) {
1118-
throw new ElasticsearchException("Failed to execute unowned documents query", e);
1118+
throw new ElasticsearchException("Failed to execute filtered documents query", e);
11191119
}
11201120
}
11211121
}
11221122
}
11231123
}
11241124

1125-
private BitSet queryUnownedDocs() throws IOException {
1125+
private BitSet queryFilteredDocs() throws IOException {
11261126
final IndexReaderContext topLevelContext = ReaderUtil.getTopLevelContext(in.getContext());
11271127

11281128
final IndexSearcher searcher = new IndexSearcher(topLevelContext);

0 commit comments

Comments
 (0)