HHH-13547 - remove logging of BatchImpl rethrown exceptions

Signed-off-by: Jan Schatteman <[email protected]>

Author: jrenaat

hibernate-core/src/main/java/org/hibernate/engine/jdbc/batch/JdbcBatchLogging.java

@@ -15,8 +15,8 @@
 
 import java.lang.invoke.MethodHandles;
 
-import static org.jboss.logging.Logger.Level.ERROR;
 import static org.jboss.logging.Logger.Level.INFO;
+import static org.jboss.logging.Logger.Level.WARN;
 
 /**
  * Sub-system logging related to JDBC batch execution
@@ -35,11 +35,7 @@ public interface JdbcBatchLogging extends BasicLogger {
 	Logger BATCH_LOGGER = Logger.getLogger( NAME );
 	JdbcBatchLogging BATCH_MESSAGE_LOGGER = Logger.getMessageLogger( MethodHandles.lookup(), JdbcBatchLogging.class, NAME );
 
-	@LogMessage(level = ERROR)
-	@Message(id = 100501, value = "Exception executing batch [%s], SQL: %s")
-	void unableToExecuteBatch(Exception e, String sql );
-
-	@LogMessage(level = ERROR)
+	@LogMessage(level = WARN)
 	@Message(id = 100502, value = "Unable to release batch statement...")
 	void unableToReleaseBatchStatement();
 

hibernate-core/src/main/java/org/hibernate/engine/jdbc/batch/internal/BatchImpl.java

@@ -23,6 +23,7 @@
 import org.hibernate.engine.jdbc.spi.SqlStatementLogger;
 import org.hibernate.event.spi.EventManager;
 import org.hibernate.event.spi.HibernateMonitoringEvent;
+import org.hibernate.jdbc.BatchFailedException;
 import org.hibernate.resource.jdbc.spi.JdbcEventHandler;
 import org.hibernate.resource.jdbc.spi.JdbcSessionOwner;
 
@@ -302,13 +303,11 @@ protected void performExecution() {
 				}
 				catch (SQLException e) {
 					abortBatch( e );
-					BATCH_MESSAGE_LOGGER.unableToExecuteBatch( e, sql );
 					throw sqlExceptionHelper.convert( e, "could not execute batch", sql );
 				}
 				catch (RuntimeException re) {
 					abortBatch( re );
-					BATCH_MESSAGE_LOGGER.unableToExecuteBatch( re, sql );
-					throw re;
+					throw new BatchFailedException( "An exception occurred while executing: " + sql, re);
 				}
 			} );
 		}

hibernate-core/src/main/java/org/hibernate/internal/CoreMessageLogger.java

@@ -483,7 +483,7 @@ void synchronizationFailed(
 	void unableToDeserializeCache(String path, SerializationException error);
 
 	/**
-	 * @deprecated Use {@link org.hibernate.engine.jdbc.batch.JdbcBatchLogging#unableToExecuteBatch} instead
+	 * @deprecated
 	 */
 	@LogMessage(level = ERROR)
 	@Message(value = "Exception executing batch [%s], SQL: %s", id = 315)