lxy/redkale
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Browse Source
This commit is contained in:
Redkale
2019-01-07 21:38:44 +08:00
parent 9b94604166
commit dbc6f8a196
4 changed files with 52 additions and 52 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/org/redkale/source/DataJdbcSource.java
View File

@@ -219,7 +219,7 @@ public class DataJdbcSource extends DataSqlSource<Connection> {
} }
@Override @Override
protected <T> CompletableFuture<Integer> clearDB(EntityInfo<T> info, String sql) { protected <T> CompletableFuture<Integer> clearTableDB(EntityInfo<T> info, String sql) {
Connection conn = null; Connection conn = null;
try { try {
conn = writePool.poll(); conn = writePool.poll();
@@ -239,7 +239,7 @@ public class DataJdbcSource extends DataSqlSource<Connection> {
} }
@Override @Override
protected <T> CompletableFuture<Integer> dropDB(EntityInfo<T> info, String sql) { protected <T> CompletableFuture<Integer> dropTableDB(EntityInfo<T> info, String sql) {
Connection conn = null; Connection conn = null;
try { try {
conn = writePool.poll(); conn = writePool.poll();

4
src/org/redkale/source/DataMemorySource.java
View File

@@ -94,12 +94,12 @@ public class DataMemorySource extends DataSqlSource<Void> {
} }
@Override @Override
protected <T> CompletableFuture<Integer> clearDB(EntityInfo<T> info, String sql) { protected <T> CompletableFuture<Integer> clearTableDB(EntityInfo<T> info, String sql) {
return CompletableFuture.completedFuture(0); return CompletableFuture.completedFuture(0);
} }
@Override @Override
protected <T> CompletableFuture<Integer> dropDB(EntityInfo<T> info, String sql) { protected <T> CompletableFuture<Integer> dropTableDB(EntityInfo<T> info, String sql) {
return CompletableFuture.completedFuture(0); return CompletableFuture.completedFuture(0);
} }

16
src/org/redkale/source/DataSource.java
View File

@@ -161,7 +161,7 @@ public interface DataSource {
* *
* @return 影响的记录条数 * @return 影响的记录条数
*/ */
public <T> int clear(final Class<T> clazz); public <T> int clearTable(final Class<T> clazz);
/** /**
* 清空表 <br> * 清空表 <br>
@@ -172,7 +172,7 @@ public interface DataSource {
* *
* @return 影响的记录条数CompletableFuture * @return 影响的记录条数CompletableFuture
*/ */
public <T> CompletableFuture<Integer> clearAsync(final Class<T> clazz); public <T> CompletableFuture<Integer> clearTableAsync(final Class<T> clazz);
/** /**
* 清空表 <br> * 清空表 <br>
@@ -184,7 +184,7 @@ public interface DataSource {
* *
* @return 影响的记录条数 * @return 影响的记录条数
*/ */
public <T> int clear(final Class<T> clazz, final FilterNode node); public <T> int clearTable(final Class<T> clazz, final FilterNode node);
/** /**
* 清空表 <br> * 清空表 <br>
@@ -196,7 +196,7 @@ public interface DataSource {
* *
* @return 影响的记录条数CompletableFuture * @return 影响的记录条数CompletableFuture
*/ */
public <T> CompletableFuture<Integer> clearAsync(final Class<T> clazz, final FilterNode node); public <T> CompletableFuture<Integer> clearTableAsync(final Class<T> clazz, final FilterNode node);
//------------------------dropAsync--------------------------- //------------------------dropAsync---------------------------
/** /**
@@ -208,7 +208,7 @@ public interface DataSource {
* *
* @return 影响的记录条数 * @return 影响的记录条数
*/ */
public <T> int drop(final Class<T> clazz); public <T> int dropTable(final Class<T> clazz);
/** /**
* 删除表 <br> * 删除表 <br>
@@ -219,7 +219,7 @@ public interface DataSource {
* *
* @return 影响的记录条数CompletableFuture * @return 影响的记录条数CompletableFuture
*/ */
public <T> CompletableFuture<Integer> dropAsync(final Class<T> clazz); public <T> CompletableFuture<Integer> dropTableAsync(final Class<T> clazz);
/** /**
* 删除表 <br> * 删除表 <br>
@@ -231,7 +231,7 @@ public interface DataSource {
* *
* @return 影响的记录条数 * @return 影响的记录条数
*/ */
public <T> int drop(final Class<T> clazz, final FilterNode node); public <T> int dropTable(final Class<T> clazz, final FilterNode node);
/** /**
* 删除表 <br> * 删除表 <br>
@@ -243,7 +243,7 @@ public interface DataSource {
* *
* @return 影响的记录条数CompletableFuture * @return 影响的记录条数CompletableFuture
*/ */
public <T> CompletableFuture<Integer> dropAsync(final Class<T> clazz, final FilterNode node); public <T> CompletableFuture<Integer> dropTableAsync(final Class<T> clazz, final FilterNode node);
//------------------------updateAsync--------------------------- //------------------------updateAsync---------------------------
/** /**

80
src/org/redkale/source/DataSqlSource.java
View File

@@ -134,10 +134,10 @@ public abstract class DataSqlSource<DBChannel> extends AbstractService implement
protected abstract <T> CompletableFuture<Integer> deleteDB(final EntityInfo<T> info, Flipper flipper, final String sql); protected abstract <T> CompletableFuture<Integer> deleteDB(final EntityInfo<T> info, Flipper flipper, final String sql);
//清空表 //清空表
protected abstract <T> CompletableFuture<Integer> clearDB(final EntityInfo<T> info, final String sql); protected abstract <T> CompletableFuture<Integer> clearTableDB(final EntityInfo<T> info, final String sql);
//删除表 //删除表
protected abstract <T> CompletableFuture<Integer> dropDB(final EntityInfo<T> info, final String sql); protected abstract <T> CompletableFuture<Integer> dropTableDB(final EntityInfo<T> info, final String sql);
//更新纪录 //更新纪录
protected abstract <T> CompletableFuture<Integer> updateDB(final EntityInfo<T> info, T... values); protected abstract <T> CompletableFuture<Integer> updateDB(final EntityInfo<T> info, T... values);
@@ -516,117 +516,117 @@ public abstract class DataSqlSource<DBChannel> extends AbstractService implement
return deleteDB(info, flipper, sql); return deleteDB(info, flipper, sql);
} }
//----------------------------- clearCompose ----------------------------- //----------------------------- clearTableCompose -----------------------------
@Override @Override
public <T> int clear(Class<T> clazz) { public <T> int clearTable(Class<T> clazz) {
return clear(clazz, (FilterNode) null); return clearTable(clazz, (FilterNode) null);
} }
@Override @Override
public <T> int clear(Class<T> clazz, FilterNode node) { public <T> int clearTable(Class<T> clazz, FilterNode node) {
final EntityInfo<T> info = loadEntityInfo(clazz); final EntityInfo<T> info = loadEntityInfo(clazz);
if (isOnlyCache(info)) return clearCache(info, node); if (isOnlyCache(info)) return clearTableCache(info, node);
return DataSqlSource.this.clearCompose(info, node).whenComplete((rs, t) -> { return DataSqlSource.this.clearTableCompose(info, node).whenComplete((rs, t) -> {
if (t != null) { if (t != null) {
futureCompleteConsumer.accept(rs, t); futureCompleteConsumer.accept(rs, t);
} else { } else {
clearCache(info, node); clearTableCache(info, node);
} }
}).join(); }).join();
} }
@Override @Override
public <T> CompletableFuture<Integer> clearAsync(final Class<T> clazz) { public <T> CompletableFuture<Integer> clearTableAsync(final Class<T> clazz) {
return clearAsync(clazz, (FilterNode) null); return clearTableAsync(clazz, (FilterNode) null);
} }
@Override @Override
public <T> CompletableFuture<Integer> clearAsync(final Class<T> clazz, FilterNode node) { public <T> CompletableFuture<Integer> clearTableAsync(final Class<T> clazz, FilterNode node) {
final EntityInfo<T> info = loadEntityInfo(clazz); final EntityInfo<T> info = loadEntityInfo(clazz);
if (isOnlyCache(info)) { 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) { if (t != null) {
futureCompleteConsumer.accept(rs, t); futureCompleteConsumer.accept(rs, t);
} else { } 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) { if (t != null) {
futureCompleteConsumer.accept(rs, t); futureCompleteConsumer.accept(rs, t);
} else { } else {
clearCache(info, node); clearTableCache(info, node);
} }
}); });
} }
protected <T> CompletableFuture<Integer> clearCompose(final EntityInfo<T> info, final FilterNode node) { protected <T> CompletableFuture<Integer> clearTableCompose(final EntityInfo<T> info, final FilterNode node) {
String sql = "TRUNCATE TABLE " + info.getTable(node); String sql = "TRUNCATE TABLE " + info.getTable(node);
if (info.isLoggable(logger, Level.FINEST, sql)) logger.finest(info.getType().getSimpleName() + " clear sql=" + sql); if (info.isLoggable(logger, Level.FINEST, sql)) logger.finest(info.getType().getSimpleName() + " clearTable sql=" + sql);
return clearDB(info, sql); return clearTableDB(info, sql);
} }
//----------------------------- dropCompose ----------------------------- //----------------------------- dropTableCompose -----------------------------
@Override @Override
public <T> int drop(Class<T> clazz) { public <T> int dropTable(Class<T> clazz) {
return drop(clazz, (FilterNode) null); return dropTable(clazz, (FilterNode) null);
} }
@Override @Override
public <T> int drop(Class<T> clazz, FilterNode node) { public <T> int dropTable(Class<T> clazz, FilterNode node) {
final EntityInfo<T> info = loadEntityInfo(clazz); final EntityInfo<T> info = loadEntityInfo(clazz);
if (isOnlyCache(info)) return dropCache(info, node); if (isOnlyCache(info)) return dropTableCache(info, node);
return DataSqlSource.this.dropCompose(info, node).whenComplete((rs, t) -> { return DataSqlSource.this.dropTableCompose(info, node).whenComplete((rs, t) -> {
if (t != null) { if (t != null) {
futureCompleteConsumer.accept(rs, t); futureCompleteConsumer.accept(rs, t);
} else { } else {
dropCache(info, node); dropTableCache(info, node);
} }
}).join(); }).join();
} }
@Override @Override
public <T> CompletableFuture<Integer> dropAsync(final Class<T> clazz) { public <T> CompletableFuture<Integer> dropTableAsync(final Class<T> clazz) {
return dropAsync(clazz, (FilterNode) null); return dropTableAsync(clazz, (FilterNode) null);
} }
@Override @Override
public <T> CompletableFuture<Integer> dropAsync(final Class<T> clazz, FilterNode node) { public <T> CompletableFuture<Integer> dropTableAsync(final Class<T> clazz, FilterNode node) {
final EntityInfo<T> info = loadEntityInfo(clazz); final EntityInfo<T> info = loadEntityInfo(clazz);
if (isOnlyCache(info)) { 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) { if (t != null) {
futureCompleteConsumer.accept(rs, t); futureCompleteConsumer.accept(rs, t);
} else { } 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) { if (t != null) {
futureCompleteConsumer.accept(rs, t); futureCompleteConsumer.accept(rs, t);
} else { } else {
dropCache(info, node); dropTableCache(info, node);
} }
}); });
} }
protected <T> CompletableFuture<Integer> dropCompose(final EntityInfo<T> info, final FilterNode node) { protected <T> CompletableFuture<Integer> dropTableCompose(final EntityInfo<T> info, final FilterNode node) {
String sql = "DROP TABLE " + info.getTable(node); String sql = "DROP TABLE " + info.getTable(node);
if (info.isLoggable(logger, Level.FINEST, sql)) logger.finest(info.getType().getSimpleName() + " drop sql=" + sql); if (info.isLoggable(logger, Level.FINEST, sql)) logger.finest(info.getType().getSimpleName() + " dropTable sql=" + sql);
return dropDB(info, sql); return dropTableDB(info, sql);
} }
protected <T> int clearCache(final EntityInfo<T> info, FilterNode node) { protected <T> int clearTableCache(final EntityInfo<T> info, FilterNode node) {
final EntityCache<T> cache = info.getCache(); final EntityCache<T> cache = info.getCache();
if (cache == null) return -1; if (cache == null) return -1;
return cache.clear(); return cache.clear();
} }
protected <T> int dropCache(final EntityInfo<T> info, FilterNode node) { protected <T> int dropTableCache(final EntityInfo<T> info, FilterNode node) {
final EntityCache<T> cache = info.getCache(); final EntityCache<T> cache = info.getCache();
if (cache == null) return -1; if (cache == null) return -1;
return cache.drop(); return cache.drop();