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

优化DataNativeSqlParser

Browse Source
This commit is contained in:
redkale
2024-05-24 17:21:53 +08:00
parent 4227a8a080
commit b51259cb91
4 changed files with 35 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

46
src/main/java/org/redkale/source/AbstractDataSqlSource.java
View File

@@ -239,9 +239,11 @@ public abstract class AbstractDataSqlSource extends AbstractDataSource implement
if (slowmsError > 0 || slowmsWarn > 0) { if (slowmsError > 0 || slowmsWarn > 0) {
long cost = System.currentTimeMillis() - startTime; long cost = System.currentTimeMillis() - startTime;
if (slowmsError > 0 && cost > slowmsError) { if (slowmsError > 0 && cost > slowmsError) {
logger.log(Level.SEVERE, DataSource.class.getSimpleName() + "(name='" + resourceName() + "') very slow sql cost " + cost + " ms, content: " + Arrays.toString(sqls)); logger.log(Level.SEVERE, DataSource.class.getSimpleName() + "(name='" + resourceName()
+ "') very slow sql cost " + cost + " ms, content: " + Arrays.toString(sqls));
} else if (slowmsWarn > 0 && cost > slowmsWarn) { } else if (slowmsWarn > 0 && cost > slowmsWarn) {
logger.log(Level.WARNING, DataSource.class.getSimpleName() + "(name='" + resourceName() + "') slow sql cost " + cost + " ms, content: " + Arrays.toString(sqls)); logger.log(Level.WARNING, DataSource.class.getSimpleName() + "(name='" + resourceName()
+ "') slow sql cost " + cost + " ms, content: " + Arrays.toString(sqls));
} }
} }
} }
@@ -287,7 +289,8 @@ public abstract class AbstractDataSqlSource extends AbstractDataSource implement
if (!props.containsKey(DATA_SOURCE_TABLECOPY_SQLTEMPLATE)) { //注意：此语句复制表结构会导致默认值和主键信息的丢失 if (!props.containsKey(DATA_SOURCE_TABLECOPY_SQLTEMPLATE)) { //注意：此语句复制表结构会导致默认值和主键信息的丢失
//注意：postgresql不支持跨库复制表结构 //注意：postgresql不支持跨库复制表结构
//props.setProperty(DATA_SOURCE_TABLECOPY_SQLTEMPLATE, "CREATE TABLE #{newtable} AS (SELECT * FROM #{oldtable} LIMIT 0)"); //props.setProperty(DATA_SOURCE_TABLECOPY_SQLTEMPLATE, "CREATE TABLE #{newtable} AS (SELECT * FROM #{oldtable} LIMIT 0)");
props.setProperty(DATA_SOURCE_TABLECOPY_SQLTEMPLATE, "CREATE TABLE IF NOT EXISTS #{newtable} (LIKE #{oldtable} INCLUDING DEFAULTS INCLUDING CONSTRAINTS INCLUDING COMMENTS INCLUDING INDEXES)"); props.setProperty(DATA_SOURCE_TABLECOPY_SQLTEMPLATE,
"CREATE TABLE IF NOT EXISTS #{newtable} (LIKE #{oldtable} INCLUDING DEFAULTS INCLUDING CONSTRAINTS INCLUDING COMMENTS INCLUDING INDEXES)");
} }
if (!props.containsKey(DATA_SOURCE_TABLENOTEXIST_SQLSTATES)) { if (!props.containsKey(DATA_SOURCE_TABLENOTEXIST_SQLSTATES)) {
props.setProperty(DATA_SOURCE_TABLENOTEXIST_SQLSTATES, "42P01;3F000"); props.setProperty(DATA_SOURCE_TABLENOTEXIST_SQLSTATES, "42P01;3F000");
@@ -306,7 +309,8 @@ public abstract class AbstractDataSqlSource extends AbstractDataSource implement
if (pos > 0) { if (pos > 0) {
url = url.substring(0, pos) + "..."; url = url.substring(0, pos) + "...";
} }
return getClass().getSimpleName() + "{url=" + url + ", maxconns=" + readMaxConns() + ", dbtype=" + dbtype() + ", " + DATA_SOURCE_TABLE_AUTODDL + "=" + autoDDL + executorToString() + "}"; return getClass().getSimpleName() + "{url=" + url + ", maxconns=" + readMaxConns()
+ ", dbtype=" + dbtype() + ", " + DATA_SOURCE_TABLE_AUTODDL + "=" + autoDDL + executorToString() + "}";
} else { } else {
String readUrl = readConfProps.getProperty(DATA_SOURCE_URL); String readUrl = readConfProps.getProperty(DATA_SOURCE_URL);
int pos = readUrl.indexOf('?'); int pos = readUrl.indexOf('?');
@@ -440,7 +444,8 @@ public abstract class AbstractDataSqlSource extends AbstractDataSource implement
sqlnull = "NOT NULL"; sqlnull = "NOT NULL";
} }
} }
} else if (column.type == java.time.LocalDate.class || column.type == java.util.Date.class || "java.sql.Date".equals(column.type.getName())) { } else if (column.type == java.time.LocalDate.class
|| column.type == java.util.Date.class || "java.sql.Date".equals(column.type.getName())) {
sqltype = "DATE"; sqltype = "DATE";
} else if (column.type == java.time.LocalTime.class || "java.sql.Time".equals(column.type.getName())) { } else if (column.type == java.time.LocalTime.class || "java.sql.Time".equals(column.type.getName())) {
sqltype = "TIME"; sqltype = "TIME";
@@ -499,7 +504,8 @@ public abstract class AbstractDataSqlSource extends AbstractDataSource implement
sqltype = "INT4"; sqltype = "INT4";
Number val = one == null ? null : (Number) info.getAttribute(column.field).get(one); Number val = one == null ? null : (Number) info.getAttribute(column.field).get(one);
sqlnull = "NOT NULL DEFAULT " + (val == null ? 0 : val); sqlnull = "NOT NULL DEFAULT " + (val == null ? 0 : val);
} else if (column.type == long.class || column.type == Long.class || column.type == AtomicLong.class || column.type == LongAdder.class) { } else if (column.type == long.class || column.type == Long.class
|| column.type == AtomicLong.class || column.type == LongAdder.class) {
sqltype = "INT8"; sqltype = "INT8";
Number val = one == null ? null : (Number) info.getAttribute(column.field).get(one); Number val = one == null ? null : (Number) info.getAttribute(column.field).get(one);
sqlnull = "NOT NULL DEFAULT " + (val == null ? 0 : val); sqlnull = "NOT NULL DEFAULT " + (val == null ? 0 : val);
@@ -552,7 +558,8 @@ public abstract class AbstractDataSqlSource extends AbstractDataSource implement
if (!column.nullable) { if (!column.nullable) {
sqlnull = "NOT NULL"; sqlnull = "NOT NULL";
} }
} else if (column.type == java.time.LocalDate.class || column.type == java.util.Date.class || "java.sql.Date".equals(column.type.getName())) { } else if (column.type == java.time.LocalDate.class
|| column.type == java.util.Date.class || "java.sql.Date".equals(column.type.getName())) {
sqltype = "DATE"; sqltype = "DATE";
} else if (column.type == java.time.LocalTime.class || "java.sql.Time".equals(column.type.getName())) { } else if (column.type == java.time.LocalTime.class || "java.sql.Time".equals(column.type.getName())) {
sqltype = "TIME"; sqltype = "TIME";
@@ -569,7 +576,8 @@ public abstract class AbstractDataSqlSource extends AbstractDataSource implement
.append(column.primary && info.isAutoGenerated() ? "" : sqlnull); .append(column.primary && info.isAutoGenerated() ? "" : sqlnull);
if (column.comment != null && !column.comment.isEmpty()) { if (column.comment != null && !column.comment.isEmpty()) {
//postgresql不支持DDL中直接带comment //postgresql不支持DDL中直接带comment
comments.add("COMMENT ON COLUMN " + info.getOriginTable() + "." + column.column + " IS '" + column.comment.replace('\'', '"') + "'"); comments.add("COMMENT ON COLUMN " + info.getOriginTable()
+ "." + column.column + " IS '" + column.comment.replace('\'', '"') + "'");
} }
sb.append(",\n"); sb.append(",\n");
} }
@@ -653,7 +661,7 @@ public abstract class AbstractDataSqlSource extends AbstractDataSource implement
protected DataNativeSqlStatement nativeParse(String nativeSql, boolean countable, Map<String, Object> params) { protected DataNativeSqlStatement nativeParse(String nativeSql, boolean countable, Map<String, Object> params) {
if (nativeSqlParser == null) { if (nativeSqlParser == null) {
throw new SourceException("not found DataNativeSqlParser instance"); throw new SourceException("not found " + DataNativeSqlParser.class.getSimpleName() + " instance");
} }
return nativeSqlParser.parse(signFunc, dbtype(), nativeSql, countable, params == null ? Collections.emptyMap() : params); return nativeSqlParser.parse(signFunc, dbtype(), nativeSql, countable, params == null ? Collections.emptyMap() : params);
} }
@@ -699,13 +707,13 @@ public abstract class AbstractDataSqlSource extends AbstractDataSource implement
String[] tables, Flipper flipper, FilterNode node, Map<String, List<Serializable>> pkmap, final String... sqls); String[] tables, Flipper flipper, FilterNode node, Map<String, List<Serializable>> pkmap, final String... sqls);
//清空表 //清空表
protected abstract <T> CompletableFuture<Integer> clearTableDBAsync(final EntityInfo<T> info, String[] tables, FilterNode node, final String... sqls); protected abstract <T> CompletableFuture<Integer> clearTableDBAsync(EntityInfo<T> info, String[] tables, FilterNode node, String... sqls);
//建表 //建表
protected abstract <T> CompletableFuture<Integer> createTableDBAsync(final EntityInfo<T> info, String copyTableSql, Serializable pk, final String... sqls); protected abstract <T> CompletableFuture<Integer> createTableDBAsync(EntityInfo<T> info, String copyTableSql, Serializable pk, String... sqls);
//删除表 //删除表
protected abstract <T> CompletableFuture<Integer> dropTableDBAsync(final EntityInfo<T> info, String[] tables, FilterNode node, final String... sqls); protected abstract <T> CompletableFuture<Integer> dropTableDBAsync(EntityInfo<T> info, String[] tables, FilterNode node, String... sqls);
//更新纪录 //更新纪录
protected abstract <T> CompletableFuture<Integer> updateEntityDBAsync(final EntityInfo<T> info, T... entitys); protected abstract <T> CompletableFuture<Integer> updateEntityDBAsync(final EntityInfo<T> info, T... entitys);
@@ -1532,7 +1540,7 @@ public abstract class AbstractDataSqlSource extends AbstractDataSource implement
} }
@Override @Override
public <T> CompletableFuture<Integer> updateColumnAsync(final Class<T> clazz, final Serializable pk, final String column, final Serializable colval) { public <T> CompletableFuture<Integer> updateColumnAsync(Class<T> clazz, Serializable pk, String column, Serializable colval) {
final EntityInfo<T> info = loadEntityInfo(clazz); final EntityInfo<T> info = loadEntityInfo(clazz);
if (isOnlyCache(info)) { if (isOnlyCache(info)) {
return CompletableFuture.completedFuture(updateCache(info, -1, pk, column, colval)); return CompletableFuture.completedFuture(updateCache(info, -1, pk, column, colval));
@@ -1602,7 +1610,7 @@ public abstract class AbstractDataSqlSource extends AbstractDataSource implement
} }
@Override @Override
public <T> CompletableFuture<Integer> updateColumnAsync(final Class<T> clazz, final String column, final Serializable colval, final FilterNode node) { public <T> CompletableFuture<Integer> updateColumnAsync(Class<T> clazz, String column, Serializable colval, FilterNode node) {
final EntityInfo<T> info = loadEntityInfo(clazz); final EntityInfo<T> info = loadEntityInfo(clazz);
if (isOnlyCache(info)) { if (isOnlyCache(info)) {
return CompletableFuture.completedFuture(updateCache(info, -1, column, colval, node)); return CompletableFuture.completedFuture(updateCache(info, -1, column, colval, node));
@@ -1627,7 +1635,7 @@ public abstract class AbstractDataSqlSource extends AbstractDataSource implement
} }
} }
protected <T> UpdateSqlInfo updateColumnSql(final EntityInfo<T> info, final String column, final Serializable colval, final FilterNode node) { protected <T> UpdateSqlInfo updateColumnSql(final EntityInfo<T> info, String column, Serializable colval, FilterNode node) {
Map<Class, String> joinTabalis = node.getJoinTabalis(); Map<Class, String> joinTabalis = node.getJoinTabalis();
CharSequence join = node.createSQLJoin(this, true, joinTabalis, new HashSet<>(), info); CharSequence join = node.createSQLJoin(this, true, joinTabalis, new HashSet<>(), info);
CharSequence where = node.createSQLExpress(this, info, joinTabalis); CharSequence where = node.createSQLExpress(this, info, joinTabalis);
@@ -1692,7 +1700,7 @@ public abstract class AbstractDataSqlSource extends AbstractDataSource implement
} }
@Override @Override
public <T> CompletableFuture<Integer> updateColumnAsync(final Class<T> clazz, final Serializable pk, final ColumnValue... values) { public <T> CompletableFuture<Integer> updateColumnAsync(final Class<T> clazz, Serializable pk, ColumnValue... values) {
if (values == null || values.length < 1) { if (values == null || values.length < 1) {
return CompletableFuture.completedFuture(-1); return CompletableFuture.completedFuture(-1);
} }
@@ -1776,7 +1784,7 @@ public abstract class AbstractDataSqlSource extends AbstractDataSource implement
} }
@Override @Override
public <T> CompletableFuture<Integer> updateColumnAsync(final Class<T> clazz, final FilterNode node, final Flipper flipper, final ColumnValue... values) { public <T> CompletableFuture<Integer> updateColumnAsync(Class<T> clazz, FilterNode node, Flipper flipper, ColumnValue... values) {
if (values == null || values.length < 1) { if (values == null || values.length < 1) {
return CompletableFuture.completedFuture(-1); return CompletableFuture.completedFuture(-1);
} }
@@ -1804,7 +1812,7 @@ public abstract class AbstractDataSqlSource extends AbstractDataSource implement
} }
} }
protected <T> UpdateSqlInfo updateColumnSql(final EntityInfo<T> info, final FilterNode node, final Flipper flipper, final ColumnValue... values) { protected <T> UpdateSqlInfo updateColumnSql(final EntityInfo<T> info, FilterNode node, Flipper flipper, ColumnValue... values) {
StringBuilder setsql = new StringBuilder(); StringBuilder setsql = new StringBuilder();
List<byte[]> blobs = null; List<byte[]> blobs = null;
int index = 0; int index = 0;
@@ -2005,7 +2013,7 @@ public abstract class AbstractDataSqlSource extends AbstractDataSource implement
} }
} }
protected <T> UpdateSqlInfo updateColumnSql(final EntityInfo<T> info, boolean needNode, T entity, FilterNode node, final SelectColumn selects) { protected <T> UpdateSqlInfo updateColumnSql(EntityInfo<T> info, boolean needNode, T entity, FilterNode node, SelectColumn selects) {
StringBuilder setsql = new StringBuilder(); StringBuilder setsql = new StringBuilder();
List<byte[]> blobs = null; List<byte[]> blobs = null;
int index = 0; int index = 0;

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

@@ -2541,6 +2541,7 @@ public class DataJdbcSource extends AbstractDataSqlSource {
* *
* @param <V> 泛型 * @param <V> 泛型
* @param sql SQL语句 * @param sql SQL语句
* @param consumer 连接处理函数
* @param handler 回调函数 * @param handler 回调函数
* *
* @return 结果 * @return 结果

2
src/main/java/org/redkale/source/DataNativeSqlParser.java
View File

@@ -13,7 +13,7 @@ import org.redkale.util.RedkaleClassLoader;
* 原生的sql解析器 <br> * 原生的sql解析器 <br>
* 参数变量有三种方式(与Mybatis的占位符类似): <br> * 参数变量有三种方式(与Mybatis的占位符类似): <br>
* ${xx.xx}: 用于直接拼接sql的变量，不做任何转义， 变量值必需的 * ${xx.xx}: 用于直接拼接sql的变量，不做任何转义， 变量值必需的
* #{xx.xx}: 用于预编译的sql的参数变量 * #{xx.xx}: 用于预编译的sql的参数变量, UPDATE SET中的#{xx.xx}变量自动转成必需的
* ##{xx.xx}: 用于预编译的sql的参数变量， 变量值必需的 * ##{xx.xx}: 用于预编译的sql的参数变量， 变量值必需的
* *
* <p> * <p>

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

@@ -25,13 +25,13 @@ public class DataNativeSqlStatement {
static final DataNativeSqlParser PARSER_NIL = new DataNativeSqlParser() { static final DataNativeSqlParser PARSER_NIL = new DataNativeSqlParser() {
@Override @Override
public DataNativeSqlInfo parse(IntFunction<String> signFunc, String dbType, String rawSql) { public DataNativeSqlInfo parse(IntFunction<String> signFunc, String dbType, String rawSql) {
throw new UnsupportedOperationException("Not supported yet."); throw new UnsupportedOperationException("No available instances found");
} }
@Override @Override
public DataNativeSqlStatement parse(IntFunction<String> signFunc, String dbType, public DataNativeSqlStatement parse(IntFunction<String> signFunc, String dbType,
String rawSql, boolean countable, Map<String, Object> params) { String rawSql, boolean countable, Map<String, Object> params) {
throw new UnsupportedOperationException("Not supported yet."); throw new UnsupportedOperationException("No available instances found");
} }
}; };