Add hql execution to Statistics

hibernate-core/src/main/java/org/hibernate/query/internal/QueryOptionsImpl.java

@@ -102,11 +102,6 @@ public class QueryOptionsImpl implements MutableQueryOptions, AppliedGraph {
 		return limit;
 	}
 
-	@Override
-	public boolean hasQueryExecutionToBeAddedToStatistics() {
-		return true;
-	}
-
 	@Override
 	public LockOptions getLockOptions() {
 		return lockOptions;

hibernate-core/src/main/java/org/hibernate/query/spi/QueryOptions.java

@@ -161,15 +161,6 @@ public interface QueryOptions {
 		return explicit != null ? explicit : Limit.NONE;
 	}
 
-	/**
-	 * Determine if the query execution has to be considered by the {@link org.hibernate.stat.Statistics}.
-	 *
-	 * @return true if the query execution has to be added to the {@link org.hibernate.stat.Statistics}, false otherwise.
-	 */
-	default boolean hasQueryExecutionToBeAddedToStatistics() {
-		return false;
-	}
-
 	/**
 	 * Did the application explicitly request paging limits?
 	 *

hibernate-core/src/main/java/org/hibernate/query/sqm/internal/QuerySqmImpl.java

@@ -858,4 +858,10 @@ public class QuerySqmImpl<R>
 				getHints()
 		);
 	}
+
+	@Override
+	public boolean hasQueryExecutionToBeAddedToStatistics() {
+		return !CRITERIA_HQL_STRING.equals( hqlString );
+	}
+
 }

hibernate-core/src/main/java/org/hibernate/sql/exec/internal/JdbcSelectExecutorStandardImpl.java

@@ -184,7 +184,7 @@ public class JdbcSelectExecutorStandardImpl implements JdbcSelectExecutor {
 		final boolean stats;
 		long startTime = 0;
 		final StatisticsImplementor statistics = executionContext.getSession().getFactory().getStatistics();
-		if ( executionContext.getQueryOptions().hasQueryExecutionToBeAddedToStatistics()
+		if ( executionContext.hasQueryExecutionToBeAddedToStatistics()
 				&& jdbcValues instanceof JdbcValuesResultSetImpl ) {
 			stats = statistics.isStatisticsEnabled();
 			if ( stats ) {

hibernate-core/src/main/java/org/hibernate/sql/exec/spi/ExecutionContext.java

@@ -74,4 +74,14 @@ public interface ExecutionContext {
 	default void afterStatement(LogicalConnectionImplementor logicalConnection) {
 		logicalConnection.afterStatement();
 	}
+
+	/**
+	 * Determine if the query execution has to be considered by the {@link org.hibernate.stat.Statistics}.
+	 *
+	 * @return true if the query execution has to be added to the {@link org.hibernate.stat.Statistics}, false otherwise.
+	 */
+	default boolean hasQueryExecutionToBeAddedToStatistics() {
+		return false;
+	}
+
 }