=== modified file 'src/com/goldencode/p2j/jmx/FwdServerJMX.java' --- old/src/com/goldencode/p2j/jmx/FwdServerJMX.java 2025-11-11 13:00:24 +0000 +++ new/src/com/goldencode/p2j/jmx/FwdServerJMX.java 2026-06-10 08:13:45 +0000 @@ -248,6 +248,29 @@ OrmDataSetParam, /** Instrumentation for DataSet.createDynamicDataSet. */ OrmDynamicDataSetParam, + + /** Lazily hydrated an new record (not rehydrated from cache) */ + HydratorNewRecord, + /** Lazily hydrated a record (including rehydration from cache) */ + HydratorLazyRecord, + /** Fully or partially hydrated a record, but not lazy */ + HydratorNonLazyRecord, + /** The hydrator token matched the result-set token */ + HydratorHit, + /** The hydrator token mismatched the result-set token */ + HydratorMiss, + /** The hydrator fallbacked to refresh and succeeded */ + HyratorSuccessfullRefresh, + /** The hydrator fallbacked to refresh and failed */ + HyratorUnsuccessfullRefresh, + /** Created a {@code ScrollableResults} instance with lazy results */ + HydratorLazyScrollable, + /** Created a {@code ScrollableResults} instance without lazy results */ + HydratorNonLazyScrollable, + /** Executed uniqueResult instance with lazy results */ + HydratorLazyUnique, + /** Executed uniqueResult instance without lazy results */ + HydratorNonLazyUnique, /** Instrumentation for OutputTableCopier.finished */ OutputTableCopier, @@ -489,6 +512,45 @@ public static enum Counter implements OptionalCounter { + TempTotalFields, + PersistentTotalFields, + TempHydratedRecordsWhenSessionCloses, + PersistentHydratedRecordsWhenSessionCloses, + TempHydratedFieldsWhenSessionCloses, + PersistentHydratedFieldsWhenSessionCloses, + PersistentHydratedFieldsWithLZS, + PersistentHydratedFieldsWithLoader, + TempHydratedFieldsWithLZS, + TempHydratedFieldsWithLoader, + + + /** Lazily hydrated an new record (not rehydrated from cache) */ + HydratorNewRecord, + /** Lazily hydrated a record (including rehydration from cache) */ + HydratorLazyRecord, + /** Fully or partially hydrated a record, but not lazy */ + HydratorNonLazyRecord, + /** The hydrator token matched the result-set token */ + HydratorHit, + /** The hydrator token mismatched the result-set token */ + HydratorMiss, + /** The hydrator fallbacked to refresh and succeeded */ + HyratorSuccessfullRefresh, + /** The hydrator fallbacked to refresh and failed */ + HyratorUnsuccessfullRefresh, + /** Created a {@code ScrollableResults} instance with lazy results */ + HydratorLazyScrollable, + /** Created a {@code ScrollableResults} instance without lazy results */ + HydratorNonLazyScrollable, + /** Executed uniqueResult instance with lazy results */ + HydratorLazyUnique, + /** Executed uniqueResult instance without lazy results */ + HydratorNonLazyUnique, + /** A call-site's field-usage profile locked in the EAGER hydration verdict */ + HydrationVerdictEager, + /** A call-site's field-usage profile locked in the LAZY hydration verdict */ + HydrationVerdictLazy, + /** Incomning network traffic */ NetworkReads, /** Outgoing network traffic */ === modified file 'src/com/goldencode/p2j/persist/Persistence.java' --- old/src/com/goldencode/p2j/persist/Persistence.java 2025-11-06 15:39:50 +0000 +++ new/src/com/goldencode/p2j/persist/Persistence.java 2026-06-10 08:15:57 +0000 @@ -751,6 +751,7 @@ import java.util.function.*; import java.util.logging.*; import com.goldencode.cache.*; +import com.goldencode.p2j.jmx.*; import com.goldencode.p2j.persist.deploy.*; import com.goldencode.p2j.persist.dialect.*; import com.goldencode.p2j.persist.dirty.DirtyShareSupport; @@ -925,7 +926,17 @@ * name. */ private final ConcurrentHashMap tenantData = new ConcurrentHashMap<>(); - + + /** + * Bounded per-database map of runtime field-usage profiles, keyed by FQL. Used by the + * lazy-feedback hydration layer to decide eager vs lazy hydration per call-site. Hosted on the + * per-database {@code Persistence} singleton (not the per-session context) so that all sessions + * against this database share the learned verdicts, while different databases stay isolated. The + * map is capped (see {@code FieldUsageProfile.maxProfiles()}): dynamic queries generate unbounded + * distinct FQL strings, so once the cap is hit new call-sites get no profile and hydrate eagerly. + */ + private final ConcurrentHashMap usageProfiles = new ConcurrentHashMap<>(); + /** * A container class which stores tenant-specific objects. Although the persistence tracks all these * {@code Tenant}, at any given moment, only one of is active in each user context. @@ -1036,7 +1047,42 @@ { return PersistenceFactory.getInstance(name); } - + + /** + * Resolve (creating if necessary) the runtime field-usage profile for the given FQL call-site. + * Used by the lazy-feedback hydration layer to decide eager vs lazy hydration per call-site. + * + * @param fql + * The FQL identifying the call-site. + * + * @return The shared profile for the call-site, or {@code null} when the feature is disabled or + * the per-database profile cap has been reached (in which case the call-site hydrates + * eagerly, the safe default). + */ + public FieldUsageProfile getOrCreateProfile(String fql) + { + if (!FieldUsageProfile.isEnabled() || fql == null) + { + return null; + } + + FieldUsageProfile profile = usageProfiles.get(fql); + if (profile != null) + { + return profile; + } + + // hard create-cap: dynamic queries produce unbounded distinct FQL, so refuse new profiles once + // full rather than evicting (a missing profile simply means EAGER). The size check races with + // concurrent creators, but only ever overshoots the cap by the number of racing threads. + if (usageProfiles.size() >= FieldUsageProfile.maxProfiles()) + { + return null; + } + + return usageProfiles.computeIfAbsent(fql, FieldUsageProfile::new); + } + /** * Initialize various infrastructure components of the persistence framework: *