mirror of
https://github.com/Alfresco/alfresco-community-repo.git
synced 2025-08-07 17:49:17 +00:00
Merged BRANCHES/DEV/V3.3-DAO-REFACTOR-5 to HEAD:
20678: DAO5 branch: Preparation for merge back to HEAD
20689: Merged DAO4 to DAO5
- Removed all 'dbscripts/create/3.x/SomeDialect' and replaced with 'dbscripts/create/SomeDialect'
DB create scripts are taken from latest DAO4
- TODO: FixAuthoritiesCrcValuesPatch needs query implementation in PatchDAO
Merged DAO3 to DAO4
- Reapplied fixes for ALF-713 (race condition on Usages)
19350: Merged BRANCHES/DEV/V3.3-DAO-REFACTOR-2 to BRANCHES/DEV/V3.3-DAO-REFACTOR-3:
18939: SAIL-4 :2nd stage branch for DAO refactor off HEAD rev 18898
18948: Merged V3.3-DAO-REFACTOR to V3.3-DAO-REFACTOR-2
18202: Dev branch for DAO refactor
18252: SAIL-233: QName.hbm.xml
18295: Added missing CREATE TABLE statements for QName-related code
18324: SAIL-234: Node.hbm.xml: Node aspects initial integration
18355: Added 'setValue' method to manually update the cached value
18356: MV property stressing lowered to speed test up
18357: SAIL-234: Node.hbm.xml
18376: Pulled all Alfresco-related create SQL into script
18389: SAIL-234: Permissions DAO refactor - initial checkpoint
18390: Formatting only (line-endings)
18400: SAIL-234: Node.hbm.xml
18418: SAIL-234: Node.hbm.xml: 'alf_node_assoc' CRUD
18429: SAIL-234: Node.hbm.xml: Cleaned out all Hibernate references to NodeAssocImpl
18457: SAIL-234: Permissions DAO refactor
18959: Merged DEV/V3.3-DAO-REFACTOR to DEV/V3.3-DAO-REFACTOR-2
18479: SAIL-234: Node.hbm.xml - fix updateNode (missing id when saving oldDummyNode)
18482: SAIL-235: remove Permissions.hbm.xml
18517: SAIL-235: Permissions DAO refactor
18523: SAIL-234: Node.hbm.xml
18524: SAIL-235: Permissions DAO refactor
18960: Merged DEV/V3.3-DAO-REFACTOR to DEV/V3.3-DAO-REFACTOR-2
18533: Flipped back to Windows line endings
18535: Formatting-only (eol)
18540: Formatting-only (eol)
18541: SAIL-235: Permissions DAO refactor
18543: SAIL-234: Node.hbm.xml: Start alf_store changes
18567: SAIL-235: Permissions DAO refactor
18596: SAIL-305: Alfresco DDL - formatted/rationalized and added missing indexes & fk constraints
18603: SAIL-311: Minor cleanup for schema upgrade scripts (V3.3)
18604: SAIL-311: Remove empty dirs
18619: SAIL-274: Locale.hbm.xml
18621: Added method to create default ACL
18622: SAIL-234: Node.hbm.xml: Store, Transaction, Server and some node
18624: Formatting only (eol)
18631: SAIL-235: Permissions DAO refactor
18633: SAIL-235: Permissions DAO refactor - do not expose CRUD for AceContext (or AuthorityAlias) since currently unused
18639: getLocale(Locale) should return null if it doesn't exist
18640: SAIL-234 NodeDAO: More replacement of node queries and updates
18648: SAIL-310: Create SQL script for core repo tables (All DB ports)
18651: SAIL-234 NodeDAO: Moves across stores handle presence of target deleted nodes
18961: Merged DEV/V3.3-DAO-REFACTOR to DEV/V3.3-DAO-REFACTOR-2
18658: SAIL-274 Locale DAO: Missing getValueKey() method
18662: SAIL-235: Permissions DAO refactor - further cleanup (of DbAccessControlList usage, including copyACLs)
18664: DB scripts porting for PostgreSQL finished.
18668: SAIL-234 Node DAO: Note in case Transaction Change ID is dropped from indexes
18669: SAIL-234 Node DAO: deleteNode and archive (store move) fixes
18672: DB scripts porting for Oracle finished.
18675: SAIL-235: Permissions DAO refactor
18677: DB scripts porting for DB2 finished.
18964: Merged DEV/V3.3-DAO-REFACTOR to DEV/V3.3-DAO-REFACTOR-2
18687: Execute a callback with retries
18688: SAIL-234 Node DAO: Child association creation
18690: SAIL-234 Node DAO: Comment out raw creation of stores as it breaks subsequent bootstrap checks
18691: SAIL-234 Node DAO: More replacement of alf_child_assoc handling
18713: Commented about needing a more efficient removeChildAssociation method
18714: SAIL-234 Node DAO: Replaced queries on alf_child_assoc
18715: SAIL-234 Node DAO: More alf_child_assoc query replacement
18727: SAIL-234 Node DAO: alf_child_assoc queries complete
18737: SAIL-234 Node DAO: Tweaks to newNode and implemented prependPaths
18741: SAIL-234 and SAIL-334: Moved UsageDelta Hibernate code and queries over to UsageDeltaDAO
18748: SAIL-234 Node DAO: fix NPE (EditionServiceImplTest)
18769: SAIL-234 Node DAO: alf_node_properties ground work
18786: SAIL-234 Node DAO: alf_node_properties and cm:auditable properties
18810: Added EqualsHelper.getMapComparison
18813: TransactionalCache propagates cache clears and removals during rollback
18826: SAIL-234 Node DAO: Moved over sundry references to NodeDaoService to NodeDAO
18849: SAIL-237: UsageDelta.hbm.xml - eol formatting only (including removal of unwanted svn:eol-style=native property)
18869: SAIL-234 NodeDAO: Fixed more references to 'nodeDaoService'
18895: SAIL-234 NodeDAO: Queries for alf_transaction
18899: SAIL-234 Node DAO: Fixed bean fetching for 'nodeDAO'
18909: SAIL-234 NodeDAO: Fixes to getNodeRefStatus and various txn queries
18916: SAIL-234 NodeDAO: Fixed moveNode alf_child_assoc updates
18922: SAIL-235: DAO refactoring: Permission.hbm.xml
18930: SAIL-235: DAO refactoring: Permission.hbm.xml
18932: SAIL-234 NodeDAO: Fixing up gotchas, javadocs and some naming
18933: SAIL-234 NodeDAO: Minor neatening
18935: SAIL-234 Node DAO: Caches for ID to NodeRef and StoreRef
18936: EHCache config files line endings
18938: SAIL-237: Usage DAO refactor - initial checkpoint
18945: SAIL-235: DAO refactoring: Permission.hbm.xml. Move Node.
18975: Fix for move-node ACL jiggery-pokery
19067: SAIL-4: fix VersionHistoryImpl.getSuccessors (causing VersionServiceImplTest.testGetVersionHistorySameWorkspace failure)
19068: SAIL-234: fix VersionMigratorTest.testMigrateOneVersion
19074: SAIL-237: Usage DAO - update to common iBatis mapping pattern(s) to ease DB porting
19076: SAIL-231: Activities DAO - update to common iBatis mapping pattern(s)
19077: SAIL-232: AppliedPatch DAO - minor cleanup (comments & formatting only)
19092: Merging HEAD to DEV/V3.3-DAO-REFACTOR-2
18973: Temporarily comment out AVMTestSuite and run AVM tests individually
19056: AVM unit test improvements
19097: SAIL-235: DAO refactoring: Permission.hbm.xml: Additional index to support queries to find the id and acl id for the primary children of a node.
19185: SAIL-238: Permissions DAO - (minor) update to common iBatis mapping pattern
19289: SAIL-234 NodeDAO: Node cache replaces NodeRef cache
19302: SAIL-234 Node DAO: Added cache for node properties
19318: SAIL-4: AVM DAO - (minor) update to common iBatis mapping pattern
20690: Merged BRANCHES/DEV/V3.3-DAO-REFACTOR-4 to BRANCHES/DEV/V3.3-DAO-REFACTOR-5:
20063: (RECORD ONLY) DAO refactor branch V4
20146: Merged BRANCHES/DEV/V3.3-DAO-REFACTOR-3 to BRANCHES/DEV/V3.3-DAO-REFACTOR-4:
19401: SAIL-234 Node DAO: Fix permission service tests (setPrimaryChildrenSharedAclId needs to invalidate nodesCache)
19428: Fixed TransactionalCache issue with null and NullValueMarker
19429: Took empty cm:content creation out of FileFolderService#createImpl
19430: SAIL-234 Node DAO: Tweaks around caching and cm:auditable
19431: SAIL-4 DAO Refactor: Exception thrown when attempting writes in read-only txn have changed
19436: SAIL-234 Node DAO: Fix NPE during cm:auditable update
19475: Allow debugging of code without stepping into trivial stuff
19476: Follow-up on 19429 by ensuring CIFS/FTP set a mimetype on the ContentWriter
19477: SAIL-234 Node DAO: Leverage DAO better for NodeService.addProperties
19478: SAIL-234 NodeDAO: Added toString() for ParentAssocsInfo (cache value for parent assocs)
19479: SAIL-234 Node DAO: Fixed for parent association and property caches
19480: Made TransactionAwareSingleton bind-key a GUID
19481: SAIL-234 Node DAO: Reinstated 100K collection property tests
19482: SAIL-234 Node DAO: Node and property cache fixes highlighted by unit tests
19483: SAIL-234 Node DAO: Start on NodeBulkLoader implementation
19595: SAIL-234 Node DAO: Fix moveNode to detect cyclic relationship prior to updating ACLs for moved tree FileFolderServiceImplTest.testETHREEOH_3088_MoveIntoSelf)
20147: Merged BRANCHES/DEV/V3.3-DAO-REFACTOR-3 to BRANCHES/DEV/V3.3-DAO-REFACTOR-4:
19602: (RECORD ONLY) Reintegrated with HEAD up to rev 19433
19621: (RECORD ONLY) SAIL-347
19683: (RECORD ONLY) Reverse-merged 19621 for SAIL-347
19722: (RECORD ONLY) Merged /alfresco/HEAD:r19434-19721
20150: Merged BRANCHES/DEV/V3.3-DAO-REFACTOR-3 to BRANCHES/DEV/V3.3-DAO-REFACTOR-4:
19741: Merged DEV\V3.3-DAO-REFACTOR-2 to DEV\V3.3-DAO-REFACTOR-3
19739: Extended "move" tests
19743: Fix AuditableAspectTest.testAddAspect (to allow for node modified date tolerance)
19748: Remaining part of merge from HEAD to V3.3-DAO-REFACTOR-3
19367: Merged BRANCHES/V3.2 to HEAD:
19286: Fix for ALF-626 "Using 'null' as an authority argument in clearPermissions() cause a java.lang.NullPointerException"
19755: SAIL-234 Node DAO: Fix RepoAdminServiceImplTest.testConcurrentDynamicModelDelete (handle InvalidNodeRefException after getChildAssocs)
20692: Merged BRANCHES/DEV/V3.3-DAO-REFACTOR-4 to BRANCHES/DEV/V3.3-DAO-REFACTOR-5:
- Retired all 1.3 and 1.4 upgrade scripts ... R.I.P.
- Fixed CRC patch for Authorities (only tested on MySQL)
- Fixed SQL patch revision numbers and bumped version schema number up
20158: Merged BRANCHES/DEV/V3.3-DAO-REFACTOR-3 to BRANCHES/DEV/V3.3-DAO-REFACTOR-4:
19773: SQL mappings and scripts: SAIL-310, SAIL-304, SAIL-303 and SAIL-347
19774: Futher fix for SAIL-310: Sequence patch must take into account sequences created for 3.3
19851: SAIL-371 (SAIL-294) NodeDAO fallout: Fix QName and Namespace read/write handling and bean name in unit test
20183: Merged DAO3 to DAO4
19852: SAIL-370: Remove LinkValidation
19853: SAIL-239 (SAIL-294) Attributes.hbm.xml: Added ability to attach arbitrary property to unique context
19857: SAIL-373 Fallout from Permissions DAO refactor (SAIL-235)
19864: SAIL-239 (SAIL-294): Removed AttributeService RMI API
19865: More SAIL-239 (SAIL-294): Removed AttributeService RMI API
20208: DAO-refactor implementation of ALF-2712 query improvements
20209: Merged BRANCHES/DEV/V3.3-DAO-REFACTOR-3 to BRANCHES/DEV/V3.3-DAO-REFACTOR-4:
20060: Removal of AttributeService for SAIL-239 (SAIL-294)
20348: SAIL-371 (SAIL-294): Protect collection properties during map insert and retrieval
20547: SAIL-371 (SAIL-294) Attributes.hbm.xml: implement getAttributes + fixes
20573: SAIL-371 (SAIL-294): NodeDAO: Fix unit tests and other fallout
20597: SAIL-239 Attributes.hbm.xml: WCM/AVM locking test fixes (wip)
20598: SAIL-239 Attributes.hbm.xml: WCM/AVM locking test fixes (wip) - fix AssetServiceImplTest.testSimpleLockFile NPE
20600: Fix PropertyValueDAOTest.testPropertyValue_Enum (follow-on to r20060 for SAIL-239 - which introduces ENUM prop vals)
20601: Fix UsageDAOTest.testCreateAndDeleteUsageDeltas NPE (would also affect ContentStoreCleanerScalabilityRunner)
20603: Fix CMISPropertyServiceTest.* (fallout from r20146 <- r19429 <- Took empty cm:content creation out of FileFolderService#createImpl)
20604: SAIL-371 (SAIL-294): NodeDAO: Fix unit tests - TransferServiceImplTest.*
20618: SAIL-371 (SAIL-294): NodeDAO: AuditableAspectTest (fix testCreateNodeWithAuditableProperties_ALF_2565 + add remove aspect test)
20624: SAIL-371 (SAIL-294): NodeDAO: Fix unit tests - UserUsageTest.*
20626: Fixed random keys for RuleTrigger NodeRef tracking
20635: SAIL-371 (SAIL-294): NodeDAO: Fix unit tests - PersonTest.testSplitDuplicates
20642: SAIL-371 (SAIL-294) DAO: Fixed CacheTest
20643: Removed must of the 'distribute' target's dependencies. Not for HEAD
20645: Follow-on to r20643 (Removed most of the 'distribute' target's dependencies. Not for HEAD)
20654: SAIL-371 (SAIL-294): NodeDAO: DMDeploymentTargetTest.* (do not try to remove mandatory aspects)
20655: SAIL-371 (SAIL-294): NodeDAO: Initial fix for TaggingServiceImplTest.testTagScopeUpdateViaNodePolicies (+ minor test cleanup)
20657: SAIL-371 (SAIL-294): NodeDAO: Fix unit tests - VersionMigratorTest.testMigrateOneVersion (cm:accessed not returned if null)
20658: Merged (back merge only - no merge info) BRANCHES/V3.3 to BRANCHES/DEV/V3.3-DAO-REFACTOR-4:
20090: Dynamic models: minor improvements to DictionaryModelType
20554: Improvement to model delete validation (investigating intermittent failure of RepoAdminServiceImplTest.testSimpleDynamicModelViaNodeService)
20662: SAIL-371 (SAIL-294): NodeDAO: Fix unit tests - RecordsManagementAuditServiceImplTest.* (we now ignore attempt to update 'cm:modifier' prop so update 'cm:title' prop instead)
20666: SAIL-371 (SAIL-294): NodeDAO: Fix unit tests - ADMLuceneTest.*
20668: SAIL-239 (SAIL-294) - delete WCM locks + tests (follow-on to r20060)
20674: SAIL-371 (SAIL-294) NodeDAO fallout: Cleaner and additional checks for ContentStoreCleaner
20675: SAIL-371 (SAIL-294) NodeDAO fallout: Fixed handling of ContentData
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@20693 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Derek Hulley
@@ -131,16 +131,28 @@ public class CacheTest extends TestCase
|
||||
assertNull("Non-transactional remove didn't go to backing cache", backingCache.get(key));
|
||||
}
|
||||
|
||||
private static final String NEW_GLOBAL_ONE = "new_global_one";
|
||||
private static final String NEW_GLOBAL_TWO = "new_global_two";
|
||||
private static final String NEW_GLOBAL_THREE = "new_global_three";
|
||||
private static final String UPDATE_TXN_THREE = "updated_txn_three";
|
||||
private static final String UPDATE_TXN_FOUR = "updated_txn_four";
|
||||
|
||||
public void testRollbackCleanup() throws Exception
|
||||
{
|
||||
TransactionService transactionService = serviceRegistry.getTransactionService();
|
||||
RetryingTransactionHelper txnHelper = transactionService.getRetryingTransactionHelper();
|
||||
|
||||
// Add items to the global cache
|
||||
backingCache.put(NEW_GLOBAL_ONE, NEW_GLOBAL_ONE);
|
||||
|
||||
RetryingTransactionCallback<Object> callback = new RetryingTransactionCallback<Object>()
|
||||
{
|
||||
private int throwCount = 0;
|
||||
public Object execute() throws Throwable
|
||||
{
|
||||
transactionalCache.put(NEW_GLOBAL_TWO, NEW_GLOBAL_TWO);
|
||||
transactionalCache.remove(NEW_GLOBAL_ONE);
|
||||
|
||||
String key = "B";
|
||||
String value = "BBB";
|
||||
// no transaction - do a put
|
||||
@@ -151,24 +163,32 @@ public class CacheTest extends TestCase
|
||||
throwCount++;
|
||||
throw new SQLException("Dummy");
|
||||
}
|
||||
return null;
|
||||
else
|
||||
{
|
||||
throw new Exception("Fail");
|
||||
}
|
||||
}
|
||||
};
|
||||
txnHelper.doInTransaction(callback);
|
||||
try
|
||||
{
|
||||
txnHelper.doInTransaction(callback);
|
||||
}
|
||||
catch (Exception e)
|
||||
{
|
||||
// Expected
|
||||
}
|
||||
|
||||
assertFalse("Remove not done after rollback", transactionalCache.contains(NEW_GLOBAL_ONE));
|
||||
assertFalse("Update happened after rollback", transactionalCache.contains(NEW_GLOBAL_TWO));
|
||||
}
|
||||
|
||||
public void testTransactionalCacheWithSingleTxn() throws Throwable
|
||||
{
|
||||
String newGlobalOne = "new_global_one";
|
||||
String newGlobalTwo = "new_global_two";
|
||||
String newGlobalThree = "new_global_three";
|
||||
String updatedTxnThree = "updated_txn_three";
|
||||
String updatedTxnFour = "updated_txn_four";
|
||||
|
||||
// add item to global cache
|
||||
backingCache.put(newGlobalOne, newGlobalOne);
|
||||
backingCache.put(newGlobalTwo, newGlobalTwo);
|
||||
backingCache.put(newGlobalThree, newGlobalThree);
|
||||
backingCache.put(NEW_GLOBAL_ONE, NEW_GLOBAL_ONE);
|
||||
backingCache.put(NEW_GLOBAL_TWO, NEW_GLOBAL_TWO);
|
||||
backingCache.put(NEW_GLOBAL_THREE, NEW_GLOBAL_THREE);
|
||||
|
||||
TransactionService transactionService = serviceRegistry.getTransactionService();
|
||||
UserTransaction txn = transactionService.getUserTransaction();
|
||||
@@ -178,29 +198,29 @@ public class CacheTest extends TestCase
|
||||
txn.begin();
|
||||
|
||||
// remove 1 from the cache
|
||||
transactionalCache.remove(newGlobalOne);
|
||||
assertFalse("Item was not removed from txn cache", transactionalCache.contains(newGlobalOne));
|
||||
assertNull("Get didn't return null", transactionalCache.get(newGlobalOne));
|
||||
assertTrue("Item was removed from backing cache", backingCache.contains(newGlobalOne));
|
||||
transactionalCache.remove(NEW_GLOBAL_ONE);
|
||||
assertFalse("Item was not removed from txn cache", transactionalCache.contains(NEW_GLOBAL_ONE));
|
||||
assertNull("Get didn't return null", transactionalCache.get(NEW_GLOBAL_ONE));
|
||||
assertTrue("Item was removed from backing cache", backingCache.contains(NEW_GLOBAL_ONE));
|
||||
|
||||
// update 3 in the cache
|
||||
transactionalCache.put(updatedTxnThree, "XXX");
|
||||
assertEquals("Item not updated in txn cache", "XXX", transactionalCache.get(updatedTxnThree));
|
||||
transactionalCache.put(UPDATE_TXN_THREE, "XXX");
|
||||
assertEquals("Item not updated in txn cache", "XXX", transactionalCache.get(UPDATE_TXN_THREE));
|
||||
assertFalse("Item was put into backing cache (excl. NullValueMarker)",
|
||||
backingCache.contains(updatedTxnThree) &&
|
||||
!(backingCache.get(updatedTxnThree) instanceof NullValueMarker));
|
||||
backingCache.contains(UPDATE_TXN_THREE) &&
|
||||
!(backingCache.get(UPDATE_TXN_THREE) instanceof NullValueMarker));
|
||||
|
||||
// check that the keys collection is correct
|
||||
Collection<String> transactionalKeys = transactionalCache.getKeys();
|
||||
assertFalse("Transactionally removed item found in keys", transactionalKeys.contains(newGlobalOne));
|
||||
assertTrue("Transactionally added item not found in keys", transactionalKeys.contains(updatedTxnThree));
|
||||
assertFalse("Transactionally removed item found in keys", transactionalKeys.contains(NEW_GLOBAL_ONE));
|
||||
assertTrue("Transactionally added item not found in keys", transactionalKeys.contains(UPDATE_TXN_THREE));
|
||||
|
||||
// Register a post-commit cache reader to make sure that nothing blows up if the cache is hit in post-commit
|
||||
PostCommitCacheReader listenerReader = new PostCommitCacheReader(transactionalCache, updatedTxnThree);
|
||||
PostCommitCacheReader listenerReader = new PostCommitCacheReader(transactionalCache, UPDATE_TXN_THREE);
|
||||
AlfrescoTransactionSupport.bindListener(listenerReader);
|
||||
|
||||
// Register a post-commit cache reader to make sure that nothing blows up if the cache is hit in post-commit
|
||||
PostCommitCacheWriter listenerWriter = new PostCommitCacheWriter(transactionalCache, updatedTxnFour, "FOUR");
|
||||
PostCommitCacheWriter listenerWriter = new PostCommitCacheWriter(transactionalCache, UPDATE_TXN_FOUR, "FOUR");
|
||||
AlfrescoTransactionSupport.bindListener(listenerWriter);
|
||||
|
||||
// commit the transaction
|
||||
@@ -217,13 +237,13 @@ public class CacheTest extends TestCase
|
||||
}
|
||||
|
||||
// check that backing cache was updated with the in-transaction changes
|
||||
assertFalse("Item was not removed from backing cache", backingCache.contains(newGlobalOne));
|
||||
assertNull("Item could still be fetched from backing cache", backingCache.get(newGlobalOne));
|
||||
assertEquals("Item not updated in backing cache", "XXX", backingCache.get(updatedTxnThree));
|
||||
assertFalse("Item was not removed from backing cache", backingCache.contains(NEW_GLOBAL_ONE));
|
||||
assertNull("Item could still be fetched from backing cache", backingCache.get(NEW_GLOBAL_ONE));
|
||||
assertEquals("Item not updated in backing cache", "XXX", backingCache.get(UPDATE_TXN_THREE));
|
||||
|
||||
// Check that the transactional cache serves get requests
|
||||
assertEquals("Transactional cache must serve post-commit get requests", "XXX",
|
||||
transactionalCache.get(updatedTxnThree));
|
||||
transactionalCache.get(UPDATE_TXN_THREE));
|
||||
}
|
||||
catch (Throwable e)
|
||||
{
|
||||
|
||||
@@ -25,7 +25,6 @@ import java.util.Map;
|
||||
import java.util.Set;
|
||||
|
||||
import net.sf.ehcache.CacheException;
|
||||
import net.sf.ehcache.CacheManager;
|
||||
|
||||
import org.alfresco.error.AlfrescoRuntimeException;
|
||||
import org.alfresco.repo.transaction.AlfrescoTransactionSupport;
|
||||
@@ -141,13 +140,6 @@ public class TransactionalCache<K extends Serializable, V extends Object>
|
||||
this.sharedCache = sharedCache;
|
||||
}
|
||||
|
||||
/**
|
||||
* No-op
|
||||
*/
|
||||
public void setCacheManager(CacheManager cacheManager)
|
||||
{
|
||||
}
|
||||
|
||||
/**
|
||||
* Set the maximum number of elements to store in the update and remove caches.
|
||||
* The maximum number of elements stored in the transaction will be twice the
|
||||
@@ -370,6 +362,7 @@ public class TransactionalCache<K extends Serializable, V extends Object>
|
||||
* Where a transaction is present, a cache of updated items is lazily added to the
|
||||
* thread and the <tt>Object</tt> put onto that.
|
||||
*/
|
||||
@SuppressWarnings("unchecked")
|
||||
public void put(K key, V value)
|
||||
{
|
||||
// are we in a transaction?
|
||||
@@ -417,14 +410,9 @@ public class TransactionalCache<K extends Serializable, V extends Object>
|
||||
txnData.haveIssuedFullWarning = true;
|
||||
}
|
||||
}
|
||||
Object existingValueObj = sharedCache.get(key);
|
||||
CacheBucket<V> bucket = null;
|
||||
if (sharedCache.contains(key))
|
||||
{
|
||||
V existingValue = getSharedCacheValue(key);
|
||||
// The value needs to be kept for later checks
|
||||
bucket = new UpdateCacheBucket<V>(existingValue, value);
|
||||
}
|
||||
else
|
||||
if (existingValueObj == null)
|
||||
{
|
||||
// Insert a 'null' marker into the shared cache
|
||||
NullValueMarker nullMarker = new NullValueMarker();
|
||||
@@ -432,6 +420,16 @@ public class TransactionalCache<K extends Serializable, V extends Object>
|
||||
// The value didn't exist before
|
||||
bucket = new NewCacheBucket<V>(nullMarker, value);
|
||||
}
|
||||
else if (existingValueObj instanceof NullValueMarker)
|
||||
{
|
||||
// Record the null as is
|
||||
bucket = new NewCacheBucket<V>((NullValueMarker)existingValueObj, value);
|
||||
}
|
||||
else
|
||||
{
|
||||
// Record the existing value as is
|
||||
bucket = new UpdateCacheBucket<V>((V)existingValueObj, value);
|
||||
}
|
||||
txnData.updatedItemsCache.put(key, bucket);
|
||||
// remove the item from the removed cache, if present
|
||||
txnData.removedItemsCache.remove(key);
|
||||
@@ -619,21 +617,19 @@ public class TransactionalCache<K extends Serializable, V extends Object>
|
||||
sharedCache.clear();
|
||||
if (isDebugEnabled)
|
||||
{
|
||||
logger.debug("Clear notification recieved at end of transaction - clearing shared cache");
|
||||
logger.debug("Clear notification recieved in commit - clearing shared cache");
|
||||
}
|
||||
}
|
||||
else
|
||||
{
|
||||
// transfer any removed items
|
||||
// any removed items will have also been removed from the in-transaction updates
|
||||
// propogate the deletes to the shared cache
|
||||
for (Serializable key : txnData.removedItemsCache)
|
||||
{
|
||||
sharedCache.remove(key);
|
||||
}
|
||||
if (isDebugEnabled)
|
||||
{
|
||||
logger.debug("Removed " + txnData.removedItemsCache.size() + " values from shared cache");
|
||||
logger.debug("Removed " + txnData.removedItemsCache.size() + " values from shared cache in commit");
|
||||
}
|
||||
}
|
||||
|
||||
@@ -661,13 +657,45 @@ public class TransactionalCache<K extends Serializable, V extends Object>
|
||||
}
|
||||
|
||||
/**
|
||||
* Just allow the transactional caches to be thrown away
|
||||
* Transfers cache removals or clears. This allows explicit cache cleanup to be propagated
|
||||
* to the shared cache even in the event of rollback - useful if the cause of a problem is
|
||||
* the shared cache value.
|
||||
*/
|
||||
public void afterRollback()
|
||||
{
|
||||
TransactionData txnData = getTransactionData();
|
||||
// drop caches from cachemanager
|
||||
removeCaches(txnData);
|
||||
try
|
||||
{
|
||||
if (txnData.isClearOn)
|
||||
{
|
||||
// clear shared cache
|
||||
sharedCache.clear();
|
||||
if (isDebugEnabled)
|
||||
{
|
||||
logger.debug("Clear notification recieved in rollback - clearing shared cache");
|
||||
}
|
||||
}
|
||||
else
|
||||
{
|
||||
// transfer any removed items
|
||||
for (Serializable key : txnData.removedItemsCache)
|
||||
{
|
||||
sharedCache.remove(key);
|
||||
}
|
||||
if (isDebugEnabled)
|
||||
{
|
||||
logger.debug("Removed " + txnData.removedItemsCache.size() + " values from shared cache in rollback");
|
||||
}
|
||||
}
|
||||
}
|
||||
catch (CacheException e)
|
||||
{
|
||||
throw new AlfrescoRuntimeException("Failed to transfer updates to shared cache", e);
|
||||
}
|
||||
finally
|
||||
{
|
||||
removeCaches(txnData);
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
|
||||
@@ -488,7 +488,7 @@ public class EntityLookupCache<K extends Serializable, V extends Object, VK exte
|
||||
* by the {@link RetryingTransactionHelper#RETRY_EXCEPTIONS RetryingTransactionHelper}.
|
||||
*
|
||||
* @param key The entity key, which may be valid or invalid (<tt>null</tt> not allowed)
|
||||
* @param value The new entity value (may be null <tt>null</tt>)
|
||||
* @param value The new entity value (may be <tt>null</tt>)
|
||||
* @return Returns the row update count.
|
||||
*/
|
||||
@SuppressWarnings("unchecked")
|
||||
@@ -528,6 +528,40 @@ public class EntityLookupCache<K extends Serializable, V extends Object, VK exte
|
||||
return updateCount;
|
||||
}
|
||||
|
||||
/**
|
||||
* Cache-only operation: Update the cache's value
|
||||
*
|
||||
* @param key The entity key, which may be valid or invalid (<tt>null</tt> not allowed)
|
||||
* @param value The new entity value (may be <tt>null</tt>)
|
||||
*/
|
||||
@SuppressWarnings("unchecked")
|
||||
public void setValue(K key, V value)
|
||||
{
|
||||
// Handle missing cache
|
||||
if (cache == null)
|
||||
{
|
||||
return;
|
||||
}
|
||||
|
||||
// Remove entries for the key (bidirectional removal removes the old value as well)
|
||||
removeByKey(key);
|
||||
|
||||
// Get the value key.
|
||||
VK valueKey = (value == null) ? (VK)VALUE_NULL : entityLookup.getValueKey(value);
|
||||
// Check if the value has a good key
|
||||
if (valueKey != null)
|
||||
{
|
||||
// There is a good value key, cache by value
|
||||
CacheRegionValueKey valueCacheKey = new CacheRegionValueKey(cacheRegion, valueKey);
|
||||
cache.put(valueCacheKey, key);
|
||||
}
|
||||
// Cache by key
|
||||
cache.put(
|
||||
new CacheRegionKey(cacheRegion, key),
|
||||
(value == null ? VALUE_NULL : value));
|
||||
// Done
|
||||
}
|
||||
|
||||
/**
|
||||
* Delete the entity associated with the given key.
|
||||
* The {@link EntityLookupCallbackDAO#deleteByKey(Serializable)} callback will be used if necessary.
|
||||
|
||||
Reference in New Issue
Block a user