From 347225efb21347ab57f25c88f09b47515ad66f12 Mon Sep 17 00:00:00 2001 From: Rob Bygrave Date: Mon, 26 Feb 2018 13:16:20 +1300 Subject: [PATCH] #1278 - Multi-tenant delete by id ... doesn't return 0 when no rows deleted --- .../server/core/DefaultServer.java | 7 ++- .../ebeaninternal/server/core/Persister.java | 2 +- .../server/persist/DefaultPersister.java | 56 +++++++++++-------- .../partition/MultiTenantPartitionTest.java | 11 +++- 4 files changed, 46 insertions(+), 30 deletions(-) diff --git a/src/main/java/io/ebeaninternal/server/core/DefaultServer.java b/src/main/java/io/ebeaninternal/server/core/DefaultServer.java index 1fce54334..90c78b0dc 100644 --- a/src/main/java/io/ebeaninternal/server/core/DefaultServer.java +++ b/src/main/java/io/ebeaninternal/server/core/DefaultServer.java @@ -1741,7 +1741,6 @@ public final class DefaultServer implements SpiServer, SpiEbeanServer { } private int deleteAll(Class beanType, Collection ids, Transaction transaction, boolean permanent) { - return executeInTrans((txn) -> persister.deleteMany(beanType, ids, txn, permanent), transaction); } @@ -1758,7 +1757,8 @@ public final class DefaultServer implements SpiServer, SpiEbeanServer { */ @Override public boolean delete(Object bean, Transaction t) throws OptimisticLockException { - return persister.delete(checkEntityBean(bean), t, false); + // this should really return an int where -1 means jdbc batch/unknown + return persister.delete(checkEntityBean(bean), t, false) == 1; } @Override @@ -1768,7 +1768,8 @@ public final class DefaultServer implements SpiServer, SpiEbeanServer { @Override public boolean deletePermanent(Object bean, Transaction t) throws OptimisticLockException { - return persister.delete(checkEntityBean(bean), t, true); + // this should really return an int where -1 means jdbc batch/unknown + return persister.delete(checkEntityBean(bean), t, true) == 1; } @Override diff --git a/src/main/java/io/ebeaninternal/server/core/Persister.java b/src/main/java/io/ebeaninternal/server/core/Persister.java index ea6155cb5..f6044d040 100644 --- a/src/main/java/io/ebeaninternal/server/core/Persister.java +++ b/src/main/java/io/ebeaninternal/server/core/Persister.java @@ -46,7 +46,7 @@ public interface Persister { /** * Delete the bean. */ - boolean delete(EntityBean entityBean, Transaction t, boolean permanent); + int delete(EntityBean entityBean, Transaction t, boolean permanent); /** * Delete multiple beans given a collection of Id values. diff --git a/src/main/java/io/ebeaninternal/server/persist/DefaultPersister.java b/src/main/java/io/ebeaninternal/server/persist/DefaultPersister.java index cbf9aba38..7343a8ac5 100644 --- a/src/main/java/io/ebeaninternal/server/persist/DefaultPersister.java +++ b/src/main/java/io/ebeaninternal/server/persist/DefaultPersister.java @@ -335,10 +335,9 @@ public final class DefaultPersister implements Persister { /** * Recursively delete the bean. This calls back to the EbeanServer. */ - private void deleteRecurse(EntityBean detailBean, Transaction t, boolean softDelete) { - + private int deleteRecurse(EntityBean detailBean, Transaction t, boolean softDelete) { Type deleteType = softDelete ? Type.SOFT_DELETE : Type.DELETE_PERMANENT; - deleteRequest(createRequest(detailBean, t, deleteType)); + return deleteRequest(createRequest(detailBean, t, deleteType)); } /** @@ -505,7 +504,7 @@ public final class DefaultPersister implements Persister { * Return false if the delete is executed without OCC and 0 rows were deleted. */ @Override - public boolean delete(EntityBean bean, Transaction t, boolean permanent) { + public int delete(EntityBean bean, Transaction t, boolean permanent) { Type deleteType = permanent ? Type.DELETE_PERMANENT : Type.DELETE; PersistRequestBean originalRequest = createRequest(bean, t, deleteType); @@ -524,7 +523,7 @@ public final class DefaultPersister implements Persister { /** * Execute the delete request returning true if a delete occurred. */ - private boolean deleteRequest(PersistRequestBean req) { + private int deleteRequest(PersistRequestBean req) { return deleteRequest(req, null); } @@ -532,7 +531,7 @@ public final class DefaultPersister implements Persister { * Execute the delete request support a second delete request for live and draft permanent delete. * A common transaction is used across both requests. */ - private boolean deleteRequest(PersistRequestBean req, PersistRequestBean draftReq) { + private int deleteRequest(PersistRequestBean req, PersistRequestBean draftReq) { if (req.isRegisteredForDeleteBean()) { // skip deleting bean. Used where cascade is on @@ -540,21 +539,21 @@ public final class DefaultPersister implements Persister { if (logger.isDebugEnabled()) { logger.debug("skipping delete on alreadyRegistered " + req.getBean()); } - return false; + return 0; } try { req.initTransIfRequiredWithBatchCascade(); - boolean deleted = delete(req); + int rows = delete(req); if (draftReq != null) { // delete the 'draft' bean ('live' bean deleted first) draftReq.setTrans(req.getTransaction()); - deleted = delete(draftReq); + rows = delete(draftReq); } req.commitTransIfRequired(); req.flushBatchOnCascade(); - return deleted; + return rows; } catch (RuntimeException ex) { req.rollbackTransIfRequired(); @@ -581,13 +580,7 @@ public final class DefaultPersister implements Persister { BeanDescriptor descriptor = beanDescriptorManager.getBeanDescriptor(beanType); boolean softDelete = !permanent && descriptor.isSoftDelete(); if (descriptor.isMultiTenant()) { - // convert to a delete by bean - for (Object id : ids) { - EntityBean bean = descriptor.createEntityBean(); - descriptor.convertSetId(id, bean); - deleteRecurse(bean, transaction, permanent); - } - return ids.size(); + return deleteAsBeans(ids, transaction, permanent, descriptor); } ArrayList idList = new ArrayList<>(ids.size()); @@ -599,6 +592,25 @@ public final class DefaultPersister implements Persister { return delete(descriptor, null, idList, transaction, softDelete); } + /** + * Convert delete by Ids into delete many beans. + */ + private int deleteAsBeans(Collection ids, Transaction transaction, boolean permanent, BeanDescriptor descriptor) { + // convert to a delete by bean + int total = 0; + for (Object id : ids) { + EntityBean bean = descriptor.createEntityBean(); + descriptor.convertSetId(id, bean); + int rowCount = deleteRecurse(bean, transaction, permanent); + if (rowCount == -1) { + total = -1; + } else if (total != -1){ + total += rowCount; + } + } + return total; + } + /** * Delete by Id. */ @@ -609,8 +621,7 @@ public final class DefaultPersister implements Persister { // convert to a delete by bean EntityBean bean = descriptor.createEntityBean(); descriptor.convertSetId(id, bean); - delete(bean, transaction, permanent); - return 1; + return delete(bean, transaction, permanent); } id = descriptor.convertId(id); @@ -649,8 +660,7 @@ public final class DefaultPersister implements Persister { if (bean == null) { return 0; } else { - deleteRecurse(bean, t, softDelete); - return 1; + return deleteRecurse(bean, t, softDelete); } } } @@ -782,7 +792,7 @@ public final class DefaultPersister implements Persister { * Note that preDelete fires before the deletion of children. *

*/ - private boolean delete(PersistRequestBean request) { + private int delete(PersistRequestBean request) { DeleteUnloadedForeignKeys unloadedForeignKeys = null; @@ -812,7 +822,7 @@ public final class DefaultPersister implements Persister { } // return true if using JDBC batch (as we can't tell until the batch is flushed) - return count != 0; + return count; } /** diff --git a/src/test/java/org/multitenant/partition/MultiTenantPartitionTest.java b/src/test/java/org/multitenant/partition/MultiTenantPartitionTest.java index 2625266ef..9104c0179 100644 --- a/src/test/java/org/multitenant/partition/MultiTenantPartitionTest.java +++ b/src/test/java/org/multitenant/partition/MultiTenantPartitionTest.java @@ -66,10 +66,14 @@ public class MultiTenantPartitionTest { server.save(content); LoggedSqlCollector.start(); - server.delete(MtContent.class, content.getId()); + int rows = server.delete(MtContent.class, content.getId()); List sql = LoggedSqlCollector.stop(); assertThat(sql.get(0)).contains("delete from mt_content where id=? and tenant_id=?"); + assertThat(rows).isEqualTo(1); + + rows = server.delete(MtContent.class, 99999); + assertThat(rows).isEqualTo(0); } @Test @@ -81,10 +85,11 @@ public class MultiTenantPartitionTest { MtContent b = newContent("title b"); - List ids = Arrays.asList(a.getId(), b.getId()); + List ids = Arrays.asList(a.getId(), b.getId(), 99998L); LoggedSqlCollector.start(); - server.deleteAll(MtContent.class, ids); + int rows = server.deleteAll(MtContent.class, ids); + assertThat(rows).isEqualTo(2); List sql = LoggedSqlCollector.stop(); assertThat(sql.get(0)).contains("delete from mt_content where id=? and tenant_id=?");