dongjunchuan/de
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix(数据集): PG数据集使用定时同步，数据量超过50000时，有可能会丢失数据 #6177

Browse Source
This commit is contained in:
taojinlong 2024-02-26 12:27:19 +08:00
parent 3488ec0f26
commit 81e05b6b28
2 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
core/backend/src/main/java/io/dataease/provider/datasource/JdbcProvider.java
View File

@ -436,6 +436,7 @@ public class JdbcProvider extends DefaultJdbcProvider {
int queryTimeout = jdbcConfiguration.getQueryTimeout() > 0 ? jdbcConfiguration.getQueryTimeout() : 0;
try (Connection con = getConnection(datasourceRequest); Statement statement = getStatement(con, queryTimeout); ResultSet resultSet = statement.executeQuery(queryStr)) {
} catch (Exception e) {
e.printStackTrace();
LogUtil.error("Datasource is invalid: " + datasourceRequest.getDatasource().getName(), e);
DataEaseException.throwException(e.getMessage());
}
@ -580,11 +581,11 @@ public class JdbcProvider extends DefaultJdbcProvider {
if (isDefaultClassLoader(customDriver)) {
driverClassName = defaultDriver;
jdbcClassLoader = extendedJdbcClassLoader;
for (DataSourceType value : SpringContextUtil.getApplicationContext().getBeansOfType(DataSourceType.class).values()) {
if (value.getType().equalsIgnoreCase(datasourceRequest.getDatasource().getType())) {
surpportVersions = value.getSurpportVersions();
}
}
// for (DataSourceType value : SpringContextUtil.getApplicationContext().getBeansOfType(DataSourceType.class).values()) {
// if (value.getType().equalsIgnoreCase(datasourceRequest.getDatasource().getType())) {
// surpportVersions = value.getSurpportVersions();
// }
// }
} else {
if (deDriver == null) {
deDriver = deDriverMapper.selectByPrimaryKey(customDriver);

2
core/backend/src/main/java/io/dataease/provider/query/pg/PgQueryProvider.java
View File

@ -993,7 +993,7 @@ public class PgQueryProvider extends QueryProvider {
String tableWithSchema = String.format(PgConstants.KEYWORD_TABLE, schema) + "." + String.format(PgConstants.KEYWORD_TABLE, sql);
return "SELECT COUNT(*) from " + tableWithSchema;
} else {
return "SELECT COUNT(*) from ( " + sqlFix(sql) + " ) DE_COUNT_TEMP";
return null;
}
}