gsmiller commented on code in PR #11901:
URL: https://github.com/apache/lucene/pull/11901#discussion_r1044827355
##########
lucene/core/src/java/org/apache/lucene/document/LongRangeDocValuesField.java:
##########
@@ -86,4 +87,28 @@ private static void checkArgs(final long[] min, final long[]
max) {
}
}
}
+
+ /**
+ * Sets the value of this field to a new value
+ *
+ * @param min the new min
+ * @param max the new max
+ */
+ public void setLongRangeValue(long min, long max) {
Review Comment:
Do we actually need these setters as part of this change? I have no problem
adding them, but I wonder if we should do it as a separate change since it's
kind of unrelated to your work here right?
##########
lucene/facet/src/java/org/apache/lucene/facet/rangeonrange/RangeOnRangeFacetCounts.java:
##########
@@ -0,0 +1,210 @@
+/*
+ * 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.lucene.facet.rangeonrange;
+
+import java.io.IOException;
+import java.util.Collections;
+import java.util.List;
+import org.apache.lucene.document.BinaryRangeDocValues;
+import org.apache.lucene.document.RangeFieldQuery;
+import org.apache.lucene.facet.FacetCountsWithFilterQuery;
+import org.apache.lucene.facet.FacetResult;
+import org.apache.lucene.facet.FacetsCollector;
+import org.apache.lucene.facet.LabelAndValue;
+import org.apache.lucene.index.DocValues;
+import org.apache.lucene.search.DocIdSetIterator;
+import org.apache.lucene.search.Query;
+import org.apache.lucene.util.ArrayUtil;
+import org.apache.lucene.util.PriorityQueue;
+
+abstract class RangeOnRangeFacetCounts extends FacetCountsWithFilterQuery {
+
+ private final Range[] ranges;
+ private final byte[][] encodedRanges;
+ private final int numEncodedValueBytes;
+ private final int dims;
+
+ /** Counts, initialized in by subclass. */
+ protected final int[] counts;
+
+ /** Our field name. */
+ protected final String field;
+
+ /** Total number of hits. */
+ protected int totCount;
+
+ private final ArrayUtil.ByteArrayComparator comparator;
+
+ /** Type of "range overlap" we want to count. */
+ RangeFieldQuery.QueryType queryType;
+
+ protected RangeOnRangeFacetCounts(
+ String field,
+ FacetsCollector hits,
+ RangeFieldQuery.QueryType queryType,
+ Query fastMatchQuery,
+ byte[][] encodedRanges,
+ Range... ranges)
+ throws IOException {
+ super(fastMatchQuery);
+ this.field = field;
+ this.ranges = ranges;
+ this.numEncodedValueBytes = ranges[0].getEncodedValueNumBytes();
+ this.dims = ranges[0].dims;
+ this.queryType = queryType;
+ this.comparator =
ArrayUtil.getUnsignedComparator(this.numEncodedValueBytes);
+ this.encodedRanges = verifyEncodedRange(encodedRanges);
Review Comment:
Maybe just inline the logic of `verifyEncodedRange` directly in the ctor?
Not sure it's worth breaking out. If you want to break it out though, let's
make the method static and pass everything in. It's tricky that calling
`verify...` requires `this.ranges` to have already been set.
##########
lucene/facet/src/java/org/apache/lucene/facet/rangeonrange/RangeOnRangeFacetCounts.java:
##########
@@ -0,0 +1,210 @@
+/*
+ * 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.lucene.facet.rangeonrange;
+
+import java.io.IOException;
+import java.util.Collections;
+import java.util.List;
+import org.apache.lucene.document.BinaryRangeDocValues;
+import org.apache.lucene.document.RangeFieldQuery;
+import org.apache.lucene.facet.FacetCountsWithFilterQuery;
+import org.apache.lucene.facet.FacetResult;
+import org.apache.lucene.facet.FacetsCollector;
+import org.apache.lucene.facet.LabelAndValue;
+import org.apache.lucene.index.DocValues;
+import org.apache.lucene.search.DocIdSetIterator;
+import org.apache.lucene.search.Query;
+import org.apache.lucene.util.ArrayUtil;
+import org.apache.lucene.util.PriorityQueue;
+
+abstract class RangeOnRangeFacetCounts extends FacetCountsWithFilterQuery {
+
+ private final Range[] ranges;
Review Comment:
So this suggestion kind of seems contradictory to my previous suggestion of
not storing the string labels in a separate array. But, now that we're
separately storing the encoded ranges, I wonder if we should bring back the
string label array and _not_ store the `Range` array at all? So the sub-classes
would pass two parallel arrays to the super ctor: 1) string labels, 2) encoded
ranges. This is pretty nit-picky, but might be just a tad tighter?
##########
lucene/core/src/java/org/apache/lucene/document/RangeFieldQuery.java:
##########
@@ -251,7 +251,7 @@ Relation compare(
}
@Override
- boolean matches(
+ public boolean matches(
Review Comment:
We don't need this public vis anymore right?
##########
lucene/facet/src/java/org/apache/lucene/facet/rangeonrange/LongRange.java:
##########
@@ -0,0 +1,124 @@
+/*
+ * 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.lucene.facet.rangeonrange;
+
+import java.util.Arrays;
+import java.util.Objects;
+
+/** Represents a long range for RangeOnRange faceting */
+public class LongRange extends Range {
+ /** Minimum (inclusive). */
+ public final long[] min;
+
+ /** Maximum (inclusive). */
+ public final long[] max;
+
+ /**
+ * Represents a single dimensional long range for RangeOnRange faceting
+ *
+ * @param label the name of the range
+ * @param minIn the minimum
+ * @param minInclusive if the minimum is inclusive
+ * @param maxIn the maximum
+ * @param maxInclusive if the maximum is inclusive
+ */
+ public LongRange(
+ String label, long minIn, boolean minInclusive, long maxIn, boolean
maxInclusive) {
+ super(label, 1);
+
+ if (!minInclusive) {
Review Comment:
Should we unify the arg validation between the single-dim and multi-dim
ctors? It feels like we should be able to just delegate to the multi-dim ctor
here and have all validation be common (same for the double version).
##########
lucene/facet/src/java/org/apache/lucene/facet/rangeonrange/LongRange.java:
##########
@@ -0,0 +1,124 @@
+/*
+ * 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.lucene.facet.rangeonrange;
+
+import java.util.Arrays;
+import java.util.Objects;
+
+/** Represents a long range for RangeOnRange faceting */
+public class LongRange extends Range {
+ /** Minimum (inclusive). */
+ public final long[] min;
+
+ /** Maximum (inclusive). */
+ public final long[] max;
+
+ /**
+ * Represents a single dimensional long range for RangeOnRange faceting
+ *
+ * @param label the name of the range
+ * @param minIn the minimum
+ * @param minInclusive if the minimum is inclusive
+ * @param maxIn the maximum
+ * @param maxInclusive if the maximum is inclusive
+ */
+ public LongRange(
+ String label, long minIn, boolean minInclusive, long maxIn, boolean
maxInclusive) {
+ super(label, 1);
+
+ if (!minInclusive) {
+ if (minIn != Long.MAX_VALUE) {
+ minIn++;
+ } else {
+ failNoMatch();
+ }
+ }
+
+ if (!maxInclusive) {
+ if (maxIn != Long.MIN_VALUE) {
+ maxIn--;
+ } else {
+ failNoMatch();
+ }
+ }
+
+ if (minIn > maxIn) {
+ failNoMatch();
+ }
+
+ this.min = new long[] {minIn};
+ this.max = new long[] {maxIn};
+ }
+
+ /**
+ * Represents a multidimensional long range for RangeOnRange faceting
+ *
+ * @param label the name of the range
+ * @param min the minimum
+ * @param max the maximum
+ */
+ public LongRange(String label, long[] min, long[] max) {
Review Comment:
Should the javadoc mention that the ranges are all treated as "inclusive" in
all dims?
##########
lucene/facet/src/java/org/apache/lucene/facet/rangeonrange/RangeOnRangeFacetCounts.java:
##########
@@ -0,0 +1,210 @@
+/*
+ * 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.lucene.facet.rangeonrange;
+
+import java.io.IOException;
+import java.util.Collections;
+import java.util.List;
+import org.apache.lucene.document.BinaryRangeDocValues;
+import org.apache.lucene.document.RangeFieldQuery;
+import org.apache.lucene.facet.FacetCountsWithFilterQuery;
+import org.apache.lucene.facet.FacetResult;
+import org.apache.lucene.facet.FacetsCollector;
+import org.apache.lucene.facet.LabelAndValue;
+import org.apache.lucene.index.DocValues;
+import org.apache.lucene.search.DocIdSetIterator;
+import org.apache.lucene.search.Query;
+import org.apache.lucene.util.ArrayUtil;
+import org.apache.lucene.util.PriorityQueue;
+
+abstract class RangeOnRangeFacetCounts extends FacetCountsWithFilterQuery {
+
+ private final Range[] ranges;
+ private final byte[][] encodedRanges;
+ private final int numEncodedValueBytes;
+ private final int dims;
+
+ /** Counts, initialized in by subclass. */
+ protected final int[] counts;
+
+ /** Our field name. */
+ protected final String field;
+
+ /** Total number of hits. */
+ protected int totCount;
+
+ private final ArrayUtil.ByteArrayComparator comparator;
+
+ /** Type of "range overlap" we want to count. */
+ RangeFieldQuery.QueryType queryType;
+
+ protected RangeOnRangeFacetCounts(
+ String field,
+ FacetsCollector hits,
+ RangeFieldQuery.QueryType queryType,
+ Query fastMatchQuery,
+ byte[][] encodedRanges,
+ Range... ranges)
+ throws IOException {
+ super(fastMatchQuery);
+ this.field = field;
+ this.ranges = ranges;
+ this.numEncodedValueBytes = ranges[0].getEncodedValueNumBytes();
Review Comment:
One more place where I wonder if we really need a callback? Could the
sub-classes pass this information in the ctor and get rid of this method
completely?
--
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-unsubscr...@lucene.apache.org
For queries about this service, please contact Infrastructure at:
us...@infra.apache.org
---------------------------------------------------------------------
To unsubscribe, e-mail: issues-unsubscr...@lucene.apache.org
For additional commands, e-mail: issues-h...@lucene.apache.org
