#220 - Refactor Persist batch, add effectively add PersistBatch.INSERT (to ALL and NONE) and allow batching per request (save(), insert(), update(), delete())

2024-04-21 10:51:47 +00:00 · 2014-12-10 03:29:44 +13:00
parent bb6571f426
commit 6bb38f2674
31 changed files with 1731 additions and 973 deletions
@@ -21,121 +21,109 @@ import org.slf4j.LoggerFactory;
 */
 public class ExeOrmUpdate {

-	private static final Logger logger = LoggerFactory.getLogger(ExeOrmUpdate.class);
-	
-    private final Binder binder;
-    
-    private final PstmtFactory pstmtFactory;
-    
-    /**
-     * Create with a given binder.
-     */
-    public ExeOrmUpdate(Binder binder, PstmtBatch pstmtBatch) {
-    	this.pstmtFactory = new PstmtFactory(pstmtBatch);
-    	this.binder = binder;
-    }
-    
-    /**
-     * Execute the orm update request.
-     */
-    public int execute(PersistRequestOrmUpdate request) {
+  private static final Logger logger = LoggerFactory.getLogger(ExeOrmUpdate.class);

-        SpiTransaction t = request.getTransaction();
-        
-        boolean batchThisRequest = t.isBatchThisRequest();
-        
-        PreparedStatement pstmt = null;
+  private final Binder binder;
+
+  private final PstmtFactory pstmtFactory;
+
+  /**
+   * Create with a given binder.
+   */
+  public ExeOrmUpdate(Binder binder, PstmtBatch pstmtBatch) {
+    this.pstmtFactory = new PstmtFactory(pstmtBatch);
+    this.binder = binder;
+  }
+
+  /**
+   * Execute the orm update request.
+   */
+  public int execute(PersistRequestOrmUpdate request) {
+
+    boolean batchThisRequest = request.isBatchThisRequest();
+
+    PreparedStatement pstmt = null;
+    try {
+      pstmt = bindStmt(request, batchThisRequest);
+      if (batchThisRequest) {
+        PstmtBatch pstmtBatch = request.getPstmtBatch();
+        if (pstmtBatch != null) {
+          pstmtBatch.addBatch(pstmt);
+        } else {
+          pstmt.addBatch();
+        }
+        // return -1 to indicate batch mode
+        return -1;
+      } else {
+        SpiUpdate<?> ormUpdate = request.getOrmUpdate();
+        if (ormUpdate.getTimeout() > 0) {
+          pstmt.setQueryTimeout(ormUpdate.getTimeout());
+        }
+        int rowCount = pstmt.executeUpdate();
+        request.checkRowCount(rowCount);
+        request.postExecute();
+        return rowCount;
+      }
+
+    } catch (SQLException ex) {
+      throw new PersistenceException("Error executing: " + request.getOrmUpdate().getGeneratedSql(), ex);
+
+    } finally {
+      if (!batchThisRequest && pstmt != null) {
        try {
-            
-        	pstmt = bindStmt(request, batchThisRequest);
-        	
-            if (batchThisRequest){
-                PstmtBatch pstmtBatch = request.getPstmtBatch();
-                if (pstmtBatch != null){
-                	pstmtBatch.addBatch(pstmt);
-                } else {
-                	pstmt.addBatch();
-                }
-                // return -1 to indicate batch mode
-                return -1;
-                
-            } else {
-            	SpiUpdate<?> ormUpdate = request.getOrmUpdate();
-            	if (ormUpdate.getTimeout() > 0){
-            		pstmt.setQueryTimeout(ormUpdate.getTimeout());
-            	}
-            	
-            	int rowCount = pstmt.executeUpdate();
-                request.checkRowCount(rowCount);
-                request.postExecute();
-                return rowCount;
-               
-            }
-
-        } catch (SQLException ex) {
-        	SpiUpdate<?> ormUpdate = request.getOrmUpdate();
-        	String msg = "Error executing: "+ormUpdate.getGeneratedSql();
-            throw new PersistenceException(msg, ex);
-
-        } finally {
-            if (!batchThisRequest && pstmt != null) {
-                try {
-                	pstmt.close();
-                } catch (SQLException e) {
-                	logger.error(null, e);
-                }
-            }
+          pstmt.close();
+        } catch (SQLException e) {
+          logger.error(null, e);
        }
+      }
    }
-	
-    /**
-     * Convert bean and property names to db table and columns.
-     */
-    private String translate(PersistRequestOrmUpdate request, String sql) {
-    	
-    	BeanDescriptor<?> descriptor = request.getBeanDescriptor();
-    	return descriptor.convertOrmUpdateToSql(sql);
-    }
-	
-    private PreparedStatement bindStmt(PersistRequestOrmUpdate request, boolean batchThisRequest) throws SQLException {
-        
-    	SpiUpdate<?> ormUpdate = request.getOrmUpdate();
-    	SpiTransaction t = request.getTransaction();
-    	
-    	String sql = ormUpdate.getUpdateStatement();
-    	
-    	// convert bean and property names to table and 
-    	// column names if required
-    	sql = translate(request, sql);
-    	
-    	BindParams bindParams = ormUpdate.getBindParams();
-        
-    	// process named parameters if required
-    	sql = BindParamsParser.parse(bindParams, sql);
-        
-    	ormUpdate.setGeneratedSql(sql);
-    	
-    	boolean logSql = request.isLogSql();
-    	
-    	PreparedStatement pstmt;
-    	if (batchThisRequest){
-    		pstmt = pstmtFactory.getPstmt(t, logSql, sql, request);
-    		
-    	} else {
-    	    if (logSql){
-    	        t.logSql(sql);
-    	    }
-    		pstmt = pstmtFactory.getPstmt(t, sql);
-    	}
-        
-        String bindLog = null;
-        if (!bindParams.isEmpty()){	       
-        	bindLog = binder.bind(bindParams, new DataBind(pstmt));
-        }
-        
-        request.setBindLog(bindLog);
-        
-        return pstmt;
+  }
+
+  /**
+   * Convert bean and property names to db table and columns.
+   */
+  private String translate(PersistRequestOrmUpdate request, String sql) {
+
+    BeanDescriptor<?> descriptor = request.getBeanDescriptor();
+    return descriptor.convertOrmUpdateToSql(sql);
+  }
+
+  private PreparedStatement bindStmt(PersistRequestOrmUpdate request, boolean batchThisRequest) throws SQLException {
+
+    SpiUpdate<?> ormUpdate = request.getOrmUpdate();
+    SpiTransaction t = request.getTransaction();
+
+    String sql = ormUpdate.getUpdateStatement();
+
+    // convert bean and property names to table and
+    // column names if required
+    sql = translate(request, sql);
+
+    BindParams bindParams = ormUpdate.getBindParams();
+
+    // process named parameters if required
+    sql = BindParamsParser.parse(bindParams, sql);
+
+    ormUpdate.setGeneratedSql(sql);
+
+    boolean logSql = request.isLogSql();
+
+    PreparedStatement pstmt;
+    if (batchThisRequest) {
+      pstmt = pstmtFactory.getPstmt(t, logSql, sql, request);
+    } else {
+      if (logSql) {
+        t.logSql(sql);
+      }
+      pstmt = pstmtFactory.getPstmt(t, sql);
    }

+    String bindLog = null;
+    if (!bindParams.isEmpty()) {
+      bindLog = binder.bind(bindParams, new DataBind(pstmt));
+    }
+
+    request.setBindLog(bindLog);
+    return pstmt;
+  }
 }