mirror of
https://github.com/Alfresco/alfresco-community-repo.git
synced 2025-08-07 17:49:17 +00:00
Merged V3.4 to HEAD (SQL-level fixes)
23368: Merged V3.3-BUG-FIX to V3.4
23363: Merged V3.3 to V3.3-BUG-FIX
23358: (RECORD ONLY) Removed redundant svn:mergeinfo
23359: Minor I18N fix on patch.updateMimetypes2
23360: Fixed ALF-3167: Websphere/Db2 SchemaBootstrap.dumpSchema is failing due to result set is closed error
- SchemaDump uses nested resultset reads, which is incompatible with SchemaBootstrap's auto-commit connection
- Also pull back some changes to fix MySQL builds after MySQL upgrades
23361: More patch I18N
23362: Merged V3.2 to V3.3
23333: Fixed ALF-5396: Missing FK indexes on non-MySQL databases
23324: Fixed ALF-5396: Missing FK indexes on non-MySQL databases
- Create scripts were manually ported and required full clean-install testing in addition to upgrade testing
23372: Fixed ALF-5421: update_ChildAssocsIndex ibatis statement does not include child_node_id
23523: Merged BRANCHES/DEV/V3.3-BUG-FIX to BRANCHES/V3.4:
23490: Merged BRANCHES/V3.3 to BRANCHES/DEV/V3.3-BUG-FIX:
23470: Merged V3.2 to V3.3
23395: Merged BRANCHES/DEV/BELARUS/HEAD_2010_09_21 to V32
22821: ALF-4203: WCM 2.2.7 case-sensitivity causes errors after upgrade to 3.2.x.
23055: ALF-4203: WCM 2.2.7 case-sensitivity causes errors after upgrade to 3.2.x (record-only, used only part of this checkin).
23198: ALF-4203: WCM 2.2.7 case-sensitivity causes errors after upgrade to 3.2.x.
23398: ALF-4203: fix for "WCM 2.2.7 case-senstivity causes err rs after upgrade to 3.2.x"
- updated template for patch.eliminateDuplicates
23433: Fix for ALF-4203: "WCM 2.2.7 case-sensitivity causes errors after upgrade to 3.2.x"
- revised fix
23752: Fixed ALF-5453: Remove old Audit tables from schema create scripts
23957: Fixed ALF-5308: SQL error when changing name for record / folder with dispostion schedule applied
24250: Fix typo in original fix of ALF-5308 and add unit test
24345: Merged V3.3 to V3.4
24337: Fixed ALF-6078: WCM: alf_lock table version number fails during roll-over.
- Added specific, minor fixes for 3.4
24352: Fix SQL fallout from ALF-6078
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@24354 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Derek Hulley
@@ -0,0 +1,110 @@
|
||||
/*
|
||||
* Copyright (C) 2005-2010 Alfresco Software Limited.
|
||||
*
|
||||
* This file is part of Alfresco
|
||||
*
|
||||
* Alfresco is free software: you can redistribute it and/or modify
|
||||
* it under the terms of the GNU Lesser General Public License as published by
|
||||
* the Free Software Foundation, either version 3 of the License, or
|
||||
* (at your option) any later version.
|
||||
*
|
||||
* Alfresco is distributed in the hope that it will be useful,
|
||||
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||
* GNU Lesser General Public License for more details.
|
||||
*
|
||||
* You should have received a copy of the GNU Lesser General Public License
|
||||
* along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
|
||||
*/
|
||||
package org.alfresco.repo.admin.patch.impl;
|
||||
|
||||
/**
|
||||
* Wrapper for duplicate entries
|
||||
*
|
||||
* @author Dmitry Velichkevich
|
||||
*/
|
||||
public class DuplicateEntry
|
||||
{
|
||||
private static final int ODD_MULTIPLICATOR = 37;
|
||||
|
||||
private Long id;
|
||||
|
||||
private Long parentId;
|
||||
|
||||
private String name;
|
||||
|
||||
private Long amount;
|
||||
|
||||
public DuplicateEntry()
|
||||
{
|
||||
}
|
||||
|
||||
public DuplicateEntry(Long id, Long parentId, String name, Long amount)
|
||||
{
|
||||
this.id = id;
|
||||
this.parentId = parentId;
|
||||
this.name = name;
|
||||
this.amount = amount;
|
||||
}
|
||||
|
||||
public Long getId()
|
||||
{
|
||||
return id;
|
||||
}
|
||||
|
||||
public void setId(Long id)
|
||||
{
|
||||
this.id = id;
|
||||
}
|
||||
|
||||
public Long getParentId()
|
||||
{
|
||||
return parentId;
|
||||
}
|
||||
|
||||
public void setParentId(Long parentId)
|
||||
{
|
||||
this.parentId = parentId;
|
||||
}
|
||||
|
||||
public String getName()
|
||||
{
|
||||
return name;
|
||||
}
|
||||
|
||||
public void setName(String name)
|
||||
{
|
||||
this.name = name;
|
||||
}
|
||||
|
||||
public Long getAmount()
|
||||
{
|
||||
return amount;
|
||||
}
|
||||
|
||||
public void setAmount(Long amount)
|
||||
{
|
||||
this.amount = amount;
|
||||
}
|
||||
|
||||
@Override
|
||||
public boolean equals(Object obj)
|
||||
{
|
||||
if (!(obj instanceof DuplicateEntry))
|
||||
{
|
||||
return false;
|
||||
}
|
||||
DuplicateEntry converted = (DuplicateEntry) obj;
|
||||
return (id == converted.getId()) && (parentId == converted.getParentId()) && ((null == name) ? (null == converted.getName()) : (name.equals(converted.getName())));
|
||||
}
|
||||
|
||||
@Override
|
||||
public int hashCode()
|
||||
{
|
||||
int result = (int) id.intValue();
|
||||
result = DuplicateEntry.ODD_MULTIPLICATOR * result + (int) parentId.longValue();
|
||||
result = DuplicateEntry.ODD_MULTIPLICATOR * result + (int) amount.longValue();
|
||||
result = DuplicateEntry.ODD_MULTIPLICATOR * result + ((null != name) ? (name.hashCode()) : (0));
|
||||
return result;
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,227 @@
|
||||
/*
|
||||
* Copyright (C) 2005-2010 Alfresco Software Limited.
|
||||
*
|
||||
* This file is part of Alfresco
|
||||
*
|
||||
* Alfresco is free software: you can redistribute it and/or modify
|
||||
* it under the terms of the GNU Lesser General Public License as published by
|
||||
* the Free Software Foundation, either version 3 of the License, or
|
||||
* (at your option) any later version.
|
||||
*
|
||||
* Alfresco is distributed in the hope that it will be useful,
|
||||
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||
* GNU Lesser General Public License for more details.
|
||||
*
|
||||
* You should have received a copy of the GNU Lesser General Public License
|
||||
* along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
|
||||
*/
|
||||
package org.alfresco.repo.admin.patch.impl;
|
||||
|
||||
import java.util.Iterator;
|
||||
import java.util.List;
|
||||
|
||||
import org.alfresco.repo.admin.patch.AbstractPatch;
|
||||
import org.alfresco.repo.avm.AVMDAOs;
|
||||
import org.alfresco.repo.avm.AVMNode;
|
||||
import org.alfresco.repo.avm.AVMNodeType;
|
||||
import org.alfresco.util.GUID;
|
||||
import org.apache.commons.logging.Log;
|
||||
import org.apache.commons.logging.LogFactory;
|
||||
import org.springframework.extensions.surf.util.I18NUtil;
|
||||
import org.springframework.orm.ibatis.SqlMapClientTemplate;
|
||||
|
||||
/**
|
||||
* ALF-4203
|
||||
*
|
||||
* This patch searches for AVM Node duplicates resulting from case insensitivity issues on
|
||||
* earlier versions of the software (see ALF-1940) and eliminates them by changing the name
|
||||
* of duplicates to make them unique. This is achieved by appending a unique suffix to
|
||||
* duplicate node names.
|
||||
*
|
||||
* @author Dmitry Velichkevich
|
||||
*/
|
||||
public class EliminateDuplicatesPatch extends AbstractPatch
|
||||
{
|
||||
private Log LOGGER = LogFactory.getLog(EliminateDuplicatesPatch.class);
|
||||
|
||||
private static final String RENAMED_MARK_KEY = "renamed.duplicate.mark";
|
||||
|
||||
private static final char EXTENSION_DELIMITER = '.';
|
||||
|
||||
private static final char TOKENS_DELIMITER = '-';
|
||||
|
||||
/**
|
||||
* Internationalized mark to indicate renamed duplicate
|
||||
*/
|
||||
private String renamedMark;
|
||||
|
||||
/**
|
||||
* Temporary extension for renamed duplicates. May be 'not set'
|
||||
*/
|
||||
private String temporaryExtension;
|
||||
|
||||
private AvmDuplicatesIBatisDao helper;
|
||||
|
||||
public EliminateDuplicatesPatch()
|
||||
{
|
||||
helper = new AvmDuplicatesIBatisDao();
|
||||
}
|
||||
|
||||
public String getRenamedMark()
|
||||
{
|
||||
if (null == renamedMark)
|
||||
{
|
||||
String mark = I18NUtil.getMessage(RENAMED_MARK_KEY);
|
||||
StringBuilder markBuilder = new StringBuilder().append(TOKENS_DELIMITER);
|
||||
renamedMark = markBuilder.append(mark).append(TOKENS_DELIMITER).toString();
|
||||
}
|
||||
return renamedMark;
|
||||
}
|
||||
|
||||
public void setTemporaryExtension(String temporaryExtension)
|
||||
{
|
||||
this.temporaryExtension = temporaryExtension;
|
||||
}
|
||||
|
||||
public void setTemplate(SqlMapClientTemplate template)
|
||||
{
|
||||
helper.setTemplate(template);
|
||||
}
|
||||
|
||||
@Override
|
||||
protected String applyInternal() throws Exception
|
||||
{
|
||||
int totalRenamed = 0;
|
||||
int duplicateGroupsAmount = 0;
|
||||
|
||||
// Receiving duplicates
|
||||
List<DuplicateEntry> duplicates = helper.getDuplicates();
|
||||
Iterator<DuplicateEntry> duplicatesIterator = duplicates.iterator();
|
||||
DuplicateEntry duplicate = null;
|
||||
|
||||
// duplicates contains all the duplicates found ordered by parent_id, lower(name), child_id.
|
||||
// Within this ordered list there are groups of duplicates (in which the parent_id and lower(name)
|
||||
// are the same but the child_id varies). A duplicate group, by definition, must have two or more entries.
|
||||
while (duplicatesIterator.hasNext() && (null != (duplicate = duplicatesIterator.next())))
|
||||
{
|
||||
// Increasing duplicate groups amount
|
||||
duplicateGroupsAmount++;
|
||||
int renamed = 0;
|
||||
|
||||
// First element of the duplicates group will be left with its current name. Marking first element of current group as marked
|
||||
int processed = 1;
|
||||
|
||||
// amount is the number of duplicates in the current duplicate group
|
||||
long amount = duplicate.getAmount();
|
||||
|
||||
// While we have duplicates and we are still within a duplicates group
|
||||
// amount = the number of duplicates with the same parent and lowercase name
|
||||
// processed = the number of duplicates in the current duplicates group that have been processed
|
||||
while (duplicatesIterator.hasNext() && (amount > processed))
|
||||
{
|
||||
// Skipping first element from each group to leave at least one Node with initial name
|
||||
duplicate = duplicatesIterator.next();
|
||||
processed++;
|
||||
|
||||
String newName = generatePatchedName(duplicate);
|
||||
boolean renamingResult = helper.renameNode(new DuplicateEntry(duplicate.getId(), duplicate.getParentId(), newName, 1L));
|
||||
if (LOGGER.isDebugEnabled())
|
||||
{
|
||||
LOGGER.debug("Trying to rename Node with id = '" + duplicate.getId() + "' and parent id = '"
|
||||
+ duplicate.getParentId() + "' from '" + duplicate.getName() + "' to '" + newName + "'. Result: "
|
||||
+ renamingResult);
|
||||
}
|
||||
if (renamingResult)
|
||||
{
|
||||
renamed++;
|
||||
totalRenamed++;
|
||||
}
|
||||
}
|
||||
|
||||
// Entries finished or another group reached
|
||||
if (LOGGER.isDebugEnabled())
|
||||
{
|
||||
LOGGER.debug("Duplicates for '" + duplicate.getName().toLowerCase() + "' name and parentId='" + duplicate.getParentId() + "': " + duplicate.getAmount()
|
||||
+ ". Renamed: " + renamed);
|
||||
}
|
||||
}
|
||||
|
||||
StringBuilder result = new StringBuilder();
|
||||
result.append(duplicateGroupsAmount).append(" duplicate group(s) were found\n");
|
||||
result.append(duplicates.size()).append(" affected node entries\n");
|
||||
result.append("----------------\nTotal renamed: ").append(totalRenamed).append('\n');
|
||||
return result.toString();
|
||||
}
|
||||
|
||||
/**
|
||||
* With help of {@link GUID} utility class this method generates unique and internationalized name for some Node. Also returned name will be finished with
|
||||
* {@link EliminateDuplicatesPatch#temporaryExtension} extension if it is not empty or <b><i>null</i></b>
|
||||
*
|
||||
* @param node - {@link DuplicateEntry} instance which contains required old name and Node id
|
||||
* @return {@link String} value which represents unique and internationalized name generated from the duplicated one
|
||||
*/
|
||||
private String generatePatchedName(DuplicateEntry node)
|
||||
{
|
||||
StringBuilder result = new StringBuilder();
|
||||
StringBuilder extension = new StringBuilder();
|
||||
AVMNode avmNode = AVMDAOs.Instance().fAVMNodeDAO.getByID(node.getId());
|
||||
String oldName = node.getName();
|
||||
if (((AVMNodeType.LAYERED_FILE == avmNode.getType()) || (AVMNodeType.PLAIN_FILE == avmNode.getType())))
|
||||
{
|
||||
int dotPosition = oldName.indexOf(EXTENSION_DELIMITER);
|
||||
if (-1 != dotPosition)
|
||||
{
|
||||
extension.append(oldName.substring(dotPosition));
|
||||
oldName = oldName.substring(0, dotPosition);
|
||||
}
|
||||
if ((null != temporaryExtension) && (temporaryExtension.length() > 0))
|
||||
{
|
||||
extension.append(EXTENSION_DELIMITER).append(temporaryExtension);
|
||||
}
|
||||
}
|
||||
result.append(oldName).append(getRenamedMark()).append(GUID.generate()).append(extension.toString());
|
||||
return result.toString();
|
||||
}
|
||||
|
||||
/**
|
||||
* iBatis helper which introduces functionality for duplicates of some node receiving and renaming in <code>avm_child_entries table</code>
|
||||
*
|
||||
* @author Dmitry Velichkevich
|
||||
*/
|
||||
private class AvmDuplicatesIBatisDao
|
||||
{
|
||||
private static final String QUERY_SELECT_DUPLICATES_ID = "alfresco.patch.select_AvmNodeDuplicates";
|
||||
|
||||
private static final String QUERY_RENAME_NODE_ID = "alfresco.patch.update_AvmNodeNameById";
|
||||
|
||||
private SqlMapClientTemplate template;
|
||||
|
||||
public void setTemplate(SqlMapClientTemplate template)
|
||||
{
|
||||
this.template = template;
|
||||
}
|
||||
|
||||
/**
|
||||
* Receives all duplicates found in some repository
|
||||
*
|
||||
* @return {@link List}<{@link DuplicateEntry}> list which contains all received duplicates wrapped into the {@link DuplicateEntry}
|
||||
*/
|
||||
@SuppressWarnings("unchecked")
|
||||
public List<DuplicateEntry> getDuplicates()
|
||||
{
|
||||
return template.queryForList(QUERY_SELECT_DUPLICATES_ID);
|
||||
}
|
||||
|
||||
/**
|
||||
* Renames some child which is duplicate for some other Node(s) in some Space
|
||||
*
|
||||
* @param renamedEntry - {@link DuplicateEntry} instance which specifies Id and new name for Node
|
||||
* @return {@link Boolean} value which equals to <code>true</code> if renaming update has been finished successfully
|
||||
*/
|
||||
public boolean renameNode(DuplicateEntry renamedEntry)
|
||||
{
|
||||
return template.update(QUERY_RENAME_NODE_ID, renamedEntry) > 0;
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -92,27 +92,30 @@ public class MigrateAttrAVMLocksPatch extends AbstractPatch
|
||||
Map<String, Object> result = (Map<String, Object>)valueObject;
|
||||
|
||||
String wpStoreId = (String)result.get("wpStoreId");
|
||||
String relPath = (String)result.get("relPath");
|
||||
String path = (String)result.get("relPath");
|
||||
String avmStore = (String)result.get("avmStore");
|
||||
String lockOwner = (String)result.get("owner1");
|
||||
|
||||
relPath = AVMLockingServiceImpl.normalizePath(relPath);
|
||||
String relPath = AVMLockingServiceImpl.normalizePath(path);
|
||||
|
||||
HashMap<String, String> lockData = new HashMap<String, String>(2);
|
||||
lockData.put(AVMLockingServiceImpl.KEY_LOCK_OWNER, lockOwner);
|
||||
lockData.put(WCMUtil.LOCK_KEY_STORE_NAME, avmStore);
|
||||
|
||||
attributeService.createAttribute(
|
||||
lockData,
|
||||
AVMLockingServiceImpl.KEY_AVM_LOCKS, wpStoreId, relPath);
|
||||
|
||||
if (logger.isTraceEnabled())
|
||||
|
||||
if (!attributeService.exists(AVMLockingServiceImpl.KEY_AVM_LOCKS, wpStoreId, relPath))
|
||||
{
|
||||
logger.trace("Set AVM Lock attr [wpStoreId="+wpStoreId+", relPath="+relPath+", lockOwner="+lockOwner+", avmStore="+avmStore+"]");
|
||||
attributeService.createAttribute(lockData, AVMLockingServiceImpl.KEY_AVM_LOCKS, wpStoreId, relPath);
|
||||
if (logger.isTraceEnabled())
|
||||
{
|
||||
logger.trace("Set AVM Lock attr [wpStoreId=" + wpStoreId + ", relPath=" + relPath + ", lockOwner=" + lockOwner + ", avmStore=" + avmStore + "]");
|
||||
}
|
||||
total++;
|
||||
}
|
||||
|
||||
total++;
|
||||
|
||||
else
|
||||
{
|
||||
logger.warn("'" + path + "' path has duplicates in normalized form. AVM lock unique attribute creation has been skipped");
|
||||
}
|
||||
|
||||
if (logger.isDebugEnabled() && (total == 0 || (total % 1000 == 0) ))
|
||||
{
|
||||
logger.debug(" Handled " + total + " AVM Lock attributes");
|
||||
|
||||
Reference in New Issue
Block a user