inteligr8/alfresco-community-repo
1
0
Fork 0
mirror of https://github.com/Alfresco/alfresco-community-repo.git synced 2025-07-31 17:39:05 +00:00
Code Issues Packages Projects Releases Wiki Activity

Revert "MNT-22186: propTablesCleanupJobDetail v2 can cause Out of Memory errors (CleanAlfPropTablesV2.sql ) (#390)" (#394)

Browse Source 
This reverts commit 5e38be6f7d.
This commit is contained in:
Cristian Turlica
2021-04-21 10:22:16 +03:00
committed by GitHub
parent 6c69e45b1e
commit a7d8789ff4
3 changed files with 7 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
repository/src/main/java/org/alfresco/repo/domain/schema/script/DeleteNotExistsExecutor.java
View File

@@ -25,8 +25,6 @@
*/ */
package org.alfresco.repo.domain.schema.script; package org.alfresco.repo.domain.schema.script;
import org.alfresco.repo.domain.dialect.Dialect;
import org.alfresco.repo.domain.dialect.MySQLInnoDBDialect;
import org.alfresco.util.LogUtil; import org.alfresco.util.LogUtil;
import org.alfresco.util.Pair; import org.alfresco.util.Pair;
import org.alfresco.util.PropertyCheck; import org.alfresco.util.PropertyCheck;
@@ -76,7 +74,6 @@ public class DeleteNotExistsExecutor implements StatementExecutor
private int line; private int line;
private File scriptFile; private File scriptFile;
private Properties globalProperties; private Properties globalProperties;
private Dialect dialect;
private boolean readOnly; private boolean readOnly;
private int deleteBatchSize; private int deleteBatchSize;
@@ -87,18 +84,12 @@ public class DeleteNotExistsExecutor implements StatementExecutor
private Date startTime; private Date startTime;
public DeleteNotExistsExecutor(Connection connection, String sql, int line, File scriptFile, Properties globalProperties) public DeleteNotExistsExecutor(Connection connection, String sql, int line, File scriptFile, Properties globalProperties)
{
this(connection, sql, line, scriptFile, globalProperties, null);
}
public DeleteNotExistsExecutor(Connection connection, String sql, int line, File scriptFile, Properties globalProperties, Dialect dialect)
{ {
this.connection = connection; this.connection = connection;
this.sql = sql; this.sql = sql;
this.line = line; this.line = line;
this.scriptFile = scriptFile; this.scriptFile = scriptFile;
this.globalProperties = globalProperties; this.globalProperties = globalProperties;
this.dialect = dialect;
} }
public void checkProperties() public void checkProperties()
@@ -173,21 +164,6 @@ public class DeleteNotExistsExecutor implements StatementExecutor
} }
} }
/**
* @return Integer.MIN_VALUE in case of MySQL otherwise the batch size.
*/
private int computeFetchSize()
{
if (this.dialect instanceof MySQLInnoDBDialect)
{
// Note the MySQL specific fetch size limitation (Integer.MIN_VALUE). fetchSize
// activates result set streaming.
return Integer.MIN_VALUE;
}
return batchSize;
}
private void process(Pair<String, String>[] tableColumn, Long[] tableUpperLimits, String[] optionalWhereClauses) throws SQLException private void process(Pair<String, String>[] tableColumn, Long[] tableUpperLimits, String[] optionalWhereClauses) throws SQLException
{ {
// The approach is to fetch ordered row ids from all referencer/secondary (e.g. // The approach is to fetch ordered row ids from all referencer/secondary (e.g.
@@ -208,7 +184,6 @@ public class DeleteNotExistsExecutor implements StatementExecutor
PreparedStatement[] secondaryPrepStmts = null; PreparedStatement[] secondaryPrepStmts = null;
PreparedStatement deletePrepStmt = null; PreparedStatement deletePrepStmt = null;
Set<Long> deleteIds = new HashSet<>(); Set<Long> deleteIds = new HashSet<>();
int fetchSize = computeFetchSize();
deletedCount = 0L; deletedCount = 0L;
startTime = new Date(); startTime = new Date();
@@ -216,7 +191,7 @@ public class DeleteNotExistsExecutor implements StatementExecutor
{ {
connection.setAutoCommit(false); connection.setAutoCommit(false);
primaryPrepStmt = connection.prepareStatement(createPreparedSelectStatement(primaryTableName, primaryColumnName, primaryWhereClause)); primaryPrepStmt = connection.prepareStatement(createPreparedSelectStatement(primaryTableName, primaryColumnName, primaryWhereClause));
primaryPrepStmt.setFetchSize(fetchSize); primaryPrepStmt.setFetchSize(batchSize);
primaryPrepStmt.setLong(1, primaryId); primaryPrepStmt.setLong(1, primaryId);
primaryPrepStmt.setLong(2, tableUpperLimits[0]); primaryPrepStmt.setLong(2, tableUpperLimits[0]);
@@ -229,7 +204,7 @@ public class DeleteNotExistsExecutor implements StatementExecutor
for (int i = 1; i < tableColumn.length; i++) for (int i = 1; i < tableColumn.length; i++)
{ {
PreparedStatement secStmt = connection.prepareStatement(createPreparedSelectStatement(tableColumn[i].getFirst(), tableColumn[i].getSecond(), optionalWhereClauses[i])); PreparedStatement secStmt = connection.prepareStatement(createPreparedSelectStatement(tableColumn[i].getFirst(), tableColumn[i].getSecond(), optionalWhereClauses[i]));
secStmt.setFetchSize(fetchSize); secStmt.setFetchSize(batchSize);
secStmt.setLong(1, primaryId); secStmt.setLong(1, primaryId);
secStmt.setLong(2, tableUpperLimits[i]); secStmt.setLong(2, tableUpperLimits[i]);

2
repository/src/main/java/org/alfresco/repo/domain/schema/script/ScriptExecutorImpl.java
View File

@@ -350,7 +350,7 @@ public class ScriptExecutorImpl implements ScriptExecutor
} }
else if (sql.startsWith("--DELETE_NOT_EXISTS")) else if (sql.startsWith("--DELETE_NOT_EXISTS"))
{ {
DeleteNotExistsExecutor deleteNotExists = new DeleteNotExistsExecutor(connection, sql, line, scriptFile, globalProperties, dialect); DeleteNotExistsExecutor deleteNotExists = new DeleteNotExistsExecutor(connection, sql, line, scriptFile, globalProperties);
deleteNotExists.execute(); deleteNotExists.execute();
// Reset // Reset

8
repository/src/test/java/org/alfresco/repo/domain/schema/script/DeleteNotExistsExecutorTest.java
View File

@@ -90,7 +90,7 @@ public class DeleteNotExistsExecutorTest
{ {
when(properties.getProperty(DeleteNotExistsExecutor.PROPERTY_READ_ONLY)).thenReturn("true"); when(properties.getProperty(DeleteNotExistsExecutor.PROPERTY_READ_ONLY)).thenReturn("true");
when(properties.getProperty(DeleteNotExistsExecutor.PROPERTY_TIMEOUT_SECONDS)).thenReturn("-1"); when(properties.getProperty(DeleteNotExistsExecutor.PROPERTY_TIMEOUT_SECONDS)).thenReturn("-1");
DeleteNotExistsExecutor deleteNotExistsExecutor = new DeleteNotExistsExecutor(connection, sql, line, scriptFile, properties, null); DeleteNotExistsExecutor deleteNotExistsExecutor = new DeleteNotExistsExecutor(connection, sql, line, scriptFile, properties);
deleteNotExistsExecutor.execute(); deleteNotExistsExecutor.execute();
List<String> res = jdbcTmpl.queryForList(select, String.class); List<String> res = jdbcTmpl.queryForList(select, String.class);
@@ -100,7 +100,7 @@ public class DeleteNotExistsExecutorTest
{ {
when(properties.getProperty(DeleteNotExistsExecutor.PROPERTY_READ_ONLY)).thenReturn("false"); when(properties.getProperty(DeleteNotExistsExecutor.PROPERTY_READ_ONLY)).thenReturn("false");
when(properties.getProperty(DeleteNotExistsExecutor.PROPERTY_TIMEOUT_SECONDS)).thenReturn("-1"); when(properties.getProperty(DeleteNotExistsExecutor.PROPERTY_TIMEOUT_SECONDS)).thenReturn("-1");
DeleteNotExistsExecutor deleteNotExistsExecutor = new DeleteNotExistsExecutor(connection, sql, line, scriptFile, properties, null); DeleteNotExistsExecutor deleteNotExistsExecutor = new DeleteNotExistsExecutor(connection, sql, line, scriptFile, properties);
deleteNotExistsExecutor.execute(); deleteNotExistsExecutor.execute();
List<String> res = jdbcTmpl.queryForList(select, String.class); List<String> res = jdbcTmpl.queryForList(select, String.class);
@@ -133,7 +133,7 @@ public class DeleteNotExistsExecutorTest
{ {
when(properties.getProperty(DeleteNotExistsExecutor.PROPERTY_DELETE_BATCH_SIZE)).thenReturn("1"); when(properties.getProperty(DeleteNotExistsExecutor.PROPERTY_DELETE_BATCH_SIZE)).thenReturn("1");
when(properties.getProperty(DeleteNotExistsExecutor.PROPERTY_READ_ONLY)).thenReturn("false"); when(properties.getProperty(DeleteNotExistsExecutor.PROPERTY_READ_ONLY)).thenReturn("false");
DeleteNotExistsExecutor deleteNotExistsExecutor = new DeleteNotExistsExecutor(connection, sql, line, scriptFile, properties, null); DeleteNotExistsExecutor deleteNotExistsExecutor = new DeleteNotExistsExecutor(connection, sql, line, scriptFile, properties);
deleteNotExistsExecutor.execute(); deleteNotExistsExecutor.execute();
List<String> res = jdbcTmpl.queryForList(select, String.class); List<String> res = jdbcTmpl.queryForList(select, String.class);
@@ -167,7 +167,7 @@ public class DeleteNotExistsExecutorTest
when(properties.getProperty(DeleteNotExistsExecutor.PROPERTY_BATCH_SIZE)).thenReturn("2"); when(properties.getProperty(DeleteNotExistsExecutor.PROPERTY_BATCH_SIZE)).thenReturn("2");
when(properties.getProperty(DeleteNotExistsExecutor.PROPERTY_READ_ONLY)).thenReturn("false"); when(properties.getProperty(DeleteNotExistsExecutor.PROPERTY_READ_ONLY)).thenReturn("false");
when(properties.getProperty(DeleteNotExistsExecutor.PROPERTY_TIMEOUT_SECONDS)).thenReturn("-1"); when(properties.getProperty(DeleteNotExistsExecutor.PROPERTY_TIMEOUT_SECONDS)).thenReturn("-1");
DeleteNotExistsExecutor deleteNotExistsExecutor = new DeleteNotExistsExecutor(connection, sql, line, scriptFile, properties, null); DeleteNotExistsExecutor deleteNotExistsExecutor = new DeleteNotExistsExecutor(connection, sql, line, scriptFile, properties);
deleteNotExistsExecutor.execute(); deleteNotExistsExecutor.execute();
List<String> res = jdbcTmpl.queryForList(select, String.class); List<String> res = jdbcTmpl.queryForList(select, String.class);