-
Notifications
You must be signed in to change notification settings - Fork 821
SOLR-18189: Skip indexing duplicate docs via a content hash URP #4263
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
base: main
Are you sure you want to change the base?
Changes from all commits
cd914b7
5277652
cd3b510
f4fe9f2
566f109
d3a4235
File filter
Filter by extension
Conversations
Jump to
Diff view
Diff view
There are no files selected for viewing
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,205 @@ | ||
| /* | ||
| * 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.update.processor; | ||
|
|
||
| import java.io.IOException; | ||
| import java.lang.invoke.MethodHandles; | ||
| import java.nio.ByteBuffer; | ||
| import java.util.Arrays; | ||
| import java.util.Collection; | ||
| import java.util.Optional; | ||
| import java.util.Set; | ||
| import java.util.function.Predicate; | ||
| import org.apache.lucene.util.BytesRef; | ||
| import org.apache.solr.common.SolrException; | ||
| import org.apache.solr.common.SolrInputDocument; | ||
| import org.apache.solr.core.SolrCore; | ||
| import org.apache.solr.handler.component.RealTimeGetComponent; | ||
| import org.apache.solr.handler.component.RealTimeGetComponent.Resolution; | ||
| import org.apache.solr.request.SolrQueryRequest; | ||
| import org.apache.solr.response.SolrQueryResponse; | ||
| import org.apache.solr.schema.BinaryField; | ||
| import org.apache.solr.schema.SchemaField; | ||
| import org.apache.solr.update.AddUpdateCommand; | ||
| import org.apache.solr.update.UpdateCommand; | ||
| import org.slf4j.Logger; | ||
| import org.slf4j.LoggerFactory; | ||
|
|
||
| /** | ||
| * An implementation of {@link UpdateRequestProcessor} which computes a hash of field values, and | ||
| * uses this hash to reject/accept document updates. | ||
| * | ||
| * <ul> | ||
| * <li>When no corresponding document with same id exists (create), the computed hash is added to | ||
| * the document. | ||
| * <li>When a previous document exists (update), a new hash is computed from the incoming field | ||
| * values and compared with the stored hash. | ||
| * </ul> | ||
| * | ||
| * <p>Depending on {#dropSameDocuments} value, this processor may drop or accept document updates. | ||
| * This implementation can be used for monitoring or dropping no-op updates (updates that do not | ||
| * change the Solr document content). | ||
| * | ||
| * <p>Note: the hash is computed using {@link Lookup3Signature} and must be stored in a field with | ||
| * docValues enabled for retrieval. | ||
| * | ||
| * @see Lookup3Signature | ||
| */ | ||
| public class ContentHashVersionProcessor extends UpdateRequestProcessor { | ||
| private static final Logger log = LoggerFactory.getLogger(MethodHandles.lookup().lookupClass()); | ||
| private final SchemaField hashField; | ||
| private final SolrQueryResponse rsp; | ||
| private final SolrCore core; | ||
| private final Predicate<String> includedFields; // Matcher for included fields in hash | ||
| private final Predicate<String> excludedFields; // Matcher for excluded fields from hash | ||
| private boolean dropSameDocuments; | ||
| private int sameCount = 0; | ||
| private int differentCount = 0; | ||
|
|
||
| public ContentHashVersionProcessor( | ||
| Predicate<String> hashIncludedFields, | ||
| Predicate<String> hashExcludedFields, | ||
| String hashFieldName, | ||
| SolrQueryRequest req, | ||
| SolrQueryResponse rsp, | ||
| UpdateRequestProcessor next) { | ||
| super(next); | ||
| this.core = req.getCore(); | ||
| this.hashField = new SchemaField(hashFieldName, new BinaryField()); | ||
| this.rsp = rsp; | ||
| this.includedFields = hashIncludedFields; | ||
| this.excludedFields = hashExcludedFields; | ||
| } | ||
|
|
||
| @Override | ||
| public void processAdd(AddUpdateCommand cmd) throws IOException { | ||
| SolrInputDocument newDoc = cmd.getSolrInputDocument(); | ||
| byte[] newHash = computeDocHash(newDoc); | ||
| newDoc.setField(hashField.getName(), newHash); | ||
|
|
||
| if (!isHashAcceptable(cmd.getIndexedId(), newHash)) { | ||
| return; | ||
| } | ||
|
|
||
| for (int i = 0; ; i++) { | ||
| logOverlyFailedRetries(i, cmd); | ||
| try { | ||
| super.processAdd(cmd); | ||
| return; | ||
| } catch (SolrException e) { | ||
| if (e.code() != 409) { | ||
| throw e; | ||
| } | ||
| ++i; | ||
| } | ||
| } | ||
| } | ||
|
|
||
| @Override | ||
| public void finish() throws IOException { | ||
| try { | ||
| super.finish(); | ||
| } finally { | ||
| // Only log when there are updates to existing documents | ||
| int totalUpdates = sameCount + differentCount; | ||
| if (totalUpdates > 0) { | ||
| if (dropSameDocuments) { | ||
| rsp.addToLog("contentHash.duplicatesDropped", sameCount); | ||
| rsp.addToLog("contentHash.duplicatesDetected", sameCount); | ||
| } else { | ||
| rsp.addToLog("contentHash.duplicatesDropped", 0); | ||
| rsp.addToLog("contentHash.duplicatesDetected", sameCount); | ||
| } | ||
|
Comment on lines
+121
to
+127
Contributor
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. I propose that we either log duplicatesDropped or duplicatesDetected as appropriate. Doing both doesn't add information. |
||
| rsp.addToLog("contentHash.changed", differentCount); | ||
|
Contributor
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. In your opinion, is this useful? |
||
| } else { | ||
|
Contributor
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. It's not uncommon for update batches to have no documents -- the ones that merely send a "commit", for example, or maybe just deletes. IMO we shouldn't bother logging if there were no documents in the batch. |
||
| rsp.addToLog("contentHash.duplicatesDropped", 0); | ||
| rsp.addToLog("contentHash.duplicatesDetected", 0); | ||
| rsp.addToLog("contentHash.changed", 0); | ||
| } | ||
| } | ||
| } | ||
|
|
||
| private static void logOverlyFailedRetries(int i, UpdateCommand cmd) { | ||
| if ((i & 255) == 255) { | ||
| log.warn("Unusual number of optimistic concurrency retries: retries={} cmd={}", i, cmd); | ||
| } | ||
| } | ||
|
|
||
| void setDropSameDocuments(boolean dropSameDocuments) { | ||
|
Contributor
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. who calls this? A setter is surprising. |
||
| this.dropSameDocuments = dropSameDocuments; | ||
| } | ||
|
|
||
| private boolean isHashAcceptable(BytesRef indexedDocId, byte[] newHash) throws IOException { | ||
| assert null != indexedDocId; | ||
|
|
||
| Optional<byte[]> oldDocHash = getOldDocHash(indexedDocId); | ||
| if (oldDocHash.isPresent()) { | ||
| if (Arrays.equals(newHash, oldDocHash.get())) { | ||
| sameCount++; | ||
| return !dropSameDocuments; | ||
| } else { | ||
| differentCount++; | ||
| return true; | ||
| } | ||
| } | ||
| return true; // Doc not found | ||
| } | ||
|
|
||
| /** Retrieves the hash value from the old document identified by the given ID. */ | ||
| private Optional<byte[]> getOldDocHash(BytesRef indexedDocId) throws IOException { | ||
| SolrInputDocument oldDoc = | ||
| RealTimeGetComponent.getInputDocument( | ||
| core, indexedDocId, indexedDocId, null, Set.of(hashField.getName()), Resolution.DOC); | ||
| if (oldDoc == null) { | ||
| return Optional.empty(); | ||
| } | ||
| Object o = oldDoc.getFieldValue(hashField.getName()); | ||
| if (o instanceof byte[] bytes) { | ||
| return Optional.of(bytes); | ||
| } else if (o instanceof ByteBuffer buf) { | ||
| byte[] bytes = new byte[buf.remaining()]; | ||
| buf.duplicate().get(bytes); | ||
| return Optional.of(bytes); | ||
| } | ||
| return Optional.empty(); | ||
| } | ||
|
|
||
| byte[] computeDocHash(SolrInputDocument doc) { | ||
| final Signature sig = new Lookup3Signature(); | ||
|
|
||
| // Stream field names, filter, sort, and process in a single pass | ||
| doc.getFieldNames().stream() | ||
| .filter(includedFields) // Keep fields that match 'included fields' matcher | ||
| .filter(excludedFields.negate()) // Exclude fields that match 'excluded fields' matcher | ||
| .sorted() // Sort to ensure consistent field order across different doc field orders | ||
| .forEach( | ||
| fieldName -> { | ||
| sig.add(fieldName); | ||
| Object o = doc.getFieldValue(fieldName); | ||
|
Contributor
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. If we streamed SolrInputField instead of the field names, we wouldn't have to do this lookup. It's also not a big deal. |
||
| if (o instanceof Collection) { | ||
| for (Object oo : (Collection<?>) o) { | ||
| sig.add(String.valueOf(oo)); | ||
| } | ||
| } else { | ||
| sig.add(String.valueOf(o)); | ||
| } | ||
| }); | ||
|
|
||
| return sig.getSignature(); | ||
| } | ||
| } | ||
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,169 @@ | ||
| /* | ||
| * 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.update.processor; | ||
|
|
||
| import java.util.ArrayList; | ||
| import java.util.List; | ||
| import java.util.Locale; | ||
| import java.util.function.Predicate; | ||
| import java.util.stream.Collectors; | ||
| import org.apache.solr.common.SolrException; | ||
| import org.apache.solr.common.util.NamedList; | ||
| import org.apache.solr.common.util.StrUtils; | ||
| import org.apache.solr.core.SolrCore; | ||
| import org.apache.solr.request.SolrQueryRequest; | ||
| import org.apache.solr.response.SolrQueryResponse; | ||
| import org.apache.solr.util.plugin.SolrCoreAware; | ||
|
|
||
| /** Factory for {@link ContentHashVersionProcessor} instances. */ | ||
|
Contributor
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. This cool new URP should be documented here: solr/solr-ref-guide/modules/configuration-guide/pages/update-request-processors.adoc which will basically be a link to these javadocs. But these javadocs are looking sparse...
Contributor
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Another thing worth documenting is that this URP should be configured to exclude fields updated with in-place updates. |
||
| public class ContentHashVersionProcessorFactory extends UpdateRequestProcessorFactory | ||
| implements SolrCoreAware, UpdateRequestProcessorFactory.RunAlways { | ||
| private static final char SEPARATOR = ','; // Separator for included/excluded fields | ||
| private List<String> includeFields = List.of("*"); // Included fields defaults to 'all' | ||
| private List<String> excludeFields = new ArrayList<>(); | ||
| private String hashFieldName; // Must be explicitly configured | ||
| private boolean dropSameDocuments = true; | ||
|
|
||
| public ContentHashVersionProcessorFactory() {} | ||
|
|
||
| public void init(NamedList<?> args) { | ||
| Object tmp = args.remove("includeFields"); | ||
| if (tmp != null) { | ||
| if (!(tmp instanceof String)) { | ||
| throw new SolrException( | ||
| SolrException.ErrorCode.SERVER_ERROR, "'includeFields' must be configured as a <str>"); | ||
| } | ||
| // Include fields support comma separated list of fields (e.g. "field1,field2,field3"). | ||
| // Also supports "*" to include all fields | ||
| this.includeFields = | ||
| StrUtils.splitSmart((String) tmp, SEPARATOR).stream() | ||
| .map(String::trim) | ||
| .collect(Collectors.toList()); | ||
| } | ||
| tmp = args.remove("hashFieldName"); | ||
| if (tmp == null) { | ||
| throw new SolrException( | ||
| SolrException.ErrorCode.SERVER_ERROR, | ||
| "'hashFieldName' is required and must be explicitly configured"); | ||
| } | ||
| if (!(tmp instanceof String)) { | ||
| throw new SolrException( | ||
| SolrException.ErrorCode.SERVER_ERROR, "'hashFieldName' must be configured as a <str>"); | ||
| } | ||
| this.hashFieldName = (String) tmp; | ||
|
|
||
| tmp = args.remove("excludeFields"); | ||
| if (tmp != null) { | ||
| if (!(tmp instanceof String)) { | ||
| throw new SolrException( | ||
| SolrException.ErrorCode.SERVER_ERROR, "'excludeFields' must be configured as a <str>"); | ||
| } | ||
| if ("*".equals(((String) tmp).trim())) { | ||
| throw new SolrException( | ||
| SolrException.ErrorCode.SERVER_ERROR, "'excludeFields' can't exclude all fields."); | ||
| } | ||
| // Exclude fields support comma separated list of fields (e.g. | ||
| // "excluded_field1,excluded_field2"). | ||
| // Also supports "*" to exclude all fields | ||
| this.excludeFields = | ||
| StrUtils.splitSmart((String) tmp, SEPARATOR).stream() | ||
| .map(String::trim) | ||
| .collect(Collectors.toList()); | ||
| } | ||
| excludeFields.add(hashFieldName); // Hash field name is excluded from hash computation | ||
|
|
||
| tmp = args.remove("hashCompareStrategy"); | ||
| if (tmp != null) { | ||
| if (!(tmp instanceof String)) { | ||
| throw new SolrException( | ||
| SolrException.ErrorCode.SERVER_ERROR, | ||
| "'hashCompareStrategy' must be configured as a <str>"); | ||
| } | ||
| String value = ((String) tmp).toLowerCase(Locale.ROOT); | ||
| if ("drop".equalsIgnoreCase(value)) { | ||
| dropSameDocuments = true; | ||
| } else if ("log".equalsIgnoreCase(value)) { | ||
| dropSameDocuments = false; | ||
| } else { | ||
| throw new SolrException( | ||
| SolrException.ErrorCode.SERVER_ERROR, | ||
| "Value '" | ||
| + value | ||
| + "' is unsupported for 'hashCompareStrategy', only 'drop' and 'log' are supported."); | ||
| } | ||
| } | ||
|
|
||
| super.init(args); | ||
| } | ||
|
|
||
| public UpdateRequestProcessor getInstance( | ||
| SolrQueryRequest req, SolrQueryResponse rsp, UpdateRequestProcessor next) { | ||
| ContentHashVersionProcessor processor = | ||
| new ContentHashVersionProcessor( | ||
| buildFieldMatcher(includeFields), | ||
| buildFieldMatcher(excludeFields), | ||
| hashFieldName, | ||
| req, | ||
| rsp, | ||
| next); | ||
| processor.setDropSameDocuments(dropSameDocuments); | ||
| return processor; | ||
| } | ||
|
|
||
| public void inform(SolrCore core) { | ||
| if (core.getLatestSchema().getUniqueKeyField() == null) { | ||
| throw new SolrException( | ||
| SolrException.ErrorCode.SERVER_ERROR, "schema must have uniqueKey defined."); | ||
| } | ||
| } | ||
|
|
||
| public String getHashFieldName() { | ||
| return hashFieldName; | ||
| } | ||
|
|
||
| public List<String> getIncludeFields() { | ||
| return includeFields; | ||
| } | ||
|
|
||
| public List<String> getExcludeFields() { | ||
| return excludeFields; | ||
| } | ||
|
|
||
| public boolean dropSameDocuments() { | ||
| return dropSameDocuments; | ||
| } | ||
|
|
||
| static Predicate<String> buildFieldMatcher(List<String> fieldNames) { | ||
| return fieldName -> { | ||
| for (String currentFieldName : fieldNames) { | ||
| if ("*".equals(currentFieldName)) { | ||
| return true; | ||
| } | ||
| if (fieldName.equals(currentFieldName)) { | ||
| return true; | ||
| } | ||
| if (currentFieldName.length() > 1 | ||
| && currentFieldName.endsWith("*") | ||
| && fieldName.startsWith(currentFieldName.substring(0, currentFieldName.length() - 1))) { | ||
| return true; | ||
| } | ||
| } | ||
| return false; | ||
| }; | ||
| } | ||
| } | ||
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Why would we get a 409? I'm guessing you were taking inspiration from DocBasedVersionConstraintsProcessor but that guy is using optimistic concurrency by setting the internal version, which this new URP here doesn't do. And we don't need to, as we are merely avoiding a redundant operation (an add of a doc that is identical to one already present) whereas DBVCP is potentially adding a document with a new version conditionally based on that it saw an existing doc with an old version.