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

More ALF-588: MT - delete tenant requires deleteStore

Browse Source 
- Reintroduced testDeleteStore
 - Added 'protocolsToIgnore' property to index recovery components
 - Added 'deleted' protocol to all ignorable store settings (ADM indexer, index recovery)
 - Return 'NodeRef.Status' for transaction changes queries (removes N+1 calls back to NodeService)


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@22290 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Derek Hulley
2010-09-07 11:09:20 +00:00
parent 6f42e152e7
commit 9e87100a6b
11 changed files with 117 additions and 152 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
config/alfresco/core-services-context.xml
View File

@@ -528,6 +528,9 @@
</property>
<property name="redirectedProtocolBindings">
<map>
<entry key="deleted">
<ref bean="admLuceneUnIndexedIndexerAndSearcherFactory"></ref>
</entry>
<entry key="workspace">
<ref bean="admLuceneIndexerAndSearcherFactory"></ref>
</entry>

15
config/alfresco/ibatis/org.hibernate.dialect.Dialect/node-common-SqlMap.xml
View File

@@ -69,6 +69,15 @@
<result property="uuid" column="uuid" jdbcType="VARCHAR" javaType="java.lang.String"/>
<result property="deleted" column="node_deleted" jdbcType="BIT" javaType="java.lang.Boolean" />
</resultMap>
<resultMap id="result_NodeStatus" class="Node">
<result property="id" column="id" jdbcType="BIGINT" javaType="java.lang.Long"/>
<result property="store.protocol" column="protocol" jdbcType="VARCHAR" javaType="java.lang.String"/>
<result property="store.identifier" column="identifier" jdbcType="VARCHAR" javaType="java.lang.String"/>
<result property="uuid" column="uuid" jdbcType="VARCHAR" javaType="java.lang.String"/>
<result property="deleted" column="node_deleted" jdbcType="BIT" javaType="java.lang.Boolean" />
<result property="transaction.id" column="txn_id" jdbcType="BIGINT" javaType="java.lang.Long"/>
<result property="transaction.changeTxnId" column="txn_change_id" jdbcType="VARCHAR" javaType="java.lang.String"/>
</resultMap>
<resultMap id="result_Node" class="Node">
<result property="id" column="id" jdbcType="BIGINT" javaType="java.lang.Long"/>
<result property="version" column="version" jdbcType="BIGINT" javaType="java.lang.Long"/>
@@ -893,13 +902,15 @@
)
</select>
<select id="select_TxnNodes" parameterClass="TransactionQuery" resultMap="result_NodeRef">
<select id="select_TxnNodes" parameterClass="TransactionQuery" resultMap="result_NodeStatus">
select
node.id as id,
store.protocol as protocol,
store.identifier as identifier,
node.uuid as uuid,
node.node_deleted as node_deleted
node.node_deleted as node_deleted,
txn.id as txn_id,
txn.change_txn_id as txn_change_id
from
alf_node node
join alf_store store on (store.id = node.store_id)

5
config/alfresco/index-recovery-context.xml
View File

@@ -46,6 +46,11 @@
<property name="tenantService">
<ref bean="tenantService" />
</property>
<property name="storeProtocolsToIgnore">
<list>
<value>deleted</value>
</list>
</property>
<property name="storesToIgnore">
<list>
<value>${version.store.version2Store}</value>

2
source/java/org/alfresco/repo/avm/AVMNodeService.java
View File

@@ -306,7 +306,7 @@ public class AVMNodeService extends AbstractNodeServiceImpl implements NodeServi
{
// TODO Need to find out if this is important and if so
// need to capture Transaction IDs.
return new NodeRef.Status("Unknown", null, !exists(nodeRef));
return new NodeRef.Status(nodeRef, "Unknown", null, !exists(nodeRef));
}
/**

12
source/java/org/alfresco/repo/domain/node/AbstractNodeDAOImpl.java
View File

@@ -775,7 +775,7 @@ public abstract class AbstractNodeDAOImpl implements NodeDAO, BatchingDAO
else
{
Transaction txn = node.getTransaction();
return new NodeRef.Status(txn.getChangeTxnId(), txn.getId(), node.getDeleted());
return new NodeRef.Status(nodeRef, txn.getChangeTxnId(), txn.getId(), node.getDeleted());
}
}
@@ -3053,23 +3053,23 @@ public abstract class AbstractNodeDAOImpl implements NodeDAO, BatchingDAO
return selectTxnById(txnId);
}
public List<NodeRef> getTxnChanges(Long txnId)
public List<NodeRef.Status> getTxnChanges(Long txnId)
{
return getTxnChangesForStore(null, txnId);
}
public List<NodeRef> getTxnChangesForStore(StoreRef storeRef, Long txnId)
public List<NodeRef.Status> getTxnChangesForStore(StoreRef storeRef, Long txnId)
{
Long storeId = (storeRef == null) ? null : getStoreNotNull(storeRef).getId();
List<NodeEntity> nodes = selectTxnChanges(txnId, storeId);
// Convert
List<NodeRef> nodeRefs = new ArrayList<NodeRef>(nodes.size());
List<NodeRef.Status> nodeStatuses = new ArrayList<NodeRef.Status>(nodes.size());
for (NodeEntity node : nodes)
{
nodeRefs.add(node.getNodeRef());
nodeStatuses.add(node.getNodeStatus());
}
// Done
return nodeRefs;
return nodeStatuses;
}
public int getTxnUpdateCount(Long txnId)

8
source/java/org/alfresco/repo/domain/node/NodeDAO.java
View File

@@ -593,14 +593,14 @@ public interface NodeDAO extends NodeBulkLoader
public int getTransactionCount();
/**
* @deprecated Replace with query returning a Node object
* @return Returns the node statuses for a transaction, limited to the store
*/
public List<NodeRef> getTxnChangesForStore(StoreRef storeRef, Long txnId);
public List<NodeRef.Status> getTxnChangesForStore(StoreRef storeRef, Long txnId);
/**
* @deprecated Replace with query returning a Node object
* @return Returns the node statuses for a transaction, regardless of store
*/
public List<NodeRef> getTxnChanges(Long txnId);
public List<NodeRef.Status> getTxnChanges(Long txnId);
public List<Long> getTxnsUnused(Long minTxnId, long maxCommitTime, int count);

6
source/java/org/alfresco/repo/domain/node/NodeEntity.java
View File

@@ -140,6 +140,12 @@ public class NodeEntity implements Node
return new NodeRef(store.getStoreRef(), uuid);
}
public NodeRef.Status getNodeStatus()
{
NodeRef nodeRef = new NodeRef(store.getStoreRef(), uuid);
return new NodeRef.Status(nodeRef, transaction.getChangeTxnId(), transaction.getId(), deleted);
}
public Pair<Long, NodeRef> getNodePair()
{
return new Pair<Long, NodeRef>(id, getNodeRef());

9
source/java/org/alfresco/repo/node/BaseNodeServiceTest.java
View File

@@ -463,20 +463,17 @@ public abstract class BaseNodeServiceTest extends BaseSpringTest
assertTrue("New store not present is list of stores", storeRefs.contains(storeRef));
}
/**
* TODO: Comment back in and fix up IndexCheckServiceTest
*/
public void xtestDeleteStore() throws Exception
public void testDeleteStore() throws Exception
{
StoreRef storeRef = createStore();
// get all stores
List<StoreRef> storeRefs = nodeService.getStores();
// check that the store ref is present
assertTrue("New store not present is list of stores", storeRefs.contains(storeRef));
assertTrue("New store not present in list of stores", storeRefs.contains(storeRef));
// Delete it
nodeService.deleteStore(storeRef);
storeRefs = nodeService.getStores();
assertFalse("Deleted store should not present is list of stores", storeRefs.contains(storeRef));
assertFalse("Deleted store should not present in list of stores", storeRefs.contains(storeRef));
// Now make sure that none of the stores have the "deleted" protocol
for (StoreRef retrievedStoreRef : storeRefs)
{

165
source/java/org/alfresco/repo/node/index/AbstractReindexComponent.java
View File

@@ -20,9 +20,10 @@ package org.alfresco.repo.node.index;
import java.io.PrintWriter;
import java.io.StringWriter;
import java.util.ArrayList;
import java.util.HashSet;
import java.util.Iterator;
import java.util.List;
import java.util.Set;
import java.util.concurrent.LinkedBlockingQueue;
import java.util.concurrent.ThreadPoolExecutor;
import java.util.concurrent.atomic.AtomicInteger;
@@ -48,15 +49,14 @@ import org.alfresco.service.cmr.repository.ChildAssociationRef;
import org.alfresco.service.cmr.repository.NodeRef;
import org.alfresco.service.cmr.repository.NodeService;
import org.alfresco.service.cmr.repository.StoreRef;
import org.alfresco.service.cmr.repository.NodeRef.Status;
import org.alfresco.service.cmr.search.ResultSet;
import org.alfresco.service.cmr.search.SearchParameters;
import org.alfresco.service.cmr.search.SearchService;
import org.alfresco.util.ParameterCheck;
import org.alfresco.util.PropertyCheck;
import org.alfresco.util.VmShutdownListener;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.springframework.extensions.surf.util.ParameterCheck;
/**
* Abstract helper for reindexing.
@@ -91,7 +91,8 @@ public abstract class AbstractReindexComponent implements IndexRecovery
private ThreadPoolExecutor threadPoolExecutor;
private TenantService tenantService;
private List<String> storesToIgnore = new ArrayList<String>(0);
private Set<String> storeProtocolsToIgnore = new HashSet<String>(7);
private Set<StoreRef> storesToIgnore = new HashSet<StoreRef>(7);
private volatile boolean shutdown;
private final WriteLock indexerWriteLock;
@@ -208,14 +209,42 @@ public abstract class AbstractReindexComponent implements IndexRecovery
this.tenantService = tenantService;
}
public void setStoresToIgnore(List<String> storesToIgnore)
/**
* @param storeProtocolsToIgnore a list of store protocols that will be ignored
* by the index check code e.g. 'deleted' in 'deleted://MyStore'
* @since 3.4
*/
public void setStoreProtocolsToIgnore(List<String> storeProtocolsToIgnore)
{
this.storesToIgnore = storesToIgnore;
for (String storeProtocolToIgnore : storeProtocolsToIgnore)
{
this.storeProtocolsToIgnore.add(storeProtocolToIgnore);
}
}
public List<String> getStoresToIgnore()
/**
* @param storesToIgnore a list of store references that will be ignored
* by the index check code e.g. 'test://TestOne'
*/
public void setStoresToIgnore(List<String> storesToIgnore)
{
return this.storesToIgnore;
for (String storeToIgnore : storesToIgnore)
{
StoreRef storeRef = new StoreRef(storeToIgnore);
this.storesToIgnore.add(storeRef);
}
}
/**
* Find out if a store is ignored by the indexing code
*
* @param storeRef the store to check
* @return Returns <tt>true</tt> if the store reference provided is not indexed
*/
public boolean isIgnorableStore(StoreRef storeRef)
{
storeRef = tenantService.getBaseName(storeRef); // Convert to tenant-safe check
return storesToIgnore.contains(storeRef) || storeProtocolsToIgnore.contains(storeRef.getProtocol());
}
/**
@@ -242,13 +271,14 @@ public abstract class AbstractReindexComponent implements IndexRecovery
*/
public final void reindex()
{
// PropertyCheck.mandatory(this, "authenticationComponent", this.authenticationComponent);
PropertyCheck.mandatory(this, "ftsIndexer", this.ftsIndexer);
PropertyCheck.mandatory(this, "indexer", this.indexer);
PropertyCheck.mandatory(this, "searcher", this.searcher);
PropertyCheck.mandatory(this, "nodeService", this.nodeService);
PropertyCheck.mandatory(this, "nodeDaoService", this.nodeDAO);
PropertyCheck.mandatory(this, "transactionComponent", this.transactionService);
PropertyCheck.mandatory(this, "storesToIgnore", this.storesToIgnore);
PropertyCheck.mandatory(this, "storeProtocolsToIgnore", this.storeProtocolsToIgnore);
if (indexerWriteLock.tryLock())
{
@@ -336,21 +366,16 @@ public abstract class AbstractReindexComponent implements IndexRecovery
}
}
List<String> storesToIgnore = getStoresToIgnore();
if (storesToIgnore != null)
{
storeRefsIterator = storeRefs.iterator();
while (storeRefsIterator.hasNext())
{
// Remove stores to ignore
StoreRef storeRef = storeRefsIterator.next();
if (storesToIgnore.contains(storeRef.toString()))
if (isIgnorableStore(storeRef))
{
storeRefsIterator.remove();
}
}
}
// Change the ordering to favour the most common stores
if (storeRefs.contains(StoreRef.STORE_REF_ARCHIVE_SPACESSTORE))
@@ -369,17 +394,6 @@ public abstract class AbstractReindexComponent implements IndexRecovery
return storeRefs;
}
// Unused - comemnted out to make use clearer for isTxnPresentInIndex
// protected InIndex isTxnIdPresentInIndex(long txnId)
// {
// Transaction txn = nodeDaoService.getTxnById(txnId);
// if (txn == null)
// {
// return InIndex.YES;
// }
// return isTxnPresentInIndex(txn);
// }
/**
* Determines if a given transaction is definitely in the index or not.
*
@@ -418,39 +432,6 @@ public abstract class AbstractReindexComponent implements IndexRecovery
// If none of the stores have the transaction, then that might be because it consists of 0 modifications
int updateCount = nodeDAO.getTxnUpdateCount(txnId);
/* Alternative (r15360)
// exclude updates in the version store
if(updateCount > 0)
{
// the updates could all be in the version stores ...
List<NodeRef> changes = nodeDaoService.getTxnChanges(txnId);
for(NodeRef change : changes)
{
StoreRef changeStore = change.getStoreRef();
if(changeStore.getProtocol().equals(StoreRef.PROTOCOL_WORKSPACE))
{
if(changeStore.getIdentifier().equals("lightWeightVersionStore"))
{
Status nodeStatus = nodeService.getNodeStatus(change);
if(!nodeStatus.isDeleted())
{
updateCount--;
}
}
if(changeStore.getIdentifier().equals("version2Store"))
{
Status nodeStatus = nodeService.getNodeStatus(change);
if(!nodeStatus.isDeleted())
{
updateCount--;
}
}
}
}
}
*/
if ((updateCount > 0) && (! allUpdatedNodesCanBeIgnored(txnId)))
{
// There were updates, but there is no sign in the indexes
@@ -543,41 +524,27 @@ public abstract class AbstractReindexComponent implements IndexRecovery
protected boolean allUpdatedNodesCanBeIgnored(Long txnId)
{
ParameterCheck.mandatory("txnId", txnId);
boolean allUpdatedNodesCanBeIgnored = false;
List<String> storesToIgnore = getStoresToIgnore();
if ((storesToIgnore != null) && (storesToIgnore.size() > 0) && (txnId != null))
{
List<NodeRef> nodeRefs = nodeDAO.getTxnChanges(txnId);
List<NodeRef.Status> nodeStatuses = nodeDAO.getTxnChanges(txnId);
allUpdatedNodesCanBeIgnored = true;
for (NodeRef nodeRef : nodeRefs)
for (NodeRef.Status nodeStatus : nodeStatuses)
{
if (nodeRef != null)
{
Status nodeStatus = nodeService.getNodeStatus(nodeRef);
if (nodeStatus == null)
{
// it's not there any more
continue;
}
NodeRef nodeRef = nodeStatus.getNodeRef();
if (! nodeStatus.isDeleted())
{
// updated node (ie. not deleted)
StoreRef storeRef = nodeRef.getStoreRef();
if (tenantService != null)
{
storeRef = tenantService.getBaseName(nodeRef.getStoreRef());
}
if (! storesToIgnore.contains(storeRef.toString()))
if (!isIgnorableStore(storeRef))
{
allUpdatedNodesCanBeIgnored = false;
break;
}
}
}
}
}
return allUpdatedNodesCanBeIgnored;
}
@@ -587,13 +554,16 @@ public abstract class AbstractReindexComponent implements IndexRecovery
final Long txnId = txn.getId();
// there have been deletes, so we have to ensure that none of the nodes deleted are present in the index
// get all node refs for the transaction
List<NodeRef> nodeRefs = nodeDAO.getTxnChangesForStore(storeRef, txnId);
List<NodeRef.Status> nodeStatuses = nodeDAO.getTxnChangesForStore(storeRef, txnId);
boolean foundNodeRef = false;
for (NodeRef nodeRef : nodeRefs)
for (NodeRef.Status nodeStatus : nodeStatuses)
{
NodeRef nodeRef = nodeStatus.getNodeRef();
if (logger.isTraceEnabled())
{
logger.trace("Searching for node in index: \n" +
logger.trace(
"Searching for node in index: \n" +
" node: " + nodeRef + "\n" +
" txn: " + txnId);
}
@@ -689,12 +659,12 @@ public abstract class AbstractReindexComponent implements IndexRecovery
}
// get the node references pertinent to the transaction
List<NodeRef> nodeRefs = nodeDAO.getTxnChanges(txnId);
List<NodeRef.Status> nodeStatuses = nodeDAO.getTxnChanges(txnId);
// reindex each node
int nodeCount = 0;
for (NodeRef nodeRef : nodeRefs)
for (NodeRef.Status nodeStatus : nodeStatuses)
{
Status nodeStatus = nodeService.getNodeStatus(nodeRef);
NodeRef nodeRef = nodeStatus.getNodeRef();
if (nodeStatus == null)
{
// it's not there any more
@@ -748,7 +718,6 @@ public abstract class AbstractReindexComponent implements IndexRecovery
private final List<Long> txnIds;
private long lastIndexedTimestamp;
private boolean atHeadOfQueue;
private boolean killed;
private ReindexWorkerRunnable(List<Long> txnIds)
{
@@ -760,7 +729,6 @@ public abstract class AbstractReindexComponent implements IndexRecovery
this.uidHashCode = id * 13 + 11;
this.txnIds = txnIds;
this.atHeadOfQueue = false;
this.killed = false;
recordTimestamp();
}
@@ -792,16 +760,6 @@ public abstract class AbstractReindexComponent implements IndexRecovery
return uidHashCode;
}
public synchronized void kill()
{
this.killed = true;
}
private synchronized boolean isKilled()
{
return killed;
}
/**
* @return the time that the last node was indexed (nanoseconds)
*/
@@ -912,11 +870,6 @@ public abstract class AbstractReindexComponent implements IndexRecovery
public synchronized void reindexedNode(NodeRef nodeRef)
{
// Check for forced kill
if (isKilled())
{
throw new ReindexTerminatedException();
}
recordTimestamp();
}
@@ -975,15 +928,15 @@ public abstract class AbstractReindexComponent implements IndexRecovery
peek.setAtHeadOfQueue();
}
// Check kill switch
if (peek == null || isKilled() || isAtHeadOfQueue())
if (peek == null || isAtHeadOfQueue())
{
// Going to close
break;
}
else
{
// This thread is not at the head of the queue and has not been flagged
// for death, so just wait until someone notifies us to carry on
// This thread is not at the head of the queue so just wait
// until someone notifies us to carry on
waitForHeadOfQueue();
// Loop again
}

12
source/java/org/alfresco/repo/node/index/FullIndexRecoveryComponent.java
View File

@@ -31,7 +31,6 @@ import org.alfresco.repo.transaction.RetryingTransactionHelper.RetryingTransacti
import org.alfresco.service.cmr.repository.ChildAssociationRef;
import org.alfresco.service.cmr.repository.NodeRef;
import org.alfresco.service.cmr.repository.StoreRef;
import org.alfresco.service.cmr.repository.NodeRef.Status;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.springframework.extensions.surf.util.I18NUtil;
@@ -446,16 +445,11 @@ public class FullIndexRecoveryComponent extends AbstractReindexComponent
public Object execute() throws Exception
{
// get the node references pertinent to the transaction
List<NodeRef> nodeRefs = nodeDAO.getTxnChanges(txnId);
List<NodeRef.Status> nodeStatuses = nodeDAO.getTxnChanges(txnId);
// reindex each node
for (NodeRef nodeRef : nodeRefs)
for (NodeRef.Status nodeStatus : nodeStatuses)
{
Status nodeStatus = nodeService.getNodeStatus(nodeRef);
if (nodeStatus == null)
{
// it's not there any more
continue;
}
NodeRef nodeRef = nodeStatus.getNodeRef();
if (nodeStatus.isDeleted()) // node deleted
{
// only the child node ref is relevant

4
source/java/org/alfresco/repo/node/index/FullIndexRecoveryComponentTest.java
View File

@@ -67,10 +67,6 @@ public class FullIndexRecoveryComponentTest extends TestCase
testTX = transactionService.getUserTransaction();
testTX.begin();
this.authenticationComponent.setSystemUserAsCurrentUser();
}
public void testSetup() throws Exception