risdenk commented on code in PR #1184:
URL: https://github.com/apache/solr/pull/1184#discussion_r1028633733
##########
solr/core/src/java/org/apache/solr/search/BitDocSet.java:
##########
@@ -194,19 +194,30 @@ public void addAllTo(FixedBitSet target) {
@Override
public DocSet andNot(DocSet other) {
- FixedBitSet newbits = bits.clone();
+ return new BitDocSet(this.andNot(getFixedBitSetClone(), other));
+ }
+
+ /**
+ * Helper method for andNot that takes FixedBitSet and DocSet. This returns
the resulting bits
+ * andNoted together.
+ *
+ * @param bits bits to operate on
+ * @param other The DocSet to compare to
+ * @return Resulting andNoted FixedBitSet
+ */
+ protected FixedBitSet andNot(FixedBitSet bits, DocSet other) {
Review Comment:
addressed in a1af3895af00b37b99d738556ce14cd75441f502
##########
solr/core/src/java/org/apache/solr/search/MutableBitDocSet.java:
##########
@@ -0,0 +1,137 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.solr.search;
+
+import org.apache.lucene.util.FixedBitSet;
+
+/**
+ * A {@link BitDocSet} based implementation that mutates the underlying bits
for andNot and
+ * intersection. This allows for computing the combinations of sets without
duplicating the
+ * underlying array. This MutableBitDocSet should not be cached because it can
be modified.
+ *
+ * @since solr 9.2
+ */
+class MutableBitDocSet extends BitDocSet {
+ private MutableBitDocSet(FixedBitSet bits) {
+ super(bits);
+ }
+
+ /**
+ * Returns a mutable BitDocSet that is a copy of the provided BitDocSet.
+ *
+ * @param bitDocSet a BitDocSet
+ * @return copy of bitDocSet that is now mutable
+ */
+ public static MutableBitDocSet fromBitDocSet(BitDocSet bitDocSet) {
+ return new MutableBitDocSet(bitDocSet.getFixedBitSetClone());
+ }
+
+ /**
+ * Returns a new BitDocSet with the same bits if the DocSet provided is a
MutableBitDocSet.
+ * Otherwise, just returns the provided DocSet.
+ *
+ * @param docSet DocSet to unwrap if it is a MutableBitDocSet
+ * @return Unwrapped DocSet that is not mutable
+ */
+ public static DocSet unwrapIfMutable(DocSet docSet) {
+ if (docSet instanceof MutableBitDocSet) {
+ return new BitDocSet(((MutableBitDocSet) docSet).getBits());
+ }
+ return docSet;
+ }
+
+ @Override
+ public DocIterator iterator() {
+ throw new UnsupportedOperationException();
+ }
+
+ /**
+ * Returns the intersection of this set with another set. This mutates the
underlying bits so do
+ * not cache the returned bitset.
+ *
+ * @return a DocSet representing the intersection
+ */
+ @Override
+ public DocSet intersection(DocSet other) {
+ // intersection is overloaded in the smaller DocSets to be more
+ // efficient, so dispatch off of it instead.
+ if (!(other instanceof BitDocSet)) {
+ return other.intersection(this);
+ }
+
+ // Default... handle with bitsets.
+ FixedBitSet newbits = getBits();
+ newbits.and(other.getFixedBitSet());
+
+ // We can't return just this since `size` is cached and
+ // we are changing the cardinality of the underlying bits.
+ return new MutableBitDocSet(newbits);
+ }
+
+ @Override
+ public int intersectionSize(DocSet other) {
+ throw new UnsupportedOperationException();
+ }
+
+ @Override
+ public boolean intersects(DocSet other) {
+ throw new UnsupportedOperationException();
+ }
+
+ @Override
+ public int unionSize(DocSet other) {
+ throw new UnsupportedOperationException();
+ }
+
+ @Override
+ public int andNotSize(DocSet other) {
+ throw new UnsupportedOperationException();
+ }
+
+ @Override
+ public void addAllTo(FixedBitSet target) {
+ throw new UnsupportedOperationException();
+ }
+
+ /**
+ * Returns the documents in this set that are not in the other set. This
mutates the underlying
+ * bits so do not cache the returned bitset.
+ *
+ * @return a DocSet representing this AND NOT other
+ */
+ @Override
+ public DocSet andNot(DocSet other) {
+ // We can't return just this since `size` is cached and
+ // we are changing the cardinality of the underlying bits.
Review Comment:
addressed in a1af3895af00b37b99d738556ce14cd75441f502
--
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: [email protected]
For queries about this service, please contact Infrastructure at:
[email protected]
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
