From f23204edd72e5b54369731119612bb6124ee6248 Mon Sep 17 00:00:00 2001 From: TommyLemon <1184482681@qq.com> Date: Wed, 26 Oct 2022 07:21:07 +0800 Subject: [PATCH] =?UTF-8?q?=E5=AE=8C=E5=96=84=E5=AF=B9=20Presto,=20Trino?= =?UTF-8?q?=20=E7=9A=84=E6=94=AF=E6=8C=81=EF=BC=9A=E6=AD=A3=E5=88=99?= =?UTF-8?q?=E5=BF=BD=E7=95=A5=E5=A4=A7=E5=B0=8F=E5=86=99=EF=BC=9B=E6=94=AF?= =?UTF-8?q?=E6=8C=81=E9=A2=84=E7=BC=96=E8=AF=91=E6=A8=A1=E5=BC=8F=E7=AD=89?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/apijson/orm/AbstractSQLConfig.java | 15 +++---- .../java/apijson/orm/AbstractSQLExecutor.java | 39 +++++++++++++------ 2 files changed, 36 insertions(+), 18 deletions(-) diff --git a/APIJSONORM/src/main/java/apijson/orm/AbstractSQLConfig.java b/APIJSONORM/src/main/java/apijson/orm/AbstractSQLConfig.java index 1dc259ba..6e10ce2c 100755 --- a/APIJSONORM/src/main/java/apijson/orm/AbstractSQLConfig.java +++ b/APIJSONORM/src/main/java/apijson/orm/AbstractSQLConfig.java @@ -3561,12 +3561,13 @@ public abstract class AbstractSQLConfig implements SQLConfig { if (isPostgreSQL() || isInfluxDB()) { return getKey(column) + " ~" + (ignoreCase ? "* " : " ") + getValue(key, column, value); } - if (isPresto() || isTrino()) { - return "regexp_like(" + getKey(column) + ", " + getValue(key, column, value) + ")"; - } if (isOracle() || isDameng() || isKingBase() || (isMySQL() && getDBVersionNums()[0] >= 8)) { return "regexp_like(" + getKey(column) + ", " + getValue(key, column, value) + (ignoreCase ? ", 'i'" : ", 'c'") + ")"; } + if (isPresto() || isTrino()) { + return "regexp_like(" + (ignoreCase ? "lower(" : "") + getKey(column) + (ignoreCase ? ")" : "") + + ", " + (ignoreCase ? "lower(" : "") + getValue(key, column, value) + (ignoreCase ? ")" : "") + ")"; + } if (isClickHouse()) { return "match(" + (ignoreCase ? "lower(" : "") + getKey(column) + (ignoreCase ? ")" : "") + ", " + (ignoreCase ? "lower(" : "") + getValue(key, column, value) + (ignoreCase ? ")" : "") + ")"; @@ -4436,14 +4437,14 @@ public abstract class AbstractSQLConfig implements SQLConfig { sql += (first ? ON : AND) + quote + jt + quote + "." + quote + on.getKey() + quote + (isNot ? NOT : "") + " ~" + (ignoreCase ? "* " : " ") + quote + on.getTargetTable() + quote + "." + quote + on.getTargetKey() + quote; } - else if (isPresto() || isTrino()) { - sql += (first ? ON : AND) + "regexp_like(" + quote + jt + quote + "." + quote + on.getKey() + quote - + ", " + quote + on.getTargetTable() + quote + "." + quote + on.getTargetKey() + quote + ")"; - } else if (isOracle() || isDameng() || isKingBase()) { sql += (first ? ON : AND) + "regexp_like(" + quote + jt + quote + "." + quote + on.getKey() + quote + ", " + quote + on.getTargetTable() + quote + "." + quote + on.getTargetKey() + quote + (ignoreCase ? ", 'i'" : ", 'c'") + ")"; } + else if (isPresto() || isTrino()) { + sql += (first ? ON : AND) + "regexp_like(" + (ignoreCase ? "lower(" : "") + quote + jt + quote + "." + quote + on.getKey() + quote + (ignoreCase ? ")" : "") + + ", " + (ignoreCase ? "lower(" : "") + quote + on.getTargetTable() + quote + "." + quote + on.getTargetKey() + quote + (ignoreCase ? ")" : "") + ")"; + } else if (isClickHouse()) { sql += (first ? ON : AND) + "match(" + (ignoreCase ? "lower(" : "") + quote + jt + quote + "." + quote + on.getKey() + quote + (ignoreCase ? ")" : "") + ", " + (ignoreCase ? "lower(" : "") + quote + on.getTargetTable() + quote + "." + quote + on.getTargetKey() + quote + (ignoreCase ? ")" : "") + ")"; diff --git a/APIJSONORM/src/main/java/apijson/orm/AbstractSQLExecutor.java b/APIJSONORM/src/main/java/apijson/orm/AbstractSQLExecutor.java index 6c25c506..a9b023d3 100755 --- a/APIJSONORM/src/main/java/apijson/orm/AbstractSQLExecutor.java +++ b/APIJSONORM/src/main/java/apijson/orm/AbstractSQLExecutor.java @@ -700,7 +700,7 @@ public abstract class AbstractSQLExecutor implements SQLExecutor { jc.putWhere(originKey, null, false); // remove originKey jc.putWhere(key + "{}", targetValueList, true); // add originKey{} } - jc.setMain(true).setPreparedValueList(new ArrayList<>()); + jc.setMain(true).setPreparedValueList(new ArrayList<>()); // 放一块逻辑更清晰，也避免解析 * 等不支持或性能开销 // String q = jc.getQuote(); @@ -752,7 +752,7 @@ public abstract class AbstractSQLExecutor implements SQLExecutor { // // if (noAggrFun) { // 加 row_number 字段会导致 count 等聚合函数统计出错，结果偏大？ String q = jc.getQuote(); - sql2 = prepared ? jc.getSQL(true) : sql; + sql2 = prepared && jc.isTDengine() == false ? jc.getSQL(true) : sql; String prefix = "SELECT * FROM("; String rnStr = ", row_number() OVER (PARTITION BY " + q + key + q + ((AbstractSQLConfig) jc).getOrderString(true) + ") _row_num_ FROM "; @@ -786,7 +786,7 @@ public abstract class AbstractSQLExecutor implements SQLExecutor { executedSQLCount ++; executedSQLStartTime = System.currentTimeMillis(); } - rs = executeQuery(jc, sql2); + rs = executeQuery(jc, sql2); if (isExplain == false) { executedSQLDuration += System.currentTimeMillis() - executedSQLStartTime; } @@ -1085,7 +1085,16 @@ public abstract class AbstractSQLExecutor implements SQLExecutor { } } else if (RequestMethod.isGetMethod(config.getMethod(), true)) { - statement = getConnection(config).prepareStatement(sql, ResultSet.TYPE_SCROLL_SENSITIVE, ResultSet.CONCUR_UPDATABLE); + //if (config.isPresto() || config.isTrino()) { + // statement = getConnection(config).prepareStatement(sql); // , ResultSet.TYPE_FORWARD_ONLY, ResultSet.CONCUR_READ_ONLY, ResultSet.HOLD_CURSORS_OVER_COMMIT); + //} else { + // statement = getConnection(config).prepareStatement(sql, ResultSet.TYPE_SCROLL_SENSITIVE, ResultSet.CONCUR_UPDATABLE); + //} + if (config.isMySQL() || config.isPostgreSQL() || config.isOracle() || config.isSQLServer() || config.isDb2()) { + statement = getConnection(config).prepareStatement(sql, ResultSet.TYPE_SCROLL_SENSITIVE, ResultSet.CONCUR_UPDATABLE); + } else { + statement = getConnection(config).prepareStatement(sql); + } } else { statement = getConnection(config).prepareStatement(sql); @@ -1227,15 +1236,19 @@ public abstract class AbstractSQLExecutor implements SQLExecutor { @Override public ResultSet executeQuery(@NotNull SQLConfig config, String sql) throws Exception { - if (config.isPresto() || config.isTrino() || config.isTDengine()) { - Connection conn = getConnection(config); - Statement stt = config.isTDengine() - ? conn.createStatement() // fix Presto: ResultSet: Exception: set type is TYPE_FORWARD_ONLY, Result set concurrency must be CONCUR_READ_ONLY - : conn.createStatement(ResultSet.TYPE_FORWARD_ONLY, ResultSet.CONCUR_READ_ONLY, ResultSet.HOLD_CURSORS_OVER_COMMIT); + if (config.isPrepared() == false || config.isTDengine() // TDengine JDBC 不支持 PreparedStatement + || (config.isExplain() && (config.isPresto() || config.isTrino()))) { // Presto JDBC 0.277 在 EXPLAIN 模式下预编译值不会替代 ? 占位导致报错 + + Connection conn = getConnection(config); + Statement stt = conn.createStatement(); + //Statement stt = config.isTDengine() + // ? conn.createStatement() // fix Presto: ResultSet: Exception: set type is TYPE_FORWARD_ONLY, Result set concurrency must be CONCUR_READ_ONLY + // : conn.createStatement(ResultSet.TYPE_FORWARD_ONLY, ResultSet.CONCUR_READ_ONLY, ResultSet.HOLD_CURSORS_OVER_COMMIT); return executeQuery(stt, StringUtil.isEmpty(sql) ? config.getSQL(false) : sql); } + // Presto JDBC 0.277 在 EXPLAIN 模式下预编译值不会替代 ? 占位导致报错 PreparedStatement stt = getStatement(config, sql); ResultSet rs = stt.executeQuery(); //PreparedStatement 不用传 SQL // if (config.isExplain() && (config.isSQLServer() || config.isOracle())) { @@ -1252,8 +1265,12 @@ public abstract class AbstractSQLExecutor implements SQLExecutor { int count; if (config.isTDengine()) { Connection conn = getConnection(config); - stt = conn.createStatement(); - count = stt.executeUpdate(StringUtil.isEmpty(sql) ? config.getSQL(false) : sql); + stt = conn.createStatement(); + //stt = config.isTDengine() + // ? conn.createStatement() // fix Presto: ResultSet: Exception: set type is TYPE_FORWARD_ONLY, Result set concurrency must be CONCUR_READ_ONLY + // : conn.createStatement(ResultSet.TYPE_FORWARD_ONLY, ResultSet.CONCUR_READ_ONLY, ResultSet.HOLD_CURSORS_OVER_COMMIT); + + count = stt.executeUpdate(StringUtil.isEmpty(sql) ? config.getSQL(false) : sql); } else { stt = getStatement(config);