优化DataSqlSource

This commit is contained in:
redkale
2023-07-24 22:11:00 +08:00
parent 835e9b7eea
commit f33a1b997f
4 changed files with 13 additions and 24 deletions

View File

@@ -666,17 +666,6 @@ public abstract class AbstractDataSqlSource extends AbstractDataSource implement
return autoDDL; return autoDDL;
} }
@Local
@Override
public abstract int nativeExecute(String sql);
@Local
@Override
public abstract int[] nativeExecute(String... sqls);
@Local
@Override
public abstract <V> V nativeQuery(String sql, Function<DataResultSet, V> handler);
//是否异步 //是否异步
protected abstract boolean isAsync(); protected abstract boolean isAsync();

View File

@@ -2464,8 +2464,8 @@ public class DataJdbcSource extends AbstractDataSqlSource {
*/ */
@Local @Local
@Override @Override
public int nativeExecute(String sql) { public int executeUpdate(String sql) {
return nativeExecute(new String[]{sql})[0]; return executeUpdate(new String[]{sql})[0];
} }
/** /**
@@ -2478,7 +2478,7 @@ public class DataJdbcSource extends AbstractDataSqlSource {
*/ */
@Local @Local
@Override @Override
public int[] nativeExecute(String... sqls) { public int[] executeUpdate(String... sqls) {
if (sqls.length == 0) { if (sqls.length == 0) {
return new int[0]; return new int[0];
} }
@@ -2521,7 +2521,7 @@ public class DataJdbcSource extends AbstractDataSqlSource {
*/ */
@Local @Local
@Override @Override
public <V> V nativeQuery(String sql, Function<DataResultSet, V> handler) { public <V> V executeQuery(String sql, Function<DataResultSet, V> handler) {
final long s = System.currentTimeMillis(); final long s = System.currentTimeMillis();
final SourceConnection conn = readPool.pollConnection(); final SourceConnection conn = readPool.pollConnection();
try { try {
@@ -2547,17 +2547,17 @@ public class DataJdbcSource extends AbstractDataSqlSource {
@Deprecated @Deprecated
public int directExecute(String sql) { public int directExecute(String sql) {
return nativeExecute(sql); return executeUpdate(sql);
} }
@Deprecated @Deprecated
public int[] directExecute(String... sqls) { public int[] directExecute(String... sqls) {
return nativeExecute(sqls); return executeUpdate(sqls);
} }
@Deprecated @Deprecated
public <V> V directQuery(String sql, Function<DataResultSet, V> handler) { public <V> V directQuery(String sql, Function<DataResultSet, V> handler) {
return nativeQuery(sql, handler); return executeQuery(sql, handler);
} }
public static DataResultSet createDataResultSet(EntityInfo info, ResultSet set) { public static DataResultSet createDataResultSet(EntityInfo info, ResultSet set) {

View File

@@ -94,17 +94,17 @@ public class DataMemorySource extends AbstractDataSqlSource implements SearchSou
} }
@Override @Override
public int nativeExecute(String sql) { public int executeUpdate(String sql) {
throw new UnsupportedOperationException("Not supported yet."); throw new UnsupportedOperationException("Not supported yet.");
} }
@Override @Override
public int[] nativeExecute(String... sqls) { public int[] executeUpdate(String... sqls) {
throw new UnsupportedOperationException("Not supported yet."); throw new UnsupportedOperationException("Not supported yet.");
} }
@Override @Override
public <V> V nativeQuery(String sql, Function<DataResultSet, V> handler) { public <V> V executeQuery(String sql, Function<DataResultSet, V> handler) {
throw new UnsupportedOperationException("Not supported yet."); throw new UnsupportedOperationException("Not supported yet.");
} }

View File

@@ -17,10 +17,10 @@ import java.util.function.Function;
*/ */
public interface DataSqlSource extends DataSource { public interface DataSqlSource extends DataSource {
public int nativeExecute(String sql); public int executeUpdate(String sql);
public int[] nativeExecute(String... sqls); public int[] executeUpdate(String... sqls);
public <V> V nativeQuery(String sql, Function<DataResultSet, V> handler); public <V> V executeQuery(String sql, Function<DataResultSet, V> handler);
} }