diff --git a/src/org/redkale/source/DataJdbcSource.java b/src/org/redkale/source/DataJdbcSource.java index 699fc3a14..73edcb297 100644 --- a/src/org/redkale/source/DataJdbcSource.java +++ b/src/org/redkale/source/DataJdbcSource.java @@ -219,7 +219,7 @@ public class DataJdbcSource extends DataSqlSource { } @Override - protected CompletableFuture clearDB(EntityInfo info, String sql) { + protected CompletableFuture clearTableDB(EntityInfo info, String sql) { Connection conn = null; try { conn = writePool.poll(); @@ -239,7 +239,7 @@ public class DataJdbcSource extends DataSqlSource { } @Override - protected CompletableFuture dropDB(EntityInfo info, String sql) { + protected CompletableFuture dropTableDB(EntityInfo info, String sql) { Connection conn = null; try { conn = writePool.poll(); diff --git a/src/org/redkale/source/DataMemorySource.java b/src/org/redkale/source/DataMemorySource.java index da6da9dfa..66d1ee729 100644 --- a/src/org/redkale/source/DataMemorySource.java +++ b/src/org/redkale/source/DataMemorySource.java @@ -94,12 +94,12 @@ public class DataMemorySource extends DataSqlSource { } @Override - protected CompletableFuture clearDB(EntityInfo info, String sql) { + protected CompletableFuture clearTableDB(EntityInfo info, String sql) { return CompletableFuture.completedFuture(0); } @Override - protected CompletableFuture dropDB(EntityInfo info, String sql) { + protected CompletableFuture dropTableDB(EntityInfo info, String sql) { return CompletableFuture.completedFuture(0); } diff --git a/src/org/redkale/source/DataSource.java b/src/org/redkale/source/DataSource.java index 7a98aead6..d4b7dbe10 100644 --- a/src/org/redkale/source/DataSource.java +++ b/src/org/redkale/source/DataSource.java @@ -161,7 +161,7 @@ public interface DataSource { * * @return 影响的记录条数 */ - public int clear(final Class clazz); + public int clearTable(final Class clazz); /** * 清空表
@@ -172,7 +172,7 @@ public interface DataSource { * * @return 影响的记录条数CompletableFuture */ - public CompletableFuture clearAsync(final Class clazz); + public CompletableFuture clearTableAsync(final Class clazz); /** * 清空表
@@ -184,7 +184,7 @@ public interface DataSource { * * @return 影响的记录条数 */ - public int clear(final Class clazz, final FilterNode node); + public int clearTable(final Class clazz, final FilterNode node); /** * 清空表
@@ -196,7 +196,7 @@ public interface DataSource { * * @return 影响的记录条数CompletableFuture */ - public CompletableFuture clearAsync(final Class clazz, final FilterNode node); + public CompletableFuture clearTableAsync(final Class clazz, final FilterNode node); //------------------------dropAsync--------------------------- /** @@ -208,7 +208,7 @@ public interface DataSource { * * @return 影响的记录条数 */ - public int drop(final Class clazz); + public int dropTable(final Class clazz); /** * 删除表
@@ -219,7 +219,7 @@ public interface DataSource { * * @return 影响的记录条数CompletableFuture */ - public CompletableFuture dropAsync(final Class clazz); + public CompletableFuture dropTableAsync(final Class clazz); /** * 删除表
@@ -231,7 +231,7 @@ public interface DataSource { * * @return 影响的记录条数 */ - public int drop(final Class clazz, final FilterNode node); + public int dropTable(final Class clazz, final FilterNode node); /** * 删除表
@@ -243,7 +243,7 @@ public interface DataSource { * * @return 影响的记录条数CompletableFuture */ - public CompletableFuture dropAsync(final Class clazz, final FilterNode node); + public CompletableFuture dropTableAsync(final Class clazz, final FilterNode node); //------------------------updateAsync--------------------------- /** diff --git a/src/org/redkale/source/DataSqlSource.java b/src/org/redkale/source/DataSqlSource.java index c397ecabe..2507d0f80 100644 --- a/src/org/redkale/source/DataSqlSource.java +++ b/src/org/redkale/source/DataSqlSource.java @@ -134,10 +134,10 @@ public abstract class DataSqlSource extends AbstractService implement protected abstract CompletableFuture deleteDB(final EntityInfo info, Flipper flipper, final String sql); //清空表 - protected abstract CompletableFuture clearDB(final EntityInfo info, final String sql); + protected abstract CompletableFuture clearTableDB(final EntityInfo info, final String sql); //删除表 - protected abstract CompletableFuture dropDB(final EntityInfo info, final String sql); + protected abstract CompletableFuture dropTableDB(final EntityInfo info, final String sql); //更新纪录 protected abstract CompletableFuture updateDB(final EntityInfo info, T... values); @@ -516,117 +516,117 @@ public abstract class DataSqlSource extends AbstractService implement return deleteDB(info, flipper, sql); } - //----------------------------- clearCompose ----------------------------- + //----------------------------- clearTableCompose ----------------------------- @Override - public int clear(Class clazz) { - return clear(clazz, (FilterNode) null); + public int clearTable(Class clazz) { + return clearTable(clazz, (FilterNode) null); } @Override - public int clear(Class clazz, FilterNode node) { + public int clearTable(Class clazz, FilterNode node) { final EntityInfo info = loadEntityInfo(clazz); - if (isOnlyCache(info)) return clearCache(info, node); - return DataSqlSource.this.clearCompose(info, node).whenComplete((rs, t) -> { + if (isOnlyCache(info)) return clearTableCache(info, node); + return DataSqlSource.this.clearTableCompose(info, node).whenComplete((rs, t) -> { if (t != null) { futureCompleteConsumer.accept(rs, t); } else { - clearCache(info, node); + clearTableCache(info, node); } }).join(); } @Override - public CompletableFuture clearAsync(final Class clazz) { - return clearAsync(clazz, (FilterNode) null); + public CompletableFuture clearTableAsync(final Class clazz) { + return clearTableAsync(clazz, (FilterNode) null); } @Override - public CompletableFuture clearAsync(final Class clazz, FilterNode node) { + public CompletableFuture clearTableAsync(final Class clazz, FilterNode node) { final EntityInfo info = loadEntityInfo(clazz); if (isOnlyCache(info)) { - return CompletableFuture.supplyAsync(() -> clearCache(info, node), getExecutor()); + return CompletableFuture.supplyAsync(() -> clearTableCache(info, node), getExecutor()); } - if (isAsync()) return DataSqlSource.this.clearCompose(info, node).whenComplete((rs, t) -> { + if (isAsync()) return DataSqlSource.this.clearTableCompose(info, node).whenComplete((rs, t) -> { if (t != null) { futureCompleteConsumer.accept(rs, t); } else { - clearCache(info, node); + clearTableCache(info, node); } }); - return CompletableFuture.supplyAsync(() -> DataSqlSource.this.clearCompose(info, node).join(), getExecutor()).whenComplete((rs, t) -> { + return CompletableFuture.supplyAsync(() -> DataSqlSource.this.clearTableCompose(info, node).join(), getExecutor()).whenComplete((rs, t) -> { if (t != null) { futureCompleteConsumer.accept(rs, t); } else { - clearCache(info, node); + clearTableCache(info, node); } }); } - protected CompletableFuture clearCompose(final EntityInfo info, final FilterNode node) { + protected CompletableFuture clearTableCompose(final EntityInfo info, final FilterNode node) { String sql = "TRUNCATE TABLE " + info.getTable(node); - if (info.isLoggable(logger, Level.FINEST, sql)) logger.finest(info.getType().getSimpleName() + " clear sql=" + sql); - return clearDB(info, sql); + if (info.isLoggable(logger, Level.FINEST, sql)) logger.finest(info.getType().getSimpleName() + " clearTable sql=" + sql); + return clearTableDB(info, sql); } - //----------------------------- dropCompose ----------------------------- + //----------------------------- dropTableCompose ----------------------------- @Override - public int drop(Class clazz) { - return drop(clazz, (FilterNode) null); + public int dropTable(Class clazz) { + return dropTable(clazz, (FilterNode) null); } @Override - public int drop(Class clazz, FilterNode node) { + public int dropTable(Class clazz, FilterNode node) { final EntityInfo info = loadEntityInfo(clazz); - if (isOnlyCache(info)) return dropCache(info, node); - return DataSqlSource.this.dropCompose(info, node).whenComplete((rs, t) -> { + if (isOnlyCache(info)) return dropTableCache(info, node); + return DataSqlSource.this.dropTableCompose(info, node).whenComplete((rs, t) -> { if (t != null) { futureCompleteConsumer.accept(rs, t); } else { - dropCache(info, node); + dropTableCache(info, node); } }).join(); } @Override - public CompletableFuture dropAsync(final Class clazz) { - return dropAsync(clazz, (FilterNode) null); + public CompletableFuture dropTableAsync(final Class clazz) { + return dropTableAsync(clazz, (FilterNode) null); } @Override - public CompletableFuture dropAsync(final Class clazz, FilterNode node) { + public CompletableFuture dropTableAsync(final Class clazz, FilterNode node) { final EntityInfo info = loadEntityInfo(clazz); if (isOnlyCache(info)) { - return CompletableFuture.supplyAsync(() -> dropCache(info, node), getExecutor()); + return CompletableFuture.supplyAsync(() -> dropTableCache(info, node), getExecutor()); } - if (isAsync()) return DataSqlSource.this.dropCompose(info, node).whenComplete((rs, t) -> { + if (isAsync()) return DataSqlSource.this.dropTableCompose(info, node).whenComplete((rs, t) -> { if (t != null) { futureCompleteConsumer.accept(rs, t); } else { - dropCache(info, node); + dropTableCache(info, node); } }); - return CompletableFuture.supplyAsync(() -> DataSqlSource.this.dropCompose(info, node).join(), getExecutor()).whenComplete((rs, t) -> { + return CompletableFuture.supplyAsync(() -> DataSqlSource.this.dropTableCompose(info, node).join(), getExecutor()).whenComplete((rs, t) -> { if (t != null) { futureCompleteConsumer.accept(rs, t); } else { - dropCache(info, node); + dropTableCache(info, node); } }); } - protected CompletableFuture dropCompose(final EntityInfo info, final FilterNode node) { + protected CompletableFuture dropTableCompose(final EntityInfo info, final FilterNode node) { String sql = "DROP TABLE " + info.getTable(node); - if (info.isLoggable(logger, Level.FINEST, sql)) logger.finest(info.getType().getSimpleName() + " drop sql=" + sql); - return dropDB(info, sql); + if (info.isLoggable(logger, Level.FINEST, sql)) logger.finest(info.getType().getSimpleName() + " dropTable sql=" + sql); + return dropTableDB(info, sql); } - protected int clearCache(final EntityInfo info, FilterNode node) { + protected int clearTableCache(final EntityInfo info, FilterNode node) { final EntityCache cache = info.getCache(); if (cache == null) return -1; return cache.clear(); } - protected int dropCache(final EntityInfo info, FilterNode node) { + protected int dropTableCache(final EntityInfo info, FilterNode node) { final EntityCache cache = info.getCache(); if (cache == null) return -1; return cache.drop();