Skip to content

SUP-20157: Fix for the Oracle crash on the consistency check #1781

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
plyhun wants to merge 1 commit into
base: hotfix-3.2.x
Choose a base branch
from
+4 −3
Open

SUP-20157: Fix for the Oracle crash on the consistency check #1781

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 4 additions & 3 deletions mdm/hibernate-core/src/main/java/com/gentics/mesh/check/AbstractListItemTableCheck.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,8 @@ protected void findOrphanedListItems(EntityManager em, ConsistencyCheckResult re
}
DatabaseConnector dc = HibernateTx.get().data().getDatabaseConnector();
String contentTable = dc.getPhysicalTableName(UUIDUtil.toJavaUuid(version.getUuid()));
String uuidColumn = dc.renderColumn(CommonContentColumn.DB_UUID);
String contentUuidColumn = dc.renderColumn(CommonContentColumn.DB_UUID);
String dbUuidColumn = dc.renderNonContentColumn("dbUuid");

List<String> listFields = version.getSchema().getFields().stream()
.filter(f -> FieldTypes.valueByName(f.getType()).equals(FieldTypes.LIST) && FieldTypes.valueByName(((ListFieldSchema) f).getListType()).equals(getListFieldType()))
Expand All @@ -65,7 +66,7 @@ protected void findOrphanedListItems(EntityManager em, ConsistencyCheckResult re
String fieldColumn = dc.identify(field + "-list." + getListFieldType().name().toLowerCase()).render(dc.getHibernateDialect());
String sql = String.format(
"SELECT ref.%s c FROM %s ref LEFT JOIN %s content ON ref.%s = content.%s WHERE ref.fieldkey = :%s AND content.%s <> ref.listuuid",
uuidColumn, refTableName, contentTable, contentRefColumn, uuidColumn, fieldParam, fieldColumn);
dbUuidColumn, refTableName, contentTable, contentRefColumn, contentUuidColumn, fieldParam, fieldColumn);

List<UUID> orphanedListItems = em.createNativeQuery(sql)
.setParameter(fieldParam, field).getResultList();
Expand All @@ -78,7 +79,7 @@ protected void findOrphanedListItems(EntityManager em, ConsistencyCheckResult re
.setRepairAction(RepairAction.DELETE);
long deleted = 0;
if (attemptRepair) {
String delete = "DELETE FROM " + refTableName + " WHERE " + uuidColumn + " IN :" + fieldParam;
String delete = "DELETE FROM " + refTableName + " WHERE " + dbUuidColumn + " IN :" + fieldParam;
deleted += SplittingUtils.splitAndCount(orphanedListItems, HibernateUtil.inQueriesLimitForSplitting(1), slice -> Long.valueOf(em.createNativeQuery(delete).setParameter(fieldParam, slice).executeUpdate()));
info.setRepaired(deleted == orphanedListItems.size());
}
Expand Down