Mailing List Archive

[GitHub] [lucene] zacharymorn commented on a diff in pull request #767: LUCENE-10436: Deprecate DocValuesFieldExistsQuery, NormsFieldExistsQuery and KnnVectorFieldExistsQuery with FieldExistsQuery
zacharymorn commented on code in PR #767:
URL: https://github.com/apache/lucene/pull/767#discussion_r841309603


##########
lucene/core/src/java/org/apache/lucene/search/DocValuesFieldExistsQuery.java:
##########
@@ -31,42 +28,21 @@
/**
* A {@link Query} that matches documents that have a value for a given field as reported by doc
* values iterators.
+ *
+ * @deprecated Use {@link org.apache.lucene.search.FieldExistsQuery} instead.
*/
-public final class DocValuesFieldExistsQuery extends Query {
-
- private final String field;
+@Deprecated
+public final class DocValuesFieldExistsQuery extends FieldExistsQuery {
+ private String field;

/** Create a query that will match documents which have a value for the given {@code field}. */
public DocValuesFieldExistsQuery(String field) {
+ super(field);
this.field = Objects.requireNonNull(field);
}

- public String getField() {
- return field;
- }
-
- @Override
- public boolean equals(Object other) {
- return sameClassAs(other) && field.equals(((DocValuesFieldExistsQuery) other).field);
- }
-
- @Override
- public int hashCode() {
- return 31 * classHash() + field.hashCode();
- }
-
- @Override
- public String toString(String field) {
- return "DocValuesFieldExistsQuery [field=" + this.field + "]";
- }
-
- @Override
- public void visit(QueryVisitor visitor) {
- if (visitor.acceptField(field)) {
- visitor.visitLeaf(this);
- }
- }
-
+ // nocommit this seems to be generalizable to norms and knn as well given LUCENE-9334, and thus
+ // could be moved to the new FieldExistsQuery?

Review Comment:
Ok I see.



--
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: dev-unsubscribe@lucene.apache.org

For queries about this service, please contact Infrastructure at:
users@infra.apache.org


---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@lucene.apache.org
For additional commands, e-mail: dev-help@lucene.apache.org
[GitHub] [lucene] zacharymorn commented on a diff in pull request #767: LUCENE-10436: Deprecate DocValuesFieldExistsQuery, NormsFieldExistsQuery and KnnVectorFieldExistsQuery with FieldExistsQuery [ In reply to ]
zacharymorn commented on code in PR #767:
URL: https://github.com/apache/lucene/pull/767#discussion_r841312352


##########
lucene/core/src/java/org/apache/lucene/search/FieldExistsQuery.java:
##########
@@ -0,0 +1,223 @@
+/*
+ * 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.search;
+
+import java.io.IOException;
+import java.util.Objects;
+import org.apache.lucene.index.DocValues;
+import org.apache.lucene.index.DocValuesType;
+import org.apache.lucene.index.FieldInfo;
+import org.apache.lucene.index.FieldInfos;
+import org.apache.lucene.index.IndexOptions;
+import org.apache.lucene.index.IndexReader;
+import org.apache.lucene.index.LeafReader;
+import org.apache.lucene.index.LeafReaderContext;
+import org.apache.lucene.index.PointValues;
+import org.apache.lucene.index.Terms;
+
+/**
+ * A {@link Query} that matches documents that contain either a {@link
+ * org.apache.lucene.document.KnnVectorField}, or a field that indexes norms or doc values.
+ */
+public class FieldExistsQuery extends Query {
+ private String field;
+
+ /** Create a query that will match that have a value for the given {@code field}. */
+ public FieldExistsQuery(String field) {
+ this.field = Objects.requireNonNull(field);
+ }
+
+ public String getField() {
+ return field;
+ }
+
+ @Override
+ public String toString(String field) {
+ return "FieldExistsQuery [field=" + this.field + "]";
+ }
+
+ @Override
+ public void visit(QueryVisitor visitor) {
+ if (visitor.acceptField(field)) {
+ visitor.visitLeaf(this);
+ }
+ }
+
+ @Override
+ public boolean equals(Object other) {
+ return sameClassAs(other) && field.equals(((FieldExistsQuery) other).field);
+ }
+
+ @Override
+ public int hashCode() {
+ final int prime = 31;
+ int hash = classHash();
+ hash = prime * hash + field.hashCode();
+ return hash;
+ }
+
+ @Override
+ public Query rewrite(IndexReader reader) throws IOException {
+ boolean allReadersRewritable = true;
+
+ for (LeafReaderContext context : reader.leaves()) {
+ LeafReader leaf = context.reader();
+ FieldInfos fieldInfos = leaf.getFieldInfos();
+ FieldInfo fieldInfo = fieldInfos.fieldInfo(field);
+
+ if (fieldInfo == null) {
+ allReadersRewritable = false;
+ break;
+ }
+
+ if (fieldInfo.hasNorms()) { // the field indexes norms
+ if (reader.getDocCount(field) != reader.maxDoc()) {
+ allReadersRewritable = false;
+ break;
+ }
+ } else if (fieldInfo.getVectorDimension() != 0) { // the field indexes vectors
+ if (leaf.getVectorValues(field).size() != reader.maxDoc()) {
+ allReadersRewritable = false;
+ break;
+ }
+ } else if (fieldInfo.getDocValuesType() != DocValuesType.NONE
+ || leaf.terms(field) != null
+ || leaf.getPointValues(field) != null) { // the field indexes doc values or points

Review Comment:
I gave that a try in https://github.com/apache/lucene/pull/767/commits/d4d9a3f5b79fa778f29c48d5ab0fee43dab14561, but it failed fa few tests (that I fixed), mostly having to do with `BinaryPoint` or `StringField` fields don't pass the condition `fieldInfo.getDocValuesType() != DocValuesType.NONE`. Could you let me know if it looks correct to you ?



--
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: dev-unsubscribe@lucene.apache.org

For queries about this service, please contact Infrastructure at:
users@infra.apache.org


---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@lucene.apache.org
For additional commands, e-mail: dev-help@lucene.apache.org