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

DataSqlSource优化

Browse Source
This commit is contained in:
redkale
2023-07-25 21:25:33 +08:00
parent 70764f1ea4
commit fe67add571
3 changed files with 17 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
src/main/java/org/redkale/source/DataJdbcSource.java
View File

@@ -10,10 +10,11 @@ import java.sql.*;
import java.util.*;
import java.util.concurrent.*;
import java.util.concurrent.atomic.*;
import java.util.function.Function;
import java.util.function.*;
import java.util.logging.Level;
import java.util.stream.Stream;
import org.redkale.annotation.AutoLoad;
import org.redkale.annotation.*;
import org.redkale.annotation.ResourceListener;
import org.redkale.annotation.ResourceType;
import org.redkale.service.Local;
@@ -2460,7 +2461,7 @@ public class DataJdbcSource extends AbstractDataSqlSource {
* @return 结果
*/
@Override
public <V> V executeQuery(String sql, Function<DataResultSet, V> handler) {
public <V> V executeQuery(String sql, BiConsumer<Object, Object> consumer, Function<DataResultSet, V> handler) {
final long s = System.currentTimeMillis();
final SourceConnection conn = readPool.pollConnection();
try {
@@ -2468,8 +2469,10 @@ public class DataJdbcSource extends AbstractDataSqlSource {
logger.finest("executeQuery sql=" + sql);
}
final Statement stmt = conn.createQueryStatement();
//final PreparedStatement prestmt = conn.prepareStatement(sql);
final ResultSet set = stmt.executeQuery(sql);// prestmt.executeQuery();
if (consumer != null) {
consumer.accept(conn, stmt);
}
final ResultSet set = stmt.executeQuery(sql);
V rs = handler.apply(createDataResultSet(null, set));
set.close();
conn.offerQueryStatement(stmt);
@@ -2499,7 +2502,7 @@ public class DataJdbcSource extends AbstractDataSqlSource {
return executeQuery(sql, handler);
}
public static DataResultSet createDataResultSet(EntityInfo info, ResultSet set) {
public static DataResultSet createDataResultSet(@Nullable EntityInfo info, ResultSet set) {
return new DataJdbcResultSet(info).resultSet(set);
}

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

@@ -8,7 +8,7 @@ package org.redkale.source;
import java.io.Serializable;
import java.util.*;
import java.util.concurrent.CompletableFuture;
import java.util.function.Function;
import java.util.function.*;
import org.redkale.annotation.AutoLoad;
import org.redkale.annotation.ResourceListener;
import org.redkale.annotation.ResourceType;
@@ -104,7 +104,7 @@ public class DataMemorySource extends AbstractDataSqlSource implements SearchSou
}
@Override
public <V> V executeQuery(String sql, Function<DataResultSet, V> handler) {
public <V> V executeQuery(String sql, BiConsumer<Object, Object> consumer, Function<DataResultSet, V> handler) {
throw new UnsupportedOperationException("Not supported yet.");
}

9
src/main/java/org/redkale/source/DataSqlSource.java
View File

@@ -4,7 +4,7 @@
package org.redkale.source;
import java.util.*;
import java.util.function.Function;
import java.util.function.*;
/**
*
@@ -22,7 +22,12 @@ public interface DataSqlSource extends DataSource {
public int[] executeUpdate(String... sqls);
public <V> V executeQuery(String sql, Function<DataResultSet, V> handler);
//BiConsumer 参数1: connection, 参数2: statement
public <V> V executeQuery(String sql, BiConsumer<Object, Object> consumer, Function<DataResultSet, V> handler);
default <V> V executeQuery(String sql, Function<DataResultSet, V> handler) {
return executeQuery(sql, null, handler);
}
default <V> V executeQueryOne(Class<V> type, String sql) {
return executeQuery(sql, rset -> {