Changeset 8131

Timestamp:

Mar 21, 2023, 11:58:37 AM (3 months ago)

Author:

Nicklas Nordborg

Message:

References #2296: Improve performance when loading many any-to-any links

The DataQuery class uses the stateless Hibernate session which is causing a lot of extra queries while iterating (since the statless session doesn't support lazy proxies). Switched to AbstractEntityQuery instead which allows us to use the stateful session.

File:

• branches/3.19-stable/src/core/net/sf/basedb/core/AnyToAny.java (modified) (2 diffs)

branches/3.19-stable/src/core/net/sf/basedb/core/AnyToAny.java

@@ -814 +814 @@
       // We store the mapping between source item id and target item id
       Map<Integer, Integer> idMap = new HashMap<>();
-      DataQuery<AnyToAnyData> linkQuery = new DataQuery<>(AnyToAnyData.class, null);
+      AbstractEntityQuery linkQuery = new AbstractEntityQuery(Item.ANYTOANY, null, false)
+      {};
       linkQuery.restrict(Restrictions.eq(Hql.property("fromType"), Expressions.integer(fromType.getValue())));
       linkQuery.restrict(Restrictions.eq(Hql.property("toType"), Expressions.integer(toType.getValue())));
       linkQuery.restrict(Restrictions.eq(Hql.property("name"), Expressions.string(linkName)));
       if (linkRestriction != null) linkQuery.restrict(linkRestriction);
-      Iterator<AnyToAnyData> linkIterator = linkQuery.iterate(dc);
+      Iterator<AnyToAnyData> linkIterator = HibernateUtil.loadIterator(linkQuery.getMainHqlQuery(dc, AnyToAnyData.class), false, null);
       while (linkIterator.hasNext())
       {
@@ -830 +831 @@
       // Store the mapping between target item id and *Data object
       Map<Integer, BasicData> targetMap = new HashMap<>(idMap.size());
-      DataQuery<? extends BasicData> targetQuery = new DataQuery<>(toType.getDataClass(), null);
+      AbstractEntityQuery targetQuery = new AbstractEntityQuery(toType, null, false)
+      {};
       targetQuery.restrict(new IdListRestriction("id", idMap.values()));
       if (targetRestriction != null) targetQuery.restrict(targetRestriction);
-      Iterator<? extends BasicData> targetIterator = targetQuery.iterate(dc);
+      Iterator<? extends BasicData> targetIterator = HibernateUtil.loadIterator(targetQuery.getMainHqlQuery(dc, toType.getDataClass()), false, null);
       while (targetIterator.hasNext())
       {