fix sphinx indexing

Author: dojutsu-user

readthedocs/projects/tasks.py

@@ -1282,13 +1282,8 @@ def fileify(version_pk, commit, build):
     except Exception:
         log.exception('Failed during ImportedFile creation')
 
-    try:
-        _update_intersphinx_data(version, path, commit, build)
-    except Exception:
-        log.exception('Failed during SphinxDomain creation')
-
 
-def _update_intersphinx_data(version, path, commit, build):
+def _create_intersphinx_data(version, path, commit, build):
     """
     Update intersphinx data for this version.
 
@@ -1376,24 +1371,6 @@ def warn(self, msg):
                 build=build,
             )
 
-    # Index new SphinxDomain objects to elasticsearch
-    index_new_files(model=SphinxDomain, version=version, build=build)
-
-    # Remove old SphinxDomain from elasticsearch
-    remove_indexed_files(
-        model=SphinxDomain,
-        version=version,
-        build=build,
-    )
-
-    # Delete SphinxDomain objects from the previous build of the version.
-    (
-        SphinxDomain.objects
-        .filter(project=version.project, version=version)
-        .exclude(build=build)
-        .delete()
-    )
-
 
 def clean_build(version_pk):
     """Clean the files used in the build of the given version."""
@@ -1481,6 +1458,12 @@ def _manage_imported_files(version, path, commit, build):
                 build=build,
             )
 
+    # create SphinxDomain objects
+    try:
+        _create_intersphinx_data(version, path, commit, build)
+    except Exception:
+        log.exception('Failed during SphinxDomain objects creation')
+
     # Index new HTMLFiles to elasticsearch
     index_new_files(model=HTMLFile, version=version, build=build)
 

readthedocs/search/documents.py

@@ -111,8 +111,10 @@ class Meta:
 
     def prepare_domains(self, html_file):
         """Prepares and returns the values for domains field."""
-        domains_qs = html_file.sphinx_domains.all().iterator()
-        domains_qs = domains_qs.exclude(domain='std', type__in=['doc', 'label'])
+        domains_qs = html_file.sphinx_domains.exclude(
+            domain='std',
+            type__in=['doc', 'label']
+        ).iterator()
 
         all_domains = [{
             'role_name': domain.role_name,