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

Browse Source
This commit is contained in:
Redkale
2020-01-11 22:02:42 +08:00
parent da2befcb97
commit df1aa2b379
3 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -601,7 +601,7 @@ public class DataJdbcSource extends DataSqlSource<Connection> {
ps.close(); ps.close();
return CompletableFuture.completedFuture(new Sheet<>(total, list)); return CompletableFuture.completedFuture(new Sheet<>(total, list));
} catch (SQLException e) { } catch (SQLException e) {
if (info.getTableStrategy() != null && info.isTableNotExist(e)) return CompletableFuture.completedFuture(new Sheet<>()); if (info.getTableStrategy() != null && info.isTableNotExist(e)) return CompletableFuture.completedFuture(new Sheet<>(0, new ArrayList()));
CompletableFuture future = new CompletableFuture(); CompletableFuture future = new CompletableFuture();
future.completeExceptionally(e); future.completeExceptionally(e);
return future;//return CompletableFuture.failedFuture(e); return future;//return CompletableFuture.failedFuture(e);

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

@@ -150,7 +150,7 @@ public class DataMemorySource extends DataSqlSource<Void> {
@Override @Override
protected <T> CompletableFuture<Sheet<T>> querySheetDB(EntityInfo<T> info, final boolean readcache, boolean needtotal, final boolean distinct, SelectColumn selects, Flipper flipper, FilterNode node) { protected <T> CompletableFuture<Sheet<T>> querySheetDB(EntityInfo<T> info, final boolean readcache, boolean needtotal, final boolean distinct, SelectColumn selects, Flipper flipper, FilterNode node) {
return CompletableFuture.completedFuture(new Sheet<>()); return CompletableFuture.completedFuture(new Sheet<>(0, new ArrayList()));
} }
} }

2
src/org/redkale/source/EntityCache.java
View File

@@ -436,7 +436,7 @@ public final class EntityCache<T> {
if (distinct) stream = distinctStream(stream, keyattrs); if (distinct) stream = distinctStream(stream, keyattrs);
total = stream.count(); total = stream.count();
} }
if (needtotal && total == 0) return new Sheet<>(); if (needtotal && total == 0) return new Sheet<>(0, new ArrayList());
Stream<T> stream = this.list.stream(); Stream<T> stream = this.list.stream();
if (filter != null) stream = stream.filter(filter); if (filter != null) stream = stream.filter(filter);
if (distinct) stream = distinctStream(stream, keyattrs); if (distinct) stream = distinctStream(stream, keyattrs);