This is an automated email from the ASF dual-hosted git repository. cpoerschke pushed a commit to branch branch_9x in repository https://gitbox.apache.org/repos/asf/solr.git
commit 8b78ea5d58f0337cce9ac20ea835fe1f9953d2c8 Author: Christine Poerschke <[email protected]> AuthorDate: Tue Sep 20 15:15:15 2022 +0100 remove deprecated RealTimeGetComponent methods (#1018) (cherry picked from commit 500c74cfb686c3e8b2c88b22b9ee5a787c0c57d0) --- .../handler/component/RealTimeGetComponent.java | 21 --------------------- .../DocBasedVersionConstraintsProcessor.java | 5 +++-- 2 files changed, 3 insertions(+), 23 deletions(-) diff --git a/solr/core/src/java/org/apache/solr/handler/component/RealTimeGetComponent.java b/solr/core/src/java/org/apache/solr/handler/component/RealTimeGetComponent.java index e53b1b06985..070e0166b20 100644 --- a/solr/core/src/java/org/apache/solr/handler/component/RealTimeGetComponent.java +++ b/solr/core/src/java/org/apache/solr/handler/component/RealTimeGetComponent.java @@ -630,21 +630,6 @@ public class RealTimeGetComponent extends SearchComponent { public static SolrInputDocument DELETED = new SolrInputDocument(); - @Deprecated // need Resolution - public static SolrInputDocument getInputDocumentFromTlog( - SolrCore core, - BytesRef idBytes, - AtomicLong versionReturned, - Set<String> onlyTheseNonStoredDVs, - boolean resolveFullDocument) { - return getInputDocumentFromTlog( - core, - idBytes, - versionReturned, - onlyTheseNonStoredDVs, - resolveFullDocument ? Resolution.DOC : Resolution.PARTIAL); - } - /** * Specialized to pick out a child doc from a nested doc from the TLog. * @@ -747,12 +732,6 @@ public class RealTimeGetComponent extends SearchComponent { return null; } - @Deprecated // easy to use wrong - public static SolrInputDocument getInputDocument( - SolrCore core, BytesRef idBytes, Resolution lookupStrategy) throws IOException { - return getInputDocument(core, idBytes, idBytes, null, null, lookupStrategy); - } - /** * Obtains the latest document for a given id from the tlog or through the realtime searcher (if * not found in the tlog). Fields that are targets of copy-fields are excluded. diff --git a/solr/core/src/java/org/apache/solr/update/processor/DocBasedVersionConstraintsProcessor.java b/solr/core/src/java/org/apache/solr/update/processor/DocBasedVersionConstraintsProcessor.java index 521fcbd2558..7ca6b9e6572 100644 --- a/solr/core/src/java/org/apache/solr/update/processor/DocBasedVersionConstraintsProcessor.java +++ b/solr/core/src/java/org/apache/solr/update/processor/DocBasedVersionConstraintsProcessor.java @@ -192,7 +192,8 @@ public class DocBasedVersionConstraintsProcessor extends UpdateRequestProcessor private DocFoundAndOldUserAndSolrVersions getOldUserVersionsFromFieldCache( BytesRef indexedDocId) { SolrInputDocument oldDoc = - RealTimeGetComponent.getInputDocumentFromTlog(core, indexedDocId, null, null, true); + RealTimeGetComponent.getInputDocumentFromTlog( + core, indexedDocId, null, null, RealTimeGetComponent.Resolution.DOC); if (oldDoc == RealTimeGetComponent.DELETED) { return DocFoundAndOldUserAndSolrVersions.NOT_FOUND; } @@ -233,7 +234,7 @@ public class DocBasedVersionConstraintsProcessor extends UpdateRequestProcessor // stored fields only... SolrInputDocument oldDoc = RealTimeGetComponent.getInputDocument( - core, indexedDocId, RealTimeGetComponent.Resolution.DOC); + core, indexedDocId, indexedDocId, null, null, RealTimeGetComponent.Resolution.DOC); if (null == oldDoc) { return DocFoundAndOldUserAndSolrVersions.NOT_FOUND; } else {
