From 37d001f7543f917719a662b02fbbd957f8ab2544 Mon Sep 17 00:00:00 2001 From: Rob Bygrave Date: Thu, 26 Oct 2017 00:03:58 +1300 Subject: [PATCH] #1185 - Modify JDBC batch so it does not "auto flush" on non-Id non-generated property --- .../io/ebean/bean/EntityBeanIntercept.java | 8 ++-- .../java/io/ebean/bean/PreGetterCallback.java | 6 ++- .../server/core/PersistRequestBean.java | 6 ++- .../server/deploy/BeanDescriptor.java | 7 +++ .../server/deploy/BeanProperty.java | 7 +++ .../server/persist/BatchControl.java | 15 ++++-- .../server/persist/BatchedBeanHolder.java | 2 +- .../basic/xtra/TestInsertBatchThenUpdate.java | 48 +++++++++++++++++++ 8 files changed, 86 insertions(+), 13 deletions(-) diff --git a/src/main/java/io/ebean/bean/EntityBeanIntercept.java b/src/main/java/io/ebean/bean/EntityBeanIntercept.java index 1789519a9..854d780a1 100644 --- a/src/main/java/io/ebean/bean/EntityBeanIntercept.java +++ b/src/main/java/io/ebean/bean/EntityBeanIntercept.java @@ -891,9 +891,9 @@ public final class EntityBeanIntercept implements Serializable { loadedProps[propertyIndex] = true; } - private void preGetterCallback() { + private void preGetterCallback(int propertyIndex) { if (preGetterCallback != null) { - preGetterCallback.preGetterTrigger(); + preGetterCallback.preGetterTrigger(propertyIndex); } } @@ -901,14 +901,14 @@ public final class EntityBeanIntercept implements Serializable { * Called prior to Id property getter. */ public void preGetId() { - preGetterCallback(); + preGetterCallback(-1); } /** * Method that is called prior to a getter method on the actual entity. */ public void preGetter(int propertyIndex) { - preGetterCallback(); + preGetterCallback(propertyIndex); if (state == STATE_NEW || disableLazyLoad) { return; } diff --git a/src/main/java/io/ebean/bean/PreGetterCallback.java b/src/main/java/io/ebean/bean/PreGetterCallback.java index 8bcbb6ce1..e840024ad 100644 --- a/src/main/java/io/ebean/bean/PreGetterCallback.java +++ b/src/main/java/io/ebean/bean/PreGetterCallback.java @@ -7,7 +7,9 @@ package io.ebean.bean; public interface PreGetterCallback { /** - * Trigger the callback. + * Trigger the callback based on a getter on a property. + * + * @param propertyIndex The index of the property */ - void preGetterTrigger(); + void preGetterTrigger(int propertyIndex); } diff --git a/src/main/java/io/ebeaninternal/server/core/PersistRequestBean.java b/src/main/java/io/ebeaninternal/server/core/PersistRequestBean.java index bc7cc848e..2eb53569b 100644 --- a/src/main/java/io/ebeaninternal/server/core/PersistRequestBean.java +++ b/src/main/java/io/ebeaninternal/server/core/PersistRequestBean.java @@ -325,8 +325,10 @@ public final class PersistRequestBean extends PersistRequest implements BeanP } @Override - public void preGetterTrigger() { - transaction.flushBatch(); + public void preGetterTrigger(int propertyIndex) { + if (propertyIndex < 0 || beanDescriptor.isGeneratedProperty(propertyIndex)) { + transaction.flushBatch(); + } } public void setSkipBatchForTopLevel() { diff --git a/src/main/java/io/ebeaninternal/server/deploy/BeanDescriptor.java b/src/main/java/io/ebeaninternal/server/deploy/BeanDescriptor.java index 1bd8f7392..11c559c50 100644 --- a/src/main/java/io/ebeaninternal/server/deploy/BeanDescriptor.java +++ b/src/main/java/io/ebeaninternal/server/deploy/BeanDescriptor.java @@ -2130,6 +2130,13 @@ public class BeanDescriptor implements MetaBeanInfo, BeanType { return lazyLoadMany(ebi, lazyLoadProperty); } + /** + * Return true if this is a generated property. + */ + public boolean isGeneratedProperty(int propertyIndex) { + return propertiesIndex[propertyIndex].isGenerated(); + } + /** * Check for lazy loading of many property. */ diff --git a/src/main/java/io/ebeaninternal/server/deploy/BeanProperty.java b/src/main/java/io/ebeaninternal/server/deploy/BeanProperty.java index b035eedec..fd78177a7 100644 --- a/src/main/java/io/ebeaninternal/server/deploy/BeanProperty.java +++ b/src/main/java/io/ebeaninternal/server/deploy/BeanProperty.java @@ -1093,6 +1093,13 @@ public class BeanProperty implements ElPropertyValue, Property { return generatedProperty instanceof GeneratedWhenModified; } + /** + * Return true if this is a generated or Id property. + */ + public boolean isGenerated() { + return id || generatedProperty != null; + } + /** * Return true if the DB column should be unique. */ diff --git a/src/main/java/io/ebeaninternal/server/persist/BatchControl.java b/src/main/java/io/ebeaninternal/server/persist/BatchControl.java index 03649a93b..4c533a0b0 100644 --- a/src/main/java/io/ebeaninternal/server/persist/BatchControl.java +++ b/src/main/java/io/ebeaninternal/server/persist/BatchControl.java @@ -62,6 +62,11 @@ public final class BatchControl { private int maxDepth; + /** + * Size of the largest buffer. + */ + private int bufferMax; + /** * Create for a given transaction, PersistExecute, default size and getGeneratedKeys. */ @@ -174,8 +179,9 @@ public final class BatchControl { BatchedBeanHolder beanHolder = getBeanHolder(request); int bufferSize = beanHolder.append(request); - // return true if top level has hit batch size - return bufferSize == batchSize && beanHolder.getOrder() == 100; + bufferMax = Math.max(bufferMax, bufferSize); + // flush if any buffer hits 10 times batch size + return (bufferMax >= batchSize * 10); } /** @@ -195,14 +201,14 @@ public final class BatchControl { /** * Flush any batched PreparedStatements. */ - protected void flushPstmtHolder() throws BatchedSqlException { + private void flushPstmtHolder() throws BatchedSqlException { pstmtHolder.flush(getGeneratedKeys); } /** * Execute all the requests contained in the list. */ - protected void executeNow(ArrayList list) throws BatchedSqlException { + void executeNow(ArrayList list) throws BatchedSqlException { for (int i = 0; i < list.size(); i++) { if (i % batchSize == 0) { // hit the batch size so flush @@ -242,6 +248,7 @@ public final class BatchControl { private void flush(boolean resetTop) throws BatchedSqlException { try { + bufferMax = 0; if (!pstmtHolder.isEmpty()) { // Flush existing pstmts (updateSql or callableSql) flushPstmtHolder(); diff --git a/src/main/java/io/ebeaninternal/server/persist/BatchedBeanHolder.java b/src/main/java/io/ebeaninternal/server/persist/BatchedBeanHolder.java index 4e1528b73..e93e1e492 100644 --- a/src/main/java/io/ebeaninternal/server/persist/BatchedBeanHolder.java +++ b/src/main/java/io/ebeaninternal/server/persist/BatchedBeanHolder.java @@ -79,7 +79,7 @@ public class BatchedBeanHolder { * and then execute them. *

*/ - public void executeNow() throws BatchedSqlException { + void executeNow() throws BatchedSqlException { // process the requests. Creates one or more PreparedStatements // with binding addBatch() for each request. // Note updates and deletes can result in many PreparedStatements diff --git a/src/test/java/org/tests/model/basic/xtra/TestInsertBatchThenUpdate.java b/src/test/java/org/tests/model/basic/xtra/TestInsertBatchThenUpdate.java index 8476b2499..08d86c0de 100644 --- a/src/test/java/org/tests/model/basic/xtra/TestInsertBatchThenUpdate.java +++ b/src/test/java/org/tests/model/basic/xtra/TestInsertBatchThenUpdate.java @@ -37,6 +37,10 @@ public class TestInsertBatchThenUpdate extends BaseTestCase { Ebean.save(parent); + // get Id or any generated property and that invokes a flush + parent.getId(); + + // going to get an update now parent.setName("MyDesk"); Ebean.save(parent); @@ -55,4 +59,48 @@ public class TestInsertBatchThenUpdate extends BaseTestCase { } + @Test + public void test_noFlushOn_getterOfNonGeneratedProperty() { + + LoggedSqlCollector.start(); + Transaction txn = Ebean.beginTransaction(); + try { + txn.setBatch(PersistBatch.ALL); + + LoggedSqlCollector.start(); + + EdParent parent = new EdParent(); + parent.setName("MyComputer"); + + EdChild child = new EdChild(); + child.setName("Harddisk 123"); + child.setParent(parent); + ArrayList children = new ArrayList<>(); + children.add(child); + parent.setChildren(children); + + Ebean.save(parent); + + // no getter call on a generated property + // so no flush here + String existing = parent.getName(); + + parent.setName(existing+" - additional"); + // the first and second save of parent merge into a single insert + Ebean.save(parent); + + // flush + Ebean.commitTransaction(); + + // insert statements for EdExtendedParent + List loggedSql = LoggedSqlCollector.stop(); + assertEquals(2, loggedSql.size()); + assertThat(loggedSql.get(0)).contains("insert into td_parent"); + assertThat(loggedSql.get(1)).contains("insert into td_child "); + + } finally { + Ebean.endTransaction(); + } + } + }