From 7dcaa3eda0f848ea60d221f71e4753dac86c1c3a Mon Sep 17 00:00:00 2001 From: redkale Date: Tue, 18 Jul 2023 20:01:43 +0800 Subject: [PATCH] =?UTF-8?q?DataJdbcSource=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../org/redkale/source/DataJdbcSource.java | 108 +++++++++--------- 1 file changed, 54 insertions(+), 54 deletions(-) diff --git a/src/main/java/org/redkale/source/DataJdbcSource.java b/src/main/java/org/redkale/source/DataJdbcSource.java index 7c0ddd94a..4b4c5591e 100644 --- a/src/main/java/org/redkale/source/DataJdbcSource.java +++ b/src/main/java/org/redkale/source/DataJdbcSource.java @@ -385,16 +385,16 @@ public class DataJdbcSource extends AbstractDataSqlSource { throw se; } //创建单表结构 - Statement st = conn.createUpdateStatement(); + Statement stmt = conn.createUpdateStatement(); if (tableSqls.length == 1) { - st.execute(tableSqls[0]); + stmt.execute(tableSqls[0]); } else { for (String tableSql : tableSqls) { - st.addBatch(tableSql); + stmt.addBatch(tableSql); } - st.executeBatch(); + stmt.executeBatch(); } - st.close(); + stmt.close(); } else { //分库分表 info.disTableLock().lock(); try { @@ -409,77 +409,77 @@ public class DataJdbcSource extends AbstractDataSqlSource { }); try { //执行一遍创建分表操作 - Statement st = conn.createUpdateStatement(); + Statement stmt = conn.createUpdateStatement(); for (String copySql : tableCopys) { - st.addBatch(copySql); + stmt.addBatch(copySql); } - st.executeBatch(); - st.close(); + stmt.executeBatch(); + stmt.close(); } catch (SQLException sqle) { //多进程并发时可能会出现重复建表 if (isTableNotExist(info, sqle.getSQLState())) { if (newCatalogs.isEmpty()) { //分表的原始表不存在 String[] tableSqls = createTableSqls(info); if (tableSqls != null) { //创建原始表 - Statement st = conn.createUpdateStatement(); + Statement stmt = conn.createUpdateStatement(); if (tableSqls.length == 1) { - st.execute(tableSqls[0]); + stmt.execute(tableSqls[0]); } else { for (String tableSql : tableSqls) { - st.addBatch(tableSql); + stmt.addBatch(tableSql); } - st.executeBatch(); + stmt.executeBatch(); } - st.close(); + stmt.close(); //再执行一遍创建分表操作 - st = conn.createUpdateStatement(); + stmt = conn.createUpdateStatement(); for (String copySql : tableCopys) { - st.addBatch(copySql); + stmt.addBatch(copySql); } - st.executeBatch(); - st.close(); + stmt.executeBatch(); + stmt.close(); } } else { //需要先建库 - Statement st; + Statement stmt; try { - st = conn.createUpdateStatement(); + stmt = conn.createUpdateStatement(); for (String newCatalog : newCatalogs) { - st.addBatch(("postgresql".equals(dbtype()) ? "CREATE SCHEMA IF NOT EXISTS " : "CREATE DATABASE IF NOT EXISTS ") + newCatalog); + stmt.addBatch(("postgresql".equals(dbtype()) ? "CREATE SCHEMA IF NOT EXISTS " : "CREATE DATABASE IF NOT EXISTS ") + newCatalog); } - st.executeBatch(); - st.close(); + stmt.executeBatch(); + stmt.close(); } catch (SQLException sqle1) { logger.log(Level.SEVERE, "create database " + tableCopys + " error", sqle1); } try { //再执行一遍创建分表操作 - st = conn.createUpdateStatement(); + stmt = conn.createUpdateStatement(); for (String copySql : tableCopys) { - st.addBatch(copySql); + stmt.addBatch(copySql); } - st.executeBatch(); - st.close(); + stmt.executeBatch(); + stmt.close(); } catch (SQLException sqle2) { if (isTableNotExist(info, sqle2.getSQLState())) { String[] tableSqls = createTableSqls(info); if (tableSqls != null) { //创建原始表 - st = conn.createUpdateStatement(); + stmt = conn.createUpdateStatement(); if (tableSqls.length == 1) { - st.execute(tableSqls[0]); + stmt.execute(tableSqls[0]); } else { for (String tableSql : tableSqls) { - st.addBatch(tableSql); + stmt.addBatch(tableSql); } - st.executeBatch(); + stmt.executeBatch(); } - st.close(); + stmt.close(); //再执行一遍创建分表操作 - st = conn.createUpdateStatement(); + stmt = conn.createUpdateStatement(); for (String copySql : tableCopys) { - st.addBatch(copySql); + stmt.addBatch(copySql); } - st.executeBatch(); - st.close(); + stmt.executeBatch(); + stmt.close(); } } else { logger.log(Level.SEVERE, "create table2 " + tableCopys + " error", sqle2); @@ -651,16 +651,16 @@ public class DataJdbcSource extends AbstractDataSqlSource { if (info.getTableStrategy() == null) { String[] tableSqls = createTableSqls(info); if (tableSqls != null) { - Statement st = conn.createUpdateStatement(); + Statement stmt = conn.createUpdateStatement(); if (tableSqls.length == 1) { - st.execute(tableSqls[0]); + stmt.execute(tableSqls[0]); } else { for (String tableSql : tableSqls) { - st.addBatch(tableSql); + stmt.addBatch(tableSql); } - st.executeBatch(); + stmt.executeBatch(); } - st.close(); + stmt.close(); return 0; } //单表结构不存在 @@ -1148,16 +1148,16 @@ public class DataJdbcSource extends AbstractDataSqlSource { String[] tableSqls = createTableSqls(info); if (tableSqls != null) { try { - Statement st = conn.createUpdateStatement(); + Statement stmt = conn.createUpdateStatement(); if (tableSqls.length == 1) { - st.execute(tableSqls[0]); + stmt.execute(tableSqls[0]); } else { for (String tableSql : tableSqls) { - st.addBatch(tableSql); + stmt.addBatch(tableSql); } - st.executeBatch(); + stmt.executeBatch(); } - st.close(); + stmt.close(); } catch (SQLException e2) { } } @@ -1380,16 +1380,16 @@ public class DataJdbcSource extends AbstractDataSqlSource { String[] tableSqls = createTableSqls(info); if (tableSqls != null) { try { - Statement st = conn.createUpdateStatement(); + Statement stmt = conn.createUpdateStatement(); if (tableSqls.length == 1) { - st.execute(tableSqls[0]); + stmt.execute(tableSqls[0]); } else { for (String tableSql : tableSqls) { - st.addBatch(tableSql); + stmt.addBatch(tableSql); } - st.executeBatch(); + stmt.executeBatch(); } - st.close(); + stmt.close(); } catch (SQLException e2) { } } @@ -2530,12 +2530,12 @@ public class DataJdbcSource extends AbstractDataSqlSource { if (logger.isLoggable(Level.FINEST)) { logger.finest("direct query sql=" + sql); } - final Statement statement = conn.createQueryStatement(); + final Statement stmt = conn.createQueryStatement(); //final PreparedStatement prestmt = conn.prepareStatement(sql); - final ResultSet set = statement.executeQuery(sql);// prestmt.executeQuery(); + final ResultSet set = stmt.executeQuery(sql);// prestmt.executeQuery(); V rs = handler.apply(createDataResultSet(null, set)); set.close(); - statement.close(); + stmt.close(); slowLog(s, sql); return rs; } catch (Exception ex) {