Issue 53253: forego indexing data class in a container being deleted (#6821)

Author: labkey-nicka

experiment/src/org/labkey/experiment/api/ExpDataClassImpl.java

@@ -242,6 +242,8 @@ public Domain getDomain(boolean forUpdate)
     {
         if (_domain == null || (forUpdate && !_domain.isMutable()))
         {
+            assert getContainer() != null : "Container cannot be null when attempting to fetch data class domain.";
+
             _domain = PropertyService.get().getDomain(getContainer(), getLSID(), forUpdate);
             if (_domain == null)
             {
@@ -328,12 +330,9 @@ public void delete(User user, @Nullable String auditUserComment)
         }
     }
 
-    public TableInfo getTinfo()
+    public @NotNull TableInfo getTinfo()
     {
-        Domain d = getDomain();
-        if (null == d)
-            throw new NullPointerException("domain is null");
-        return StorageProvisioner.createTableInfo(d);
+        return StorageProvisioner.createTableInfo(getDomain());
     }
 
     @Override

experiment/src/org/labkey/experiment/api/ExperimentServiceImpl.java

@@ -1219,13 +1219,8 @@ public void indexDataClass(ExpDataClassImpl dataClass)
         SearchService.IndexTask task = ss.defaultTask();
 
         Runnable r = () -> {
-            Domain d = dataClass.getDomain();
-            if (d == null)
-                return; // Domain may be null if the DataClass has been deleted
-
-            TableInfo table = dataClass.getTinfo();
-            if (table == null)
-                return;
+            if (dataClass.getContainer() == null)
+                return; // Issue 53253: container may be deleted
 
             indexDataClass(dataClass, task);
             indexDataClassData(dataClass, task);
@@ -1830,13 +1825,7 @@ public ExpDataClassImpl getDataClass(int rowId)
     @Override
     public List<? extends ExpData> getExpDatas(ExpDataClass dataClass)
     {
-        Domain d = dataClass.getDomain();
-        if (d == null)
-            throw new IllegalStateException("No domain for DataClass '" + dataClass.getName() + "' in container '" + dataClass.getContainer().getPath() + "'");
-
         TableInfo table = ((ExpDataClassImpl) dataClass).getTinfo();
-        if (table == null)
-            throw new IllegalStateException("No table for DataClass '" + dataClass.getName() + "' in container '" + dataClass.getContainer().getPath() + "'");
 
         SQLFragment sql = new SQLFragment()
                 .append("SELECT * FROM ").append(getTinfoData(), "d")
@@ -1849,7 +1838,6 @@ public List<? extends ExpData> getExpDatas(ExpDataClass dataClass)
         return datas.stream().map(ExpDataImpl::new).collect(toList());
     }
 
-
     public List<ExpDataImpl> getExpDatasByObjectId(ContainerFilter containerFilter, Collection<Integer> objectIds)
     {
         SimpleFilter filter = new SimpleFilter();
@@ -1862,13 +1850,7 @@ public List<ExpDataImpl> getExpDatasByObjectId(ContainerFilter containerFilter,
     @Nullable
     public ExpDataImpl getExpData(ExpDataClass dataClass, String name)
     {
-        Domain d = dataClass.getDomain();
-        if (d == null)
-            throw new IllegalStateException("No domain for DataClass '" + dataClass.getName() + "' in container '" + dataClass.getContainer().getPath() + "'");
-
         TableInfo table = ((ExpDataClassImpl) dataClass).getTinfo();
-        if (table == null)
-            throw new IllegalStateException("No table for DataClass '" + dataClass.getName() + "' in container '" + dataClass.getContainer().getPath() + "'");
 
         SQLFragment sql = new SQLFragment()
                 .append("SELECT * FROM ").append(getTinfoData(), "d")
@@ -1886,13 +1868,7 @@ public ExpDataImpl getExpData(ExpDataClass dataClass, String name)
     @Nullable
     public ExpDataImpl getExpData(ExpDataClass dataClass, int rowId)
     {
-        Domain d = dataClass.getDomain();
-        if (d == null)
-            throw new IllegalStateException("No domain for DataClass '" + dataClass.getName() + "' in container '" + dataClass.getContainer().getPath() + "'");
-
         TableInfo table = ((ExpDataClassImpl) dataClass).getTinfo();
-        if (table == null)
-            throw new IllegalStateException("No table for DataClass '" + dataClass.getName() + "' in container '" + dataClass.getContainer().getPath() + "'");
 
         SQLFragment sql = new SQLFragment()
                 .append("SELECT * FROM ").append(getTinfoData(), "d")
@@ -10226,6 +10202,7 @@ else if (currentDataType instanceof ExpSampleType sampleType)
         }
     }
 
+    @SuppressWarnings("JUnitMalformedDeclaration")
     public static class TestCase extends Assert
     {
         final Logger log = LogManager.getLogger(ExperimentServiceImpl.class);
@@ -10389,6 +10366,7 @@ public void setPath(String path)
         }
     }
 
+    @SuppressWarnings("JUnitMalformedDeclaration")
     public static class LineageQueryTestCase extends Assert
     {
         TempTableTracker tt;
@@ -10587,6 +10565,7 @@ public void testCycle()
         }
     }
 
+    @SuppressWarnings("JUnitMalformedDeclaration")
     public static class ParseInputOutputAliasTestCase extends Assert
     {
         @Test