remove deprecated RealTimeGetComponent methods (apache#1018)

cowpaths · Sep 20, 2022 · 500c74c · 500c74c
1 parent b35ccf8
commit 500c74c
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 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
@@ -630,21 +630,6 @@ private static void removeCopyFieldTargets(SolrDocument solrDoc, IndexSchema sch
 
   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 static SolrInputDocument getInputDocumentFromTlog(
     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
@@ -192,7 +192,8 @@ private void validateUserVersions(
   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 @@ private DocFoundAndOldUserAndSolrVersions getOldUserVersionsFromStored(BytesRef
     // 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 {