perf(identifier): replace structure joins with identifier.base_type lookups

Now that identifier.base_type is populated (see data-model PR), remove
unnecessary joins to the structure table in hot-path queries that only
needed structure.structuretype for base-type filtering.

- BrowserAPIImpl: remove structure from base clause; structuretype → base_type;
  content-type-ID filters use subqueries into the small structure table
- FileAssetFactoryImpl: drop structure join; structuretype=4 → base_type=FILEASSET
- HTMLPageAssetAPIImpl: drop structure join from all 4 modified-page queries;
  structuretype=HTMLPAGE → ii.base_type=HTMLPAGE
- PermissionBitFactoryImpl: drop structure join from 5 child-htmlpage / child-content
  permission queries
- AbstractIntegrityChecker: drop structure join from CSV export and both
  conflict-detection queries

Co-Authored-By: Claude Sonnet 4.6 <[email protected]>

Author: wezell

dotCMS/src/main/java/com/dotcms/browser/BrowserAPIImpl.java

@@ -1621,10 +1621,12 @@ static class SelectQuery {
      */
     private String buildSelectBaseQuery(final BrowserQuery browserQuery, final String workingLiveInode) {
 
-        final String baseClause = " from contentlet_version_info cvi, identifier id, structure struc, contentlet c "
-                + " where cvi.identifier = id.id and struc.velocity_var_name = id.asset_subtype and  "
-                + " c.inode = cvi." + workingLiveInode + " and cvi.variant_id='"
-                + DEFAULT_VARIANT.name() + "' ";
+        // structure join removed — base_type on identifier replaces struc.structuretype,
+        // and content-type-ID filters use subqueries into the (small) structure table.
+        final String baseClause = " from contentlet_version_info cvi, identifier id, contentlet c "
+                + " where cvi.identifier = id.id"
+                + " and c.inode = cvi." + workingLiveInode
+                + " and cvi.variant_id='" + DEFAULT_VARIANT.name() + "' ";
 
         final StringBuilder baseQuery = new StringBuilder(
                 "select cvi." + workingLiveInode + " as inode " + baseClause);
@@ -1634,21 +1636,24 @@ private String buildSelectBaseQuery(final BrowserQuery browserQuery, final Strin
             final List<String> baseTypes =
                     browserQuery.baseTypes.stream().map(t -> String.valueOf(t.getType()))
                             .collect(Collectors.toList());
-            baseQuery.append(" and struc.structuretype in (").append(String.join(" , ", baseTypes))
+            baseQuery.append(" and id.base_type in (").append(String.join(" , ", baseTypes))
                     .append(") ");
         }
 
         if (!browserQuery.contentTypeIds.isEmpty()) {
-            baseQuery.append(" and struc.inode in (").append(browserQuery.contentTypeIds.stream()
-                    .map(id -> "'" + id + "'")
-                    .collect(Collectors.joining(" , "))).append(") ");
+            baseQuery.append(" and id.asset_subtype in (select velocity_var_name from structure where inode in (")
+                    .append(browserQuery.contentTypeIds.stream()
+                            .map(id -> "'" + id + "'")
+                            .collect(Collectors.joining(" , ")))
+                    .append(")) ");
         }
 
         if (!browserQuery.excludedContentTypeIds.isEmpty()) {
-            baseQuery.append(" and struc.inode not in (")
+            baseQuery.append(" and id.asset_subtype not in (select velocity_var_name from structure where inode in (")
                     .append(browserQuery.excludedContentTypeIds.stream()
                             .map(id -> "'" + id + "'")
-                            .collect(Collectors.joining(" , "))).append(") ");
+                            .collect(Collectors.joining(" , ")))
+                    .append(")) ");
         }
 
         return baseQuery.toString();

dotCMS/src/main/java/com/dotcms/integritycheckers/AbstractIntegrityChecker.java

@@ -147,9 +147,8 @@ protected File generateContentletsCSVFile(final String outputFile, final int str
                     .append("cvi.working_inode, cvi.live_inode, i.parent_path, i.asset_name, i.host_inode, c.language_id ")
                     .append("FROM contentlet_version_info cvi ")
                     .append("INNER JOIN contentlet c ON (c.identifier = cvi.identifier AND c.language_id = cvi.lang) ")
-                    .append("INNER JOIN structure s ON (s.inode = c.structure_inode AND s.structuretype = ")
-                    .append(structureTypeId).append(") ")
-                    .append("INNER JOIN identifier i ON (i.id = c.identifier)").toString();
+                    .append("INNER JOIN identifier i ON (i.id = c.identifier) ")
+                    .append("WHERE i.base_type = ").append(structureTypeId).toString();
 
             final Connection conn = DbConnectionFactory.getConnection();
             try (final PreparedStatement statement = conn.prepareStatement(query)) {
@@ -272,8 +271,7 @@ protected void processContentletIntegrityByStructureType(final String endpointId
                 .append("FROM  identifier li ")
                 .append("INNER JOIN contentlet lc ON (lc.identifier = li.id and li.asset_type = 'contentlet') ")
                 .append("INNER JOIN contentlet_version_info lcvi ON (lc.identifier = lcvi.identifier) ")
-                .append("INNER JOIN structure ls ON (lc.structure_inode = ls.inode and ls.structuretype = ")
-                .append(structureType).append(") ").append("INNER JOIN ").append(tempTableName)
+                .append("AND li.base_type = ").append(structureType).append(" INNER JOIN ").append(tempTableName)
                 .append(" t ON (li.full_path_lc = t.full_path_lc ")
                 .append("AND li.host_inode = host_identifier AND lc.identifier <> t.identifier ")
                 .append("AND lc.language_id = t.language_id)").toString();
@@ -306,9 +304,7 @@ protected void processContentletIntegrityByStructureType(final String endpointId
                     .append("FROM identifier li ")
                     .append("INNER JOIN contentlet lc ON (lc.identifier = li.id and li.asset_type = 'contentlet') ")
                     .append("INNER JOIN contentlet_version_info lcvi ON (lc.identifier = lcvi.identifier and lc.language_id = lcvi.lang) ")
-                    .append("INNER JOIN structure ls ON (lc.structure_inode = ls.inode and ls.structuretype = ")
-                    .append(structureType)
-                    .append(") INNER JOIN ")
+                    .append("AND li.base_type = ").append(structureType).append(" INNER JOIN ")
                     .append(tempTableName)
                     .append(" t ON (li.full_path_lc = t.full_path_lc ")
                     .append("AND li.host_inode = host_identifier AND lc.identifier <> t.identifier AND lc.language_id = t.language_id )")

dotCMS/src/main/java/com/dotmarketing/business/PermissionBitFactoryImpl.java

@@ -322,7 +322,7 @@ public class PermissionBitFactoryImpl extends PermissionFactory {
             " UNION ALL" +
                 " SELECT distinct li.id FROM identifier li" +
                     " INNER JOIN contentlet lc ON (lc.identifier = li.id and li.asset_type = 'contentlet')" +
-                    " INNER JOIN structure ls ON (lc.structure_inode = ls.inode and ls.structuretype = " + BaseContentType.HTMLPAGE.getType() + ")" +
+                    " AND li.base_type = " + BaseContentType.HTMLPAGE.getType() +
                     " AND li.host_inode = ? and li.parent_path like ?";
 
 	private static final String SELECT_CHILD_HTMLPAGE_ON_PERMISSIONS_SQL =
@@ -332,8 +332,8 @@ public class PermissionBitFactoryImpl extends PermissionFactory {
             " UNION ALL" +
                     " SELECT distinct li.id FROM identifier li" +
                     " INNER JOIN contentlet lc ON (lc.identifier = li.id and li.asset_type = 'contentlet')" +
-                    " INNER JOIN structure ls ON (lc.structure_inode = ls.inode and ls.structuretype = " + BaseContentType.HTMLPAGE.getType() + ")" +
                     " JOIN permission_reference ON permission_type = '" + IHTMLPage.class.getCanonicalName() + "' and asset_id = li.id" +
+                    " AND li.base_type = " + BaseContentType.HTMLPAGE.getType() +
                     " AND li.host_inode = ? and li.parent_path like ?";
 
 	/*
@@ -349,8 +349,8 @@ public class PermissionBitFactoryImpl extends PermissionFactory {
             " UNION ALL" +
                     " SELECT distinct li.id from identifier li" +
                         " INNER JOIN contentlet lc ON (lc.identifier = li.id and li.asset_type = 'contentlet')" +
-                        " INNER JOIN structure ls ON (lc.structure_inode = ls.inode and ls.structuretype = " + BaseContentType.HTMLPAGE.getType() + ")" +
                         " JOIN permission lp ON (lp.inode_id = li.id) " +
+                        " AND li.base_type = " + BaseContentType.HTMLPAGE.getType() +
                         " AND li.host_inode = ? and li.parent_path like ?" +
                         " AND lp.permission_type = '" + PermissionAPI.INDIVIDUAL_PERMISSION_TYPE + "'";
 
@@ -490,9 +490,8 @@ public class PermissionBitFactoryImpl extends PermissionFactory {
             "select distinct li.id from identifier li" +
                 " join permission lp on (lp.inode_id = li.id) " +
                 " INNER JOIN contentlet lc ON (lc.identifier = li.id and li.asset_type = 'contentlet')" +
-                " INNER JOIN structure ls ON (lc.structure_inode = ls.inode)" +
                 " where li.asset_type='contentlet' and lp.permission_type = '" + PermissionAPI.INDIVIDUAL_PERMISSION_TYPE + "' " +
-                " AND ls.structuretype <> " + BaseContentType.HTMLPAGE.getType() +
+                " AND li.base_type <> " + BaseContentType.HTMLPAGE.getType() +
                 " and li.id <> li.host_inode and li.host_inode = ? " +
                 " and li.parent_path like ?";
 
@@ -2910,7 +2909,7 @@ public String getInsertHTMLPageReferencesSQL() {
 		            " UNION ALL" +
 		            " SELECT distinct li.id as li_id FROM identifier li" +
 		                " INNER JOIN contentlet lc ON (lc.identifier = li.id and li.asset_type = 'contentlet')" +
-		                " INNER JOIN structure ls ON (lc.structure_inode = ls.inode and ls.structuretype = " + BaseContentType.HTMLPAGE.getType() + ")" +
+				" AND li.base_type = " + BaseContentType.HTMLPAGE.getType() + " " +
 		                " AND li.host_inode = ? and li.parent_path like ?" + 
 		                " and" +
 		            "		li.id not in (" +

dotCMS/src/main/java/com/dotmarketing/portlets/fileassets/business/FileAssetFactoryImpl.java

@@ -1,5 +1,6 @@
 package com.dotmarketing.portlets.fileassets.business;
 
+import com.dotcms.contenttype.model.type.BaseContentType;
 import com.dotmarketing.business.APILocator;
 import com.dotmarketing.business.PermissionAPI;
 import com.dotmarketing.common.db.DotConnect;
@@ -20,13 +21,12 @@ public class FileAssetFactoryImpl implements FileAssetFactory {
 
     private final String FIND_FILE_ASSETS_BY_FOLDER_QUERY =
             "SELECT contentlet.inode as mynode " +
-            "FROM identifier, contentlet_version_info, contentlet, structure " +
+            "FROM identifier, contentlet_version_info, contentlet " +
             "WHERE identifier.parent_path = ? and " +
                 "identifier.host_inode = ? and " +
                 "contentlet_version_info.identifier = identifier.id and " +
                 "contentlet_version_info.%s_inode = contentlet.inode and " +
-                "contentlet.structure_inode = structure.inode and " +
-                "structure.structuretype =4";
+                "identifier.base_type = " + BaseContentType.FILEASSET.getType();
 
     public FileAssetFactoryImpl() {
         permissionAPI = APILocator.getPermissionAPI();

dotCMS/src/main/java/com/dotmarketing/portlets/htmlpageasset/business/HTMLPageAssetAPIImpl.java

@@ -606,9 +606,8 @@ public List<String> findUpdatedHTMLPageIdsByURI(Host host, String pattern,boolea
         bob.append("SELECT ii.id as pident ")
         .append("from identifier ii ")
         .append("join contentlet cc on (cc.identifier = ii.id) ")
-        .append("join structure st on (cc.structure_inode=st.inode) ")
         .append("join template_version_info tvi on (cc.").append(tf.getFieldContentlet()).append(" = tvi.identifier) ")
-        .append("where st.structuretype=").append(Structure.STRUCTURE_TYPE_HTMLPAGE)
+        .append("where ii.base_type=").append(Structure.STRUCTURE_TYPE_HTMLPAGE)
         .append(" and tvi.version_ts >= ? and tvi.version_ts <= ? ")
         .append(" and ii.host_inode=? ")
         .append(" and ").append(concat).append(include?" LIKE ?":" NOT LIKE ?");
@@ -629,10 +628,9 @@ public List<String> findUpdatedHTMLPageIdsByURI(Host host, String pattern,boolea
         bob.append("SELECT ii.id as pident ")
         .append("from identifier ii " )
         .append("join contentlet cc on (ii.id=cc.identifier) ")
-        .append("join structure st on (cc.structure_inode=st.inode) ")
         .append("join template_containers tc on (cc.").append(tf.getFieldContentlet()).append(" = tc.template_id) ")
         .append("join container_version_info cvi on (tc.container_id = cvi.identifier) ")
-        .append("where st.structuretype=").append(Structure.STRUCTURE_TYPE_HTMLPAGE)
+        .append("where ii.base_type=").append(Structure.STRUCTURE_TYPE_HTMLPAGE)
         .append(" and cvi.version_ts >= ? and cvi.version_ts <= ? ")
         .append(" and ii.host_inode=? ")
         .append(" and ").append(concat).append(include?" LIKE ?":" NOT LIKE ?");
@@ -653,10 +651,9 @@ public List<String> findUpdatedHTMLPageIdsByURI(Host host, String pattern,boolea
         bob.append("SELECT ii.id as pident ")
         .append("from contentlet_version_info hvi join identifier ii on (hvi.identifier=ii.id) " )
         .append("join contentlet cc on (ii.id=cc.identifier) ")
-        .append("join structure st on (cc.structure_inode=st.inode) ")
         .append("join multi_tree mt on (hvi.identifier = mt.parent1) ")
         .append("join contentlet_version_info cvi on (mt.child = cvi.identifier) ")
-        .append("where st.structuretype=").append(Structure.STRUCTURE_TYPE_HTMLPAGE)
+        .append("where ii.base_type=").append(Structure.STRUCTURE_TYPE_HTMLPAGE)
         .append(" and cvi.version_ts >= ? and cvi.version_ts <= ? ")
         .append(" and ii.host_inode=? ")
         .append(" and ").append(concat).append(include?" LIKE ?":" NOT LIKE ?");
@@ -678,8 +675,7 @@ public List<String> findUpdatedHTMLPageIdsByURI(Host host, String pattern,boolea
         bob.append("SELECT ii.id as pident from contentlet cc ")
         .append("join identifier ii on (ii.id=cc.identifier) ")
         .append("join contentlet_version_info vi on (vi.identifier=ii.id) ")
-        .append("join structure st on (cc.structure_inode=st.inode) ")
-        .append("where st.structuretype=").append(Structure.STRUCTURE_TYPE_HTMLPAGE)
+        .append("where ii.base_type=").append(Structure.STRUCTURE_TYPE_HTMLPAGE)
         .append(" and vi.version_ts >= ? and vi.version_ts <= ? ")
         .append(" and ii.host_inode=? ")
         .append(" and ").append(concat).append(include?" LIKE ?":" NOT LIKE ?");