diff --git a/src/org/redkale/source/DataJdbcSource.java b/src/org/redkale/source/DataJdbcSource.java index 99dae2997..d523be0a9 100644 --- a/src/org/redkale/source/DataJdbcSource.java +++ b/src/org/redkale/source/DataJdbcSource.java @@ -502,7 +502,7 @@ public class DataJdbcSource extends DataSqlSource { } @Override - protected CompletableFuture> querySheetDB(EntityInfo info, boolean needtotal, SelectColumn selects, Flipper flipper, FilterNode node) { + protected CompletableFuture> querySheetDB(EntityInfo info, final boolean readcache, boolean needtotal, SelectColumn selects, Flipper flipper, FilterNode node) { Connection conn = null; try { conn = readPool.poll(); @@ -516,7 +516,7 @@ public class DataJdbcSource extends DataSqlSource { if ("mysql".equals(dbtype) || "postgresql".equals(dbtype)) { final String listsql = "SELECT " + info.getQueryColumns("a", selects) + " FROM " + info.getTable(node) + " a" + (join == null ? "" : join) + ((where == null || where.length() == 0) ? "" : (" WHERE " + where)) + createSQLOrderby(info, flipper) + (flipper == null || flipper.getLimit() < 1 ? "" : (" LIMIT " + flipper.getLimit() + " OFFSET " + flipper.getOffset())); - if (info.isLoggable(logger, Level.FINEST, listsql)) { + if (!readcache && info.isLoggable(logger, Level.FINEST, listsql)) { logger.finest(info.getType().getSimpleName() + " query sql=" + listsql); } PreparedStatement ps = conn.prepareStatement(listsql, ResultSet.TYPE_SCROLL_INSENSITIVE, ResultSet.CONCUR_READ_ONLY); @@ -529,7 +529,7 @@ public class DataJdbcSource extends DataSqlSource { long total = list.size(); if (needtotal) { final String countsql = "SELECT COUNT(*) FROM " + info.getTable(node) + " a" + (join == null ? "" : join) + ((where == null || where.length() == 0) ? "" : (" WHERE " + where)); - if (info.isLoggable(logger, Level.FINEST, countsql)) { + if (!readcache && info.isLoggable(logger, Level.FINEST, countsql)) { logger.finest(info.getType().getSimpleName() + " query countsql=" + countsql); } ps = conn.prepareStatement(countsql, ResultSet.TYPE_SCROLL_INSENSITIVE, ResultSet.CONCUR_READ_ONLY); @@ -542,7 +542,7 @@ public class DataJdbcSource extends DataSqlSource { } final String sql = "SELECT " + info.getQueryColumns("a", selects) + " FROM " + info.getTable(node) + " a" + (join == null ? "" : join) + ((where == null || where.length() == 0) ? "" : (" WHERE " + where)) + info.createSQLOrderby(flipper); - if (info.isLoggable(logger, Level.FINEST, sql)) { + if (!readcache && info.isLoggable(logger, Level.FINEST, sql)) { logger.finest(info.getType().getSimpleName() + " query sql=" + sql + (flipper == null || flipper.getLimit() < 1 ? "" : (" LIMIT " + flipper.getLimit() + " OFFSET " + flipper.getOffset()))); } conn.setReadOnly(true); diff --git a/src/org/redkale/source/DataMemorySource.java b/src/org/redkale/source/DataMemorySource.java index 2428f3297..a9e567655 100644 --- a/src/org/redkale/source/DataMemorySource.java +++ b/src/org/redkale/source/DataMemorySource.java @@ -144,7 +144,7 @@ public class DataMemorySource extends DataSqlSource { } @Override - protected CompletableFuture> querySheetDB(EntityInfo info, boolean needtotal, SelectColumn selects, Flipper flipper, FilterNode node) { + protected CompletableFuture> querySheetDB(EntityInfo info, final boolean readcache, boolean needtotal, SelectColumn selects, Flipper flipper, FilterNode node) { return CompletableFuture.completedFuture(new Sheet<>()); } diff --git a/src/org/redkale/source/DataSqlSource.java b/src/org/redkale/source/DataSqlSource.java index daf9da454..c3cd3dffa 100644 --- a/src/org/redkale/source/DataSqlSource.java +++ b/src/org/redkale/source/DataSqlSource.java @@ -164,7 +164,7 @@ public abstract class DataSqlSource extends AbstractService implement protected abstract CompletableFuture existsDB(final EntityInfo info, final String sql, final boolean onlypk); //查询一页数据 - protected abstract CompletableFuture> querySheetDB(final EntityInfo info, final boolean needtotal, final SelectColumn selects, final Flipper flipper, final FilterNode node); + protected abstract CompletableFuture> querySheetDB(final EntityInfo info, final boolean readcache, final boolean needtotal, final SelectColumn selects, final Flipper flipper, final FilterNode node); protected T getEntityValue(EntityInfo info, final SelectColumn sels, final ResultSet set) throws SQLException { return info.getEntityValue(sels, set); @@ -2321,6 +2321,6 @@ public abstract class DataSqlSource extends AbstractService implement return CompletableFuture.completedFuture(cache.querySheet(needtotal, selects, flipper, node)); } } - return querySheetDB(info, needtotal, selects, flipper, node); + return querySheetDB(info, readcache, needtotal, selects, flipper, node); } }