February 2009 - jbosscache-commits

JBoss Cache SVN: r7675 - in core/branches/flat/src: main/java/org/horizon/config and 10 other directories.

by jbosscache-commits＠lists.jboss.org

Author: manik.surtani(a)jboss.com Date: 2009-02-10 08:55:59 -0500 (Tue, 10 Feb 2009) New Revision: 7675 Added: core/branches/flat/src/main/java/org/horizon/loaderold/ Removed: core/branches/flat/src/main/java/org/horizon/loader_old/ Modified: core/branches/flat/src/main/java/org/horizon/config/CacheLoaderConfig.java core/branches/flat/src/main/java/org/horizon/container/UnsortedDataContainer.java core/branches/flat/src/main/java/org/horizon/factories/AbstractComponentRegistry.java core/branches/flat/src/main/java/org/horizon/factories/EmptyConstructorNamedCacheFactory.java core/branches/flat/src/main/java/org/horizon/interceptors/CacheLoaderInterceptor.java core/branches/flat/src/main/java/org/horizon/interceptors/CacheStoreInterceptor.java core/branches/flat/src/main/java/org/horizon/loaderold/AbstractCacheLoaderOld.java core/branches/flat/src/main/java/org/horizon/loaderold/AbstractDelegatingCacheLoaderOld.java core/branches/flat/src/main/java/org/horizon/loaderold/AsyncCacheLoaderConfig.java core/branches/flat/src/main/java/org/horizon/loaderold/AsyncCacheLoaderOld.java core/branches/flat/src/main/java/org/horizon/loaderold/CacheLoader.java core/branches/flat/src/main/java/org/horizon/loaderold/CacheLoaderManager.java core/branches/flat/src/main/java/org/horizon/loaderold/CacheLoaderOld.java core/branches/flat/src/main/java/org/horizon/loaderold/CacheStore.java core/branches/flat/src/main/java/org/horizon/loaderold/ChainingCacheLoaderOld.java core/branches/flat/src/main/java/org/horizon/loaderold/ClusteredCacheLoaderConfig.java core/branches/flat/src/main/java/org/horizon/loaderold/ClusteredCacheLoaderOld.java core/branches/flat/src/main/java/org/horizon/loaderold/FileCacheLoaderConfig.java core/branches/flat/src/main/java/org/horizon/loaderold/FileCacheLoaderOld.java core/branches/flat/src/main/java/org/horizon/loaderold/Modification.java core/branches/flat/src/main/java/org/horizon/loaderold/ReadOnlyDelegatingCacheLoaderOld.java core/branches/flat/src/main/java/org/horizon/loaderold/SingletonStoreCacheLoaderOld.java core/branches/flat/src/main/java/org/horizon/loaderold/SingletonStoreDefaultConfig.java core/branches/flat/src/main/java/org/horizon/loaderold/StoredEntry.java core/branches/flat/src/main/java/org/horizon/marshall/HorizonMarshaller.java core/branches/flat/src/main/java/org/horizon/statetransfer/DefaultStateTransferManager.java core/branches/flat/src/main/java/org/horizon/util/FileLookup.java core/branches/flat/src/main/resources/config-samples/all.xml core/branches/flat/src/test/java/org/horizon/api/tree/NodeMoveAPITest.java core/branches/flat/src/test/java/org/horizon/manager/CacheManagerComponentRegistryTest.java Log: Loaders - work in progress Modified: core/branches/flat/src/main/java/org/horizon/config/CacheLoaderConfig.java =================================================================== --- core/branches/flat/src/main/java/org/horizon/config/CacheLoaderConfig.java 2009-02-10 13:51:40 UTC (rev 7674) +++ core/branches/flat/src/main/java/org/horizon/config/CacheLoaderConfig.java 2009-02-10 13:55:59 UTC (rev 7675) @@ -21,8 +21,8 @@ */ package org.horizon.config; -import org.horizon.loader_old.CacheLoaderOld; -import org.horizon.loader_old.SingletonStoreCacheLoaderOld; +import org.horizon.loaderold.CacheLoaderOld; +import org.horizon.loaderold.SingletonStoreCacheLoaderOld; import org.horizon.util.Util; import java.util.ArrayList; Modified: core/branches/flat/src/main/java/org/horizon/container/UnsortedDataContainer.java =================================================================== --- core/branches/flat/src/main/java/org/horizon/container/UnsortedDataContainer.java 2009-02-10 13:51:40 UTC (rev 7674) +++ core/branches/flat/src/main/java/org/horizon/container/UnsortedDataContainer.java 2009-02-10 13:55:59 UTC (rev 7675) @@ -22,8 +22,8 @@ package org.horizon.container; import org.horizon.factories.annotations.Inject; -import org.horizon.loader_old.CacheLoaderManager; -import org.horizon.loader_old.CacheLoaderOld; +import org.horizon.loaderold.CacheLoaderManager; +import org.horizon.loaderold.CacheLoaderOld; import java.util.AbstractSet; import java.util.ArrayList; Modified: core/branches/flat/src/main/java/org/horizon/factories/AbstractComponentRegistry.java =================================================================== --- core/branches/flat/src/main/java/org/horizon/factories/AbstractComponentRegistry.java 2009-02-10 13:51:40 UTC (rev 7674) +++ core/branches/flat/src/main/java/org/horizon/factories/AbstractComponentRegistry.java 2009-02-10 13:55:59 UTC (rev 7675) @@ -477,7 +477,7 @@ */ public void registerDefaultClassLoader(ClassLoader loader) { registerComponent(loader == null ? getClass().getClassLoader() : loader, ClassLoader.class); - // make sure the class loader_old is non-volatile, so it survives restarts. + // make sure the class loaderold is non-volatile, so it survives restarts. componentLookup.get(ClassLoader.class.getName()).nonVolatile = true; } Modified: core/branches/flat/src/main/java/org/horizon/factories/EmptyConstructorNamedCacheFactory.java =================================================================== --- core/branches/flat/src/main/java/org/horizon/factories/EmptyConstructorNamedCacheFactory.java 2009-02-10 13:51:40 UTC (rev 7674) +++ core/branches/flat/src/main/java/org/horizon/factories/EmptyConstructorNamedCacheFactory.java 2009-02-10 13:55:59 UTC (rev 7675) @@ -28,7 +28,7 @@ import org.horizon.factories.annotations.DefaultFactoryFor; import org.horizon.factories.context.ContextFactory; import org.horizon.invocation.InvocationContextContainer; -import org.horizon.loader_old.CacheLoaderManager; +import org.horizon.loaderold.CacheLoaderManager; import org.horizon.marshall.Marshaller; import org.horizon.marshall.VersionAwareMarshaller; import org.horizon.notifications.cachelistener.CacheNotifier; Modified: core/branches/flat/src/main/java/org/horizon/interceptors/CacheLoaderInterceptor.java =================================================================== --- core/branches/flat/src/main/java/org/horizon/interceptors/CacheLoaderInterceptor.java 2009-02-10 13:51:40 UTC (rev 7674) +++ core/branches/flat/src/main/java/org/horizon/interceptors/CacheLoaderInterceptor.java 2009-02-10 13:55:59 UTC (rev 7675) @@ -35,8 +35,8 @@ import org.horizon.factories.annotations.Inject; import org.horizon.factories.annotations.Start; import org.horizon.interceptors.base.JmxStatsCommandInterceptor; -import org.horizon.loader_old.CacheLoaderManager; -import org.horizon.loader_old.CacheLoaderOld; +import org.horizon.loaderold.CacheLoaderManager; +import org.horizon.loaderold.CacheLoaderOld; import org.horizon.notifications.cachelistener.CacheNotifier; import org.horizon.transaction.TransactionTable; Modified: core/branches/flat/src/main/java/org/horizon/interceptors/CacheStoreInterceptor.java =================================================================== --- core/branches/flat/src/main/java/org/horizon/interceptors/CacheStoreInterceptor.java 2009-02-10 13:51:40 UTC (rev 7674) +++ core/branches/flat/src/main/java/org/horizon/interceptors/CacheStoreInterceptor.java 2009-02-10 13:55:59 UTC (rev 7675) @@ -39,10 +39,10 @@ import org.horizon.invocation.Options; import org.horizon.jmx.annotations.ManagedAttribute; import org.horizon.jmx.annotations.ManagedOperation; -import org.horizon.loader_old.CacheLoaderManager; -import org.horizon.loader_old.CacheLoaderOld; -import org.horizon.loader_old.Modification; -import org.horizon.loader_old.Modification.ModificationType; +import org.horizon.loaderold.CacheLoaderManager; +import org.horizon.loaderold.CacheLoaderOld; +import org.horizon.loaderold.Modification; +import org.horizon.loaderold.Modification.ModificationType; import org.horizon.logging.LogFactory; import org.horizon.transaction.GlobalTransaction; @@ -112,7 +112,7 @@ // this is a commit call. GlobalTransaction gtx = command.getGlobalTransaction(); if (trace) log.trace("Calling loader.commit() for gtx " + gtx); - // sync call (a write) on the loader_old + // sync call (a write) on the loaderold // ignore modified FQNs // List fqnsModified = getFqnsFromModificationList(txTable.get(globalTransaction).getCacheLoaderModifications()); try { Copied: core/branches/flat/src/main/java/org/horizon/loaderold (from rev 7674, core/branches/flat/src/main/java/org/horizon/loader_old) Modified: core/branches/flat/src/main/java/org/horizon/loaderold/AbstractCacheLoaderOld.java =================================================================== --- core/branches/flat/src/main/java/org/horizon/loader_old/AbstractCacheLoaderOld.java 2009-02-10 13:51:40 UTC (rev 7674) +++ core/branches/flat/src/main/java/org/horizon/loaderold/AbstractCacheLoaderOld.java 2009-02-10 13:55:59 UTC (rev 7675) @@ -19,7 +19,7 @@ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA * 02110-1301 USA, or see the FSF site: http://www.fsf.org. */ -package org.horizon.loader; +package org.horizon.loaderold; import org.horizon.Cache; import org.horizon.CacheException; @@ -142,7 +142,7 @@ public void destroy() { } - // Adds simple transactional capabilities to cache loaders that are inherently non-transactional. If your cache loader_old implementation + // Adds simple transactional capabilities to cache loaders that are inherently non-transactional. If your cache loaderold implementation // is tansactional though, then override these. public void prepare(Object tx, List<Modification> modifications, boolean one_phase) { Modified: core/branches/flat/src/main/java/org/horizon/loaderold/AbstractDelegatingCacheLoaderOld.java =================================================================== --- core/branches/flat/src/main/java/org/horizon/loader_old/AbstractDelegatingCacheLoaderOld.java 2009-02-10 13:51:40 UTC (rev 7674) +++ core/branches/flat/src/main/java/org/horizon/loaderold/AbstractDelegatingCacheLoaderOld.java 2009-02-10 13:55:59 UTC (rev 7675) @@ -19,7 +19,7 @@ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA * 02110-1301 USA, or see the FSF site: http://www.fsf.org. */ -package org.horizon.loader; +package org.horizon.loaderold; import org.horizon.Cache; import org.horizon.config.CacheLoaderConfig.IndividualCacheLoaderConfig; Modified: core/branches/flat/src/main/java/org/horizon/loaderold/AsyncCacheLoaderConfig.java =================================================================== --- core/branches/flat/src/main/java/org/horizon/loader_old/AsyncCacheLoaderConfig.java 2009-02-10 13:51:40 UTC (rev 7674) +++ core/branches/flat/src/main/java/org/horizon/loaderold/AsyncCacheLoaderConfig.java 2009-02-10 13:55:59 UTC (rev 7675) @@ -19,7 +19,7 @@ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA * 02110-1301 USA, or see the FSF site: http://www.fsf.org. */ -package org.horizon.loader; +package org.horizon.loaderold; import org.horizon.config.CacheLoaderConfig.IndividualCacheLoaderConfig; Modified: core/branches/flat/src/main/java/org/horizon/loaderold/AsyncCacheLoaderOld.java =================================================================== --- core/branches/flat/src/main/java/org/horizon/loader_old/AsyncCacheLoaderOld.java 2009-02-10 13:51:40 UTC (rev 7674) +++ core/branches/flat/src/main/java/org/horizon/loaderold/AsyncCacheLoaderOld.java 2009-02-10 13:55:59 UTC (rev 7675) @@ -19,7 +19,7 @@ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA * 02110-1301 USA, or see the FSF site: http://www.fsf.org. */ -package org.horizon.loader; +package org.horizon.loaderold; import org.horizon.CacheException; import org.horizon.config.CacheLoaderConfig.IndividualCacheLoaderConfig; Modified: core/branches/flat/src/main/java/org/horizon/loaderold/CacheLoader.java =================================================================== --- core/branches/flat/src/main/java/org/horizon/loader_old/CacheLoader.java 2009-02-10 13:51:40 UTC (rev 7674) +++ core/branches/flat/src/main/java/org/horizon/loaderold/CacheLoader.java 2009-02-10 13:55:59 UTC (rev 7675) @@ -1,4 +1,4 @@ -package org.horizon.loader; +package org.horizon.loaderold; import org.horizon.Cache; import org.horizon.config.CacheLoaderConfig; Modified: core/branches/flat/src/main/java/org/horizon/loaderold/CacheLoaderManager.java =================================================================== --- core/branches/flat/src/main/java/org/horizon/loader_old/CacheLoaderManager.java 2009-02-10 13:51:40 UTC (rev 7674) +++ core/branches/flat/src/main/java/org/horizon/loaderold/CacheLoaderManager.java 2009-02-10 13:55:59 UTC (rev 7675) @@ -19,7 +19,7 @@ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA * 02110-1301 USA, or see the FSF site: http://www.fsf.org. */ -package org.horizon.loader; +package org.horizon.loaderold; import org.horizon.Cache; import org.horizon.CacheException; @@ -113,20 +113,20 @@ */ private CacheLoaderOld<Object, Object> createCacheLoader() throws Exception { CacheLoaderOld<Object, Object> tmpLoader; - // if we only have a single cache loader_old configured in the chaining cacheloader then - // don't use a chaining cache loader_old at all. + // if we only have a single cache loaderold configured in the chaining cacheloader then + // don't use a chaining cache loaderold at all. ArrayList<IndividualCacheLoaderConfig> finalConfigs = new ArrayList<IndividualCacheLoaderConfig>(); - // also if we are using passivation then just directly use the first cache loader_old. + // also if we are using passivation then just directly use the first cache loaderold. if (config.useChainingCacheLoader()) { - // create chaining cache loader_old. + // create chaining cache loaderold. ChainingCacheLoaderOld<Object, Object> ccl = new ChainingCacheLoaderOld<Object, Object>(); tmpLoader = ccl; Iterator<IndividualCacheLoaderConfig> it = config.getIndividualCacheLoaderConfigs().iterator(); - // only one cache loader_old may have fetchPersistentState to true. + // only one cache loaderold may have fetchPersistentState to true. int numLoadersWithFetchPersistentState = 0; while (it.hasNext()) { CacheLoaderConfig.IndividualCacheLoaderConfig cfg = (CacheLoaderConfig.IndividualCacheLoaderConfig) it.next(); @@ -178,7 +178,7 @@ * @throws Exception */ private CacheLoaderOld<Object, Object> createCacheLoader(CacheLoaderConfig.IndividualCacheLoaderConfig cfg, Cache<Object, Object> cache) throws Exception { - // create loader_old + // create loaderold CacheLoaderOld<Object, Object> tmpLoader = cfg.getCacheLoader() == null ? createInstance(cfg.getClassName()) : cfg.getCacheLoader(); if (tmpLoader != null) { @@ -205,7 +205,7 @@ if (decorator instanceof AbstractDelegatingCacheLoaderOld) { @SuppressWarnings("unchecked") AbstractDelegatingCacheLoaderOld<Object, Object> singletonDecorator = (AbstractDelegatingCacheLoaderOld<Object, Object>) decorator; - /* set the cache loader_old to where calls will be delegated by the class providing the singleton + /* set the cache loaderold to where calls will be delegated by the class providing the singleton * store functionality. */ singletonDecorator.setCacheLoader(tmpLoader); tmpLoader = singletonDecorator; @@ -218,7 +218,7 @@ tmpLoader.setConfig(cfg); setCacheInLoader(cache, tmpLoader); - // we should not be creating/starting the cache loader_old here - this should be done in the separate + // we should not be creating/starting the cache loaderold here - this should be done in the separate // startCacheLoader() method. // tmpLoader.create(); // tmpLoader.start(); @@ -256,7 +256,7 @@ if (log.isDebugEnabled()) log.debug("preloading transient state from cache loader {0}", loader); long start, stop, total; start = System.currentTimeMillis(); - // TODO: Call preload on the cache loader_old interface + // TODO: Call preload on the cache loaderold interface if (true) throw new RuntimeException("implement me"); stop = System.currentTimeMillis(); total = stop - start; @@ -298,9 +298,9 @@ @Stop public void stopCacheLoader() { if (loader != null) { - // stop the cache loader_old + // stop the cache loaderold loader.stop(); - // destroy the cache loader_old + // destroy the cache loaderold loader.destroy(); } } @@ -324,9 +324,9 @@ // wire any deps. registry.wireDependencies(loader); - // create the cache loader_old + // create the cache loaderold loader.create(); - // start the cache loader_old + // start the cache loaderold loader.start(); purgeLoaders(false); Modified: core/branches/flat/src/main/java/org/horizon/loaderold/CacheLoaderOld.java =================================================================== --- core/branches/flat/src/main/java/org/horizon/loader_old/CacheLoaderOld.java 2009-02-10 13:51:40 UTC (rev 7674) +++ core/branches/flat/src/main/java/org/horizon/loaderold/CacheLoaderOld.java 2009-02-10 13:55:59 UTC (rev 7675) @@ -19,7 +19,7 @@ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA * 02110-1301 USA, or see the FSF site: http://www.fsf.org. */ -package org.horizon.loader; +package org.horizon.loaderold; import net.jcip.annotations.ThreadSafe; import org.horizon.Cache; Modified: core/branches/flat/src/main/java/org/horizon/loaderold/CacheStore.java =================================================================== --- core/branches/flat/src/main/java/org/horizon/loader_old/CacheStore.java 2009-02-10 13:51:40 UTC (rev 7674) +++ core/branches/flat/src/main/java/org/horizon/loaderold/CacheStore.java 2009-02-10 13:55:59 UTC (rev 7675) @@ -1,4 +1,4 @@ -package org.horizon.loader; +package org.horizon.loaderold; import javax.transaction.Transaction; import java.io.IOException; Modified: core/branches/flat/src/main/java/org/horizon/loaderold/ChainingCacheLoaderOld.java =================================================================== --- core/branches/flat/src/main/java/org/horizon/loader_old/ChainingCacheLoaderOld.java 2009-02-10 13:51:40 UTC (rev 7674) +++ core/branches/flat/src/main/java/org/horizon/loaderold/ChainingCacheLoaderOld.java 2009-02-10 13:55:59 UTC (rev 7675) @@ -19,7 +19,7 @@ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA * 02110-1301 USA, or see the FSF site: http://www.fsf.org. */ -package org.horizon.loader; +package org.horizon.loaderold; import org.horizon.config.CacheLoaderConfig; import org.horizon.config.CacheLoaderConfig.IndividualCacheLoaderConfig; Modified: core/branches/flat/src/main/java/org/horizon/loaderold/ClusteredCacheLoaderConfig.java =================================================================== --- core/branches/flat/src/main/java/org/horizon/loader_old/ClusteredCacheLoaderConfig.java 2009-02-10 13:51:40 UTC (rev 7674) +++ core/branches/flat/src/main/java/org/horizon/loaderold/ClusteredCacheLoaderConfig.java 2009-02-10 13:55:59 UTC (rev 7675) @@ -19,7 +19,7 @@ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA * 02110-1301 USA, or see the FSF site: http://www.fsf.org. */ -package org.horizon.loader; +package org.horizon.loaderold; import org.horizon.config.CacheLoaderConfig.IndividualCacheLoaderConfig; Modified: core/branches/flat/src/main/java/org/horizon/loaderold/ClusteredCacheLoaderOld.java =================================================================== --- core/branches/flat/src/main/java/org/horizon/loader_old/ClusteredCacheLoaderOld.java 2009-02-10 13:51:40 UTC (rev 7674) +++ core/branches/flat/src/main/java/org/horizon/loaderold/ClusteredCacheLoaderOld.java 2009-02-10 13:55:59 UTC (rev 7675) @@ -19,7 +19,7 @@ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA * 02110-1301 USA, or see the FSF site: http://www.fsf.org. */ -package org.horizon.loader; +package org.horizon.loaderold; import net.jcip.annotations.ThreadSafe; import org.horizon.commands.CommandsFactory; Modified: core/branches/flat/src/main/java/org/horizon/loaderold/FileCacheLoaderConfig.java =================================================================== --- core/branches/flat/src/main/java/org/horizon/loader_old/FileCacheLoaderConfig.java 2009-02-10 13:51:40 UTC (rev 7674) +++ core/branches/flat/src/main/java/org/horizon/loaderold/FileCacheLoaderConfig.java 2009-02-10 13:55:59 UTC (rev 7675) @@ -19,7 +19,7 @@ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA * 02110-1301 USA, or see the FSF site: http://www.fsf.org. */ -package org.horizon.loader; +package org.horizon.loaderold; import org.horizon.config.CacheLoaderConfig.IndividualCacheLoaderConfig; import org.horizon.config.Dynamic; Modified: core/branches/flat/src/main/java/org/horizon/loaderold/FileCacheLoaderOld.java =================================================================== --- core/branches/flat/src/main/java/org/horizon/loader_old/FileCacheLoaderOld.java 2009-02-10 13:51:40 UTC (rev 7674) +++ core/branches/flat/src/main/java/org/horizon/loaderold/FileCacheLoaderOld.java 2009-02-10 13:55:59 UTC (rev 7675) @@ -19,7 +19,7 @@ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA * 02110-1301 USA, or see the FSF site: http://www.fsf.org. */ -package org.horizon.loader; +package org.horizon.loaderold; import net.jcip.annotations.ThreadSafe; import org.horizon.CacheException; Modified: core/branches/flat/src/main/java/org/horizon/loaderold/Modification.java =================================================================== --- core/branches/flat/src/main/java/org/horizon/loader_old/Modification.java 2009-02-10 13:51:40 UTC (rev 7674) +++ core/branches/flat/src/main/java/org/horizon/loaderold/Modification.java 2009-02-10 13:55:59 UTC (rev 7675) @@ -19,7 +19,7 @@ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA * 02110-1301 USA, or see the FSF site: http://www.fsf.org. */ -package org.horizon.loader; +package org.horizon.loaderold; import java.io.Serializable; Modified: core/branches/flat/src/main/java/org/horizon/loaderold/ReadOnlyDelegatingCacheLoaderOld.java =================================================================== --- core/branches/flat/src/main/java/org/horizon/loader_old/ReadOnlyDelegatingCacheLoaderOld.java 2009-02-10 13:51:40 UTC (rev 7674) +++ core/branches/flat/src/main/java/org/horizon/loaderold/ReadOnlyDelegatingCacheLoaderOld.java 2009-02-10 13:55:59 UTC (rev 7675) @@ -19,7 +19,7 @@ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA * 02110-1301 USA, or see the FSF site: http://www.fsf.org. */ -package org.horizon.loader; +package org.horizon.loaderold; import org.horizon.logging.Log; import org.horizon.logging.LogFactory; Modified: core/branches/flat/src/main/java/org/horizon/loaderold/SingletonStoreCacheLoaderOld.java =================================================================== --- core/branches/flat/src/main/java/org/horizon/loader_old/SingletonStoreCacheLoaderOld.java 2009-02-10 13:51:40 UTC (rev 7674) +++ core/branches/flat/src/main/java/org/horizon/loaderold/SingletonStoreCacheLoaderOld.java 2009-02-10 13:55:59 UTC (rev 7675) @@ -19,7 +19,7 @@ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA * 02110-1301 USA, or see the FSF site: http://www.fsf.org. */ -package org.horizon.loader; +package org.horizon.loaderold; import org.horizon.config.CacheLoaderConfig; import org.horizon.config.CacheLoaderConfig.IndividualCacheLoaderConfig.SingletonStoreConfig; Modified: core/branches/flat/src/main/java/org/horizon/loaderold/SingletonStoreDefaultConfig.java =================================================================== --- core/branches/flat/src/main/java/org/horizon/loader_old/SingletonStoreDefaultConfig.java 2009-02-10 13:51:40 UTC (rev 7674) +++ core/branches/flat/src/main/java/org/horizon/loaderold/SingletonStoreDefaultConfig.java 2009-02-10 13:55:59 UTC (rev 7675) @@ -19,7 +19,7 @@ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA * 02110-1301 USA, or see the FSF site: http://www.fsf.org. */ -package org.horizon.loader; +package org.horizon.loaderold; import org.horizon.config.CacheLoaderConfig.IndividualCacheLoaderConfig.SingletonStoreConfig; Modified: core/branches/flat/src/main/java/org/horizon/loaderold/StoredEntry.java =================================================================== --- core/branches/flat/src/main/java/org/horizon/loader_old/StoredEntry.java 2009-02-10 13:51:40 UTC (rev 7674) +++ core/branches/flat/src/main/java/org/horizon/loaderold/StoredEntry.java 2009-02-10 13:55:59 UTC (rev 7675) @@ -1,4 +1,4 @@ -package org.horizon.loader; +package org.horizon.loaderold; /** * // TODO: Manik: Document this! Modified: core/branches/flat/src/main/java/org/horizon/marshall/HorizonMarshaller.java =================================================================== --- core/branches/flat/src/main/java/org/horizon/marshall/HorizonMarshaller.java 2009-02-10 13:51:40 UTC (rev 7674) +++ core/branches/flat/src/main/java/org/horizon/marshall/HorizonMarshaller.java 2009-02-10 13:55:59 UTC (rev 7675) @@ -263,7 +263,7 @@ Thread currentThread = Thread.currentThread(); ClassLoader old = currentThread.getContextClassLoader(); try { - // only do this if we haven't already set a context class loader_old elsewhere. + // only do this if we haven't already set a context class loaderold elsewhere. if (overrideContextClassloaderOnThread || old == null) currentThread.setContextClassLoader(loader); return unmarshallObject(in, refMap); } Modified: core/branches/flat/src/main/java/org/horizon/statetransfer/DefaultStateTransferManager.java =================================================================== --- core/branches/flat/src/main/java/org/horizon/statetransfer/DefaultStateTransferManager.java 2009-02-10 13:51:40 UTC (rev 7674) +++ core/branches/flat/src/main/java/org/horizon/statetransfer/DefaultStateTransferManager.java 2009-02-10 13:55:59 UTC (rev 7675) @@ -24,7 +24,7 @@ import org.horizon.config.Configuration; import org.horizon.factories.annotations.Inject; import org.horizon.factories.annotations.Start; -import org.horizon.loader_old.CacheLoaderManager; +import org.horizon.loaderold.CacheLoaderManager; import org.horizon.logging.Log; import org.horizon.logging.LogFactory; import org.horizon.marshall.Marshaller; Modified: core/branches/flat/src/main/java/org/horizon/util/FileLookup.java =================================================================== --- core/branches/flat/src/main/java/org/horizon/util/FileLookup.java 2009-02-10 13:51:40 UTC (rev 7674) +++ core/branches/flat/src/main/java/org/horizon/util/FileLookup.java 2009-02-10 13:55:59 UTC (rev 7675) @@ -67,7 +67,7 @@ ClassLoader cl = Thread.currentThread().getContextClassLoader(); InputStream is = cl == null ? null : cl.getResourceAsStream(filename); if (is == null) { - // check system class loader_old + // check system class loaderold is = getClass().getClassLoader().getResourceAsStream(filename); } return is; @@ -77,7 +77,7 @@ ClassLoader cl = Thread.currentThread().getContextClassLoader(); URL u = cl == null ? null : cl.getResource(filename); if (u == null) { - // check system class loader_old + // check system class loaderold u = getClass().getClassLoader().getResource(filename); } if (u == null) { Modified: core/branches/flat/src/main/resources/config-samples/all.xml =================================================================== --- core/branches/flat/src/main/resources/config-samples/all.xml 2009-02-10 13:51:40 UTC (rev 7674) +++ core/branches/flat/src/main/resources/config-samples/all.xml 2009-02-10 13:55:59 UTC (rev 7675) @@ -129,14 +129,14 @@ Cache loaders. If passivation is enabled, state is offloaded to the cache loaders ONLY when evicted. Similarly, when the state - is accessed again, it is removed from the cache loader_old and loaded into memory. + is accessed again, it is removed from the cache loaderold and loaded into memory. - Otherwise, state is always maintained in the cache loader_old as well as in memory. + Otherwise, state is always maintained in the cache loaderold as well as in memory. - Set 'shared' to true if all instances in the cluster use the same cache loader_old instance, e.g., are talking to the + Set 'shared' to true if all instances in the cluster use the same cache loaderold instance, e.g., are talking to the same database. - If "preload" is true, all keys are loaded from the cache loader_old into memory upon starting the cache. + If "preload" is true, all keys are loaded from the cache loaderold into memory upon starting the cache. --> <loaders passivation="false" shared="false" preload="true"> Modified: core/branches/flat/src/test/java/org/horizon/api/tree/NodeMoveAPITest.java =================================================================== --- core/branches/flat/src/test/java/org/horizon/api/tree/NodeMoveAPITest.java 2009-02-10 13:51:40 UTC (rev 7674) +++ core/branches/flat/src/test/java/org/horizon/api/tree/NodeMoveAPITest.java 2009-02-10 13:55:59 UTC (rev 7675) @@ -301,13 +301,13 @@ cache.getConfiguration().setCacheLoaderConfig(getSingleCacheLoaderConfig(pasv, "/", DummyInMemoryCacheLoader.class.getName(), "debug=true", false, false, false, false)); cache.start(); -DummyInMemoryCacheLoader loader_old = (DummyInMemoryCacheLoader) cache.getCacheLoaderManager().getCacheLoader(); +DummyInMemoryCacheLoader loaderold = (DummyInMemoryCacheLoader) cache.getCacheLoaderManager().getCacheLoader(); rootNode.put("key", "value"); if (!pasv) { -Map m = loader_old.get(Fqn.ROOT); +Map m = loaderold.get(Fqn.ROOT); assertNotNull("Should not be null", m); assertEquals("value", m.get("key")); } @@ -359,16 +359,16 @@ if (pasv) cache.evict(Fqn.ROOT, true); -//now inspect the loader_old. -assertEquals(vA, loader_old.get(nodeA.getFqn()).get(k)); -assertEquals(vB, loader_old.get(nodeB.getFqn()).get(k)); -assertEquals(vC, loader_old.get(nodeC.getFqn()).get(k)); -assertEquals(vD, loader_old.get(nodeD.getFqn()).get(k)); -assertEquals(vE, loader_old.get(nodeE.getFqn()).get(k)); +//now inspect the loaderold. +assertEquals(vA, loaderold.get(nodeA.getFqn()).get(k)); +assertEquals(vB, loaderold.get(nodeB.getFqn()).get(k)); +assertEquals(vC, loaderold.get(nodeC.getFqn()).get(k)); +assertEquals(vD, loaderold.get(nodeD.getFqn()).get(k)); +assertEquals(vE, loaderold.get(nodeE.getFqn()).get(k)); -assertNull(loader_old.get(old_C)); -assertNull(loader_old.get(old_D)); -assertNull(loader_old.get(old_E)); +assertNull(loaderold.get(old_C)); +assertNull(loaderold.get(old_D)); +assertNull(loaderold.get(old_E)); } */ Modified: core/branches/flat/src/test/java/org/horizon/manager/CacheManagerComponentRegistryTest.java =================================================================== --- core/branches/flat/src/test/java/org/horizon/manager/CacheManagerComponentRegistryTest.java 2009-02-10 13:51:40 UTC (rev 7674) +++ core/branches/flat/src/test/java/org/horizon/manager/CacheManagerComponentRegistryTest.java 2009-02-10 13:55:59 UTC (rev 7675) @@ -6,8 +6,8 @@ import org.horizon.config.GlobalConfiguration; import org.horizon.interceptors.BatchingInterceptor; import org.horizon.interceptors.InterceptorChain; -import org.horizon.loader_old.CacheLoaderManager; -import org.horizon.loader_old.FileCacheLoaderConfig; +import org.horizon.loaderold.CacheLoaderManager; +import org.horizon.loaderold.FileCacheLoaderConfig; import org.horizon.remoting.RPCManager; import org.horizon.transaction.DummyTransactionManager; import org.horizon.transaction.DummyTransactionManagerLookup; @@ -58,7 +58,7 @@ public void testForceUnsharedComponents() throws NamedCacheNotFoundException { CacheLoaderConfig clc = new CacheLoaderConfig(); - // TODO change this to use a dummy in memory cache loader_old instead!! + // TODO change this to use a dummy in memory cache loaderold instead!! FileCacheLoaderConfig fc = new FileCacheLoaderConfig(); fc.setLocation("/tmp"); clc.addIndividualCacheLoaderConfig(fc);

15 years, 10 months

1
0
0 / 0

JBoss Cache SVN: r7674 - in core/branches/flat/src: main/java/org/horizon/config and 10 other directories.

by jbosscache-commits＠lists.jboss.org

Author: manik.surtani(a)jboss.com Date: 2009-02-10 08:51:40 -0500 (Tue, 10 Feb 2009) New Revision: 7674 Added: core/branches/flat/src/main/java/org/horizon/loader_old/ core/branches/flat/src/main/java/org/horizon/loader_old/AbstractCacheLoaderOld.java core/branches/flat/src/main/java/org/horizon/loader_old/AbstractDelegatingCacheLoaderOld.java core/branches/flat/src/main/java/org/horizon/loader_old/AsyncCacheLoaderConfig.java core/branches/flat/src/main/java/org/horizon/loader_old/AsyncCacheLoaderOld.java core/branches/flat/src/main/java/org/horizon/loader_old/CacheLoader.java core/branches/flat/src/main/java/org/horizon/loader_old/CacheLoaderManager.java core/branches/flat/src/main/java/org/horizon/loader_old/CacheLoaderOld.java core/branches/flat/src/main/java/org/horizon/loader_old/CacheStore.java core/branches/flat/src/main/java/org/horizon/loader_old/ChainingCacheLoaderOld.java core/branches/flat/src/main/java/org/horizon/loader_old/ClusteredCacheLoaderConfig.java core/branches/flat/src/main/java/org/horizon/loader_old/ClusteredCacheLoaderOld.java core/branches/flat/src/main/java/org/horizon/loader_old/FileCacheLoaderConfig.java core/branches/flat/src/main/java/org/horizon/loader_old/FileCacheLoaderOld.java core/branches/flat/src/main/java/org/horizon/loader_old/ReadOnlyDelegatingCacheLoaderOld.java core/branches/flat/src/main/java/org/horizon/loader_old/SingletonStoreCacheLoaderOld.java core/branches/flat/src/main/java/org/horizon/loader_old/SingletonStoreDefaultConfig.java core/branches/flat/src/main/java/org/horizon/loader_old/StoredEntry.java Removed: core/branches/flat/src/main/java/org/horizon/loader/ core/branches/flat/src/main/java/org/horizon/loader_old/AbstractCacheLoader.java core/branches/flat/src/main/java/org/horizon/loader_old/AbstractDelegatingCacheLoader.java core/branches/flat/src/main/java/org/horizon/loader_old/AsyncCacheLoader.java core/branches/flat/src/main/java/org/horizon/loader_old/AsyncCacheLoaderConfig.java core/branches/flat/src/main/java/org/horizon/loader_old/CacheLoader.java core/branches/flat/src/main/java/org/horizon/loader_old/CacheLoaderManager.java core/branches/flat/src/main/java/org/horizon/loader_old/ChainingCacheLoader.java core/branches/flat/src/main/java/org/horizon/loader_old/ClusteredCacheLoader.java core/branches/flat/src/main/java/org/horizon/loader_old/ClusteredCacheLoaderConfig.java core/branches/flat/src/main/java/org/horizon/loader_old/FileCacheLoader.java core/branches/flat/src/main/java/org/horizon/loader_old/FileCacheLoaderConfig.java core/branches/flat/src/main/java/org/horizon/loader_old/ReadOnlyDelegatingCacheLoader.java core/branches/flat/src/main/java/org/horizon/loader_old/SingletonStoreCacheLoader.java core/branches/flat/src/main/java/org/horizon/loader_old/SingletonStoreDefaultConfig.java Modified: core/branches/flat/src/main/java/org/horizon/config/CacheLoaderConfig.java core/branches/flat/src/main/java/org/horizon/container/UnsortedDataContainer.java core/branches/flat/src/main/java/org/horizon/factories/AbstractComponentRegistry.java core/branches/flat/src/main/java/org/horizon/factories/EmptyConstructorNamedCacheFactory.java core/branches/flat/src/main/java/org/horizon/interceptors/CacheLoaderInterceptor.java core/branches/flat/src/main/java/org/horizon/interceptors/CacheStoreInterceptor.java core/branches/flat/src/main/java/org/horizon/marshall/HorizonMarshaller.java core/branches/flat/src/main/java/org/horizon/statetransfer/DefaultStateTransferManager.java core/branches/flat/src/main/java/org/horizon/util/FileLookup.java core/branches/flat/src/main/resources/config-samples/all.xml core/branches/flat/src/test/java/org/horizon/api/tree/NodeMoveAPITest.java core/branches/flat/src/test/java/org/horizon/manager/CacheManagerComponentRegistryTest.java Log: Loaders - work in progress Modified: core/branches/flat/src/main/java/org/horizon/config/CacheLoaderConfig.java =================================================================== --- core/branches/flat/src/main/java/org/horizon/config/CacheLoaderConfig.java 2009-02-10 11:58:28 UTC (rev 7673) +++ core/branches/flat/src/main/java/org/horizon/config/CacheLoaderConfig.java 2009-02-10 13:51:40 UTC (rev 7674) @@ -21,8 +21,8 @@ */ package org.horizon.config; -import org.horizon.loader.CacheLoaderOld; -import org.horizon.loader.SingletonStoreCacheLoaderOld; +import org.horizon.loader_old.CacheLoaderOld; +import org.horizon.loader_old.SingletonStoreCacheLoaderOld; import org.horizon.util.Util; import java.util.ArrayList; Modified: core/branches/flat/src/main/java/org/horizon/container/UnsortedDataContainer.java =================================================================== --- core/branches/flat/src/main/java/org/horizon/container/UnsortedDataContainer.java 2009-02-10 11:58:28 UTC (rev 7673) +++ core/branches/flat/src/main/java/org/horizon/container/UnsortedDataContainer.java 2009-02-10 13:51:40 UTC (rev 7674) @@ -22,8 +22,8 @@ package org.horizon.container; import org.horizon.factories.annotations.Inject; -import org.horizon.loader.CacheLoaderManager; -import org.horizon.loader.CacheLoaderOld; +import org.horizon.loader_old.CacheLoaderManager; +import org.horizon.loader_old.CacheLoaderOld; import java.util.AbstractSet; import java.util.ArrayList; Modified: core/branches/flat/src/main/java/org/horizon/factories/AbstractComponentRegistry.java =================================================================== --- core/branches/flat/src/main/java/org/horizon/factories/AbstractComponentRegistry.java 2009-02-10 11:58:28 UTC (rev 7673) +++ core/branches/flat/src/main/java/org/horizon/factories/AbstractComponentRegistry.java 2009-02-10 13:51:40 UTC (rev 7674) @@ -477,7 +477,7 @@ */ public void registerDefaultClassLoader(ClassLoader loader) { registerComponent(loader == null ? getClass().getClassLoader() : loader, ClassLoader.class); - // make sure the class loader is non-volatile, so it survives restarts. + // make sure the class loader_old is non-volatile, so it survives restarts. componentLookup.get(ClassLoader.class.getName()).nonVolatile = true; } Modified: core/branches/flat/src/main/java/org/horizon/factories/EmptyConstructorNamedCacheFactory.java =================================================================== --- core/branches/flat/src/main/java/org/horizon/factories/EmptyConstructorNamedCacheFactory.java 2009-02-10 11:58:28 UTC (rev 7673) +++ core/branches/flat/src/main/java/org/horizon/factories/EmptyConstructorNamedCacheFactory.java 2009-02-10 13:51:40 UTC (rev 7674) @@ -28,7 +28,7 @@ import org.horizon.factories.annotations.DefaultFactoryFor; import org.horizon.factories.context.ContextFactory; import org.horizon.invocation.InvocationContextContainer; -import org.horizon.loader.CacheLoaderManager; +import org.horizon.loader_old.CacheLoaderManager; import org.horizon.marshall.Marshaller; import org.horizon.marshall.VersionAwareMarshaller; import org.horizon.notifications.cachelistener.CacheNotifier; Modified: core/branches/flat/src/main/java/org/horizon/interceptors/CacheLoaderInterceptor.java =================================================================== --- core/branches/flat/src/main/java/org/horizon/interceptors/CacheLoaderInterceptor.java 2009-02-10 11:58:28 UTC (rev 7673) +++ core/branches/flat/src/main/java/org/horizon/interceptors/CacheLoaderInterceptor.java 2009-02-10 13:51:40 UTC (rev 7674) @@ -35,8 +35,8 @@ import org.horizon.factories.annotations.Inject; import org.horizon.factories.annotations.Start; import org.horizon.interceptors.base.JmxStatsCommandInterceptor; -import org.horizon.loader.CacheLoaderManager; -import org.horizon.loader.CacheLoaderOld; +import org.horizon.loader_old.CacheLoaderManager; +import org.horizon.loader_old.CacheLoaderOld; import org.horizon.notifications.cachelistener.CacheNotifier; import org.horizon.transaction.TransactionTable; Modified: core/branches/flat/src/main/java/org/horizon/interceptors/CacheStoreInterceptor.java =================================================================== --- core/branches/flat/src/main/java/org/horizon/interceptors/CacheStoreInterceptor.java 2009-02-10 11:58:28 UTC (rev 7673) +++ core/branches/flat/src/main/java/org/horizon/interceptors/CacheStoreInterceptor.java 2009-02-10 13:51:40 UTC (rev 7674) @@ -39,10 +39,10 @@ import org.horizon.invocation.Options; import org.horizon.jmx.annotations.ManagedAttribute; import org.horizon.jmx.annotations.ManagedOperation; -import org.horizon.loader.CacheLoaderManager; -import org.horizon.loader.CacheLoaderOld; -import org.horizon.loader.Modification; -import org.horizon.loader.Modification.ModificationType; +import org.horizon.loader_old.CacheLoaderManager; +import org.horizon.loader_old.CacheLoaderOld; +import org.horizon.loader_old.Modification; +import org.horizon.loader_old.Modification.ModificationType; import org.horizon.logging.LogFactory; import org.horizon.transaction.GlobalTransaction; @@ -112,7 +112,7 @@ // this is a commit call. GlobalTransaction gtx = command.getGlobalTransaction(); if (trace) log.trace("Calling loader.commit() for gtx " + gtx); - // sync call (a write) on the loader + // sync call (a write) on the loader_old // ignore modified FQNs // List fqnsModified = getFqnsFromModificationList(txTable.get(globalTransaction).getCacheLoaderModifications()); try { Copied: core/branches/flat/src/main/java/org/horizon/loader_old (from rev 7672, core/branches/flat/src/main/java/org/horizon/loader) Deleted: core/branches/flat/src/main/java/org/horizon/loader_old/AbstractCacheLoader.java =================================================================== --- core/branches/flat/src/main/java/org/horizon/loader/AbstractCacheLoader.java 2009-02-10 11:54:44 UTC (rev 7672) +++ core/branches/flat/src/main/java/org/horizon/loader_old/AbstractCacheLoader.java 2009-02-10 13:51:40 UTC (rev 7674) @@ -1,167 +0,0 @@ -/* - * JBoss, Home of Professional Open Source. - * Copyright 2000 - 2008, Red Hat Middleware LLC, and individual contributors - * as indicated by the @author tags. See the copyright.txt file in the - * distribution for a full listing of individual contributors. - * - * This 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 2.1 of - * the License, or (at your option) any later version. - * - * This software 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 this software; if not, write to the Free - * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA - * 02110-1301 USA, or see the FSF site: http://www.fsf.org. - */ -package org.horizon.loader; - -import org.horizon.Cache; -import org.horizon.CacheException; -import org.horizon.logging.Log; -import org.horizon.logging.LogFactory; -import org.horizon.marshall.EntryData; -import org.horizon.marshall.EntryDataExceptionMarker; -import org.horizon.marshall.EntryDataMarker; -import org.horizon.marshall.Marshaller; - -import java.io.ObjectInputStream; -import java.io.ObjectOutputStream; -import java.util.List; -import java.util.Map; -import java.util.concurrent.ConcurrentHashMap; - -/** - * A convenience abstract implementation of a {@link CacheLoader}. Specific methods to note are methods like {@link - * #storeState(Fqn,java.io.ObjectInputStream)}, {@link #loadState(Fqn,java.io.ObjectOutputStream)}, {@link - * #storeEntireState(java.io.ObjectInputStream)} and {@link #loadEntireState(java.io.ObjectOutputStream)} which have - * convenience implementations here. - * - * Also useful to note is the implementation of {@link #put(java.util.List)}, used during the prepare phase of a - * transaction. - * - * - * @author <a href="mailto:manik@jboss.org">Manik Surtani (manik(a)jboss.org)</a> - * @author <a href="mailto:galder.zamarreno@jboss.com">Galder Zamarreno</a> - * @since 1.0 - */ -public abstract class AbstractCacheLoader<K, V> implements CacheLoader<K, V> { - protected Cache<K, V> cache; - private static final Log log = LogFactory.getLog(AbstractCacheLoader.class); - private static final boolean trace = log.isTraceEnabled(); - /** - * HashMap<Object,List<Modification>>. List of open transactions. Note that this is purely transient, as we don't use - * a log, recovery is not available - */ - protected Map<Object, List<Modification>> transactions = new ConcurrentHashMap<Object, List<Modification>>(); - - public void storeEntireState(ObjectInputStream in) { - // store new state - Object objectFromStream = null; - // TODO fix me -// try { -// objectFromStream = cache.getMarshaller().objectFromObjectStream(in); -// } -// catch (Exception e) { -// throw new CacheException(e.getMessage(), e); -// } - - if (objectFromStream instanceof EntryDataMarker) { - // no persistent state sent across; return? - if (trace) log.trace("Empty persistent stream?"); - return; - } - if (objectFromStream instanceof EntryDataExceptionMarker) { - EntryDataExceptionMarker ndem = (EntryDataExceptionMarker) objectFromStream; - throw new CacheException("State provider cacheloader at node " + ndem.getKey() - + " threw exception during loadState (see Caused by)", ndem.getCause()); - } - - List<EntryData<K, V>> data = (List<EntryData<K, V>>) objectFromStream; - for (EntryData<K, V> datem : data) { - put(datem.getKey(), datem.getValue()); - } - } - - public void loadEntireState(ObjectOutputStream os) { - List<EntryData<K, V>> list = getAllEntries(); - if (trace) log.trace("Loading state of " + list.size() + " nodes into stream"); - // TODO fix me -// try { -// cache.getMarshaller().objectToObjectStream(list, os); -// } -// catch (Exception e) { -// throw new CacheException(e.getMessage(), e); -// } - } - - - public void setCache(Cache<K, V> c) { - this.cache = c; - } - - public void put(List<Modification> modifications) { - for (Modification m : modifications) { - switch (m.getType()) { - case PUT: - put((K) m.getKey(), (V) m.getValue()); - break; - case REMOVE: - remove(m.getKey()); - break; - case CLEAR: - clear(); - break; - default: - throw new CacheException("Unknown modification " + m.getType()); - } - } - } - - protected Marshaller getMarshaller() { - return null; - // todo fix me -// return cache.getMarshaller(); - } - - // empty implementations for loaders that do not wish to implement lifecycle. - public void create() { - } - - public void start() { - } - - public void stop() { - } - - public void destroy() { - } - - // Adds simple transactional capabilities to cache loaders that are inherently non-transactional. If your cache loader implementation - // is tansactional though, then override these. - - public void prepare(Object tx, List<Modification> modifications, boolean one_phase) { - if (one_phase) { - put(modifications); - } else { - transactions.put(tx, modifications); - } - } - - public void commit(Object tx) { - List<Modification> modifications = transactions.remove(tx); - if (modifications == null) { - throw new CacheException("transaction " + tx + " not found in transaction table"); - } - put(modifications); - } - - public void rollback(Object tx) { - transactions.remove(tx); - } -} Copied: core/branches/flat/src/main/java/org/horizon/loader_old/AbstractCacheLoaderOld.java (from rev 7673, core/branches/flat/src/main/java/org/horizon/loader/AbstractCacheLoaderOld.java) =================================================================== --- core/branches/flat/src/main/java/org/horizon/loader_old/AbstractCacheLoaderOld.java (rev 0) +++ core/branches/flat/src/main/java/org/horizon/loader_old/AbstractCacheLoaderOld.java 2009-02-10 13:51:40 UTC (rev 7674) @@ -0,0 +1,167 @@ +/* + * JBoss, Home of Professional Open Source. + * Copyright 2000 - 2008, Red Hat Middleware LLC, and individual contributors + * as indicated by the @author tags. See the copyright.txt file in the + * distribution for a full listing of individual contributors. + * + * This 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 2.1 of + * the License, or (at your option) any later version. + * + * This software 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 this software; if not, write to the Free + * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA + * 02110-1301 USA, or see the FSF site: http://www.fsf.org. + */ +package org.horizon.loader; + +import org.horizon.Cache; +import org.horizon.CacheException; +import org.horizon.logging.Log; +import org.horizon.logging.LogFactory; +import org.horizon.marshall.EntryData; +import org.horizon.marshall.EntryDataExceptionMarker; +import org.horizon.marshall.EntryDataMarker; +import org.horizon.marshall.Marshaller; + +import java.io.ObjectInputStream; +import java.io.ObjectOutputStream; +import java.util.List; +import java.util.Map; +import java.util.concurrent.ConcurrentHashMap; + +/** + * A convenience abstract implementation of a {@link CacheLoaderOld}. Specific methods to note are methods like {@link + * #storeState(Fqn,java.io.ObjectInputStream)}, {@link #loadState(Fqn,java.io.ObjectOutputStream)}, {@link + * #storeEntireState(java.io.ObjectInputStream)} and {@link #loadEntireState(java.io.ObjectOutputStream)} which have + * convenience implementations here. + * + * Also useful to note is the implementation of {@link #put(java.util.List)}, used during the prepare phase of a + * transaction. + * + * + * @author <a href="mailto:manik@jboss.org">Manik Surtani (manik(a)jboss.org)</a> + * @author <a href="mailto:galder.zamarreno@jboss.com">Galder Zamarreno</a> + * @since 1.0 + */ +public abstract class AbstractCacheLoaderOld<K, V> implements CacheLoaderOld<K, V> { + protected Cache<K, V> cache; + private static final Log log = LogFactory.getLog(AbstractCacheLoaderOld.class); + private static final boolean trace = log.isTraceEnabled(); + /** + * HashMap<Object,List<Modification>>. List of open transactions. Note that this is purely transient, as we don't use + * a log, recovery is not available + */ + protected Map<Object, List<Modification>> transactions = new ConcurrentHashMap<Object, List<Modification>>(); + + public void storeEntireState(ObjectInputStream in) { + // store new state + Object objectFromStream = null; + // TODO fix me +// try { +// objectFromStream = cache.getMarshaller().objectFromObjectStream(in); +// } +// catch (Exception e) { +// throw new CacheException(e.getMessage(), e); +// } + + if (objectFromStream instanceof EntryDataMarker) { + // no persistent state sent across; return? + if (trace) log.trace("Empty persistent stream?"); + return; + } + if (objectFromStream instanceof EntryDataExceptionMarker) { + EntryDataExceptionMarker ndem = (EntryDataExceptionMarker) objectFromStream; + throw new CacheException("State provider cacheloader at node " + ndem.getKey() + + " threw exception during loadState (see Caused by)", ndem.getCause()); + } + + List<EntryData<K, V>> data = (List<EntryData<K, V>>) objectFromStream; + for (EntryData<K, V> datem : data) { + put(datem.getKey(), datem.getValue()); + } + } + + public void loadEntireState(ObjectOutputStream os) { + List<EntryData<K, V>> list = getAllEntries(); + if (trace) log.trace("Loading state of " + list.size() + " nodes into stream"); + // TODO fix me +// try { +// cache.getMarshaller().objectToObjectStream(list, os); +// } +// catch (Exception e) { +// throw new CacheException(e.getMessage(), e); +// } + } + + + public void setCache(Cache<K, V> c) { + this.cache = c; + } + + public void put(List<Modification> modifications) { + for (Modification m : modifications) { + switch (m.getType()) { + case PUT: + put((K) m.getKey(), (V) m.getValue()); + break; + case REMOVE: + remove(m.getKey()); + break; + case CLEAR: + clear(); + break; + default: + throw new CacheException("Unknown modification " + m.getType()); + } + } + } + + protected Marshaller getMarshaller() { + return null; + // todo fix me +// return cache.getMarshaller(); + } + + // empty implementations for loaders that do not wish to implement lifecycle. + public void create() { + } + + public void start() { + } + + public void stop() { + } + + public void destroy() { + } + + // Adds simple transactional capabilities to cache loaders that are inherently non-transactional. If your cache loader_old implementation + // is tansactional though, then override these. + + public void prepare(Object tx, List<Modification> modifications, boolean one_phase) { + if (one_phase) { + put(modifications); + } else { + transactions.put(tx, modifications); + } + } + + public void commit(Object tx) { + List<Modification> modifications = transactions.remove(tx); + if (modifications == null) { + throw new CacheException("transaction " + tx + " not found in transaction table"); + } + put(modifications); + } + + public void rollback(Object tx) { + transactions.remove(tx); + } +} Deleted: core/branches/flat/src/main/java/org/horizon/loader_old/AbstractDelegatingCacheLoader.java =================================================================== --- core/branches/flat/src/main/java/org/horizon/loader/AbstractDelegatingCacheLoader.java 2009-02-10 11:54:44 UTC (rev 7672) +++ core/branches/flat/src/main/java/org/horizon/loader_old/AbstractDelegatingCacheLoader.java 2009-02-10 13:51:40 UTC (rev 7674) @@ -1,133 +0,0 @@ -/* - * JBoss, Home of Professional Open Source. - * Copyright 2000 - 2008, Red Hat Middleware LLC, and individual contributors - * as indicated by the @author tags. See the copyright.txt file in the - * distribution for a full listing of individual contributors. - * - * This 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 2.1 of - * the License, or (at your option) any later version. - * - * This software 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 this software; if not, write to the Free - * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA - * 02110-1301 USA, or see the FSF site: http://www.fsf.org. - */ -package org.horizon.loader; - -import org.horizon.Cache; -import org.horizon.config.CacheLoaderConfig.IndividualCacheLoaderConfig; -import org.horizon.marshall.EntryData; - -import java.io.ObjectInputStream; -import java.io.ObjectOutputStream; -import java.util.List; - -/** - * AbstractDelegatingCacheLoader provides standard functionality for a cache loader that simply delegates each operation - * defined in the cache loader interface to the underlying cache loader, basically acting as a proxy to the real cache - * loader. - * - * Any cache loader implementation that extends this class would be required to override any of the methods in order to - * provide a different or added behaviour. - * - * @author <a href="mailto:galder.zamarreno@jboss.com">Galder Zamarreno</a> - * @since 1.0 - */ -public abstract class AbstractDelegatingCacheLoader<K, V> extends AbstractCacheLoader<K, V> { - private CacheLoader<K, V> cacheLoader; - - public AbstractDelegatingCacheLoader(CacheLoader<K, V> cacheLoader) { - this.cacheLoader = cacheLoader; - } - - public void clear() { - cacheLoader.clear(); - } - - public void commit(Object tx) { - cacheLoader.commit(tx); - } - - public void create() { - cacheLoader.create(); - } - - public void destroy() { - cacheLoader.destroy(); - } - - public boolean exists(Object key) { - return cacheLoader.exists(key); - } - - public V get(Object key) { - return cacheLoader.get(key); - } - - public List<EntryData<K, V>> getAllEntries() { - return cacheLoader.getAllEntries(); - } - - public IndividualCacheLoaderConfig getConfig() { - return cacheLoader.getConfig(); - } - - public void loadEntireState(ObjectOutputStream os) { - cacheLoader.loadEntireState(os); - } - - public void prepare(Object tx, List<Modification> modifications, boolean one_phase) { - cacheLoader.prepare(tx, modifications, one_phase); - } - - public V put(K key, V value) { - return cacheLoader.put(key, value); - } - - public void put(List<Modification> modifications) { - cacheLoader.put(modifications); - } - - public V remove(Object key) { - return cacheLoader.remove(key); - } - - public void rollback(Object tx) { - cacheLoader.rollback(tx); - } - - public void setCache(Cache<K, V> c) { - cacheLoader.setCache(c); - } - - public void setConfig(IndividualCacheLoaderConfig config) { - cacheLoader.setConfig(config); - } - - public void start() { - cacheLoader.start(); - } - - public void stop() { - cacheLoader.stop(); - } - - public void storeEntireState(ObjectInputStream is) { - cacheLoader.storeEntireState(is); - } - - public CacheLoader<K, V> getCacheLoader() { - return cacheLoader; - } - - public void setCacheLoader(CacheLoader<K, V> cacheLoader) { - this.cacheLoader = cacheLoader; - } -} Copied: core/branches/flat/src/main/java/org/horizon/loader_old/AbstractDelegatingCacheLoaderOld.java (from rev 7673, core/branches/flat/src/main/java/org/horizon/loader/AbstractDelegatingCacheLoaderOld.java) =================================================================== --- core/branches/flat/src/main/java/org/horizon/loader_old/AbstractDelegatingCacheLoaderOld.java (rev 0) +++ core/branches/flat/src/main/java/org/horizon/loader_old/AbstractDelegatingCacheLoaderOld.java 2009-02-10 13:51:40 UTC (rev 7674) @@ -0,0 +1,133 @@ +/* + * JBoss, Home of Professional Open Source. + * Copyright 2000 - 2008, Red Hat Middleware LLC, and individual contributors + * as indicated by the @author tags. See the copyright.txt file in the + * distribution for a full listing of individual contributors. + * + * This 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 2.1 of + * the License, or (at your option) any later version. + * + * This software 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 this software; if not, write to the Free + * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA + * 02110-1301 USA, or see the FSF site: http://www.fsf.org. + */ +package org.horizon.loader; + +import org.horizon.Cache; +import org.horizon.config.CacheLoaderConfig.IndividualCacheLoaderConfig; +import org.horizon.marshall.EntryData; + +import java.io.ObjectInputStream; +import java.io.ObjectOutputStream; +import java.util.List; + +/** + * AbstractDelegatingCacheLoader provides standard functionality for a cache loader that simply delegates each operation + * defined in the cache loader interface to the underlying cache loader, basically acting as a proxy to the real cache + * loader. + * + * Any cache loader implementation that extends this class would be required to override any of the methods in order to + * provide a different or added behaviour. + * + * @author <a href="mailto:galder.zamarreno@jboss.com">Galder Zamarreno</a> + * @since 1.0 + */ +public abstract class AbstractDelegatingCacheLoaderOld<K, V> extends AbstractCacheLoaderOld<K, V> { + private CacheLoaderOld<K, V> cacheLoader; + + public AbstractDelegatingCacheLoaderOld(CacheLoaderOld<K, V> cacheLoader) { + this.cacheLoader = cacheLoader; + } + + public void clear() { + cacheLoader.clear(); + } + + public void commit(Object tx) { + cacheLoader.commit(tx); + } + + public void create() { + cacheLoader.create(); + } + + public void destroy() { + cacheLoader.destroy(); + } + + public boolean exists(Object key) { + return cacheLoader.exists(key); + } + + public V get(Object key) { + return cacheLoader.get(key); + } + + public List<EntryData<K, V>> getAllEntries() { + return cacheLoader.getAllEntries(); + } + + public IndividualCacheLoaderConfig getConfig() { + return cacheLoader.getConfig(); + } + + public void loadEntireState(ObjectOutputStream os) { + cacheLoader.loadEntireState(os); + } + + public void prepare(Object tx, List<Modification> modifications, boolean one_phase) { + cacheLoader.prepare(tx, modifications, one_phase); + } + + public V put(K key, V value) { + return cacheLoader.put(key, value); + } + + public void put(List<Modification> modifications) { + cacheLoader.put(modifications); + } + + public V remove(Object key) { + return cacheLoader.remove(key); + } + + public void rollback(Object tx) { + cacheLoader.rollback(tx); + } + + public void setCache(Cache<K, V> c) { + cacheLoader.setCache(c); + } + + public void setConfig(IndividualCacheLoaderConfig config) { + cacheLoader.setConfig(config); + } + + public void start() { + cacheLoader.start(); + } + + public void stop() { + cacheLoader.stop(); + } + + public void storeEntireState(ObjectInputStream is) { + cacheLoader.storeEntireState(is); + } + + public CacheLoaderOld<K, V> getCacheLoader() { + return cacheLoader; + } + + public void setCacheLoader(CacheLoaderOld<K, V> cacheLoader) { + this.cacheLoader = cacheLoader; + } +} Deleted: core/branches/flat/src/main/java/org/horizon/loader_old/AsyncCacheLoader.java =================================================================== --- core/branches/flat/src/main/java/org/horizon/loader/AsyncCacheLoader.java 2009-02-10 11:54:44 UTC (rev 7672) +++ core/branches/flat/src/main/java/org/horizon/loader_old/AsyncCacheLoader.java 2009-02-10 13:51:40 UTC (rev 7674) @@ -1,269 +0,0 @@ -/* - * JBoss, Home of Professional Open Source. - * Copyright 2000 - 2008, Red Hat Middleware LLC, and individual contributors - * as indicated by the @author tags. See the copyright.txt file in the - * distribution for a full listing of individual contributors. - * - * This 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 2.1 of - * the License, or (at your option) any later version. - * - * This software 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 this software; if not, write to the Free - * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA - * 02110-1301 USA, or see the FSF site: http://www.fsf.org. - */ -package org.horizon.loader; - -import org.horizon.CacheException; -import org.horizon.config.CacheLoaderConfig.IndividualCacheLoaderConfig; -import org.horizon.logging.Log; -import org.horizon.logging.LogFactory; - -import java.util.ArrayList; -import java.util.List; -import java.util.concurrent.ArrayBlockingQueue; -import java.util.concurrent.BlockingQueue; -import java.util.concurrent.ExecutorService; -import java.util.concurrent.Executors; -import java.util.concurrent.Future; -import java.util.concurrent.ThreadFactory; -import java.util.concurrent.TimeUnit; -import java.util.concurrent.atomic.AtomicBoolean; -import java.util.concurrent.atomic.AtomicInteger; - -/** - * The AsyncCacheLoader is a delegating cache loader that extends AbstractDelegatingCacheLoader overriding methods to - * that should not just delegate the operation to the underlying cache loader. - * - * Read operations are done synchronously, while write (CRUD - Create, Remove, Update, Delete) operations are done - * asynchronously. There is no provision for exception handling at the moment for problems encountered with the - * underlying CacheLoader during a CRUD operation, and the exception is just logged. - * - * When configuring the CacheLoader, use the following attribute: - * - * <code> <attribute name="CacheLoaderAsynchronous">true</attribute> </code> - * - * to define whether cache loader operations are to be asynchronous. If not specified, a cache loader operation is - * assumed synchronous. - * - * - * The following additional parameters are available: <dl> <dt>cache.async.batchSize</dt> <dd>Number of modifications to - * commit in one transaction, default is 100. The minimum batch size is 1.</dd> <dt>cache.async.pollWait</dt> <dd>How - * long to wait before processing an incomplete batch, in milliseconds. Default is 100. Set this to 0 to not wait - * before processing available records.</dd> <dt>cache.async.returnOld</dt> <dd>If <code>true</code>, this loader - * returns the old values from {@link #put} and {@link #remove} methods. Otherwise, these methods always return null. - * Default is true. <code>false</code> improves the performance of these operations.</dd> - * <dt>cache.async.queueSize</dt> <dd>Maximum number of entries to enqueue for asynchronous processing. Lowering this - * size may help prevent out-of-memory conditions. It also may help to prevent less records lost in the case of JVM - * failure. Default is 10,000 operations.</dd> <dt>cache.async.put</dt> <dd>If set to false, all {@link #put} - * operations will be processed synchronously, and then only the {@link #remove} operations will be processed - * asynchronously. This mode may be useful for processing expiration of messages within a separate thread and keeping - * other operations synchronous for reliability. </dd> <dt>cache.async.threadPoolSize</dt> <dd>The size of the async - * processor thread pool. Defaults to <tt>1</tt>. This property is new in JBoss Cache 3.0.</dd> </dl> For increased - * performance for many smaller transactions, use higher values for <code>cache.async.batchSize</code> and - * <code>cache.async.pollWait</code>. For larger sized records, use a smaller value for - * <code>cache.async.queueSize</code>. - * - * @author Manik Surtani (manik.surtani(a)jboss.com) - * @since 1.0 - */ -public class AsyncCacheLoader<K, V> extends AbstractDelegatingCacheLoader<K, V> { - - private static final Log log = LogFactory.getLog(AsyncCacheLoader.class); - private static final boolean trace = log.isTraceEnabled(); - - private static AtomicInteger threadId = new AtomicInteger(0); - - /** - * Default limit on entries to process asynchronously. - */ - private static final int DEFAULT_QUEUE_SIZE = 10000; - - private AsyncCacheLoaderConfig config; - private ExecutorService executor; - private AtomicBoolean stopped = new AtomicBoolean(true); - private BlockingQueue<Modification> queue = new ArrayBlockingQueue<Modification>(DEFAULT_QUEUE_SIZE); - private List<Future> processorFutures; - - public AsyncCacheLoader() { - super(null); - } - - public AsyncCacheLoader(CacheLoader<K, V> cacheLoader) { - super(cacheLoader); - } - - @Override - public void setConfig(IndividualCacheLoaderConfig base) { - if (base instanceof AsyncCacheLoaderConfig) { - config = (AsyncCacheLoaderConfig) base; - } else { - config = new AsyncCacheLoaderConfig(base); - } - - if (config.getQueueSize() > 0) { - queue = new ArrayBlockingQueue<Modification>(config.getQueueSize()); - } - - super.setConfig(base); - } - - @Override - public V put(K key, V value) { - if (config.getUseAsyncPut()) { - V oldValue = get(key); - Modification mod = new Modification(Modification.ModificationType.PUT, key, value); - enqueue(mod); - return oldValue; - } else { - return super.put(key, value); - } - } - - @Override - public void put(List<Modification> modifications) { - if (config.getUseAsyncPut()) { - for (Modification modification : modifications) { - enqueue(modification); - } - } else { - super.put(modifications); - } - } - - @Override - public V remove(Object key) { - V oldValue = get(key); - Modification mod = new Modification(Modification.ModificationType.REMOVE, key, null); - enqueue(mod); - return oldValue; - } - - @Override - public void start() { - if (log.isInfoEnabled()) log.info("Async cache loader starting: " + this); - stopped.set(false); - super.start(); - executor = Executors.newFixedThreadPool(config.getThreadPoolSize(), new ThreadFactory() { - public Thread newThread(Runnable r) { - Thread t = new Thread(r, "AsyncCacheLoader-" + threadId.getAndIncrement()); - t.setDaemon(true); - return t; - } - }); - processorFutures = new ArrayList<Future>(config.getThreadPoolSize()); - for (int i = 0; i < config.getThreadPoolSize(); i++) processorFutures.add(executor.submit(new AsyncProcessor())); - } - - @Override - public void stop() { - stopped.set(true); - if (executor != null) { - for (Future f : processorFutures) f.cancel(true); - executor.shutdown(); - try { - boolean terminated = executor.isTerminated(); - while (!terminated) { - terminated = executor.awaitTermination(60, TimeUnit.SECONDS); - } - } - catch (InterruptedException e) { - Thread.currentThread().interrupt(); - } - } - executor = null; - super.stop(); - } - - private void enqueue(final Modification mod) { - if (stopped.get()) { - throw new CacheException("AsyncCacheLoader stopped; no longer accepting more entries."); - } - if (trace) log.trace("Enqueuing modification " + mod); - try { - queue.put(mod); - } - catch (InterruptedException e) { - Thread.currentThread().interrupt(); - } - } - - /** - * Processes (by batch if possible) a queue of {@link Modification}s. - * - * @author manik surtani - */ - private class AsyncProcessor implements Runnable { - // Modifications to invoke as a single put - private final List<Modification> mods = new ArrayList<Modification>(config.getBatchSize()); - - public void run() { - while (!Thread.interrupted()) { - try { - run0(); - } - catch (InterruptedException e) { - break; - } - } - - try { - if (trace) log.trace("process remaining batch " + mods.size()); - put(mods); - if (trace) log.trace("process remaining queued " + queue.size()); - while (!queue.isEmpty()) { - run0(); - } - } - catch (InterruptedException e) { - log.trace("remaining interrupted"); - } - } - - private void run0() throws InterruptedException { - log.trace("Checking for modifications"); - int i = queue.drainTo(mods, config.getBatchSize()); - if (i == 0) { - Modification m = queue.take(); - mods.add(m); - } - - if (trace) { - log.trace("Calling put(List) with " + mods.size() + " modifications"); - } - put(mods); - mods.clear(); - } - - private void put(List<Modification> mods) { - try { - AsyncCacheLoader.super.put(mods); - } - catch (Exception e) { - if (log.isWarnEnabled()) log.warn("Failed to process async modifications: " + e); - if (log.isDebugEnabled()) log.debug("Exception: ", e); - } - } - } - - @Override - public String toString() { - return super.toString() + - " delegate=[" + super.getCacheLoader() + "]" + - " stopped=" + stopped + - " batchSize=" + config.getBatchSize() + - " returnOld=" + config.getReturnOld() + - " asyncPut=" + config.getUseAsyncPut() + - " threadPoolSize=" + config.getThreadPoolSize() + - " queue.remainingCapacity()=" + queue.remainingCapacity() + - " queue.peek()=" + queue.peek(); - } - -} Deleted: core/branches/flat/src/main/java/org/horizon/loader_old/AsyncCacheLoaderConfig.java =================================================================== --- core/branches/flat/src/main/java/org/horizon/loader/AsyncCacheLoaderConfig.java 2009-02-10 11:54:44 UTC (rev 7672) +++ core/branches/flat/src/main/java/org/horizon/loader_old/AsyncCacheLoaderConfig.java 2009-02-10 13:51:40 UTC (rev 7674) @@ -1,156 +0,0 @@ -/* - * JBoss, Home of Professional Open Source. - * Copyright 2000 - 2008, Red Hat Middleware LLC, and individual contributors - * as indicated by the @author tags. See the copyright.txt file in the - * distribution for a full listing of individual contributors. - * - * This 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 2.1 of - * the License, or (at your option) any later version. - * - * This software 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 this software; if not, write to the Free - * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA - * 02110-1301 USA, or see the FSF site: http://www.fsf.org. - */ -package org.horizon.loader; - -import org.horizon.config.CacheLoaderConfig.IndividualCacheLoaderConfig; - -import java.util.Properties; - -public class AsyncCacheLoaderConfig extends IndividualCacheLoaderConfig { - /** - * The serialVersionUID - */ - private static final long serialVersionUID = 5038037589485991681L; - - private int batchSize = 100; - private boolean returnOld = true; - private int queueSize = 0; - private boolean useAsyncPut = true; - private int threadPoolSize = 1; - - /** - * Default constructor. - */ - public AsyncCacheLoaderConfig() { - setClassName(AsyncCacheLoader.class.getName()); - } - - /** - * For use by {@link AsyncCacheLoader}. - * - * @param base generic config object created by XML parsing. - */ - AsyncCacheLoaderConfig(IndividualCacheLoaderConfig base) { - setClassName(AsyncCacheLoader.class.getName()); - populateFromBaseConfig(base); - } - - public int getThreadPoolSize() { - return threadPoolSize; - } - - public void setThreadPoolSize(int threadPoolSize) { - testImmutability("threadPoolSize"); - this.threadPoolSize = threadPoolSize; - } - - public int getBatchSize() { - return batchSize; - } - - public void setBatchSize(int batchSize) { - testImmutability("batchSize"); - this.batchSize = batchSize; - } - - public int getQueueSize() { - return queueSize; - } - - public void setQueueSize(int queueSize) { - testImmutability("queueSize"); - this.queueSize = queueSize; - } - - public boolean getReturnOld() { - return returnOld; - } - - public void setReturnOld(boolean returnOld) { - testImmutability("returnOld"); - this.returnOld = returnOld; - } - - public boolean getUseAsyncPut() { - return useAsyncPut; - } - - public void setUseAsyncPut(boolean useAsyncPut) { - testImmutability("useAsyncPut"); - this.useAsyncPut = useAsyncPut; - } - - @Override - public void setProperties(Properties props) { - super.setProperties(props); - String s; - - s = props.getProperty("cache.async.batchSize"); - if (s != null) batchSize = Integer.parseInt(s); - if (batchSize <= 0) throw new IllegalArgumentException("Invalid batch size: " + batchSize); - - s = props.getProperty("cache.async.threadPoolSize"); - if (s != null) threadPoolSize = Integer.parseInt(s); - if (threadPoolSize <= 0) throw new IllegalArgumentException("Invalid thread pool size: " + threadPoolSize); - - - s = props.getProperty("cache.async.returnOld"); - if (s != null) returnOld = Boolean.valueOf(s); - - s = props.getProperty("cache.async.queueSize"); - if (s != null) queueSize = Integer.parseInt(s); - - s = props.getProperty("cache.async.put"); - if (s != null) useAsyncPut = Boolean.valueOf(s); - - - } - - @Override - public boolean equals(Object obj) { - if (obj instanceof AsyncCacheLoaderConfig && equalsExcludingProperties(obj)) { - AsyncCacheLoaderConfig other = (AsyncCacheLoaderConfig) obj; - return (batchSize == other.batchSize) - && (queueSize == other.queueSize) - && (returnOld == other.returnOld) - && (useAsyncPut == other.useAsyncPut); - } - return false; - } - - @Override - public int hashCode() { - int result = hashCodeExcludingProperties(); - result = 31 * result + batchSize; - result = 31 * result + queueSize; - result = 31 * result + (returnOld ? 0 : 1); - result = 31 * result + (useAsyncPut ? 0 : 1); - return result; - } - - @Override - public AsyncCacheLoaderConfig clone() throws CloneNotSupportedException { - return (AsyncCacheLoaderConfig) super.clone(); - } - - -} \ No newline at end of file Copied: core/branches/flat/src/main/java/org/horizon/loader_old/AsyncCacheLoaderConfig.java (from rev 7673, core/branches/flat/src/main/java/org/horizon/loader/AsyncCacheLoaderConfig.java) =================================================================== --- core/branches/flat/src/main/java/org/horizon/loader_old/AsyncCacheLoaderConfig.java (rev 0) +++ core/branches/flat/src/main/java/org/horizon/loader_old/AsyncCacheLoaderConfig.java 2009-02-10 13:51:40 UTC (rev 7674) @@ -0,0 +1,156 @@ +/* + * JBoss, Home of Professional Open Source. + * Copyright 2000 - 2008, Red Hat Middleware LLC, and individual contributors + * as indicated by the @author tags. See the copyright.txt file in the + * distribution for a full listing of individual contributors. + * + * This 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 2.1 of + * the License, or (at your option) any later version. + * + * This software 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 this software; if not, write to the Free + * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA + * 02110-1301 USA, or see the FSF site: http://www.fsf.org. + */ +package org.horizon.loader; + +import org.horizon.config.CacheLoaderConfig.IndividualCacheLoaderConfig; + +import java.util.Properties; + +public class AsyncCacheLoaderConfig extends IndividualCacheLoaderConfig { + /** + * The serialVersionUID + */ + private static final long serialVersionUID = 5038037589485991681L; + + private int batchSize = 100; + private boolean returnOld = true; + private int queueSize = 0; + private boolean useAsyncPut = true; + private int threadPoolSize = 1; + + /** + * Default constructor. + */ + public AsyncCacheLoaderConfig() { + setClassName(AsyncCacheLoaderOld.class.getName()); + } + + /** + * For use by {@link AsyncCacheLoaderOld}. + * + * @param base generic config object created by XML parsing. + */ + AsyncCacheLoaderConfig(IndividualCacheLoaderConfig base) { + setClassName(AsyncCacheLoaderOld.class.getName()); + populateFromBaseConfig(base); + } + + public int getThreadPoolSize() { + return threadPoolSize; + } + + public void setThreadPoolSize(int threadPoolSize) { + testImmutability("threadPoolSize"); + this.threadPoolSize = threadPoolSize; + } + + public int getBatchSize() { + return batchSize; + } + + public void setBatchSize(int batchSize) { + testImmutability("batchSize"); + this.batchSize = batchSize; + } + + public int getQueueSize() { + return queueSize; + } + + public void setQueueSize(int queueSize) { + testImmutability("queueSize"); + this.queueSize = queueSize; + } + + public boolean getReturnOld() { + return returnOld; + } + + public void setReturnOld(boolean returnOld) { + testImmutability("returnOld"); + this.returnOld = returnOld; + } + + public boolean getUseAsyncPut() { + return useAsyncPut; + } + + public void setUseAsyncPut(boolean useAsyncPut) { + testImmutability("useAsyncPut"); + this.useAsyncPut = useAsyncPut; + } + + @Override + public void setProperties(Properties props) { + super.setProperties(props); + String s; + + s = props.getProperty("cache.async.batchSize"); + if (s != null) batchSize = Integer.parseInt(s); + if (batchSize <= 0) throw new IllegalArgumentException("Invalid batch size: " + batchSize); + + s = props.getProperty("cache.async.threadPoolSize"); + if (s != null) threadPoolSize = Integer.parseInt(s); + if (threadPoolSize <= 0) throw new IllegalArgumentException("Invalid thread pool size: " + threadPoolSize); + + + s = props.getProperty("cache.async.returnOld"); + if (s != null) returnOld = Boolean.valueOf(s); + + s = props.getProperty("cache.async.queueSize"); + if (s != null) queueSize = Integer.parseInt(s); + + s = props.getProperty("cache.async.put"); + if (s != null) useAsyncPut = Boolean.valueOf(s); + + + } + + @Override + public boolean equals(Object obj) { + if (obj instanceof AsyncCacheLoaderConfig && equalsExcludingProperties(obj)) { + AsyncCacheLoaderConfig other = (AsyncCacheLoaderConfig) obj; + return (batchSize == other.batchSize) + && (queueSize == other.queueSize) + && (returnOld == other.returnOld) + && (useAsyncPut == other.useAsyncPut); + } + return false; + } + + @Override + public int hashCode() { + int result = hashCodeExcludingProperties(); + result = 31 * result + batchSize; + result = 31 * result + queueSize; + result = 31 * result + (returnOld ? 0 : 1); + result = 31 * result + (useAsyncPut ? 0 : 1); + return result; + } + + @Override + public AsyncCacheLoaderConfig clone() throws CloneNotSupportedException { + return (AsyncCacheLoaderConfig) super.clone(); + } + + +} \ No newline at end of file Copied: core/branches/flat/src/main/java/org/horizon/loader_old/AsyncCacheLoaderOld.java (from rev 7673, core/branches/flat/src/main/java/org/horizon/loader/AsyncCacheLoaderOld.java) =================================================================== --- core/branches/flat/src/main/java/org/horizon/loader_old/AsyncCacheLoaderOld.java (rev 0) +++ core/branches/flat/src/main/java/org/horizon/loader_old/AsyncCacheLoaderOld.java 2009-02-10 13:51:40 UTC (rev 7674) @@ -0,0 +1,269 @@ +/* + * JBoss, Home of Professional Open Source. + * Copyright 2000 - 2008, Red Hat Middleware LLC, and individual contributors + * as indicated by the @author tags. See the copyright.txt file in the + * distribution for a full listing of individual contributors. + * + * This 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 2.1 of + * the License, or (at your option) any later version. + * + * This software 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 this software; if not, write to the Free + * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA + * 02110-1301 USA, or see the FSF site: http://www.fsf.org. + */ +package org.horizon.loader; + +import org.horizon.CacheException; +import org.horizon.config.CacheLoaderConfig.IndividualCacheLoaderConfig; +import org.horizon.logging.Log; +import org.horizon.logging.LogFactory; + +import java.util.ArrayList; +import java.util.List; +import java.util.concurrent.ArrayBlockingQueue; +import java.util.concurrent.BlockingQueue; +import java.util.concurrent.ExecutorService; +import java.util.concurrent.Executors; +import java.util.concurrent.Future; +import java.util.concurrent.ThreadFactory; +import java.util.concurrent.TimeUnit; +import java.util.concurrent.atomic.AtomicBoolean; +import java.util.concurrent.atomic.AtomicInteger; + +/** + * The AsyncCacheLoader is a delegating cache loader that extends AbstractDelegatingCacheLoader overriding methods to + * that should not just delegate the operation to the underlying cache loader. + * + * Read operations are done synchronously, while write (CRUD - Create, Remove, Update, Delete) operations are done + * asynchronously. There is no provision for exception handling at the moment for problems encountered with the + * underlying CacheLoader during a CRUD operation, and the exception is just logged. + * + * When configuring the CacheLoader, use the following attribute: + * + * <code> <attribute name="CacheLoaderAsynchronous">true</attribute> </code> + * + * to define whether cache loader operations are to be asynchronous. If not specified, a cache loader operation is + * assumed synchronous. + * + * + * The following additional parameters are available: <dl> <dt>cache.async.batchSize</dt> <dd>Number of modifications to + * commit in one transaction, default is 100. The minimum batch size is 1.</dd> <dt>cache.async.pollWait</dt> <dd>How + * long to wait before processing an incomplete batch, in milliseconds. Default is 100. Set this to 0 to not wait + * before processing available records.</dd> <dt>cache.async.returnOld</dt> <dd>If <code>true</code>, this loader + * returns the old values from {@link #put} and {@link #remove} methods. Otherwise, these methods always return null. + * Default is true. <code>false</code> improves the performance of these operations.</dd> + * <dt>cache.async.queueSize</dt> <dd>Maximum number of entries to enqueue for asynchronous processing. Lowering this + * size may help prevent out-of-memory conditions. It also may help to prevent less records lost in the case of JVM + * failure. Default is 10,000 operations.</dd> <dt>cache.async.put</dt> <dd>If set to false, all {@link #put} + * operations will be processed synchronously, and then only the {@link #remove} operations will be processed + * asynchronously. This mode may be useful for processing expiration of messages within a separate thread and keeping + * other operations synchronous for reliability. </dd> <dt>cache.async.threadPoolSize</dt> <dd>The size of the async + * processor thread pool. Defaults to <tt>1</tt>. This property is new in JBoss Cache 3.0.</dd> </dl> For increased + * performance for many smaller transactions, use higher values for <code>cache.async.batchSize</code> and + * <code>cache.async.pollWait</code>. For larger sized records, use a smaller value for + * <code>cache.async.queueSize</code>. + * + * @author Manik Surtani (manik.surtani(a)jboss.com) + * @since 1.0 + */ +public class AsyncCacheLoaderOld<K, V> extends AbstractDelegatingCacheLoaderOld<K, V> { + + private static final Log log = LogFactory.getLog(AsyncCacheLoaderOld.class); + private static final boolean trace = log.isTraceEnabled(); + + private static AtomicInteger threadId = new AtomicInteger(0); + + /** + * Default limit on entries to process asynchronously. + */ + private static final int DEFAULT_QUEUE_SIZE = 10000; + + private AsyncCacheLoaderConfig config; + private ExecutorService executor; + private AtomicBoolean stopped = new AtomicBoolean(true); + private BlockingQueue<Modification> queue = new ArrayBlockingQueue<Modification>(DEFAULT_QUEUE_SIZE); + private List<Future> processorFutures; + + public AsyncCacheLoaderOld() { + super(null); + } + + public AsyncCacheLoaderOld(CacheLoaderOld<K, V> cacheLoader) { + super(cacheLoader); + } + + @Override + public void setConfig(IndividualCacheLoaderConfig base) { + if (base instanceof AsyncCacheLoaderConfig) { + config = (AsyncCacheLoaderConfig) base; + } else { + config = new AsyncCacheLoaderConfig(base); + } + + if (config.getQueueSize() > 0) { + queue = new ArrayBlockingQueue<Modification>(config.getQueueSize()); + } + + super.setConfig(base); + } + + @Override + public V put(K key, V value) { + if (config.getUseAsyncPut()) { + V oldValue = get(key); + Modification mod = new Modification(Modification.ModificationType.PUT, key, value); + enqueue(mod); + return oldValue; + } else { + return super.put(key, value); + } + } + + @Override + public void put(List<Modification> modifications) { + if (config.getUseAsyncPut()) { + for (Modification modification : modifications) { + enqueue(modification); + } + } else { + super.put(modifications); + } + } + + @Override + public V remove(Object key) { + V oldValue = get(key); + Modification mod = new Modification(Modification.ModificationType.REMOVE, key, null); + enqueue(mod); + return oldValue; + } + + @Override + public void start() { + if (log.isInfoEnabled()) log.info("Async cache loader starting: " + this); + stopped.set(false); + super.start(); + executor = Executors.newFixedThreadPool(config.getThreadPoolSize(), new ThreadFactory() { + public Thread newThread(Runnable r) { + Thread t = new Thread(r, "AsyncCacheLoaderOld-" + threadId.getAndIncrement()); + t.setDaemon(true); + return t; + } + }); + processorFutures = new ArrayList<Future>(config.getThreadPoolSize()); + for (int i = 0; i < config.getThreadPoolSize(); i++) processorFutures.add(executor.submit(new AsyncProcessor())); + } + + @Override + public void stop() { + stopped.set(true); + if (executor != null) { + for (Future f : processorFutures) f.cancel(true); + executor.shutdown(); + try { + boolean terminated = executor.isTerminated(); + while (!terminated) { + terminated = executor.awaitTermination(60, TimeUnit.SECONDS); + } + } + catch (InterruptedException e) { + Thread.currentThread().interrupt(); + } + } + executor = null; + super.stop(); + } + + private void enqueue(final Modification mod) { + if (stopped.get()) { + throw new CacheException("AsyncCacheLoaderOld stopped; no longer accepting more entries."); + } + if (trace) log.trace("Enqueuing modification " + mod); + try { + queue.put(mod); + } + catch (InterruptedException e) { + Thread.currentThread().interrupt(); + } + } + + /** + * Processes (by batch if possible) a queue of {@link Modification}s. + * + * @author manik surtani + */ + private class AsyncProcessor implements Runnable { + // Modifications to invoke as a single put + private final List<Modification> mods = new ArrayList<Modification>(config.getBatchSize()); + + public void run() { + while (!Thread.interrupted()) { + try { + run0(); + } + catch (InterruptedException e) { + break; + } + } + + try { + if (trace) log.trace("process remaining batch " + mods.size()); + put(mods); + if (trace) log.trace("process remaining queued " + queue.size()); + while (!queue.isEmpty()) { + run0(); + } + } + catch (InterruptedException e) { + log.trace("remaining interrupted"); + } + } + + private void run0() throws InterruptedException { + log.trace("Checking for modifications"); + int i = queue.drainTo(mods, config.getBatchSize()); + if (i == 0) { + Modification m = queue.take(); + mods.add(m); + } + + if (trace) { + log.trace("Calling put(List) with " + mods.size() + " modifications"); + } + put(mods); + mods.clear(); + } + + private void put(List<Modification> mods) { + try { + AsyncCacheLoaderOld.super.put(mods); + } + catch (Exception e) { + if (log.isWarnEnabled()) log.warn("Failed to process async modifications: " + e); + if (log.isDebugEnabled()) log.debug("Exception: ", e); + } + } + } + + @Override + public String toString() { + return super.toString() + + " delegate=[" + super.getCacheLoader() + "]" + + " stopped=" + stopped + + " batchSize=" + config.getBatchSize() + + " returnOld=" + config.getReturnOld() + + " asyncPut=" + config.getUseAsyncPut() + + " threadPoolSize=" + config.getThreadPoolSize() + + " queue.remainingCapacity()=" + queue.remainingCapacity() + + " queue.peek()=" + queue.peek(); + } + +} Deleted: core/branches/flat/src/main/java/org/horizon/loader_old/CacheLoader.java =================================================================== --- core/branches/flat/src/main/java/org/horizon/loader/CacheLoader.java 2009-02-10 11:54:44 UTC (rev 7672) +++ core/branches/flat/src/main/java/org/horizon/loader_old/CacheLoader.java 2009-02-10 13:51:40 UTC (rev 7674) @@ -1,236 +0,0 @@ -/* - * JBoss, Home of Professional Open Source. - * Copyright 2000 - 2008, Red Hat Middleware LLC, and individual contributors - * as indicated by the @author tags. See the copyright.txt file in the - * distribution for a full listing of individual contributors. - * - * This 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 2.1 of - * the License, or (at your option) any later version. - * - * This software 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 this software; if not, write to the Free - * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA - * 02110-1301 USA, or see the FSF site: http://www.fsf.org. - */ -package org.horizon.loader; - -import net.jcip.annotations.ThreadSafe; -import org.horizon.Cache; -import org.horizon.config.CacheLoaderConfig.IndividualCacheLoaderConfig; -import org.horizon.factories.scopes.Scope; -import org.horizon.factories.scopes.Scopes; -import org.horizon.marshall.EntryData; - -import java.io.ObjectInputStream; -import java.io.ObjectOutputStream; -import java.util.List; -import java.util.Map; - -/** - * A {@link CacheLoader} implementation persists and load keys to and from secondary storage, such as a database or - * filesystem. Typically, implementations store a series of keys and values (an entire {@link Map}) under a single - * {@link Fqn}. Loading and saving properties of an entire {@link Map} should be atomic. - * - * Lifecycle: First an instance of the loader is created, then the configuration ({@link - * #setConfig(CacheLoaderConfig.IndividualCacheLoaderConfig)}) and cache ({@link #setCache(CacheSPI)}) are set. After - * this, {@link #create()} is called. Then {@link #start()} is called. When re-deployed, {@link #stop()} will be called, - * followed by another {@link #start()}. Finally, when shut down, {@link #destroy()} is called, after which the loader - * is unusable. - * - * An {@link AbstractCacheLoader} is provided as a convenient starting place when implementing your own {@link - * CacheLoader}. - * - * It is important to note that all implementations are thread safe, as concurrent reads and writes, potentially even to - * the same {@link Fqn}, are possible. - * - * - * @author <a href="mailto:manik@jboss.org">Manik Surtani (manik(a)jboss.org)</a> - * @since 1.0 - */ -@ThreadSafe -(a)Scope(Scopes.NAMED_CACHE) -public interface CacheLoader<K, V> { - /** - * Sets the configuration. This is called before {@link #create()} and {@link #start()}. - * - * @param config May be an instance of the {@link CacheLoaderConfig.IndividualCacheLoaderConfig} base class, in which - * case the cache loader should use the {@link CacheLoaderConfig.IndividualCacheLoaderConfig#getProperties()} - * method to find configuration information. Alternatively, may be a type-specific subclass of {@link - * CacheLoaderConfig.IndividualCacheLoaderConfig}, if there is one. - */ - void setConfig(IndividualCacheLoaderConfig config); - - /** - * Gets the configuration. - * - * @return the configuration, represented by a {@link CacheLoaderConfig.IndividualCacheLoaderConfig} object. - */ - IndividualCacheLoaderConfig getConfig(); - - /** - * Sets the {@link Cache} that is maintaining this CacheLoader. This method allows this CacheLoader to set a - * reference to the {@link Cache}. This method is called be called after the CacheLoader instance has been - * constructed. - * - * @param c The cache on which this loader works - */ - void setCache(Cache<K, V> c); - - /** - * Returns all keys and values from the persistent store, given a {@link Fqn} - * - * @param name the {@link Fqn} to search for. - * @return Map<Object,Object> keys and values for the given node. Returns null if the node is not found. If the node - * is found but has no attributes, this method returns an empty Map. - */ - V get(Object key); - - - /** - * Returns true if the CacheLoader has a node with a {@link Fqn}. - * - * @return true if node exists, false otherwise - */ - boolean exists(Object key); - - /** - * Puts a key and value into the attribute map of a given node. If the node does not exist, all parent nodes from - * the root down are created automatically. Returns the old value. - */ - V put(K key, V value); - - /** - * Removes everything from this cache-loader - */ - void clear(); - - /** - * Removes the given node and all its subnodes, does nothing if the node does not exist. - * - * @param fqn the {@link Fqn} of the node - */ - V remove(Object key); - - /** - * Retrieves all entries stored in this cache loader - * - * @return All entries - * @throws Exception on error - */ - List<EntryData<K, V>> getAllEntries(); - - - /** - * Applies all modifications to the backend store. Changes may be applied in a single operation. - * - * @param modifications A List<Modification> of modifications - */ - void put(List<Modification> modifications); - - /** - * Prepares a list of modifications. For example, for a DB-based CacheLoader: <ol> <li>Create a local (JDBC) - * transaction <li>Associate the local transaction with <code>tx</code> (tx is the key) <li>Execute the corresponding - * SQL statements against the DB (statements derived from modifications) </ol> For non-transactional CacheLoader - * (e.g. file-based), the implementation could attempt to implement its own transactional logic, attempting to write - * data to a temp location (or memory) and writing it to the proper location upon commit. - * - * @param tx The transaction, indended to be used by implementations as an identifier of the transaction - * (and not necessarily a JTA {@link javax.transaction.Transaction} object) - * @param modifications A {@link List} containing {@link org.horizon.loader.Modification}s, for the given - * transaction - * @param one_phase Persist immediately and (for example) commit the local JDBC transaction as well. When true, - * we won't get a {@link #commit(Object)} or {@link #rollback(Object)} method call later - * @throws Exception - */ - void prepare(Object tx, List<Modification> modifications, boolean one_phase); - - /** - * Commits the transaction. A DB-based CacheLoader would look up the local JDBC transaction asociated with - * <code>tx</code> and commit that transaction. Non-transactional CacheLoaders could simply write the data that was - * previously saved transiently under the given <code>tx</code> key, to (for example) a file system. - * - * Note this only holds if the previous prepare() did not define <pre>one_phase=true</pre> - * - * @param tx transaction to commit - */ - void commit(Object tx); - - /** - * Rolls the transaction back. A DB-based CacheLoader would look up the local JDBC transaction asociated with - * <code>tx</code> and roll back that transaction. - * - * @param tx transaction to roll back - */ - void rollback(Object tx); - - /** - * Fetches the entire state for this cache from secondary storage (disk, database) and writes it to a provided - * ObjectOutputStream. State written to the provided ObjectOutputStream parameter is used for initialization of a new - * CacheImpl instance. When the state gets transferred to the new cache instance its cacheloader calls {@link - * #storeEntireState(ObjectInputStream)} - * - * Implementations of this method should not catch any exception or close the given ObjectOutputStream parameter. In - * order to ensure cacheloader interoperability contents of the cache are written to the ObjectOutputStream as a - * sequence of NodeData objects. - * - * Default implementation is provided by {@link AbstractCacheLoader} and ensures cacheloader interoperability. - * Implementors are encouraged to consider extending AbstractCacheLoader prior to implementing completely custom - * cacheloader. - * - * @param os ObjectOutputStream to write state - * @see AbstractCacheLoader#loadEntireState(ObjectOutputStream) - * @see org.horizon.marshall.NodeData - */ - void loadEntireState(ObjectOutputStream os); - - /** - * Stores the entire state for this cache by reading it from a provided ObjectInputStream. The state was provided to - * this cache by calling {@link #loadEntireState(ObjectOutputStream)}} on some other cache instance. State currently - * in storage gets overwritten. - * - * Implementations of this method should not catch any exception or close the given ObjectInputStream parameter. In - * order to ensure cacheloader interoperability contents of the cache are read from the ObjectInputStream as a - * sequence of NodeData objects. - * - * Default implementation is provided by {@link AbstractCacheLoader} and ensures cacheloader interoperability. - * Implementors are encouraged to consider extending AbstractCacheLoader prior to implementing completely custom - * cacheloader. - * - * @param is ObjectInputStream to read state - * @see AbstractCacheLoader#storeEntireState(ObjectInputStream) - * @see org.horizon.marshall.NodeData - */ - void storeEntireState(ObjectInputStream is); - - /** - * Lifecycle method, called when the cache loader is created. - * - * @throws java.lang.Exception - */ - void create(); - - /** - * Lifecycle method, called when the cache loader is started. - * - * @throws java.lang.Exception - */ - void start(); - - /** - * Lifecycle method, called when the cache loader is stopped. - */ - void stop(); - - /** - * Lifecycle method, called when the cache loader is destroyed. - */ - void destroy(); - -} Copied: core/branches/flat/src/main/java/org/horizon/loader_old/CacheLoader.java (from rev 7673, core/branches/flat/src/main/java/org/horizon/loader/CacheLoader.java) =================================================================== --- core/branches/flat/src/main/java/org/horizon/loader_old/CacheLoader.java (rev 0) +++ core/branches/flat/src/main/java/org/horizon/loader_old/CacheLoader.java 2009-02-10 13:51:40 UTC (rev 7674) @@ -0,0 +1,54 @@ +package org.horizon.loader; + +import org.horizon.Cache; +import org.horizon.config.CacheLoaderConfig; +import org.horizon.lifecycle.Lifecycle; +import org.horizon.marshall.Marshaller; + +import javax.transaction.TransactionManager; +import java.util.Collection; +import java.util.Set; + +/** + * Responsible for loading cache data from an external source + * + * @author Manik Surtani + * @since 1.0 + */ +public interface CacheLoader<K, V> extends Lifecycle { + + /** + * Used to initialize a cache loader. Typically invoked by the {@link org.horizon.loader.CacheLoaderManager} when + * setting up cache loaders. + * + * @param config the cache loader configuration bean + * @param cache cache associated with this cache loader. Implementations may use this to determine cache name when + * selecting where refer to state in storage, for example, a different database table name. + * @param tm transaction manager associated with the cache. Note that it is the cache loader's responsibility to + * be aware of and participate in transactions accordingly. + * @param m marshaller to use when loading state from a stream, if supported by the implementation. + */ + void init(CacheLoaderConfig.IndividualCacheLoaderConfig config, Cache cache, TransactionManager tm, Marshaller m); + + /** + * Loads an entry mapped to by a given key. Should return null if the entry does not exist. + * + * @param key key + * @return an entry + */ + StoredEntry<K, V> load(K key); + + /** + * Loads a set of entries based on a collection of keys. Should return an empty set if none of the keys exist. + * + * @param keys keys + * @return a set of entries + */ + Set<StoredEntry<K, V>> loadAll(Collection<? extends K> keys); + + /** + * @param key key to test + * @return true if the key exists, false otherwise + */ + boolean containsKey(K key); +} Deleted: core/branches/flat/src/main/java/org/horizon/loader_old/CacheLoaderManager.java =================================================================== --- core/branches/flat/src/main/java/org/horizon/loader/CacheLoaderManager.java 2009-02-10 11:54:44 UTC (rev 7672) +++ core/branches/flat/src/main/java/org/horizon/loader_old/CacheLoaderManager.java 2009-02-10 13:51:40 UTC (rev 7674) @@ -1,353 +0,0 @@ -/* - * JBoss, Home of Professional Open Source. - * Copyright 2000 - 2008, Red Hat Middleware LLC, and individual contributors - * as indicated by the @author tags. See the copyright.txt file in the - * distribution for a full listing of individual contributors. - * - * This 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 2.1 of - * the License, or (at your option) any later version. - * - * This software 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 this software; if not, write to the Free - * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA - * 02110-1301 USA, or see the FSF site: http://www.fsf.org. - */ -package org.horizon.loader; - -import org.horizon.Cache; -import org.horizon.CacheException; -import org.horizon.config.CacheLoaderConfig; -import org.horizon.config.CacheLoaderConfig.IndividualCacheLoaderConfig; -import org.horizon.config.CacheLoaderConfig.IndividualCacheLoaderConfig.SingletonStoreConfig; -import org.horizon.config.Configuration; -import org.horizon.config.ConfigurationException; -import org.horizon.factories.ComponentRegistry; -import org.horizon.factories.annotations.Inject; -import org.horizon.factories.annotations.Start; -import org.horizon.factories.annotations.Stop; -import org.horizon.logging.Log; -import org.horizon.logging.LogFactory; -import org.horizon.util.ReflectionUtil; - -import java.util.ArrayList; -import java.util.Iterator; - -/** - * Manages all cache loader functionality. This class is typically initialised with an XML DOM Element, represeting a - * cache loader configuration, or a {@link CacheLoaderConfig} object. - * - * Usage: - * - * <code> CacheLoaderManager manager = new CacheLoaderManager(); manager.setConfig(myXmlSnippet, myTreeCache); - * CacheLoader loader = manager.getCacheLoader(); </code> - * - * See the User Guide or sample configuration files for the equivalent XML configuration elements. - * - * @author <a href="mailto:manik@jboss.org">Manik Surtani (manik(a)jboss.org)</a> - * @author <a href="mailto:galder.zamarreno@jboss.com">Galder Zamarreno</a> - * @since 1.0 - */ -public class CacheLoaderManager { - private static final Log log = LogFactory.getLog(CacheLoaderManager.class); - private CacheLoaderConfig config; - private Cache<Object, Object> cache; - private CacheLoader<Object, Object> loader; - private boolean fetchPersistentState; - private Configuration configuration; - private ComponentRegistry registry; - - @Inject - public void injectDependencies(Cache<Object, Object> cache, Configuration configuration, ComponentRegistry registry) { - // TODO: Inject CacheSPI once we have the cache loaders not relying on a tree structure - this.config = configuration.getCacheLoaderConfig(); - this.cache = cache; - this.configuration = configuration; - this.registry = registry; - - if (config != null) { - try { - loader = createCacheLoader(); - } - catch (Exception e) { - throw new CacheException("Unable to create cache loaders", e); - } - } - } - - /** - * Sets a configuration object and creates a cacheloader accordingly. Primarily used for testing. - * - * @param config - * @param cache - * @throws CacheException - */ - public void setConfig(CacheLoaderConfig config, Cache<Object, Object> cache, Configuration configuration) throws CacheException { - this.config = config == null ? configuration.getCacheLoaderConfig() : config; - this.cache = cache; - this.configuration = configuration; - - if (config != null) { - try { - loader = createCacheLoader(); - } - catch (Exception e) { - throw new CacheException("Unable to create cache loaders", e); - } - } - } - - /** - * Creates the cache loader based on a cache loader config passed in. - * - * @return a configured cacheloader - * @throws IllegalAccessException - * @throws InstantiationException - * @throws ClassNotFoundException - */ - private CacheLoader<Object, Object> createCacheLoader() throws Exception { - CacheLoader<Object, Object> tmpLoader; - // if we only have a single cache loader configured in the chaining cacheloader then - // don't use a chaining cache loader at all. - - ArrayList<IndividualCacheLoaderConfig> finalConfigs = - new ArrayList<IndividualCacheLoaderConfig>(); - - // also if we are using passivation then just directly use the first cache loader. - if (config.useChainingCacheLoader()) { - // create chaining cache loader. - ChainingCacheLoader<Object, Object> ccl = new ChainingCacheLoader<Object, Object>(); - tmpLoader = ccl; - Iterator<IndividualCacheLoaderConfig> it = config.getIndividualCacheLoaderConfigs().iterator(); - - // only one cache loader may have fetchPersistentState to true. - int numLoadersWithFetchPersistentState = 0; - while (it.hasNext()) { - CacheLoaderConfig.IndividualCacheLoaderConfig cfg = (CacheLoaderConfig.IndividualCacheLoaderConfig) it.next(); - if (cfg.isFetchPersistentState()) { - numLoadersWithFetchPersistentState++; - fetchPersistentState = true; - } - if (numLoadersWithFetchPersistentState > 1) { - throw new Exception("Invalid cache loader configuration!! Only ONE cache loader may have fetchPersistentState set to true. Cache will not start!"); - } - - assertNotSingletonAndShared(cfg); - - CacheLoader<Object, Object> l = createCacheLoader(cfg, cache); - cfg = l.getConfig(); - finalConfigs.add(cfg); - // Only loaders that deal w/ state transfer factor into - // whether the overall chain supports ExtendedCacheLoader - ccl.addCacheLoader(l, cfg); - - } - } else { - CacheLoaderConfig.IndividualCacheLoaderConfig cfg = config.getIndividualCacheLoaderConfigs().get(0); - tmpLoader = createCacheLoader(cfg, cache); - finalConfigs.add(tmpLoader.getConfig() == null ? cfg : tmpLoader.getConfig()); - fetchPersistentState = cfg.isFetchPersistentState(); - assertNotSingletonAndShared(cfg); - } - - // Update the config with those actually used by the loaders - ReflectionUtil.setValue(config, "accessible", true); - config.setIndividualCacheLoaderConfigs(finalConfigs); - - return tmpLoader; - } - - private void assertNotSingletonAndShared(IndividualCacheLoaderConfig cfg) { - SingletonStoreConfig ssc = cfg.getSingletonStoreConfig(); - if (ssc != null && ssc.isSingletonStoreEnabled() && config.isShared()) - throw new ConfigurationException("Invalid cache loader configuration!! If a cache loader is configured as a singleton, the cache loader cannot be shared in a cluster!"); - } - - /** - * Creates the cache loader based on the configuration. - * - * @param cfg - * @param cache - * @return a cache loader - * @throws Exception - */ - private CacheLoader<Object, Object> createCacheLoader(CacheLoaderConfig.IndividualCacheLoaderConfig cfg, Cache<Object, Object> cache) throws Exception { - // create loader - CacheLoader<Object, Object> tmpLoader = cfg.getCacheLoader() == null ? createInstance(cfg.getClassName()) : cfg.getCacheLoader(); - - if (tmpLoader != null) { - // async? - if (cfg.isAsync()) { - CacheLoader<Object, Object> asyncDecorator; - asyncDecorator = new AsyncCacheLoader<Object, Object>(tmpLoader); - tmpLoader = asyncDecorator; - } - - if (cfg.isIgnoreModifications()) { - AbstractDelegatingCacheLoader<Object, Object> readOnlyDecorator; - readOnlyDecorator = new ReadOnlyDelegatingCacheLoader<Object, Object>(tmpLoader); - tmpLoader = readOnlyDecorator; - } - - // singleton? - SingletonStoreConfig ssc = cfg.getSingletonStoreConfig(); - if (ssc != null && ssc.isSingletonStoreEnabled()) { - Object decorator = createInstance(ssc.getSingletonStoreClass()); - - /* class providing singleton store functionality must extend AbstractDelegatingCacheLoader so that - * underlying cacheloader can be set. */ - if (decorator instanceof AbstractDelegatingCacheLoader) { - @SuppressWarnings("unchecked") - AbstractDelegatingCacheLoader<Object, Object> singletonDecorator = (AbstractDelegatingCacheLoader<Object, Object>) decorator; - /* set the cache loader to where calls will be delegated by the class providing the singleton - * store functionality. */ - singletonDecorator.setCacheLoader(tmpLoader); - tmpLoader = singletonDecorator; - } else { - throw new Exception("Invalid cache loader configuration!! Singleton store implementation class must extend org.horizon.loader.AbstractDelegatingCacheLoader"); - } - } - - // load props - tmpLoader.setConfig(cfg); - - setCacheInLoader(cache, tmpLoader); - // we should not be creating/starting the cache loader here - this should be done in the separate - // startCacheLoader() method. - // tmpLoader.create(); - // tmpLoader.start(); - } - return tmpLoader; - } - - /** - * Sets the cache instance associated with the given cache loader. This method was created for testing purpouses so - * that it can be overriden in the mock version of the CacheLoaderManager. - * - * @param c instance of cache to be set in cache loader - * @param loader cache loader to which assign the cache instance - */ - protected void setCacheInLoader(Cache<Object, Object> c, CacheLoader<Object, Object> loader) { - loader.setCache(c); - } - - @SuppressWarnings("unchecked") - private CacheLoader<Object, Object> createInstance(String className) throws ClassNotFoundException, IllegalAccessException, InstantiationException { - if (log.isTraceEnabled()) log.trace("instantiating class " + className); - Class<?> cl = Thread.currentThread().getContextClassLoader().loadClass(className); - return (CacheLoader<Object, Object>) cl.newInstance(); - } - - /** - * Performs a preload on the cache based on the cache loader preload configs used when configuring the cache. - * - * @throws Exception - */ - @Start(priority = 50) - public void preloadCache() throws CacheException { - if (loader != null) { - if (config.isPreload()) { - if (log.isDebugEnabled()) log.debug("preloading transient state from cache loader {0}", loader); - long start, stop, total; - start = System.currentTimeMillis(); - // TODO: Call preload on the cache loader interface - if (true) throw new RuntimeException("implement me"); - stop = System.currentTimeMillis(); - total = stop - start; - if (log.isDebugEnabled()) { - log.debug("preloading transient state from cache loader was successful (in " + total + " milliseconds)"); - } - } - } - } - - /** - * Returns the configuration element of the cache loaders - */ - public CacheLoaderConfig getCacheLoaderConfig() { - return config; - } - - /** - * Returns the cache loader - */ - public CacheLoader<Object, Object> getCacheLoader() { - return loader; - } - - /** - * Tests if we're using passivation - */ - public boolean isPassivation() { - return config.isPassivation(); - } - - /** - * Returns true if at least one of the configured cache loaders has set fetchPersistentState to true. - */ - public boolean isFetchPersistentState() { - return fetchPersistentState; - } - - @Stop - public void stopCacheLoader() { - if (loader != null) { - // stop the cache loader - loader.stop(); - // destroy the cache loader - loader.destroy(); - } - } - - @Start - public void startCacheLoader() throws CacheException { - if (config == null) config = configuration.getCacheLoaderConfig(); - - if (config != null && loader == null) { - try { - loader = createCacheLoader(); - } - catch (Exception e) { - throw new CacheException("Unable to create cache loaders", e); - } - } - - - if (loader != null) { - try { - // wire any deps. - registry.wireDependencies(loader); - - // create the cache loader - loader.create(); - // start the cache loader - loader.start(); - - purgeLoaders(false); - } - catch (Exception e) { - throw new CacheException("Unable to start cache loaders", e); - } - fetchPersistentState = fetchPersistentState || (loader.getConfig() != null && loader.getConfig().isFetchPersistentState()); - fetchPersistentState = fetchPersistentState || (config != null && config.isFetchPersistentState()); - } - } - - public void purgeLoaders(boolean force) throws Exception { - if ((loader instanceof ChainingCacheLoader) && !force) { - ((ChainingCacheLoader<?, ?>) loader).purgeIfNecessary(); - } else { - CacheLoaderConfig.IndividualCacheLoaderConfig first = getCacheLoaderConfig().getFirstCacheLoaderConfig(); - if (force || - (first != null && first.isPurgeOnStartup())) { - loader.clear(); - } - } - } -} Copied: core/branches/flat/src/main/java/org/horizon/loader_old/CacheLoaderManager.java (from rev 7673, core/branches/flat/src/main/java/org/horizon/loader/CacheLoaderManager.java) =================================================================== --- core/branches/flat/src/main/java/org/horizon/loader_old/CacheLoaderManager.java (rev 0) +++ core/branches/flat/src/main/java/org/horizon/loader_old/CacheLoaderManager.java 2009-02-10 13:51:40 UTC (rev 7674) @@ -0,0 +1,353 @@ +/* + * JBoss, Home of Professional Open Source. + * Copyright 2000 - 2008, Red Hat Middleware LLC, and individual contributors + * as indicated by the @author tags. See the copyright.txt file in the + * distribution for a full listing of individual contributors. + * + * This 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 2.1 of + * the License, or (at your option) any later version. + * + * This software 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 this software; if not, write to the Free + * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA + * 02110-1301 USA, or see the FSF site: http://www.fsf.org. + */ +package org.horizon.loader; + +import org.horizon.Cache; +import org.horizon.CacheException; +import org.horizon.config.CacheLoaderConfig; +import org.horizon.config.CacheLoaderConfig.IndividualCacheLoaderConfig; +import org.horizon.config.CacheLoaderConfig.IndividualCacheLoaderConfig.SingletonStoreConfig; +import org.horizon.config.Configuration; +import org.horizon.config.ConfigurationException; +import org.horizon.factories.ComponentRegistry; +import org.horizon.factories.annotations.Inject; +import org.horizon.factories.annotations.Start; +import org.horizon.factories.annotations.Stop; +import org.horizon.logging.Log; +import org.horizon.logging.LogFactory; +import org.horizon.util.ReflectionUtil; + +import java.util.ArrayList; +import java.util.Iterator; + +/** + * Manages all cache loader functionality. This class is typically initialised with an XML DOM Element, represeting a + * cache loader configuration, or a {@link CacheLoaderConfig} object. + * + * Usage: + * + * <code> CacheLoaderManager manager = new CacheLoaderManager(); manager.setConfig(myXmlSnippet, myTreeCache); + * CacheLoader loader = manager.getCacheLoader(); </code> + * + * See the User Guide or sample configuration files for the equivalent XML configuration elements. + * + * @author <a href="mailto:manik@jboss.org">Manik Surtani (manik(a)jboss.org)</a> + * @author <a href="mailto:galder.zamarreno@jboss.com">Galder Zamarreno</a> + * @since 1.0 + */ +public class CacheLoaderManager { + private static final Log log = LogFactory.getLog(CacheLoaderManager.class); + private CacheLoaderConfig config; + private Cache<Object, Object> cache; + private CacheLoaderOld<Object, Object> loader; + private boolean fetchPersistentState; + private Configuration configuration; + private ComponentRegistry registry; + + @Inject + public void injectDependencies(Cache<Object, Object> cache, Configuration configuration, ComponentRegistry registry) { + // TODO: Inject CacheSPI once we have the cache loaders not relying on a tree structure + this.config = configuration.getCacheLoaderConfig(); + this.cache = cache; + this.configuration = configuration; + this.registry = registry; + + if (config != null) { + try { + loader = createCacheLoader(); + } + catch (Exception e) { + throw new CacheException("Unable to create cache loaders", e); + } + } + } + + /** + * Sets a configuration object and creates a cacheloader accordingly. Primarily used for testing. + * + * @param config + * @param cache + * @throws CacheException + */ + public void setConfig(CacheLoaderConfig config, Cache<Object, Object> cache, Configuration configuration) throws CacheException { + this.config = config == null ? configuration.getCacheLoaderConfig() : config; + this.cache = cache; + this.configuration = configuration; + + if (config != null) { + try { + loader = createCacheLoader(); + } + catch (Exception e) { + throw new CacheException("Unable to create cache loaders", e); + } + } + } + + /** + * Creates the cache loader based on a cache loader config passed in. + * + * @return a configured cacheloader + * @throws IllegalAccessException + * @throws InstantiationException + * @throws ClassNotFoundException + */ + private CacheLoaderOld<Object, Object> createCacheLoader() throws Exception { + CacheLoaderOld<Object, Object> tmpLoader; + // if we only have a single cache loader_old configured in the chaining cacheloader then + // don't use a chaining cache loader_old at all. + + ArrayList<IndividualCacheLoaderConfig> finalConfigs = + new ArrayList<IndividualCacheLoaderConfig>(); + + // also if we are using passivation then just directly use the first cache loader_old. + if (config.useChainingCacheLoader()) { + // create chaining cache loader_old. + ChainingCacheLoaderOld<Object, Object> ccl = new ChainingCacheLoaderOld<Object, Object>(); + tmpLoader = ccl; + Iterator<IndividualCacheLoaderConfig> it = config.getIndividualCacheLoaderConfigs().iterator(); + + // only one cache loader_old may have fetchPersistentState to true. + int numLoadersWithFetchPersistentState = 0; + while (it.hasNext()) { + CacheLoaderConfig.IndividualCacheLoaderConfig cfg = (CacheLoaderConfig.IndividualCacheLoaderConfig) it.next(); + if (cfg.isFetchPersistentState()) { + numLoadersWithFetchPersistentState++; + fetchPersistentState = true; + } + if (numLoadersWithFetchPersistentState > 1) { + throw new Exception("Invalid cache loader configuration!! Only ONE cache loader may have fetchPersistentState set to true. Cache will not start!"); + } + + assertNotSingletonAndShared(cfg); + + CacheLoaderOld<Object, Object> l = createCacheLoader(cfg, cache); + cfg = l.getConfig(); + finalConfigs.add(cfg); + // Only loaders that deal w/ state transfer factor into + // whether the overall chain supports ExtendedCacheLoader + ccl.addCacheLoader(l, cfg); + + } + } else { + CacheLoaderConfig.IndividualCacheLoaderConfig cfg = config.getIndividualCacheLoaderConfigs().get(0); + tmpLoader = createCacheLoader(cfg, cache); + finalConfigs.add(tmpLoader.getConfig() == null ? cfg : tmpLoader.getConfig()); + fetchPersistentState = cfg.isFetchPersistentState(); + assertNotSingletonAndShared(cfg); + } + + // Update the config with those actually used by the loaders + ReflectionUtil.setValue(config, "accessible", true); + config.setIndividualCacheLoaderConfigs(finalConfigs); + + return tmpLoader; + } + + private void assertNotSingletonAndShared(IndividualCacheLoaderConfig cfg) { + SingletonStoreConfig ssc = cfg.getSingletonStoreConfig(); + if (ssc != null && ssc.isSingletonStoreEnabled() && config.isShared()) + throw new ConfigurationException("Invalid cache loader configuration!! If a cache loader is configured as a singleton, the cache loader cannot be shared in a cluster!"); + } + + /** + * Creates the cache loader based on the configuration. + * + * @param cfg + * @param cache + * @return a cache loader + * @throws Exception + */ + private CacheLoaderOld<Object, Object> createCacheLoader(CacheLoaderConfig.IndividualCacheLoaderConfig cfg, Cache<Object, Object> cache) throws Exception { + // create loader_old + CacheLoaderOld<Object, Object> tmpLoader = cfg.getCacheLoader() == null ? createInstance(cfg.getClassName()) : cfg.getCacheLoader(); + + if (tmpLoader != null) { + // async? + if (cfg.isAsync()) { + CacheLoaderOld<Object, Object> asyncDecorator; + asyncDecorator = new AsyncCacheLoaderOld<Object, Object>(tmpLoader); + tmpLoader = asyncDecorator; + } + + if (cfg.isIgnoreModifications()) { + AbstractDelegatingCacheLoaderOld<Object, Object> readOnlyDecorator; + readOnlyDecorator = new ReadOnlyDelegatingCacheLoaderOld<Object, Object>(tmpLoader); + tmpLoader = readOnlyDecorator; + } + + // singleton? + SingletonStoreConfig ssc = cfg.getSingletonStoreConfig(); + if (ssc != null && ssc.isSingletonStoreEnabled()) { + Object decorator = createInstance(ssc.getSingletonStoreClass()); + + /* class providing singleton store functionality must extend AbstractDelegatingCacheLoaderOld so that + * underlying cacheloader can be set. */ + if (decorator instanceof AbstractDelegatingCacheLoaderOld) { + @SuppressWarnings("unchecked") + AbstractDelegatingCacheLoaderOld<Object, Object> singletonDecorator = (AbstractDelegatingCacheLoaderOld<Object, Object>) decorator; + /* set the cache loader_old to where calls will be delegated by the class providing the singleton + * store functionality. */ + singletonDecorator.setCacheLoader(tmpLoader); + tmpLoader = singletonDecorator; + } else { + throw new Exception("Invalid cache loader configuration!! Singleton store implementation class must extend org.horizon.loader.AbstractDelegatingCacheLoaderOld"); + } + } + + // load props + tmpLoader.setConfig(cfg); + + setCacheInLoader(cache, tmpLoader); + // we should not be creating/starting the cache loader_old here - this should be done in the separate + // startCacheLoader() method. + // tmpLoader.create(); + // tmpLoader.start(); + } + return tmpLoader; + } + + /** + * Sets the cache instance associated with the given cache loader. This method was created for testing purpouses so + * that it can be overriden in the mock version of the CacheLoaderManager. + * + * @param c instance of cache to be set in cache loader + * @param loader cache loader to which assign the cache instance + */ + protected void setCacheInLoader(Cache<Object, Object> c, CacheLoaderOld<Object, Object> loader) { + loader.setCache(c); + } + + @SuppressWarnings("unchecked") + private CacheLoaderOld<Object, Object> createInstance(String className) throws ClassNotFoundException, IllegalAccessException, InstantiationException { + if (log.isTraceEnabled()) log.trace("instantiating class " + className); + Class<?> cl = Thread.currentThread().getContextClassLoader().loadClass(className); + return (CacheLoaderOld<Object, Object>) cl.newInstance(); + } + + /** + * Performs a preload on the cache based on the cache loader preload configs used when configuring the cache. + * + * @throws Exception + */ + @Start(priority = 50) + public void preloadCache() throws CacheException { + if (loader != null) { + if (config.isPreload()) { + if (log.isDebugEnabled()) log.debug("preloading transient state from cache loader {0}", loader); + long start, stop, total; + start = System.currentTimeMillis(); + // TODO: Call preload on the cache loader_old interface + if (true) throw new RuntimeException("implement me"); + stop = System.currentTimeMillis(); + total = stop - start; + if (log.isDebugEnabled()) { + log.debug("preloading transient state from cache loader was successful (in " + total + " milliseconds)"); + } + } + } + } + + /** + * Returns the configuration element of the cache loaders + */ + public CacheLoaderConfig getCacheLoaderConfig() { + return config; + } + + /** + * Returns the cache loader + */ + public CacheLoaderOld<Object, Object> getCacheLoader() { + return loader; + } + + /** + * Tests if we're using passivation + */ + public boolean isPassivation() { + return config.isPassivation(); + } + + /** + * Returns true if at least one of the configured cache loaders has set fetchPersistentState to true. + */ + public boolean isFetchPersistentState() { + return fetchPersistentState; + } + + @Stop + public void stopCacheLoader() { + if (loader != null) { + // stop the cache loader_old + loader.stop(); + // destroy the cache loader_old + loader.destroy(); + } + } + + @Start + public void startCacheLoader() throws CacheException { + if (config == null) config = configuration.getCacheLoaderConfig(); + + if (config != null && loader == null) { + try { + loader = createCacheLoader(); + } + catch (Exception e) { + throw new CacheException("Unable to create cache loaders", e); + } + } + + + if (loader != null) { + try { + // wire any deps. + registry.wireDependencies(loader); + + // create the cache loader_old + loader.create(); + // start the cache loader_old + loader.start(); + + purgeLoaders(false); + } + catch (Exception e) { + throw new CacheException("Unable to start cache loaders", e); + } + fetchPersistentState = fetchPersistentState || (loader.getConfig() != null && loader.getConfig().isFetchPersistentState()); + fetchPersistentState = fetchPersistentState || (config != null && config.isFetchPersistentState()); + } + } + + public void purgeLoaders(boolean force) throws Exception { + if ((loader instanceof ChainingCacheLoaderOld) && !force) { + ((ChainingCacheLoaderOld<?, ?>) loader).purgeIfNecessary(); + } else { + CacheLoaderConfig.IndividualCacheLoaderConfig first = getCacheLoaderConfig().getFirstCacheLoaderConfig(); + if (force || + (first != null && first.isPurgeOnStartup())) { + loader.clear(); + } + } + } +} Copied: core/branches/flat/src/main/java/org/horizon/loader_old/CacheLoaderOld.java (from rev 7673, core/branches/flat/src/main/java/org/horizon/loader/CacheLoaderOld.java) =================================================================== --- core/branches/flat/src/main/java/org/horizon/loader_old/CacheLoaderOld.java (rev 0) +++ core/branches/flat/src/main/java/org/horizon/loader_old/CacheLoaderOld.java 2009-02-10 13:51:40 UTC (rev 7674) @@ -0,0 +1,236 @@ +/* + * JBoss, Home of Professional Open Source. + * Copyright 2000 - 2008, Red Hat Middleware LLC, and individual contributors + * as indicated by the @author tags. See the copyright.txt file in the + * distribution for a full listing of individual contributors. + * + * This 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 2.1 of + * the License, or (at your option) any later version. + * + * This software 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 this software; if not, write to the Free + * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA + * 02110-1301 USA, or see the FSF site: http://www.fsf.org. + */ +package org.horizon.loader; + +import net.jcip.annotations.ThreadSafe; +import org.horizon.Cache; +import org.horizon.config.CacheLoaderConfig.IndividualCacheLoaderConfig; +import org.horizon.factories.scopes.Scope; +import org.horizon.factories.scopes.Scopes; +import org.horizon.marshall.EntryData; + +import java.io.ObjectInputStream; +import java.io.ObjectOutputStream; +import java.util.List; +import java.util.Map; + +/** + * A {@link CacheLoaderOld} implementation persists and load keys to and from secondary storage, such as a database or + * filesystem. Typically, implementations store a series of keys and values (an entire {@link Map}) under a single + * {@link Fqn}. Loading and saving properties of an entire {@link Map} should be atomic. + * + * Lifecycle: First an instance of the loader is created, then the configuration ({@link + * #setConfig(CacheLoaderConfig.IndividualCacheLoaderConfig)}) and cache ({@link #setCache(CacheSPI)}) are set. After + * this, {@link #create()} is called. Then {@link #start()} is called. When re-deployed, {@link #stop()} will be called, + * followed by another {@link #start()}. Finally, when shut down, {@link #destroy()} is called, after which the loader + * is unusable. + * + * An {@link AbstractCacheLoaderOld} is provided as a convenient starting place when implementing your own {@link + * CacheLoaderOld}. + * + * It is important to note that all implementations are thread safe, as concurrent reads and writes, potentially even to + * the same {@link Fqn}, are possible. + * + * + * @author <a href="mailto:manik@jboss.org">Manik Surtani (manik(a)jboss.org)</a> + * @since 1.0 + */ +@ThreadSafe +(a)Scope(Scopes.NAMED_CACHE) +public interface CacheLoaderOld<K, V> { + /** + * Sets the configuration. This is called before {@link #create()} and {@link #start()}. + * + * @param config May be an instance of the {@link CacheLoaderConfig.IndividualCacheLoaderConfig} base class, in which + * case the cache loader should use the {@link CacheLoaderConfig.IndividualCacheLoaderConfig#getProperties()} + * method to find configuration information. Alternatively, may be a type-specific subclass of {@link + * CacheLoaderConfig.IndividualCacheLoaderConfig}, if there is one. + */ + void setConfig(IndividualCacheLoaderConfig config); + + /** + * Gets the configuration. + * + * @return the configuration, represented by a {@link CacheLoaderConfig.IndividualCacheLoaderConfig} object. + */ + IndividualCacheLoaderConfig getConfig(); + + /** + * Sets the {@link Cache} that is maintaining this CacheLoader. This method allows this CacheLoader to set a + * reference to the {@link Cache}. This method is called be called after the CacheLoader instance has been + * constructed. + * + * @param c The cache on which this loader works + */ + void setCache(Cache<K, V> c); + + /** + * Returns all keys and values from the persistent store, given a {@link Fqn} + * + * @param name the {@link Fqn} to search for. + * @return Map<Object,Object> keys and values for the given node. Returns null if the node is not found. If the node + * is found but has no attributes, this method returns an empty Map. + */ + V get(Object key); + + + /** + * Returns true if the CacheLoader has a node with a {@link Fqn}. + * + * @return true if node exists, false otherwise + */ + boolean exists(Object key); + + /** + * Puts a key and value into the attribute map of a given node. If the node does not exist, all parent nodes from + * the root down are created automatically. Returns the old value. + */ + V put(K key, V value); + + /** + * Removes everything from this cache-loader + */ + void clear(); + + /** + * Removes the given node and all its subnodes, does nothing if the node does not exist. + * + * @param fqn the {@link Fqn} of the node + */ + V remove(Object key); + + /** + * Retrieves all entries stored in this cache loader + * + * @return All entries + * @throws Exception on error + */ + List<EntryData<K, V>> getAllEntries(); + + + /** + * Applies all modifications to the backend store. Changes may be applied in a single operation. + * + * @param modifications A List<Modification> of modifications + */ + void put(List<Modification> modifications); + + /** + * Prepares a list of modifications. For example, for a DB-based CacheLoader: <ol> <li>Create a local (JDBC) + * transaction <li>Associate the local transaction with <code>tx</code> (tx is the key) <li>Execute the corresponding + * SQL statements against the DB (statements derived from modifications) </ol> For non-transactional CacheLoader + * (e.g. file-based), the implementation could attempt to implement its own transactional logic, attempting to write + * data to a temp location (or memory) and writing it to the proper location upon commit. + * + * @param tx The transaction, indended to be used by implementations as an identifier of the transaction + * (and not necessarily a JTA {@link javax.transaction.Transaction} object) + * @param modifications A {@link List} containing {@link org.horizon.loader.Modification}s, for the given + * transaction + * @param one_phase Persist immediately and (for example) commit the local JDBC transaction as well. When true, + * we won't get a {@link #commit(Object)} or {@link #rollback(Object)} method call later + * @throws Exception + */ + void prepare(Object tx, List<Modification> modifications, boolean one_phase); + + /** + * Commits the transaction. A DB-based CacheLoader would look up the local JDBC transaction asociated with + * <code>tx</code> and commit that transaction. Non-transactional CacheLoaders could simply write the data that was + * previously saved transiently under the given <code>tx</code> key, to (for example) a file system. + * + * Note this only holds if the previous prepare() did not define <pre>one_phase=true</pre> + * + * @param tx transaction to commit + */ + void commit(Object tx); + + /** + * Rolls the transaction back. A DB-based CacheLoader would look up the local JDBC transaction asociated with + * <code>tx</code> and roll back that transaction. + * + * @param tx transaction to roll back + */ + void rollback(Object tx); + + /** + * Fetches the entire state for this cache from secondary storage (disk, database) and writes it to a provided + * ObjectOutputStream. State written to the provided ObjectOutputStream parameter is used for initialization of a new + * CacheImpl instance. When the state gets transferred to the new cache instance its cacheloader calls {@link + * #storeEntireState(ObjectInputStream)} + * + * Implementations of this method should not catch any exception or close the given ObjectOutputStream parameter. In + * order to ensure cacheloader interoperability contents of the cache are written to the ObjectOutputStream as a + * sequence of NodeData objects. + * + * Default implementation is provided by {@link AbstractCacheLoaderOld} and ensures cacheloader interoperability. + * Implementors are encouraged to consider extending AbstractCacheLoader prior to implementing completely custom + * cacheloader. + * + * @param os ObjectOutputStream to write state + * @see AbstractCacheLoaderOld#loadEntireState(ObjectOutputStream) + * @see org.horizon.marshall.NodeData + */ + void loadEntireState(ObjectOutputStream os); + + /** + * Stores the entire state for this cache by reading it from a provided ObjectInputStream. The state was provided to + * this cache by calling {@link #loadEntireState(ObjectOutputStream)}} on some other cache instance. State currently + * in storage gets overwritten. + * + * Implementations of this method should not catch any exception or close the given ObjectInputStream parameter. In + * order to ensure cacheloader interoperability contents of the cache are read from the ObjectInputStream as a + * sequence of NodeData objects. + * + * Default implementation is provided by {@link AbstractCacheLoaderOld} and ensures cacheloader interoperability. + * Implementors are encouraged to consider extending AbstractCacheLoader prior to implementing completely custom + * cacheloader. + * + * @param is ObjectInputStream to read state + * @see AbstractCacheLoaderOld#storeEntireState(ObjectInputStream) + * @see org.horizon.marshall.NodeData + */ + void storeEntireState(ObjectInputStream is); + + /** + * Lifecycle method, called when the cache loader is created. + * + * @throws java.lang.Exception + */ + void create(); + + /** + * Lifecycle method, called when the cache loader is started. + * + * @throws java.lang.Exception + */ + void start(); + + /** + * Lifecycle method, called when the cache loader is stopped. + */ + void stop(); + + /** + * Lifecycle method, called when the cache loader is destroyed. + */ + void destroy(); + +} Copied: core/branches/flat/src/main/java/org/horizon/loader_old/CacheStore.java (from rev 7673, core/branches/flat/src/main/java/org/horizon/loader/CacheStore.java) =================================================================== --- core/branches/flat/src/main/java/org/horizon/loader_old/CacheStore.java (rev 0) +++ core/branches/flat/src/main/java/org/horizon/loader_old/CacheStore.java 2009-02-10 13:51:40 UTC (rev 7674) @@ -0,0 +1,102 @@ +package org.horizon.loader; + +import javax.transaction.Transaction; +import java.io.IOException; +import java.io.InputStream; +import java.io.OutputStream; +import java.util.Collection; +import java.util.List; + +/** + * A specialization of the {@link CacheLoader} interface that can be written to. + * + * @author Manik Surtani + * @since 1.0 + */ +public interface CacheStore<K, V> extends CacheLoader<K, V> { + + /** + * Stores an entry + * + * @param ed entry to store + */ + void store(StoredEntry<K, V> ed); + + /** + * Stores a collection of entries + * + * @param ed entries to store + */ + void storeAll(Collection<StoredEntry<K, V>> ed); + + /** + * Writes contents of the stream to the store. Implementations should expect that the stream contains data in an + * implementation-specific format, typically generated using {@link #load(java.io.OutputStream)}. While not a + * requirement, it is recommended that implementations make use of the {@link org.horizon.marshall.Marshaller} when + * dealing with the stream to make use of efficient marshalling. + * + * @param inputStream stream to read from + */ + void store(InputStream inputStream); + + /** + * Loads the entire state into a stream, using whichever format is most efficient for the cache loader + * implementation. Typically read and parsed by {@link #store(java.io.InputStream)}. + * + * While not a requirement, it is recommended that implementations make use of the {@link + * org.horizon.marshall.Marshaller} when dealing with the stream to make use of efficient marshalling. + * + * @param outputStream stream to write to + * @throws java.io.IOException in the event of problems writing to the stream + */ + void load(OutputStream outputStream) throws IOException; + + /** + * Clears all entries in the store + */ + void clear(); + + /** + * Removes an entry in the store. + * + * @param key key to remove + * @return true if the entry was removed; false if the entry wasn't found. + */ + boolean remove(K key); + + /** + * Removes a collection of entries from the store + * + * @param keys keys to remove + */ + void removeAll(Collection<? extends K> keys); + + /** + * Purges expired entries from the store. + */ + void purgeExpired(); + + /** + * Issues a prepare call with a set of modifications to be applied to the cache store + * + * @param modifications modifications to be applied + * @param tx transaction identifier + * @param isOnePhase if true, there will not be a commit or rollback phase and changes should be flushed + * immediately + */ + void prepare(List<Modification> modifications, Transaction tx, boolean isOnePhase); + + /** + * Commits a transaction that has been previously prepared + * + * @param tx tx to commit + */ + void commit(Transaction tx); + + /** + * Rolls back a transaction that has been previously prepared + * + * @param tx tx to roll back + */ + void rollback(Transaction tx); +} Deleted: core/branches/flat/src/main/java/org/horizon/loader_old/ChainingCacheLoader.java =================================================================== --- core/branches/flat/src/main/java/org/horizon/loader/ChainingCacheLoader.java 2009-02-10 11:54:44 UTC (rev 7672) +++ core/branches/flat/src/main/java/org/horizon/loader_old/ChainingCacheLoader.java 2009-02-10 13:51:40 UTC (rev 7674) @@ -1,338 +0,0 @@ -/* - * JBoss, Home of Professional Open Source. - * Copyright 2000 - 2008, Red Hat Middleware LLC, and individual contributors - * as indicated by the @author tags. See the copyright.txt file in the - * distribution for a full listing of individual contributors. - * - * This 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 2.1 of - * the License, or (at your option) any later version. - * - * This software 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 this software; if not, write to the Free - * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA - * 02110-1301 USA, or see the FSF site: http://www.fsf.org. - */ -package org.horizon.loader; - -import org.horizon.config.CacheLoaderConfig; -import org.horizon.config.CacheLoaderConfig.IndividualCacheLoaderConfig; -import org.horizon.factories.ComponentRegistry; -import org.horizon.factories.annotations.Inject; -import org.horizon.marshall.EntryData; - -import java.io.ObjectInputStream; -import java.io.ObjectOutputStream; -import java.util.ArrayList; -import java.util.Collections; -import java.util.Iterator; -import java.util.List; - -/** - * This decorator is used whenever more than one cache loader is configured. READ operations are directed to each of - * the cache loaders (in the order which they were configured) until a non-null (or non-empty in the case of retrieving - * collection objects) result is achieved. - * - * WRITE operations are propagated to ALL registered cacheloaders that specified set ignoreModifications to false. - * - * @author <a href="mailto:manik@jboss.org">Manik Surtani (manik(a)jboss.org)</a> - * @since 1.0 - */ -public class ChainingCacheLoader<K, V> extends AbstractCacheLoader<K, V> { - - private final List<CacheLoader<K, V>> cacheLoaders = new ArrayList<CacheLoader<K, V>>(2); - private final List<CacheLoader<K, V>> writeCacheLoaders = new ArrayList<CacheLoader<K, V>>(2); - private final List<CacheLoaderConfig.IndividualCacheLoaderConfig> cacheLoaderConfigs = new ArrayList<CacheLoaderConfig.IndividualCacheLoaderConfig>(2); - private ComponentRegistry registry; - - /** - * Sets the configuration. Will be called before {@link #create()} and {@link #start()} - * - * @param config ignored - */ - public void setConfig(IndividualCacheLoaderConfig config) { - // don't do much here? - } - - public IndividualCacheLoaderConfig getConfig() { - return null; - } - - @Inject - public void injectDependencies(ComponentRegistry registry) { - this.registry = registry; - } - - - public V get(Object key) { - V answer = null; - for (CacheLoader<K, V> l : cacheLoaders) { - answer = l.get(key); - if (answer != null) break; - } - return answer; - } - - /** - * Checks whether the CacheLoader has a node with Fqn - * - * @param name - * @return True if node exists, false otherwise - */ - public boolean exists(Object key) { - boolean answer = false; - for (CacheLoader<K, V> l : cacheLoaders) { - answer = l.exists(key); - if (answer) break; - } - return answer; - } - - /** - * Inserts key and value into the attributes hashmap of the given node. If the node does not exist, all parent nodes - * from the root down are created automatically. Returns the old value - */ - public V put(K key, V value) { - V answer = null; - boolean isFirst = true; - for (CacheLoader<K, V> l : writeCacheLoaders) { - V tAnswer = l.put(key, value); - if (isFirst) { - answer = tAnswer; - isFirst = false; - } - - } - return answer; - } - - /** - * Inserts all modifications to the backend store. Overwrite whatever is already in the datastore. - * - * @param modifications A List<Modification> of modifications - * @throws Exception - */ - @Override - public void put(List<Modification> modifications) { - for (CacheLoader<K, V> l : writeCacheLoaders) { - l.put(modifications); - } - } - - /** - * Removes the given key and value. No-op if key doesn't exist. Returns the first response from the loader chain. - */ - public V remove(Object key) { - V answer = null; - boolean isFirst = true; - for (CacheLoader<K, V> l : writeCacheLoaders) { - V tAnswer = l.remove(key); - if (isFirst) { - answer = tAnswer; - isFirst = false; - } - } - return answer; - } - - /** - * Prepare the modifications. For example, for a DB-based CacheLoader: <ol> <li>Create a local (JDBC) transaction - * <li>Associate the local transaction with <code>tx</code> (tx is the key) <li>Execute the coresponding SQL - * statements against the DB (statements derived from modifications) </ol> For non-transactional CacheLoader (e.g. - * file-based), this could be a null operation - * - * @param tx The transaction, just used as a hashmap key - * @param modifications List<Modification>, a list of all modifications within the given transaction - * @param one_phase Persist immediately and (for example) commit the local JDBC transaction as well. When true, - * we won't get a {@link #commit(Object)} or {@link #rollback(Object)} method call later - * @throws Exception - */ - @Override - public void prepare(Object tx, List<Modification> modifications, boolean one_phase) { - for (CacheLoader<K, V> l : writeCacheLoaders) { - l.prepare(tx, modifications, one_phase); - } - } - - /** - * Commit the transaction. A DB-based CacheLoader would look up the local JDBC transaction asociated with - * <code>tx</code> and commit that transaction Non-transactional CacheLoaders could simply write the data that - * was previously saved transiently under the given <code>tx</code> key, to (for example) a file system (note this - * only holds if the previous prepare() did not define one_phase=true - * - * @param tx - */ - @Override - public void commit(Object tx) { - for (CacheLoader<K, V> l : writeCacheLoaders) { - l.commit(tx); - } - } - - /** - * Roll the transaction back. A DB-based CacheLoader would look up the local JDBC transaction asociated with - * <code>tx</code> and roll back that transaction - * - * @param tx - */ - @Override - public void rollback(Object tx) { - for (CacheLoader<K, V> l : writeCacheLoaders) { - l.rollback(tx); - } - } - - - /** - * Creates individual cache loaders. - * - * @throws Exception - */ - @Override - public void create() { - Iterator<CacheLoader<K, V>> it = cacheLoaders.iterator(); - Iterator<CacheLoaderConfig.IndividualCacheLoaderConfig> cfgIt = cacheLoaderConfigs.iterator(); - while (it.hasNext() && cfgIt.hasNext()) { - CacheLoader<K, V> cl = it.next(); - CacheLoaderConfig.IndividualCacheLoaderConfig cfg = cfgIt.next(); - cl.setConfig(cfg); - registry.wireDependencies(cl); - cl.create(); - } - } - - @Override - public void start() { - for (CacheLoader<K, V> cacheLoader : cacheLoaders) { - cacheLoader.start(); - } - } - - @Override - public void stop() { - for (CacheLoader<K, V> cacheLoader : cacheLoaders) { - cacheLoader.stop(); - } - } - - @Override - public void destroy() { - for (CacheLoader<K, V> cacheLoader : cacheLoaders) { - cacheLoader.destroy(); - } - } - - @Override - public void loadEntireState(ObjectOutputStream os) { - Iterator<CacheLoader<K, V>> i = cacheLoaders.iterator(); - Iterator<CacheLoaderConfig.IndividualCacheLoaderConfig> cfgs = cacheLoaderConfigs.iterator(); - while (i.hasNext() && cfgs.hasNext()) { - CacheLoader<K, V> l = i.next(); - CacheLoaderConfig.IndividualCacheLoaderConfig cfg = cfgs.next(); - if (cfg.isFetchPersistentState()) { - l.loadEntireState(os); - break; - } - } - } - - @Override - public void storeEntireState(ObjectInputStream is) { - Iterator<CacheLoader<K, V>> i = writeCacheLoaders.iterator(); - Iterator<CacheLoaderConfig.IndividualCacheLoaderConfig> cfgs = cacheLoaderConfigs.iterator(); - while (i.hasNext()) { - CacheLoader<K, V> l = i.next(); - CacheLoaderConfig.IndividualCacheLoaderConfig cfg = cfgs.next(); - if (cfg.isFetchPersistentState()) { - l.storeEntireState(is); - break; - } - } - - } - - /** - * Returns the number of cache loaders in the chain. - */ - public int getSize() { - return cacheLoaders.size(); - } - - /** - * Returns a List<CacheLoader> of individual cache loaders configured. - */ - public List<CacheLoader<K, V>> getCacheLoaders() { - return Collections.unmodifiableList(cacheLoaders); - } - - /** - * Adds a cache loader to the chain (always added at the end of the chain) - * - * @param l the cache loader to add - * @param cfg and its configuration - */ - public void addCacheLoader(CacheLoader<K, V> l, CacheLoaderConfig.IndividualCacheLoaderConfig cfg) { - synchronized (this) { - cacheLoaderConfigs.add(cfg); - cacheLoaders.add(l); - - if (!cfg.isIgnoreModifications()) { - writeCacheLoaders.add(l); - } - } - } - - @Override - public String toString() { - StringBuilder buf = new StringBuilder("ChainingCacheLoader{"); - Iterator<CacheLoader<K, V>> i = cacheLoaders.iterator(); - Iterator<CacheLoaderConfig.IndividualCacheLoaderConfig> c = cacheLoaderConfigs.iterator(); - int count = 0; - while (i.hasNext() && c.hasNext()) { - CacheLoader<K, V> loader = i.next(); - CacheLoaderConfig.IndividualCacheLoaderConfig cfg = c.next(); - - buf.append(++count); - buf.append(": IgnoreMods? "); - buf.append(cfg.isIgnoreModifications()); - buf.append(" CLoader: "); - buf.append(loader); - buf.append("; "); - } - buf.append("}"); - return buf.toString(); - } - - public void purgeIfNecessary() throws Exception { - Iterator<CacheLoader<K, V>> loaders = cacheLoaders.iterator(); - Iterator<CacheLoaderConfig.IndividualCacheLoaderConfig> configs = cacheLoaderConfigs.iterator(); - - while (loaders.hasNext() && configs.hasNext()) { - CacheLoader<K, V> myLoader = loaders.next(); - CacheLoaderConfig.IndividualCacheLoaderConfig myConfig = configs.next(); - - if (!myConfig.isIgnoreModifications() && myConfig.isPurgeOnStartup()) myLoader.clear(); - } - } - - public void clear() { - for (CacheLoader<K, V> l : writeCacheLoaders) - l.clear(); - } - - public List<EntryData<K, V>> getAllEntries() { - ArrayList<EntryData<K, V>> full = new ArrayList<EntryData<K, V>>(); - - for (CacheLoader<K, V> l : writeCacheLoaders) - full.addAll(l.getAllEntries()); - - return full; - } - -} Copied: core/branches/flat/src/main/java/org/horizon/loader_old/ChainingCacheLoaderOld.java (from rev 7673, core/branches/flat/src/main/java/org/horizon/loader/ChainingCacheLoaderOld.java) =================================================================== --- core/branches/flat/src/main/java/org/horizon/loader_old/ChainingCacheLoaderOld.java (rev 0) +++ core/branches/flat/src/main/java/org/horizon/loader_old/ChainingCacheLoaderOld.java 2009-02-10 13:51:40 UTC (rev 7674) @@ -0,0 +1,338 @@ +/* + * JBoss, Home of Professional Open Source. + * Copyright 2000 - 2008, Red Hat Middleware LLC, and individual contributors + * as indicated by the @author tags. See the copyright.txt file in the + * distribution for a full listing of individual contributors. + * + * This 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 2.1 of + * the License, or (at your option) any later version. + * + * This software 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 this software; if not, write to the Free + * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA + * 02110-1301 USA, or see the FSF site: http://www.fsf.org. + */ +package org.horizon.loader; + +import org.horizon.config.CacheLoaderConfig; +import org.horizon.config.CacheLoaderConfig.IndividualCacheLoaderConfig; +import org.horizon.factories.ComponentRegistry; +import org.horizon.factories.annotations.Inject; +import org.horizon.marshall.EntryData; + +import java.io.ObjectInputStream; +import java.io.ObjectOutputStream; +import java.util.ArrayList; +import java.util.Collections; +import java.util.Iterator; +import java.util.List; + +/** + * This decorator is used whenever more than one cache loader is configured. READ operations are directed to each of + * the cache loaders (in the order which they were configured) until a non-null (or non-empty in the case of retrieving + * collection objects) result is achieved. + * + * WRITE operations are propagated to ALL registered cacheloaders that specified set ignoreModifications to false. + * + * @author <a href="mailto:manik@jboss.org">Manik Surtani (manik(a)jboss.org)</a> + * @since 1.0 + */ +public class ChainingCacheLoaderOld<K, V> extends AbstractCacheLoaderOld<K, V> { + + private final List<CacheLoaderOld<K, V>> cacheLoaders = new ArrayList<CacheLoaderOld<K, V>>(2); + private final List<CacheLoaderOld<K, V>> writeCacheLoaders = new ArrayList<CacheLoaderOld<K, V>>(2); + private final List<CacheLoaderConfig.IndividualCacheLoaderConfig> cacheLoaderConfigs = new ArrayList<CacheLoaderConfig.IndividualCacheLoaderConfig>(2); + private ComponentRegistry registry; + + /** + * Sets the configuration. Will be called before {@link #create()} and {@link #start()} + * + * @param config ignored + */ + public void setConfig(IndividualCacheLoaderConfig config) { + // don't do much here? + } + + public IndividualCacheLoaderConfig getConfig() { + return null; + } + + @Inject + public void injectDependencies(ComponentRegistry registry) { + this.registry = registry; + } + + + public V get(Object key) { + V answer = null; + for (CacheLoaderOld<K, V> l : cacheLoaders) { + answer = l.get(key); + if (answer != null) break; + } + return answer; + } + + /** + * Checks whether the CacheLoader has a node with Fqn + * + * @param name + * @return True if node exists, false otherwise + */ + public boolean exists(Object key) { + boolean answer = false; + for (CacheLoaderOld<K, V> l : cacheLoaders) { + answer = l.exists(key); + if (answer) break; + } + return answer; + } + + /** + * Inserts key and value into the attributes hashmap of the given node. If the node does not exist, all parent nodes + * from the root down are created automatically. Returns the old value + */ + public V put(K key, V value) { + V answer = null; + boolean isFirst = true; + for (CacheLoaderOld<K, V> l : writeCacheLoaders) { + V tAnswer = l.put(key, value); + if (isFirst) { + answer = tAnswer; + isFirst = false; + } + + } + return answer; + } + + /** + * Inserts all modifications to the backend store. Overwrite whatever is already in the datastore. + * + * @param modifications A List<Modification> of modifications + * @throws Exception + */ + @Override + public void put(List<Modification> modifications) { + for (CacheLoaderOld<K, V> l : writeCacheLoaders) { + l.put(modifications); + } + } + + /** + * Removes the given key and value. No-op if key doesn't exist. Returns the first response from the loader chain. + */ + public V remove(Object key) { + V answer = null; + boolean isFirst = true; + for (CacheLoaderOld<K, V> l : writeCacheLoaders) { + V tAnswer = l.remove(key); + if (isFirst) { + answer = tAnswer; + isFirst = false; + } + } + return answer; + } + + /** + * Prepare the modifications. For example, for a DB-based CacheLoader: <ol> <li>Create a local (JDBC) transaction + * <li>Associate the local transaction with <code>tx</code> (tx is the key) <li>Execute the coresponding SQL + * statements against the DB (statements derived from modifications) </ol> For non-transactional CacheLoader (e.g. + * file-based), this could be a null operation + * + * @param tx The transaction, just used as a hashmap key + * @param modifications List<Modification>, a list of all modifications within the given transaction + * @param one_phase Persist immediately and (for example) commit the local JDBC transaction as well. When true, + * we won't get a {@link #commit(Object)} or {@link #rollback(Object)} method call later + * @throws Exception + */ + @Override + public void prepare(Object tx, List<Modification> modifications, boolean one_phase) { + for (CacheLoaderOld<K, V> l : writeCacheLoaders) { + l.prepare(tx, modifications, one_phase); + } + } + + /** + * Commit the transaction. A DB-based CacheLoader would look up the local JDBC transaction asociated with + * <code>tx</code> and commit that transaction Non-transactional CacheLoaders could simply write the data that + * was previously saved transiently under the given <code>tx</code> key, to (for example) a file system (note this + * only holds if the previous prepare() did not define one_phase=true + * + * @param tx + */ + @Override + public void commit(Object tx) { + for (CacheLoaderOld<K, V> l : writeCacheLoaders) { + l.commit(tx); + } + } + + /** + * Roll the transaction back. A DB-based CacheLoader would look up the local JDBC transaction asociated with + * <code>tx</code> and roll back that transaction + * + * @param tx + */ + @Override + public void rollback(Object tx) { + for (CacheLoaderOld<K, V> l : writeCacheLoaders) { + l.rollback(tx); + } + } + + + /** + * Creates individual cache loaders. + * + * @throws Exception + */ + @Override + public void create() { + Iterator<CacheLoaderOld<K, V>> it = cacheLoaders.iterator(); + Iterator<CacheLoaderConfig.IndividualCacheLoaderConfig> cfgIt = cacheLoaderConfigs.iterator(); + while (it.hasNext() && cfgIt.hasNext()) { + CacheLoaderOld<K, V> cl = it.next(); + CacheLoaderConfig.IndividualCacheLoaderConfig cfg = cfgIt.next(); + cl.setConfig(cfg); + registry.wireDependencies(cl); + cl.create(); + } + } + + @Override + public void start() { + for (CacheLoaderOld<K, V> cacheLoader : cacheLoaders) { + cacheLoader.start(); + } + } + + @Override + public void stop() { + for (CacheLoaderOld<K, V> cacheLoader : cacheLoaders) { + cacheLoader.stop(); + } + } + + @Override + public void destroy() { + for (CacheLoaderOld<K, V> cacheLoader : cacheLoaders) { + cacheLoader.destroy(); + } + } + + @Override + public void loadEntireState(ObjectOutputStream os) { + Iterator<CacheLoaderOld<K, V>> i = cacheLoaders.iterator(); + Iterator<CacheLoaderConfig.IndividualCacheLoaderConfig> cfgs = cacheLoaderConfigs.iterator(); + while (i.hasNext() && cfgs.hasNext()) { + CacheLoaderOld<K, V> l = i.next(); + CacheLoaderConfig.IndividualCacheLoaderConfig cfg = cfgs.next(); + if (cfg.isFetchPersistentState()) { + l.loadEntireState(os); + break; + } + } + } + + @Override + public void storeEntireState(ObjectInputStream is) { + Iterator<CacheLoaderOld<K, V>> i = writeCacheLoaders.iterator(); + Iterator<CacheLoaderConfig.IndividualCacheLoaderConfig> cfgs = cacheLoaderConfigs.iterator(); + while (i.hasNext()) { + CacheLoaderOld<K, V> l = i.next(); + CacheLoaderConfig.IndividualCacheLoaderConfig cfg = cfgs.next(); + if (cfg.isFetchPersistentState()) { + l.storeEntireState(is); + break; + } + } + + } + + /** + * Returns the number of cache loaders in the chain. + */ + public int getSize() { + return cacheLoaders.size(); + } + + /** + * Returns a List<CacheLoader> of individual cache loaders configured. + */ + public List<CacheLoaderOld<K, V>> getCacheLoaders() { + return Collections.unmodifiableList(cacheLoaders); + } + + /** + * Adds a cache loader to the chain (always added at the end of the chain) + * + * @param l the cache loader to add + * @param cfg and its configuration + */ + public void addCacheLoader(CacheLoaderOld<K, V> l, CacheLoaderConfig.IndividualCacheLoaderConfig cfg) { + synchronized (this) { + cacheLoaderConfigs.add(cfg); + cacheLoaders.add(l); + + if (!cfg.isIgnoreModifications()) { + writeCacheLoaders.add(l); + } + } + } + + @Override + public String toString() { + StringBuilder buf = new StringBuilder("ChainingCacheLoaderOld{"); + Iterator<CacheLoaderOld<K, V>> i = cacheLoaders.iterator(); + Iterator<CacheLoaderConfig.IndividualCacheLoaderConfig> c = cacheLoaderConfigs.iterator(); + int count = 0; + while (i.hasNext() && c.hasNext()) { + CacheLoaderOld<K, V> loader = i.next(); + CacheLoaderConfig.IndividualCacheLoaderConfig cfg = c.next(); + + buf.append(++count); + buf.append(": IgnoreMods? "); + buf.append(cfg.isIgnoreModifications()); + buf.append(" CLoader: "); + buf.append(loader); + buf.append("; "); + } + buf.append("}"); + return buf.toString(); + } + + public void purgeIfNecessary() throws Exception { + Iterator<CacheLoaderOld<K, V>> loaders = cacheLoaders.iterator(); + Iterator<CacheLoaderConfig.IndividualCacheLoaderConfig> configs = cacheLoaderConfigs.iterator(); + + while (loaders.hasNext() && configs.hasNext()) { + CacheLoaderOld<K, V> myLoader = loaders.next(); + CacheLoaderConfig.IndividualCacheLoaderConfig myConfig = configs.next(); + + if (!myConfig.isIgnoreModifications() && myConfig.isPurgeOnStartup()) myLoader.clear(); + } + } + + public void clear() { + for (CacheLoaderOld<K, V> l : writeCacheLoaders) + l.clear(); + } + + public List<EntryData<K, V>> getAllEntries() { + ArrayList<EntryData<K, V>> full = new ArrayList<EntryData<K, V>>(); + + for (CacheLoaderOld<K, V> l : writeCacheLoaders) + full.addAll(l.getAllEntries()); + + return full; + } + +} Deleted: core/branches/flat/src/main/java/org/horizon/loader_old/ClusteredCacheLoader.java =================================================================== --- core/branches/flat/src/main/java/org/horizon/loader/ClusteredCacheLoader.java 2009-02-10 11:54:44 UTC (rev 7672) +++ core/branches/flat/src/main/java/org/horizon/loader_old/ClusteredCacheLoader.java 2009-02-10 13:51:40 UTC (rev 7674) @@ -1,379 +0,0 @@ -/* - * JBoss, Home of Professional Open Source. - * Copyright 2000 - 2008, Red Hat Middleware LLC, and individual contributors - * as indicated by the @author tags. See the copyright.txt file in the - * distribution for a full listing of individual contributors. - * - * This 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 2.1 of - * the License, or (at your option) any later version. - * - * This software 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 this software; if not, write to the Free - * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA - * 02110-1301 USA, or see the FSF site: http://www.fsf.org. - */ -package org.horizon.loader; - -import net.jcip.annotations.ThreadSafe; -import org.horizon.ComponentStatus; -import org.horizon.commands.CommandsFactory; -import org.horizon.commands.DataCommand; -import org.horizon.config.CacheLoaderConfig.IndividualCacheLoaderConfig; -import org.horizon.factories.annotations.Inject; -import org.horizon.lock.StripedLock; -import org.horizon.logging.Log; -import org.horizon.logging.LogFactory; -import org.horizon.remoting.ResponseFilter; -import org.horizon.remoting.transport.Address; -import org.horizon.tree.Fqn; - -import java.io.ObjectInputStream; -import java.io.ObjectOutputStream; -import java.util.ArrayList; -import java.util.Collections; -import java.util.List; -import java.util.Map; -import java.util.Set; - -/** - * A cache loader that consults other members in the cluster for values. Does not propagate update methods since - * replication should take care of this. A <code>timeout</code> property is required, a <code>long</code> that - * specifies in milliseconds how long to wait for results before returning a null. - * - * @author <a href="mailto:manik@jboss.org">Manik Surtani (manik(a)jboss.org)</a> // TODO implement me!! - * @since 1.0 - */ -@ThreadSafe -public class ClusteredCacheLoader extends AbstractCacheLoader { - private static final Log log = LogFactory.getLog(ClusteredCacheLoader.class); - private static final boolean trace = log.isTraceEnabled(); - private StripedLock lock = new StripedLock(); - private ClusteredCacheLoaderConfig config; - private CommandsFactory commandsFactory; - - /** - * A test to check whether the cache is in its started state. If not, calls should not be made as the channel may - * not have properly started, blocks due to state transfers may be in progress, etc. - * - * @return true if the cache is in its STARTED state. - */ - protected boolean isCacheReady() { - return cache.getCacheStatus() == ComponentStatus.STARTED; - } - - @Inject - public void setCommandsFactory(CommandsFactory commandsFactory) { - this.commandsFactory = commandsFactory; - } - - /** - * Sets the configuration. A property <code>timeout</code> is used as the timeout value. - */ - public void setConfig(IndividualCacheLoaderConfig base) { -// if (base instanceof ClusteredCacheLoaderConfig) -// { -// this.config = (ClusteredCacheLoaderConfig) base; -// } -// else -// { -// config = new ClusteredCacheLoaderConfig(base); -// } - } - - public IndividualCacheLoaderConfig getConfig() { - return config; - } - - public Object get(Object key) { - return null; // TODO: Manik: Customise this generated block - } - - public boolean exists(Object key) { - return false; // TODO: Manik: Customise this generated block - } - - public Object put(Object key, Object value) { - return null; // TODO: Manik: Customise this generated block - } - - public void clear() { - // TODO: Manik: Customise this generated block - } - - public Object remove(Object key) { - return null; // TODO: Manik: Customise this generated block - } - - public List getAllEntries() { - return null; // TODO: Manik: Customise this generated block - } - - private boolean isOriginLocal() { - return cache.getAdvancedCache().getInvocationContextContainer().get().isOriginLocal(); - } - - public Set getChildrenNames(Fqn fqn) throws Exception { - if (!isCacheReady() || !isOriginLocal()) return Collections.emptySet(); - lock.acquireLock(fqn, true); -// try -// { -// GetChildrenNamesCommand command = commandsFactory.buildGetChildrenNamesCommand(fqn); -// Object resp = callRemote(command); -// return (Set) resp; -// } -// finally -// { -// lock.releaseLock(fqn); -// } - throw new RuntimeException("Implement me"); - } - - private Object callRemote(DataCommand dataCommand) throws Exception { - if (trace) log.trace("cache=" + cache.getCacheManager().getAddress() + "; calling with " + dataCommand); -// ClusteredGetCommand clusteredGet = commandsFactory.buildClusteredGetCommand(false, dataCommand); - List resps; - // JBCACHE-1186 -// resps = cache.getRPCManager().callRemoteMethods(null, clusteredGet, GroupRequest.GET_ALL, config.getTimeout(), new ResponseValidityFilter(cache.getMembers(), cache.getLocalAddress()), false); - -// if (resps == null) -// { -// if (log.isInfoEnabled()) -// log.info("No replies to call " + dataCommand + ". Perhaps we're alone in the cluster?"); -// throw new ReplicationException("No replies to call " + dataCommand + ". Perhaps we're alone in the cluster?"); -// } -// else -// { -// // test for and remove exceptions -// Iterator i = resps.iterator(); -// Object result = null; -// while (i.hasNext()) -// { -// Object o = i.next(); -// if (o instanceof Exception) -// { -// if (log.isDebugEnabled()) -// log.debug("Found remote exception among responses - removing from responses list", (Exception) o); -// } -// else if (o != null) -// { -// // keep looping till we find a FOUND answer. -// List<Boolean> clusteredGetResp = (List<Boolean>) o; -// // found? -// if (clusteredGetResp.get(0)) -// { -// result = clusteredGetResp.get(1); -// break; -// } -// } -// else if (!cache.getConfiguration().isUseRegionBasedMarshalling()) -// { -// throw new IllegalStateException("Received unexpected null response to " + clusteredGet); -// } -// // else region was inactive on peer; -// // keep looping to see if anyone else responded -// } -// -// if (trace) log.trace("got responses " + resps); -// return result; -// } - throw new RuntimeException("Implement me"); - } - - public Map get(Fqn name) throws Exception { - return get0(name); - } - - protected Map get0(Fqn name) throws Exception { - // DON'T make a remote call if this is a remote call in the first place - leads to deadlocks - JBCACHE-1103 - if (!isCacheReady() || !isOriginLocal()) return Collections.emptyMap(); - lock.acquireLock(name, true); -// try -// { -// GetDataMapCommand command = commandsFactory.buildGetDataMapCommand(name); -// Object resp = callRemote(command); -// return (Map) resp; -// } -// finally -// { -// lock.releaseLock(name); -// } - throw new RuntimeException("Implement me"); - } - - public boolean exists(Fqn name) throws Exception { - // DON'T make a remote call if this is a remote call in the first place - leads to deadlocks - JBCACHE-1103 - if (!isCacheReady() || !isOriginLocal()) return false; - - lock.acquireLock(name, false); -// try -// { -// ExistsCommand command = commandsFactory.buildExistsNodeCommand(name); -// Object resp = callRemote(command); -// return resp != null && (Boolean) resp; -// } -// finally -// { -// lock.releaseLock(name); -// } - throw new RuntimeException("Implement me"); - } - - public Object put(Fqn name, Object key, Object value) throws Exception { - // DON'T make a remote call if this is a remote call in the first place - leads to deadlocks - JBCACHE-1103 - if (!isCacheReady() || !isOriginLocal()) return null; - lock.acquireLock(name, true); - try { -// NodeSPI n = cache.peek(name, false); -// if (n == null) -// { -// GetKeyValueCommand command = commandsFactory.buildGetKeyValueCommand(name, key, true); -// return callRemote(command); -// } -// else -// { -// // dont bother with a remote call -// return n.getDirect(key); -// } - } - finally { - lock.releaseLock(name); - } - throw new RuntimeException("Implement me"); - } - - /** - * Does nothing; replication handles put. - */ - public void put(Fqn name, Map attributes) throws Exception { - } - - /** - * Does nothing; replication handles put. - */ -// @Override -// public void put(List<Modification> modifications) throws Exception -// { -// } - - /** - * Fetches the remove value, does not remove. Replication handles removal. - */ - public Object remove(Fqn name, Object key) throws Exception { - // DON'T make a remote call if this is a remote call in the first place - leads to deadlocks - JBCACHE-1103 - if (!isCacheReady() || !isOriginLocal()) return false; - lock.acquireLock(name, true); - try { -// NodeSPI n = cache.peek(name, true); -// if (n == null) -// { -// GetKeyValueCommand command = commandsFactory.buildGetKeyValueCommand(name, key, true); -// return callRemote(command); -// } -// else -// { -// // dont bother with a remote call -// return n.getDirect(key); -// } - } - finally { - lock.releaseLock(name); - } - throw new RuntimeException("Implement me"); - } - - /** - * Does nothing; replication handles removal. - */ - public void remove(Fqn name) throws Exception { - // do nothing - } - - /** - * Does nothing; replication handles removal. - */ - public void removeData(Fqn name) throws Exception { - } - - /** - * Does nothing. - */ -// @Override -// public void prepare(Object tx, List modifications, boolean one_phase) throws Exception -// { -// } - - /** - * Does nothing. - */ -// @Override -// public void commit(Object tx) throws Exception -// { -// } - - /** - * Does nothing. - */ - @Override - public void rollback(Object tx) { - } - -// @Override -// public void loadEntireState(ObjectOutputStream os) throws Exception -// { -// //intentional no-op -// } - - // @Override - - public void loadState(Fqn subtree, ObjectOutputStream os) throws Exception { - // intentional no-op - } - -// @Override -// public void storeEntireState(ObjectInputStream is) throws Exception -// { -// // intentional no-op -// } - - // @Override - - public void storeState(Fqn subtree, ObjectInputStream is) throws Exception { - // intentional no-op - } - - public static class ResponseValidityFilter implements ResponseFilter { - private int numValidResponses = 0; - private List<Address> pendingResponders; - - public ResponseValidityFilter(List<Address> expected, Address localAddress) { - this.pendingResponders = new ArrayList<Address>(expected); - // We'll never get a response from ourself - this.pendingResponders.remove(localAddress); - } - - public boolean isAcceptable(Object object, Address address) { - pendingResponders.remove(address); - - if (object instanceof List) { - List response = (List) object; - Boolean foundResult = (Boolean) response.get(0); - if (foundResult) numValidResponses++; - } - // always return true to make sure a response is logged by the JGroups RpcDispatcher. - return true; - } - - public boolean needMoreResponses() { - return numValidResponses < 1 && pendingResponders.size() > 0; - } - - } - -} Deleted: core/branches/flat/src/main/java/org/horizon/loader_old/ClusteredCacheLoaderConfig.java =================================================================== --- core/branches/flat/src/main/java/org/horizon/loader/ClusteredCacheLoaderConfig.java 2009-02-10 11:54:44 UTC (rev 7672) +++ core/branches/flat/src/main/java/org/horizon/loader_old/ClusteredCacheLoaderConfig.java 2009-02-10 13:51:40 UTC (rev 7674) @@ -1,92 +0,0 @@ -/* - * JBoss, Home of Professional Open Source. - * Copyright 2000 - 2008, Red Hat Middleware LLC, and individual contributors - * as indicated by the @author tags. See the copyright.txt file in the - * distribution for a full listing of individual contributors. - * - * This 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 2.1 of - * the License, or (at your option) any later version. - * - * This software 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 this software; if not, write to the Free - * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA - * 02110-1301 USA, or see the FSF site: http://www.fsf.org. - */ -package org.horizon.loader; - - -import org.horizon.config.CacheLoaderConfig.IndividualCacheLoaderConfig; -import org.horizon.config.Dynamic; - -import java.util.Properties; - -public class ClusteredCacheLoaderConfig extends IndividualCacheLoaderConfig { - /** - * The serialVersionUID - */ - private static final long serialVersionUID = -3425487656984237468L; - - @Dynamic - private long timeout = 10000; - - public ClusteredCacheLoaderConfig() { - setClassName(ClusteredCacheLoader.class.getName()); - } - - /** - * For use by {@link org.horizon.loader.ClusteredCacheLoader}. - * - * @param base generic config object created by XML parsing. - */ - ClusteredCacheLoaderConfig(IndividualCacheLoaderConfig base) { - setClassName(ClusteredCacheLoader.class.getName()); - populateFromBaseConfig(base); - } - - public long getTimeout() { - return timeout; - } - - public void setTimeout(long timeout) { - testImmutability("timeout"); - this.timeout = timeout; - } - - @Override - public void setProperties(Properties props) { - super.setProperties(props); - try { - timeout = Long.valueOf(props.getProperty("timeout")); - } - catch (Exception e) { - log.info("Using default value for config property 'timeout' - " + timeout); - } - } - - @Override - public boolean equals(Object obj) { - if (obj instanceof ClusteredCacheLoaderConfig && equalsExcludingProperties(obj)) { - ClusteredCacheLoaderConfig other = (ClusteredCacheLoaderConfig) obj; - return (this.timeout == other.timeout); - } - return false; - } - - @Override - public int hashCode() { - return 31 * hashCodeExcludingProperties() + (int) timeout; - } - - @Override - public ClusteredCacheLoaderConfig clone() throws CloneNotSupportedException { - return (ClusteredCacheLoaderConfig) super.clone(); - } - -} \ No newline at end of file Copied: core/branches/flat/src/main/java/org/horizon/loader_old/ClusteredCacheLoaderConfig.java (from rev 7673, core/branches/flat/src/main/java/org/horizon/loader/ClusteredCacheLoaderConfig.java) =================================================================== --- core/branches/flat/src/main/java/org/horizon/loader_old/ClusteredCacheLoaderConfig.java (rev 0) +++ core/branches/flat/src/main/java/org/horizon/loader_old/ClusteredCacheLoaderConfig.java 2009-02-10 13:51:40 UTC (rev 7674) @@ -0,0 +1,92 @@ +/* + * JBoss, Home of Professional Open Source. + * Copyright 2000 - 2008, Red Hat Middleware LLC, and individual contributors + * as indicated by the @author tags. See the copyright.txt file in the + * distribution for a full listing of individual contributors. + * + * This 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 2.1 of + * the License, or (at your option) any later version. + * + * This software 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 this software; if not, write to the Free + * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA + * 02110-1301 USA, or see the FSF site: http://www.fsf.org. + */ +package org.horizon.loader; + + +import org.horizon.config.CacheLoaderConfig.IndividualCacheLoaderConfig; +import org.horizon.config.Dynamic; + +import java.util.Properties; + +public class ClusteredCacheLoaderConfig extends IndividualCacheLoaderConfig { + /** + * The serialVersionUID + */ + private static final long serialVersionUID = -3425487656984237468L; + + @Dynamic + private long timeout = 10000; + + public ClusteredCacheLoaderConfig() { + setClassName(ClusteredCacheLoaderOld.class.getName()); + } + + /** + * For use by {@link ClusteredCacheLoaderOld}. + * + * @param base generic config object created by XML parsing. + */ + ClusteredCacheLoaderConfig(IndividualCacheLoaderConfig base) { + setClassName(ClusteredCacheLoaderOld.class.getName()); + populateFromBaseConfig(base); + } + + public long getTimeout() { + return timeout; + } + + public void setTimeout(long timeout) { + testImmutability("timeout"); + this.timeout = timeout; + } + + @Override + public void setProperties(Properties props) { + super.setProperties(props); + try { + timeout = Long.valueOf(props.getProperty("timeout")); + } + catch (Exception e) { + log.info("Using default value for config property 'timeout' - " + timeout); + } + } + + @Override + public boolean equals(Object obj) { + if (obj instanceof ClusteredCacheLoaderConfig && equalsExcludingProperties(obj)) { + ClusteredCacheLoaderConfig other = (ClusteredCacheLoaderConfig) obj; + return (this.timeout == other.timeout); + } + return false; + } + + @Override + public int hashCode() { + return 31 * hashCodeExcludingProperties() + (int) timeout; + } + + @Override + public ClusteredCacheLoaderConfig clone() throws CloneNotSupportedException { + return (ClusteredCacheLoaderConfig) super.clone(); + } + +} \ No newline at end of file Copied: core/branches/flat/src/main/java/org/horizon/loader_old/ClusteredCacheLoaderOld.java (from rev 7673, core/branches/flat/src/main/java/org/horizon/loader/ClusteredCacheLoaderOld.java) =================================================================== --- core/branches/flat/src/main/java/org/horizon/loader_old/ClusteredCacheLoaderOld.java (rev 0) +++ core/branches/flat/src/main/java/org/horizon/loader_old/ClusteredCacheLoaderOld.java 2009-02-10 13:51:40 UTC (rev 7674) @@ -0,0 +1,379 @@ +/* + * JBoss, Home of Professional Open Source. + * Copyright 2000 - 2008, Red Hat Middleware LLC, and individual contributors + * as indicated by the @author tags. See the copyright.txt file in the + * distribution for a full listing of individual contributors. + * + * This 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 2.1 of + * the License, or (at your option) any later version. + * + * This software 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 this software; if not, write to the Free + * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA + * 02110-1301 USA, or see the FSF site: http://www.fsf.org. + */ +package org.horizon.loader; + +import net.jcip.annotations.ThreadSafe; +import org.horizon.commands.CommandsFactory; +import org.horizon.commands.DataCommand; +import org.horizon.config.CacheLoaderConfig.IndividualCacheLoaderConfig; +import org.horizon.factories.annotations.Inject; +import org.horizon.lifecycle.ComponentStatus; +import org.horizon.lock.StripedLock; +import org.horizon.logging.Log; +import org.horizon.logging.LogFactory; +import org.horizon.remoting.ResponseFilter; +import org.horizon.remoting.transport.Address; +import org.horizon.tree.Fqn; + +import java.io.ObjectInputStream; +import java.io.ObjectOutputStream; +import java.util.ArrayList; +import java.util.Collections; +import java.util.List; +import java.util.Map; +import java.util.Set; + +/** + * A cache loader that consults other members in the cluster for values. Does not propagate update methods since + * replication should take care of this. A <code>timeout</code> property is required, a <code>long</code> that + * specifies in milliseconds how long to wait for results before returning a null. + * + * @author <a href="mailto:manik@jboss.org">Manik Surtani (manik(a)jboss.org)</a> // TODO implement me!! + * @since 1.0 + */ +@ThreadSafe +public class ClusteredCacheLoaderOld extends AbstractCacheLoaderOld { + private static final Log log = LogFactory.getLog(ClusteredCacheLoaderOld.class); + private static final boolean trace = log.isTraceEnabled(); + private StripedLock lock = new StripedLock(); + private ClusteredCacheLoaderConfig config; + private CommandsFactory commandsFactory; + + /** + * A test to check whether the cache is in its started state. If not, calls should not be made as the channel may + * not have properly started, blocks due to state transfers may be in progress, etc. + * + * @return true if the cache is in its STARTED state. + */ + protected boolean isCacheReady() { + return cache.getStatus() == ComponentStatus.RUNNING; + } + + @Inject + public void setCommandsFactory(CommandsFactory commandsFactory) { + this.commandsFactory = commandsFactory; + } + + /** + * Sets the configuration. A property <code>timeout</code> is used as the timeout value. + */ + public void setConfig(IndividualCacheLoaderConfig base) { +// if (base instanceof ClusteredCacheLoaderConfig) +// { +// this.config = (ClusteredCacheLoaderConfig) base; +// } +// else +// { +// config = new ClusteredCacheLoaderConfig(base); +// } + } + + public IndividualCacheLoaderConfig getConfig() { + return config; + } + + public Object get(Object key) { + return null; // TODO: Manik: Customise this generated block + } + + public boolean exists(Object key) { + return false; // TODO: Manik: Customise this generated block + } + + public Object put(Object key, Object value) { + return null; // TODO: Manik: Customise this generated block + } + + public void clear() { + // TODO: Manik: Customise this generated block + } + + public Object remove(Object key) { + return null; // TODO: Manik: Customise this generated block + } + + public List getAllEntries() { + return null; // TODO: Manik: Customise this generated block + } + + private boolean isOriginLocal() { + return cache.getAdvancedCache().getInvocationContextContainer().get().isOriginLocal(); + } + + public Set getChildrenNames(Fqn fqn) throws Exception { + if (!isCacheReady() || !isOriginLocal()) return Collections.emptySet(); + lock.acquireLock(fqn, true); +// try +// { +// GetChildrenNamesCommand command = commandsFactory.buildGetChildrenNamesCommand(fqn); +// Object resp = callRemote(command); +// return (Set) resp; +// } +// finally +// { +// lock.releaseLock(fqn); +// } + throw new RuntimeException("Implement me"); + } + + private Object callRemote(DataCommand dataCommand) throws Exception { + if (trace) log.trace("cache=" + cache.getCacheManager().getAddress() + "; calling with " + dataCommand); +// ClusteredGetCommand clusteredGet = commandsFactory.buildClusteredGetCommand(false, dataCommand); + List resps; + // JBCACHE-1186 +// resps = cache.getRPCManager().callRemoteMethods(null, clusteredGet, GroupRequest.GET_ALL, config.getTimeout(), new ResponseValidityFilter(cache.getMembers(), cache.getLocalAddress()), false); + +// if (resps == null) +// { +// if (log.isInfoEnabled()) +// log.info("No replies to call " + dataCommand + ". Perhaps we're alone in the cluster?"); +// throw new ReplicationException("No replies to call " + dataCommand + ". Perhaps we're alone in the cluster?"); +// } +// else +// { +// // test for and remove exceptions +// Iterator i = resps.iterator(); +// Object result = null; +// while (i.hasNext()) +// { +// Object o = i.next(); +// if (o instanceof Exception) +// { +// if (log.isDebugEnabled()) +// log.debug("Found remote exception among responses - removing from responses list", (Exception) o); +// } +// else if (o != null) +// { +// // keep looping till we find a FOUND answer. +// List<Boolean> clusteredGetResp = (List<Boolean>) o; +// // found? +// if (clusteredGetResp.get(0)) +// { +// result = clusteredGetResp.get(1); +// break; +// } +// } +// else if (!cache.getConfiguration().isUseRegionBasedMarshalling()) +// { +// throw new IllegalStateException("Received unexpected null response to " + clusteredGet); +// } +// // else region was inactive on peer; +// // keep looping to see if anyone else responded +// } +// +// if (trace) log.trace("got responses " + resps); +// return result; +// } + throw new RuntimeException("Implement me"); + } + + public Map get(Fqn name) throws Exception { + return get0(name); + } + + protected Map get0(Fqn name) throws Exception { + // DON'T make a remote call if this is a remote call in the first place - leads to deadlocks - JBCACHE-1103 + if (!isCacheReady() || !isOriginLocal()) return Collections.emptyMap(); + lock.acquireLock(name, true); +// try +// { +// GetDataMapCommand command = commandsFactory.buildGetDataMapCommand(name); +// Object resp = callRemote(command); +// return (Map) resp; +// } +// finally +// { +// lock.releaseLock(name); +// } + throw new RuntimeException("Implement me"); + } + + public boolean exists(Fqn name) throws Exception { + // DON'T make a remote call if this is a remote call in the first place - leads to deadlocks - JBCACHE-1103 + if (!isCacheReady() || !isOriginLocal()) return false; + + lock.acquireLock(name, false); +// try +// { +// ExistsCommand command = commandsFactory.buildExistsNodeCommand(name); +// Object resp = callRemote(command); +// return resp != null && (Boolean) resp; +// } +// finally +// { +// lock.releaseLock(name); +// } + throw new RuntimeException("Implement me"); + } + + public Object put(Fqn name, Object key, Object value) throws Exception { + // DON'T make a remote call if this is a remote call in the first place - leads to deadlocks - JBCACHE-1103 + if (!isCacheReady() || !isOriginLocal()) return null; + lock.acquireLock(name, true); + try { +// NodeSPI n = cache.peek(name, false); +// if (n == null) +// { +// GetKeyValueCommand command = commandsFactory.buildGetKeyValueCommand(name, key, true); +// return callRemote(command); +// } +// else +// { +// // dont bother with a remote call +// return n.getDirect(key); +// } + } + finally { + lock.releaseLock(name); + } + throw new RuntimeException("Implement me"); + } + + /** + * Does nothing; replication handles put. + */ + public void put(Fqn name, Map attributes) throws Exception { + } + + /** + * Does nothing; replication handles put. + */ +// @Override +// public void put(List<Modification> modifications) throws Exception +// { +// } + + /** + * Fetches the remove value, does not remove. Replication handles removal. + */ + public Object remove(Fqn name, Object key) throws Exception { + // DON'T make a remote call if this is a remote call in the first place - leads to deadlocks - JBCACHE-1103 + if (!isCacheReady() || !isOriginLocal()) return false; + lock.acquireLock(name, true); + try { +// NodeSPI n = cache.peek(name, true); +// if (n == null) +// { +// GetKeyValueCommand command = commandsFactory.buildGetKeyValueCommand(name, key, true); +// return callRemote(command); +// } +// else +// { +// // dont bother with a remote call +// return n.getDirect(key); +// } + } + finally { + lock.releaseLock(name); + } + throw new RuntimeException("Implement me"); + } + + /** + * Does nothing; replication handles removal. + */ + public void remove(Fqn name) throws Exception { + // do nothing + } + + /** + * Does nothing; replication handles removal. + */ + public void removeData(Fqn name) throws Exception { + } + + /** + * Does nothing. + */ +// @Override +// public void prepare(Object tx, List modifications, boolean one_phase) throws Exception +// { +// } + + /** + * Does nothing. + */ +// @Override +// public void commit(Object tx) throws Exception +// { +// } + + /** + * Does nothing. + */ + @Override + public void rollback(Object tx) { + } + +// @Override +// public void loadEntireState(ObjectOutputStream os) throws Exception +// { +// //intentional no-op +// } + + // @Override + + public void loadState(Fqn subtree, ObjectOutputStream os) throws Exception { + // intentional no-op + } + +// @Override +// public void storeEntireState(ObjectInputStream is) throws Exception +// { +// // intentional no-op +// } + + // @Override + + public void storeState(Fqn subtree, ObjectInputStream is) throws Exception { + // intentional no-op + } + + public static class ResponseValidityFilter implements ResponseFilter { + private int numValidResponses = 0; + private List<Address> pendingResponders; + + public ResponseValidityFilter(List<Address> expected, Address localAddress) { + this.pendingResponders = new ArrayList<Address>(expected); + // We'll never get a response from ourself + this.pendingResponders.remove(localAddress); + } + + public boolean isAcceptable(Object object, Address address) { + pendingResponders.remove(address); + + if (object instanceof List) { + List response = (List) object; + Boolean foundResult = (Boolean) response.get(0); + if (foundResult) numValidResponses++; + } + // always return true to make sure a response is logged by the JGroups RpcDispatcher. + return true; + } + + public boolean needMoreResponses() { + return numValidResponses < 1 && pendingResponders.size() > 0; + } + + } + +} Deleted: core/branches/flat/src/main/java/org/horizon/loader_old/FileCacheLoader.java =================================================================== --- core/branches/flat/src/main/java/org/horizon/loader/FileCacheLoader.java 2009-02-10 11:54:44 UTC (rev 7672) +++ core/branches/flat/src/main/java/org/horizon/loader_old/FileCacheLoader.java 2009-02-10 13:51:40 UTC (rev 7674) @@ -1,415 +0,0 @@ -/* - * JBoss, Home of Professional Open Source. - * Copyright 2000 - 2008, Red Hat Middleware LLC, and individual contributors - * as indicated by the @author tags. See the copyright.txt file in the - * distribution for a full listing of individual contributors. - * - * This 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 2.1 of - * the License, or (at your option) any later version. - * - * This software 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 this software; if not, write to the Free - * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA - * 02110-1301 USA, or see the FSF site: http://www.fsf.org. - */ -package org.horizon.loader; - -import net.jcip.annotations.ThreadSafe; -import org.horizon.CacheException; -import org.horizon.config.CacheLoaderConfig.IndividualCacheLoaderConfig; -import org.horizon.lock.StripedLock; -import org.horizon.logging.Log; -import org.horizon.logging.LogFactory; -import org.horizon.marshall.EntryData; -import org.jboss.util.stream.MarshalledValueInputStream; - -import java.io.Closeable; -import java.io.File; -import java.io.FileInputStream; -import java.io.FileNotFoundException; -import java.io.FileOutputStream; -import java.io.IOException; -import java.io.ObjectInputStream; -import java.io.ObjectOutputStream; -import java.util.LinkedList; -import java.util.List; -import java.util.regex.Matcher; -import java.util.regex.Pattern; - -/** - * Simple file-based CacheLoader implementation. Nodes are directories, attributes of a node is a file in the directory - * - * The FileCacheLoader has some severe limitations which restrict its use in a production environment, or if used in - * such an environment, it should be used with due care and sufficient understanding of these limitations. <ul> <li>Due - * to the way the FileCacheLoader represents a tree structure on disk (directories and files) traversal is inefficient - * for deep trees.</li> <li>Usage on shared filesystems like NFS, Windows shares, etc. should be avoided as these do not - * implement proper file locking and can cause data corruption.</li> <li>Usage with an isolation level of NONE can cause - * corrupt writes as multiple threads attempt to write to the same file.</li> <li>File systems are inherently not - * transactional, so when attempting to use your cache in a transactional context, failures when writing to the file - * (which happens during the commit phase) cannot be recovered.</li> </ul> - * - * As a rule of thumb, it is recommended that the FileCacheLoader not be used in a highly concurrent, transactional or - * stressful environment, and its use is restricted to testing. - * - * In terms of concurrency, file systems are notoriously inconsistent in their implementations of concurrent locks. To - * get around this and to meet the thread safety contracts set out in {@link CacheLoader}, this implementation - * uses a {@link StripedLock} - * - * @author Bela Ban - * @author <a href="mailto:galder.zamarreno@jboss.com">Galder Zamarreno</a> - * @author <a href="mailto:manik@jboss.org">Manik Surtani</a> - * @since 1.0 - */ -@ThreadSafe -public class FileCacheLoader<K, V> extends AbstractCacheLoader<K, V> { - File root = null; - String rootPath = null; - Log log = LogFactory.getLog(getClass()); - - protected final StripedLock lock = new StripedLock(); - - private FileCacheLoaderConfig config; - - /** - * For full path, check '*' '<' '>' '|' '"' '?' Regex: [\*<>|"?] - */ - public static final Pattern PATH_PATTERN = Pattern.compile("[\\*<>|\"?]"); - - /** - * For fqn, check '*' '<' '>' '|' '"' '?' and also '\' '/' and ':' - */ - public static final Pattern KEY_PATTERN = Pattern.compile("[\\\\\\/:*<>|\"?]"); - private static boolean isOldWindows; - - static { - float osVersion = -1; - try { - osVersion = Float.parseFloat(System.getProperty("os.version").trim()); - } - catch (Exception e) { - // ignore - } - // 4.x is windows NT/2000 and 5.x is XP. - isOldWindows = System.getProperty("os.name").toLowerCase().startsWith("windows") && osVersion < 4; - } - - public void setConfig(IndividualCacheLoaderConfig base) { - if (base instanceof FileCacheLoaderConfig) { - this.config = (FileCacheLoaderConfig) base; - } else if (base != null) { - this.config = new FileCacheLoaderConfig(base); - } - - String location = this.config != null ? this.config.getLocation() : null; - if (location != null && location.length() > 0) { - root = new File(location); - rootPath = root.getAbsolutePath() + File.separator; - } - } - - public IndividualCacheLoaderConfig getConfig() { - return config; - } - - @Override - public void create() { - if (root == null) { - String tmpLocation = System.getProperty("java.io.tmpdir", "C:\\tmp"); - root = new File(tmpLocation); - rootPath = root.getAbsolutePath() + File.separator; - } - if (!root.exists()) { - if (log.isTraceEnabled()) { - log.trace("Creating cache loader location " + root); - } - - if (config.isCheckCharacterPortability()) { - /* Before creating the root, check whether the path is character portable. Anything that comes after is part - of the fqn which is inspected later. */ - isCharacterPortableLocation(root.getAbsolutePath()); - } - - boolean created = root.mkdirs(); - if (!created) { - throw new CacheException("Unable to create cache loader location " + root); - } - } - - if (!root.isDirectory()) { - throw new CacheException("Cache loader location [" + root + "] is not a directory!"); - } - } - - public V get(Object key) { - lock(key); - try { - try { - return loadValue(key); - } - catch (Exception e) { - throw new CacheException(e); - } - } - finally { - unlock(key); - } - } - - public boolean exists(Object key) { - lock(key); - try { - return getFile(key, false).exists(); - } - catch (IOException e) { - throw new CacheException(e); - } - finally { - unlock(key); - } - } - - public V put(K key, V value) { - lock(key); - try { - V retval; - try { - retval = loadValue(key); - storeValue(key, value); - return retval; - } - catch (Exception e) { - throw new CacheException(e); - } - } - finally { - unlock(key); - } - } - - public V remove(Object key) { - lock(key); - try { - V retval; - try { - File file = getFile(key, false); - if (!file.exists()) - return null; - - retval = loadValue(key); - file.delete(); - return retval; - } - catch (Exception e) { - throw new CacheException(e); - } - } - finally { - unlock(key); - } - } - - private void unlock(Object key) { - lock.releaseLock(key.toString()); - } - - private void lock(Object key) { - lock.acquireLock(key.toString(), true); - } - - private File getDirectory(Object key, boolean create) throws IOException { - File f = new File(getFullPath(key)); - if (!f.exists()) { - if (create) { - boolean make = f.mkdirs(); - if (!make) - throw new IOException("Unable to mkdirs " + f); - } - } - return f; - } - - private String getFullPath(Object key) { - return rootPath; - } - - private void safeClose(Closeable closeable) { - if (closeable == null) - return; - - try { - closeable.close(); - } - catch (IOException e) { - } - } - - private V loadValue(Object key) throws Exception { - File child = getFile(key, false); - if (!child.exists()) - return null; - - return loadValue(child); - } - - private V loadValue(File file) throws Exception { - FileInputStream fileIn = null; - ObjectInputStream input = null; - - try { - fileIn = new FileInputStream(file); - input = new MarshalledValueInputStream(fileIn); - return (V) getMarshaller().objectFromObjectStream(input); - } - catch (FileNotFoundException fnfe) { - return null; - } - finally { - safeClose(input); - safeClose(fileIn); - } - } - - private EntryData<K, V> loadEntry(File file) throws Exception { - FileInputStream fileIn = null; - ObjectInputStream input = null; - - try { - fileIn = new FileInputStream(file); - input = new MarshalledValueInputStream(fileIn); - V value = (V) getMarshaller().objectFromObjectStream(input); - K key = (K) getMarshaller().objectFromObjectStream(input); - return new EntryData<K, V>(key, value); - } - catch (FileNotFoundException fnfe) { - return null; - } - finally { - safeClose(input); - safeClose(fileIn); - } - } - - private File getFile(Object key, boolean create) throws IOException { - File directory = getDirectory(key, create); - File child = new File(directory, key.toString()); - if (create && !child.exists()) { - if (config.isCheckCharacterPortability()) { - /* Check whether the entire file path (root + fqn + data file name), is length portable */ - isLengthPortablePath(child.getAbsolutePath()); - /* Check whether the fqn tree we're trying to store could contain non portable characters */ - isCharacterPortableKey(key); - } - - if (!child.createNewFile()) { - throw new IOException("Unable to create file: " + child); - } - } - - return child; - } - - protected void storeValue(Object key, Object value) throws Exception { - File child = getFile(key, true); - - FileOutputStream fileOut = null; - ObjectOutputStream output = null; - try { - fileOut = new FileOutputStream(child); - output = new ObjectOutputStream(fileOut); - getMarshaller().objectToObjectStream(value, output); - getMarshaller().objectToObjectStream(key, output); // For getAllEntries - } - finally { - safeClose(output); - safeClose(fileOut); - } - } - - protected boolean isCharacterPortableLocation(String fileAbsolutePath) { - Matcher matcher = PATH_PATTERN.matcher(fileAbsolutePath); - if (matcher.find()) { - log.warn("Cache loader location ( " + fileAbsolutePath + " ) contains one of these characters: '*' '<' '>' '|' '\"' '?'"); - log.warn("Directories containing these characters are illegal in some operative systems and could lead to portability issues"); - return false; - } - - return true; - } - - protected boolean isCharacterPortableKey(Object key) { - // getFullPath converts Object to String via toString(), so we do too - Matcher matcher = KEY_PATTERN.matcher(key.toString()); - if (matcher.find()) { - log.warn("The key.toString() contains one of these characters: '*' '<' '>' '|' '\"' '?' '\\' '/' ':' "); - log.warn("Directories containing these characters are illegal in some operating systems and could lead to portability issues"); - return false; - } - - return true; - } - - protected boolean isLengthPortablePath(String absoluteFqnPath) { - - if (isOldWindows && absoluteFqnPath.length() > 255) { - log.warn("The full absolute path to the fqn that you are trying to store is bigger than 255 characters, this could lead to problems on certain Windows systems: " + absoluteFqnPath); - return false; - } - - return true; - } - - public void clear() { - File directory = new File(rootPath); - if (!directory.exists()) - return; - - File[] files = directory.listFiles(); - if (files != null) { - for (File file : files) { - try { - lock(file.getName()); - if (file.exists()) - file.delete(); - } - finally { - unlock(file.getName()); - } - } - } - } - - public List<EntryData<K, V>> getAllEntries() { - List<EntryData<K, V>> entries = new LinkedList<EntryData<K, V>>(); - File directory = new File(rootPath); - if (!directory.exists()) - return entries; - - File[] files = directory.listFiles(); - if (files != null) { - for (File file : files) { - try { - lock(file.getName()); - if (file.exists()) { - EntryData<K, V> entry = loadEntry(file); - if (entry != null) - entries.add(entry); - } - } - catch (Exception e) { - } - finally { - unlock(file.getName()); - } - } - } - - return entries; - } -} Deleted: core/branches/flat/src/main/java/org/horizon/loader_old/FileCacheLoaderConfig.java =================================================================== --- core/branches/flat/src/main/java/org/horizon/loader/FileCacheLoaderConfig.java 2009-02-10 11:54:44 UTC (rev 7672) +++ core/branches/flat/src/main/java/org/horizon/loader_old/FileCacheLoaderConfig.java 2009-02-10 13:51:40 UTC (rev 7674) @@ -1,98 +0,0 @@ -/* - * JBoss, Home of Professional Open Source. - * Copyright 2000 - 2008, Red Hat Middleware LLC, and individual contributors - * as indicated by the @author tags. See the copyright.txt file in the - * distribution for a full listing of individual contributors. - * - * This 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 2.1 of - * the License, or (at your option) any later version. - * - * This software 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 this software; if not, write to the Free - * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA - * 02110-1301 USA, or see the FSF site: http://www.fsf.org. - */ -package org.horizon.loader; - -import org.horizon.config.CacheLoaderConfig.IndividualCacheLoaderConfig; -import org.horizon.config.Dynamic; -import org.horizon.util.Util; - -import java.util.Properties; - -public class FileCacheLoaderConfig extends IndividualCacheLoaderConfig { - private static final long serialVersionUID = 4626734068542420865L; - - private String location; - @Dynamic - private boolean checkCharacterPortability = true; - - public FileCacheLoaderConfig() { - setClassName(FileCacheLoader.class.getName()); - } - - /** - * For use by {@link FileCacheLoader}. - * - * @param base generic config object created by XML parsing. - */ - FileCacheLoaderConfig(IndividualCacheLoaderConfig base) { - setClassName(FileCacheLoader.class.getName()); - populateFromBaseConfig(base); - } - - public String getLocation() { - return location; - } - - public void setLocation(String location) { - testImmutability("location"); - this.location = location; - } - - public boolean isCheckCharacterPortability() { - return checkCharacterPortability; - } - - public void setCheckCharacterPortability(boolean checkCharacterPortability) { - testImmutability("check.character.portability"); - this.checkCharacterPortability = checkCharacterPortability; - } - - @Override - public void setProperties(Properties props) { - super.setProperties(props); - - if (props != null) { - setLocation(props.getProperty("location")); - String prop = props.getProperty("check.character.portability"); - setCheckCharacterPortability((prop == null || Boolean.valueOf(prop))); - } - } - - @Override - public boolean equals(Object obj) { - if (obj instanceof FileCacheLoaderConfig && equalsExcludingProperties(obj)) { - return Util.safeEquals(location, ((FileCacheLoaderConfig) obj).location); - } - return false; - } - - @Override - public int hashCode() { - return 31 * hashCodeExcludingProperties() + (location == null ? 0 : location.hashCode()); - } - - @Override - public FileCacheLoaderConfig clone() throws CloneNotSupportedException { - return (FileCacheLoaderConfig) super.clone(); - } - -} \ No newline at end of file Copied: core/branches/flat/src/main/java/org/horizon/loader_old/FileCacheLoaderConfig.java (from rev 7673, core/branches/flat/src/main/java/org/horizon/loader/FileCacheLoaderConfig.java) =================================================================== --- core/branches/flat/src/main/java/org/horizon/loader_old/FileCacheLoaderConfig.java (rev 0) +++ core/branches/flat/src/main/java/org/horizon/loader_old/FileCacheLoaderConfig.java 2009-02-10 13:51:40 UTC (rev 7674) @@ -0,0 +1,98 @@ +/* + * JBoss, Home of Professional Open Source. + * Copyright 2000 - 2008, Red Hat Middleware LLC, and individual contributors + * as indicated by the @author tags. See the copyright.txt file in the + * distribution for a full listing of individual contributors. + * + * This 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 2.1 of + * the License, or (at your option) any later version. + * + * This software 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 this software; if not, write to the Free + * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA + * 02110-1301 USA, or see the FSF site: http://www.fsf.org. + */ +package org.horizon.loader; + +import org.horizon.config.CacheLoaderConfig.IndividualCacheLoaderConfig; +import org.horizon.config.Dynamic; +import org.horizon.util.Util; + +import java.util.Properties; + +public class FileCacheLoaderConfig extends IndividualCacheLoaderConfig { + private static final long serialVersionUID = 4626734068542420865L; + + private String location; + @Dynamic + private boolean checkCharacterPortability = true; + + public FileCacheLoaderConfig() { + setClassName(FileCacheLoaderOld.class.getName()); + } + + /** + * For use by {@link FileCacheLoaderOld}. + * + * @param base generic config object created by XML parsing. + */ + FileCacheLoaderConfig(IndividualCacheLoaderConfig base) { + setClassName(FileCacheLoaderOld.class.getName()); + populateFromBaseConfig(base); + } + + public String getLocation() { + return location; + } + + public void setLocation(String location) { + testImmutability("location"); + this.location = location; + } + + public boolean isCheckCharacterPortability() { + return checkCharacterPortability; + } + + public void setCheckCharacterPortability(boolean checkCharacterPortability) { + testImmutability("check.character.portability"); + this.checkCharacterPortability = checkCharacterPortability; + } + + @Override + public void setProperties(Properties props) { + super.setProperties(props); + + if (props != null) { + setLocation(props.getProperty("location")); + String prop = props.getProperty("check.character.portability"); + setCheckCharacterPortability((prop == null || Boolean.valueOf(prop))); + } + } + + @Override + public boolean equals(Object obj) { + if (obj instanceof FileCacheLoaderConfig && equalsExcludingProperties(obj)) { + return Util.safeEquals(location, ((FileCacheLoaderConfig) obj).location); + } + return false; + } + + @Override + public int hashCode() { + return 31 * hashCodeExcludingProperties() + (location == null ? 0 : location.hashCode()); + } + + @Override + public FileCacheLoaderConfig clone() throws CloneNotSupportedException { + return (FileCacheLoaderConfig) super.clone(); + } + +} \ No newline at end of file Copied: core/branches/flat/src/main/java/org/horizon/loader_old/FileCacheLoaderOld.java (from rev 7673, core/branches/flat/src/main/java/org/horizon/loader/FileCacheLoaderOld.java) =================================================================== --- core/branches/flat/src/main/java/org/horizon/loader_old/FileCacheLoaderOld.java (rev 0) +++ core/branches/flat/src/main/java/org/horizon/loader_old/FileCacheLoaderOld.java 2009-02-10 13:51:40 UTC (rev 7674) @@ -0,0 +1,415 @@ +/* + * JBoss, Home of Professional Open Source. + * Copyright 2000 - 2008, Red Hat Middleware LLC, and individual contributors + * as indicated by the @author tags. See the copyright.txt file in the + * distribution for a full listing of individual contributors. + * + * This 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 2.1 of + * the License, or (at your option) any later version. + * + * This software 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 this software; if not, write to the Free + * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA + * 02110-1301 USA, or see the FSF site: http://www.fsf.org. + */ +package org.horizon.loader; + +import net.jcip.annotations.ThreadSafe; +import org.horizon.CacheException; +import org.horizon.config.CacheLoaderConfig.IndividualCacheLoaderConfig; +import org.horizon.lock.StripedLock; +import org.horizon.logging.Log; +import org.horizon.logging.LogFactory; +import org.horizon.marshall.EntryData; +import org.jboss.util.stream.MarshalledValueInputStream; + +import java.io.Closeable; +import java.io.File; +import java.io.FileInputStream; +import java.io.FileNotFoundException; +import java.io.FileOutputStream; +import java.io.IOException; +import java.io.ObjectInputStream; +import java.io.ObjectOutputStream; +import java.util.LinkedList; +import java.util.List; +import java.util.regex.Matcher; +import java.util.regex.Pattern; + +/** + * Simple file-based CacheLoader implementation. Nodes are directories, attributes of a node is a file in the directory + * + * The FileCacheLoader has some severe limitations which restrict its use in a production environment, or if used in + * such an environment, it should be used with due care and sufficient understanding of these limitations. <ul> <li>Due + * to the way the FileCacheLoader represents a tree structure on disk (directories and files) traversal is inefficient + * for deep trees.</li> <li>Usage on shared filesystems like NFS, Windows shares, etc. should be avoided as these do not + * implement proper file locking and can cause data corruption.</li> <li>Usage with an isolation level of NONE can cause + * corrupt writes as multiple threads attempt to write to the same file.</li> <li>File systems are inherently not + * transactional, so when attempting to use your cache in a transactional context, failures when writing to the file + * (which happens during the commit phase) cannot be recovered.</li> </ul> + * + * As a rule of thumb, it is recommended that the FileCacheLoader not be used in a highly concurrent, transactional or + * stressful environment, and its use is restricted to testing. + * + * In terms of concurrency, file systems are notoriously inconsistent in their implementations of concurrent locks. To + * get around this and to meet the thread safety contracts set out in {@link CacheLoaderOld}, this implementation + * uses a {@link StripedLock} + * + * @author Bela Ban + * @author <a href="mailto:galder.zamarreno@jboss.com">Galder Zamarreno</a> + * @author <a href="mailto:manik@jboss.org">Manik Surtani</a> + * @since 1.0 + */ +@ThreadSafe +public class FileCacheLoaderOld<K, V> extends AbstractCacheLoaderOld<K, V> { + File root = null; + String rootPath = null; + Log log = LogFactory.getLog(getClass()); + + protected final StripedLock lock = new StripedLock(); + + private FileCacheLoaderConfig config; + + /** + * For full path, check '*' '<' '>' '|' '"' '?' Regex: [\*<>|"?] + */ + public static final Pattern PATH_PATTERN = Pattern.compile("[\\*<>|\"?]"); + + /** + * For fqn, check '*' '<' '>' '|' '"' '?' and also '\' '/' and ':' + */ + public static final Pattern KEY_PATTERN = Pattern.compile("[\\\\\\/:*<>|\"?]"); + private static boolean isOldWindows; + + static { + float osVersion = -1; + try { + osVersion = Float.parseFloat(System.getProperty("os.version").trim()); + } + catch (Exception e) { + // ignore + } + // 4.x is windows NT/2000 and 5.x is XP. + isOldWindows = System.getProperty("os.name").toLowerCase().startsWith("windows") && osVersion < 4; + } + + public void setConfig(IndividualCacheLoaderConfig base) { + if (base instanceof FileCacheLoaderConfig) { + this.config = (FileCacheLoaderConfig) base; + } else if (base != null) { + this.config = new FileCacheLoaderConfig(base); + } + + String location = this.config != null ? this.config.getLocation() : null; + if (location != null && location.length() > 0) { + root = new File(location); + rootPath = root.getAbsolutePath() + File.separator; + } + } + + public IndividualCacheLoaderConfig getConfig() { + return config; + } + + @Override + public void create() { + if (root == null) { + String tmpLocation = System.getProperty("java.io.tmpdir", "C:\\tmp"); + root = new File(tmpLocation); + rootPath = root.getAbsolutePath() + File.separator; + } + if (!root.exists()) { + if (log.isTraceEnabled()) { + log.trace("Creating cache loader location " + root); + } + + if (config.isCheckCharacterPortability()) { + /* Before creating the root, check whether the path is character portable. Anything that comes after is part + of the fqn which is inspected later. */ + isCharacterPortableLocation(root.getAbsolutePath()); + } + + boolean created = root.mkdirs(); + if (!created) { + throw new CacheException("Unable to create cache loader location " + root); + } + } + + if (!root.isDirectory()) { + throw new CacheException("Cache loader location [" + root + "] is not a directory!"); + } + } + + public V get(Object key) { + lock(key); + try { + try { + return loadValue(key); + } + catch (Exception e) { + throw new CacheException(e); + } + } + finally { + unlock(key); + } + } + + public boolean exists(Object key) { + lock(key); + try { + return getFile(key, false).exists(); + } + catch (IOException e) { + throw new CacheException(e); + } + finally { + unlock(key); + } + } + + public V put(K key, V value) { + lock(key); + try { + V retval; + try { + retval = loadValue(key); + storeValue(key, value); + return retval; + } + catch (Exception e) { + throw new CacheException(e); + } + } + finally { + unlock(key); + } + } + + public V remove(Object key) { + lock(key); + try { + V retval; + try { + File file = getFile(key, false); + if (!file.exists()) + return null; + + retval = loadValue(key); + file.delete(); + return retval; + } + catch (Exception e) { + throw new CacheException(e); + } + } + finally { + unlock(key); + } + } + + private void unlock(Object key) { + lock.releaseLock(key.toString()); + } + + private void lock(Object key) { + lock.acquireLock(key.toString(), true); + } + + private File getDirectory(Object key, boolean create) throws IOException { + File f = new File(getFullPath(key)); + if (!f.exists()) { + if (create) { + boolean make = f.mkdirs(); + if (!make) + throw new IOException("Unable to mkdirs " + f); + } + } + return f; + } + + private String getFullPath(Object key) { + return rootPath; + } + + private void safeClose(Closeable closeable) { + if (closeable == null) + return; + + try { + closeable.close(); + } + catch (IOException e) { + } + } + + private V loadValue(Object key) throws Exception { + File child = getFile(key, false); + if (!child.exists()) + return null; + + return loadValue(child); + } + + private V loadValue(File file) throws Exception { + FileInputStream fileIn = null; + ObjectInputStream input = null; + + try { + fileIn = new FileInputStream(file); + input = new MarshalledValueInputStream(fileIn); + return (V) getMarshaller().objectFromObjectStream(input); + } + catch (FileNotFoundException fnfe) { + return null; + } + finally { + safeClose(input); + safeClose(fileIn); + } + } + + private EntryData<K, V> loadEntry(File file) throws Exception { + FileInputStream fileIn = null; + ObjectInputStream input = null; + + try { + fileIn = new FileInputStream(file); + input = new MarshalledValueInputStream(fileIn); + V value = (V) getMarshaller().objectFromObjectStream(input); + K key = (K) getMarshaller().objectFromObjectStream(input); + return new EntryData<K, V>(key, value); + } + catch (FileNotFoundException fnfe) { + return null; + } + finally { + safeClose(input); + safeClose(fileIn); + } + } + + private File getFile(Object key, boolean create) throws IOException { + File directory = getDirectory(key, create); + File child = new File(directory, key.toString()); + if (create && !child.exists()) { + if (config.isCheckCharacterPortability()) { + /* Check whether the entire file path (root + fqn + data file name), is length portable */ + isLengthPortablePath(child.getAbsolutePath()); + /* Check whether the fqn tree we're trying to store could contain non portable characters */ + isCharacterPortableKey(key); + } + + if (!child.createNewFile()) { + throw new IOException("Unable to create file: " + child); + } + } + + return child; + } + + protected void storeValue(Object key, Object value) throws Exception { + File child = getFile(key, true); + + FileOutputStream fileOut = null; + ObjectOutputStream output = null; + try { + fileOut = new FileOutputStream(child); + output = new ObjectOutputStream(fileOut); + getMarshaller().objectToObjectStream(value, output); + getMarshaller().objectToObjectStream(key, output); // For getAllEntries + } + finally { + safeClose(output); + safeClose(fileOut); + } + } + + protected boolean isCharacterPortableLocation(String fileAbsolutePath) { + Matcher matcher = PATH_PATTERN.matcher(fileAbsolutePath); + if (matcher.find()) { + log.warn("Cache loader location ( " + fileAbsolutePath + " ) contains one of these characters: '*' '<' '>' '|' '\"' '?'"); + log.warn("Directories containing these characters are illegal in some operative systems and could lead to portability issues"); + return false; + } + + return true; + } + + protected boolean isCharacterPortableKey(Object key) { + // getFullPath converts Object to String via toString(), so we do too + Matcher matcher = KEY_PATTERN.matcher(key.toString()); + if (matcher.find()) { + log.warn("The key.toString() contains one of these characters: '*' '<' '>' '|' '\"' '?' '\\' '/' ':' "); + log.warn("Directories containing these characters are illegal in some operating systems and could lead to portability issues"); + return false; + } + + return true; + } + + protected boolean isLengthPortablePath(String absoluteFqnPath) { + + if (isOldWindows && absoluteFqnPath.length() > 255) { + log.warn("The full absolute path to the fqn that you are trying to store is bigger than 255 characters, this could lead to problems on certain Windows systems: " + absoluteFqnPath); + return false; + } + + return true; + } + + public void clear() { + File directory = new File(rootPath); + if (!directory.exists()) + return; + + File[] files = directory.listFiles(); + if (files != null) { + for (File file : files) { + try { + lock(file.getName()); + if (file.exists()) + file.delete(); + } + finally { + unlock(file.getName()); + } + } + } + } + + public List<EntryData<K, V>> getAllEntries() { + List<EntryData<K, V>> entries = new LinkedList<EntryData<K, V>>(); + File directory = new File(rootPath); + if (!directory.exists()) + return entries; + + File[] files = directory.listFiles(); + if (files != null) { + for (File file : files) { + try { + lock(file.getName()); + if (file.exists()) { + EntryData<K, V> entry = loadEntry(file); + if (entry != null) + entries.add(entry); + } + } + catch (Exception e) { + } + finally { + unlock(file.getName()); + } + } + } + + return entries; + } +} Deleted: core/branches/flat/src/main/java/org/horizon/loader_old/ReadOnlyDelegatingCacheLoader.java =================================================================== --- core/branches/flat/src/main/java/org/horizon/loader/ReadOnlyDelegatingCacheLoader.java 2009-02-10 11:54:44 UTC (rev 7672) +++ core/branches/flat/src/main/java/org/horizon/loader_old/ReadOnlyDelegatingCacheLoader.java 2009-02-10 13:51:40 UTC (rev 7674) @@ -1,84 +0,0 @@ -/* - * JBoss, Home of Professional Open Source. - * Copyright 2000 - 2008, Red Hat Middleware LLC, and individual contributors - * as indicated by the @author tags. See the copyright.txt file in the - * distribution for a full listing of individual contributors. - * - * This 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 2.1 of - * the License, or (at your option) any later version. - * - * This software 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 this software; if not, write to the Free - * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA - * 02110-1301 USA, or see the FSF site: http://www.fsf.org. - */ -package org.horizon.loader; - -import org.horizon.logging.Log; -import org.horizon.logging.LogFactory; - -import java.io.ObjectInputStream; -import java.util.List; - -/** - * Provides ignoreModifications features to all cache loaders. - * - * @author <a href="mailto:manik@jboss.org">Manik Surtani</a> - * @since 1.0 - */ -public class ReadOnlyDelegatingCacheLoader<K, V> extends AbstractDelegatingCacheLoader<K, V> { - private static final Log log = LogFactory.getLog(ReadOnlyDelegatingCacheLoader.class); - - public ReadOnlyDelegatingCacheLoader(CacheLoader cl) { - super(cl); - } - - @Override - public V put(K key, V value) { - log.trace("Not delegating write operation to underlying cache loader"); - return get(key); - } - - @Override - public void put(List<Modification> modifications) { - log.trace("Not delegating write operation to underlying cache loader"); - } - - @Override - public V remove(Object key) { - log.trace("Not delegating write operation to underlying cache loader"); - return get(key); - } - - @Override - public void prepare(Object tx, List<Modification> modifications, boolean one_phase) { - log.trace("Not delegating write operation to underlying cache loader"); - } - - @Override - public void commit(Object tx) { - log.trace("Not delegating write operation to underlying cache loader"); - } - - @Override - public void rollback(Object tx) { - log.trace("Not delegating write operation to underlying cache loader"); - } - - @Override - public void storeEntireState(ObjectInputStream is) { - log.trace("Not delegating write operation to underlying cache loader"); - } - - @Override - public void clear() { - log.trace("Not delegating write operation to underlying cache loader"); - } -} Copied: core/branches/flat/src/main/java/org/horizon/loader_old/ReadOnlyDelegatingCacheLoaderOld.java (from rev 7673, core/branches/flat/src/main/java/org/horizon/loader/ReadOnlyDelegatingCacheLoaderOld.java) =================================================================== --- core/branches/flat/src/main/java/org/horizon/loader_old/ReadOnlyDelegatingCacheLoaderOld.java (rev 0) +++ core/branches/flat/src/main/java/org/horizon/loader_old/ReadOnlyDelegatingCacheLoaderOld.java 2009-02-10 13:51:40 UTC (rev 7674) @@ -0,0 +1,84 @@ +/* + * JBoss, Home of Professional Open Source. + * Copyright 2000 - 2008, Red Hat Middleware LLC, and individual contributors + * as indicated by the @author tags. See the copyright.txt file in the + * distribution for a full listing of individual contributors. + * + * This 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 2.1 of + * the License, or (at your option) any later version. + * + * This software 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 this software; if not, write to the Free + * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA + * 02110-1301 USA, or see the FSF site: http://www.fsf.org. + */ +package org.horizon.loader; + +import org.horizon.logging.Log; +import org.horizon.logging.LogFactory; + +import java.io.ObjectInputStream; +import java.util.List; + +/** + * Provides ignoreModifications features to all cache loaders. + * + * @author <a href="mailto:manik@jboss.org">Manik Surtani</a> + * @since 1.0 + */ +public class ReadOnlyDelegatingCacheLoaderOld<K, V> extends AbstractDelegatingCacheLoaderOld<K, V> { + private static final Log log = LogFactory.getLog(ReadOnlyDelegatingCacheLoaderOld.class); + + public ReadOnlyDelegatingCacheLoaderOld(CacheLoaderOld cl) { + super(cl); + } + + @Override + public V put(K key, V value) { + log.trace("Not delegating write operation to underlying cache loader"); + return get(key); + } + + @Override + public void put(List<Modification> modifications) { + log.trace("Not delegating write operation to underlying cache loader"); + } + + @Override + public V remove(Object key) { + log.trace("Not delegating write operation to underlying cache loader"); + return get(key); + } + + @Override + public void prepare(Object tx, List<Modification> modifications, boolean one_phase) { + log.trace("Not delegating write operation to underlying cache loader"); + } + + @Override + public void commit(Object tx) { + log.trace("Not delegating write operation to underlying cache loader"); + } + + @Override + public void rollback(Object tx) { + log.trace("Not delegating write operation to underlying cache loader"); + } + + @Override + public void storeEntireState(ObjectInputStream is) { + log.trace("Not delegating write operation to underlying cache loader"); + } + + @Override + public void clear() { + log.trace("Not delegating write operation to underlying cache loader"); + } +} Deleted: core/branches/flat/src/main/java/org/horizon/loader_old/SingletonStoreCacheLoader.java =================================================================== --- core/branches/flat/src/main/java/org/horizon/loader/SingletonStoreCacheLoader.java 2009-02-10 11:54:44 UTC (rev 7672) +++ core/branches/flat/src/main/java/org/horizon/loader_old/SingletonStoreCacheLoader.java 2009-02-10 13:51:40 UTC (rev 7674) @@ -1,506 +0,0 @@ -/* - * JBoss, Home of Professional Open Source. - * Copyright 2000 - 2008, Red Hat Middleware LLC, and individual contributors - * as indicated by the @author tags. See the copyright.txt file in the - * distribution for a full listing of individual contributors. - * - * This 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 2.1 of - * the License, or (at your option) any later version. - * - * This software 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 this software; if not, write to the Free - * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA - * 02110-1301 USA, or see the FSF site: http://www.fsf.org. - */ -package org.horizon.loader; - -import org.horizon.config.CacheLoaderConfig; -import org.horizon.config.CacheLoaderConfig.IndividualCacheLoaderConfig.SingletonStoreConfig; -import org.horizon.logging.Log; -import org.horizon.logging.LogFactory; -import org.horizon.notifications.Listener; -import org.horizon.notifications.cachelistener.event.Event; -import org.horizon.notifications.cachemanagerlistener.annotation.CacheStarted; -import org.horizon.notifications.cachemanagerlistener.annotation.CacheStopped; -import org.horizon.notifications.cachemanagerlistener.annotation.ViewChanged; -import org.horizon.notifications.cachemanagerlistener.event.ViewChangedEvent; -import org.horizon.remoting.transport.Address; -import org.horizon.tree.Fqn; - -import java.io.ObjectInputStream; -import java.util.List; -import java.util.Map; -import java.util.concurrent.Callable; -import java.util.concurrent.ExecutionException; -import java.util.concurrent.ExecutorService; -import java.util.concurrent.Executors; -import java.util.concurrent.Future; -import java.util.concurrent.ThreadFactory; -import java.util.concurrent.TimeUnit; -import java.util.concurrent.TimeoutException; - -/** - * SingletonStoreCacheLoader is a delegating cache loader used for situations when only one cache instance should - * interact with the underlying store. The coordinator of the cluster will be responsible for the underlying - * CacheLoader. SingletonStoreCacheLoader is a simply facade to a real CacheLoader implementation. It always delegates - * reads to the real CacheLoader. - * - * Writes are forwarded only if this SingletonStoreCacheLoader is currently the cordinator. This avoid having all - * CacheLoaders in a cluster writing the same data to the same underlying store. Although not incorrect (e.g. a DB will - * just discard additional INSERTs for the same key, and throw an exception), this will avoid a lot of redundant - * work. - * - * Whenever the current coordinator dies (or leaves), the second in line will take over. That SingletonStoreCacheLoader - * will then pass writes through to its underlying CacheLoader. Optionally, when a new coordinator takes over the - * Singleton, it can push the in-memory state to the cache cacheLoader, within a time constraint. - * - * @author Bela Ban - * @author <a href="mailto:galder.zamarreno@jboss.com">Galder Zamarreno</a> - * @since 1.0 - */ -public class SingletonStoreCacheLoader extends AbstractDelegatingCacheLoader { - /** - * Log instance. - */ - private static final Log log = LogFactory.getLog(SingletonStoreCacheLoader.class); - private static final boolean trace = log.isTraceEnabled(); - - /** - * Name of thread that should pushing in-memory state to cache loader. - */ - private static final String THREAD_NAME = "InMemoryToCacheLoaderPusher"; - - /** - * Configuration for the SingletonStoreCacheLoader. - */ - private SingletonStoreDefaultConfig config; - - /** - * Executor service used to submit tasks to push in-memory state. - */ - private final ExecutorService executor; - - /** - * Future result of the in-memory push state task. This allows SingletonStoreCacheLoader to check whether there's any - * push taks on going. - */ - private Future<?> pushStateFuture; /* FutureTask guarantess a safe publication of the result */ - - /** - * Address instance that allows SingletonStoreCacheLoader to find out whether it became the coordinator of the - * cluster, or whether it stopped being it. This dictates whether the SingletonStoreCacheLoader is active or not. - */ - private Address localAddress; - - /** - * Whether the the current cache instance is the coordinator and therefore SingletonStoreCacheLoader is active. Being - * active means delegating calls to the underlying cache loader. - */ - private boolean active; - - /** - * Empty constructor so that it can instantiated using reflection. - */ - public SingletonStoreCacheLoader() { - super(null); - - executor = Executors.newSingleThreadExecutor(new ThreadFactory() { - public Thread newThread(Runnable r) { - return new Thread(r, THREAD_NAME); - } - }); - } - - /** - * Sets the config for SingletonStoreCacheLoader and for the delegating cache loader. - */ - @Override - public void setConfig(CacheLoaderConfig.IndividualCacheLoaderConfig config) { - super.setConfig(config); - - SingletonStoreConfig ssc = config.getSingletonStoreConfig(); - if (ssc instanceof SingletonStoreDefaultConfig) { - this.config = (SingletonStoreDefaultConfig) ssc; - } else if (ssc != null) { - this.config = new SingletonStoreDefaultConfig(ssc); - } else { - this.config = new SingletonStoreDefaultConfig(); - } - } - - @Override - public void create()// throws Exception - { - super.create(); - - cache.addListener(new SingletonStoreListener()); - } - - /** - * Protected constructor which should only be used from unit tests. Production code should set - * pushStateWhenCoordinator using setConfig() method instead. - * - * @param config configuration instance for SingletonStoreCacheLoader - */ - protected SingletonStoreCacheLoader(SingletonStoreDefaultConfig config) { - this(); - - this.config = config; - } - - /** - * Returns SingletonStoreCacheLoader's configuration instance. This method has been defined for convenience reasons - * when unit testing SingletonStoreCacheLoader's configuration. - * - * @return instance of SingletonStoreDefaultConfig - */ - protected SingletonStoreDefaultConfig getSingletonStoreDefaultConfig() { - return config; - } - - /** - * Returns the Future instance of a running in-memory to cache loader push task. This method has been defined for - * convenience reasons when unit testing. - * - * @return an instance of Future - */ - protected Future<?> getPushStateFuture() { - return pushStateFuture; - } - - /** - * Method called when the cache instance either becomes the coordinator or stops being the coordinator. If it becomes - * the coordinator, it can optionally start the in-memory state transfer to the underlying cache store. - * - * @param newActiveState true if the cache instance just became the coordinator, false if the cache instance stopped - * being the coordinator. - */ - protected void activeStatusChanged(boolean newActiveState) throws PushStateException { - active = newActiveState; - log.debug("changed mode: " + this); - if (active && config.isPushStateWhenCoordinator()) { - doPushState(); - } - } - - /** - * Factory method for the creation of a Callable task in charge of pushing in-memory state to cache loader. - * - * @return new instance of Callable<?> whose call() method either throws an exception or returns null if the task was - * successfull. - */ - protected Callable<?> createPushStateTask() { - return new Callable() { - public Object call() throws Exception { - final boolean debugEnabled = log.isDebugEnabled(); - - if (debugEnabled) log.debug("start pushing in-memory state to cache cacheLoader"); -// pushState(cache.getRoot()); - if (debugEnabled) log.debug("in-memory state passed to cache cacheLoader successfully"); - - return null; - } - }; - } - - /** - * Pushes the state of a specific cache entry by reading the entry's data from the cache and putting in the cache store - * via the cache loader. This method is call recursively so that it iterates through the whole cache. - * - */ - // TODO implement me -// protected void pushState(Object key) throws Exception -// { -// /* Put the key's data first */ -// } - - /** - * Method that waits for the in-memory to cache loader state to finish. This method's called in case a push state is - * already in progress and we need to wait for it to finish. - * - * @param future instance of Future representing the on going push task - * @param timeout time to wait for the push task to finish - * @param unit instance of TimeUnit representing the unit of timeout - */ - protected void awaitForPushToFinish(Future future, int timeout, TimeUnit unit) { - final boolean debugEnabled = log.isDebugEnabled(); - try { - if (debugEnabled) log.debug("wait for state push to cache loader to finish"); - future.get(timeout, unit); - } - catch (TimeoutException e) { - if (debugEnabled) log.debug("timed out waiting for state push to cache loader to finish"); - } - catch (ExecutionException e) { - if (debugEnabled) log.debug("exception reported waiting for state push to cache loader to finish"); - } - catch (InterruptedException ie) { - /* Re-assert the thread's interrupted status */ - Thread.currentThread().interrupt(); - if (trace) log.trace("wait for state push to cache loader to finish was interrupted"); - } - } - - /** - * Called when the SingletonStoreCacheLoader discovers that the cache instance has become the coordinator and push in - * memory state has been enabled. It might not actually push the state if there's an ongoing push task running, in - * which case will wait for the push task to finish. - * - * @throws PushStateException when the push state task reports an issue. - */ - private void doPushState() throws PushStateException { - if (pushStateFuture == null || pushStateFuture.isDone()) { - Callable<?> task = createPushStateTask(); - pushStateFuture = executor.submit(task); - try { - waitForTaskToFinish(pushStateFuture, config.getPushStateWhenCoordinatorTimeout(), TimeUnit.MILLISECONDS); - } - catch (Exception e) { - throw new PushStateException("unable to complete in memory state push to cache loader", e); - } - } else { - /* at the most, we wait for push state timeout value. if it push task finishes earlier, this call - * will stop when the push task finishes, otherwise a timeout exception will be reported */ - awaitForPushToFinish(pushStateFuture, config.getPushStateWhenCoordinatorTimeout(), TimeUnit.MILLISECONDS); - } - } - - /** - * Waits, within a time constraint, for a task to finish. - * - * @param future represents the task waiting to finish. - * @param timeout maximum time to wait for the time to finish. - * @param unit instance of TimeUnit representing the unit of timeout - * @throws Exception if any issues are reported while waiting for the task to finish - */ - private void waitForTaskToFinish(Future future, int timeout, TimeUnit unit) throws Exception { - try { - future.get(timeout, unit); - } - catch (TimeoutException e) { - throw new Exception("task timed out", e); - } - catch (InterruptedException e) { - /* Re-assert the thread's interrupted status */ - Thread.currentThread().interrupt(); - if (trace) log.trace("task was interrupted"); - } - finally { - /* no-op if task is completed */ - future.cancel(true); /* interrupt if running */ - } - } - - /** - * Indicates whether the current cache instances is the coordinator of the cluster. - * - * @param members new member list - * @return whether the current cache instance is the coordinator or not. - */ - private boolean isCoordinator(List<Address> members) { - if (members != null && localAddress != null) { - return members.size() > 0 && localAddress.equals(members.get(0)); - } - - /* Invalid new view, so previous value returned */ - return active; - } - - /** - * Calls the underlying cache loader's operation if the current cache instance is the coordinator. - */ -// @Override - public Object put(Fqn name, Object key, Object value) throws Exception { - if (active) { -// return super.put(name, key, value); - } - - return null; - } - - /** - * Calls the underlying cache loader's operation if the current cache instance is the coordinator. - */ -// @Override - public void put(Fqn name, Map attributes) throws Exception { - // TODO implement me -// if (active) -// { -// super.put(name, attributes); -// } - } - - /** - * Calls the underlying cache loader's operation if the current cache instance is the coordinator. - */ -// @Override -// public void put(List<Modification> modifications) throws Exception -// { - // TODO implement me -// if (active) -// { -// super.put(modifications); -// } -// } - - /** - * Calls the underlying cache loader's operation if the current cache instance is the coordinator. - */ -// @Override - public Object remove(Fqn fqn, Object key) throws Exception { - if (active) { -// return super.remove(fqn, key); - } - - return null; - } - - /** - * Calls the underlying cache loader's operation if the current cache instance is the coordinator. - */ -// @Override - public void remove(Fqn fqn) throws Exception { - if (active) { - super.remove(fqn); - } - } - - /** - * Calls the underlying cache loader's operation if the current cache instance is the coordinator. - */ -// @Override - public void removeData(Fqn fqn) throws Exception { - if (active) { -// super.removeData(fqn); - } - } - - /** - * Calls the underlying cache loader's operation if the current cache instance is the coordinator. - */ -// @Override -// public void prepare(Object tx, List<Modification> modifications, boolean one_phase) throws Exception -// { -// if (active) -// { -// super.prepare(tx, modifications, one_phase); -// } -// } - - /** - * Calls the underlying cache loader's operation if the current cache instance is the coordinator. - */ - @Override - public void commit(Object tx) // throws Exception - { - if (active) { - super.commit(tx); - } - } - - /** - * Calls the underlying cache loader's operation if the current cache instance is the coordinator. - */ - @Override - public void rollback(Object tx) { - if (active) { - super.rollback(tx); - } - } - - /** - * Calls the underlying cache loader's operation if the current cache instance is the coordinator. - */ - @Override - public void storeEntireState(ObjectInputStream is) //throws Exception - { - if (active) { - super.storeEntireState(is); - } - } - - /** - * Calls the underlying cache loader's operation if the current cache instance is the coordinator. - */ -// @Override - public void storeState(Fqn subtree, ObjectInputStream is) throws Exception { - if (active) { - // super.storeState(subtree, is); - } - } - - /** - * Calls the underlying cache loader's operation if the current cache instance is the coordinator. - */ - @Override - public String toString() { - return "loc_addr=" + localAddress + ", active=" + active; - } - - /** - * Cache listener that reacts to cluster topology changes to find out whether a new coordinator is elected. - * SingletonStoreCacheLoader reacts to these changes in order to decide which cache instance should interact with the - * underlying cache store. - */ - @Listener - public class SingletonStoreListener { - /** - * Cache started, check whether the cache instance is the coordinator and set the singleton store cache loader's - * active status. - */ - @CacheStarted - public void cacheStarted(Event e) { - localAddress = cache.getCacheManager().getAddress(); - active = cache.getCacheManager().isCoordinator(); - if (log.isDebugEnabled()) log.debug("cache started: " + this); - } - - @CacheStopped - public void cacheStopped(Event e) { - if (log.isDebugEnabled()) log.debug("cache stopped: " + this); - } - - /** - * The cluster formation changed, so determine whether the current cache instance stopped being the coordinator or - * became the coordinator. This method can lead to an optional in memory to cache loader state push, if the - * current cache instance became the coordinator. This method will report any issues that could potentially arise - * from this push. - */ - @ViewChanged - public void viewChange(ViewChangedEvent event) { - boolean tmp = isCoordinator(event.getNewMemberList()); - - if (active != tmp) { - try { - activeStatusChanged(tmp); - } - catch (PushStateException e) { - log.error("exception reported changing cache instance's active status", e); - } - - } - } - } - - /** - * Exception representing any issues that arise from pushing the in-memory state to the cache loader. - */ - public static class PushStateException extends Exception { - private static final long serialVersionUID = 5542893943730200886L; - - public PushStateException(String message, Throwable cause) { - super(message, cause); - } - - public PushStateException(Throwable cause) { - super(cause); - } - } -} \ No newline at end of file Copied: core/branches/flat/src/main/java/org/horizon/loader_old/SingletonStoreCacheLoaderOld.java (from rev 7673, core/branches/flat/src/main/java/org/horizon/loader/SingletonStoreCacheLoaderOld.java) =================================================================== --- core/branches/flat/src/main/java/org/horizon/loader_old/SingletonStoreCacheLoaderOld.java (rev 0) +++ core/branches/flat/src/main/java/org/horizon/loader_old/SingletonStoreCacheLoaderOld.java 2009-02-10 13:51:40 UTC (rev 7674) @@ -0,0 +1,506 @@ +/* + * JBoss, Home of Professional Open Source. + * Copyright 2000 - 2008, Red Hat Middleware LLC, and individual contributors + * as indicated by the @author tags. See the copyright.txt file in the + * distribution for a full listing of individual contributors. + * + * This 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 2.1 of + * the License, or (at your option) any later version. + * + * This software 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 this software; if not, write to the Free + * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA + * 02110-1301 USA, or see the FSF site: http://www.fsf.org. + */ +package org.horizon.loader; + +import org.horizon.config.CacheLoaderConfig; +import org.horizon.config.CacheLoaderConfig.IndividualCacheLoaderConfig.SingletonStoreConfig; +import org.horizon.logging.Log; +import org.horizon.logging.LogFactory; +import org.horizon.notifications.Listener; +import org.horizon.notifications.cachelistener.event.Event; +import org.horizon.notifications.cachemanagerlistener.annotation.CacheStarted; +import org.horizon.notifications.cachemanagerlistener.annotation.CacheStopped; +import org.horizon.notifications.cachemanagerlistener.annotation.ViewChanged; +import org.horizon.notifications.cachemanagerlistener.event.ViewChangedEvent; +import org.horizon.remoting.transport.Address; +import org.horizon.tree.Fqn; + +import java.io.ObjectInputStream; +import java.util.List; +import java.util.Map; +import java.util.concurrent.Callable; +import java.util.concurrent.ExecutionException; +import java.util.concurrent.ExecutorService; +import java.util.concurrent.Executors; +import java.util.concurrent.Future; +import java.util.concurrent.ThreadFactory; +import java.util.concurrent.TimeUnit; +import java.util.concurrent.TimeoutException; + +/** + * SingletonStoreCacheLoader is a delegating cache loader used for situations when only one cache instance should + * interact with the underlying store. The coordinator of the cluster will be responsible for the underlying + * CacheLoader. SingletonStoreCacheLoader is a simply facade to a real CacheLoader implementation. It always delegates + * reads to the real CacheLoader. + * + * Writes are forwarded only if this SingletonStoreCacheLoader is currently the cordinator. This avoid having all + * CacheLoaders in a cluster writing the same data to the same underlying store. Although not incorrect (e.g. a DB will + * just discard additional INSERTs for the same key, and throw an exception), this will avoid a lot of redundant + * work. + * + * Whenever the current coordinator dies (or leaves), the second in line will take over. That SingletonStoreCacheLoader + * will then pass writes through to its underlying CacheLoader. Optionally, when a new coordinator takes over the + * Singleton, it can push the in-memory state to the cache cacheLoader, within a time constraint. + * + * @author Bela Ban + * @author <a href="mailto:galder.zamarreno@jboss.com">Galder Zamarreno</a> + * @since 1.0 + */ +public class SingletonStoreCacheLoaderOld extends AbstractDelegatingCacheLoaderOld { + /** + * Log instance. + */ + private static final Log log = LogFactory.getLog(SingletonStoreCacheLoaderOld.class); + private static final boolean trace = log.isTraceEnabled(); + + /** + * Name of thread that should pushing in-memory state to cache loader. + */ + private static final String THREAD_NAME = "InMemoryToCacheLoaderPusher"; + + /** + * Configuration for the SingletonStoreCacheLoader. + */ + private SingletonStoreDefaultConfig config; + + /** + * Executor service used to submit tasks to push in-memory state. + */ + private final ExecutorService executor; + + /** + * Future result of the in-memory push state task. This allows SingletonStoreCacheLoader to check whether there's any + * push taks on going. + */ + private Future<?> pushStateFuture; /* FutureTask guarantess a safe publication of the result */ + + /** + * Address instance that allows SingletonStoreCacheLoader to find out whether it became the coordinator of the + * cluster, or whether it stopped being it. This dictates whether the SingletonStoreCacheLoader is active or not. + */ + private Address localAddress; + + /** + * Whether the the current cache instance is the coordinator and therefore SingletonStoreCacheLoader is active. Being + * active means delegating calls to the underlying cache loader. + */ + private boolean active; + + /** + * Empty constructor so that it can instantiated using reflection. + */ + public SingletonStoreCacheLoaderOld() { + super(null); + + executor = Executors.newSingleThreadExecutor(new ThreadFactory() { + public Thread newThread(Runnable r) { + return new Thread(r, THREAD_NAME); + } + }); + } + + /** + * Sets the config for SingletonStoreCacheLoader and for the delegating cache loader. + */ + @Override + public void setConfig(CacheLoaderConfig.IndividualCacheLoaderConfig config) { + super.setConfig(config); + + SingletonStoreConfig ssc = config.getSingletonStoreConfig(); + if (ssc instanceof SingletonStoreDefaultConfig) { + this.config = (SingletonStoreDefaultConfig) ssc; + } else if (ssc != null) { + this.config = new SingletonStoreDefaultConfig(ssc); + } else { + this.config = new SingletonStoreDefaultConfig(); + } + } + + @Override + public void create()// throws Exception + { + super.create(); + + cache.addListener(new SingletonStoreListener()); + } + + /** + * Protected constructor which should only be used from unit tests. Production code should set + * pushStateWhenCoordinator using setConfig() method instead. + * + * @param config configuration instance for SingletonStoreCacheLoader + */ + protected SingletonStoreCacheLoaderOld(SingletonStoreDefaultConfig config) { + this(); + + this.config = config; + } + + /** + * Returns SingletonStoreCacheLoader's configuration instance. This method has been defined for convenience reasons + * when unit testing SingletonStoreCacheLoader's configuration. + * + * @return instance of SingletonStoreDefaultConfig + */ + protected SingletonStoreDefaultConfig getSingletonStoreDefaultConfig() { + return config; + } + + /** + * Returns the Future instance of a running in-memory to cache loader push task. This method has been defined for + * convenience reasons when unit testing. + * + * @return an instance of Future + */ + protected Future<?> getPushStateFuture() { + return pushStateFuture; + } + + /** + * Method called when the cache instance either becomes the coordinator or stops being the coordinator. If it becomes + * the coordinator, it can optionally start the in-memory state transfer to the underlying cache store. + * + * @param newActiveState true if the cache instance just became the coordinator, false if the cache instance stopped + * being the coordinator. + */ + protected void activeStatusChanged(boolean newActiveState) throws PushStateException { + active = newActiveState; + log.debug("changed mode: " + this); + if (active && config.isPushStateWhenCoordinator()) { + doPushState(); + } + } + + /** + * Factory method for the creation of a Callable task in charge of pushing in-memory state to cache loader. + * + * @return new instance of Callable<?> whose call() method either throws an exception or returns null if the task was + * successfull. + */ + protected Callable<?> createPushStateTask() { + return new Callable() { + public Object call() throws Exception { + final boolean debugEnabled = log.isDebugEnabled(); + + if (debugEnabled) log.debug("start pushing in-memory state to cache cacheLoader"); +// pushState(cache.getRoot()); + if (debugEnabled) log.debug("in-memory state passed to cache cacheLoader successfully"); + + return null; + } + }; + } + + /** + * Pushes the state of a specific cache entry by reading the entry's data from the cache and putting in the cache store + * via the cache loader. This method is call recursively so that it iterates through the whole cache. + * + */ + // TODO implement me +// protected void pushState(Object key) throws Exception +// { +// /* Put the key's data first */ +// } + + /** + * Method that waits for the in-memory to cache loader state to finish. This method's called in case a push state is + * already in progress and we need to wait for it to finish. + * + * @param future instance of Future representing the on going push task + * @param timeout time to wait for the push task to finish + * @param unit instance of TimeUnit representing the unit of timeout + */ + protected void awaitForPushToFinish(Future future, int timeout, TimeUnit unit) { + final boolean debugEnabled = log.isDebugEnabled(); + try { + if (debugEnabled) log.debug("wait for state push to cache loader to finish"); + future.get(timeout, unit); + } + catch (TimeoutException e) { + if (debugEnabled) log.debug("timed out waiting for state push to cache loader to finish"); + } + catch (ExecutionException e) { + if (debugEnabled) log.debug("exception reported waiting for state push to cache loader to finish"); + } + catch (InterruptedException ie) { + /* Re-assert the thread's interrupted status */ + Thread.currentThread().interrupt(); + if (trace) log.trace("wait for state push to cache loader to finish was interrupted"); + } + } + + /** + * Called when the SingletonStoreCacheLoader discovers that the cache instance has become the coordinator and push in + * memory state has been enabled. It might not actually push the state if there's an ongoing push task running, in + * which case will wait for the push task to finish. + * + * @throws PushStateException when the push state task reports an issue. + */ + private void doPushState() throws PushStateException { + if (pushStateFuture == null || pushStateFuture.isDone()) { + Callable<?> task = createPushStateTask(); + pushStateFuture = executor.submit(task); + try { + waitForTaskToFinish(pushStateFuture, config.getPushStateWhenCoordinatorTimeout(), TimeUnit.MILLISECONDS); + } + catch (Exception e) { + throw new PushStateException("unable to complete in memory state push to cache loader", e); + } + } else { + /* at the most, we wait for push state timeout value. if it push task finishes earlier, this call + * will stop when the push task finishes, otherwise a timeout exception will be reported */ + awaitForPushToFinish(pushStateFuture, config.getPushStateWhenCoordinatorTimeout(), TimeUnit.MILLISECONDS); + } + } + + /** + * Waits, within a time constraint, for a task to finish. + * + * @param future represents the task waiting to finish. + * @param timeout maximum time to wait for the time to finish. + * @param unit instance of TimeUnit representing the unit of timeout + * @throws Exception if any issues are reported while waiting for the task to finish + */ + private void waitForTaskToFinish(Future future, int timeout, TimeUnit unit) throws Exception { + try { + future.get(timeout, unit); + } + catch (TimeoutException e) { + throw new Exception("task timed out", e); + } + catch (InterruptedException e) { + /* Re-assert the thread's interrupted status */ + Thread.currentThread().interrupt(); + if (trace) log.trace("task was interrupted"); + } + finally { + /* no-op if task is completed */ + future.cancel(true); /* interrupt if running */ + } + } + + /** + * Indicates whether the current cache instances is the coordinator of the cluster. + * + * @param members new member list + * @return whether the current cache instance is the coordinator or not. + */ + private boolean isCoordinator(List<Address> members) { + if (members != null && localAddress != null) { + return members.size() > 0 && localAddress.equals(members.get(0)); + } + + /* Invalid new view, so previous value returned */ + return active; + } + + /** + * Calls the underlying cache loader's operation if the current cache instance is the coordinator. + */ +// @Override + public Object put(Fqn name, Object key, Object value) throws Exception { + if (active) { +// return super.put(name, key, value); + } + + return null; + } + + /** + * Calls the underlying cache loader's operation if the current cache instance is the coordinator. + */ +// @Override + public void put(Fqn name, Map attributes) throws Exception { + // TODO implement me +// if (active) +// { +// super.put(name, attributes); +// } + } + + /** + * Calls the underlying cache loader's operation if the current cache instance is the coordinator. + */ +// @Override +// public void put(List<Modification> modifications) throws Exception +// { + // TODO implement me +// if (active) +// { +// super.put(modifications); +// } +// } + + /** + * Calls the underlying cache loader's operation if the current cache instance is the coordinator. + */ +// @Override + public Object remove(Fqn fqn, Object key) throws Exception { + if (active) { +// return super.remove(fqn, key); + } + + return null; + } + + /** + * Calls the underlying cache loader's operation if the current cache instance is the coordinator. + */ +// @Override + public void remove(Fqn fqn) throws Exception { + if (active) { + super.remove(fqn); + } + } + + /** + * Calls the underlying cache loader's operation if the current cache instance is the coordinator. + */ +// @Override + public void removeData(Fqn fqn) throws Exception { + if (active) { +// super.removeData(fqn); + } + } + + /** + * Calls the underlying cache loader's operation if the current cache instance is the coordinator. + */ +// @Override +// public void prepare(Object tx, List<Modification> modifications, boolean one_phase) throws Exception +// { +// if (active) +// { +// super.prepare(tx, modifications, one_phase); +// } +// } + + /** + * Calls the underlying cache loader's operation if the current cache instance is the coordinator. + */ + @Override + public void commit(Object tx) // throws Exception + { + if (active) { + super.commit(tx); + } + } + + /** + * Calls the underlying cache loader's operation if the current cache instance is the coordinator. + */ + @Override + public void rollback(Object tx) { + if (active) { + super.rollback(tx); + } + } + + /** + * Calls the underlying cache loader's operation if the current cache instance is the coordinator. + */ + @Override + public void storeEntireState(ObjectInputStream is) //throws Exception + { + if (active) { + super.storeEntireState(is); + } + } + + /** + * Calls the underlying cache loader's operation if the current cache instance is the coordinator. + */ +// @Override + public void storeState(Fqn subtree, ObjectInputStream is) throws Exception { + if (active) { + // super.storeState(subtree, is); + } + } + + /** + * Calls the underlying cache loader's operation if the current cache instance is the coordinator. + */ + @Override + public String toString() { + return "loc_addr=" + localAddress + ", active=" + active; + } + + /** + * Cache listener that reacts to cluster topology changes to find out whether a new coordinator is elected. + * SingletonStoreCacheLoader reacts to these changes in order to decide which cache instance should interact with the + * underlying cache store. + */ + @Listener + public class SingletonStoreListener { + /** + * Cache started, check whether the cache instance is the coordinator and set the singleton store cache loader's + * active status. + */ + @CacheStarted + public void cacheStarted(Event e) { + localAddress = cache.getCacheManager().getAddress(); + active = cache.getCacheManager().isCoordinator(); + if (log.isDebugEnabled()) log.debug("cache started: " + this); + } + + @CacheStopped + public void cacheStopped(Event e) { + if (log.isDebugEnabled()) log.debug("cache stopped: " + this); + } + + /** + * The cluster formation changed, so determine whether the current cache instance stopped being the coordinator or + * became the coordinator. This method can lead to an optional in memory to cache loader state push, if the + * current cache instance became the coordinator. This method will report any issues that could potentially arise + * from this push. + */ + @ViewChanged + public void viewChange(ViewChangedEvent event) { + boolean tmp = isCoordinator(event.getNewMemberList()); + + if (active != tmp) { + try { + activeStatusChanged(tmp); + } + catch (PushStateException e) { + log.error("exception reported changing cache instance's active status", e); + } + + } + } + } + + /** + * Exception representing any issues that arise from pushing the in-memory state to the cache loader. + */ + public static class PushStateException extends Exception { + private static final long serialVersionUID = 5542893943730200886L; + + public PushStateException(String message, Throwable cause) { + super(message, cause); + } + + public PushStateException(Throwable cause) { + super(cause); + } + } +} \ No newline at end of file Deleted: core/branches/flat/src/main/java/org/horizon/loader_old/SingletonStoreDefaultConfig.java =================================================================== --- core/branches/flat/src/main/java/org/horizon/loader/SingletonStoreDefaultConfig.java 2009-02-10 11:54:44 UTC (rev 7672) +++ core/branches/flat/src/main/java/org/horizon/loader_old/SingletonStoreDefaultConfig.java 2009-02-10 13:51:40 UTC (rev 7674) @@ -1,159 +0,0 @@ -/* - * JBoss, Home of Professional Open Source. - * Copyright 2000 - 2008, Red Hat Middleware LLC, and individual contributors - * as indicated by the @author tags. See the copyright.txt file in the - * distribution for a full listing of individual contributors. - * - * This 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 2.1 of - * the License, or (at your option) any later version. - * - * This software 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 this software; if not, write to the Free - * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA - * 02110-1301 USA, or see the FSF site: http://www.fsf.org. - */ -package org.horizon.loader; - - -import org.horizon.config.CacheLoaderConfig.IndividualCacheLoaderConfig.SingletonStoreConfig; -import org.horizon.config.Dynamic; - -import java.util.Properties; - -/** - * Default singleton store cache loader configuration implementation, which is provided with the default singleton store - * cache loader implementation. It provides with the capability of defining whether to push the in memory state to cache - * loader when becoming the coordinator within a time constraint. - * - * @author <a href="mailto:galder.zamarreno@jboss.com">Galder Zamarreno</a> - * @since 1.0 - */ -public class SingletonStoreDefaultConfig extends SingletonStoreConfig { - private static final long serialVersionUID = -5828927920142613537L; - - /** - * Boolean indicating whether push state when coordinator has been configured. - */ - @Dynamic - private boolean pushStateWhenCoordinator; - - /** - * Number of milliseconds configured defining the time constraint for the state push. - */ - @Dynamic - private int pushStateWhenCoordinatorTimeout; - - /** - * Default constructor that sets default values for singleton store cache loader configuration taking in account that - * this configuration belongs to the default singleton store cache loader implementation. - */ - public SingletonStoreDefaultConfig() { - /* pushStateWhenCoordinator enabled by default with 20 seconds as default timeout*/ - pushStateWhenCoordinator = true; - pushStateWhenCoordinatorTimeout = 20000; - - /* if we got to this point, we know that singleton store must have been enabled */ - setSingletonStoreEnabled(true); - /* and we also know that the configuration was created by SingletonStoreCacheLoader */ - setSingletonStoreClass(SingletonStoreCacheLoader.class.getName()); - } - - /** - * Constructor that sets the assumed values for the default singleton store cache loader implementation and also the - * properties, as per the properties section defined in the XML configuration. - * - * @param base contains properties set in XML configuration - */ - public SingletonStoreDefaultConfig(SingletonStoreConfig base) { - this(); - setSingletonStoreProperties(base.getSingletonStoreProperties()); - } - - @Override - public boolean isSingletonStoreEnabled() { - return true; - } - - @Override - public void setSingletonStoreEnabled(boolean singletonStoreEnabled) { - /* ignore it */ - } - - @Override - public String getSingletonStoreClass() { - return SingletonStoreCacheLoader.class.getName(); - } - - @Override - public void setSingletonStoreClass(String singletonStoreClass) { - /* ignore it */ - } - - /** - * Takes the properties defined and populates the individual instance fields of the default singleton store cache - * loader configuration. - * - * @param props is an instance of Properties containing these values. - */ - @Override - public void setSingletonStoreProperties(Properties props) { - super.setSingletonStoreProperties(props); - String pushStateWhenCoordinatorStr = props.getProperty("pushStateWhenCoordinator"); - if (pushStateWhenCoordinatorStr != null) { - /* if not null, we use the defined value, otherwise we leave it to the default value, true */ - /* note: default value for a null property is false, hence the check */ - setPushStateWhenCoordinator(Boolean.valueOf(pushStateWhenCoordinatorStr)); - } - String pushStateWhenCoordinatorTimeoutStr = props.getProperty("pushStateWhenCoordinatorTimeout"); - if (pushStateWhenCoordinatorTimeoutStr != null) { - setPushStateWhenCoordinatorTimeout(Integer.parseInt(pushStateWhenCoordinatorTimeoutStr)); - } - } - - public boolean isPushStateWhenCoordinator() { - return pushStateWhenCoordinator; - } - - public void setPushStateWhenCoordinator(boolean pushStateWhenCoordinator) { - testImmutability("pushStateWhenCoordinator"); - this.pushStateWhenCoordinator = pushStateWhenCoordinator; - } - - public int getPushStateWhenCoordinatorTimeout() { - return pushStateWhenCoordinatorTimeout; - } - - public void setPushStateWhenCoordinatorTimeout(int pushStateWhenCoordinatorTimeout) { - testImmutability("pushStateWhenCoordinatorTimeout"); - this.pushStateWhenCoordinatorTimeout = pushStateWhenCoordinatorTimeout; - } - - @Override - public boolean equals(Object obj) { - if (this == obj) - return true; - - if (obj instanceof SingletonStoreDefaultConfig) { - SingletonStoreDefaultConfig other = (SingletonStoreDefaultConfig) obj; - return (other.pushStateWhenCoordinator == this.pushStateWhenCoordinator) - && (other.pushStateWhenCoordinatorTimeout == this.pushStateWhenCoordinatorTimeout); - } - return false; - } - - - @Override - public int hashCode() { - int result = 13; - result = 23 * result + (pushStateWhenCoordinator ? 0 : 1); - result = 23 * result + pushStateWhenCoordinatorTimeout; - return result; - } -} Copied: core/branches/flat/src/main/java/org/horizon/loader_old/SingletonStoreDefaultConfig.java (from rev 7673, core/branches/flat/src/main/java/org/horizon/loader/SingletonStoreDefaultConfig.java) =================================================================== --- core/branches/flat/src/main/java/org/horizon/loader_old/SingletonStoreDefaultConfig.java (rev 0) +++ core/branches/flat/src/main/java/org/horizon/loader_old/SingletonStoreDefaultConfig.java 2009-02-10 13:51:40 UTC (rev 7674) @@ -0,0 +1,159 @@ +/* + * JBoss, Home of Professional Open Source. + * Copyright 2000 - 2008, Red Hat Middleware LLC, and individual contributors + * as indicated by the @author tags. See the copyright.txt file in the + * distribution for a full listing of individual contributors. + * + * This 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 2.1 of + * the License, or (at your option) any later version. + * + * This software 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 this software; if not, write to the Free + * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA + * 02110-1301 USA, or see the FSF site: http://www.fsf.org. + */ +package org.horizon.loader; + + +import org.horizon.config.CacheLoaderConfig.IndividualCacheLoaderConfig.SingletonStoreConfig; +import org.horizon.config.Dynamic; + +import java.util.Properties; + +/** + * Default singleton store cache loader configuration implementation, which is provided with the default singleton store + * cache loader implementation. It provides with the capability of defining whether to push the in memory state to cache + * loader when becoming the coordinator within a time constraint. + * + * @author <a href="mailto:galder.zamarreno@jboss.com">Galder Zamarreno</a> + * @since 1.0 + */ +public class SingletonStoreDefaultConfig extends SingletonStoreConfig { + private static final long serialVersionUID = -5828927920142613537L; + + /** + * Boolean indicating whether push state when coordinator has been configured. + */ + @Dynamic + private boolean pushStateWhenCoordinator; + + /** + * Number of milliseconds configured defining the time constraint for the state push. + */ + @Dynamic + private int pushStateWhenCoordinatorTimeout; + + /** + * Default constructor that sets default values for singleton store cache loader configuration taking in account that + * this configuration belongs to the default singleton store cache loader implementation. + */ + public SingletonStoreDefaultConfig() { + /* pushStateWhenCoordinator enabled by default with 20 seconds as default timeout*/ + pushStateWhenCoordinator = true; + pushStateWhenCoordinatorTimeout = 20000; + + /* if we got to this point, we know that singleton store must have been enabled */ + setSingletonStoreEnabled(true); + /* and we also know that the configuration was created by SingletonStoreCacheLoaderOld */ + setSingletonStoreClass(SingletonStoreCacheLoaderOld.class.getName()); + } + + /** + * Constructor that sets the assumed values for the default singleton store cache loader implementation and also the + * properties, as per the properties section defined in the XML configuration. + * + * @param base contains properties set in XML configuration + */ + public SingletonStoreDefaultConfig(SingletonStoreConfig base) { + this(); + setSingletonStoreProperties(base.getSingletonStoreProperties()); + } + + @Override + public boolean isSingletonStoreEnabled() { + return true; + } + + @Override + public void setSingletonStoreEnabled(boolean singletonStoreEnabled) { + /* ignore it */ + } + + @Override + public String getSingletonStoreClass() { + return SingletonStoreCacheLoaderOld.class.getName(); + } + + @Override + public void setSingletonStoreClass(String singletonStoreClass) { + /* ignore it */ + } + + /** + * Takes the properties defined and populates the individual instance fields of the default singleton store cache + * loader configuration. + * + * @param props is an instance of Properties containing these values. + */ + @Override + public void setSingletonStoreProperties(Properties props) { + super.setSingletonStoreProperties(props); + String pushStateWhenCoordinatorStr = props.getProperty("pushStateWhenCoordinator"); + if (pushStateWhenCoordinatorStr != null) { + /* if not null, we use the defined value, otherwise we leave it to the default value, true */ + /* note: default value for a null property is false, hence the check */ + setPushStateWhenCoordinator(Boolean.valueOf(pushStateWhenCoordinatorStr)); + } + String pushStateWhenCoordinatorTimeoutStr = props.getProperty("pushStateWhenCoordinatorTimeout"); + if (pushStateWhenCoordinatorTimeoutStr != null) { + setPushStateWhenCoordinatorTimeout(Integer.parseInt(pushStateWhenCoordinatorTimeoutStr)); + } + } + + public boolean isPushStateWhenCoordinator() { + return pushStateWhenCoordinator; + } + + public void setPushStateWhenCoordinator(boolean pushStateWhenCoordinator) { + testImmutability("pushStateWhenCoordinator"); + this.pushStateWhenCoordinator = pushStateWhenCoordinator; + } + + public int getPushStateWhenCoordinatorTimeout() { + return pushStateWhenCoordinatorTimeout; + } + + public void setPushStateWhenCoordinatorTimeout(int pushStateWhenCoordinatorTimeout) { + testImmutability("pushStateWhenCoordinatorTimeout"); + this.pushStateWhenCoordinatorTimeout = pushStateWhenCoordinatorTimeout; + } + + @Override + public boolean equals(Object obj) { + if (this == obj) + return true; + + if (obj instanceof SingletonStoreDefaultConfig) { + SingletonStoreDefaultConfig other = (SingletonStoreDefaultConfig) obj; + return (other.pushStateWhenCoordinator == this.pushStateWhenCoordinator) + && (other.pushStateWhenCoordinatorTimeout == this.pushStateWhenCoordinatorTimeout); + } + return false; + } + + + @Override + public int hashCode() { + int result = 13; + result = 23 * result + (pushStateWhenCoordinator ? 0 : 1); + result = 23 * result + pushStateWhenCoordinatorTimeout; + return result; + } +} Copied: core/branches/flat/src/main/java/org/horizon/loader_old/StoredEntry.java (from rev 7673, core/branches/flat/src/main/java/org/horizon/loader/StoredEntry.java) =================================================================== --- core/branches/flat/src/main/java/org/horizon/loader_old/StoredEntry.java (rev 0) +++ core/branches/flat/src/main/java/org/horizon/loader_old/StoredEntry.java 2009-02-10 13:51:40 UTC (rev 7674) @@ -0,0 +1,12 @@ +package org.horizon.loader; + +/** + * // TODO: Manik: Document this! + * + * @author Manik Surtani + */ +public class StoredEntry<K, V> { + K key; + V value; + long expiry, created; +} Modified: core/branches/flat/src/main/java/org/horizon/marshall/HorizonMarshaller.java =================================================================== --- core/branches/flat/src/main/java/org/horizon/marshall/HorizonMarshaller.java 2009-02-10 11:58:28 UTC (rev 7673) +++ core/branches/flat/src/main/java/org/horizon/marshall/HorizonMarshaller.java 2009-02-10 13:51:40 UTC (rev 7674) @@ -263,7 +263,7 @@ Thread currentThread = Thread.currentThread(); ClassLoader old = currentThread.getContextClassLoader(); try { - // only do this if we haven't already set a context class loader elsewhere. + // only do this if we haven't already set a context class loader_old elsewhere. if (overrideContextClassloaderOnThread || old == null) currentThread.setContextClassLoader(loader); return unmarshallObject(in, refMap); } Modified: core/branches/flat/src/main/java/org/horizon/statetransfer/DefaultStateTransferManager.java =================================================================== --- core/branches/flat/src/main/java/org/horizon/statetransfer/DefaultStateTransferManager.java 2009-02-10 11:58:28 UTC (rev 7673) +++ core/branches/flat/src/main/java/org/horizon/statetransfer/DefaultStateTransferManager.java 2009-02-10 13:51:40 UTC (rev 7674) @@ -24,7 +24,7 @@ import org.horizon.config.Configuration; import org.horizon.factories.annotations.Inject; import org.horizon.factories.annotations.Start; -import org.horizon.loader.CacheLoaderManager; +import org.horizon.loader_old.CacheLoaderManager; import org.horizon.logging.Log; import org.horizon.logging.LogFactory; import org.horizon.marshall.Marshaller; Modified: core/branches/flat/src/main/java/org/horizon/util/FileLookup.java =================================================================== --- core/branches/flat/src/main/java/org/horizon/util/FileLookup.java 2009-02-10 11:58:28 UTC (rev 7673) +++ core/branches/flat/src/main/java/org/horizon/util/FileLookup.java 2009-02-10 13:51:40 UTC (rev 7674) @@ -67,7 +67,7 @@ ClassLoader cl = Thread.currentThread().getContextClassLoader(); InputStream is = cl == null ? null : cl.getResourceAsStream(filename); if (is == null) { - // check system class loader + // check system class loader_old is = getClass().getClassLoader().getResourceAsStream(filename); } return is; @@ -77,7 +77,7 @@ ClassLoader cl = Thread.currentThread().getContextClassLoader(); URL u = cl == null ? null : cl.getResource(filename); if (u == null) { - // check system class loader + // check system class loader_old u = getClass().getClassLoader().getResource(filename); } if (u == null) { Modified: core/branches/flat/src/main/resources/config-samples/all.xml =================================================================== --- core/branches/flat/src/main/resources/config-samples/all.xml 2009-02-10 11:58:28 UTC (rev 7673) +++ core/branches/flat/src/main/resources/config-samples/all.xml 2009-02-10 13:51:40 UTC (rev 7674) @@ -129,14 +129,14 @@ Cache loaders. If passivation is enabled, state is offloaded to the cache loaders ONLY when evicted. Similarly, when the state - is accessed again, it is removed from the cache loader and loaded into memory. + is accessed again, it is removed from the cache loader_old and loaded into memory. - Otherwise, state is always maintained in the cache loader as well as in memory. + Otherwise, state is always maintained in the cache loader_old as well as in memory. - Set 'shared' to true if all instances in the cluster use the same cache loader instance, e.g., are talking to the + Set 'shared' to true if all instances in the cluster use the same cache loader_old instance, e.g., are talking to the same database. - If "preload" is true, all keys are loaded from the cache loader into memory upon starting the cache. + If "preload" is true, all keys are loaded from the cache loader_old into memory upon starting the cache. --> <loaders passivation="false" shared="false" preload="true"> Modified: core/branches/flat/src/test/java/org/horizon/api/tree/NodeMoveAPITest.java =================================================================== --- core/branches/flat/src/test/java/org/horizon/api/tree/NodeMoveAPITest.java 2009-02-10 11:58:28 UTC (rev 7673) +++ core/branches/flat/src/test/java/org/horizon/api/tree/NodeMoveAPITest.java 2009-02-10 13:51:40 UTC (rev 7674) @@ -301,13 +301,13 @@ cache.getConfiguration().setCacheLoaderConfig(getSingleCacheLoaderConfig(pasv, "/", DummyInMemoryCacheLoader.class.getName(), "debug=true", false, false, false, false)); cache.start(); -DummyInMemoryCacheLoader loader = (DummyInMemoryCacheLoader) cache.getCacheLoaderManager().getCacheLoader(); +DummyInMemoryCacheLoader loader_old = (DummyInMemoryCacheLoader) cache.getCacheLoaderManager().getCacheLoader(); rootNode.put("key", "value"); if (!pasv) { -Map m = loader.get(Fqn.ROOT); +Map m = loader_old.get(Fqn.ROOT); assertNotNull("Should not be null", m); assertEquals("value", m.get("key")); } @@ -359,16 +359,16 @@ if (pasv) cache.evict(Fqn.ROOT, true); -//now inspect the loader. -assertEquals(vA, loader.get(nodeA.getFqn()).get(k)); -assertEquals(vB, loader.get(nodeB.getFqn()).get(k)); -assertEquals(vC, loader.get(nodeC.getFqn()).get(k)); -assertEquals(vD, loader.get(nodeD.getFqn()).get(k)); -assertEquals(vE, loader.get(nodeE.getFqn()).get(k)); +//now inspect the loader_old. +assertEquals(vA, loader_old.get(nodeA.getFqn()).get(k)); +assertEquals(vB, loader_old.get(nodeB.getFqn()).get(k)); +assertEquals(vC, loader_old.get(nodeC.getFqn()).get(k)); +assertEquals(vD, loader_old.get(nodeD.getFqn()).get(k)); +assertEquals(vE, loader_old.get(nodeE.getFqn()).get(k)); -assertNull(loader.get(old_C)); -assertNull(loader.get(old_D)); -assertNull(loader.get(old_E)); +assertNull(loader_old.get(old_C)); +assertNull(loader_old.get(old_D)); +assertNull(loader_old.get(old_E)); } */ Modified: core/branches/flat/src/test/java/org/horizon/manager/CacheManagerComponentRegistryTest.java =================================================================== --- core/branches/flat/src/test/java/org/horizon/manager/CacheManagerComponentRegistryTest.java 2009-02-10 11:58:28 UTC (rev 7673) +++ core/branches/flat/src/test/java/org/horizon/manager/CacheManagerComponentRegistryTest.java 2009-02-10 13:51:40 UTC (rev 7674) @@ -6,8 +6,8 @@ import org.horizon.config.GlobalConfiguration; import org.horizon.interceptors.BatchingInterceptor; import org.horizon.interceptors.InterceptorChain; -import org.horizon.loader.CacheLoaderManager; -import org.horizon.loader.FileCacheLoaderConfig; +import org.horizon.loader_old.CacheLoaderManager; +import org.horizon.loader_old.FileCacheLoaderConfig; import org.horizon.remoting.RPCManager; import org.horizon.transaction.DummyTransactionManager; import org.horizon.transaction.DummyTransactionManagerLookup; @@ -58,7 +58,7 @@ public void testForceUnsharedComponents() throws NamedCacheNotFoundException { CacheLoaderConfig clc = new CacheLoaderConfig(); - // TODO change this to use a dummy in memory cache loader instead!! + // TODO change this to use a dummy in memory cache loader_old instead!! FileCacheLoaderConfig fc = new FileCacheLoaderConfig(); fc.setLocation("/tmp"); clc.addIndividualCacheLoaderConfig(fc);

15 years, 10 months

1
0
0 / 0

JBoss Cache SVN: r7673 - in core/branches/flat/src/main: java/org/horizon/config and 7 other directories.

by jbosscache-commits＠lists.jboss.org

Author: manik.surtani(a)jboss.com Date: 2009-02-10 06:58:28 -0500 (Tue, 10 Feb 2009) New Revision: 7673 Added: core/branches/flat/src/main/java/org/horizon/loader/AbstractCacheLoaderOld.java core/branches/flat/src/main/java/org/horizon/loader/AbstractDelegatingCacheLoaderOld.java core/branches/flat/src/main/java/org/horizon/loader/AsyncCacheLoaderOld.java core/branches/flat/src/main/java/org/horizon/loader/CacheLoader.java core/branches/flat/src/main/java/org/horizon/loader/CacheLoaderOld.java core/branches/flat/src/main/java/org/horizon/loader/CacheStore.java core/branches/flat/src/main/java/org/horizon/loader/ChainingCacheLoaderOld.java core/branches/flat/src/main/java/org/horizon/loader/ClusteredCacheLoaderOld.java core/branches/flat/src/main/java/org/horizon/loader/FileCacheLoaderOld.java core/branches/flat/src/main/java/org/horizon/loader/ReadOnlyDelegatingCacheLoaderOld.java core/branches/flat/src/main/java/org/horizon/loader/SingletonStoreCacheLoaderOld.java core/branches/flat/src/main/java/org/horizon/loader/StoredEntry.java Removed: core/branches/flat/src/main/java/org/horizon/loader/AbstractCacheLoader.java core/branches/flat/src/main/java/org/horizon/loader/AbstractDelegatingCacheLoader.java core/branches/flat/src/main/java/org/horizon/loader/AsyncCacheLoader.java core/branches/flat/src/main/java/org/horizon/loader/CacheLoader.java core/branches/flat/src/main/java/org/horizon/loader/ChainingCacheLoader.java core/branches/flat/src/main/java/org/horizon/loader/ClusteredCacheLoader.java core/branches/flat/src/main/java/org/horizon/loader/FileCacheLoader.java core/branches/flat/src/main/java/org/horizon/loader/ReadOnlyDelegatingCacheLoader.java core/branches/flat/src/main/java/org/horizon/loader/SingletonStoreCacheLoader.java Modified: core/branches/flat/src/main/docbook/userguide/en/modules/basic_api.xml core/branches/flat/src/main/java/org/horizon/config/CacheLoaderConfig.java core/branches/flat/src/main/java/org/horizon/container/UnsortedDataContainer.java core/branches/flat/src/main/java/org/horizon/factories/InterceptorChainFactory.java core/branches/flat/src/main/java/org/horizon/interceptors/CacheLoaderInterceptor.java core/branches/flat/src/main/java/org/horizon/interceptors/CacheStoreInterceptor.java core/branches/flat/src/main/java/org/horizon/loader/AsyncCacheLoaderConfig.java core/branches/flat/src/main/java/org/horizon/loader/CacheLoaderManager.java core/branches/flat/src/main/java/org/horizon/loader/ClusteredCacheLoaderConfig.java core/branches/flat/src/main/java/org/horizon/loader/FileCacheLoaderConfig.java core/branches/flat/src/main/java/org/horizon/loader/SingletonStoreDefaultConfig.java core/branches/flat/src/main/java/org/horizon/lock/StripedLock.java core/branches/flat/src/main/java/org/horizon/notifications/cachelistener/annotation/CacheEntryLoaded.java core/branches/flat/src/main/resources/config-samples/all.xml Log: Loaders - work in progress Modified: core/branches/flat/src/main/docbook/userguide/en/modules/basic_api.xml =================================================================== --- core/branches/flat/src/main/docbook/userguide/en/modules/basic_api.xml 2009-02-10 11:54:44 UTC (rev 7672) +++ core/branches/flat/src/main/docbook/userguide/en/modules/basic_api.xml 2009-02-10 11:58:28 UTC (rev 7673) @@ -664,7 +664,7 @@ </footnote> </listitem> <listitem> - <literal>org.horizon.loader.ClusteredCacheLoader</literal> + <literal>org.horizon.loader.ClusteredCacheLoaderOld</literal> - used as a "read-only" CacheLoader, where other nodes in the cluster are queried for state. </listitem> </itemizedlist> Modified: core/branches/flat/src/main/java/org/horizon/config/CacheLoaderConfig.java =================================================================== --- core/branches/flat/src/main/java/org/horizon/config/CacheLoaderConfig.java 2009-02-10 11:54:44 UTC (rev 7672) +++ core/branches/flat/src/main/java/org/horizon/config/CacheLoaderConfig.java 2009-02-10 11:58:28 UTC (rev 7673) @@ -21,8 +21,8 @@ */ package org.horizon.config; -import org.horizon.loader.CacheLoader; -import org.horizon.loader.SingletonStoreCacheLoader; +import org.horizon.loader.CacheLoaderOld; +import org.horizon.loader.SingletonStoreCacheLoaderOld; import org.horizon.util.Util; import java.util.ArrayList; @@ -168,7 +168,7 @@ private boolean purgeOnStartup; private SingletonStoreConfig singletonStoreConfig; - private transient CacheLoader<Object, Object> cacheLoader; + private transient CacheLoaderOld<Object, Object> cacheLoader; protected void populateFromBaseConfig(IndividualCacheLoaderConfig base) { if (base != null) { @@ -233,7 +233,7 @@ * @return cache loader, if one exists * @since 1.0 */ - public CacheLoader<Object, Object> getCacheLoader() { + public CacheLoaderOld<Object, Object> getCacheLoader() { return cacheLoader; } @@ -244,7 +244,7 @@ * @param cacheLoader cacheLoader to set * @since 1.0 */ - public void setCacheLoader(CacheLoader<Object, Object> cacheLoader) { + public void setCacheLoader(CacheLoaderOld<Object, Object> cacheLoader) { this.cacheLoader = cacheLoader; } @@ -320,7 +320,7 @@ public SingletonStoreConfig() { // default value - className = SingletonStoreCacheLoader.class.getName(); + className = SingletonStoreCacheLoaderOld.class.getName(); } public boolean isSingletonStoreEnabled() { Modified: core/branches/flat/src/main/java/org/horizon/container/UnsortedDataContainer.java =================================================================== --- core/branches/flat/src/main/java/org/horizon/container/UnsortedDataContainer.java 2009-02-10 11:54:44 UTC (rev 7672) +++ core/branches/flat/src/main/java/org/horizon/container/UnsortedDataContainer.java 2009-02-10 11:58:28 UTC (rev 7673) @@ -22,8 +22,8 @@ package org.horizon.container; import org.horizon.factories.annotations.Inject; -import org.horizon.loader.CacheLoader; import org.horizon.loader.CacheLoaderManager; +import org.horizon.loader.CacheLoaderOld; import java.util.AbstractSet; import java.util.ArrayList; @@ -48,7 +48,7 @@ final ConcurrentMap<K, ExpirableCachedValue<V>> expirableData = new ConcurrentHashMap<K, ExpirableCachedValue<V>>(); private static final Object NULL = new Object(); private CacheLoaderManager clm; - private CacheLoader cacheLoader; + private CacheLoaderOld cacheLoader; @Inject public void injectDependencies(CacheLoaderManager clm) { Modified: core/branches/flat/src/main/java/org/horizon/factories/InterceptorChainFactory.java =================================================================== --- core/branches/flat/src/main/java/org/horizon/factories/InterceptorChainFactory.java 2009-02-10 11:54:44 UTC (rev 7672) +++ core/branches/flat/src/main/java/org/horizon/factories/InterceptorChainFactory.java 2009-02-10 11:58:28 UTC (rev 7673) @@ -98,7 +98,7 @@ //Nothing... } - // TODO: Uncomment once the CacheLoader has been moved to Starobrno + // TODO: Uncomment once the CacheLoaderOld has been moved to Starobrno if (configuration.isUsingCacheLoaders()) { // if (configuration.getCacheLoaderConfig().isPassivation()) // { @@ -111,7 +111,7 @@ } interceptorChain.appendIntereceptor(createInterceptor(LockingInterceptor.class)); - // TODO: Uncomment once the CacheLoader has been moved to Starobrno + // TODO: Uncomment once the CacheLoaderOld has been moved to Starobrno if (configuration.isUsingCacheLoaders()) { // if (configuration.getCacheLoaderConfig().isPassivation()) // { Modified: core/branches/flat/src/main/java/org/horizon/interceptors/CacheLoaderInterceptor.java =================================================================== --- core/branches/flat/src/main/java/org/horizon/interceptors/CacheLoaderInterceptor.java 2009-02-10 11:54:44 UTC (rev 7672) +++ core/branches/flat/src/main/java/org/horizon/interceptors/CacheLoaderInterceptor.java 2009-02-10 11:58:28 UTC (rev 7673) @@ -35,8 +35,8 @@ import org.horizon.factories.annotations.Inject; import org.horizon.factories.annotations.Start; import org.horizon.interceptors.base.JmxStatsCommandInterceptor; -import org.horizon.loader.CacheLoader; import org.horizon.loader.CacheLoaderManager; +import org.horizon.loader.CacheLoaderOld; import org.horizon.notifications.cachelistener.CacheNotifier; import org.horizon.transaction.TransactionTable; @@ -55,7 +55,7 @@ private CacheLoaderManager clm; protected TransactionTable txTable = null; - protected CacheLoader<Object, Object> loader; + protected CacheLoaderOld<Object, Object> loader; protected DataContainer<Object, Object> dataContainer; protected CacheNotifier notifier; protected EntryFactory entryFactory; Modified: core/branches/flat/src/main/java/org/horizon/interceptors/CacheStoreInterceptor.java =================================================================== --- core/branches/flat/src/main/java/org/horizon/interceptors/CacheStoreInterceptor.java 2009-02-10 11:54:44 UTC (rev 7672) +++ core/branches/flat/src/main/java/org/horizon/interceptors/CacheStoreInterceptor.java 2009-02-10 11:58:28 UTC (rev 7673) @@ -39,8 +39,8 @@ import org.horizon.invocation.Options; import org.horizon.jmx.annotations.ManagedAttribute; import org.horizon.jmx.annotations.ManagedOperation; -import org.horizon.loader.CacheLoader; import org.horizon.loader.CacheLoaderManager; +import org.horizon.loader.CacheLoaderOld; import org.horizon.loader.Modification; import org.horizon.loader.Modification.ModificationType; import org.horizon.logging.LogFactory; @@ -69,7 +69,7 @@ private HashMap<GlobalTransaction, Integer> txStores = new HashMap<GlobalTransaction, Integer>(); private Map<GlobalTransaction, Set<Object>> preparingTxs = new ConcurrentHashMap<GlobalTransaction, Set<Object>>(); private long cacheStores = 0; - CacheLoader<Object, Object> loader; + CacheLoaderOld<Object, Object> loader; private CacheLoaderManager loaderManager; private boolean statsEnabled; @@ -80,7 +80,7 @@ @Inject protected void init(CacheLoaderManager loaderManager, TransactionManager txManager, CacheLoaderConfig clConfig) { - // never inject a CacheLoader at this stage - only a CacheLoaderManager, since the CacheLoaderManager only creates a CacheLoader instance when it @Starts. + // never inject a CacheLoaderOld at this stage - only a CacheLoaderManager, since the CacheLoaderManager only creates a CacheLoaderOld instance when it @Starts. this.loaderManager = loaderManager; this.loaderConfig = clConfig; txMgr = txManager; @@ -88,7 +88,7 @@ @Start protected void start() { - // this should only happen after the CacheLoaderManager has started, since the CacheLoaderManager only creates the CacheLoader instance in its @Start method. + // this should only happen after the CacheLoaderManager has started, since the CacheLoaderManager only creates the CacheLoaderOld instance in its @Start method. loader = loaderManager.getCacheLoader(); this.setStatisticsEnabled(configuration.isExposeManagementStatistics()); } Deleted: core/branches/flat/src/main/java/org/horizon/loader/AbstractCacheLoader.java =================================================================== --- core/branches/flat/src/main/java/org/horizon/loader/AbstractCacheLoader.java 2009-02-10 11:54:44 UTC (rev 7672) +++ core/branches/flat/src/main/java/org/horizon/loader/AbstractCacheLoader.java 2009-02-10 11:58:28 UTC (rev 7673) @@ -1,167 +0,0 @@ -/* - * JBoss, Home of Professional Open Source. - * Copyright 2000 - 2008, Red Hat Middleware LLC, and individual contributors - * as indicated by the @author tags. See the copyright.txt file in the - * distribution for a full listing of individual contributors. - * - * This 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 2.1 of - * the License, or (at your option) any later version. - * - * This software 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 this software; if not, write to the Free - * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA - * 02110-1301 USA, or see the FSF site: http://www.fsf.org. - */ -package org.horizon.loader; - -import org.horizon.Cache; -import org.horizon.CacheException; -import org.horizon.logging.Log; -import org.horizon.logging.LogFactory; -import org.horizon.marshall.EntryData; -import org.horizon.marshall.EntryDataExceptionMarker; -import org.horizon.marshall.EntryDataMarker; -import org.horizon.marshall.Marshaller; - -import java.io.ObjectInputStream; -import java.io.ObjectOutputStream; -import java.util.List; -import java.util.Map; -import java.util.concurrent.ConcurrentHashMap; - -/** - * A convenience abstract implementation of a {@link CacheLoader}. Specific methods to note are methods like {@link - * #storeState(Fqn,java.io.ObjectInputStream)}, {@link #loadState(Fqn,java.io.ObjectOutputStream)}, {@link - * #storeEntireState(java.io.ObjectInputStream)} and {@link #loadEntireState(java.io.ObjectOutputStream)} which have - * convenience implementations here. - * - * Also useful to note is the implementation of {@link #put(java.util.List)}, used during the prepare phase of a - * transaction. - * - * - * @author <a href="mailto:manik@jboss.org">Manik Surtani (manik(a)jboss.org)</a> - * @author <a href="mailto:galder.zamarreno@jboss.com">Galder Zamarreno</a> - * @since 1.0 - */ -public abstract class AbstractCacheLoader<K, V> implements CacheLoader<K, V> { - protected Cache<K, V> cache; - private static final Log log = LogFactory.getLog(AbstractCacheLoader.class); - private static final boolean trace = log.isTraceEnabled(); - /** - * HashMap<Object,List<Modification>>. List of open transactions. Note that this is purely transient, as we don't use - * a log, recovery is not available - */ - protected Map<Object, List<Modification>> transactions = new ConcurrentHashMap<Object, List<Modification>>(); - - public void storeEntireState(ObjectInputStream in) { - // store new state - Object objectFromStream = null; - // TODO fix me -// try { -// objectFromStream = cache.getMarshaller().objectFromObjectStream(in); -// } -// catch (Exception e) { -// throw new CacheException(e.getMessage(), e); -// } - - if (objectFromStream instanceof EntryDataMarker) { - // no persistent state sent across; return? - if (trace) log.trace("Empty persistent stream?"); - return; - } - if (objectFromStream instanceof EntryDataExceptionMarker) { - EntryDataExceptionMarker ndem = (EntryDataExceptionMarker) objectFromStream; - throw new CacheException("State provider cacheloader at node " + ndem.getKey() - + " threw exception during loadState (see Caused by)", ndem.getCause()); - } - - List<EntryData<K, V>> data = (List<EntryData<K, V>>) objectFromStream; - for (EntryData<K, V> datem : data) { - put(datem.getKey(), datem.getValue()); - } - } - - public void loadEntireState(ObjectOutputStream os) { - List<EntryData<K, V>> list = getAllEntries(); - if (trace) log.trace("Loading state of " + list.size() + " nodes into stream"); - // TODO fix me -// try { -// cache.getMarshaller().objectToObjectStream(list, os); -// } -// catch (Exception e) { -// throw new CacheException(e.getMessage(), e); -// } - } - - - public void setCache(Cache<K, V> c) { - this.cache = c; - } - - public void put(List<Modification> modifications) { - for (Modification m : modifications) { - switch (m.getType()) { - case PUT: - put((K) m.getKey(), (V) m.getValue()); - break; - case REMOVE: - remove(m.getKey()); - break; - case CLEAR: - clear(); - break; - default: - throw new CacheException("Unknown modification " + m.getType()); - } - } - } - - protected Marshaller getMarshaller() { - return null; - // todo fix me -// return cache.getMarshaller(); - } - - // empty implementations for loaders that do not wish to implement lifecycle. - public void create() { - } - - public void start() { - } - - public void stop() { - } - - public void destroy() { - } - - // Adds simple transactional capabilities to cache loaders that are inherently non-transactional. If your cache loader implementation - // is tansactional though, then override these. - - public void prepare(Object tx, List<Modification> modifications, boolean one_phase) { - if (one_phase) { - put(modifications); - } else { - transactions.put(tx, modifications); - } - } - - public void commit(Object tx) { - List<Modification> modifications = transactions.remove(tx); - if (modifications == null) { - throw new CacheException("transaction " + tx + " not found in transaction table"); - } - put(modifications); - } - - public void rollback(Object tx) { - transactions.remove(tx); - } -} Copied: core/branches/flat/src/main/java/org/horizon/loader/AbstractCacheLoaderOld.java (from rev 7669, core/branches/flat/src/main/java/org/horizon/loader/AbstractCacheLoader.java) =================================================================== --- core/branches/flat/src/main/java/org/horizon/loader/AbstractCacheLoaderOld.java (rev 0) +++ core/branches/flat/src/main/java/org/horizon/loader/AbstractCacheLoaderOld.java 2009-02-10 11:58:28 UTC (rev 7673) @@ -0,0 +1,167 @@ +/* + * JBoss, Home of Professional Open Source. + * Copyright 2000 - 2008, Red Hat Middleware LLC, and individual contributors + * as indicated by the @author tags. See the copyright.txt file in the + * distribution for a full listing of individual contributors. + * + * This 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 2.1 of + * the License, or (at your option) any later version. + * + * This software 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 this software; if not, write to the Free + * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA + * 02110-1301 USA, or see the FSF site: http://www.fsf.org. + */ +package org.horizon.loader; + +import org.horizon.Cache; +import org.horizon.CacheException; +import org.horizon.logging.Log; +import org.horizon.logging.LogFactory; +import org.horizon.marshall.EntryData; +import org.horizon.marshall.EntryDataExceptionMarker; +import org.horizon.marshall.EntryDataMarker; +import org.horizon.marshall.Marshaller; + +import java.io.ObjectInputStream; +import java.io.ObjectOutputStream; +import java.util.List; +import java.util.Map; +import java.util.concurrent.ConcurrentHashMap; + +/** + * A convenience abstract implementation of a {@link CacheLoaderOld}. Specific methods to note are methods like {@link + * #storeState(Fqn,java.io.ObjectInputStream)}, {@link #loadState(Fqn,java.io.ObjectOutputStream)}, {@link + * #storeEntireState(java.io.ObjectInputStream)} and {@link #loadEntireState(java.io.ObjectOutputStream)} which have + * convenience implementations here. + * + * Also useful to note is the implementation of {@link #put(java.util.List)}, used during the prepare phase of a + * transaction. + * + * + * @author <a href="mailto:manik@jboss.org">Manik Surtani (manik(a)jboss.org)</a> + * @author <a href="mailto:galder.zamarreno@jboss.com">Galder Zamarreno</a> + * @since 1.0 + */ +public abstract class AbstractCacheLoaderOld<K, V> implements CacheLoaderOld<K, V> { + protected Cache<K, V> cache; + private static final Log log = LogFactory.getLog(AbstractCacheLoaderOld.class); + private static final boolean trace = log.isTraceEnabled(); + /** + * HashMap<Object,List<Modification>>. List of open transactions. Note that this is purely transient, as we don't use + * a log, recovery is not available + */ + protected Map<Object, List<Modification>> transactions = new ConcurrentHashMap<Object, List<Modification>>(); + + public void storeEntireState(ObjectInputStream in) { + // store new state + Object objectFromStream = null; + // TODO fix me +// try { +// objectFromStream = cache.getMarshaller().objectFromObjectStream(in); +// } +// catch (Exception e) { +// throw new CacheException(e.getMessage(), e); +// } + + if (objectFromStream instanceof EntryDataMarker) { + // no persistent state sent across; return? + if (trace) log.trace("Empty persistent stream?"); + return; + } + if (objectFromStream instanceof EntryDataExceptionMarker) { + EntryDataExceptionMarker ndem = (EntryDataExceptionMarker) objectFromStream; + throw new CacheException("State provider cacheloader at node " + ndem.getKey() + + " threw exception during loadState (see Caused by)", ndem.getCause()); + } + + List<EntryData<K, V>> data = (List<EntryData<K, V>>) objectFromStream; + for (EntryData<K, V> datem : data) { + put(datem.getKey(), datem.getValue()); + } + } + + public void loadEntireState(ObjectOutputStream os) { + List<EntryData<K, V>> list = getAllEntries(); + if (trace) log.trace("Loading state of " + list.size() + " nodes into stream"); + // TODO fix me +// try { +// cache.getMarshaller().objectToObjectStream(list, os); +// } +// catch (Exception e) { +// throw new CacheException(e.getMessage(), e); +// } + } + + + public void setCache(Cache<K, V> c) { + this.cache = c; + } + + public void put(List<Modification> modifications) { + for (Modification m : modifications) { + switch (m.getType()) { + case PUT: + put((K) m.getKey(), (V) m.getValue()); + break; + case REMOVE: + remove(m.getKey()); + break; + case CLEAR: + clear(); + break; + default: + throw new CacheException("Unknown modification " + m.getType()); + } + } + } + + protected Marshaller getMarshaller() { + return null; + // todo fix me +// return cache.getMarshaller(); + } + + // empty implementations for loaders that do not wish to implement lifecycle. + public void create() { + } + + public void start() { + } + + public void stop() { + } + + public void destroy() { + } + + // Adds simple transactional capabilities to cache loaders that are inherently non-transactional. If your cache loader implementation + // is tansactional though, then override these. + + public void prepare(Object tx, List<Modification> modifications, boolean one_phase) { + if (one_phase) { + put(modifications); + } else { + transactions.put(tx, modifications); + } + } + + public void commit(Object tx) { + List<Modification> modifications = transactions.remove(tx); + if (modifications == null) { + throw new CacheException("transaction " + tx + " not found in transaction table"); + } + put(modifications); + } + + public void rollback(Object tx) { + transactions.remove(tx); + } +} Property changes on: core/branches/flat/src/main/java/org/horizon/loader/AbstractCacheLoaderOld.java ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Deleted: core/branches/flat/src/main/java/org/horizon/loader/AbstractDelegatingCacheLoader.java =================================================================== --- core/branches/flat/src/main/java/org/horizon/loader/AbstractDelegatingCacheLoader.java 2009-02-10 11:54:44 UTC (rev 7672) +++ core/branches/flat/src/main/java/org/horizon/loader/AbstractDelegatingCacheLoader.java 2009-02-10 11:58:28 UTC (rev 7673) @@ -1,133 +0,0 @@ -/* - * JBoss, Home of Professional Open Source. - * Copyright 2000 - 2008, Red Hat Middleware LLC, and individual contributors - * as indicated by the @author tags. See the copyright.txt file in the - * distribution for a full listing of individual contributors. - * - * This 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 2.1 of - * the License, or (at your option) any later version. - * - * This software 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 this software; if not, write to the Free - * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA - * 02110-1301 USA, or see the FSF site: http://www.fsf.org. - */ -package org.horizon.loader; - -import org.horizon.Cache; -import org.horizon.config.CacheLoaderConfig.IndividualCacheLoaderConfig; -import org.horizon.marshall.EntryData; - -import java.io.ObjectInputStream; -import java.io.ObjectOutputStream; -import java.util.List; - -/** - * AbstractDelegatingCacheLoader provides standard functionality for a cache loader that simply delegates each operation - * defined in the cache loader interface to the underlying cache loader, basically acting as a proxy to the real cache - * loader. - * - * Any cache loader implementation that extends this class would be required to override any of the methods in order to - * provide a different or added behaviour. - * - * @author <a href="mailto:galder.zamarreno@jboss.com">Galder Zamarreno</a> - * @since 1.0 - */ -public abstract class AbstractDelegatingCacheLoader<K, V> extends AbstractCacheLoader<K, V> { - private CacheLoader<K, V> cacheLoader; - - public AbstractDelegatingCacheLoader(CacheLoader<K, V> cacheLoader) { - this.cacheLoader = cacheLoader; - } - - public void clear() { - cacheLoader.clear(); - } - - public void commit(Object tx) { - cacheLoader.commit(tx); - } - - public void create() { - cacheLoader.create(); - } - - public void destroy() { - cacheLoader.destroy(); - } - - public boolean exists(Object key) { - return cacheLoader.exists(key); - } - - public V get(Object key) { - return cacheLoader.get(key); - } - - public List<EntryData<K, V>> getAllEntries() { - return cacheLoader.getAllEntries(); - } - - public IndividualCacheLoaderConfig getConfig() { - return cacheLoader.getConfig(); - } - - public void loadEntireState(ObjectOutputStream os) { - cacheLoader.loadEntireState(os); - } - - public void prepare(Object tx, List<Modification> modifications, boolean one_phase) { - cacheLoader.prepare(tx, modifications, one_phase); - } - - public V put(K key, V value) { - return cacheLoader.put(key, value); - } - - public void put(List<Modification> modifications) { - cacheLoader.put(modifications); - } - - public V remove(Object key) { - return cacheLoader.remove(key); - } - - public void rollback(Object tx) { - cacheLoader.rollback(tx); - } - - public void setCache(Cache<K, V> c) { - cacheLoader.setCache(c); - } - - public void setConfig(IndividualCacheLoaderConfig config) { - cacheLoader.setConfig(config); - } - - public void start() { - cacheLoader.start(); - } - - public void stop() { - cacheLoader.stop(); - } - - public void storeEntireState(ObjectInputStream is) { - cacheLoader.storeEntireState(is); - } - - public CacheLoader<K, V> getCacheLoader() { - return cacheLoader; - } - - public void setCacheLoader(CacheLoader<K, V> cacheLoader) { - this.cacheLoader = cacheLoader; - } -} Copied: core/branches/flat/src/main/java/org/horizon/loader/AbstractDelegatingCacheLoaderOld.java (from rev 7669, core/branches/flat/src/main/java/org/horizon/loader/AbstractDelegatingCacheLoader.java) =================================================================== --- core/branches/flat/src/main/java/org/horizon/loader/AbstractDelegatingCacheLoaderOld.java (rev 0) +++ core/branches/flat/src/main/java/org/horizon/loader/AbstractDelegatingCacheLoaderOld.java 2009-02-10 11:58:28 UTC (rev 7673) @@ -0,0 +1,133 @@ +/* + * JBoss, Home of Professional Open Source. + * Copyright 2000 - 2008, Red Hat Middleware LLC, and individual contributors + * as indicated by the @author tags. See the copyright.txt file in the + * distribution for a full listing of individual contributors. + * + * This 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 2.1 of + * the License, or (at your option) any later version. + * + * This software 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 this software; if not, write to the Free + * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA + * 02110-1301 USA, or see the FSF site: http://www.fsf.org. + */ +package org.horizon.loader; + +import org.horizon.Cache; +import org.horizon.config.CacheLoaderConfig.IndividualCacheLoaderConfig; +import org.horizon.marshall.EntryData; + +import java.io.ObjectInputStream; +import java.io.ObjectOutputStream; +import java.util.List; + +/** + * AbstractDelegatingCacheLoader provides standard functionality for a cache loader that simply delegates each operation + * defined in the cache loader interface to the underlying cache loader, basically acting as a proxy to the real cache + * loader. + * + * Any cache loader implementation that extends this class would be required to override any of the methods in order to + * provide a different or added behaviour. + * + * @author <a href="mailto:galder.zamarreno@jboss.com">Galder Zamarreno</a> + * @since 1.0 + */ +public abstract class AbstractDelegatingCacheLoaderOld<K, V> extends AbstractCacheLoaderOld<K, V> { + private CacheLoaderOld<K, V> cacheLoader; + + public AbstractDelegatingCacheLoaderOld(CacheLoaderOld<K, V> cacheLoader) { + this.cacheLoader = cacheLoader; + } + + public void clear() { + cacheLoader.clear(); + } + + public void commit(Object tx) { + cacheLoader.commit(tx); + } + + public void create() { + cacheLoader.create(); + } + + public void destroy() { + cacheLoader.destroy(); + } + + public boolean exists(Object key) { + return cacheLoader.exists(key); + } + + public V get(Object key) { + return cacheLoader.get(key); + } + + public List<EntryData<K, V>> getAllEntries() { + return cacheLoader.getAllEntries(); + } + + public IndividualCacheLoaderConfig getConfig() { + return cacheLoader.getConfig(); + } + + public void loadEntireState(ObjectOutputStream os) { + cacheLoader.loadEntireState(os); + } + + public void prepare(Object tx, List<Modification> modifications, boolean one_phase) { + cacheLoader.prepare(tx, modifications, one_phase); + } + + public V put(K key, V value) { + return cacheLoader.put(key, value); + } + + public void put(List<Modification> modifications) { + cacheLoader.put(modifications); + } + + public V remove(Object key) { + return cacheLoader.remove(key); + } + + public void rollback(Object tx) { + cacheLoader.rollback(tx); + } + + public void setCache(Cache<K, V> c) { + cacheLoader.setCache(c); + } + + public void setConfig(IndividualCacheLoaderConfig config) { + cacheLoader.setConfig(config); + } + + public void start() { + cacheLoader.start(); + } + + public void stop() { + cacheLoader.stop(); + } + + public void storeEntireState(ObjectInputStream is) { + cacheLoader.storeEntireState(is); + } + + public CacheLoaderOld<K, V> getCacheLoader() { + return cacheLoader; + } + + public void setCacheLoader(CacheLoaderOld<K, V> cacheLoader) { + this.cacheLoader = cacheLoader; + } +} Property changes on: core/branches/flat/src/main/java/org/horizon/loader/AbstractDelegatingCacheLoaderOld.java ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Deleted: core/branches/flat/src/main/java/org/horizon/loader/AsyncCacheLoader.java =================================================================== --- core/branches/flat/src/main/java/org/horizon/loader/AsyncCacheLoader.java 2009-02-10 11:54:44 UTC (rev 7672) +++ core/branches/flat/src/main/java/org/horizon/loader/AsyncCacheLoader.java 2009-02-10 11:58:28 UTC (rev 7673) @@ -1,269 +0,0 @@ -/* - * JBoss, Home of Professional Open Source. - * Copyright 2000 - 2008, Red Hat Middleware LLC, and individual contributors - * as indicated by the @author tags. See the copyright.txt file in the - * distribution for a full listing of individual contributors. - * - * This 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 2.1 of - * the License, or (at your option) any later version. - * - * This software 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 this software; if not, write to the Free - * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA - * 02110-1301 USA, or see the FSF site: http://www.fsf.org. - */ -package org.horizon.loader; - -import org.horizon.CacheException; -import org.horizon.config.CacheLoaderConfig.IndividualCacheLoaderConfig; -import org.horizon.logging.Log; -import org.horizon.logging.LogFactory; - -import java.util.ArrayList; -import java.util.List; -import java.util.concurrent.ArrayBlockingQueue; -import java.util.concurrent.BlockingQueue; -import java.util.concurrent.ExecutorService; -import java.util.concurrent.Executors; -import java.util.concurrent.Future; -import java.util.concurrent.ThreadFactory; -import java.util.concurrent.TimeUnit; -import java.util.concurrent.atomic.AtomicBoolean; -import java.util.concurrent.atomic.AtomicInteger; - -/** - * The AsyncCacheLoader is a delegating cache loader that extends AbstractDelegatingCacheLoader overriding methods to - * that should not just delegate the operation to the underlying cache loader. - * - * Read operations are done synchronously, while write (CRUD - Create, Remove, Update, Delete) operations are done - * asynchronously. There is no provision for exception handling at the moment for problems encountered with the - * underlying CacheLoader during a CRUD operation, and the exception is just logged. - * - * When configuring the CacheLoader, use the following attribute: - * - * <code> <attribute name="CacheLoaderAsynchronous">true</attribute> </code> - * - * to define whether cache loader operations are to be asynchronous. If not specified, a cache loader operation is - * assumed synchronous. - * - * - * The following additional parameters are available: <dl> <dt>cache.async.batchSize</dt> <dd>Number of modifications to - * commit in one transaction, default is 100. The minimum batch size is 1.</dd> <dt>cache.async.pollWait</dt> <dd>How - * long to wait before processing an incomplete batch, in milliseconds. Default is 100. Set this to 0 to not wait - * before processing available records.</dd> <dt>cache.async.returnOld</dt> <dd>If <code>true</code>, this loader - * returns the old values from {@link #put} and {@link #remove} methods. Otherwise, these methods always return null. - * Default is true. <code>false</code> improves the performance of these operations.</dd> - * <dt>cache.async.queueSize</dt> <dd>Maximum number of entries to enqueue for asynchronous processing. Lowering this - * size may help prevent out-of-memory conditions. It also may help to prevent less records lost in the case of JVM - * failure. Default is 10,000 operations.</dd> <dt>cache.async.put</dt> <dd>If set to false, all {@link #put} - * operations will be processed synchronously, and then only the {@link #remove} operations will be processed - * asynchronously. This mode may be useful for processing expiration of messages within a separate thread and keeping - * other operations synchronous for reliability. </dd> <dt>cache.async.threadPoolSize</dt> <dd>The size of the async - * processor thread pool. Defaults to <tt>1</tt>. This property is new in JBoss Cache 3.0.</dd> </dl> For increased - * performance for many smaller transactions, use higher values for <code>cache.async.batchSize</code> and - * <code>cache.async.pollWait</code>. For larger sized records, use a smaller value for - * <code>cache.async.queueSize</code>. - * - * @author Manik Surtani (manik.surtani(a)jboss.com) - * @since 1.0 - */ -public class AsyncCacheLoader<K, V> extends AbstractDelegatingCacheLoader<K, V> { - - private static final Log log = LogFactory.getLog(AsyncCacheLoader.class); - private static final boolean trace = log.isTraceEnabled(); - - private static AtomicInteger threadId = new AtomicInteger(0); - - /** - * Default limit on entries to process asynchronously. - */ - private static final int DEFAULT_QUEUE_SIZE = 10000; - - private AsyncCacheLoaderConfig config; - private ExecutorService executor; - private AtomicBoolean stopped = new AtomicBoolean(true); - private BlockingQueue<Modification> queue = new ArrayBlockingQueue<Modification>(DEFAULT_QUEUE_SIZE); - private List<Future> processorFutures; - - public AsyncCacheLoader() { - super(null); - } - - public AsyncCacheLoader(CacheLoader<K, V> cacheLoader) { - super(cacheLoader); - } - - @Override - public void setConfig(IndividualCacheLoaderConfig base) { - if (base instanceof AsyncCacheLoaderConfig) { - config = (AsyncCacheLoaderConfig) base; - } else { - config = new AsyncCacheLoaderConfig(base); - } - - if (config.getQueueSize() > 0) { - queue = new ArrayBlockingQueue<Modification>(config.getQueueSize()); - } - - super.setConfig(base); - } - - @Override - public V put(K key, V value) { - if (config.getUseAsyncPut()) { - V oldValue = get(key); - Modification mod = new Modification(Modification.ModificationType.PUT, key, value); - enqueue(mod); - return oldValue; - } else { - return super.put(key, value); - } - } - - @Override - public void put(List<Modification> modifications) { - if (config.getUseAsyncPut()) { - for (Modification modification : modifications) { - enqueue(modification); - } - } else { - super.put(modifications); - } - } - - @Override - public V remove(Object key) { - V oldValue = get(key); - Modification mod = new Modification(Modification.ModificationType.REMOVE, key, null); - enqueue(mod); - return oldValue; - } - - @Override - public void start() { - if (log.isInfoEnabled()) log.info("Async cache loader starting: " + this); - stopped.set(false); - super.start(); - executor = Executors.newFixedThreadPool(config.getThreadPoolSize(), new ThreadFactory() { - public Thread newThread(Runnable r) { - Thread t = new Thread(r, "AsyncCacheLoader-" + threadId.getAndIncrement()); - t.setDaemon(true); - return t; - } - }); - processorFutures = new ArrayList<Future>(config.getThreadPoolSize()); - for (int i = 0; i < config.getThreadPoolSize(); i++) processorFutures.add(executor.submit(new AsyncProcessor())); - } - - @Override - public void stop() { - stopped.set(true); - if (executor != null) { - for (Future f : processorFutures) f.cancel(true); - executor.shutdown(); - try { - boolean terminated = executor.isTerminated(); - while (!terminated) { - terminated = executor.awaitTermination(60, TimeUnit.SECONDS); - } - } - catch (InterruptedException e) { - Thread.currentThread().interrupt(); - } - } - executor = null; - super.stop(); - } - - private void enqueue(final Modification mod) { - if (stopped.get()) { - throw new CacheException("AsyncCacheLoader stopped; no longer accepting more entries."); - } - if (trace) log.trace("Enqueuing modification " + mod); - try { - queue.put(mod); - } - catch (InterruptedException e) { - Thread.currentThread().interrupt(); - } - } - - /** - * Processes (by batch if possible) a queue of {@link Modification}s. - * - * @author manik surtani - */ - private class AsyncProcessor implements Runnable { - // Modifications to invoke as a single put - private final List<Modification> mods = new ArrayList<Modification>(config.getBatchSize()); - - public void run() { - while (!Thread.interrupted()) { - try { - run0(); - } - catch (InterruptedException e) { - break; - } - } - - try { - if (trace) log.trace("process remaining batch " + mods.size()); - put(mods); - if (trace) log.trace("process remaining queued " + queue.size()); - while (!queue.isEmpty()) { - run0(); - } - } - catch (InterruptedException e) { - log.trace("remaining interrupted"); - } - } - - private void run0() throws InterruptedException { - log.trace("Checking for modifications"); - int i = queue.drainTo(mods, config.getBatchSize()); - if (i == 0) { - Modification m = queue.take(); - mods.add(m); - } - - if (trace) { - log.trace("Calling put(List) with " + mods.size() + " modifications"); - } - put(mods); - mods.clear(); - } - - private void put(List<Modification> mods) { - try { - AsyncCacheLoader.super.put(mods); - } - catch (Exception e) { - if (log.isWarnEnabled()) log.warn("Failed to process async modifications: " + e); - if (log.isDebugEnabled()) log.debug("Exception: ", e); - } - } - } - - @Override - public String toString() { - return super.toString() + - " delegate=[" + super.getCacheLoader() + "]" + - " stopped=" + stopped + - " batchSize=" + config.getBatchSize() + - " returnOld=" + config.getReturnOld() + - " asyncPut=" + config.getUseAsyncPut() + - " threadPoolSize=" + config.getThreadPoolSize() + - " queue.remainingCapacity()=" + queue.remainingCapacity() + - " queue.peek()=" + queue.peek(); - } - -} Modified: core/branches/flat/src/main/java/org/horizon/loader/AsyncCacheLoaderConfig.java =================================================================== --- core/branches/flat/src/main/java/org/horizon/loader/AsyncCacheLoaderConfig.java 2009-02-10 11:54:44 UTC (rev 7672) +++ core/branches/flat/src/main/java/org/horizon/loader/AsyncCacheLoaderConfig.java 2009-02-10 11:58:28 UTC (rev 7673) @@ -41,16 +41,16 @@ * Default constructor. */ public AsyncCacheLoaderConfig() { - setClassName(AsyncCacheLoader.class.getName()); + setClassName(AsyncCacheLoaderOld.class.getName()); } /** - * For use by {@link AsyncCacheLoader}. + * For use by {@link AsyncCacheLoaderOld}. * * @param base generic config object created by XML parsing. */ AsyncCacheLoaderConfig(IndividualCacheLoaderConfig base) { - setClassName(AsyncCacheLoader.class.getName()); + setClassName(AsyncCacheLoaderOld.class.getName()); populateFromBaseConfig(base); } Copied: core/branches/flat/src/main/java/org/horizon/loader/AsyncCacheLoaderOld.java (from rev 7666, core/branches/flat/src/main/java/org/horizon/loader/AsyncCacheLoader.java) =================================================================== --- core/branches/flat/src/main/java/org/horizon/loader/AsyncCacheLoaderOld.java (rev 0) +++ core/branches/flat/src/main/java/org/horizon/loader/AsyncCacheLoaderOld.java 2009-02-10 11:58:28 UTC (rev 7673) @@ -0,0 +1,269 @@ +/* + * JBoss, Home of Professional Open Source. + * Copyright 2000 - 2008, Red Hat Middleware LLC, and individual contributors + * as indicated by the @author tags. See the copyright.txt file in the + * distribution for a full listing of individual contributors. + * + * This 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 2.1 of + * the License, or (at your option) any later version. + * + * This software 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 this software; if not, write to the Free + * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA + * 02110-1301 USA, or see the FSF site: http://www.fsf.org. + */ +package org.horizon.loader; + +import org.horizon.CacheException; +import org.horizon.config.CacheLoaderConfig.IndividualCacheLoaderConfig; +import org.horizon.logging.Log; +import org.horizon.logging.LogFactory; + +import java.util.ArrayList; +import java.util.List; +import java.util.concurrent.ArrayBlockingQueue; +import java.util.concurrent.BlockingQueue; +import java.util.concurrent.ExecutorService; +import java.util.concurrent.Executors; +import java.util.concurrent.Future; +import java.util.concurrent.ThreadFactory; +import java.util.concurrent.TimeUnit; +import java.util.concurrent.atomic.AtomicBoolean; +import java.util.concurrent.atomic.AtomicInteger; + +/** + * The AsyncCacheLoader is a delegating cache loader that extends AbstractDelegatingCacheLoader overriding methods to + * that should not just delegate the operation to the underlying cache loader. + * + * Read operations are done synchronously, while write (CRUD - Create, Remove, Update, Delete) operations are done + * asynchronously. There is no provision for exception handling at the moment for problems encountered with the + * underlying CacheLoader during a CRUD operation, and the exception is just logged. + * + * When configuring the CacheLoader, use the following attribute: + * + * <code> <attribute name="CacheLoaderAsynchronous">true</attribute> </code> + * + * to define whether cache loader operations are to be asynchronous. If not specified, a cache loader operation is + * assumed synchronous. + * + * + * The following additional parameters are available: <dl> <dt>cache.async.batchSize</dt> <dd>Number of modifications to + * commit in one transaction, default is 100. The minimum batch size is 1.</dd> <dt>cache.async.pollWait</dt> <dd>How + * long to wait before processing an incomplete batch, in milliseconds. Default is 100. Set this to 0 to not wait + * before processing available records.</dd> <dt>cache.async.returnOld</dt> <dd>If <code>true</code>, this loader + * returns the old values from {@link #put} and {@link #remove} methods. Otherwise, these methods always return null. + * Default is true. <code>false</code> improves the performance of these operations.</dd> + * <dt>cache.async.queueSize</dt> <dd>Maximum number of entries to enqueue for asynchronous processing. Lowering this + * size may help prevent out-of-memory conditions. It also may help to prevent less records lost in the case of JVM + * failure. Default is 10,000 operations.</dd> <dt>cache.async.put</dt> <dd>If set to false, all {@link #put} + * operations will be processed synchronously, and then only the {@link #remove} operations will be processed + * asynchronously. This mode may be useful for processing expiration of messages within a separate thread and keeping + * other operations synchronous for reliability. </dd> <dt>cache.async.threadPoolSize</dt> <dd>The size of the async + * processor thread pool. Defaults to <tt>1</tt>. This property is new in JBoss Cache 3.0.</dd> </dl> For increased + * performance for many smaller transactions, use higher values for <code>cache.async.batchSize</code> and + * <code>cache.async.pollWait</code>. For larger sized records, use a smaller value for + * <code>cache.async.queueSize</code>. + * + * @author Manik Surtani (manik.surtani(a)jboss.com) + * @since 1.0 + */ +public class AsyncCacheLoaderOld<K, V> extends AbstractDelegatingCacheLoaderOld<K, V> { + + private static final Log log = LogFactory.getLog(AsyncCacheLoaderOld.class); + private static final boolean trace = log.isTraceEnabled(); + + private static AtomicInteger threadId = new AtomicInteger(0); + + /** + * Default limit on entries to process asynchronously. + */ + private static final int DEFAULT_QUEUE_SIZE = 10000; + + private AsyncCacheLoaderConfig config; + private ExecutorService executor; + private AtomicBoolean stopped = new AtomicBoolean(true); + private BlockingQueue<Modification> queue = new ArrayBlockingQueue<Modification>(DEFAULT_QUEUE_SIZE); + private List<Future> processorFutures; + + public AsyncCacheLoaderOld() { + super(null); + } + + public AsyncCacheLoaderOld(CacheLoaderOld<K, V> cacheLoader) { + super(cacheLoader); + } + + @Override + public void setConfig(IndividualCacheLoaderConfig base) { + if (base instanceof AsyncCacheLoaderConfig) { + config = (AsyncCacheLoaderConfig) base; + } else { + config = new AsyncCacheLoaderConfig(base); + } + + if (config.getQueueSize() > 0) { + queue = new ArrayBlockingQueue<Modification>(config.getQueueSize()); + } + + super.setConfig(base); + } + + @Override + public V put(K key, V value) { + if (config.getUseAsyncPut()) { + V oldValue = get(key); + Modification mod = new Modification(Modification.ModificationType.PUT, key, value); + enqueue(mod); + return oldValue; + } else { + return super.put(key, value); + } + } + + @Override + public void put(List<Modification> modifications) { + if (config.getUseAsyncPut()) { + for (Modification modification : modifications) { + enqueue(modification); + } + } else { + super.put(modifications); + } + } + + @Override + public V remove(Object key) { + V oldValue = get(key); + Modification mod = new Modification(Modification.ModificationType.REMOVE, key, null); + enqueue(mod); + return oldValue; + } + + @Override + public void start() { + if (log.isInfoEnabled()) log.info("Async cache loader starting: " + this); + stopped.set(false); + super.start(); + executor = Executors.newFixedThreadPool(config.getThreadPoolSize(), new ThreadFactory() { + public Thread newThread(Runnable r) { + Thread t = new Thread(r, "AsyncCacheLoaderOld-" + threadId.getAndIncrement()); + t.setDaemon(true); + return t; + } + }); + processorFutures = new ArrayList<Future>(config.getThreadPoolSize()); + for (int i = 0; i < config.getThreadPoolSize(); i++) processorFutures.add(executor.submit(new AsyncProcessor())); + } + + @Override + public void stop() { + stopped.set(true); + if (executor != null) { + for (Future f : processorFutures) f.cancel(true); + executor.shutdown(); + try { + boolean terminated = executor.isTerminated(); + while (!terminated) { + terminated = executor.awaitTermination(60, TimeUnit.SECONDS); + } + } + catch (InterruptedException e) { + Thread.currentThread().interrupt(); + } + } + executor = null; + super.stop(); + } + + private void enqueue(final Modification mod) { + if (stopped.get()) { + throw new CacheException("AsyncCacheLoaderOld stopped; no longer accepting more entries."); + } + if (trace) log.trace("Enqueuing modification " + mod); + try { + queue.put(mod); + } + catch (InterruptedException e) { + Thread.currentThread().interrupt(); + } + } + + /** + * Processes (by batch if possible) a queue of {@link Modification}s. + * + * @author manik surtani + */ + private class AsyncProcessor implements Runnable { + // Modifications to invoke as a single put + private final List<Modification> mods = new ArrayList<Modification>(config.getBatchSize()); + + public void run() { + while (!Thread.interrupted()) { + try { + run0(); + } + catch (InterruptedException e) { + break; + } + } + + try { + if (trace) log.trace("process remaining batch " + mods.size()); + put(mods); + if (trace) log.trace("process remaining queued " + queue.size()); + while (!queue.isEmpty()) { + run0(); + } + } + catch (InterruptedException e) { + log.trace("remaining interrupted"); + } + } + + private void run0() throws InterruptedException { + log.trace("Checking for modifications"); + int i = queue.drainTo(mods, config.getBatchSize()); + if (i == 0) { + Modification m = queue.take(); + mods.add(m); + } + + if (trace) { + log.trace("Calling put(List) with " + mods.size() + " modifications"); + } + put(mods); + mods.clear(); + } + + private void put(List<Modification> mods) { + try { + AsyncCacheLoaderOld.super.put(mods); + } + catch (Exception e) { + if (log.isWarnEnabled()) log.warn("Failed to process async modifications: " + e); + if (log.isDebugEnabled()) log.debug("Exception: ", e); + } + } + } + + @Override + public String toString() { + return super.toString() + + " delegate=[" + super.getCacheLoader() + "]" + + " stopped=" + stopped + + " batchSize=" + config.getBatchSize() + + " returnOld=" + config.getReturnOld() + + " asyncPut=" + config.getUseAsyncPut() + + " threadPoolSize=" + config.getThreadPoolSize() + + " queue.remainingCapacity()=" + queue.remainingCapacity() + + " queue.peek()=" + queue.peek(); + } + +} Property changes on: core/branches/flat/src/main/java/org/horizon/loader/AsyncCacheLoaderOld.java ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Deleted: core/branches/flat/src/main/java/org/horizon/loader/CacheLoader.java =================================================================== --- core/branches/flat/src/main/java/org/horizon/loader/CacheLoader.java 2009-02-10 11:54:44 UTC (rev 7672) +++ core/branches/flat/src/main/java/org/horizon/loader/CacheLoader.java 2009-02-10 11:58:28 UTC (rev 7673) @@ -1,236 +0,0 @@ -/* - * JBoss, Home of Professional Open Source. - * Copyright 2000 - 2008, Red Hat Middleware LLC, and individual contributors - * as indicated by the @author tags. See the copyright.txt file in the - * distribution for a full listing of individual contributors. - * - * This 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 2.1 of - * the License, or (at your option) any later version. - * - * This software 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 this software; if not, write to the Free - * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA - * 02110-1301 USA, or see the FSF site: http://www.fsf.org. - */ -package org.horizon.loader; - -import net.jcip.annotations.ThreadSafe; -import org.horizon.Cache; -import org.horizon.config.CacheLoaderConfig.IndividualCacheLoaderConfig; -import org.horizon.factories.scopes.Scope; -import org.horizon.factories.scopes.Scopes; -import org.horizon.marshall.EntryData; - -import java.io.ObjectInputStream; -import java.io.ObjectOutputStream; -import java.util.List; -import java.util.Map; - -/** - * A {@link CacheLoader} implementation persists and load keys to and from secondary storage, such as a database or - * filesystem. Typically, implementations store a series of keys and values (an entire {@link Map}) under a single - * {@link Fqn}. Loading and saving properties of an entire {@link Map} should be atomic. - * - * Lifecycle: First an instance of the loader is created, then the configuration ({@link - * #setConfig(CacheLoaderConfig.IndividualCacheLoaderConfig)}) and cache ({@link #setCache(CacheSPI)}) are set. After - * this, {@link #create()} is called. Then {@link #start()} is called. When re-deployed, {@link #stop()} will be called, - * followed by another {@link #start()}. Finally, when shut down, {@link #destroy()} is called, after which the loader - * is unusable. - * - * An {@link AbstractCacheLoader} is provided as a convenient starting place when implementing your own {@link - * CacheLoader}. - * - * It is important to note that all implementations are thread safe, as concurrent reads and writes, potentially even to - * the same {@link Fqn}, are possible. - * - * - * @author <a href="mailto:manik@jboss.org">Manik Surtani (manik(a)jboss.org)</a> - * @since 1.0 - */ -@ThreadSafe -(a)Scope(Scopes.NAMED_CACHE) -public interface CacheLoader<K, V> { - /** - * Sets the configuration. This is called before {@link #create()} and {@link #start()}. - * - * @param config May be an instance of the {@link CacheLoaderConfig.IndividualCacheLoaderConfig} base class, in which - * case the cache loader should use the {@link CacheLoaderConfig.IndividualCacheLoaderConfig#getProperties()} - * method to find configuration information. Alternatively, may be a type-specific subclass of {@link - * CacheLoaderConfig.IndividualCacheLoaderConfig}, if there is one. - */ - void setConfig(IndividualCacheLoaderConfig config); - - /** - * Gets the configuration. - * - * @return the configuration, represented by a {@link CacheLoaderConfig.IndividualCacheLoaderConfig} object. - */ - IndividualCacheLoaderConfig getConfig(); - - /** - * Sets the {@link Cache} that is maintaining this CacheLoader. This method allows this CacheLoader to set a - * reference to the {@link Cache}. This method is called be called after the CacheLoader instance has been - * constructed. - * - * @param c The cache on which this loader works - */ - void setCache(Cache<K, V> c); - - /** - * Returns all keys and values from the persistent store, given a {@link Fqn} - * - * @param name the {@link Fqn} to search for. - * @return Map<Object,Object> keys and values for the given node. Returns null if the node is not found. If the node - * is found but has no attributes, this method returns an empty Map. - */ - V get(Object key); - - - /** - * Returns true if the CacheLoader has a node with a {@link Fqn}. - * - * @return true if node exists, false otherwise - */ - boolean exists(Object key); - - /** - * Puts a key and value into the attribute map of a given node. If the node does not exist, all parent nodes from - * the root down are created automatically. Returns the old value. - */ - V put(K key, V value); - - /** - * Removes everything from this cache-loader - */ - void clear(); - - /** - * Removes the given node and all its subnodes, does nothing if the node does not exist. - * - * @param fqn the {@link Fqn} of the node - */ - V remove(Object key); - - /** - * Retrieves all entries stored in this cache loader - * - * @return All entries - * @throws Exception on error - */ - List<EntryData<K, V>> getAllEntries(); - - - /** - * Applies all modifications to the backend store. Changes may be applied in a single operation. - * - * @param modifications A List<Modification> of modifications - */ - void put(List<Modification> modifications); - - /** - * Prepares a list of modifications. For example, for a DB-based CacheLoader: <ol> <li>Create a local (JDBC) - * transaction <li>Associate the local transaction with <code>tx</code> (tx is the key) <li>Execute the corresponding - * SQL statements against the DB (statements derived from modifications) </ol> For non-transactional CacheLoader - * (e.g. file-based), the implementation could attempt to implement its own transactional logic, attempting to write - * data to a temp location (or memory) and writing it to the proper location upon commit. - * - * @param tx The transaction, indended to be used by implementations as an identifier of the transaction - * (and not necessarily a JTA {@link javax.transaction.Transaction} object) - * @param modifications A {@link List} containing {@link org.horizon.loader.Modification}s, for the given - * transaction - * @param one_phase Persist immediately and (for example) commit the local JDBC transaction as well. When true, - * we won't get a {@link #commit(Object)} or {@link #rollback(Object)} method call later - * @throws Exception - */ - void prepare(Object tx, List<Modification> modifications, boolean one_phase); - - /** - * Commits the transaction. A DB-based CacheLoader would look up the local JDBC transaction asociated with - * <code>tx</code> and commit that transaction. Non-transactional CacheLoaders could simply write the data that was - * previously saved transiently under the given <code>tx</code> key, to (for example) a file system. - * - * Note this only holds if the previous prepare() did not define <pre>one_phase=true</pre> - * - * @param tx transaction to commit - */ - void commit(Object tx); - - /** - * Rolls the transaction back. A DB-based CacheLoader would look up the local JDBC transaction asociated with - * <code>tx</code> and roll back that transaction. - * - * @param tx transaction to roll back - */ - void rollback(Object tx); - - /** - * Fetches the entire state for this cache from secondary storage (disk, database) and writes it to a provided - * ObjectOutputStream. State written to the provided ObjectOutputStream parameter is used for initialization of a new - * CacheImpl instance. When the state gets transferred to the new cache instance its cacheloader calls {@link - * #storeEntireState(ObjectInputStream)} - * - * Implementations of this method should not catch any exception or close the given ObjectOutputStream parameter. In - * order to ensure cacheloader interoperability contents of the cache are written to the ObjectOutputStream as a - * sequence of NodeData objects. - * - * Default implementation is provided by {@link AbstractCacheLoader} and ensures cacheloader interoperability. - * Implementors are encouraged to consider extending AbstractCacheLoader prior to implementing completely custom - * cacheloader. - * - * @param os ObjectOutputStream to write state - * @see AbstractCacheLoader#loadEntireState(ObjectOutputStream) - * @see org.horizon.marshall.NodeData - */ - void loadEntireState(ObjectOutputStream os); - - /** - * Stores the entire state for this cache by reading it from a provided ObjectInputStream. The state was provided to - * this cache by calling {@link #loadEntireState(ObjectOutputStream)}} on some other cache instance. State currently - * in storage gets overwritten. - * - * Implementations of this method should not catch any exception or close the given ObjectInputStream parameter. In - * order to ensure cacheloader interoperability contents of the cache are read from the ObjectInputStream as a - * sequence of NodeData objects. - * - * Default implementation is provided by {@link AbstractCacheLoader} and ensures cacheloader interoperability. - * Implementors are encouraged to consider extending AbstractCacheLoader prior to implementing completely custom - * cacheloader. - * - * @param is ObjectInputStream to read state - * @see AbstractCacheLoader#storeEntireState(ObjectInputStream) - * @see org.horizon.marshall.NodeData - */ - void storeEntireState(ObjectInputStream is); - - /** - * Lifecycle method, called when the cache loader is created. - * - * @throws java.lang.Exception - */ - void create(); - - /** - * Lifecycle method, called when the cache loader is started. - * - * @throws java.lang.Exception - */ - void start(); - - /** - * Lifecycle method, called when the cache loader is stopped. - */ - void stop(); - - /** - * Lifecycle method, called when the cache loader is destroyed. - */ - void destroy(); - -} Added: core/branches/flat/src/main/java/org/horizon/loader/CacheLoader.java =================================================================== --- core/branches/flat/src/main/java/org/horizon/loader/CacheLoader.java (rev 0) +++ core/branches/flat/src/main/java/org/horizon/loader/CacheLoader.java 2009-02-10 11:58:28 UTC (rev 7673) @@ -0,0 +1,54 @@ +package org.horizon.loader; + +import org.horizon.Cache; +import org.horizon.config.CacheLoaderConfig; +import org.horizon.lifecycle.Lifecycle; +import org.horizon.marshall.Marshaller; + +import javax.transaction.TransactionManager; +import java.util.Collection; +import java.util.Set; + +/** + * Responsible for loading cache data from an external source + * + * @author Manik Surtani + * @since 1.0 + */ +public interface CacheLoader<K, V> extends Lifecycle { + + /** + * Used to initialize a cache loader. Typically invoked by the {@link org.horizon.loader.CacheLoaderManager} when + * setting up cache loaders. + * + * @param config the cache loader configuration bean + * @param cache cache associated with this cache loader. Implementations may use this to determine cache name when + * selecting where refer to state in storage, for example, a different database table name. + * @param tm transaction manager associated with the cache. Note that it is the cache loader's responsibility to + * be aware of and participate in transactions accordingly. + * @param m marshaller to use when loading state from a stream, if supported by the implementation. + */ + void init(CacheLoaderConfig.IndividualCacheLoaderConfig config, Cache cache, TransactionManager tm, Marshaller m); + + /** + * Loads an entry mapped to by a given key. Should return null if the entry does not exist. + * + * @param key key + * @return an entry + */ + StoredEntry<K, V> load(K key); + + /** + * Loads a set of entries based on a collection of keys. Should return an empty set if none of the keys exist. + * + * @param keys keys + * @return a set of entries + */ + Set<StoredEntry<K, V>> loadAll(Collection<? extends K> keys); + + /** + * @param key key to test + * @return true if the key exists, false otherwise + */ + boolean containsKey(K key); +} Modified: core/branches/flat/src/main/java/org/horizon/loader/CacheLoaderManager.java =================================================================== --- core/branches/flat/src/main/java/org/horizon/loader/CacheLoaderManager.java 2009-02-10 11:54:44 UTC (rev 7672) +++ core/branches/flat/src/main/java/org/horizon/loader/CacheLoaderManager.java 2009-02-10 11:58:28 UTC (rev 7673) @@ -58,7 +58,7 @@ private static final Log log = LogFactory.getLog(CacheLoaderManager.class); private CacheLoaderConfig config; private Cache<Object, Object> cache; - private CacheLoader<Object, Object> loader; + private CacheLoaderOld<Object, Object> loader; private boolean fetchPersistentState; private Configuration configuration; private ComponentRegistry registry; @@ -111,8 +111,8 @@ * @throws InstantiationException * @throws ClassNotFoundException */ - private CacheLoader<Object, Object> createCacheLoader() throws Exception { - CacheLoader<Object, Object> tmpLoader; + private CacheLoaderOld<Object, Object> createCacheLoader() throws Exception { + CacheLoaderOld<Object, Object> tmpLoader; // if we only have a single cache loader configured in the chaining cacheloader then // don't use a chaining cache loader at all. @@ -122,7 +122,7 @@ // also if we are using passivation then just directly use the first cache loader. if (config.useChainingCacheLoader()) { // create chaining cache loader. - ChainingCacheLoader<Object, Object> ccl = new ChainingCacheLoader<Object, Object>(); + ChainingCacheLoaderOld<Object, Object> ccl = new ChainingCacheLoaderOld<Object, Object>(); tmpLoader = ccl; Iterator<IndividualCacheLoaderConfig> it = config.getIndividualCacheLoaderConfigs().iterator(); @@ -140,7 +140,7 @@ assertNotSingletonAndShared(cfg); - CacheLoader<Object, Object> l = createCacheLoader(cfg, cache); + CacheLoaderOld<Object, Object> l = createCacheLoader(cfg, cache); cfg = l.getConfig(); finalConfigs.add(cfg); // Only loaders that deal w/ state transfer factor into @@ -177,21 +177,21 @@ * @return a cache loader * @throws Exception */ - private CacheLoader<Object, Object> createCacheLoader(CacheLoaderConfig.IndividualCacheLoaderConfig cfg, Cache<Object, Object> cache) throws Exception { + private CacheLoaderOld<Object, Object> createCacheLoader(CacheLoaderConfig.IndividualCacheLoaderConfig cfg, Cache<Object, Object> cache) throws Exception { // create loader - CacheLoader<Object, Object> tmpLoader = cfg.getCacheLoader() == null ? createInstance(cfg.getClassName()) : cfg.getCacheLoader(); + CacheLoaderOld<Object, Object> tmpLoader = cfg.getCacheLoader() == null ? createInstance(cfg.getClassName()) : cfg.getCacheLoader(); if (tmpLoader != null) { // async? if (cfg.isAsync()) { - CacheLoader<Object, Object> asyncDecorator; - asyncDecorator = new AsyncCacheLoader<Object, Object>(tmpLoader); + CacheLoaderOld<Object, Object> asyncDecorator; + asyncDecorator = new AsyncCacheLoaderOld<Object, Object>(tmpLoader); tmpLoader = asyncDecorator; } if (cfg.isIgnoreModifications()) { - AbstractDelegatingCacheLoader<Object, Object> readOnlyDecorator; - readOnlyDecorator = new ReadOnlyDelegatingCacheLoader<Object, Object>(tmpLoader); + AbstractDelegatingCacheLoaderOld<Object, Object> readOnlyDecorator; + readOnlyDecorator = new ReadOnlyDelegatingCacheLoaderOld<Object, Object>(tmpLoader); tmpLoader = readOnlyDecorator; } @@ -200,17 +200,17 @@ if (ssc != null && ssc.isSingletonStoreEnabled()) { Object decorator = createInstance(ssc.getSingletonStoreClass()); - /* class providing singleton store functionality must extend AbstractDelegatingCacheLoader so that + /* class providing singleton store functionality must extend AbstractDelegatingCacheLoaderOld so that * underlying cacheloader can be set. */ - if (decorator instanceof AbstractDelegatingCacheLoader) { + if (decorator instanceof AbstractDelegatingCacheLoaderOld) { @SuppressWarnings("unchecked") - AbstractDelegatingCacheLoader<Object, Object> singletonDecorator = (AbstractDelegatingCacheLoader<Object, Object>) decorator; + AbstractDelegatingCacheLoaderOld<Object, Object> singletonDecorator = (AbstractDelegatingCacheLoaderOld<Object, Object>) decorator; /* set the cache loader to where calls will be delegated by the class providing the singleton * store functionality. */ singletonDecorator.setCacheLoader(tmpLoader); tmpLoader = singletonDecorator; } else { - throw new Exception("Invalid cache loader configuration!! Singleton store implementation class must extend org.horizon.loader.AbstractDelegatingCacheLoader"); + throw new Exception("Invalid cache loader configuration!! Singleton store implementation class must extend org.horizon.loader.AbstractDelegatingCacheLoaderOld"); } } @@ -233,15 +233,15 @@ * @param c instance of cache to be set in cache loader * @param loader cache loader to which assign the cache instance */ - protected void setCacheInLoader(Cache<Object, Object> c, CacheLoader<Object, Object> loader) { + protected void setCacheInLoader(Cache<Object, Object> c, CacheLoaderOld<Object, Object> loader) { loader.setCache(c); } @SuppressWarnings("unchecked") - private CacheLoader<Object, Object> createInstance(String className) throws ClassNotFoundException, IllegalAccessException, InstantiationException { + private CacheLoaderOld<Object, Object> createInstance(String className) throws ClassNotFoundException, IllegalAccessException, InstantiationException { if (log.isTraceEnabled()) log.trace("instantiating class " + className); Class<?> cl = Thread.currentThread().getContextClassLoader().loadClass(className); - return (CacheLoader<Object, Object>) cl.newInstance(); + return (CacheLoaderOld<Object, Object>) cl.newInstance(); } /** @@ -277,7 +277,7 @@ /** * Returns the cache loader */ - public CacheLoader<Object, Object> getCacheLoader() { + public CacheLoaderOld<Object, Object> getCacheLoader() { return loader; } @@ -340,8 +340,8 @@ } public void purgeLoaders(boolean force) throws Exception { - if ((loader instanceof ChainingCacheLoader) && !force) { - ((ChainingCacheLoader<?, ?>) loader).purgeIfNecessary(); + if ((loader instanceof ChainingCacheLoaderOld) && !force) { + ((ChainingCacheLoaderOld<?, ?>) loader).purgeIfNecessary(); } else { CacheLoaderConfig.IndividualCacheLoaderConfig first = getCacheLoaderConfig().getFirstCacheLoaderConfig(); if (force || Copied: core/branches/flat/src/main/java/org/horizon/loader/CacheLoaderOld.java (from rev 7669, core/branches/flat/src/main/java/org/horizon/loader/CacheLoader.java) =================================================================== --- core/branches/flat/src/main/java/org/horizon/loader/CacheLoaderOld.java (rev 0) +++ core/branches/flat/src/main/java/org/horizon/loader/CacheLoaderOld.java 2009-02-10 11:58:28 UTC (rev 7673) @@ -0,0 +1,236 @@ +/* + * JBoss, Home of Professional Open Source. + * Copyright 2000 - 2008, Red Hat Middleware LLC, and individual contributors + * as indicated by the @author tags. See the copyright.txt file in the + * distribution for a full listing of individual contributors. + * + * This 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 2.1 of + * the License, or (at your option) any later version. + * + * This software 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 this software; if not, write to the Free + * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA + * 02110-1301 USA, or see the FSF site: http://www.fsf.org. + */ +package org.horizon.loader; + +import net.jcip.annotations.ThreadSafe; +import org.horizon.Cache; +import org.horizon.config.CacheLoaderConfig.IndividualCacheLoaderConfig; +import org.horizon.factories.scopes.Scope; +import org.horizon.factories.scopes.Scopes; +import org.horizon.marshall.EntryData; + +import java.io.ObjectInputStream; +import java.io.ObjectOutputStream; +import java.util.List; +import java.util.Map; + +/** + * A {@link CacheLoaderOld} implementation persists and load keys to and from secondary storage, such as a database or + * filesystem. Typically, implementations store a series of keys and values (an entire {@link Map}) under a single + * {@link Fqn}. Loading and saving properties of an entire {@link Map} should be atomic. + * + * Lifecycle: First an instance of the loader is created, then the configuration ({@link + * #setConfig(CacheLoaderConfig.IndividualCacheLoaderConfig)}) and cache ({@link #setCache(CacheSPI)}) are set. After + * this, {@link #create()} is called. Then {@link #start()} is called. When re-deployed, {@link #stop()} will be called, + * followed by another {@link #start()}. Finally, when shut down, {@link #destroy()} is called, after which the loader + * is unusable. + * + * An {@link AbstractCacheLoaderOld} is provided as a convenient starting place when implementing your own {@link + * CacheLoaderOld}. + * + * It is important to note that all implementations are thread safe, as concurrent reads and writes, potentially even to + * the same {@link Fqn}, are possible. + * + * + * @author <a href="mailto:manik@jboss.org">Manik Surtani (manik(a)jboss.org)</a> + * @since 1.0 + */ +@ThreadSafe +(a)Scope(Scopes.NAMED_CACHE) +public interface CacheLoaderOld<K, V> { + /** + * Sets the configuration. This is called before {@link #create()} and {@link #start()}. + * + * @param config May be an instance of the {@link CacheLoaderConfig.IndividualCacheLoaderConfig} base class, in which + * case the cache loader should use the {@link CacheLoaderConfig.IndividualCacheLoaderConfig#getProperties()} + * method to find configuration information. Alternatively, may be a type-specific subclass of {@link + * CacheLoaderConfig.IndividualCacheLoaderConfig}, if there is one. + */ + void setConfig(IndividualCacheLoaderConfig config); + + /** + * Gets the configuration. + * + * @return the configuration, represented by a {@link CacheLoaderConfig.IndividualCacheLoaderConfig} object. + */ + IndividualCacheLoaderConfig getConfig(); + + /** + * Sets the {@link Cache} that is maintaining this CacheLoader. This method allows this CacheLoader to set a + * reference to the {@link Cache}. This method is called be called after the CacheLoader instance has been + * constructed. + * + * @param c The cache on which this loader works + */ + void setCache(Cache<K, V> c); + + /** + * Returns all keys and values from the persistent store, given a {@link Fqn} + * + * @param name the {@link Fqn} to search for. + * @return Map<Object,Object> keys and values for the given node. Returns null if the node is not found. If the node + * is found but has no attributes, this method returns an empty Map. + */ + V get(Object key); + + + /** + * Returns true if the CacheLoader has a node with a {@link Fqn}. + * + * @return true if node exists, false otherwise + */ + boolean exists(Object key); + + /** + * Puts a key and value into the attribute map of a given node. If the node does not exist, all parent nodes from + * the root down are created automatically. Returns the old value. + */ + V put(K key, V value); + + /** + * Removes everything from this cache-loader + */ + void clear(); + + /** + * Removes the given node and all its subnodes, does nothing if the node does not exist. + * + * @param fqn the {@link Fqn} of the node + */ + V remove(Object key); + + /** + * Retrieves all entries stored in this cache loader + * + * @return All entries + * @throws Exception on error + */ + List<EntryData<K, V>> getAllEntries(); + + + /** + * Applies all modifications to the backend store. Changes may be applied in a single operation. + * + * @param modifications A List<Modification> of modifications + */ + void put(List<Modification> modifications); + + /** + * Prepares a list of modifications. For example, for a DB-based CacheLoader: <ol> <li>Create a local (JDBC) + * transaction <li>Associate the local transaction with <code>tx</code> (tx is the key) <li>Execute the corresponding + * SQL statements against the DB (statements derived from modifications) </ol> For non-transactional CacheLoader + * (e.g. file-based), the implementation could attempt to implement its own transactional logic, attempting to write + * data to a temp location (or memory) and writing it to the proper location upon commit. + * + * @param tx The transaction, indended to be used by implementations as an identifier of the transaction + * (and not necessarily a JTA {@link javax.transaction.Transaction} object) + * @param modifications A {@link List} containing {@link org.horizon.loader.Modification}s, for the given + * transaction + * @param one_phase Persist immediately and (for example) commit the local JDBC transaction as well. When true, + * we won't get a {@link #commit(Object)} or {@link #rollback(Object)} method call later + * @throws Exception + */ + void prepare(Object tx, List<Modification> modifications, boolean one_phase); + + /** + * Commits the transaction. A DB-based CacheLoader would look up the local JDBC transaction asociated with + * <code>tx</code> and commit that transaction. Non-transactional CacheLoaders could simply write the data that was + * previously saved transiently under the given <code>tx</code> key, to (for example) a file system. + * + * Note this only holds if the previous prepare() did not define <pre>one_phase=true</pre> + * + * @param tx transaction to commit + */ + void commit(Object tx); + + /** + * Rolls the transaction back. A DB-based CacheLoader would look up the local JDBC transaction asociated with + * <code>tx</code> and roll back that transaction. + * + * @param tx transaction to roll back + */ + void rollback(Object tx); + + /** + * Fetches the entire state for this cache from secondary storage (disk, database) and writes it to a provided + * ObjectOutputStream. State written to the provided ObjectOutputStream parameter is used for initialization of a new + * CacheImpl instance. When the state gets transferred to the new cache instance its cacheloader calls {@link + * #storeEntireState(ObjectInputStream)} + * + * Implementations of this method should not catch any exception or close the given ObjectOutputStream parameter. In + * order to ensure cacheloader interoperability contents of the cache are written to the ObjectOutputStream as a + * sequence of NodeData objects. + * + * Default implementation is provided by {@link AbstractCacheLoaderOld} and ensures cacheloader interoperability. + * Implementors are encouraged to consider extending AbstractCacheLoader prior to implementing completely custom + * cacheloader. + * + * @param os ObjectOutputStream to write state + * @see AbstractCacheLoaderOld#loadEntireState(ObjectOutputStream) + * @see org.horizon.marshall.NodeData + */ + void loadEntireState(ObjectOutputStream os); + + /** + * Stores the entire state for this cache by reading it from a provided ObjectInputStream. The state was provided to + * this cache by calling {@link #loadEntireState(ObjectOutputStream)}} on some other cache instance. State currently + * in storage gets overwritten. + * + * Implementations of this method should not catch any exception or close the given ObjectInputStream parameter. In + * order to ensure cacheloader interoperability contents of the cache are read from the ObjectInputStream as a + * sequence of NodeData objects. + * + * Default implementation is provided by {@link AbstractCacheLoaderOld} and ensures cacheloader interoperability. + * Implementors are encouraged to consider extending AbstractCacheLoader prior to implementing completely custom + * cacheloader. + * + * @param is ObjectInputStream to read state + * @see AbstractCacheLoaderOld#storeEntireState(ObjectInputStream) + * @see org.horizon.marshall.NodeData + */ + void storeEntireState(ObjectInputStream is); + + /** + * Lifecycle method, called when the cache loader is created. + * + * @throws java.lang.Exception + */ + void create(); + + /** + * Lifecycle method, called when the cache loader is started. + * + * @throws java.lang.Exception + */ + void start(); + + /** + * Lifecycle method, called when the cache loader is stopped. + */ + void stop(); + + /** + * Lifecycle method, called when the cache loader is destroyed. + */ + void destroy(); + +} Property changes on: core/branches/flat/src/main/java/org/horizon/loader/CacheLoaderOld.java ___________________________________________________________________ Name: svn:executable + * Name: svn:keywords + Id Revision Name: svn:eol-style + LF Added: core/branches/flat/src/main/java/org/horizon/loader/CacheStore.java =================================================================== --- core/branches/flat/src/main/java/org/horizon/loader/CacheStore.java (rev 0) +++ core/branches/flat/src/main/java/org/horizon/loader/CacheStore.java 2009-02-10 11:58:28 UTC (rev 7673) @@ -0,0 +1,76 @@ +package org.horizon.loader; + +import java.io.IOException; +import java.io.InputStream; +import java.io.OutputStream; +import java.util.Collection; + +/** + * A specialization of the {@link CacheLoader} interface that can be written to. + * + * @author Manik Surtani + * @since 1.0 + */ +public interface CacheStore<K, V> extends CacheLoader<K, V> { + + /** + * Stores an entry + * + * @param ed entry to store + */ + void store(StoredEntry<K, V> ed); + + /** + * Stores a collection of entries + * + * @param ed entries to store + */ + void storeAll(Collection<StoredEntry<K, V>> ed); + + /** + * Writes contents of the stream to the store. Implementations should expect that the stream contains data in an + * implementation-specific format, typically generated using {@link #load(java.io.OutputStream)}. While not a + * requirement, it is recommended that implementations make use of the {@link org.horizon.marshall.Marshaller} when + * dealing with the stream to make use of efficient marshalling. + * + * @param inputStream stream to read from + */ + void store(InputStream inputStream); + + /** + * Loads the entire state into a stream, using whichever format is most efficient for the cache loader + * implementation. Typically read and parsed by {@link #store(java.io.InputStream)}. + * + * While not a requirement, it is recommended that implementations make use of the {@link + * org.horizon.marshall.Marshaller} when dealing with the stream to make use of efficient marshalling. + * + * @param outputStream stream to write to + * @throws java.io.IOException in the event of problems writing to the stream + */ + void load(OutputStream outputStream) throws IOException; + + /** + * Clears all entries in the store + */ + void clear(); + + /** + * Removes an entry in the store. + * + * @param key key to remove + * @return true if the entry was removed; false if the entry wasn't found. + */ + boolean remove(K key); + + /** + * Removes a collection of entries from the store + * + * @param keys keys to remove + */ + void removeAll(Collection<? extends K> keys); + + /** + * Purges expired entries from the store. + */ + void purgeExpired(); +} Deleted: core/branches/flat/src/main/java/org/horizon/loader/ChainingCacheLoader.java =================================================================== --- core/branches/flat/src/main/java/org/horizon/loader/ChainingCacheLoader.java 2009-02-10 11:54:44 UTC (rev 7672) +++ core/branches/flat/src/main/java/org/horizon/loader/ChainingCacheLoader.java 2009-02-10 11:58:28 UTC (rev 7673) @@ -1,338 +0,0 @@ -/* - * JBoss, Home of Professional Open Source. - * Copyright 2000 - 2008, Red Hat Middleware LLC, and individual contributors - * as indicated by the @author tags. See the copyright.txt file in the - * distribution for a full listing of individual contributors. - * - * This 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 2.1 of - * the License, or (at your option) any later version. - * - * This software 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 this software; if not, write to the Free - * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA - * 02110-1301 USA, or see the FSF site: http://www.fsf.org. - */ -package org.horizon.loader; - -import org.horizon.config.CacheLoaderConfig; -import org.horizon.config.CacheLoaderConfig.IndividualCacheLoaderConfig; -import org.horizon.factories.ComponentRegistry; -import org.horizon.factories.annotations.Inject; -import org.horizon.marshall.EntryData; - -import java.io.ObjectInputStream; -import java.io.ObjectOutputStream; -import java.util.ArrayList; -import java.util.Collections; -import java.util.Iterator; -import java.util.List; - -/** - * This decorator is used whenever more than one cache loader is configured. READ operations are directed to each of - * the cache loaders (in the order which they were configured) until a non-null (or non-empty in the case of retrieving - * collection objects) result is achieved. - * - * WRITE operations are propagated to ALL registered cacheloaders that specified set ignoreModifications to false. - * - * @author <a href="mailto:manik@jboss.org">Manik Surtani (manik(a)jboss.org)</a> - * @since 1.0 - */ -public class ChainingCacheLoader<K, V> extends AbstractCacheLoader<K, V> { - - private final List<CacheLoader<K, V>> cacheLoaders = new ArrayList<CacheLoader<K, V>>(2); - private final List<CacheLoader<K, V>> writeCacheLoaders = new ArrayList<CacheLoader<K, V>>(2); - private final List<CacheLoaderConfig.IndividualCacheLoaderConfig> cacheLoaderConfigs = new ArrayList<CacheLoaderConfig.IndividualCacheLoaderConfig>(2); - private ComponentRegistry registry; - - /** - * Sets the configuration. Will be called before {@link #create()} and {@link #start()} - * - * @param config ignored - */ - public void setConfig(IndividualCacheLoaderConfig config) { - // don't do much here? - } - - public IndividualCacheLoaderConfig getConfig() { - return null; - } - - @Inject - public void injectDependencies(ComponentRegistry registry) { - this.registry = registry; - } - - - public V get(Object key) { - V answer = null; - for (CacheLoader<K, V> l : cacheLoaders) { - answer = l.get(key); - if (answer != null) break; - } - return answer; - } - - /** - * Checks whether the CacheLoader has a node with Fqn - * - * @param name - * @return True if node exists, false otherwise - */ - public boolean exists(Object key) { - boolean answer = false; - for (CacheLoader<K, V> l : cacheLoaders) { - answer = l.exists(key); - if (answer) break; - } - return answer; - } - - /** - * Inserts key and value into the attributes hashmap of the given node. If the node does not exist, all parent nodes - * from the root down are created automatically. Returns the old value - */ - public V put(K key, V value) { - V answer = null; - boolean isFirst = true; - for (CacheLoader<K, V> l : writeCacheLoaders) { - V tAnswer = l.put(key, value); - if (isFirst) { - answer = tAnswer; - isFirst = false; - } - - } - return answer; - } - - /** - * Inserts all modifications to the backend store. Overwrite whatever is already in the datastore. - * - * @param modifications A List<Modification> of modifications - * @throws Exception - */ - @Override - public void put(List<Modification> modifications) { - for (CacheLoader<K, V> l : writeCacheLoaders) { - l.put(modifications); - } - } - - /** - * Removes the given key and value. No-op if key doesn't exist. Returns the first response from the loader chain. - */ - public V remove(Object key) { - V answer = null; - boolean isFirst = true; - for (CacheLoader<K, V> l : writeCacheLoaders) { - V tAnswer = l.remove(key); - if (isFirst) { - answer = tAnswer; - isFirst = false; - } - } - return answer; - } - - /** - * Prepare the modifications. For example, for a DB-based CacheLoader: <ol> <li>Create a local (JDBC) transaction - * <li>Associate the local transaction with <code>tx</code> (tx is the key) <li>Execute the coresponding SQL - * statements against the DB (statements derived from modifications) </ol> For non-transactional CacheLoader (e.g. - * file-based), this could be a null operation - * - * @param tx The transaction, just used as a hashmap key - * @param modifications List<Modification>, a list of all modifications within the given transaction - * @param one_phase Persist immediately and (for example) commit the local JDBC transaction as well. When true, - * we won't get a {@link #commit(Object)} or {@link #rollback(Object)} method call later - * @throws Exception - */ - @Override - public void prepare(Object tx, List<Modification> modifications, boolean one_phase) { - for (CacheLoader<K, V> l : writeCacheLoaders) { - l.prepare(tx, modifications, one_phase); - } - } - - /** - * Commit the transaction. A DB-based CacheLoader would look up the local JDBC transaction asociated with - * <code>tx</code> and commit that transaction Non-transactional CacheLoaders could simply write the data that - * was previously saved transiently under the given <code>tx</code> key, to (for example) a file system (note this - * only holds if the previous prepare() did not define one_phase=true - * - * @param tx - */ - @Override - public void commit(Object tx) { - for (CacheLoader<K, V> l : writeCacheLoaders) { - l.commit(tx); - } - } - - /** - * Roll the transaction back. A DB-based CacheLoader would look up the local JDBC transaction asociated with - * <code>tx</code> and roll back that transaction - * - * @param tx - */ - @Override - public void rollback(Object tx) { - for (CacheLoader<K, V> l : writeCacheLoaders) { - l.rollback(tx); - } - } - - - /** - * Creates individual cache loaders. - * - * @throws Exception - */ - @Override - public void create() { - Iterator<CacheLoader<K, V>> it = cacheLoaders.iterator(); - Iterator<CacheLoaderConfig.IndividualCacheLoaderConfig> cfgIt = cacheLoaderConfigs.iterator(); - while (it.hasNext() && cfgIt.hasNext()) { - CacheLoader<K, V> cl = it.next(); - CacheLoaderConfig.IndividualCacheLoaderConfig cfg = cfgIt.next(); - cl.setConfig(cfg); - registry.wireDependencies(cl); - cl.create(); - } - } - - @Override - public void start() { - for (CacheLoader<K, V> cacheLoader : cacheLoaders) { - cacheLoader.start(); - } - } - - @Override - public void stop() { - for (CacheLoader<K, V> cacheLoader : cacheLoaders) { - cacheLoader.stop(); - } - } - - @Override - public void destroy() { - for (CacheLoader<K, V> cacheLoader : cacheLoaders) { - cacheLoader.destroy(); - } - } - - @Override - public void loadEntireState(ObjectOutputStream os) { - Iterator<CacheLoader<K, V>> i = cacheLoaders.iterator(); - Iterator<CacheLoaderConfig.IndividualCacheLoaderConfig> cfgs = cacheLoaderConfigs.iterator(); - while (i.hasNext() && cfgs.hasNext()) { - CacheLoader<K, V> l = i.next(); - CacheLoaderConfig.IndividualCacheLoaderConfig cfg = cfgs.next(); - if (cfg.isFetchPersistentState()) { - l.loadEntireState(os); - break; - } - } - } - - @Override - public void storeEntireState(ObjectInputStream is) { - Iterator<CacheLoader<K, V>> i = writeCacheLoaders.iterator(); - Iterator<CacheLoaderConfig.IndividualCacheLoaderConfig> cfgs = cacheLoaderConfigs.iterator(); - while (i.hasNext()) { - CacheLoader<K, V> l = i.next(); - CacheLoaderConfig.IndividualCacheLoaderConfig cfg = cfgs.next(); - if (cfg.isFetchPersistentState()) { - l.storeEntireState(is); - break; - } - } - - } - - /** - * Returns the number of cache loaders in the chain. - */ - public int getSize() { - return cacheLoaders.size(); - } - - /** - * Returns a List<CacheLoader> of individual cache loaders configured. - */ - public List<CacheLoader<K, V>> getCacheLoaders() { - return Collections.unmodifiableList(cacheLoaders); - } - - /** - * Adds a cache loader to the chain (always added at the end of the chain) - * - * @param l the cache loader to add - * @param cfg and its configuration - */ - public void addCacheLoader(CacheLoader<K, V> l, CacheLoaderConfig.IndividualCacheLoaderConfig cfg) { - synchronized (this) { - cacheLoaderConfigs.add(cfg); - cacheLoaders.add(l); - - if (!cfg.isIgnoreModifications()) { - writeCacheLoaders.add(l); - } - } - } - - @Override - public String toString() { - StringBuilder buf = new StringBuilder("ChainingCacheLoader{"); - Iterator<CacheLoader<K, V>> i = cacheLoaders.iterator(); - Iterator<CacheLoaderConfig.IndividualCacheLoaderConfig> c = cacheLoaderConfigs.iterator(); - int count = 0; - while (i.hasNext() && c.hasNext()) { - CacheLoader<K, V> loader = i.next(); - CacheLoaderConfig.IndividualCacheLoaderConfig cfg = c.next(); - - buf.append(++count); - buf.append(": IgnoreMods? "); - buf.append(cfg.isIgnoreModifications()); - buf.append(" CLoader: "); - buf.append(loader); - buf.append("; "); - } - buf.append("}"); - return buf.toString(); - } - - public void purgeIfNecessary() throws Exception { - Iterator<CacheLoader<K, V>> loaders = cacheLoaders.iterator(); - Iterator<CacheLoaderConfig.IndividualCacheLoaderConfig> configs = cacheLoaderConfigs.iterator(); - - while (loaders.hasNext() && configs.hasNext()) { - CacheLoader<K, V> myLoader = loaders.next(); - CacheLoaderConfig.IndividualCacheLoaderConfig myConfig = configs.next(); - - if (!myConfig.isIgnoreModifications() && myConfig.isPurgeOnStartup()) myLoader.clear(); - } - } - - public void clear() { - for (CacheLoader<K, V> l : writeCacheLoaders) - l.clear(); - } - - public List<EntryData<K, V>> getAllEntries() { - ArrayList<EntryData<K, V>> full = new ArrayList<EntryData<K, V>>(); - - for (CacheLoader<K, V> l : writeCacheLoaders) - full.addAll(l.getAllEntries()); - - return full; - } - -} Copied: core/branches/flat/src/main/java/org/horizon/loader/ChainingCacheLoaderOld.java (from rev 7666, core/branches/flat/src/main/java/org/horizon/loader/ChainingCacheLoader.java) =================================================================== --- core/branches/flat/src/main/java/org/horizon/loader/ChainingCacheLoaderOld.java (rev 0) +++ core/branches/flat/src/main/java/org/horizon/loader/ChainingCacheLoaderOld.java 2009-02-10 11:58:28 UTC (rev 7673) @@ -0,0 +1,338 @@ +/* + * JBoss, Home of Professional Open Source. + * Copyright 2000 - 2008, Red Hat Middleware LLC, and individual contributors + * as indicated by the @author tags. See the copyright.txt file in the + * distribution for a full listing of individual contributors. + * + * This 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 2.1 of + * the License, or (at your option) any later version. + * + * This software 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 this software; if not, write to the Free + * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA + * 02110-1301 USA, or see the FSF site: http://www.fsf.org. + */ +package org.horizon.loader; + +import org.horizon.config.CacheLoaderConfig; +import org.horizon.config.CacheLoaderConfig.IndividualCacheLoaderConfig; +import org.horizon.factories.ComponentRegistry; +import org.horizon.factories.annotations.Inject; +import org.horizon.marshall.EntryData; + +import java.io.ObjectInputStream; +import java.io.ObjectOutputStream; +import java.util.ArrayList; +import java.util.Collections; +import java.util.Iterator; +import java.util.List; + +/** + * This decorator is used whenever more than one cache loader is configured. READ operations are directed to each of + * the cache loaders (in the order which they were configured) until a non-null (or non-empty in the case of retrieving + * collection objects) result is achieved. + * + * WRITE operations are propagated to ALL registered cacheloaders that specified set ignoreModifications to false. + * + * @author <a href="mailto:manik@jboss.org">Manik Surtani (manik(a)jboss.org)</a> + * @since 1.0 + */ +public class ChainingCacheLoaderOld<K, V> extends AbstractCacheLoaderOld<K, V> { + + private final List<CacheLoaderOld<K, V>> cacheLoaders = new ArrayList<CacheLoaderOld<K, V>>(2); + private final List<CacheLoaderOld<K, V>> writeCacheLoaders = new ArrayList<CacheLoaderOld<K, V>>(2); + private final List<CacheLoaderConfig.IndividualCacheLoaderConfig> cacheLoaderConfigs = new ArrayList<CacheLoaderConfig.IndividualCacheLoaderConfig>(2); + private ComponentRegistry registry; + + /** + * Sets the configuration. Will be called before {@link #create()} and {@link #start()} + * + * @param config ignored + */ + public void setConfig(IndividualCacheLoaderConfig config) { + // don't do much here? + } + + public IndividualCacheLoaderConfig getConfig() { + return null; + } + + @Inject + public void injectDependencies(ComponentRegistry registry) { + this.registry = registry; + } + + + public V get(Object key) { + V answer = null; + for (CacheLoaderOld<K, V> l : cacheLoaders) { + answer = l.get(key); + if (answer != null) break; + } + return answer; + } + + /** + * Checks whether the CacheLoader has a node with Fqn + * + * @param name + * @return True if node exists, false otherwise + */ + public boolean exists(Object key) { + boolean answer = false; + for (CacheLoaderOld<K, V> l : cacheLoaders) { + answer = l.exists(key); + if (answer) break; + } + return answer; + } + + /** + * Inserts key and value into the attributes hashmap of the given node. If the node does not exist, all parent nodes + * from the root down are created automatically. Returns the old value + */ + public V put(K key, V value) { + V answer = null; + boolean isFirst = true; + for (CacheLoaderOld<K, V> l : writeCacheLoaders) { + V tAnswer = l.put(key, value); + if (isFirst) { + answer = tAnswer; + isFirst = false; + } + + } + return answer; + } + + /** + * Inserts all modifications to the backend store. Overwrite whatever is already in the datastore. + * + * @param modifications A List<Modification> of modifications + * @throws Exception + */ + @Override + public void put(List<Modification> modifications) { + for (CacheLoaderOld<K, V> l : writeCacheLoaders) { + l.put(modifications); + } + } + + /** + * Removes the given key and value. No-op if key doesn't exist. Returns the first response from the loader chain. + */ + public V remove(Object key) { + V answer = null; + boolean isFirst = true; + for (CacheLoaderOld<K, V> l : writeCacheLoaders) { + V tAnswer = l.remove(key); + if (isFirst) { + answer = tAnswer; + isFirst = false; + } + } + return answer; + } + + /** + * Prepare the modifications. For example, for a DB-based CacheLoader: <ol> <li>Create a local (JDBC) transaction + * <li>Associate the local transaction with <code>tx</code> (tx is the key) <li>Execute the coresponding SQL + * statements against the DB (statements derived from modifications) </ol> For non-transactional CacheLoader (e.g. + * file-based), this could be a null operation + * + * @param tx The transaction, just used as a hashmap key + * @param modifications List<Modification>, a list of all modifications within the given transaction + * @param one_phase Persist immediately and (for example) commit the local JDBC transaction as well. When true, + * we won't get a {@link #commit(Object)} or {@link #rollback(Object)} method call later + * @throws Exception + */ + @Override + public void prepare(Object tx, List<Modification> modifications, boolean one_phase) { + for (CacheLoaderOld<K, V> l : writeCacheLoaders) { + l.prepare(tx, modifications, one_phase); + } + } + + /** + * Commit the transaction. A DB-based CacheLoader would look up the local JDBC transaction asociated with + * <code>tx</code> and commit that transaction Non-transactional CacheLoaders could simply write the data that + * was previously saved transiently under the given <code>tx</code> key, to (for example) a file system (note this + * only holds if the previous prepare() did not define one_phase=true + * + * @param tx + */ + @Override + public void commit(Object tx) { + for (CacheLoaderOld<K, V> l : writeCacheLoaders) { + l.commit(tx); + } + } + + /** + * Roll the transaction back. A DB-based CacheLoader would look up the local JDBC transaction asociated with + * <code>tx</code> and roll back that transaction + * + * @param tx + */ + @Override + public void rollback(Object tx) { + for (CacheLoaderOld<K, V> l : writeCacheLoaders) { + l.rollback(tx); + } + } + + + /** + * Creates individual cache loaders. + * + * @throws Exception + */ + @Override + public void create() { + Iterator<CacheLoaderOld<K, V>> it = cacheLoaders.iterator(); + Iterator<CacheLoaderConfig.IndividualCacheLoaderConfig> cfgIt = cacheLoaderConfigs.iterator(); + while (it.hasNext() && cfgIt.hasNext()) { + CacheLoaderOld<K, V> cl = it.next(); + CacheLoaderConfig.IndividualCacheLoaderConfig cfg = cfgIt.next(); + cl.setConfig(cfg); + registry.wireDependencies(cl); + cl.create(); + } + } + + @Override + public void start() { + for (CacheLoaderOld<K, V> cacheLoader : cacheLoaders) { + cacheLoader.start(); + } + } + + @Override + public void stop() { + for (CacheLoaderOld<K, V> cacheLoader : cacheLoaders) { + cacheLoader.stop(); + } + } + + @Override + public void destroy() { + for (CacheLoaderOld<K, V> cacheLoader : cacheLoaders) { + cacheLoader.destroy(); + } + } + + @Override + public void loadEntireState(ObjectOutputStream os) { + Iterator<CacheLoaderOld<K, V>> i = cacheLoaders.iterator(); + Iterator<CacheLoaderConfig.IndividualCacheLoaderConfig> cfgs = cacheLoaderConfigs.iterator(); + while (i.hasNext() && cfgs.hasNext()) { + CacheLoaderOld<K, V> l = i.next(); + CacheLoaderConfig.IndividualCacheLoaderConfig cfg = cfgs.next(); + if (cfg.isFetchPersistentState()) { + l.loadEntireState(os); + break; + } + } + } + + @Override + public void storeEntireState(ObjectInputStream is) { + Iterator<CacheLoaderOld<K, V>> i = writeCacheLoaders.iterator(); + Iterator<CacheLoaderConfig.IndividualCacheLoaderConfig> cfgs = cacheLoaderConfigs.iterator(); + while (i.hasNext()) { + CacheLoaderOld<K, V> l = i.next(); + CacheLoaderConfig.IndividualCacheLoaderConfig cfg = cfgs.next(); + if (cfg.isFetchPersistentState()) { + l.storeEntireState(is); + break; + } + } + + } + + /** + * Returns the number of cache loaders in the chain. + */ + public int getSize() { + return cacheLoaders.size(); + } + + /** + * Returns a List<CacheLoader> of individual cache loaders configured. + */ + public List<CacheLoaderOld<K, V>> getCacheLoaders() { + return Collections.unmodifiableList(cacheLoaders); + } + + /** + * Adds a cache loader to the chain (always added at the end of the chain) + * + * @param l the cache loader to add + * @param cfg and its configuration + */ + public void addCacheLoader(CacheLoaderOld<K, V> l, CacheLoaderConfig.IndividualCacheLoaderConfig cfg) { + synchronized (this) { + cacheLoaderConfigs.add(cfg); + cacheLoaders.add(l); + + if (!cfg.isIgnoreModifications()) { + writeCacheLoaders.add(l); + } + } + } + + @Override + public String toString() { + StringBuilder buf = new StringBuilder("ChainingCacheLoaderOld{"); + Iterator<CacheLoaderOld<K, V>> i = cacheLoaders.iterator(); + Iterator<CacheLoaderConfig.IndividualCacheLoaderConfig> c = cacheLoaderConfigs.iterator(); + int count = 0; + while (i.hasNext() && c.hasNext()) { + CacheLoaderOld<K, V> loader = i.next(); + CacheLoaderConfig.IndividualCacheLoaderConfig cfg = c.next(); + + buf.append(++count); + buf.append(": IgnoreMods? "); + buf.append(cfg.isIgnoreModifications()); + buf.append(" CLoader: "); + buf.append(loader); + buf.append("; "); + } + buf.append("}"); + return buf.toString(); + } + + public void purgeIfNecessary() throws Exception { + Iterator<CacheLoaderOld<K, V>> loaders = cacheLoaders.iterator(); + Iterator<CacheLoaderConfig.IndividualCacheLoaderConfig> configs = cacheLoaderConfigs.iterator(); + + while (loaders.hasNext() && configs.hasNext()) { + CacheLoaderOld<K, V> myLoader = loaders.next(); + CacheLoaderConfig.IndividualCacheLoaderConfig myConfig = configs.next(); + + if (!myConfig.isIgnoreModifications() && myConfig.isPurgeOnStartup()) myLoader.clear(); + } + } + + public void clear() { + for (CacheLoaderOld<K, V> l : writeCacheLoaders) + l.clear(); + } + + public List<EntryData<K, V>> getAllEntries() { + ArrayList<EntryData<K, V>> full = new ArrayList<EntryData<K, V>>(); + + for (CacheLoaderOld<K, V> l : writeCacheLoaders) + full.addAll(l.getAllEntries()); + + return full; + } + +} Property changes on: core/branches/flat/src/main/java/org/horizon/loader/ChainingCacheLoaderOld.java ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Deleted: core/branches/flat/src/main/java/org/horizon/loader/ClusteredCacheLoader.java =================================================================== --- core/branches/flat/src/main/java/org/horizon/loader/ClusteredCacheLoader.java 2009-02-10 11:54:44 UTC (rev 7672) +++ core/branches/flat/src/main/java/org/horizon/loader/ClusteredCacheLoader.java 2009-02-10 11:58:28 UTC (rev 7673) @@ -1,379 +0,0 @@ -/* - * JBoss, Home of Professional Open Source. - * Copyright 2000 - 2008, Red Hat Middleware LLC, and individual contributors - * as indicated by the @author tags. See the copyright.txt file in the - * distribution for a full listing of individual contributors. - * - * This 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 2.1 of - * the License, or (at your option) any later version. - * - * This software 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 this software; if not, write to the Free - * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA - * 02110-1301 USA, or see the FSF site: http://www.fsf.org. - */ -package org.horizon.loader; - -import net.jcip.annotations.ThreadSafe; -import org.horizon.ComponentStatus; -import org.horizon.commands.CommandsFactory; -import org.horizon.commands.DataCommand; -import org.horizon.config.CacheLoaderConfig.IndividualCacheLoaderConfig; -import org.horizon.factories.annotations.Inject; -import org.horizon.lock.StripedLock; -import org.horizon.logging.Log; -import org.horizon.logging.LogFactory; -import org.horizon.remoting.ResponseFilter; -import org.horizon.remoting.transport.Address; -import org.horizon.tree.Fqn; - -import java.io.ObjectInputStream; -import java.io.ObjectOutputStream; -import java.util.ArrayList; -import java.util.Collections; -import java.util.List; -import java.util.Map; -import java.util.Set; - -/** - * A cache loader that consults other members in the cluster for values. Does not propagate update methods since - * replication should take care of this. A <code>timeout</code> property is required, a <code>long</code> that - * specifies in milliseconds how long to wait for results before returning a null. - * - * @author <a href="mailto:manik@jboss.org">Manik Surtani (manik(a)jboss.org)</a> // TODO implement me!! - * @since 1.0 - */ -@ThreadSafe -public class ClusteredCacheLoader extends AbstractCacheLoader { - private static final Log log = LogFactory.getLog(ClusteredCacheLoader.class); - private static final boolean trace = log.isTraceEnabled(); - private StripedLock lock = new StripedLock(); - private ClusteredCacheLoaderConfig config; - private CommandsFactory commandsFactory; - - /** - * A test to check whether the cache is in its started state. If not, calls should not be made as the channel may - * not have properly started, blocks due to state transfers may be in progress, etc. - * - * @return true if the cache is in its STARTED state. - */ - protected boolean isCacheReady() { - return cache.getCacheStatus() == ComponentStatus.STARTED; - } - - @Inject - public void setCommandsFactory(CommandsFactory commandsFactory) { - this.commandsFactory = commandsFactory; - } - - /** - * Sets the configuration. A property <code>timeout</code> is used as the timeout value. - */ - public void setConfig(IndividualCacheLoaderConfig base) { -// if (base instanceof ClusteredCacheLoaderConfig) -// { -// this.config = (ClusteredCacheLoaderConfig) base; -// } -// else -// { -// config = new ClusteredCacheLoaderConfig(base); -// } - } - - public IndividualCacheLoaderConfig getConfig() { - return config; - } - - public Object get(Object key) { - return null; // TODO: Manik: Customise this generated block - } - - public boolean exists(Object key) { - return false; // TODO: Manik: Customise this generated block - } - - public Object put(Object key, Object value) { - return null; // TODO: Manik: Customise this generated block - } - - public void clear() { - // TODO: Manik: Customise this generated block - } - - public Object remove(Object key) { - return null; // TODO: Manik: Customise this generated block - } - - public List getAllEntries() { - return null; // TODO: Manik: Customise this generated block - } - - private boolean isOriginLocal() { - return cache.getAdvancedCache().getInvocationContextContainer().get().isOriginLocal(); - } - - public Set getChildrenNames(Fqn fqn) throws Exception { - if (!isCacheReady() || !isOriginLocal()) return Collections.emptySet(); - lock.acquireLock(fqn, true); -// try -// { -// GetChildrenNamesCommand command = commandsFactory.buildGetChildrenNamesCommand(fqn); -// Object resp = callRemote(command); -// return (Set) resp; -// } -// finally -// { -// lock.releaseLock(fqn); -// } - throw new RuntimeException("Implement me"); - } - - private Object callRemote(DataCommand dataCommand) throws Exception { - if (trace) log.trace("cache=" + cache.getCacheManager().getAddress() + "; calling with " + dataCommand); -// ClusteredGetCommand clusteredGet = commandsFactory.buildClusteredGetCommand(false, dataCommand); - List resps; - // JBCACHE-1186 -// resps = cache.getRPCManager().callRemoteMethods(null, clusteredGet, GroupRequest.GET_ALL, config.getTimeout(), new ResponseValidityFilter(cache.getMembers(), cache.getLocalAddress()), false); - -// if (resps == null) -// { -// if (log.isInfoEnabled()) -// log.info("No replies to call " + dataCommand + ". Perhaps we're alone in the cluster?"); -// throw new ReplicationException("No replies to call " + dataCommand + ". Perhaps we're alone in the cluster?"); -// } -// else -// { -// // test for and remove exceptions -// Iterator i = resps.iterator(); -// Object result = null; -// while (i.hasNext()) -// { -// Object o = i.next(); -// if (o instanceof Exception) -// { -// if (log.isDebugEnabled()) -// log.debug("Found remote exception among responses - removing from responses list", (Exception) o); -// } -// else if (o != null) -// { -// // keep looping till we find a FOUND answer. -// List<Boolean> clusteredGetResp = (List<Boolean>) o; -// // found? -// if (clusteredGetResp.get(0)) -// { -// result = clusteredGetResp.get(1); -// break; -// } -// } -// else if (!cache.getConfiguration().isUseRegionBasedMarshalling()) -// { -// throw new IllegalStateException("Received unexpected null response to " + clusteredGet); -// } -// // else region was inactive on peer; -// // keep looping to see if anyone else responded -// } -// -// if (trace) log.trace("got responses " + resps); -// return result; -// } - throw new RuntimeException("Implement me"); - } - - public Map get(Fqn name) throws Exception { - return get0(name); - } - - protected Map get0(Fqn name) throws Exception { - // DON'T make a remote call if this is a remote call in the first place - leads to deadlocks - JBCACHE-1103 - if (!isCacheReady() || !isOriginLocal()) return Collections.emptyMap(); - lock.acquireLock(name, true); -// try -// { -// GetDataMapCommand command = commandsFactory.buildGetDataMapCommand(name); -// Object resp = callRemote(command); -// return (Map) resp; -// } -// finally -// { -// lock.releaseLock(name); -// } - throw new RuntimeException("Implement me"); - } - - public boolean exists(Fqn name) throws Exception { - // DON'T make a remote call if this is a remote call in the first place - leads to deadlocks - JBCACHE-1103 - if (!isCacheReady() || !isOriginLocal()) return false; - - lock.acquireLock(name, false); -// try -// { -// ExistsCommand command = commandsFactory.buildExistsNodeCommand(name); -// Object resp = callRemote(command); -// return resp != null && (Boolean) resp; -// } -// finally -// { -// lock.releaseLock(name); -// } - throw new RuntimeException("Implement me"); - } - - public Object put(Fqn name, Object key, Object value) throws Exception { - // DON'T make a remote call if this is a remote call in the first place - leads to deadlocks - JBCACHE-1103 - if (!isCacheReady() || !isOriginLocal()) return null; - lock.acquireLock(name, true); - try { -// NodeSPI n = cache.peek(name, false); -// if (n == null) -// { -// GetKeyValueCommand command = commandsFactory.buildGetKeyValueCommand(name, key, true); -// return callRemote(command); -// } -// else -// { -// // dont bother with a remote call -// return n.getDirect(key); -// } - } - finally { - lock.releaseLock(name); - } - throw new RuntimeException("Implement me"); - } - - /** - * Does nothing; replication handles put. - */ - public void put(Fqn name, Map attributes) throws Exception { - } - - /** - * Does nothing; replication handles put. - */ -// @Override -// public void put(List<Modification> modifications) throws Exception -// { -// } - - /** - * Fetches the remove value, does not remove. Replication handles removal. - */ - public Object remove(Fqn name, Object key) throws Exception { - // DON'T make a remote call if this is a remote call in the first place - leads to deadlocks - JBCACHE-1103 - if (!isCacheReady() || !isOriginLocal()) return false; - lock.acquireLock(name, true); - try { -// NodeSPI n = cache.peek(name, true); -// if (n == null) -// { -// GetKeyValueCommand command = commandsFactory.buildGetKeyValueCommand(name, key, true); -// return callRemote(command); -// } -// else -// { -// // dont bother with a remote call -// return n.getDirect(key); -// } - } - finally { - lock.releaseLock(name); - } - throw new RuntimeException("Implement me"); - } - - /** - * Does nothing; replication handles removal. - */ - public void remove(Fqn name) throws Exception { - // do nothing - } - - /** - * Does nothing; replication handles removal. - */ - public void removeData(Fqn name) throws Exception { - } - - /** - * Does nothing. - */ -// @Override -// public void prepare(Object tx, List modifications, boolean one_phase) throws Exception -// { -// } - - /** - * Does nothing. - */ -// @Override -// public void commit(Object tx) throws Exception -// { -// } - - /** - * Does nothing. - */ - @Override - public void rollback(Object tx) { - } - -// @Override -// public void loadEntireState(ObjectOutputStream os) throws Exception -// { -// //intentional no-op -// } - - // @Override - - public void loadState(Fqn subtree, ObjectOutputStream os) throws Exception { - // intentional no-op - } - -// @Override -// public void storeEntireState(ObjectInputStream is) throws Exception -// { -// // intentional no-op -// } - - // @Override - - public void storeState(Fqn subtree, ObjectInputStream is) throws Exception { - // intentional no-op - } - - public static class ResponseValidityFilter implements ResponseFilter { - private int numValidResponses = 0; - private List<Address> pendingResponders; - - public ResponseValidityFilter(List<Address> expected, Address localAddress) { - this.pendingResponders = new ArrayList<Address>(expected); - // We'll never get a response from ourself - this.pendingResponders.remove(localAddress); - } - - public boolean isAcceptable(Object object, Address address) { - pendingResponders.remove(address); - - if (object instanceof List) { - List response = (List) object; - Boolean foundResult = (Boolean) response.get(0); - if (foundResult) numValidResponses++; - } - // always return true to make sure a response is logged by the JGroups RpcDispatcher. - return true; - } - - public boolean needMoreResponses() { - return numValidResponses < 1 && pendingResponders.size() > 0; - } - - } - -} Modified: core/branches/flat/src/main/java/org/horizon/loader/ClusteredCacheLoaderConfig.java =================================================================== --- core/branches/flat/src/main/java/org/horizon/loader/ClusteredCacheLoaderConfig.java 2009-02-10 11:54:44 UTC (rev 7672) +++ core/branches/flat/src/main/java/org/horizon/loader/ClusteredCacheLoaderConfig.java 2009-02-10 11:58:28 UTC (rev 7673) @@ -37,16 +37,16 @@ private long timeout = 10000; public ClusteredCacheLoaderConfig() { - setClassName(ClusteredCacheLoader.class.getName()); + setClassName(ClusteredCacheLoaderOld.class.getName()); } /** - * For use by {@link org.horizon.loader.ClusteredCacheLoader}. + * For use by {@link ClusteredCacheLoaderOld}. * * @param base generic config object created by XML parsing. */ ClusteredCacheLoaderConfig(IndividualCacheLoaderConfig base) { - setClassName(ClusteredCacheLoader.class.getName()); + setClassName(ClusteredCacheLoaderOld.class.getName()); populateFromBaseConfig(base); } Copied: core/branches/flat/src/main/java/org/horizon/loader/ClusteredCacheLoaderOld.java (from rev 7669, core/branches/flat/src/main/java/org/horizon/loader/ClusteredCacheLoader.java) =================================================================== --- core/branches/flat/src/main/java/org/horizon/loader/ClusteredCacheLoaderOld.java (rev 0) +++ core/branches/flat/src/main/java/org/horizon/loader/ClusteredCacheLoaderOld.java 2009-02-10 11:58:28 UTC (rev 7673) @@ -0,0 +1,379 @@ +/* + * JBoss, Home of Professional Open Source. + * Copyright 2000 - 2008, Red Hat Middleware LLC, and individual contributors + * as indicated by the @author tags. See the copyright.txt file in the + * distribution for a full listing of individual contributors. + * + * This 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 2.1 of + * the License, or (at your option) any later version. + * + * This software 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 this software; if not, write to the Free + * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA + * 02110-1301 USA, or see the FSF site: http://www.fsf.org. + */ +package org.horizon.loader; + +import net.jcip.annotations.ThreadSafe; +import org.horizon.commands.CommandsFactory; +import org.horizon.commands.DataCommand; +import org.horizon.config.CacheLoaderConfig.IndividualCacheLoaderConfig; +import org.horizon.factories.annotations.Inject; +import org.horizon.lifecycle.ComponentStatus; +import org.horizon.lock.StripedLock; +import org.horizon.logging.Log; +import org.horizon.logging.LogFactory; +import org.horizon.remoting.ResponseFilter; +import org.horizon.remoting.transport.Address; +import org.horizon.tree.Fqn; + +import java.io.ObjectInputStream; +import java.io.ObjectOutputStream; +import java.util.ArrayList; +import java.util.Collections; +import java.util.List; +import java.util.Map; +import java.util.Set; + +/** + * A cache loader that consults other members in the cluster for values. Does not propagate update methods since + * replication should take care of this. A <code>timeout</code> property is required, a <code>long</code> that + * specifies in milliseconds how long to wait for results before returning a null. + * + * @author <a href="mailto:manik@jboss.org">Manik Surtani (manik(a)jboss.org)</a> // TODO implement me!! + * @since 1.0 + */ +@ThreadSafe +public class ClusteredCacheLoaderOld extends AbstractCacheLoaderOld { + private static final Log log = LogFactory.getLog(ClusteredCacheLoaderOld.class); + private static final boolean trace = log.isTraceEnabled(); + private StripedLock lock = new StripedLock(); + private ClusteredCacheLoaderConfig config; + private CommandsFactory commandsFactory; + + /** + * A test to check whether the cache is in its started state. If not, calls should not be made as the channel may + * not have properly started, blocks due to state transfers may be in progress, etc. + * + * @return true if the cache is in its STARTED state. + */ + protected boolean isCacheReady() { + return cache.getStatus() == ComponentStatus.RUNNING; + } + + @Inject + public void setCommandsFactory(CommandsFactory commandsFactory) { + this.commandsFactory = commandsFactory; + } + + /** + * Sets the configuration. A property <code>timeout</code> is used as the timeout value. + */ + public void setConfig(IndividualCacheLoaderConfig base) { +// if (base instanceof ClusteredCacheLoaderConfig) +// { +// this.config = (ClusteredCacheLoaderConfig) base; +// } +// else +// { +// config = new ClusteredCacheLoaderConfig(base); +// } + } + + public IndividualCacheLoaderConfig getConfig() { + return config; + } + + public Object get(Object key) { + return null; // TODO: Manik: Customise this generated block + } + + public boolean exists(Object key) { + return false; // TODO: Manik: Customise this generated block + } + + public Object put(Object key, Object value) { + return null; // TODO: Manik: Customise this generated block + } + + public void clear() { + // TODO: Manik: Customise this generated block + } + + public Object remove(Object key) { + return null; // TODO: Manik: Customise this generated block + } + + public List getAllEntries() { + return null; // TODO: Manik: Customise this generated block + } + + private boolean isOriginLocal() { + return cache.getAdvancedCache().getInvocationContextContainer().get().isOriginLocal(); + } + + public Set getChildrenNames(Fqn fqn) throws Exception { + if (!isCacheReady() || !isOriginLocal()) return Collections.emptySet(); + lock.acquireLock(fqn, true); +// try +// { +// GetChildrenNamesCommand command = commandsFactory.buildGetChildrenNamesCommand(fqn); +// Object resp = callRemote(command); +// return (Set) resp; +// } +// finally +// { +// lock.releaseLock(fqn); +// } + throw new RuntimeException("Implement me"); + } + + private Object callRemote(DataCommand dataCommand) throws Exception { + if (trace) log.trace("cache=" + cache.getCacheManager().getAddress() + "; calling with " + dataCommand); +// ClusteredGetCommand clusteredGet = commandsFactory.buildClusteredGetCommand(false, dataCommand); + List resps; + // JBCACHE-1186 +// resps = cache.getRPCManager().callRemoteMethods(null, clusteredGet, GroupRequest.GET_ALL, config.getTimeout(), new ResponseValidityFilter(cache.getMembers(), cache.getLocalAddress()), false); + +// if (resps == null) +// { +// if (log.isInfoEnabled()) +// log.info("No replies to call " + dataCommand + ". Perhaps we're alone in the cluster?"); +// throw new ReplicationException("No replies to call " + dataCommand + ". Perhaps we're alone in the cluster?"); +// } +// else +// { +// // test for and remove exceptions +// Iterator i = resps.iterator(); +// Object result = null; +// while (i.hasNext()) +// { +// Object o = i.next(); +// if (o instanceof Exception) +// { +// if (log.isDebugEnabled()) +// log.debug("Found remote exception among responses - removing from responses list", (Exception) o); +// } +// else if (o != null) +// { +// // keep looping till we find a FOUND answer. +// List<Boolean> clusteredGetResp = (List<Boolean>) o; +// // found? +// if (clusteredGetResp.get(0)) +// { +// result = clusteredGetResp.get(1); +// break; +// } +// } +// else if (!cache.getConfiguration().isUseRegionBasedMarshalling()) +// { +// throw new IllegalStateException("Received unexpected null response to " + clusteredGet); +// } +// // else region was inactive on peer; +// // keep looping to see if anyone else responded +// } +// +// if (trace) log.trace("got responses " + resps); +// return result; +// } + throw new RuntimeException("Implement me"); + } + + public Map get(Fqn name) throws Exception { + return get0(name); + } + + protected Map get0(Fqn name) throws Exception { + // DON'T make a remote call if this is a remote call in the first place - leads to deadlocks - JBCACHE-1103 + if (!isCacheReady() || !isOriginLocal()) return Collections.emptyMap(); + lock.acquireLock(name, true); +// try +// { +// GetDataMapCommand command = commandsFactory.buildGetDataMapCommand(name); +// Object resp = callRemote(command); +// return (Map) resp; +// } +// finally +// { +// lock.releaseLock(name); +// } + throw new RuntimeException("Implement me"); + } + + public boolean exists(Fqn name) throws Exception { + // DON'T make a remote call if this is a remote call in the first place - leads to deadlocks - JBCACHE-1103 + if (!isCacheReady() || !isOriginLocal()) return false; + + lock.acquireLock(name, false); +// try +// { +// ExistsCommand command = commandsFactory.buildExistsNodeCommand(name); +// Object resp = callRemote(command); +// return resp != null && (Boolean) resp; +// } +// finally +// { +// lock.releaseLock(name); +// } + throw new RuntimeException("Implement me"); + } + + public Object put(Fqn name, Object key, Object value) throws Exception { + // DON'T make a remote call if this is a remote call in the first place - leads to deadlocks - JBCACHE-1103 + if (!isCacheReady() || !isOriginLocal()) return null; + lock.acquireLock(name, true); + try { +// NodeSPI n = cache.peek(name, false); +// if (n == null) +// { +// GetKeyValueCommand command = commandsFactory.buildGetKeyValueCommand(name, key, true); +// return callRemote(command); +// } +// else +// { +// // dont bother with a remote call +// return n.getDirect(key); +// } + } + finally { + lock.releaseLock(name); + } + throw new RuntimeException("Implement me"); + } + + /** + * Does nothing; replication handles put. + */ + public void put(Fqn name, Map attributes) throws Exception { + } + + /** + * Does nothing; replication handles put. + */ +// @Override +// public void put(List<Modification> modifications) throws Exception +// { +// } + + /** + * Fetches the remove value, does not remove. Replication handles removal. + */ + public Object remove(Fqn name, Object key) throws Exception { + // DON'T make a remote call if this is a remote call in the first place - leads to deadlocks - JBCACHE-1103 + if (!isCacheReady() || !isOriginLocal()) return false; + lock.acquireLock(name, true); + try { +// NodeSPI n = cache.peek(name, true); +// if (n == null) +// { +// GetKeyValueCommand command = commandsFactory.buildGetKeyValueCommand(name, key, true); +// return callRemote(command); +// } +// else +// { +// // dont bother with a remote call +// return n.getDirect(key); +// } + } + finally { + lock.releaseLock(name); + } + throw new RuntimeException("Implement me"); + } + + /** + * Does nothing; replication handles removal. + */ + public void remove(Fqn name) throws Exception { + // do nothing + } + + /** + * Does nothing; replication handles removal. + */ + public void removeData(Fqn name) throws Exception { + } + + /** + * Does nothing. + */ +// @Override +// public void prepare(Object tx, List modifications, boolean one_phase) throws Exception +// { +// } + + /** + * Does nothing. + */ +// @Override +// public void commit(Object tx) throws Exception +// { +// } + + /** + * Does nothing. + */ + @Override + public void rollback(Object tx) { + } + +// @Override +// public void loadEntireState(ObjectOutputStream os) throws Exception +// { +// //intentional no-op +// } + + // @Override + + public void loadState(Fqn subtree, ObjectOutputStream os) throws Exception { + // intentional no-op + } + +// @Override +// public void storeEntireState(ObjectInputStream is) throws Exception +// { +// // intentional no-op +// } + + // @Override + + public void storeState(Fqn subtree, ObjectInputStream is) throws Exception { + // intentional no-op + } + + public static class ResponseValidityFilter implements ResponseFilter { + private int numValidResponses = 0; + private List<Address> pendingResponders; + + public ResponseValidityFilter(List<Address> expected, Address localAddress) { + this.pendingResponders = new ArrayList<Address>(expected); + // We'll never get a response from ourself + this.pendingResponders.remove(localAddress); + } + + public boolean isAcceptable(Object object, Address address) { + pendingResponders.remove(address); + + if (object instanceof List) { + List response = (List) object; + Boolean foundResult = (Boolean) response.get(0); + if (foundResult) numValidResponses++; + } + // always return true to make sure a response is logged by the JGroups RpcDispatcher. + return true; + } + + public boolean needMoreResponses() { + return numValidResponses < 1 && pendingResponders.size() > 0; + } + + } + +} Property changes on: core/branches/flat/src/main/java/org/horizon/loader/ClusteredCacheLoaderOld.java ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Deleted: core/branches/flat/src/main/java/org/horizon/loader/FileCacheLoader.java =================================================================== --- core/branches/flat/src/main/java/org/horizon/loader/FileCacheLoader.java 2009-02-10 11:54:44 UTC (rev 7672) +++ core/branches/flat/src/main/java/org/horizon/loader/FileCacheLoader.java 2009-02-10 11:58:28 UTC (rev 7673) @@ -1,415 +0,0 @@ -/* - * JBoss, Home of Professional Open Source. - * Copyright 2000 - 2008, Red Hat Middleware LLC, and individual contributors - * as indicated by the @author tags. See the copyright.txt file in the - * distribution for a full listing of individual contributors. - * - * This 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 2.1 of - * the License, or (at your option) any later version. - * - * This software 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 this software; if not, write to the Free - * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA - * 02110-1301 USA, or see the FSF site: http://www.fsf.org. - */ -package org.horizon.loader; - -import net.jcip.annotations.ThreadSafe; -import org.horizon.CacheException; -import org.horizon.config.CacheLoaderConfig.IndividualCacheLoaderConfig; -import org.horizon.lock.StripedLock; -import org.horizon.logging.Log; -import org.horizon.logging.LogFactory; -import org.horizon.marshall.EntryData; -import org.jboss.util.stream.MarshalledValueInputStream; - -import java.io.Closeable; -import java.io.File; -import java.io.FileInputStream; -import java.io.FileNotFoundException; -import java.io.FileOutputStream; -import java.io.IOException; -import java.io.ObjectInputStream; -import java.io.ObjectOutputStream; -import java.util.LinkedList; -import java.util.List; -import java.util.regex.Matcher; -import java.util.regex.Pattern; - -/** - * Simple file-based CacheLoader implementation. Nodes are directories, attributes of a node is a file in the directory - * - * The FileCacheLoader has some severe limitations which restrict its use in a production environment, or if used in - * such an environment, it should be used with due care and sufficient understanding of these limitations. <ul> <li>Due - * to the way the FileCacheLoader represents a tree structure on disk (directories and files) traversal is inefficient - * for deep trees.</li> <li>Usage on shared filesystems like NFS, Windows shares, etc. should be avoided as these do not - * implement proper file locking and can cause data corruption.</li> <li>Usage with an isolation level of NONE can cause - * corrupt writes as multiple threads attempt to write to the same file.</li> <li>File systems are inherently not - * transactional, so when attempting to use your cache in a transactional context, failures when writing to the file - * (which happens during the commit phase) cannot be recovered.</li> </ul> - * - * As a rule of thumb, it is recommended that the FileCacheLoader not be used in a highly concurrent, transactional or - * stressful environment, and its use is restricted to testing. - * - * In terms of concurrency, file systems are notoriously inconsistent in their implementations of concurrent locks. To - * get around this and to meet the thread safety contracts set out in {@link CacheLoader}, this implementation - * uses a {@link StripedLock} - * - * @author Bela Ban - * @author <a href="mailto:galder.zamarreno@jboss.com">Galder Zamarreno</a> - * @author <a href="mailto:manik@jboss.org">Manik Surtani</a> - * @since 1.0 - */ -@ThreadSafe -public class FileCacheLoader<K, V> extends AbstractCacheLoader<K, V> { - File root = null; - String rootPath = null; - Log log = LogFactory.getLog(getClass()); - - protected final StripedLock lock = new StripedLock(); - - private FileCacheLoaderConfig config; - - /** - * For full path, check '*' '<' '>' '|' '"' '?' Regex: [\*<>|"?] - */ - public static final Pattern PATH_PATTERN = Pattern.compile("[\\*<>|\"?]"); - - /** - * For fqn, check '*' '<' '>' '|' '"' '?' and also '\' '/' and ':' - */ - public static final Pattern KEY_PATTERN = Pattern.compile("[\\\\\\/:*<>|\"?]"); - private static boolean isOldWindows; - - static { - float osVersion = -1; - try { - osVersion = Float.parseFloat(System.getProperty("os.version").trim()); - } - catch (Exception e) { - // ignore - } - // 4.x is windows NT/2000 and 5.x is XP. - isOldWindows = System.getProperty("os.name").toLowerCase().startsWith("windows") && osVersion < 4; - } - - public void setConfig(IndividualCacheLoaderConfig base) { - if (base instanceof FileCacheLoaderConfig) { - this.config = (FileCacheLoaderConfig) base; - } else if (base != null) { - this.config = new FileCacheLoaderConfig(base); - } - - String location = this.config != null ? this.config.getLocation() : null; - if (location != null && location.length() > 0) { - root = new File(location); - rootPath = root.getAbsolutePath() + File.separator; - } - } - - public IndividualCacheLoaderConfig getConfig() { - return config; - } - - @Override - public void create() { - if (root == null) { - String tmpLocation = System.getProperty("java.io.tmpdir", "C:\\tmp"); - root = new File(tmpLocation); - rootPath = root.getAbsolutePath() + File.separator; - } - if (!root.exists()) { - if (log.isTraceEnabled()) { - log.trace("Creating cache loader location " + root); - } - - if (config.isCheckCharacterPortability()) { - /* Before creating the root, check whether the path is character portable. Anything that comes after is part - of the fqn which is inspected later. */ - isCharacterPortableLocation(root.getAbsolutePath()); - } - - boolean created = root.mkdirs(); - if (!created) { - throw new CacheException("Unable to create cache loader location " + root); - } - } - - if (!root.isDirectory()) { - throw new CacheException("Cache loader location [" + root + "] is not a directory!"); - } - } - - public V get(Object key) { - lock(key); - try { - try { - return loadValue(key); - } - catch (Exception e) { - throw new CacheException(e); - } - } - finally { - unlock(key); - } - } - - public boolean exists(Object key) { - lock(key); - try { - return getFile(key, false).exists(); - } - catch (IOException e) { - throw new CacheException(e); - } - finally { - unlock(key); - } - } - - public V put(K key, V value) { - lock(key); - try { - V retval; - try { - retval = loadValue(key); - storeValue(key, value); - return retval; - } - catch (Exception e) { - throw new CacheException(e); - } - } - finally { - unlock(key); - } - } - - public V remove(Object key) { - lock(key); - try { - V retval; - try { - File file = getFile(key, false); - if (!file.exists()) - return null; - - retval = loadValue(key); - file.delete(); - return retval; - } - catch (Exception e) { - throw new CacheException(e); - } - } - finally { - unlock(key); - } - } - - private void unlock(Object key) { - lock.releaseLock(key.toString()); - } - - private void lock(Object key) { - lock.acquireLock(key.toString(), true); - } - - private File getDirectory(Object key, boolean create) throws IOException { - File f = new File(getFullPath(key)); - if (!f.exists()) { - if (create) { - boolean make = f.mkdirs(); - if (!make) - throw new IOException("Unable to mkdirs " + f); - } - } - return f; - } - - private String getFullPath(Object key) { - return rootPath; - } - - private void safeClose(Closeable closeable) { - if (closeable == null) - return; - - try { - closeable.close(); - } - catch (IOException e) { - } - } - - private V loadValue(Object key) throws Exception { - File child = getFile(key, false); - if (!child.exists()) - return null; - - return loadValue(child); - } - - private V loadValue(File file) throws Exception { - FileInputStream fileIn = null; - ObjectInputStream input = null; - - try { - fileIn = new FileInputStream(file); - input = new MarshalledValueInputStream(fileIn); - return (V) getMarshaller().objectFromObjectStream(input); - } - catch (FileNotFoundException fnfe) { - return null; - } - finally { - safeClose(input); - safeClose(fileIn); - } - } - - private EntryData<K, V> loadEntry(File file) throws Exception { - FileInputStream fileIn = null; - ObjectInputStream input = null; - - try { - fileIn = new FileInputStream(file); - input = new MarshalledValueInputStream(fileIn); - V value = (V) getMarshaller().objectFromObjectStream(input); - K key = (K) getMarshaller().objectFromObjectStream(input); - return new EntryData<K, V>(key, value); - } - catch (FileNotFoundException fnfe) { - return null; - } - finally { - safeClose(input); - safeClose(fileIn); - } - } - - private File getFile(Object key, boolean create) throws IOException { - File directory = getDirectory(key, create); - File child = new File(directory, key.toString()); - if (create && !child.exists()) { - if (config.isCheckCharacterPortability()) { - /* Check whether the entire file path (root + fqn + data file name), is length portable */ - isLengthPortablePath(child.getAbsolutePath()); - /* Check whether the fqn tree we're trying to store could contain non portable characters */ - isCharacterPortableKey(key); - } - - if (!child.createNewFile()) { - throw new IOException("Unable to create file: " + child); - } - } - - return child; - } - - protected void storeValue(Object key, Object value) throws Exception { - File child = getFile(key, true); - - FileOutputStream fileOut = null; - ObjectOutputStream output = null; - try { - fileOut = new FileOutputStream(child); - output = new ObjectOutputStream(fileOut); - getMarshaller().objectToObjectStream(value, output); - getMarshaller().objectToObjectStream(key, output); // For getAllEntries - } - finally { - safeClose(output); - safeClose(fileOut); - } - } - - protected boolean isCharacterPortableLocation(String fileAbsolutePath) { - Matcher matcher = PATH_PATTERN.matcher(fileAbsolutePath); - if (matcher.find()) { - log.warn("Cache loader location ( " + fileAbsolutePath + " ) contains one of these characters: '*' '<' '>' '|' '\"' '?'"); - log.warn("Directories containing these characters are illegal in some operative systems and could lead to portability issues"); - return false; - } - - return true; - } - - protected boolean isCharacterPortableKey(Object key) { - // getFullPath converts Object to String via toString(), so we do too - Matcher matcher = KEY_PATTERN.matcher(key.toString()); - if (matcher.find()) { - log.warn("The key.toString() contains one of these characters: '*' '<' '>' '|' '\"' '?' '\\' '/' ':' "); - log.warn("Directories containing these characters are illegal in some operating systems and could lead to portability issues"); - return false; - } - - return true; - } - - protected boolean isLengthPortablePath(String absoluteFqnPath) { - - if (isOldWindows && absoluteFqnPath.length() > 255) { - log.warn("The full absolute path to the fqn that you are trying to store is bigger than 255 characters, this could lead to problems on certain Windows systems: " + absoluteFqnPath); - return false; - } - - return true; - } - - public void clear() { - File directory = new File(rootPath); - if (!directory.exists()) - return; - - File[] files = directory.listFiles(); - if (files != null) { - for (File file : files) { - try { - lock(file.getName()); - if (file.exists()) - file.delete(); - } - finally { - unlock(file.getName()); - } - } - } - } - - public List<EntryData<K, V>> getAllEntries() { - List<EntryData<K, V>> entries = new LinkedList<EntryData<K, V>>(); - File directory = new File(rootPath); - if (!directory.exists()) - return entries; - - File[] files = directory.listFiles(); - if (files != null) { - for (File file : files) { - try { - lock(file.getName()); - if (file.exists()) { - EntryData<K, V> entry = loadEntry(file); - if (entry != null) - entries.add(entry); - } - } - catch (Exception e) { - } - finally { - unlock(file.getName()); - } - } - } - - return entries; - } -} Modified: core/branches/flat/src/main/java/org/horizon/loader/FileCacheLoaderConfig.java =================================================================== --- core/branches/flat/src/main/java/org/horizon/loader/FileCacheLoaderConfig.java 2009-02-10 11:54:44 UTC (rev 7672) +++ core/branches/flat/src/main/java/org/horizon/loader/FileCacheLoaderConfig.java 2009-02-10 11:58:28 UTC (rev 7673) @@ -35,16 +35,16 @@ private boolean checkCharacterPortability = true; public FileCacheLoaderConfig() { - setClassName(FileCacheLoader.class.getName()); + setClassName(FileCacheLoaderOld.class.getName()); } /** - * For use by {@link FileCacheLoader}. + * For use by {@link FileCacheLoaderOld}. * * @param base generic config object created by XML parsing. */ FileCacheLoaderConfig(IndividualCacheLoaderConfig base) { - setClassName(FileCacheLoader.class.getName()); + setClassName(FileCacheLoaderOld.class.getName()); populateFromBaseConfig(base); } Copied: core/branches/flat/src/main/java/org/horizon/loader/FileCacheLoaderOld.java (from rev 7666, core/branches/flat/src/main/java/org/horizon/loader/FileCacheLoader.java) =================================================================== --- core/branches/flat/src/main/java/org/horizon/loader/FileCacheLoaderOld.java (rev 0) +++ core/branches/flat/src/main/java/org/horizon/loader/FileCacheLoaderOld.java 2009-02-10 11:58:28 UTC (rev 7673) @@ -0,0 +1,415 @@ +/* + * JBoss, Home of Professional Open Source. + * Copyright 2000 - 2008, Red Hat Middleware LLC, and individual contributors + * as indicated by the @author tags. See the copyright.txt file in the + * distribution for a full listing of individual contributors. + * + * This 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 2.1 of + * the License, or (at your option) any later version. + * + * This software 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 this software; if not, write to the Free + * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA + * 02110-1301 USA, or see the FSF site: http://www.fsf.org. + */ +package org.horizon.loader; + +import net.jcip.annotations.ThreadSafe; +import org.horizon.CacheException; +import org.horizon.config.CacheLoaderConfig.IndividualCacheLoaderConfig; +import org.horizon.lock.StripedLock; +import org.horizon.logging.Log; +import org.horizon.logging.LogFactory; +import org.horizon.marshall.EntryData; +import org.jboss.util.stream.MarshalledValueInputStream; + +import java.io.Closeable; +import java.io.File; +import java.io.FileInputStream; +import java.io.FileNotFoundException; +import java.io.FileOutputStream; +import java.io.IOException; +import java.io.ObjectInputStream; +import java.io.ObjectOutputStream; +import java.util.LinkedList; +import java.util.List; +import java.util.regex.Matcher; +import java.util.regex.Pattern; + +/** + * Simple file-based CacheLoader implementation. Nodes are directories, attributes of a node is a file in the directory + * + * The FileCacheLoader has some severe limitations which restrict its use in a production environment, or if used in + * such an environment, it should be used with due care and sufficient understanding of these limitations. <ul> <li>Due + * to the way the FileCacheLoader represents a tree structure on disk (directories and files) traversal is inefficient + * for deep trees.</li> <li>Usage on shared filesystems like NFS, Windows shares, etc. should be avoided as these do not + * implement proper file locking and can cause data corruption.</li> <li>Usage with an isolation level of NONE can cause + * corrupt writes as multiple threads attempt to write to the same file.</li> <li>File systems are inherently not + * transactional, so when attempting to use your cache in a transactional context, failures when writing to the file + * (which happens during the commit phase) cannot be recovered.</li> </ul> + * + * As a rule of thumb, it is recommended that the FileCacheLoader not be used in a highly concurrent, transactional or + * stressful environment, and its use is restricted to testing. + * + * In terms of concurrency, file systems are notoriously inconsistent in their implementations of concurrent locks. To + * get around this and to meet the thread safety contracts set out in {@link CacheLoaderOld}, this implementation + * uses a {@link StripedLock} + * + * @author Bela Ban + * @author <a href="mailto:galder.zamarreno@jboss.com">Galder Zamarreno</a> + * @author <a href="mailto:manik@jboss.org">Manik Surtani</a> + * @since 1.0 + */ +@ThreadSafe +public class FileCacheLoaderOld<K, V> extends AbstractCacheLoaderOld<K, V> { + File root = null; + String rootPath = null; + Log log = LogFactory.getLog(getClass()); + + protected final StripedLock lock = new StripedLock(); + + private FileCacheLoaderConfig config; + + /** + * For full path, check '*' '<' '>' '|' '"' '?' Regex: [\*<>|"?] + */ + public static final Pattern PATH_PATTERN = Pattern.compile("[\\*<>|\"?]"); + + /** + * For fqn, check '*' '<' '>' '|' '"' '?' and also '\' '/' and ':' + */ + public static final Pattern KEY_PATTERN = Pattern.compile("[\\\\\\/:*<>|\"?]"); + private static boolean isOldWindows; + + static { + float osVersion = -1; + try { + osVersion = Float.parseFloat(System.getProperty("os.version").trim()); + } + catch (Exception e) { + // ignore + } + // 4.x is windows NT/2000 and 5.x is XP. + isOldWindows = System.getProperty("os.name").toLowerCase().startsWith("windows") && osVersion < 4; + } + + public void setConfig(IndividualCacheLoaderConfig base) { + if (base instanceof FileCacheLoaderConfig) { + this.config = (FileCacheLoaderConfig) base; + } else if (base != null) { + this.config = new FileCacheLoaderConfig(base); + } + + String location = this.config != null ? this.config.getLocation() : null; + if (location != null && location.length() > 0) { + root = new File(location); + rootPath = root.getAbsolutePath() + File.separator; + } + } + + public IndividualCacheLoaderConfig getConfig() { + return config; + } + + @Override + public void create() { + if (root == null) { + String tmpLocation = System.getProperty("java.io.tmpdir", "C:\\tmp"); + root = new File(tmpLocation); + rootPath = root.getAbsolutePath() + File.separator; + } + if (!root.exists()) { + if (log.isTraceEnabled()) { + log.trace("Creating cache loader location " + root); + } + + if (config.isCheckCharacterPortability()) { + /* Before creating the root, check whether the path is character portable. Anything that comes after is part + of the fqn which is inspected later. */ + isCharacterPortableLocation(root.getAbsolutePath()); + } + + boolean created = root.mkdirs(); + if (!created) { + throw new CacheException("Unable to create cache loader location " + root); + } + } + + if (!root.isDirectory()) { + throw new CacheException("Cache loader location [" + root + "] is not a directory!"); + } + } + + public V get(Object key) { + lock(key); + try { + try { + return loadValue(key); + } + catch (Exception e) { + throw new CacheException(e); + } + } + finally { + unlock(key); + } + } + + public boolean exists(Object key) { + lock(key); + try { + return getFile(key, false).exists(); + } + catch (IOException e) { + throw new CacheException(e); + } + finally { + unlock(key); + } + } + + public V put(K key, V value) { + lock(key); + try { + V retval; + try { + retval = loadValue(key); + storeValue(key, value); + return retval; + } + catch (Exception e) { + throw new CacheException(e); + } + } + finally { + unlock(key); + } + } + + public V remove(Object key) { + lock(key); + try { + V retval; + try { + File file = getFile(key, false); + if (!file.exists()) + return null; + + retval = loadValue(key); + file.delete(); + return retval; + } + catch (Exception e) { + throw new CacheException(e); + } + } + finally { + unlock(key); + } + } + + private void unlock(Object key) { + lock.releaseLock(key.toString()); + } + + private void lock(Object key) { + lock.acquireLock(key.toString(), true); + } + + private File getDirectory(Object key, boolean create) throws IOException { + File f = new File(getFullPath(key)); + if (!f.exists()) { + if (create) { + boolean make = f.mkdirs(); + if (!make) + throw new IOException("Unable to mkdirs " + f); + } + } + return f; + } + + private String getFullPath(Object key) { + return rootPath; + } + + private void safeClose(Closeable closeable) { + if (closeable == null) + return; + + try { + closeable.close(); + } + catch (IOException e) { + } + } + + private V loadValue(Object key) throws Exception { + File child = getFile(key, false); + if (!child.exists()) + return null; + + return loadValue(child); + } + + private V loadValue(File file) throws Exception { + FileInputStream fileIn = null; + ObjectInputStream input = null; + + try { + fileIn = new FileInputStream(file); + input = new MarshalledValueInputStream(fileIn); + return (V) getMarshaller().objectFromObjectStream(input); + } + catch (FileNotFoundException fnfe) { + return null; + } + finally { + safeClose(input); + safeClose(fileIn); + } + } + + private EntryData<K, V> loadEntry(File file) throws Exception { + FileInputStream fileIn = null; + ObjectInputStream input = null; + + try { + fileIn = new FileInputStream(file); + input = new MarshalledValueInputStream(fileIn); + V value = (V) getMarshaller().objectFromObjectStream(input); + K key = (K) getMarshaller().objectFromObjectStream(input); + return new EntryData<K, V>(key, value); + } + catch (FileNotFoundException fnfe) { + return null; + } + finally { + safeClose(input); + safeClose(fileIn); + } + } + + private File getFile(Object key, boolean create) throws IOException { + File directory = getDirectory(key, create); + File child = new File(directory, key.toString()); + if (create && !child.exists()) { + if (config.isCheckCharacterPortability()) { + /* Check whether the entire file path (root + fqn + data file name), is length portable */ + isLengthPortablePath(child.getAbsolutePath()); + /* Check whether the fqn tree we're trying to store could contain non portable characters */ + isCharacterPortableKey(key); + } + + if (!child.createNewFile()) { + throw new IOException("Unable to create file: " + child); + } + } + + return child; + } + + protected void storeValue(Object key, Object value) throws Exception { + File child = getFile(key, true); + + FileOutputStream fileOut = null; + ObjectOutputStream output = null; + try { + fileOut = new FileOutputStream(child); + output = new ObjectOutputStream(fileOut); + getMarshaller().objectToObjectStream(value, output); + getMarshaller().objectToObjectStream(key, output); // For getAllEntries + } + finally { + safeClose(output); + safeClose(fileOut); + } + } + + protected boolean isCharacterPortableLocation(String fileAbsolutePath) { + Matcher matcher = PATH_PATTERN.matcher(fileAbsolutePath); + if (matcher.find()) { + log.warn("Cache loader location ( " + fileAbsolutePath + " ) contains one of these characters: '*' '<' '>' '|' '\"' '?'"); + log.warn("Directories containing these characters are illegal in some operative systems and could lead to portability issues"); + return false; + } + + return true; + } + + protected boolean isCharacterPortableKey(Object key) { + // getFullPath converts Object to String via toString(), so we do too + Matcher matcher = KEY_PATTERN.matcher(key.toString()); + if (matcher.find()) { + log.warn("The key.toString() contains one of these characters: '*' '<' '>' '|' '\"' '?' '\\' '/' ':' "); + log.warn("Directories containing these characters are illegal in some operating systems and could lead to portability issues"); + return false; + } + + return true; + } + + protected boolean isLengthPortablePath(String absoluteFqnPath) { + + if (isOldWindows && absoluteFqnPath.length() > 255) { + log.warn("The full absolute path to the fqn that you are trying to store is bigger than 255 characters, this could lead to problems on certain Windows systems: " + absoluteFqnPath); + return false; + } + + return true; + } + + public void clear() { + File directory = new File(rootPath); + if (!directory.exists()) + return; + + File[] files = directory.listFiles(); + if (files != null) { + for (File file : files) { + try { + lock(file.getName()); + if (file.exists()) + file.delete(); + } + finally { + unlock(file.getName()); + } + } + } + } + + public List<EntryData<K, V>> getAllEntries() { + List<EntryData<K, V>> entries = new LinkedList<EntryData<K, V>>(); + File directory = new File(rootPath); + if (!directory.exists()) + return entries; + + File[] files = directory.listFiles(); + if (files != null) { + for (File file : files) { + try { + lock(file.getName()); + if (file.exists()) { + EntryData<K, V> entry = loadEntry(file); + if (entry != null) + entries.add(entry); + } + } + catch (Exception e) { + } + finally { + unlock(file.getName()); + } + } + } + + return entries; + } +} Property changes on: core/branches/flat/src/main/java/org/horizon/loader/FileCacheLoaderOld.java ___________________________________________________________________ Name: svn:executable + * Name: svn:keywords + Id Revision Name: svn:eol-style + LF Deleted: core/branches/flat/src/main/java/org/horizon/loader/ReadOnlyDelegatingCacheLoader.java =================================================================== --- core/branches/flat/src/main/java/org/horizon/loader/ReadOnlyDelegatingCacheLoader.java 2009-02-10 11:54:44 UTC (rev 7672) +++ core/branches/flat/src/main/java/org/horizon/loader/ReadOnlyDelegatingCacheLoader.java 2009-02-10 11:58:28 UTC (rev 7673) @@ -1,84 +0,0 @@ -/* - * JBoss, Home of Professional Open Source. - * Copyright 2000 - 2008, Red Hat Middleware LLC, and individual contributors - * as indicated by the @author tags. See the copyright.txt file in the - * distribution for a full listing of individual contributors. - * - * This 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 2.1 of - * the License, or (at your option) any later version. - * - * This software 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 this software; if not, write to the Free - * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA - * 02110-1301 USA, or see the FSF site: http://www.fsf.org. - */ -package org.horizon.loader; - -import org.horizon.logging.Log; -import org.horizon.logging.LogFactory; - -import java.io.ObjectInputStream; -import java.util.List; - -/** - * Provides ignoreModifications features to all cache loaders. - * - * @author <a href="mailto:manik@jboss.org">Manik Surtani</a> - * @since 1.0 - */ -public class ReadOnlyDelegatingCacheLoader<K, V> extends AbstractDelegatingCacheLoader<K, V> { - private static final Log log = LogFactory.getLog(ReadOnlyDelegatingCacheLoader.class); - - public ReadOnlyDelegatingCacheLoader(CacheLoader cl) { - super(cl); - } - - @Override - public V put(K key, V value) { - log.trace("Not delegating write operation to underlying cache loader"); - return get(key); - } - - @Override - public void put(List<Modification> modifications) { - log.trace("Not delegating write operation to underlying cache loader"); - } - - @Override - public V remove(Object key) { - log.trace("Not delegating write operation to underlying cache loader"); - return get(key); - } - - @Override - public void prepare(Object tx, List<Modification> modifications, boolean one_phase) { - log.trace("Not delegating write operation to underlying cache loader"); - } - - @Override - public void commit(Object tx) { - log.trace("Not delegating write operation to underlying cache loader"); - } - - @Override - public void rollback(Object tx) { - log.trace("Not delegating write operation to underlying cache loader"); - } - - @Override - public void storeEntireState(ObjectInputStream is) { - log.trace("Not delegating write operation to underlying cache loader"); - } - - @Override - public void clear() { - log.trace("Not delegating write operation to underlying cache loader"); - } -} Copied: core/branches/flat/src/main/java/org/horizon/loader/ReadOnlyDelegatingCacheLoaderOld.java (from rev 7666, core/branches/flat/src/main/java/org/horizon/loader/ReadOnlyDelegatingCacheLoader.java) =================================================================== --- core/branches/flat/src/main/java/org/horizon/loader/ReadOnlyDelegatingCacheLoaderOld.java (rev 0) +++ core/branches/flat/src/main/java/org/horizon/loader/ReadOnlyDelegatingCacheLoaderOld.java 2009-02-10 11:58:28 UTC (rev 7673) @@ -0,0 +1,84 @@ +/* + * JBoss, Home of Professional Open Source. + * Copyright 2000 - 2008, Red Hat Middleware LLC, and individual contributors + * as indicated by the @author tags. See the copyright.txt file in the + * distribution for a full listing of individual contributors. + * + * This 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 2.1 of + * the License, or (at your option) any later version. + * + * This software 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 this software; if not, write to the Free + * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA + * 02110-1301 USA, or see the FSF site: http://www.fsf.org. + */ +package org.horizon.loader; + +import org.horizon.logging.Log; +import org.horizon.logging.LogFactory; + +import java.io.ObjectInputStream; +import java.util.List; + +/** + * Provides ignoreModifications features to all cache loaders. + * + * @author <a href="mailto:manik@jboss.org">Manik Surtani</a> + * @since 1.0 + */ +public class ReadOnlyDelegatingCacheLoaderOld<K, V> extends AbstractDelegatingCacheLoaderOld<K, V> { + private static final Log log = LogFactory.getLog(ReadOnlyDelegatingCacheLoaderOld.class); + + public ReadOnlyDelegatingCacheLoaderOld(CacheLoaderOld cl) { + super(cl); + } + + @Override + public V put(K key, V value) { + log.trace("Not delegating write operation to underlying cache loader"); + return get(key); + } + + @Override + public void put(List<Modification> modifications) { + log.trace("Not delegating write operation to underlying cache loader"); + } + + @Override + public V remove(Object key) { + log.trace("Not delegating write operation to underlying cache loader"); + return get(key); + } + + @Override + public void prepare(Object tx, List<Modification> modifications, boolean one_phase) { + log.trace("Not delegating write operation to underlying cache loader"); + } + + @Override + public void commit(Object tx) { + log.trace("Not delegating write operation to underlying cache loader"); + } + + @Override + public void rollback(Object tx) { + log.trace("Not delegating write operation to underlying cache loader"); + } + + @Override + public void storeEntireState(ObjectInputStream is) { + log.trace("Not delegating write operation to underlying cache loader"); + } + + @Override + public void clear() { + log.trace("Not delegating write operation to underlying cache loader"); + } +} Property changes on: core/branches/flat/src/main/java/org/horizon/loader/ReadOnlyDelegatingCacheLoaderOld.java ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Deleted: core/branches/flat/src/main/java/org/horizon/loader/SingletonStoreCacheLoader.java =================================================================== --- core/branches/flat/src/main/java/org/horizon/loader/SingletonStoreCacheLoader.java 2009-02-10 11:54:44 UTC (rev 7672) +++ core/branches/flat/src/main/java/org/horizon/loader/SingletonStoreCacheLoader.java 2009-02-10 11:58:28 UTC (rev 7673) @@ -1,506 +0,0 @@ -/* - * JBoss, Home of Professional Open Source. - * Copyright 2000 - 2008, Red Hat Middleware LLC, and individual contributors - * as indicated by the @author tags. See the copyright.txt file in the - * distribution for a full listing of individual contributors. - * - * This 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 2.1 of - * the License, or (at your option) any later version. - * - * This software 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 this software; if not, write to the Free - * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA - * 02110-1301 USA, or see the FSF site: http://www.fsf.org. - */ -package org.horizon.loader; - -import org.horizon.config.CacheLoaderConfig; -import org.horizon.config.CacheLoaderConfig.IndividualCacheLoaderConfig.SingletonStoreConfig; -import org.horizon.logging.Log; -import org.horizon.logging.LogFactory; -import org.horizon.notifications.Listener; -import org.horizon.notifications.cachelistener.event.Event; -import org.horizon.notifications.cachemanagerlistener.annotation.CacheStarted; -import org.horizon.notifications.cachemanagerlistener.annotation.CacheStopped; -import org.horizon.notifications.cachemanagerlistener.annotation.ViewChanged; -import org.horizon.notifications.cachemanagerlistener.event.ViewChangedEvent; -import org.horizon.remoting.transport.Address; -import org.horizon.tree.Fqn; - -import java.io.ObjectInputStream; -import java.util.List; -import java.util.Map; -import java.util.concurrent.Callable; -import java.util.concurrent.ExecutionException; -import java.util.concurrent.ExecutorService; -import java.util.concurrent.Executors; -import java.util.concurrent.Future; -import java.util.concurrent.ThreadFactory; -import java.util.concurrent.TimeUnit; -import java.util.concurrent.TimeoutException; - -/** - * SingletonStoreCacheLoader is a delegating cache loader used for situations when only one cache instance should - * interact with the underlying store. The coordinator of the cluster will be responsible for the underlying - * CacheLoader. SingletonStoreCacheLoader is a simply facade to a real CacheLoader implementation. It always delegates - * reads to the real CacheLoader. - * - * Writes are forwarded only if this SingletonStoreCacheLoader is currently the cordinator. This avoid having all - * CacheLoaders in a cluster writing the same data to the same underlying store. Although not incorrect (e.g. a DB will - * just discard additional INSERTs for the same key, and throw an exception), this will avoid a lot of redundant - * work. - * - * Whenever the current coordinator dies (or leaves), the second in line will take over. That SingletonStoreCacheLoader - * will then pass writes through to its underlying CacheLoader. Optionally, when a new coordinator takes over the - * Singleton, it can push the in-memory state to the cache cacheLoader, within a time constraint. - * - * @author Bela Ban - * @author <a href="mailto:galder.zamarreno@jboss.com">Galder Zamarreno</a> - * @since 1.0 - */ -public class SingletonStoreCacheLoader extends AbstractDelegatingCacheLoader { - /** - * Log instance. - */ - private static final Log log = LogFactory.getLog(SingletonStoreCacheLoader.class); - private static final boolean trace = log.isTraceEnabled(); - - /** - * Name of thread that should pushing in-memory state to cache loader. - */ - private static final String THREAD_NAME = "InMemoryToCacheLoaderPusher"; - - /** - * Configuration for the SingletonStoreCacheLoader. - */ - private SingletonStoreDefaultConfig config; - - /** - * Executor service used to submit tasks to push in-memory state. - */ - private final ExecutorService executor; - - /** - * Future result of the in-memory push state task. This allows SingletonStoreCacheLoader to check whether there's any - * push taks on going. - */ - private Future<?> pushStateFuture; /* FutureTask guarantess a safe publication of the result */ - - /** - * Address instance that allows SingletonStoreCacheLoader to find out whether it became the coordinator of the - * cluster, or whether it stopped being it. This dictates whether the SingletonStoreCacheLoader is active or not. - */ - private Address localAddress; - - /** - * Whether the the current cache instance is the coordinator and therefore SingletonStoreCacheLoader is active. Being - * active means delegating calls to the underlying cache loader. - */ - private boolean active; - - /** - * Empty constructor so that it can instantiated using reflection. - */ - public SingletonStoreCacheLoader() { - super(null); - - executor = Executors.newSingleThreadExecutor(new ThreadFactory() { - public Thread newThread(Runnable r) { - return new Thread(r, THREAD_NAME); - } - }); - } - - /** - * Sets the config for SingletonStoreCacheLoader and for the delegating cache loader. - */ - @Override - public void setConfig(CacheLoaderConfig.IndividualCacheLoaderConfig config) { - super.setConfig(config); - - SingletonStoreConfig ssc = config.getSingletonStoreConfig(); - if (ssc instanceof SingletonStoreDefaultConfig) { - this.config = (SingletonStoreDefaultConfig) ssc; - } else if (ssc != null) { - this.config = new SingletonStoreDefaultConfig(ssc); - } else { - this.config = new SingletonStoreDefaultConfig(); - } - } - - @Override - public void create()// throws Exception - { - super.create(); - - cache.addListener(new SingletonStoreListener()); - } - - /** - * Protected constructor which should only be used from unit tests. Production code should set - * pushStateWhenCoordinator using setConfig() method instead. - * - * @param config configuration instance for SingletonStoreCacheLoader - */ - protected SingletonStoreCacheLoader(SingletonStoreDefaultConfig config) { - this(); - - this.config = config; - } - - /** - * Returns SingletonStoreCacheLoader's configuration instance. This method has been defined for convenience reasons - * when unit testing SingletonStoreCacheLoader's configuration. - * - * @return instance of SingletonStoreDefaultConfig - */ - protected SingletonStoreDefaultConfig getSingletonStoreDefaultConfig() { - return config; - } - - /** - * Returns the Future instance of a running in-memory to cache loader push task. This method has been defined for - * convenience reasons when unit testing. - * - * @return an instance of Future - */ - protected Future<?> getPushStateFuture() { - return pushStateFuture; - } - - /** - * Method called when the cache instance either becomes the coordinator or stops being the coordinator. If it becomes - * the coordinator, it can optionally start the in-memory state transfer to the underlying cache store. - * - * @param newActiveState true if the cache instance just became the coordinator, false if the cache instance stopped - * being the coordinator. - */ - protected void activeStatusChanged(boolean newActiveState) throws PushStateException { - active = newActiveState; - log.debug("changed mode: " + this); - if (active && config.isPushStateWhenCoordinator()) { - doPushState(); - } - } - - /** - * Factory method for the creation of a Callable task in charge of pushing in-memory state to cache loader. - * - * @return new instance of Callable<?> whose call() method either throws an exception or returns null if the task was - * successfull. - */ - protected Callable<?> createPushStateTask() { - return new Callable() { - public Object call() throws Exception { - final boolean debugEnabled = log.isDebugEnabled(); - - if (debugEnabled) log.debug("start pushing in-memory state to cache cacheLoader"); -// pushState(cache.getRoot()); - if (debugEnabled) log.debug("in-memory state passed to cache cacheLoader successfully"); - - return null; - } - }; - } - - /** - * Pushes the state of a specific cache entry by reading the entry's data from the cache and putting in the cache store - * via the cache loader. This method is call recursively so that it iterates through the whole cache. - * - */ - // TODO implement me -// protected void pushState(Object key) throws Exception -// { -// /* Put the key's data first */ -// } - - /** - * Method that waits for the in-memory to cache loader state to finish. This method's called in case a push state is - * already in progress and we need to wait for it to finish. - * - * @param future instance of Future representing the on going push task - * @param timeout time to wait for the push task to finish - * @param unit instance of TimeUnit representing the unit of timeout - */ - protected void awaitForPushToFinish(Future future, int timeout, TimeUnit unit) { - final boolean debugEnabled = log.isDebugEnabled(); - try { - if (debugEnabled) log.debug("wait for state push to cache loader to finish"); - future.get(timeout, unit); - } - catch (TimeoutException e) { - if (debugEnabled) log.debug("timed out waiting for state push to cache loader to finish"); - } - catch (ExecutionException e) { - if (debugEnabled) log.debug("exception reported waiting for state push to cache loader to finish"); - } - catch (InterruptedException ie) { - /* Re-assert the thread's interrupted status */ - Thread.currentThread().interrupt(); - if (trace) log.trace("wait for state push to cache loader to finish was interrupted"); - } - } - - /** - * Called when the SingletonStoreCacheLoader discovers that the cache instance has become the coordinator and push in - * memory state has been enabled. It might not actually push the state if there's an ongoing push task running, in - * which case will wait for the push task to finish. - * - * @throws PushStateException when the push state task reports an issue. - */ - private void doPushState() throws PushStateException { - if (pushStateFuture == null || pushStateFuture.isDone()) { - Callable<?> task = createPushStateTask(); - pushStateFuture = executor.submit(task); - try { - waitForTaskToFinish(pushStateFuture, config.getPushStateWhenCoordinatorTimeout(), TimeUnit.MILLISECONDS); - } - catch (Exception e) { - throw new PushStateException("unable to complete in memory state push to cache loader", e); - } - } else { - /* at the most, we wait for push state timeout value. if it push task finishes earlier, this call - * will stop when the push task finishes, otherwise a timeout exception will be reported */ - awaitForPushToFinish(pushStateFuture, config.getPushStateWhenCoordinatorTimeout(), TimeUnit.MILLISECONDS); - } - } - - /** - * Waits, within a time constraint, for a task to finish. - * - * @param future represents the task waiting to finish. - * @param timeout maximum time to wait for the time to finish. - * @param unit instance of TimeUnit representing the unit of timeout - * @throws Exception if any issues are reported while waiting for the task to finish - */ - private void waitForTaskToFinish(Future future, int timeout, TimeUnit unit) throws Exception { - try { - future.get(timeout, unit); - } - catch (TimeoutException e) { - throw new Exception("task timed out", e); - } - catch (InterruptedException e) { - /* Re-assert the thread's interrupted status */ - Thread.currentThread().interrupt(); - if (trace) log.trace("task was interrupted"); - } - finally { - /* no-op if task is completed */ - future.cancel(true); /* interrupt if running */ - } - } - - /** - * Indicates whether the current cache instances is the coordinator of the cluster. - * - * @param members new member list - * @return whether the current cache instance is the coordinator or not. - */ - private boolean isCoordinator(List<Address> members) { - if (members != null && localAddress != null) { - return members.size() > 0 && localAddress.equals(members.get(0)); - } - - /* Invalid new view, so previous value returned */ - return active; - } - - /** - * Calls the underlying cache loader's operation if the current cache instance is the coordinator. - */ -// @Override - public Object put(Fqn name, Object key, Object value) throws Exception { - if (active) { -// return super.put(name, key, value); - } - - return null; - } - - /** - * Calls the underlying cache loader's operation if the current cache instance is the coordinator. - */ -// @Override - public void put(Fqn name, Map attributes) throws Exception { - // TODO implement me -// if (active) -// { -// super.put(name, attributes); -// } - } - - /** - * Calls the underlying cache loader's operation if the current cache instance is the coordinator. - */ -// @Override -// public void put(List<Modification> modifications) throws Exception -// { - // TODO implement me -// if (active) -// { -// super.put(modifications); -// } -// } - - /** - * Calls the underlying cache loader's operation if the current cache instance is the coordinator. - */ -// @Override - public Object remove(Fqn fqn, Object key) throws Exception { - if (active) { -// return super.remove(fqn, key); - } - - return null; - } - - /** - * Calls the underlying cache loader's operation if the current cache instance is the coordinator. - */ -// @Override - public void remove(Fqn fqn) throws Exception { - if (active) { - super.remove(fqn); - } - } - - /** - * Calls the underlying cache loader's operation if the current cache instance is the coordinator. - */ -// @Override - public void removeData(Fqn fqn) throws Exception { - if (active) { -// super.removeData(fqn); - } - } - - /** - * Calls the underlying cache loader's operation if the current cache instance is the coordinator. - */ -// @Override -// public void prepare(Object tx, List<Modification> modifications, boolean one_phase) throws Exception -// { -// if (active) -// { -// super.prepare(tx, modifications, one_phase); -// } -// } - - /** - * Calls the underlying cache loader's operation if the current cache instance is the coordinator. - */ - @Override - public void commit(Object tx) // throws Exception - { - if (active) { - super.commit(tx); - } - } - - /** - * Calls the underlying cache loader's operation if the current cache instance is the coordinator. - */ - @Override - public void rollback(Object tx) { - if (active) { - super.rollback(tx); - } - } - - /** - * Calls the underlying cache loader's operation if the current cache instance is the coordinator. - */ - @Override - public void storeEntireState(ObjectInputStream is) //throws Exception - { - if (active) { - super.storeEntireState(is); - } - } - - /** - * Calls the underlying cache loader's operation if the current cache instance is the coordinator. - */ -// @Override - public void storeState(Fqn subtree, ObjectInputStream is) throws Exception { - if (active) { - // super.storeState(subtree, is); - } - } - - /** - * Calls the underlying cache loader's operation if the current cache instance is the coordinator. - */ - @Override - public String toString() { - return "loc_addr=" + localAddress + ", active=" + active; - } - - /** - * Cache listener that reacts to cluster topology changes to find out whether a new coordinator is elected. - * SingletonStoreCacheLoader reacts to these changes in order to decide which cache instance should interact with the - * underlying cache store. - */ - @Listener - public class SingletonStoreListener { - /** - * Cache started, check whether the cache instance is the coordinator and set the singleton store cache loader's - * active status. - */ - @CacheStarted - public void cacheStarted(Event e) { - localAddress = cache.getCacheManager().getAddress(); - active = cache.getCacheManager().isCoordinator(); - if (log.isDebugEnabled()) log.debug("cache started: " + this); - } - - @CacheStopped - public void cacheStopped(Event e) { - if (log.isDebugEnabled()) log.debug("cache stopped: " + this); - } - - /** - * The cluster formation changed, so determine whether the current cache instance stopped being the coordinator or - * became the coordinator. This method can lead to an optional in memory to cache loader state push, if the - * current cache instance became the coordinator. This method will report any issues that could potentially arise - * from this push. - */ - @ViewChanged - public void viewChange(ViewChangedEvent event) { - boolean tmp = isCoordinator(event.getNewMemberList()); - - if (active != tmp) { - try { - activeStatusChanged(tmp); - } - catch (PushStateException e) { - log.error("exception reported changing cache instance's active status", e); - } - - } - } - } - - /** - * Exception representing any issues that arise from pushing the in-memory state to the cache loader. - */ - public static class PushStateException extends Exception { - private static final long serialVersionUID = 5542893943730200886L; - - public PushStateException(String message, Throwable cause) { - super(message, cause); - } - - public PushStateException(Throwable cause) { - super(cause); - } - } -} \ No newline at end of file Copied: core/branches/flat/src/main/java/org/horizon/loader/SingletonStoreCacheLoaderOld.java (from rev 7669, core/branches/flat/src/main/java/org/horizon/loader/SingletonStoreCacheLoader.java) =================================================================== --- core/branches/flat/src/main/java/org/horizon/loader/SingletonStoreCacheLoaderOld.java (rev 0) +++ core/branches/flat/src/main/java/org/horizon/loader/SingletonStoreCacheLoaderOld.java 2009-02-10 11:58:28 UTC (rev 7673) @@ -0,0 +1,506 @@ +/* + * JBoss, Home of Professional Open Source. + * Copyright 2000 - 2008, Red Hat Middleware LLC, and individual contributors + * as indicated by the @author tags. See the copyright.txt file in the + * distribution for a full listing of individual contributors. + * + * This 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 2.1 of + * the License, or (at your option) any later version. + * + * This software 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 this software; if not, write to the Free + * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA + * 02110-1301 USA, or see the FSF site: http://www.fsf.org. + */ +package org.horizon.loader; + +import org.horizon.config.CacheLoaderConfig; +import org.horizon.config.CacheLoaderConfig.IndividualCacheLoaderConfig.SingletonStoreConfig; +import org.horizon.logging.Log; +import org.horizon.logging.LogFactory; +import org.horizon.notifications.Listener; +import org.horizon.notifications.cachelistener.event.Event; +import org.horizon.notifications.cachemanagerlistener.annotation.CacheStarted; +import org.horizon.notifications.cachemanagerlistener.annotation.CacheStopped; +import org.horizon.notifications.cachemanagerlistener.annotation.ViewChanged; +import org.horizon.notifications.cachemanagerlistener.event.ViewChangedEvent; +import org.horizon.remoting.transport.Address; +import org.horizon.tree.Fqn; + +import java.io.ObjectInputStream; +import java.util.List; +import java.util.Map; +import java.util.concurrent.Callable; +import java.util.concurrent.ExecutionException; +import java.util.concurrent.ExecutorService; +import java.util.concurrent.Executors; +import java.util.concurrent.Future; +import java.util.concurrent.ThreadFactory; +import java.util.concurrent.TimeUnit; +import java.util.concurrent.TimeoutException; + +/** + * SingletonStoreCacheLoader is a delegating cache loader used for situations when only one cache instance should + * interact with the underlying store. The coordinator of the cluster will be responsible for the underlying + * CacheLoader. SingletonStoreCacheLoader is a simply facade to a real CacheLoader implementation. It always delegates + * reads to the real CacheLoader. + * + * Writes are forwarded only if this SingletonStoreCacheLoader is currently the cordinator. This avoid having all + * CacheLoaders in a cluster writing the same data to the same underlying store. Although not incorrect (e.g. a DB will + * just discard additional INSERTs for the same key, and throw an exception), this will avoid a lot of redundant + * work. + * + * Whenever the current coordinator dies (or leaves), the second in line will take over. That SingletonStoreCacheLoader + * will then pass writes through to its underlying CacheLoader. Optionally, when a new coordinator takes over the + * Singleton, it can push the in-memory state to the cache cacheLoader, within a time constraint. + * + * @author Bela Ban + * @author <a href="mailto:galder.zamarreno@jboss.com">Galder Zamarreno</a> + * @since 1.0 + */ +public class SingletonStoreCacheLoaderOld extends AbstractDelegatingCacheLoaderOld { + /** + * Log instance. + */ + private static final Log log = LogFactory.getLog(SingletonStoreCacheLoaderOld.class); + private static final boolean trace = log.isTraceEnabled(); + + /** + * Name of thread that should pushing in-memory state to cache loader. + */ + private static final String THREAD_NAME = "InMemoryToCacheLoaderPusher"; + + /** + * Configuration for the SingletonStoreCacheLoader. + */ + private SingletonStoreDefaultConfig config; + + /** + * Executor service used to submit tasks to push in-memory state. + */ + private final ExecutorService executor; + + /** + * Future result of the in-memory push state task. This allows SingletonStoreCacheLoader to check whether there's any + * push taks on going. + */ + private Future<?> pushStateFuture; /* FutureTask guarantess a safe publication of the result */ + + /** + * Address instance that allows SingletonStoreCacheLoader to find out whether it became the coordinator of the + * cluster, or whether it stopped being it. This dictates whether the SingletonStoreCacheLoader is active or not. + */ + private Address localAddress; + + /** + * Whether the the current cache instance is the coordinator and therefore SingletonStoreCacheLoader is active. Being + * active means delegating calls to the underlying cache loader. + */ + private boolean active; + + /** + * Empty constructor so that it can instantiated using reflection. + */ + public SingletonStoreCacheLoaderOld() { + super(null); + + executor = Executors.newSingleThreadExecutor(new ThreadFactory() { + public Thread newThread(Runnable r) { + return new Thread(r, THREAD_NAME); + } + }); + } + + /** + * Sets the config for SingletonStoreCacheLoader and for the delegating cache loader. + */ + @Override + public void setConfig(CacheLoaderConfig.IndividualCacheLoaderConfig config) { + super.setConfig(config); + + SingletonStoreConfig ssc = config.getSingletonStoreConfig(); + if (ssc instanceof SingletonStoreDefaultConfig) { + this.config = (SingletonStoreDefaultConfig) ssc; + } else if (ssc != null) { + this.config = new SingletonStoreDefaultConfig(ssc); + } else { + this.config = new SingletonStoreDefaultConfig(); + } + } + + @Override + public void create()// throws Exception + { + super.create(); + + cache.addListener(new SingletonStoreListener()); + } + + /** + * Protected constructor which should only be used from unit tests. Production code should set + * pushStateWhenCoordinator using setConfig() method instead. + * + * @param config configuration instance for SingletonStoreCacheLoader + */ + protected SingletonStoreCacheLoaderOld(SingletonStoreDefaultConfig config) { + this(); + + this.config = config; + } + + /** + * Returns SingletonStoreCacheLoader's configuration instance. This method has been defined for convenience reasons + * when unit testing SingletonStoreCacheLoader's configuration. + * + * @return instance of SingletonStoreDefaultConfig + */ + protected SingletonStoreDefaultConfig getSingletonStoreDefaultConfig() { + return config; + } + + /** + * Returns the Future instance of a running in-memory to cache loader push task. This method has been defined for + * convenience reasons when unit testing. + * + * @return an instance of Future + */ + protected Future<?> getPushStateFuture() { + return pushStateFuture; + } + + /** + * Method called when the cache instance either becomes the coordinator or stops being the coordinator. If it becomes + * the coordinator, it can optionally start the in-memory state transfer to the underlying cache store. + * + * @param newActiveState true if the cache instance just became the coordinator, false if the cache instance stopped + * being the coordinator. + */ + protected void activeStatusChanged(boolean newActiveState) throws PushStateException { + active = newActiveState; + log.debug("changed mode: " + this); + if (active && config.isPushStateWhenCoordinator()) { + doPushState(); + } + } + + /** + * Factory method for the creation of a Callable task in charge of pushing in-memory state to cache loader. + * + * @return new instance of Callable<?> whose call() method either throws an exception or returns null if the task was + * successfull. + */ + protected Callable<?> createPushStateTask() { + return new Callable() { + public Object call() throws Exception { + final boolean debugEnabled = log.isDebugEnabled(); + + if (debugEnabled) log.debug("start pushing in-memory state to cache cacheLoader"); +// pushState(cache.getRoot()); + if (debugEnabled) log.debug("in-memory state passed to cache cacheLoader successfully"); + + return null; + } + }; + } + + /** + * Pushes the state of a specific cache entry by reading the entry's data from the cache and putting in the cache store + * via the cache loader. This method is call recursively so that it iterates through the whole cache. + * + */ + // TODO implement me +// protected void pushState(Object key) throws Exception +// { +// /* Put the key's data first */ +// } + + /** + * Method that waits for the in-memory to cache loader state to finish. This method's called in case a push state is + * already in progress and we need to wait for it to finish. + * + * @param future instance of Future representing the on going push task + * @param timeout time to wait for the push task to finish + * @param unit instance of TimeUnit representing the unit of timeout + */ + protected void awaitForPushToFinish(Future future, int timeout, TimeUnit unit) { + final boolean debugEnabled = log.isDebugEnabled(); + try { + if (debugEnabled) log.debug("wait for state push to cache loader to finish"); + future.get(timeout, unit); + } + catch (TimeoutException e) { + if (debugEnabled) log.debug("timed out waiting for state push to cache loader to finish"); + } + catch (ExecutionException e) { + if (debugEnabled) log.debug("exception reported waiting for state push to cache loader to finish"); + } + catch (InterruptedException ie) { + /* Re-assert the thread's interrupted status */ + Thread.currentThread().interrupt(); + if (trace) log.trace("wait for state push to cache loader to finish was interrupted"); + } + } + + /** + * Called when the SingletonStoreCacheLoader discovers that the cache instance has become the coordinator and push in + * memory state has been enabled. It might not actually push the state if there's an ongoing push task running, in + * which case will wait for the push task to finish. + * + * @throws PushStateException when the push state task reports an issue. + */ + private void doPushState() throws PushStateException { + if (pushStateFuture == null || pushStateFuture.isDone()) { + Callable<?> task = createPushStateTask(); + pushStateFuture = executor.submit(task); + try { + waitForTaskToFinish(pushStateFuture, config.getPushStateWhenCoordinatorTimeout(), TimeUnit.MILLISECONDS); + } + catch (Exception e) { + throw new PushStateException("unable to complete in memory state push to cache loader", e); + } + } else { + /* at the most, we wait for push state timeout value. if it push task finishes earlier, this call + * will stop when the push task finishes, otherwise a timeout exception will be reported */ + awaitForPushToFinish(pushStateFuture, config.getPushStateWhenCoordinatorTimeout(), TimeUnit.MILLISECONDS); + } + } + + /** + * Waits, within a time constraint, for a task to finish. + * + * @param future represents the task waiting to finish. + * @param timeout maximum time to wait for the time to finish. + * @param unit instance of TimeUnit representing the unit of timeout + * @throws Exception if any issues are reported while waiting for the task to finish + */ + private void waitForTaskToFinish(Future future, int timeout, TimeUnit unit) throws Exception { + try { + future.get(timeout, unit); + } + catch (TimeoutException e) { + throw new Exception("task timed out", e); + } + catch (InterruptedException e) { + /* Re-assert the thread's interrupted status */ + Thread.currentThread().interrupt(); + if (trace) log.trace("task was interrupted"); + } + finally { + /* no-op if task is completed */ + future.cancel(true); /* interrupt if running */ + } + } + + /** + * Indicates whether the current cache instances is the coordinator of the cluster. + * + * @param members new member list + * @return whether the current cache instance is the coordinator or not. + */ + private boolean isCoordinator(List<Address> members) { + if (members != null && localAddress != null) { + return members.size() > 0 && localAddress.equals(members.get(0)); + } + + /* Invalid new view, so previous value returned */ + return active; + } + + /** + * Calls the underlying cache loader's operation if the current cache instance is the coordinator. + */ +// @Override + public Object put(Fqn name, Object key, Object value) throws Exception { + if (active) { +// return super.put(name, key, value); + } + + return null; + } + + /** + * Calls the underlying cache loader's operation if the current cache instance is the coordinator. + */ +// @Override + public void put(Fqn name, Map attributes) throws Exception { + // TODO implement me +// if (active) +// { +// super.put(name, attributes); +// } + } + + /** + * Calls the underlying cache loader's operation if the current cache instance is the coordinator. + */ +// @Override +// public void put(List<Modification> modifications) throws Exception +// { + // TODO implement me +// if (active) +// { +// super.put(modifications); +// } +// } + + /** + * Calls the underlying cache loader's operation if the current cache instance is the coordinator. + */ +// @Override + public Object remove(Fqn fqn, Object key) throws Exception { + if (active) { +// return super.remove(fqn, key); + } + + return null; + } + + /** + * Calls the underlying cache loader's operation if the current cache instance is the coordinator. + */ +// @Override + public void remove(Fqn fqn) throws Exception { + if (active) { + super.remove(fqn); + } + } + + /** + * Calls the underlying cache loader's operation if the current cache instance is the coordinator. + */ +// @Override + public void removeData(Fqn fqn) throws Exception { + if (active) { +// super.removeData(fqn); + } + } + + /** + * Calls the underlying cache loader's operation if the current cache instance is the coordinator. + */ +// @Override +// public void prepare(Object tx, List<Modification> modifications, boolean one_phase) throws Exception +// { +// if (active) +// { +// super.prepare(tx, modifications, one_phase); +// } +// } + + /** + * Calls the underlying cache loader's operation if the current cache instance is the coordinator. + */ + @Override + public void commit(Object tx) // throws Exception + { + if (active) { + super.commit(tx); + } + } + + /** + * Calls the underlying cache loader's operation if the current cache instance is the coordinator. + */ + @Override + public void rollback(Object tx) { + if (active) { + super.rollback(tx); + } + } + + /** + * Calls the underlying cache loader's operation if the current cache instance is the coordinator. + */ + @Override + public void storeEntireState(ObjectInputStream is) //throws Exception + { + if (active) { + super.storeEntireState(is); + } + } + + /** + * Calls the underlying cache loader's operation if the current cache instance is the coordinator. + */ +// @Override + public void storeState(Fqn subtree, ObjectInputStream is) throws Exception { + if (active) { + // super.storeState(subtree, is); + } + } + + /** + * Calls the underlying cache loader's operation if the current cache instance is the coordinator. + */ + @Override + public String toString() { + return "loc_addr=" + localAddress + ", active=" + active; + } + + /** + * Cache listener that reacts to cluster topology changes to find out whether a new coordinator is elected. + * SingletonStoreCacheLoader reacts to these changes in order to decide which cache instance should interact with the + * underlying cache store. + */ + @Listener + public class SingletonStoreListener { + /** + * Cache started, check whether the cache instance is the coordinator and set the singleton store cache loader's + * active status. + */ + @CacheStarted + public void cacheStarted(Event e) { + localAddress = cache.getCacheManager().getAddress(); + active = cache.getCacheManager().isCoordinator(); + if (log.isDebugEnabled()) log.debug("cache started: " + this); + } + + @CacheStopped + public void cacheStopped(Event e) { + if (log.isDebugEnabled()) log.debug("cache stopped: " + this); + } + + /** + * The cluster formation changed, so determine whether the current cache instance stopped being the coordinator or + * became the coordinator. This method can lead to an optional in memory to cache loader state push, if the + * current cache instance became the coordinator. This method will report any issues that could potentially arise + * from this push. + */ + @ViewChanged + public void viewChange(ViewChangedEvent event) { + boolean tmp = isCoordinator(event.getNewMemberList()); + + if (active != tmp) { + try { + activeStatusChanged(tmp); + } + catch (PushStateException e) { + log.error("exception reported changing cache instance's active status", e); + } + + } + } + } + + /** + * Exception representing any issues that arise from pushing the in-memory state to the cache loader. + */ + public static class PushStateException extends Exception { + private static final long serialVersionUID = 5542893943730200886L; + + public PushStateException(String message, Throwable cause) { + super(message, cause); + } + + public PushStateException(Throwable cause) { + super(cause); + } + } +} \ No newline at end of file Property changes on: core/branches/flat/src/main/java/org/horizon/loader/SingletonStoreCacheLoaderOld.java ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Modified: core/branches/flat/src/main/java/org/horizon/loader/SingletonStoreDefaultConfig.java =================================================================== --- core/branches/flat/src/main/java/org/horizon/loader/SingletonStoreDefaultConfig.java 2009-02-10 11:54:44 UTC (rev 7672) +++ core/branches/flat/src/main/java/org/horizon/loader/SingletonStoreDefaultConfig.java 2009-02-10 11:58:28 UTC (rev 7673) @@ -61,8 +61,8 @@ /* if we got to this point, we know that singleton store must have been enabled */ setSingletonStoreEnabled(true); - /* and we also know that the configuration was created by SingletonStoreCacheLoader */ - setSingletonStoreClass(SingletonStoreCacheLoader.class.getName()); + /* and we also know that the configuration was created by SingletonStoreCacheLoaderOld */ + setSingletonStoreClass(SingletonStoreCacheLoaderOld.class.getName()); } /** @@ -88,7 +88,7 @@ @Override public String getSingletonStoreClass() { - return SingletonStoreCacheLoader.class.getName(); + return SingletonStoreCacheLoaderOld.class.getName(); } @Override Added: core/branches/flat/src/main/java/org/horizon/loader/StoredEntry.java =================================================================== --- core/branches/flat/src/main/java/org/horizon/loader/StoredEntry.java (rev 0) +++ core/branches/flat/src/main/java/org/horizon/loader/StoredEntry.java 2009-02-10 11:58:28 UTC (rev 7673) @@ -0,0 +1,12 @@ +package org.horizon.loader; + +/** + * // TODO: Manik: Document this! + * + * @author Manik Surtani + */ +public class StoredEntry<K, V> { + K key; + V value; + long expiry, created; +} Modified: core/branches/flat/src/main/java/org/horizon/lock/StripedLock.java =================================================================== --- core/branches/flat/src/main/java/org/horizon/lock/StripedLock.java 2009-02-10 11:54:44 UTC (rev 7672) +++ core/branches/flat/src/main/java/org/horizon/lock/StripedLock.java 2009-02-10 11:58:28 UTC (rev 7673) @@ -28,7 +28,7 @@ /** * A simple implementation of lock striping, using cache entry keys to lock on, primarily used to help make {@link - * org.horizon.loader.CacheLoader} implemtations thread safe. + * org.horizon.loader.CacheLoaderOld} implemtations thread safe. * * Backed by a set of {@link java.util.concurrent.locks.ReentrantReadWriteLock} instances, and using the key hashcodes * to determine buckets. Modified: core/branches/flat/src/main/java/org/horizon/notifications/cachelistener/annotation/CacheEntryLoaded.java =================================================================== --- core/branches/flat/src/main/java/org/horizon/notifications/cachelistener/annotation/CacheEntryLoaded.java 2009-02-10 11:54:44 UTC (rev 7672) +++ core/branches/flat/src/main/java/org/horizon/notifications/cachelistener/annotation/CacheEntryLoaded.java 2009-02-10 11:58:28 UTC (rev 7673) @@ -28,7 +28,7 @@ /** * This annotation should be used on methods that need to be notified when a cache entry is loaded from a {@link - * org.horizon.loader.CacheLoader}. + * org.horizon.loader.CacheLoaderOld}. * * Methods annotated with this annotation should be public and take in a single parameter, a {@link * org.horizon.notifications.cachelistener.event.CacheEntryLoadedEvent} otherwise an {@link Modified: core/branches/flat/src/main/resources/config-samples/all.xml =================================================================== --- core/branches/flat/src/main/resources/config-samples/all.xml 2009-02-10 11:54:44 UTC (rev 7672) +++ core/branches/flat/src/main/resources/config-samples/all.xml 2009-02-10 11:58:28 UTC (rev 7673) @@ -154,7 +154,7 @@ horizon.jdbc.table.drop=false </properties> - <singletonStore enabled="true" class="org.horizon.loader.SingletonStoreCacheLoader"> + <singletonStore enabled="true" class="org.horizon.loader.SingletonStoreCacheLoaderOld"> <properties> horizon.singletonStore.pushStateWhenCoordinator=true horizon.singletonStore.pushStateWhenCoordinatorTimeout=20000

15 years, 10 months

1
0
0 / 0

JBoss Cache SVN: r7672 - in core/branches/flat/src: main/java/org/horizon and 11 other directories.

by jbosscache-commits＠lists.jboss.org

Author: manik.surtani(a)jboss.com Date: 2009-02-10 06:54:44 -0500 (Tue, 10 Feb 2009) New Revision: 7672 Added: core/branches/flat/src/main/java/org/horizon/lifecycle/ComponentStatus.java Removed: core/branches/flat/src/main/java/org/horizon/ComponentStatus.java core/branches/flat/src/main/java/org/horizon/factories/annotations/Destroy.java Modified: core/branches/flat/src/main/docbook/userguide/en/modules/cache_loaders.xml core/branches/flat/src/main/java/org/horizon/Cache.java core/branches/flat/src/main/java/org/horizon/CacheDelegate.java core/branches/flat/src/main/java/org/horizon/config/AbstractNamedCacheConfigurationBean.java core/branches/flat/src/main/java/org/horizon/config/GlobalConfiguration.java core/branches/flat/src/main/java/org/horizon/factories/AbstractComponentRegistry.java core/branches/flat/src/main/java/org/horizon/factories/ComponentRegistry.java core/branches/flat/src/main/java/org/horizon/lifecycle/Lifecycle.java core/branches/flat/src/main/java/org/horizon/manager/CacheManager.java core/branches/flat/src/main/java/org/horizon/manager/DefaultCacheManager.java core/branches/flat/src/main/java/org/horizon/marshall/Marshaller.java core/branches/flat/src/main/java/org/horizon/notifications/AbstractListenerImpl.java core/branches/flat/src/main/java/org/horizon/tree/TreeCache.java core/branches/flat/src/main/java/org/horizon/util/TestingUtil.java core/branches/flat/src/test/java/org/horizon/config/parsing/ConfigurationParserTest.java core/branches/flat/src/test/java/org/horizon/manager/CacheManagerTest.java Log: ComponentStatus changes Modified: core/branches/flat/src/main/docbook/userguide/en/modules/cache_loaders.xml =================================================================== --- core/branches/flat/src/main/docbook/userguide/en/modules/cache_loaders.xml 2009-02-09 21:28:30 UTC (rev 7671) +++ core/branches/flat/src/main/docbook/userguide/en/modules/cache_loaders.xml 2009-02-10 11:54:44 UTC (rev 7672) @@ -147,7 +147,7 @@ details. </para> - <programlisting role="XML"><![CDATA[<![CDATA[<![CDATA[ + <programlisting role="XML"><![CDATA[ ...  @@ -198,7 +198,7 @@  - <class>org.horizon.loader.SingletonStoreCacheLoader</class> + <class>org.horizon.loader.SingletonStoreCacheLoaderOld</class>  @@ -211,7 +211,8 @@ </config> </attribute> -]]>]]>]]></programlisting> +]]>]]>]]>]]> + </programlisting> <para>The <literal>class</literal> @@ -377,7 +378,7 @@ singleton store functionality. This class must extend <literal>org.jboss.cache.loader.AbstractDelegatingCacheLoader</literal> , and if absent, it defaults to - <literal>org.horizon.loader.SingletonStoreCacheLoader</literal> + <literal>org.horizon.loader.SingletonStoreCacheLoaderOld</literal> . </para> @@ -983,7 +984,9 @@ </programlisting> If you do not use Maven, you can still download the amazon-s3 library by navigating the repository or through - <ulink url="http://e-xml.sourceforge.net/maven2/repository/net/noderunner/amazon-s3/1...">this URL</ulink>. + <ulink + url="http://e-xml.sourceforge.net/maven2/repository/net/noderunner/amazon-s3/1..."> + this URL</ulink>. </section> <section> @@ -1026,22 +1029,22 @@ Name of the bucket to store data. For different caches using the same access key, use a different bucket name. Read the S3 documentation on the definition of a bucket. - The default value is <literal>jboss-cache</literal>. + The default value is<literal>jboss-cache</literal>. </listitem> <listitem> <literal>cache.s3.callingFormat</literal> - - One of <literal>PATH</literal>, <literal>SUBDOMAIN</literal>, or + One of<literal>PATH</literal>,<literal>SUBDOMAIN</literal>, or <literal>VANITY</literal>. Read the S3 documentation on the use of calling domains. - The default value is <literal>SUBDOMAIN</literal>. + The default value is<literal>SUBDOMAIN</literal>. </listitem> <listitem> <literal>cache.s3.optimize</literal> - - The default is <literal>false</literal>. + The default is<literal>false</literal>. If true, <literal>put(Map)</literal> operations @@ -1053,7 +1056,7 @@ <listitem> <literal>cache.s3.parentCache</literal> - - The default is <literal>true</literal>. + The default is<literal>true</literal>. Set this value to <literal>false</literal> if you are using multiple caches @@ -1078,9 +1081,10 @@ - This choses a primary storage location for your data to reduce loading and retrevial latency. - Set to <literal>EU</literal> + Set to + <literal>EU</literal> to store data in Europe. - The default is <literal>null</literal>, to store data in + The default is<literal>null</literal>, to store data in the United States. </listitem> </itemizedlist> Modified: core/branches/flat/src/main/java/org/horizon/Cache.java =================================================================== --- core/branches/flat/src/main/java/org/horizon/Cache.java 2009-02-09 21:28:30 UTC (rev 7671) +++ core/branches/flat/src/main/java/org/horizon/Cache.java 2009-02-10 11:54:44 UTC (rev 7672) @@ -22,6 +22,7 @@ package org.horizon; import org.horizon.config.Configuration; +import org.horizon.lifecycle.ComponentStatus; import org.horizon.lifecycle.Lifecycle; import org.horizon.manager.CacheManager; import org.horizon.notifications.Listenable; @@ -56,7 +57,7 @@ * * @param key key with which the specified value is to be associated. * @param value value to be associated with the specified key. - * @throws IllegalStateException if {@link #getCacheStatus()} would not return {@link ComponentStatus#STARTED}. + * @throws IllegalStateException if {@link #getStatus()} would not return {@link org.horizon.lifecycle.ComponentStatus#STARTED}. */ void putForExternalRead(K key, V value); @@ -64,8 +65,6 @@ Configuration getConfiguration(); - ComponentStatus getCacheStatus(); - /** * @return true if a batch was successfully started; false if one was available and already running. */ @@ -140,4 +139,6 @@ boolean replace(K key, V oldValue, V value, long lifespan, TimeUnit unit); AdvancedCache<K, V> getAdvancedCache(); + + ComponentStatus getStatus(); } Modified: core/branches/flat/src/main/java/org/horizon/CacheDelegate.java =================================================================== --- core/branches/flat/src/main/java/org/horizon/CacheDelegate.java 2009-02-09 21:28:30 UTC (rev 7671) +++ core/branches/flat/src/main/java/org/horizon/CacheDelegate.java 2009-02-10 11:54:44 UTC (rev 7672) @@ -46,6 +46,7 @@ import org.horizon.interceptors.base.CommandInterceptor; import org.horizon.invocation.InvocationContextContainer; import org.horizon.invocation.Options; +import org.horizon.lifecycle.ComponentStatus; import org.horizon.logging.Log; import org.horizon.logging.LogFactory; import org.horizon.manager.CacheManager; @@ -347,8 +348,8 @@ return get(key); } - public ComponentStatus getCacheStatus() { - return componentRegistry.getState(); + public ComponentStatus getStatus() { + return componentRegistry.getStatus(); } public boolean startBatch() { Deleted: core/branches/flat/src/main/java/org/horizon/ComponentStatus.java =================================================================== --- core/branches/flat/src/main/java/org/horizon/ComponentStatus.java 2009-02-09 21:28:30 UTC (rev 7671) +++ core/branches/flat/src/main/java/org/horizon/ComponentStatus.java 2009-02-10 11:54:44 UTC (rev 7672) @@ -1,177 +0,0 @@ -/* - * JBoss, Home of Professional Open Source. - * Copyright 2000 - 2008, Red Hat Middleware LLC, and individual contributors - * as indicated by the @author tags. See the copyright.txt file in the - * distribution for a full listing of individual contributors. - * - * This 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 2.1 of - * the License, or (at your option) any later version. - * - * This software 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 this software; if not, write to the Free - * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA - * 02110-1301 USA, or see the FSF site: http://www.fsf.org. - */ -package org.horizon; - -import org.horizon.logging.Log; -import org.horizon.logging.LogFactory; - -/** - * Various states that an object that has a four stage lifecycle (i.e. <code>create()</code>, <code>start()</code>, - * <code>stop()</code> and <code>destroy()</code>) might be in. - * - * @author <a href="brian.stansberry(a)jboss.com">Brian Stansberry</a> - * @since 1.0 - */ -public enum ComponentStatus { - /** - * Object has been instantiated, but create() has not been called. - */ - INSTANTIATED, - /** - * The <code>create()</code> method has been called but not yet completed. - */ - CREATING, - /** - * The <code>create()</code> method has been completed but <code>start()</code> has not been called. - */ - CREATED, - /** - * The <code>start()</code> method has been called but has not yet completed. - */ - STARTING, - /** - * The <code>start()</code> method has completed. - */ - STARTED, - /** - * The <code>stop()</code> method has been called but has not yet completed. - */ - STOPPING, - /** - * The <code>stop()</code> method has completed but <code>destroy()</code> has not yet been called. Conceptually - * equivalent to {@link #CREATED}. - */ - STOPPED, - /** - * The <code>destroy()</code> method has been called but has not yet completed. - */ - DESTROYING, - /** - * The <code>destroy()</code> method has completed. Conceptually equivalent to {@link #INSTANTIATED}. - */ - DESTROYED, - /** - * A failure occurred during the execution of <code>create()</code>, <code>start()</code>, <code>stop()</code> or - * <code>destroy()</code>. The next logical transition is to call <code>destroy()</code>. - */ - FAILED; - - private static final Log log = LogFactory.getLog(ComponentStatus.class); - - public boolean createAllowed() { - switch (this) { - case CREATING: - case CREATED: - case STARTING: - case STARTED: - case STOPPED: - case FAILED: - case STOPPING: - case DESTROYING: - return false; - default: - return true; - } - } - - public boolean needToDestroyFailedCache() { - return this == ComponentStatus.FAILED; - } - - public boolean startAllowed() { - switch (this) { - case INSTANTIATED: - case DESTROYED: - case STARTING: - case STARTED: - case FAILED: - case STOPPING: - case DESTROYING: - return false; - default: - return true; - } - } - - public boolean needCreateBeforeStart() { - switch (this) { - case INSTANTIATED: - case DESTROYED: - return true; - default: - return false; - } - } - - public boolean stopAllowed() { - switch (this) { - case INSTANTIATED: - case CREATED: - case STOPPED: - case DESTROYED: - log.debug("Ignoring call to stop() as current state is " + this); - return false; - case CREATING: - case STARTING: - case STOPPING: - case DESTROYING: - log.warn("Ignoring call to stop() as current state is " + this); - return false; - case FAILED: - case STARTED: - default: - return true; - } - - } - - public boolean destroyAllowed() { - switch (this) { - case INSTANTIATED: - case DESTROYED: - log.debug("Ignoring call to destroy() as current state is " + this); - return false; - case CREATING: - case STARTING: - case STOPPING: - case DESTROYING: - log.warn("Ignoring call to destroy() as current state iswhile cache is " + this); - return false; - case STARTED: - // stop first - return false; - case CREATED: - case STOPPED: - case FAILED: - default: - return true; - } - } - - public boolean needStopBeforeDestroy() { - return this == ComponentStatus.STARTED; - } - - public boolean allowInvocations() { - return (this == ComponentStatus.STARTED); - } -} Modified: core/branches/flat/src/main/java/org/horizon/config/AbstractNamedCacheConfigurationBean.java =================================================================== --- core/branches/flat/src/main/java/org/horizon/config/AbstractNamedCacheConfigurationBean.java 2009-02-09 21:28:30 UTC (rev 7671) +++ core/branches/flat/src/main/java/org/horizon/config/AbstractNamedCacheConfigurationBean.java 2009-02-10 11:54:44 UTC (rev 7672) @@ -1,10 +1,10 @@ package org.horizon.config; -import org.horizon.ComponentStatus; import org.horizon.factories.ComponentRegistry; import org.horizon.factories.annotations.Inject; import org.horizon.factories.scopes.Scope; import org.horizon.factories.scopes.Scopes; +import org.horizon.lifecycle.ComponentStatus; /** * Adds named cache specific features to the {@link org.horizon.config.AbstractConfigurationBean}. @@ -23,6 +23,6 @@ } protected boolean hasComponentStarted() { - return cr != null && cr.getState() != null && cr.getState() == ComponentStatus.STARTED; + return cr != null && cr.getStatus() != null && cr.getStatus() == ComponentStatus.RUNNING; } } Modified: core/branches/flat/src/main/java/org/horizon/config/GlobalConfiguration.java =================================================================== --- core/branches/flat/src/main/java/org/horizon/config/GlobalConfiguration.java 2009-02-09 21:28:30 UTC (rev 7671) +++ core/branches/flat/src/main/java/org/horizon/config/GlobalConfiguration.java 2009-02-10 11:54:44 UTC (rev 7672) @@ -1,7 +1,6 @@ package org.horizon.config; import org.horizon.CacheException; -import org.horizon.ComponentStatus; import org.horizon.Version; import org.horizon.executors.DefaultExecutorFactory; import org.horizon.executors.DefaultScheduledExecutorFactory; @@ -10,6 +9,7 @@ import org.horizon.factories.annotations.NonVolatile; import org.horizon.factories.scopes.Scope; import org.horizon.factories.scopes.Scopes; +import org.horizon.lifecycle.ComponentStatus; import org.horizon.marshall.VersionAwareMarshaller; import org.horizon.remoting.transport.jgroups.JGroupsTransport; import org.horizon.util.TypedProperties; @@ -75,7 +75,7 @@ } protected boolean hasComponentStarted() { - return gcr != null && gcr.getState() != null && gcr.getState() == ComponentStatus.STARTED; + return gcr != null && gcr.getStatus() != null && gcr.getStatus() == ComponentStatus.RUNNING; } public String getAsyncListenerExecutorFactoryClass() { Modified: core/branches/flat/src/main/java/org/horizon/factories/AbstractComponentRegistry.java =================================================================== --- core/branches/flat/src/main/java/org/horizon/factories/AbstractComponentRegistry.java 2009-02-09 21:28:30 UTC (rev 7671) +++ core/branches/flat/src/main/java/org/horizon/factories/AbstractComponentRegistry.java 2009-02-10 11:54:44 UTC (rev 7672) @@ -22,20 +22,19 @@ package org.horizon.factories; import org.horizon.CacheException; -import org.horizon.ComponentStatus; import org.horizon.Version; import org.horizon.config.Configuration; import org.horizon.config.ConfigurationException; import org.horizon.config.RuntimeConfig; import org.horizon.factories.annotations.ComponentName; import org.horizon.factories.annotations.DefaultFactoryFor; -import org.horizon.factories.annotations.Destroy; import org.horizon.factories.annotations.Inject; import org.horizon.factories.annotations.NonVolatile; import org.horizon.factories.annotations.Start; import org.horizon.factories.annotations.Stop; import org.horizon.factories.scopes.Scope; import org.horizon.factories.scopes.Scopes; +import org.horizon.lifecycle.ComponentStatus; import org.horizon.lifecycle.Lifecycle; import org.horizon.logging.Log; import org.horizon.util.BeanUtils; @@ -65,13 +64,13 @@ * * Default factories are treated as components too and will need to be wired before being used. * - * The registry can exist in one of several states, as defined by the {@link org.horizon.ComponentStatus} enumeration. - * In terms of the cache, state changes in the following manner: <ul> <li>INSTANTIATED - when first constructed</li> - * <li>CONSTRUCTED - when created using the DefaultCacheFactory</li> <li>STARTED - when {@link + * The registry can exist in one of several states, as defined by the {@link org.horizon.lifecycle.ComponentStatus} + * enumeration. In terms of the cache, state changes in the following manner: <ul> <li>INSTANTIATED - when first + * constructed</li> <li>CONSTRUCTED - when created using the DefaultCacheFactory</li> <li>STARTED - when {@link * org.horizon.Cache#start()} is called</li> <li>STOPPED - when {@link org.horizon.Cache#stop()} is called</li> </ul> * * Cache configuration can only be changed and will only be reinjected if the cache is not in the {@link - * org.horizon.ComponentStatus#STARTED} state. + * org.horizon.lifecycle.ComponentStatus#RUNNING} state. * * @author Manik Surtani (<a href="mailto:manik@jboss.org">manik(a)jboss.org</a>) * @since 1.0 @@ -101,7 +100,7 @@ * * @return state of the registry */ - public ComponentStatus getState() { + public ComponentStatus getStatus() { return state; } @@ -189,7 +188,7 @@ old.methodsScanned = false; c = old; - if (state == ComponentStatus.STARTED) populateLifecycleMethods(); + if (state == ComponentStatus.RUNNING) populateLifecycleMethods(); } else { c = new Component(); c.name = name; @@ -503,7 +502,6 @@ c.methodsScanned = true; c.startMethods.clear(); c.stopMethods.clear(); - c.destroyMethods.clear(); List<Method> methods = ReflectionUtil.getAllMethods(c.instance.getClass(), Start.class); for (Method m : methods) { @@ -522,15 +520,6 @@ em.priority = m.getAnnotation(Stop.class).priority(); c.stopMethods.add(em); } - - methods = ReflectionUtil.getAllMethods(c.instance.getClass(), Destroy.class); - for (Method m : methods) { - PrioritizedMethod em = new PrioritizedMethod(); - em.component = c; - em.method = m; - em.priority = m.getAnnotation(Destroy.class).priority(); - c.destroyMethods.add(em); - } } } } @@ -556,15 +545,11 @@ /** * Creates the components needed by a cache instance and sets the cache status to {@link - * org.horizon.ComponentStatus#CREATED} when it is done. + * org.horizon.lifecycle.ComponentStatus#INITIALIZING} when it is done. */ - public void create() { - if (!state.createAllowed()) { - if (state.needToDestroyFailedCache()) - destroy(); - else - return; - } + private void init() { + if (state.needToDestroyFailedCache()) + destroy(); try { internalCreate(); @@ -576,16 +561,17 @@ /** * This starts the components in the cache, connecting to channels, starting service threads, etc. If the cache is - * not in the {@link org.horizon.ComponentStatus#CREATED} state, {@link #create()} will be invoked first. + * not in the {@link org.horizon.lifecycle.ComponentStatus#INITIALIZING} state, {@link #init()} will be invoked + * first. */ public void start() { boolean createdInStart = false; if (!state.startAllowed()) { if (state.needToDestroyFailedCache()) - destroy(); // this will take us back to DESTROYED + destroy(); // this will take us back to TERMINATED - if (state.needCreateBeforeStart()) { - create(); + if (state.needToInitializeBeforeStart()) { + init(); createdInStart = true; } else return; @@ -600,8 +586,8 @@ } /** - * Stops the cache and sets the cache status to {@link org.horizon.ComponentStatus#STOPPED} once it is done. If the - * cache is not in the {@link org.horizon.ComponentStatus#STARTED} state, this is a no-op. + * Stops the cache and sets the cache status to {@link org.horizon.lifecycle.ComponentStatus#TERMINATED} once it is + * done. If the cache is not in the {@link org.horizon.lifecycle.ComponentStatus#RUNNING} state, this is a no-op. */ public void stop() { if (!state.stopAllowed()) { @@ -622,36 +608,31 @@ handleLifecycleTransitionFailure(t); } finally { - if (!failed) state = ComponentStatus.STOPPED; + if (!failed) state = ComponentStatus.TERMINATED; } } /** * Destroys the cache and frees up any resources. Sets the cache status to {@link - * org.horizon.ComponentStatus#DESTROYED} when it is done. + * org.horizon.lifecycle.ComponentStatus#TERMINATED} when it is done. * - * If the cache is in {@link org.horizon.ComponentStatus#STARTED} when this method is called, it will first call - * {@link #stop()} to stop the cache. + * If the cache is in {@link org.horizon.lifecycle.ComponentStatus#RUNNING} when this method is called, it will first + * call {@link #stop()} to stop the cache. */ - public void destroy() { - if (!state.destroyAllowed()) { - if (state.needStopBeforeDestroy()) { - try { - stop(); - } - catch (CacheException e) { - getLog().warn("Needed to call stop() before destroying but stop() threw exception. Proceeding to destroy", e); - } - } else - return; + private void destroy() { + try { + stop(); } + catch (CacheException e) { + getLog().warn("Needed to call stop() before destroying but stop() threw exception. Proceeding to destroy", e); + } try { - internalDestroy(); + resetNonVolatile(); } finally { // We always progress to destroyed - state = ComponentStatus.DESTROYED; + state = ComponentStatus.TERMINATED; } } // ------------------------------ END: Publicly available lifecycle methods ----------------------------- @@ -680,10 +661,9 @@ * The actual create implementation. */ private void internalCreate() { - state = ComponentStatus.CREATING; + state = ComponentStatus.INITIALIZING; resetNonVolatile(); rewire(); - state = ComponentStatus.CREATED; } private void internalStart(boolean createdInStart) throws CacheException, IllegalArgumentException { @@ -694,8 +674,6 @@ rewire(); } - state = ComponentStatus.STARTING; - // start all internal components // first cache all start, stop and destroy methods. populateLifecycleMethods(); @@ -713,8 +691,8 @@ addShutdownHook(); - getLog().info("JBoss Cache version: " + Version.printVersion()); - state = ComponentStatus.STARTED; + getLog().info("Horizon version: " + Version.printVersion()); + state = ComponentStatus.RUNNING; } protected void addShutdownHook() { @@ -740,35 +718,15 @@ // fire all STOP methods according to priority for (PrioritizedMethod em : stopMethods) em.invoke(); - state = ComponentStatus.STOPPED; + destroy(); } - /** - * Actual destroy - */ - private void internalDestroy() { - - state = ComponentStatus.DESTROYING; - - resetNonVolatile(); - - List<PrioritizedMethod> destroyMethods = new ArrayList<PrioritizedMethod>(componentLookup.size()); - for (Component c : componentLookup.values()) destroyMethods.addAll(c.destroyMethods); - - Collections.sort(destroyMethods); - - // fire all DESTROY methods according to priority - for (PrioritizedMethod em : destroyMethods) em.invoke(); - - state = ComponentStatus.DESTROYED; - } - // ------------------------------ END: Actual internal lifecycle methods -------------------------------- /** * Asserts whether invocations are allowed on the cache or not. Returns <tt>true</tt> if invocations are to be * allowed, <tt>false</tt> otherwise. If the origin of the call is remote and the cache status is {@link - * org.horizon.ComponentStatus#STARTING}, this method will block for up to {@link + * org.horizon.lifecycle.ComponentStatus#INITIALIZING}, this method will block for up to {@link * Configuration#getStateRetrievalTimeout()} millis, checking for a valid state. * * @param originLocal true if the call originates locally (i.e., from the {@link org.horizon.CacheDelegate} or false @@ -785,8 +743,8 @@ getLog().trace("Is remotely originating."); // else if this is a remote call and the status is STARTING, wait until the cache starts. - if (state == ComponentStatus.STARTING) { - getLog().trace("Cache is starting; block."); + if (state == ComponentStatus.INITIALIZING) { + getLog().trace("Cache is initializing; block."); try { blockUntilCacheStarts(); return true; @@ -801,9 +759,9 @@ } /** - * Blocks until the current cache instance is in its {@link org.horizon.ComponentStatus#STARTED started} phase. - * Blocks for up to {@link Configuration#getStateRetrievalTimeout()} milliseconds, throwing an IllegalStateException - * if the cache doesn't reach this state even after this maximum wait time. + * Blocks until the current cache instance is in its {@link org.horizon.lifecycle.ComponentStatus#RUNNING started} + * phase. Blocks for up to {@link Configuration#getStateRetrievalTimeout()} milliseconds, throwing an + * IllegalStateException if the cache doesn't reach this state even after this maximum wait time. * * @throws InterruptedException if interrupted while waiting * @throws IllegalStateException if even after waiting the cache has not started. @@ -842,7 +800,6 @@ List<Method> injectionMethods = new ArrayList<Method>(2); List<PrioritizedMethod> startMethods = new ArrayList<PrioritizedMethod>(2); List<PrioritizedMethod> stopMethods = new ArrayList<PrioritizedMethod>(2); - List<PrioritizedMethod> destroyMethods = new ArrayList<PrioritizedMethod>(2); /** * If true, then this component is not flushed before starting the ComponentRegistry. */ Modified: core/branches/flat/src/main/java/org/horizon/factories/ComponentRegistry.java =================================================================== --- core/branches/flat/src/main/java/org/horizon/factories/ComponentRegistry.java 2009-02-09 21:28:30 UTC (rev 7671) +++ core/branches/flat/src/main/java/org/horizon/factories/ComponentRegistry.java 2009-02-10 11:54:44 UTC (rev 7672) @@ -2,12 +2,12 @@ import org.horizon.AdvancedCache; import org.horizon.CacheException; -import org.horizon.ComponentStatus; import org.horizon.config.Configuration; import org.horizon.config.ConfigurationException; import org.horizon.factories.annotations.Inject; import org.horizon.factories.scopes.ScopeDetector; import org.horizon.factories.scopes.Scopes; +import org.horizon.lifecycle.ComponentStatus; import org.horizon.logging.Log; import org.horizon.logging.LogFactory; import org.horizon.notifications.cachemanagerlistener.CacheManagerNotifier; @@ -105,12 +105,12 @@ @Override public void start() { - if (globalComponents.getState() != ComponentStatus.STARTED || globalComponents.getState() != ComponentStatus.STARTING) { + if (globalComponents.getStatus() != ComponentStatus.RUNNING || globalComponents.getStatus() != ComponentStatus.INITIALIZING) { globalComponents.start(); } - boolean needToNotify = state != ComponentStatus.STARTED && state != ComponentStatus.STARTING; + boolean needToNotify = state != ComponentStatus.RUNNING && state != ComponentStatus.INITIALIZING; super.start(); - if (needToNotify && state == ComponentStatus.STARTED) { + if (needToNotify && state == ComponentStatus.RUNNING) { globalComponents.registerNamedComponentRegistry(this, cacheName); cacheManagerNotifier.notifyCacheStarted(cacheName); } @@ -119,8 +119,8 @@ @Override public void stop() { if (state.stopAllowed()) globalComponents.unregisterNamedComponentRegistry(cacheName); - boolean needToNotify = state == ComponentStatus.STARTED || state == ComponentStatus.STARTING; + boolean needToNotify = state == ComponentStatus.RUNNING || state == ComponentStatus.INITIALIZING; super.stop(); - if (state == ComponentStatus.STOPPED && needToNotify) cacheManagerNotifier.notifyCacheStopped(cacheName); + if (state == ComponentStatus.TERMINATED && needToNotify) cacheManagerNotifier.notifyCacheStopped(cacheName); } } Deleted: core/branches/flat/src/main/java/org/horizon/factories/annotations/Destroy.java =================================================================== --- core/branches/flat/src/main/java/org/horizon/factories/annotations/Destroy.java 2009-02-09 21:28:30 UTC (rev 7671) +++ core/branches/flat/src/main/java/org/horizon/factories/annotations/Destroy.java 2009-02-10 11:54:44 UTC (rev 7672) @@ -1,48 +0,0 @@ -/* - * JBoss, Home of Professional Open Source. - * Copyright 2000 - 2008, Red Hat Middleware LLC, and individual contributors - * as indicated by the @author tags. See the copyright.txt file in the - * distribution for a full listing of individual contributors. - * - * This 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 2.1 of - * the License, or (at your option) any later version. - * - * This software 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 this software; if not, write to the Free - * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA - * 02110-1301 USA, or see the FSF site: http://www.fsf.org. - */ -package org.horizon.factories.annotations; - -import static java.lang.annotation.ElementType.METHOD; -import java.lang.annotation.Retention; -import java.lang.annotation.RetentionPolicy; -import java.lang.annotation.Target; - -/** - * Method level annotation that indicates a (no-param) method to be called on a component registered in the - * ComponentRegistry when the cache is destroyed. - * - * - * @author Manik Surtani (<a href="mailto:manik@jboss.org">manik(a)jboss.org</a>) - * @since 1.0 - */ -@Target(METHOD) -(a)Retention(RetentionPolicy.RUNTIME) -public @interface Destroy { - /** - * Optional parameter which defines the order in which this method will be called when the ComponentRegistry moves to - * the STARTED state. Defaults to 10. - * - * @return execution priority - * @since 1.0 - */ - public abstract int priority() default 10; -} \ No newline at end of file Copied: core/branches/flat/src/main/java/org/horizon/lifecycle/ComponentStatus.java (from rev 7666, core/branches/flat/src/main/java/org/horizon/ComponentStatus.java) =================================================================== --- core/branches/flat/src/main/java/org/horizon/lifecycle/ComponentStatus.java (rev 0) +++ core/branches/flat/src/main/java/org/horizon/lifecycle/ComponentStatus.java 2009-02-10 11:54:44 UTC (rev 7672) @@ -0,0 +1,102 @@ +/* + * JBoss, Home of Professional Open Source. + * Copyright 2000 - 2008, Red Hat Middleware LLC, and individual contributors + * as indicated by the @author tags. See the copyright.txt file in the + * distribution for a full listing of individual contributors. + * + * This 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 2.1 of + * the License, or (at your option) any later version. + * + * This software 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 this software; if not, write to the Free + * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA + * 02110-1301 USA, or see the FSF site: http://www.fsf.org. + */ +package org.horizon.lifecycle; + +import org.horizon.logging.Log; +import org.horizon.logging.LogFactory; + +/** + * Different states a component may be in. + * + * @author Manik Surtani + * @see org.horizon.lifecycle.Lifecycle + * @since 1.0 + */ +public enum ComponentStatus { + /** + * Object has been instantiated, but start() has not been called. + */ + INSTANTIATED, + /** + * The <code>start()</code> method has been called but not yet completed. + */ + INITIALIZING, + /** + * The <code>start()</code> method has been completed and the component is running. + */ + RUNNING, + /** + * The <code>stop()</code> method has been called but has not yet completed. + */ + STOPPING, + /** + * The <code>stop()</code> method has completed and the component has terminated. + */ + TERMINATED, + /** + * The component is in a failed state due to a problem with one of the other lifecycle transition phases. + */ + FAILED; + + private static final Log log = LogFactory.getLog(ComponentStatus.class); + + public boolean needToDestroyFailedCache() { + return this == ComponentStatus.FAILED; + } + + public boolean startAllowed() { + switch (this) { + case INSTANTIATED: + case TERMINATED: + return true; + default: + return false; + } + } + + public boolean needToInitializeBeforeStart() { + switch (this) { + case INSTANTIATED: + return true; + default: + return false; + } + } + + public boolean stopAllowed() { + switch (this) { + case INSTANTIATED: + case TERMINATED: + case STOPPING: + case INITIALIZING: + log.debug("Ignoring call to stop() as current state is " + this); + return false; + default: + return true; + } + + } + + public boolean allowInvocations() { + return this == ComponentStatus.RUNNING; + } +} Property changes on: core/branches/flat/src/main/java/org/horizon/lifecycle/ComponentStatus.java ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Modified: core/branches/flat/src/main/java/org/horizon/lifecycle/Lifecycle.java =================================================================== --- core/branches/flat/src/main/java/org/horizon/lifecycle/Lifecycle.java 2009-02-09 21:28:30 UTC (rev 7671) +++ core/branches/flat/src/main/java/org/horizon/lifecycle/Lifecycle.java 2009-02-10 11:54:44 UTC (rev 7672) @@ -28,7 +28,9 @@ * @since 1.0 */ public interface Lifecycle { + void start(); void stop(); + } Modified: core/branches/flat/src/main/java/org/horizon/manager/CacheManager.java =================================================================== --- core/branches/flat/src/main/java/org/horizon/manager/CacheManager.java 2009-02-09 21:28:30 UTC (rev 7671) +++ core/branches/flat/src/main/java/org/horizon/manager/CacheManager.java 2009-02-10 11:54:44 UTC (rev 7672) @@ -1,12 +1,12 @@ package org.horizon.manager; import org.horizon.Cache; -import org.horizon.ComponentStatus; import org.horizon.config.Configuration; import org.horizon.config.DuplicateCacheNameException; import org.horizon.factories.annotations.NonVolatile; import org.horizon.factories.scopes.Scope; import org.horizon.factories.scopes.Scopes; +import org.horizon.lifecycle.ComponentStatus; import org.horizon.lifecycle.Lifecycle; import org.horizon.notifications.Listenable; import org.horizon.remoting.transport.Address; @@ -98,7 +98,7 @@ Address getAddress(); + boolean isCoordinator(); + ComponentStatus getStatus(); - - boolean isCoordinator(); } Modified: core/branches/flat/src/main/java/org/horizon/manager/DefaultCacheManager.java =================================================================== --- core/branches/flat/src/main/java/org/horizon/manager/DefaultCacheManager.java 2009-02-09 21:28:30 UTC (rev 7671) +++ core/branches/flat/src/main/java/org/horizon/manager/DefaultCacheManager.java 2009-02-10 11:54:44 UTC (rev 7672) @@ -22,7 +22,6 @@ package org.horizon.manager; import org.horizon.Cache; -import org.horizon.ComponentStatus; import org.horizon.config.Configuration; import org.horizon.config.ConfigurationException; import org.horizon.config.DuplicateCacheNameException; @@ -34,6 +33,7 @@ import org.horizon.factories.annotations.NonVolatile; import org.horizon.factories.scopes.Scope; import org.horizon.factories.scopes.Scopes; +import org.horizon.lifecycle.ComponentStatus; import org.horizon.lifecycle.Lifecycle; import org.horizon.notifications.cachemanagerlistener.CacheManagerNotifier; import org.horizon.remoting.RPCManager; @@ -372,6 +372,6 @@ } public ComponentStatus getStatus() { - return globalComponentRegistry.getState(); + return globalComponentRegistry.getStatus(); } } Modified: core/branches/flat/src/main/java/org/horizon/marshall/Marshaller.java =================================================================== --- core/branches/flat/src/main/java/org/horizon/marshall/Marshaller.java 2009-02-09 21:28:30 UTC (rev 7671) +++ core/branches/flat/src/main/java/org/horizon/marshall/Marshaller.java 2009-02-10 11:54:44 UTC (rev 7672) @@ -47,8 +47,8 @@ * This interface is used to marshall {@link org.horizon.commands.ReplicableCommand}s, their parameters and their * response values. * - * The interface is also used by the {@link org.horizon.loader.CacheLoader} framework to efficiently serialize data to - * be persisted, as well as the {@link org.horizon.statetransfer.StateTransferManager} when serializing the cache for + * The interface is also used by the {@link org.horizon.loader.CacheLoaderOld} framework to efficiently serialize data + * to be persisted, as well as the {@link org.horizon.statetransfer.StateTransferManager} when serializing the cache for * transferring state en-masse. * * @author <a href="mailto://manik@jboss.org">Manik Surtani</a> Modified: core/branches/flat/src/main/java/org/horizon/notifications/AbstractListenerImpl.java =================================================================== --- core/branches/flat/src/main/java/org/horizon/notifications/AbstractListenerImpl.java 2009-02-09 21:28:30 UTC (rev 7671) +++ core/branches/flat/src/main/java/org/horizon/notifications/AbstractListenerImpl.java 2009-02-10 11:54:44 UTC (rev 7672) @@ -3,7 +3,6 @@ import org.horizon.CacheException; import org.horizon.factories.KnownComponentNames; import org.horizon.factories.annotations.ComponentName; -import org.horizon.factories.annotations.Destroy; import org.horizon.factories.annotations.Inject; import org.horizon.factories.annotations.Start; import org.horizon.factories.annotations.Stop; @@ -44,11 +43,6 @@ this.asyncProcessor = executor; } - @Destroy - void destroy() { - removeAllCacheListeners(); - } - @Start public void start() { syncProcessor = new WithinThreadExecutor(); Modified: core/branches/flat/src/main/java/org/horizon/tree/TreeCache.java =================================================================== --- core/branches/flat/src/main/java/org/horizon/tree/TreeCache.java 2009-02-09 21:28:30 UTC (rev 7671) +++ core/branches/flat/src/main/java/org/horizon/tree/TreeCache.java 2009-02-10 11:54:44 UTC (rev 7672) @@ -264,8 +264,7 @@ * @param newParent new location under which to attach the node being moved. * @throws NodeNotExistsException may throw one of these if the target node does not exist or if a different thread * has moved this node elsewhere already. - * @throws IllegalStateException if {@link Cache#getCacheStatus()} would not return {@link - * org.horizon.ComponentStatus#STARTED}. + * @throws IllegalStateException if {@link #getStatus()} would not return {@link org.horizon.lifecycle.ComponentStatus#STARTED}. */ void move(Fqn nodeToMove, Fqn newParent) throws NodeNotExistsException; @@ -274,8 +273,7 @@ /** * Convenience method that takes in string representations of Fqns. Otherwise identical to {@link #move(Fqn, Fqn)} * - * @throws IllegalStateException if {@link Cache#getCacheStatus()} would not return {@link - * org.horizon.ComponentStatus#STARTED}. + * @throws IllegalStateException if {@link #getStatus()} would not return {@link org.horizon.lifecycle.ComponentStatus#STARTED}. */ void move(String nodeToMove, String newParent) throws NodeNotExistsException; @@ -288,8 +286,7 @@ * @param fqn * @return map of data, or an empty map * @throws CacheException - * @throws IllegalStateException if {@link Cache#getCacheStatus()} would not return {@link - * org.horizon.ComponentStatus#STARTED}. + * @throws IllegalStateException if {@link #getStatus()} would not return {@link org.horizon.lifecycle.ComponentStatus#STARTED}. */ Map<K, V> getData(Fqn fqn); @@ -310,8 +307,7 @@ * A convenience method to retrieving a node and getting keys from the node directly. * * @param fqn name of the node - * @throws IllegalStateException if {@link Cache#getCacheStatus()} would not return {@link - * org.horizon.ComponentStatus#STARTED}. + * @throws IllegalStateException if {@link #getStatus()} would not return {@link org.horizon.lifecycle.ComponentStatus#STARTED}. */ Set<K> getKeys(Fqn fqn); @@ -321,8 +317,7 @@ * Convenience method that takes in a String represenation of the Fqn. Otherwise identical to {@link * #clearData(Fqn)}. * - * @throws IllegalStateException if {@link Cache#getCacheStatus()} would not return {@link - * org.horizon.ComponentStatus#STARTED}. + * @throws IllegalStateException if {@link #getStatus()} would not return {@link org.horizon.lifecycle.ComponentStatus#STARTED}. */ void clearData(String fqn); @@ -334,8 +329,7 @@ * A convenience method to retrieving a node and getting keys from the node directly. * * @param fqn name of the node - * @throws IllegalStateException if {@link Cache#getCacheStatus()} would not return {@link - * org.horizon.ComponentStatus#STARTED}. + * @throws IllegalStateException if {@link #getStatus()} would not return {@link org.horizon.lifecycle.ComponentStatus#STARTED}. */ void clearData(Fqn fqn); Modified: core/branches/flat/src/main/java/org/horizon/util/TestingUtil.java =================================================================== --- core/branches/flat/src/main/java/org/horizon/util/TestingUtil.java 2009-02-09 21:28:30 UTC (rev 7671) +++ core/branches/flat/src/main/java/org/horizon/util/TestingUtil.java 2009-02-10 11:54:44 UTC (rev 7672) @@ -10,13 +10,13 @@ import org.horizon.AdvancedCache; import org.horizon.Cache; import org.horizon.CacheDelegate; -import org.horizon.ComponentStatus; import org.horizon.commands.CommandsFactory; import org.horizon.commands.VisitableCommand; import org.horizon.factories.ComponentRegistry; import org.horizon.factories.GlobalComponentRegistry; import org.horizon.interceptors.InterceptorChain; import org.horizon.interceptors.base.CommandInterceptor; +import org.horizon.lifecycle.ComponentStatus; import org.horizon.lock.LockManager; import org.horizon.manager.CacheManager; import org.horizon.remoting.transport.Address; @@ -185,7 +185,7 @@ } /** - * Loops, continually calling {@link #areCacheViewsComplete(CacheSPI[])} until it either returns true or + * Loops, continually calling {@link #areCacheViewsComplete(Cache[])} until it either returns true or * <code>timeout</code> ms have elapsed. * * @param groupSize number of caches expected in the group @@ -211,8 +211,8 @@ } /** - * Checks each cache to see if the number of elements in the array returned by {@link CacheSPI#getMembers()} matches - * the size of the <code>caches</code> parameter. + * Checks each cache to see if the number of elements in the array returned by {@link CacheManager#getMembers()} + * matches the size of the <code>caches</code> parameter. * * @param caches caches that should form a View * @return <code>true</code> if all caches have <code>caches.length</code> members; false otherwise @@ -383,7 +383,7 @@ public static void killCaches(Cache... caches) { for (Cache c : caches) { try { - if (c != null && c.getCacheStatus() == ComponentStatus.STARTED) { + if (c != null && c.getStatus() == ComponentStatus.RUNNING) { TransactionManager tm = getTransactionManager(c); if (tm != null) { try { @@ -424,7 +424,7 @@ */ public static void killTransactions(Cache... caches) { for (Cache c : caches) { - if (c != null && c.getCacheStatus() == ComponentStatus.STARTED) { + if (c != null && c.getStatus() == ComponentStatus.RUNNING) { TransactionManager tm = getTransactionManager(c); if (tm != null) { try { @@ -509,7 +509,7 @@ AdvancedCache spi = cache.getAdvancedCache(); long killTime = System.currentTimeMillis() + timeout; while (System.currentTimeMillis() < killTime) { - if (spi.getCacheStatus() == cacheStatus) return; + if (spi.getStatus() == cacheStatus) return; sleepThread(50); } throw new RuntimeException("Timed out waiting for condition"); Modified: core/branches/flat/src/test/java/org/horizon/config/parsing/ConfigurationParserTest.java =================================================================== --- core/branches/flat/src/test/java/org/horizon/config/parsing/ConfigurationParserTest.java 2009-02-09 21:28:30 UTC (rev 7671) +++ core/branches/flat/src/test/java/org/horizon/config/parsing/ConfigurationParserTest.java 2009-02-10 11:54:44 UTC (rev 7672) @@ -211,7 +211,7 @@ CacheLoaderConfig.IndividualCacheLoaderConfig.SingletonStoreConfig ssc = iclc.getSingletonStoreConfig(); assert ssc.isSingletonStoreEnabled(); - assert ssc.getClassName().equals("org.horizon.loader.SingletonStoreCacheLoader"); + assert ssc.getClassName().equals("org.horizon.loader.SingletonStoreCacheLoaderOld"); assert ssc.getSingletonStoreProperties().isEmpty(); } Modified: core/branches/flat/src/test/java/org/horizon/manager/CacheManagerTest.java =================================================================== --- core/branches/flat/src/test/java/org/horizon/manager/CacheManagerTest.java 2009-02-09 21:28:30 UTC (rev 7671) +++ core/branches/flat/src/test/java/org/horizon/manager/CacheManagerTest.java 2009-02-10 11:54:44 UTC (rev 7672) @@ -1,9 +1,9 @@ package org.horizon.manager; import org.horizon.Cache; -import org.horizon.ComponentStatus; import org.horizon.config.Configuration; import org.horizon.config.DuplicateCacheNameException; +import org.horizon.lifecycle.ComponentStatus; import org.horizon.util.TestingUtil; import org.testng.annotations.Test; @@ -17,7 +17,7 @@ CacheManager cm = new DefaultCacheManager(); try { - assert cm.getCache().getCacheStatus() == ComponentStatus.STARTED; + assert cm.getCache().getStatus() == ComponentStatus.RUNNING; assert cm.getCache().getName().equals(DefaultCacheManager.DEFAULT_CACHE_NAME); try { @@ -59,15 +59,15 @@ Cache c2 = cm.getCache("cache2"); Cache c3 = cm.getCache("cache3"); - assert c1.getCacheStatus() == ComponentStatus.STARTED; - assert c2.getCacheStatus() == ComponentStatus.STARTED; - assert c3.getCacheStatus() == ComponentStatus.STARTED; + assert c1.getStatus() == ComponentStatus.RUNNING; + assert c2.getStatus() == ComponentStatus.RUNNING; + assert c3.getStatus() == ComponentStatus.RUNNING; cm.stop(); - assert c1.getCacheStatus() == ComponentStatus.STOPPED; - assert c2.getCacheStatus() == ComponentStatus.STOPPED; - assert c3.getCacheStatus() == ComponentStatus.STOPPED; + assert c1.getStatus() == ComponentStatus.TERMINATED; + assert c2.getStatus() == ComponentStatus.TERMINATED; + assert c3.getStatus() == ComponentStatus.TERMINATED; } finally { TestingUtil.killCacheManagers(cm); }

15 years, 10 months

1
0
0 / 0

JBoss Cache SVN: r7671 - core/branches/flat/src/test/java/org/horizon/eviction.

by jbosscache-commits＠lists.jboss.org

Author: manik.surtani(a)jboss.com Date: 2009-02-09 16:28:30 -0500 (Mon, 09 Feb 2009) New Revision: 7671 Modified: core/branches/flat/src/test/java/org/horizon/eviction/EvictionFunctionalTest.java Log: Improved test Modified: core/branches/flat/src/test/java/org/horizon/eviction/EvictionFunctionalTest.java =================================================================== --- core/branches/flat/src/test/java/org/horizon/eviction/EvictionFunctionalTest.java 2009-02-09 18:43:20 UTC (rev 7670) +++ core/branches/flat/src/test/java/org/horizon/eviction/EvictionFunctionalTest.java 2009-02-09 21:28:30 UTC (rev 7671) @@ -2,27 +2,26 @@ import org.horizon.Cache; import org.horizon.config.Configuration; +import org.horizon.config.EvictionAlgorithmConfig; import org.horizon.config.EvictionConfig; +import org.horizon.container.DataContainer; import org.horizon.eviction.algorithms.fifo.FIFOAlgorithmConfig; +import org.horizon.eviction.events.EvictionEvent; import org.horizon.manager.CacheManager; import org.horizon.manager.DefaultCacheManager; -import org.horizon.notifications.Listener; -import org.horizon.notifications.cachelistener.annotation.CacheEntryEvicted; -import org.horizon.notifications.cachelistener.event.CacheEntryEvictedEvent; +import org.horizon.util.ReflectionUtil; import org.horizon.util.TestingUtil; import org.testng.annotations.AfterMethod; import org.testng.annotations.BeforeMethod; import org.testng.annotations.Test; -import java.util.HashSet; -import java.util.Set; +import java.util.concurrent.BlockingQueue; import java.util.concurrent.CountDownLatch; import java.util.concurrent.TimeUnit; -@Test(groups = "functional", sequential = true, enabled = true) +@Test(groups = "functional", sequential = true) public class EvictionFunctionalTest { Cache cache; - EvictionListener el; @BeforeMethod public void setUp() { @@ -36,8 +35,6 @@ ec.setWakeUpInterval(50); // 50 millis! CacheManager cm = new DefaultCacheManager(cfg); cache = cm.getCache(); - el = new EvictionListener(); - cache.addListener(el); } catch (Exception e) { e.printStackTrace(); } @@ -49,33 +46,78 @@ } public void testEviction() throws InterruptedException { - el.latch = new CountDownLatch(1); + CountDownLatch evictionCompleteLatch = new CountDownLatch(1); + CountDownLatch cacheFillLatch = new CountDownLatch(1); + EvictionManager em = cache.getAdvancedCache().getEvictionManager(); + EvictionAlgorithm actualAlgorithm = (EvictionAlgorithm) TestingUtil.extractField(em, "evictionAlgorithm"); + DelegatingAlgorithm a = new DelegatingAlgorithm(actualAlgorithm, cacheFillLatch, evictionCompleteLatch); + ReflectionUtil.setValue(em, "evictionAlgorithm", a); + for (int i = 0; i < 20; i++) { cache.put(i, "value"); } + cacheFillLatch.countDown(); - assert el.latch.await(60, TimeUnit.SECONDS); - for (int i = 10; i < 20; i++) assert cache.containsKey(i); + assert evictionCompleteLatch.await(600, TimeUnit.SECONDS); + for (int i = 10; i < 20; i++) + assert cache.get(i).equals("value") : "Key " + i + " should map to 'value', but was " + cache.get(i); - for (int i = 0; i < 10; i++) assert !cache.containsKey(i); + for (int i = 0; i < 10; i++) + assert cache.get(i) == null : + "Key " + i + " should map to null, but was " + cache.get(i) + " and cache count is " + cache.size(); } - @Listener - public static class EvictionListener { - Set<Integer> expectedKeys = new HashSet<Integer>(); - CountDownLatch latch; + public class DelegatingAlgorithm implements EvictionAlgorithm { + EvictionAlgorithm delegate; + CountDownLatch cacheFillLatch; + CountDownLatch evictionOverLatch; - public EvictionListener() { - for (int i = 0; i < 10; i++) expectedKeys.add(i); + public DelegatingAlgorithm(EvictionAlgorithm delegate, CountDownLatch cacheFillLatch, CountDownLatch evictionOverLatch) { + this.delegate = delegate; + this.cacheFillLatch = cacheFillLatch; + this.evictionOverLatch = evictionOverLatch; } - @CacheEntryEvicted - public void handle(CacheEntryEvictedEvent event) { - System.out.println("Saw event " + event); - if (event.isPre()) { - assert expectedKeys.remove(event.getKey()); - if (expectedKeys.isEmpty()) latch.countDown(); + public void process(BlockingQueue<EvictionEvent> queue) throws EvictionException { + try { + cacheFillLatch.await(); + } catch (InterruptedException e) { + throw new RuntimeException(e); } + System.out.println("Queue size=" + queue.size()); + + delegate.process(queue); + + // queue should now have processed + evictionOverLatch.countDown(); } + + public void resetEvictionQueue() { + delegate.resetEvictionQueue(); + } + + public void setEvictionAction(EvictionAction evictionAction) { + delegate.setEvictionAction(evictionAction); + } + + public void init(Cache<?, ?> cache, DataContainer<?, ?> dataContiner, EvictionAlgorithmConfig evictionAlgorithmConfig) { + delegate.init(cache, dataContiner, evictionAlgorithmConfig); + } + + public boolean canIgnoreEvent(EvictionEvent.Type eventType) { + return delegate.canIgnoreEvent(eventType); + } + + public Class<? extends EvictionAlgorithmConfig> getConfigurationClass() { + return delegate.getConfigurationClass(); + } + + public void start() { + delegate.start(); + } + + public void stop() { + delegate.stop(); + } } }

15 years, 10 months

1
0
0 / 0

JBoss Cache SVN: r7670 - in core/branches/flat: src/test/java/org/horizon and 1 other directories.

by jbosscache-commits＠lists.jboss.org

Author: manik.surtani(a)jboss.com Date: 2009-02-09 13:43:20 -0500 (Mon, 09 Feb 2009) New Revision: 7670 Modified: core/branches/flat/pom.xml core/branches/flat/src/test/java/org/horizon/BaseClusteredTest.java core/branches/flat/src/test/java/org/horizon/manager/CacheManagerComponentRegistryTest.java Log: Fixed tests running in maven Modified: core/branches/flat/pom.xml =================================================================== --- core/branches/flat/pom.xml 2009-02-09 18:30:59 UTC (rev 7669) +++ core/branches/flat/pom.xml 2009-02-09 18:43:20 UTC (rev 7670) @@ -145,18 +145,19 @@ <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-surefire-plugin</artifactId> - <version>2.4.3-JBOSS</version> +  + <version>2.4.3</version> <configuration> - <parallel>methods</parallel> - <threadCount>1</threadCount> +  +  <forkMode>none</forkMode> - <trimStackTrace>false</trimStackTrace> - <properties> - <property> - <name>listener</name> - <value>org.horizon.util.UnitTestTestNGListener</value> - </property> - </properties> +  +  +  +  +  +  +  </configuration> </plugin> <plugin> Modified: core/branches/flat/src/test/java/org/horizon/BaseClusteredTest.java =================================================================== --- core/branches/flat/src/test/java/org/horizon/BaseClusteredTest.java 2009-02-09 18:30:59 UTC (rev 7669) +++ core/branches/flat/src/test/java/org/horizon/BaseClusteredTest.java 2009-02-09 18:43:20 UTC (rev 7670) @@ -96,7 +96,7 @@ return new ReplListener(c); } - @AfterMethod + @AfterMethod(alwaysRun = true) public void cleanupThreadLocals() { TestingUtil.killCacheManagers(cacheManagerThreadLocal.get().toArray(new CacheManager[cacheManagerThreadLocal.get().size()])); cacheManagerThreadLocal.get().clear(); Modified: core/branches/flat/src/test/java/org/horizon/manager/CacheManagerComponentRegistryTest.java =================================================================== --- core/branches/flat/src/test/java/org/horizon/manager/CacheManagerComponentRegistryTest.java 2009-02-09 18:30:59 UTC (rev 7669) +++ core/branches/flat/src/test/java/org/horizon/manager/CacheManagerComponentRegistryTest.java 2009-02-09 18:43:20 UTC (rev 7670) @@ -25,9 +25,9 @@ public class CacheManagerComponentRegistryTest { DefaultCacheManager cm; - @AfterMethod + @AfterMethod(alwaysRun = true) public void tearDown() { - if (cm != null) cm.stop(); + TestingUtil.killCacheManagers(cm); } public void testForceSharedComponents() throws NamedCacheNotFoundException {

15 years, 10 months

1
0
0 / 0

JBoss Cache SVN: r7669 - in core/branches/flat/src: main/java/org/horizon/atomic and 23 other directories.

by jbosscache-commits＠lists.jboss.org

Author: manik.surtani(a)jboss.com Date: 2009-02-09 13:30:59 -0500 (Mon, 09 Feb 2009) New Revision: 7669 Added: core/branches/flat/src/main/java/org/horizon/AdvancedCache.java core/branches/flat/src/main/java/org/horizon/context/AbstractContext.java core/branches/flat/src/main/java/org/horizon/context/OptionContainer.java core/branches/flat/src/main/java/org/horizon/invocation/Options.java Removed: core/branches/flat/src/main/java/org/horizon/CacheSPI.java core/branches/flat/src/main/java/org/horizon/config/Option.java Modified: core/branches/flat/src/main/java/org/horizon/Cache.java core/branches/flat/src/main/java/org/horizon/CacheDelegate.java core/branches/flat/src/main/java/org/horizon/atomic/AtomicHashMap.java core/branches/flat/src/main/java/org/horizon/atomic/AtomicHashMapProxy.java core/branches/flat/src/main/java/org/horizon/commands/CommandsFactoryImpl.java core/branches/flat/src/main/java/org/horizon/context/EntryLookup.java core/branches/flat/src/main/java/org/horizon/context/InvocationContext.java core/branches/flat/src/main/java/org/horizon/context/InvocationContextImpl.java core/branches/flat/src/main/java/org/horizon/context/TransactionContext.java core/branches/flat/src/main/java/org/horizon/context/TransactionContextImpl.java core/branches/flat/src/main/java/org/horizon/factories/BootstrapFactory.java core/branches/flat/src/main/java/org/horizon/factories/ComponentRegistry.java core/branches/flat/src/main/java/org/horizon/factories/DefaultCacheFactory.java core/branches/flat/src/main/java/org/horizon/factories/EntryFactoryImpl.java core/branches/flat/src/main/java/org/horizon/factories/annotations/NonVolatile.java core/branches/flat/src/main/java/org/horizon/interceptors/CacheStoreInterceptor.java core/branches/flat/src/main/java/org/horizon/interceptors/InvalidationInterceptor.java core/branches/flat/src/main/java/org/horizon/interceptors/InvocationContextInterceptor.java core/branches/flat/src/main/java/org/horizon/interceptors/LockingInterceptor.java core/branches/flat/src/main/java/org/horizon/interceptors/ReplicationInterceptor.java core/branches/flat/src/main/java/org/horizon/interceptors/TxInterceptor.java core/branches/flat/src/main/java/org/horizon/interceptors/base/BaseRpcInterceptor.java core/branches/flat/src/main/java/org/horizon/invocation/InvocationContextContainer.java core/branches/flat/src/main/java/org/horizon/jmx/JmxRegistrationManager.java core/branches/flat/src/main/java/org/horizon/jmx/PlatformMBeanServerRegistration.java core/branches/flat/src/main/java/org/horizon/loader/AbstractCacheLoader.java core/branches/flat/src/main/java/org/horizon/loader/AbstractDelegatingCacheLoader.java core/branches/flat/src/main/java/org/horizon/loader/CacheLoader.java core/branches/flat/src/main/java/org/horizon/loader/CacheLoaderManager.java core/branches/flat/src/main/java/org/horizon/loader/ClusteredCacheLoader.java core/branches/flat/src/main/java/org/horizon/loader/SingletonStoreCacheLoader.java core/branches/flat/src/main/java/org/horizon/lock/StripedLockManager.java core/branches/flat/src/main/java/org/horizon/notifications/cachelistener/CacheNotifierImpl.java core/branches/flat/src/main/java/org/horizon/statetransfer/DefaultStateTransferManager.java core/branches/flat/src/main/java/org/horizon/tree/Node.java core/branches/flat/src/main/java/org/horizon/tree/NodeImpl.java core/branches/flat/src/main/java/org/horizon/tree/TreeCache.java core/branches/flat/src/main/java/org/horizon/tree/TreeCacheImpl.java core/branches/flat/src/main/java/org/horizon/tree/TreeStructureSupport.java core/branches/flat/src/main/java/org/horizon/util/TestingUtil.java core/branches/flat/src/test/java/org/horizon/BaseClusteredTest.java core/branches/flat/src/test/java/org/horizon/api/CacheAPITest.java core/branches/flat/src/test/java/org/horizon/api/MixedModeTest.java core/branches/flat/src/test/java/org/horizon/api/mvcc/PutForExternalReadTest.java core/branches/flat/src/test/java/org/horizon/api/tree/NodeLockSupport.java core/branches/flat/src/test/java/org/horizon/api/tree/NodeMoveAPITest.java core/branches/flat/src/test/java/org/horizon/api/tree/SyncReplTest.java core/branches/flat/src/test/java/org/horizon/api/tree/TreeCacheAPITest.java core/branches/flat/src/test/java/org/horizon/invalidation/BaseInvalidationTest.java core/branches/flat/src/test/java/org/horizon/notifications/cachelistener/CacheNotifierImplTest.java core/branches/flat/src/test/java/org/horizon/replication/BaseReplicatedAPITest.java core/branches/flat/src/test/java/org/horizon/replication/ReplicationExceptionTest.java core/branches/flat/src/test/java/org/horizon/tx/LocalModeTxTest.java core/branches/flat/src/test/java/org/horizon/tx/MarkAsRollbackTest.java Log: - New Options API - Removed CacheSPI in favour of AdvancedCache Added: core/branches/flat/src/main/java/org/horizon/AdvancedCache.java =================================================================== --- core/branches/flat/src/main/java/org/horizon/AdvancedCache.java (rev 0) +++ core/branches/flat/src/main/java/org/horizon/AdvancedCache.java 2009-02-09 18:30:59 UTC (rev 7669) @@ -0,0 +1,108 @@ +package org.horizon; + +import org.horizon.batch.BatchContainer; +import org.horizon.eviction.EvictionManager; +import org.horizon.factories.ComponentRegistry; +import org.horizon.interceptors.base.CommandInterceptor; +import org.horizon.invocation.InvocationContextContainer; +import org.horizon.invocation.Options; + +import java.util.List; +import java.util.Map; +import java.util.concurrent.TimeUnit; + +/** + * An advanced interface that exposes additional methods not available on {@link Cache}. + * + * @author Manik Surtani + * @since 1.0 + */ +public interface AdvancedCache<K, V> extends Cache<K, V> { + /** + * Adds a custom interceptor to the interceptor chain, at specified position, where the first interceptor in the + * chain is at position 0 and the last one at NUM_INTERCEPTORS - 1. + * + * @param i the interceptor to add + * @param position the position to add the interceptor + */ + void addInterceptor(CommandInterceptor i, int position); + + /** + * Adds a custom interceptor to the interceptor chain, after an instance of the specified interceptor type. Throws a + * cache exception if it cannot find an interceptor of the specified type. + * + * @param i interceptor to add + * @param afterInterceptor interceptor type after which to place custom interceptor + */ + void addInterceptorAfter(CommandInterceptor i, Class<? extends CommandInterceptor> afterInterceptor); + + /** + * Adds a custom interceptor to the interceptor chain, before an instance of the specified interceptor type. Throws a + * cache exception if it cannot find an interceptor of the specified type. + * + * @param i interceptor to add + * @param beforeInterceptor interceptor type before which to place custom interceptor + */ + void addInterceptorBefore(CommandInterceptor i, Class<? extends CommandInterceptor> beforeInterceptor); + + /** + * Removes the interceptor at a specified position, where the first interceptor in the chain is at position 0 and the + * last one at getInterceptorChain().size() - 1. + * + * @param position the position at which to remove an interceptor + */ + void removeInterceptor(int position); + + /** + * Removes the interceptor of specified type. + * + * @param interceptorType type of interceptor to remove + */ + void removeInterceptor(Class<? extends CommandInterceptor> interceptorType); + + /** + * Retrieves the current Interceptor chain. + * + * @return an immutable {@link java.util.List} of {@link org.horizon.interceptors.base.CommandInterceptor}s + * configured for this cache + */ + List<CommandInterceptor> getInterceptorChain(); + + /** + * @return the eviction manager - if one is configured - for this cache instance + */ + EvictionManager getEvictionManager(); + + /** + * @return the component registry for this cache instance + */ + ComponentRegistry getComponentRegistry(); + + BatchContainer getBatchContainer(); + + InvocationContextContainer getInvocationContextContainer(); + + void putForExternalRead(K key, V value, Options... options); + + V put(K key, V value, Options... options); + + V put(K key, V value, long lifespan, TimeUnit unit, Options... options); + + V putIfAbsent(K key, V value, Options... options); + + V putIfAbsent(K key, V value, long lifespan, TimeUnit unit, Options... options); + + void putAll(Map<? extends K, ? extends V> map, Options... options); + + void putAll(Map<? extends K, ? extends V> map, long lifespan, TimeUnit unit, Options... options); + + V remove(Object key, Options... options); + + boolean remove(Object key, Object oldValue, Options... options); + + void clear(Options... options); + + boolean containsKey(Object key, Options... options); + + V get(Object key, Options... options); +} Modified: core/branches/flat/src/main/java/org/horizon/Cache.java =================================================================== --- core/branches/flat/src/main/java/org/horizon/Cache.java 2009-02-09 18:29:53 UTC (rev 7668) +++ core/branches/flat/src/main/java/org/horizon/Cache.java 2009-02-09 18:30:59 UTC (rev 7669) @@ -22,8 +22,6 @@ package org.horizon; import org.horizon.config.Configuration; -import org.horizon.context.InvocationContext; -import org.horizon.interceptors.base.CommandInterceptor; import org.horizon.lifecycle.Lifecycle; import org.horizon.manager.CacheManager; import org.horizon.notifications.Listenable; @@ -66,10 +64,6 @@ Configuration getConfiguration(); - InvocationContext getInvocationContext(); - - void setInvocationContext(InvocationContext ctx); - ComponentStatus getCacheStatus(); /** @@ -84,48 +78,6 @@ String getVersion(); /** - * Adds a custom interceptor to the interceptor chain, at specified position, where the first interceptor in the - * chain is at position 0 and the last one at NUM_INTERCEPTORS - 1. - * - * @param i the interceptor to add - * @param position the position to add the interceptor - */ - void addInterceptor(CommandInterceptor i, int position); - - /** - * Adds a custom interceptor to the interceptor chain, after an instance of the specified interceptor type. Throws a - * cache exception if it cannot find an interceptor of the specified type. - * - * @param i interceptor to add - * @param afterInterceptor interceptor type after which to place custom interceptor - */ - void addInterceptorAfter(CommandInterceptor i, Class<? extends CommandInterceptor> afterInterceptor); - - /** - * Adds a custom interceptor to the interceptor chain, before an instance of the specified interceptor type. Throws a - * cache exception if it cannot find an interceptor of the specified type. - * - * @param i interceptor to add - * @param beforeInterceptor interceptor type before which to place custom interceptor - */ - void addInterceptorBefore(CommandInterceptor i, Class<? extends CommandInterceptor> beforeInterceptor); - - /** - * Removes the interceptor at a specified position, where the first interceptor in the chain is at position 0 and the - * last one at getInterceptorChain().size() - 1. - * - * @param position the position at which to remove an interceptor - */ - void removeInterceptor(int position); - - /** - * Removes the interceptor of specified type. - * - * @param interceptorType type of interceptor to remove - */ - void removeInterceptor(Class<? extends CommandInterceptor> interceptorType); - - /** * Retrieves the cache manager responsible for creating this cache instance. * * @return a cache manager @@ -186,4 +138,6 @@ * @return true if the value was replaced, false otherwise */ boolean replace(K key, V oldValue, V value, long lifespan, TimeUnit unit); + + AdvancedCache<K, V> getAdvancedCache(); } Modified: core/branches/flat/src/main/java/org/horizon/CacheDelegate.java =================================================================== --- core/branches/flat/src/main/java/org/horizon/CacheDelegate.java 2009-02-09 18:29:53 UTC (rev 7668) +++ core/branches/flat/src/main/java/org/horizon/CacheDelegate.java 2009-02-09 18:30:59 UTC (rev 7669) @@ -45,17 +45,13 @@ import org.horizon.interceptors.InterceptorChain; import org.horizon.interceptors.base.CommandInterceptor; import org.horizon.invocation.InvocationContextContainer; -import org.horizon.loader.CacheLoaderManager; -import org.horizon.lock.LockManager; +import org.horizon.invocation.Options; import org.horizon.logging.Log; import org.horizon.logging.LogFactory; import org.horizon.manager.CacheManager; import org.horizon.marshall.Marshaller; import org.horizon.notifications.cachelistener.CacheNotifier; import org.horizon.remoting.RPCManager; -import org.horizon.statetransfer.StateTransferManager; -import org.horizon.transaction.GlobalTransaction; -import org.horizon.transaction.TransactionTable; import javax.transaction.Transaction; import javax.transaction.TransactionManager; @@ -70,7 +66,7 @@ * @since 1.0 */ @NonVolatile -public class CacheDelegate<K, V> implements CacheSPI<K, V>, AtomicMapCache<K, V> { +public class CacheDelegate<K, V> implements AdvancedCache<K, V>, AtomicMapCache<K, V> { protected InvocationContextContainer invocationContextContainer; protected CommandsFactory commandsFactory; protected InterceptorChain invoker; @@ -84,7 +80,6 @@ private String name; private EvictionManager evictionManager; private DataContainer dataContainer; - private LockManager lockManager; private static final Log log = LogFactory.getLog(CacheDelegate.class); private CacheManager cacheManager; @@ -93,19 +88,18 @@ } @Inject - private void injectDependencies(EvictionManager evictionManager, - InvocationContextContainer invocationContextContainer, - CommandsFactory commandsFactory, - InterceptorChain interceptorChain, - Configuration configuration, - CacheNotifier notifier, - ComponentRegistry componentRegistry, - TransactionManager transactionManager, - BatchContainer batchContainer, - RPCManager rpcManager, DataContainer dataContainer, - Marshaller marshaller, - LockManager lockManager, - CacheManager cacheManager) { + public void injectDependencies(EvictionManager evictionManager, + InvocationContextContainer invocationContextContainer, + CommandsFactory commandsFactory, + InterceptorChain interceptorChain, + Configuration configuration, + CacheNotifier notifier, + ComponentRegistry componentRegistry, + TransactionManager transactionManager, + BatchContainer batchContainer, + RPCManager rpcManager, DataContainer dataContainer, + Marshaller marshaller, + CacheManager cacheManager) { this.invocationContextContainer = invocationContextContainer; this.commandsFactory = commandsFactory; this.invoker = interceptorChain; @@ -118,45 +112,46 @@ this.evictionManager = evictionManager; this.dataContainer = dataContainer; this.marshaller = marshaller; - this.lockManager = lockManager; this.cacheManager = cacheManager; } + @SuppressWarnings("unchecked") public V putIfAbsent(K key, V value) { PutKeyValueCommand command = commandsFactory.buildPutKeyValueCommand(key, value); command.setPutIfAbsent(true); - return (V) invoker.invoke(buildCtx(), command); + return (V) invoker.invoke(getInvocationContext(), command); } public boolean remove(Object key, Object value) { RemoveCommand command = commandsFactory.buildRemoveCommand(key, value); - return (Boolean) invoker.invoke(buildCtx(), command); + return (Boolean) invoker.invoke(getInvocationContext(), command); } public boolean replace(K key, V oldValue, V newValue) { ReplaceCommand command = commandsFactory.buildReplaceCommand(key, oldValue, newValue); - return (Boolean) invoker.invoke(buildCtx(), command); + return (Boolean) invoker.invoke(getInvocationContext(), command); } + @SuppressWarnings("unchecked") public V replace(K key, V value) { ReplaceCommand command = commandsFactory.buildReplaceCommand(key, null, value); - return (V) invoker.invoke(buildCtx(), command); + return (V) invoker.invoke(getInvocationContext(), command); } public int size() { SizeCommand command = commandsFactory.buildSizeCommand(); - return (Integer) invoker.invoke(buildCtx(), command); + return (Integer) invoker.invoke(getInvocationContext(), command); } public boolean isEmpty() { SizeCommand command = commandsFactory.buildSizeCommand(); - int size = (Integer) invoker.invoke(buildCtx(), command); + int size = (Integer) invoker.invoke(getInvocationContext(), command); return size == 0; } public boolean containsKey(Object key) { GetKeyValueCommand command = commandsFactory.buildGetKeyValueCommand(key); - Object response = invoker.invoke(buildCtx(), command); + Object response = invoker.invoke(getInvocationContext(), command); return response != null; } @@ -164,30 +159,32 @@ throw new UnsupportedOperationException("Go away"); } + @SuppressWarnings("unchecked") public V get(Object key) { GetKeyValueCommand command = commandsFactory.buildGetKeyValueCommand(key); - return (V) invoker.invoke(buildCtx(), command); + return (V) invoker.invoke(getInvocationContext(), command); } + @SuppressWarnings("unchecked") public V put(K key, V value) { PutKeyValueCommand command = commandsFactory.buildPutKeyValueCommand(key, value); - return (V) invoker.invoke(buildCtx(), command); + return (V) invoker.invoke(getInvocationContext(), command); } + @SuppressWarnings("unchecked") public V remove(Object key) { RemoveCommand command = commandsFactory.buildRemoveCommand(key, null); - V oldval = (V) invoker.invoke(buildCtx(), command); - return oldval; + return (V) invoker.invoke(getInvocationContext(), command); } public void putAll(Map<? extends K, ? extends V> t) { PutMapCommand command = commandsFactory.buildPutMapCommand(t); - invoker.invoke(buildCtx(), command); + invoker.invoke(getInvocationContext(), command); } public void clear() { ClearCommand command = commandsFactory.buildClearCommand(); - invoker.invoke(buildCtx(), command); + invoker.invoke(getInvocationContext(), command); } public Set<K> keySet() { @@ -203,7 +200,6 @@ } public void putForExternalRead(K key, V value) { - InvocationContext ctx = invocationContextContainer.get(); Transaction ongoingTransaction = null; try { if (transactionManager != null && (ongoingTransaction = transactionManager.getTransaction()) != null) { @@ -211,10 +207,7 @@ } // if the node exists then this should be a no-op. - ctx.getOptionOverrides().setFailSilently(true); - ctx.getOptionOverrides().setForceAsynchronous(true); - ctx.getOptionOverrides().setLockAcquisitionTimeout(0); - putIfAbsent(key, value); + putIfAbsent(key, value, Options.FAIL_SILENTLY, Options.FORCE_ASYNCHRONOUS, Options.ZERO_LOCK_ACQUISITION_TIMEOUT); } catch (Exception e) { if (log.isDebugEnabled()) log.debug("Caught exception while doing putForExternalRead()", e); @@ -231,7 +224,7 @@ public void evict(K key) { EvictCommand command = commandsFactory.buildEvictCommand(key); - invoker.invoke(buildCtx(), command); + invoker.invoke(getInvocationContext(), command); } public Configuration getConfiguration() { @@ -250,15 +243,10 @@ return notifier.getListeners(); } - public InvocationContext getInvocationContext() { + private InvocationContext getInvocationContext() { return invocationContextContainer.get(); } - public void setInvocationContext(InvocationContext ctx) { - if (ctx == null) invocationContextContainer.remove(); - else invocationContextContainer.set(ctx); - } - public void start() { componentRegistry.start(); } @@ -267,22 +255,10 @@ componentRegistry.stop(); } - private InvocationContext buildCtx() { - return invocationContextContainer.get(); - } - - public TransactionManager getTransactionManager() { - return transactionManager; - } - public List<CommandInterceptor> getInterceptorChain() { - throw new IllegalStateException();//todo Implement me properly + return invoker.asList(); } - public Marshaller getMarshaller() { - return marshaller; - } - public void addInterceptor(CommandInterceptor i, int position) { invoker.addInterceptor(i, position); } @@ -303,42 +279,74 @@ invoker.removeInterceptor(interceptorType); } - public CacheLoaderManager getCacheLoaderManager() { - throw new IllegalStateException();//todo Implement me properly + public EvictionManager getEvictionManager() { + return evictionManager; } - public TransactionTable getTransactionTable() { - throw new IllegalStateException();//todo Implement me properly + public ComponentRegistry getComponentRegistry() { + return componentRegistry; } - public EvictionManager getEvictionManager() { - return evictionManager; + public void putForExternalRead(K key, V value, Options... options) { + getInvocationContext().setOptions(options); + putForExternalRead(key, value); } - public RPCManager getRPCManager() { - return rpcManager; + public V put(K key, V value, Options... options) { + getInvocationContext().setOptions(options); + return put(key, value); } - public StateTransferManager getStateTransferManager() { - throw new IllegalStateException();//todo Implement me properly + public V put(K key, V value, long lifespan, TimeUnit unit, Options... options) { + getInvocationContext().setOptions(options); + return put(key, value, lifespan, unit); } - public CacheNotifier getNotifier() { - return notifier; + public V putIfAbsent(K key, V value, Options... options) { + getInvocationContext().setOptions(options); + return putIfAbsent(key, value); } - public GlobalTransaction getCurrentTransaction(Transaction tx, boolean createIfNotExists) { - throw new IllegalStateException();//todo Implement me properly + public V putIfAbsent(K key, V value, long lifespan, TimeUnit unit, Options... options) { + getInvocationContext().setOptions(options); + return putIfAbsent(key, value, lifespan, unit); } - public GlobalTransaction getCurrentTransaction() { - throw new IllegalStateException();//todo Implement me properly + public void putAll(Map<? extends K, ? extends V> map, Options... options) { + getInvocationContext().setOptions(options); + putAll(map); } - public ComponentRegistry getComponentRegistry() { - return componentRegistry; + public void putAll(Map<? extends K, ? extends V> map, long lifespan, TimeUnit unit, Options... options) { + getInvocationContext().setOptions(options); + putAll(map, lifespan, unit); } + public V remove(Object key, Options... options) { + getInvocationContext().setOptions(options); + return remove(key); + } + + public boolean remove(Object key, Object oldValue, Options... options) { + getInvocationContext().setOptions(options); + return remove(key, oldValue); + } + + public void clear(Options... options) { + getInvocationContext().setOptions(options); + clear(); + } + + public boolean containsKey(Object key, Options... options) { + getInvocationContext().setOptions(options); + return containsKey(key); + } + + public V get(Object key, Options... options) { + getInvocationContext().setOptions(options); + return get(key); + } + public ComponentStatus getCacheStatus() { return componentRegistry.getState(); } @@ -355,14 +363,6 @@ batchContainer.endBatch(successful); } - public Object getDirect(Object key) { - throw new UnsupportedOperationException("Not implemented");//todo please implement! - } - - public LockManager getLockManager() { - return lockManager; - } - public String getName() { return name; } @@ -371,10 +371,6 @@ return Version.version; } - public void setName(String name) { - this.name = name; - } - @Override public String toString() { return dataContainer == null ? super.toString() : dataContainer.toString(); @@ -383,9 +379,10 @@ public AtomicMap getAtomicMap(K key) throws ClassCastException { Object value = get(key); if (value == null) value = AtomicHashMap.newInstance(this, key); - return ((AtomicHashMap) value).getProxy(this, key); + return ((AtomicHashMap) value).getProxy(this, key, batchContainer, invocationContextContainer); } + @SuppressWarnings("unchecked") public <AMK, AMV> AtomicMap<AMK, AMV> getAtomicMap(K key, Class<AMK> atomicMapKeyType, Class<AMV> atomicMapValueType) throws ClassCastException { return getAtomicMap(key); } @@ -394,33 +391,44 @@ return batchContainer; } + public InvocationContextContainer getInvocationContextContainer() { + return invocationContextContainer; + } + public CacheManager getCacheManager() { return cacheManager; } + @SuppressWarnings("unchecked") public V put(K key, V value, long lifespan, TimeUnit unit) { PutKeyValueCommand command = commandsFactory.buildPutKeyValueCommand(key, value, unit.toMillis(lifespan)); - return (V) invoker.invoke(buildCtx(), command); + return (V) invoker.invoke(getInvocationContext(), command); } + @SuppressWarnings("unchecked") public V putIfAbsent(K key, V value, long lifespan, TimeUnit unit) { PutKeyValueCommand command = commandsFactory.buildPutKeyValueCommand(key, value, unit.toMillis(lifespan)); command.setPutIfAbsent(true); - return (V) invoker.invoke(buildCtx(), command); + return (V) invoker.invoke(getInvocationContext(), command); } public void putAll(Map<? extends K, ? extends V> map, long lifespan, TimeUnit unit) { PutMapCommand command = commandsFactory.buildPutMapCommand(map, unit.toMillis(lifespan)); - invoker.invoke(buildCtx(), command); + invoker.invoke(getInvocationContext(), command); } + @SuppressWarnings("unchecked") public V replace(K key, V value, long lifespan, TimeUnit unit) { ReplaceCommand command = commandsFactory.buildReplaceCommand(key, null, value, unit.toMillis(lifespan)); - return (V) invoker.invoke(buildCtx(), command); + return (V) invoker.invoke(getInvocationContext(), command); } public boolean replace(K key, V oldValue, V value, long lifespan, TimeUnit unit) { ReplaceCommand command = commandsFactory.buildReplaceCommand(key, oldValue, value, unit.toMillis(lifespan)); - return (Boolean) invoker.invoke(buildCtx(), command); + return (Boolean) invoker.invoke(getInvocationContext(), command); } + + public AdvancedCache<K, V> getAdvancedCache() { + return this; + } } Deleted: core/branches/flat/src/main/java/org/horizon/CacheSPI.java =================================================================== --- core/branches/flat/src/main/java/org/horizon/CacheSPI.java 2009-02-09 18:29:53 UTC (rev 7668) +++ core/branches/flat/src/main/java/org/horizon/CacheSPI.java 2009-02-09 18:30:59 UTC (rev 7669) @@ -1,181 +0,0 @@ -/* - * JBoss, Home of Professional Open Source. - * Copyright 2000 - 2008, Red Hat Middleware LLC, and individual contributors - * as indicated by the @author tags. See the copyright.txt file in the - * distribution for a full listing of individual contributors. - * - * This 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 2.1 of - * the License, or (at your option) any later version. - * - * This software 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 this software; if not, write to the Free - * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA - * 02110-1301 USA, or see the FSF site: http://www.fsf.org. - */ -package org.horizon; - -import net.jcip.annotations.ThreadSafe; -import org.horizon.batch.BatchContainer; -import org.horizon.eviction.EvictionManager; -import org.horizon.factories.ComponentRegistry; -import org.horizon.interceptors.base.CommandInterceptor; -import org.horizon.loader.CacheLoader; -import org.horizon.loader.CacheLoaderManager; -import org.horizon.lock.LockManager; -import org.horizon.marshall.Marshaller; -import org.horizon.notifications.cachelistener.CacheNotifier; -import org.horizon.remoting.RPCManager; -import org.horizon.statetransfer.StateTransferManager; -import org.horizon.transaction.GlobalTransaction; -import org.horizon.transaction.TransactionTable; - -import javax.transaction.Transaction; -import javax.transaction.TransactionManager; -import java.util.List; - -/** - * A more detailed interface to {@link Cache}, which is used when writing plugins for or extending JBoss Cache. A - * reference to this interface should only be obtained when it is passed in to your code, for example when you write an - * {@link org.horizon.interceptors.base.CommandInterceptor} or {@link CacheLoader}. - * - * You should NEVER attempt to directly cast a {@link Cache} instance to this interface. In future, the - * implementation may not allow it. - * - * - * @author <a href="mailto:manik@jboss.org">Manik Surtani (manik(a)jboss.org)</a> - * @see Cache - * @see CacheLoader - * @since 1.0 - */ -@ThreadSafe -public interface CacheSPI<K, V> extends Cache<K, V> { - /** - * Retrieves a reference to a running {@link javax.transaction.TransactionManager}, if one is configured. - * - * From 2.1.0, Interceptor authors should obtain this by injection rather than this method. See the {@link - * org.horizon.factories.annotations.Inject} annotation. - * - * @return a TransactionManager - */ - TransactionManager getTransactionManager(); - - /** - * Retrieves the current Interceptor chain. - * - * From 2.1.0, Interceptor authors should obtain this by injection rather than this method. See the {@link - * org.horizon.factories.annotations.Inject} annotation. - * - * @return an immutable {@link List} of {@link org.horizon.interceptors.base.CommandInterceptor}s configured for this - * cache - */ - List<CommandInterceptor> getInterceptorChain(); - - /** - * Retrieves an instance of a {@link Marshaller}, which is capable of converting Java objects to bytestreams and back - * in an efficient manner, which is also interoperable with bytestreams produced/consumed by other versions of JBoss - * Cache. - * - * The use of this marshaller is the recommended way of creating efficient, compatible, byte streams from - * objects. - * - * From 2.1.0, Interceptor authors should obtain this by injection rather than this method. See the {@link - * org.horizon.factories.annotations.Inject} annotation. - * - * @return an instance of {@link Marshaller} - */ - Marshaller getMarshaller(); - - /** - * Retrieves the current CacheCacheLoaderManager instance associated with the current Cache instance. - * - * From 2.1.0, Interceptor authors should obtain this by injection rather than this method. See the {@link - * org.horizon.factories.annotations.Inject} annotation. - * - * @return Retrieves a reference to the currently configured {@link CacheLoaderManager} if one or more cache loaders - * are configured, null otherwise. - */ - CacheLoaderManager getCacheLoaderManager(); - - /** - * Retrieves the current TransactionTable instance associated with the current Cache instance. - * - * From 2.1.0, Interceptor authors should obtain this by injection rather than this method. See the {@link - * org.horizon.factories.annotations.Inject} annotation. - * - * @return the current {@link TransactionTable} - */ - TransactionTable getTransactionTable(); - - - EvictionManager getEvictionManager(); - - /** - * Gets a handle of the RPC manager. - * - * From 2.1.0, Interceptor authors should obtain this by injection rather than this method. See the {@link - * org.horizon.factories.annotations.Inject} annotation. - * - * @return the {@link RPCManager} configured. - */ - RPCManager getRPCManager(); - - /** - * Retrieves the current StateTransferManager instance associated with the current Cache instance. - * - * From 2.1.0, Interceptor authors should obtain this by injection rather than this method. See the {@link - * org.horizon.factories.annotations.Inject} annotation. - * - * @return the current {@link org.horizon.statetransfer.StateTransferManager} - */ - StateTransferManager getStateTransferManager(); - - /** - * Retrieves the current Notifier instance associated with the current Cache instance. - * - * From 2.1.0, Interceptor authors should obtain this by injection rather than this method. See the {@link - * org.horizon.factories.annotations.Inject} annotation. - * - * @return the notifier attached with this instance of the cache. See {@link org.horizon.notifications.cachelistener.CacheNotifier}, - * a class that is responsible for emitting notifications to registered CacheListeners. - */ - CacheNotifier getNotifier(); - - /** - * Returns the global transaction for this local transaction. Optionally creates a new global transaction if it does - * not exist. - * - * @param tx the current transaction - * @param createIfNotExists if true creates a new transaction if none exists - * @return a GlobalTransaction - */ - GlobalTransaction getCurrentTransaction(Transaction tx, boolean createIfNotExists); - - /** - * Returns the transaction associated with the current thread. If a local transaction exists, but doesn't yet have a - * mapping to a GlobalTransaction, a new GlobalTransaction will be created and mapped to the local transaction. Note - * that if a local transaction exists, but is not ACTIVE or PREPARING, null is returned. - * - * @return A GlobalTransaction, or null if no (local) transaction was associated with the current thread - */ - GlobalTransaction getCurrentTransaction(); - - /** - * Returns the component registry associated with this cache instance. - * - * @see org.horizon.factories.ComponentRegistry - */ - ComponentRegistry getComponentRegistry(); - - Object getDirect(Object key); - - LockManager getLockManager(); - - BatchContainer getBatchContainer(); -} Modified: core/branches/flat/src/main/java/org/horizon/atomic/AtomicHashMap.java =================================================================== --- core/branches/flat/src/main/java/org/horizon/atomic/AtomicHashMap.java 2009-02-09 18:29:53 UTC (rev 7668) +++ core/branches/flat/src/main/java/org/horizon/atomic/AtomicHashMap.java 2009-02-09 18:30:59 UTC (rev 7669) @@ -23,6 +23,8 @@ import net.jcip.annotations.NotThreadSafe; import org.horizon.Cache; +import org.horizon.batch.BatchContainer; +import org.horizon.invocation.InvocationContextContainer; import org.horizon.util.FastCopyHashMap; import java.util.Collection; @@ -125,12 +127,14 @@ return delegate.entrySet(); } - public AtomicMap getProxy(Cache cache, Object mapKey) { + public AtomicMap getProxy(Cache cache, Object mapKey, + BatchContainer batchContainer, InvocationContextContainer invocationContextContainer) { // construct the proxy lazily if (proxy == null) // DCL is OK here since proxy is volatile (and we live in a post-JDK 5 world) { synchronized (this) { - if (proxy == null) proxy = new AtomicHashMapProxy(cache, mapKey); + if (proxy == null) + proxy = new AtomicHashMapProxy(cache, mapKey, batchContainer, invocationContextContainer); } } return proxy; Modified: core/branches/flat/src/main/java/org/horizon/atomic/AtomicHashMapProxy.java =================================================================== --- core/branches/flat/src/main/java/org/horizon/atomic/AtomicHashMapProxy.java 2009-02-09 18:29:53 UTC (rev 7668) +++ core/branches/flat/src/main/java/org/horizon/atomic/AtomicHashMapProxy.java 2009-02-09 18:30:59 UTC (rev 7669) @@ -22,8 +22,10 @@ package org.horizon.atomic; import org.horizon.Cache; -import org.horizon.CacheSPI; import org.horizon.batch.AutoBatchSupport; +import org.horizon.batch.BatchContainer; +import org.horizon.invocation.InvocationContextContainer; +import org.horizon.invocation.Options; import java.util.Collection; import java.util.Map; @@ -38,11 +40,13 @@ public class AtomicHashMapProxy<K, V> extends AutoBatchSupport implements AtomicMap<K, V> { Object deltaMapKey; Cache cache; + InvocationContextContainer icc; - public AtomicHashMapProxy(Cache cache, Object deltaMapKey) { + public AtomicHashMapProxy(Cache cache, Object deltaMapKey, BatchContainer batchContainer, InvocationContextContainer icc) { this.cache = cache; this.deltaMapKey = deltaMapKey; - this.batchContainer = ((CacheSPI) cache).getBatchContainer(); + this.batchContainer = batchContainer; + this.icc = icc; } // internal helper, reduces lots of casts. @@ -55,23 +59,22 @@ return (AtomicHashMap<K, V>) cache.get(deltaMapKey); } else { // acquire WL - boolean suppressLocks = cache.getInvocationContext().getOptionOverrides().isSuppressLocking(); - if (!suppressLocks) { - cache.getInvocationContext().getOptionOverrides().setForceWriteLock(true); - } + boolean suppressLocks = icc.get().hasOption(Options.SKIP_LOCKING); + if (!suppressLocks) icc.get().setOptions(Options.FORCE_WRITE_LOCK); + AtomicHashMap map = getDeltaMapForRead(); // copy for write AtomicHashMap copy = map == null ? new AtomicHashMap() : map.copyForWrite(); copy.initForWriting(); // reinstate the option - cache.getInvocationContext().getOptionOverrides().setSuppressLocking(suppressLocks); + if (suppressLocks) icc.get().setOptions(Options.SKIP_LOCKING); cache.put(deltaMapKey, copy); return copy; } } private boolean ownsLock() { - return cache.getInvocationContext().hasLockedKey(deltaMapKey); + return icc.get().hasLockedKey(deltaMapKey); } // readers Modified: core/branches/flat/src/main/java/org/horizon/commands/CommandsFactoryImpl.java =================================================================== --- core/branches/flat/src/main/java/org/horizon/commands/CommandsFactoryImpl.java 2009-02-09 18:29:53 UTC (rev 7668) +++ core/branches/flat/src/main/java/org/horizon/commands/CommandsFactoryImpl.java 2009-02-09 18:30:59 UTC (rev 7669) @@ -21,7 +21,7 @@ */ package org.horizon.commands; -import org.horizon.CacheSPI; +import org.horizon.Cache; import org.horizon.commands.read.GetKeyValueCommand; import org.horizon.commands.read.SizeCommand; import org.horizon.commands.remote.ReplicateCommand; @@ -51,13 +51,13 @@ public class CommandsFactoryImpl implements CommandsFactory { private DataContainer dataContainer; private CacheNotifier notifier; - private CacheSPI cache; + private Cache cache; // some stateless commands can be reused so that they aren't constructed again all the time. SizeCommand cachedSizeCommand; @Inject - public void setupDependencies(DataContainer container, CacheNotifier notifier, CacheSPI cache) { + public void setupDependencies(DataContainer container, CacheNotifier notifier, Cache cache) { this.dataContainer = container; this.notifier = notifier; this.cache = cache; Deleted: core/branches/flat/src/main/java/org/horizon/config/Option.java =================================================================== --- core/branches/flat/src/main/java/org/horizon/config/Option.java 2009-02-09 18:29:53 UTC (rev 7668) +++ core/branches/flat/src/main/java/org/horizon/config/Option.java 2009-02-09 18:30:59 UTC (rev 7669) @@ -1,322 +0,0 @@ -/* - * JBoss, Home of Professional Open Source. - * Copyright 2000 - 2008, Red Hat Middleware LLC, and individual contributors - * as indicated by the @author tags. See the copyright.txt file in the - * distribution for a full listing of individual contributors. - * - * This 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 2.1 of - * the License, or (at your option) any later version. - * - * This software 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 this software; if not, write to the Free - * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA - * 02110-1301 USA, or see the FSF site: http://www.fsf.org. - */ -package org.horizon.config; - - -/** - * Used to override characteristics of specific calls to the cache. The javadocs of each of the setters below detail - * functionality and behaviour. - * - * @author <a href="mailto:manik@jboss.org">Manik Surtani (manik(a)jboss.org)</a> - * @since 1.0 - */ -public class Option { - private boolean failSilently; - private boolean cacheModeLocal; - private boolean suppressLocking; - - private boolean forceWriteLock; - private boolean skipCacheStatusCheck; - - private boolean forceAsynchronous; - private boolean forceSynchronous; - - private long syncReplTimeout = -1; - private int lockAcquisitionTimeout = -1; - private boolean suppressPersistence; - - /** - * @since 1.0 - */ - public boolean isSuppressLocking() { - return suppressLocking; - } - - /** - * Suppresses acquiring locks for the given invocation. Used with pessimistic locking only. Use with extreme care, - * may lead to a breach in data integrity! - * - * @since 1.0 - */ - public void setSuppressLocking(boolean suppressLocking) { - this.suppressLocking = suppressLocking; - } - - - /** - * @since 1.0 - */ - public boolean isFailSilently() { - return failSilently; - } - - /** - * suppress any failures in your cache operation, including version mismatches with optimistic locking, timeouts - * obtaining locks, transaction rollbacks. If this is option is set, the method invocation will __never fail or - * throw an exception__, although it may not succeed. With this option enabled the call will not participate - * in any ongoing transactions even if a transaction is running. - * - * @since 1.0 - */ - public void setFailSilently(boolean failSilently) { - this.failSilently = failSilently; - } - - /** - * only applies to put() and remove() methods on the cache. - * - * @since 1.0 - */ - public boolean isCacheModeLocal() { - return cacheModeLocal; - } - - /** - * overriding CacheMode from REPL_SYNC, REPL_ASYNC, INVALIDATION_SYNC, INVALIDATION_ASYNC to LOCAL. Only applies to - * put() and remove() methods on the cache. - * - * @param cacheModeLocal - * @since 1.0 - */ - public void setCacheModeLocal(boolean cacheModeLocal) { - this.cacheModeLocal = cacheModeLocal; - } - - /** - * Gets whether replication or invalidation should be done asynchronously, even if the cache is configured in a - * synchronous mode. Has no effect if the call is occuring within a transactional context. - * - * @return <code>true</code> if replication/invalidation should be done asynchronously; <code>false</code> if the - * default mode configured for the cache should be used. - */ - public boolean isForceAsynchronous() { - return forceAsynchronous; - } - - /** - * Sets whether replication or invalidation should be done asynchronously, even if the cache is configured in a - * synchronous mode. Has no effect if the call is occuring within a transactional context. - * - * @param forceAsynchronous <code>true</code> if replication/invalidation should be done asynchronously; - * <code>false</code> if the default mode configured for the cache should be used. - */ - public void setForceAsynchronous(boolean forceAsynchronous) { - this.forceAsynchronous = forceAsynchronous; - } - - /** - * Gets whether replication or invalidation should be done synchronously, even if the cache is configured in an - * asynchronous mode. Has no effect if the call is occuring within a transactional context. - * - * @return <code>true</code> if replication/invalidation should be done synchronously; <code>false</code> if the - * default mode configured for the cache should be used. - */ - public boolean isForceSynchronous() { - return forceSynchronous; - } - - /** - * Sets whether replication or invalidation should be done synchronously, even if the cache is configured in an - * asynchronous mode. Has no effect if the call is occuring within a transactional context. - * - * @param forceSynchronous <code>true</code> if replication/invalidation should be done synchronously; - * <code>false</code> if the default mode configured for the cache should be used. - */ - public void setForceSynchronous(boolean forceSynchronous) { - this.forceSynchronous = forceSynchronous; - } - - /** - * Gets any lock acquisition timeout configured for the call. - * - * @return the time in ms that lock acquisition attempts should block before failing with a TimeoutException. A - * value < 0 indicates that the cache's default timeout should be used. - */ - public int getLockAcquisitionTimeout() { - return lockAcquisitionTimeout; - } - - /** - * Sets any lock acquisition timeout configured for the call. - * - * @param lockAcquisitionTimeout the time in ms that lock acquisition attempts should block before failing with a - * TimeoutException. A value < 0 indicates that the cache's default timeout should be - * used. - */ - public void setLockAcquisitionTimeout(int lockAcquisitionTimeout) { - this.lockAcquisitionTimeout = lockAcquisitionTimeout; - } - - @Override - public String toString() { - return "Option{" + - "failSilently=" + failSilently + - ", cacheModeLocal=" + cacheModeLocal + - ", suppressLocking=" + suppressLocking + - ", lockAcquisitionTimeout=" + lockAcquisitionTimeout + - ", forceAsynchronous=" + forceAsynchronous + - ", forceSynchronous=" + forceSynchronous + - '}'; - } - - /** - * @return a new Option instance with all fields shallow-copied. - */ - public Option copy() { - try { - return (Option) super.clone(); - } - catch (CloneNotSupportedException e) { - // should never happen - throw new RuntimeException(e); - } - } - - - @Override - public boolean equals(Object o) { - if (this == o) return true; - if (o == null || getClass() != o.getClass()) return false; - - final Option option = (Option) o; - - if (cacheModeLocal != option.cacheModeLocal) return false; - if (failSilently != option.failSilently) return false; - if (suppressLocking != option.suppressLocking) return false; - if (forceWriteLock != option.forceWriteLock) return false; - if (forceAsynchronous != option.forceAsynchronous) return false; - if (forceSynchronous != option.forceSynchronous) return false; - if (lockAcquisitionTimeout != option.lockAcquisitionTimeout) return false; - if (suppressPersistence != option.suppressPersistence) return false; - return true; - } - - @Override - public int hashCode() { - int result; - result = (failSilently ? 1 : 0); - result = 29 * result + (cacheModeLocal ? 1 : 0); - result = 29 * result + (suppressLocking ? 1 : 0); - result = 29 * result + (forceWriteLock ? 0 : 1); - result = 29 * result + (forceAsynchronous ? 0 : 1); - result = 29 * result + (forceSynchronous ? 0 : 1); - result = 29 * result + (lockAcquisitionTimeout); - result = 29 * result + (suppressPersistence ? 0 : 1); - return result; - } - - /** - * Resets this option to defaults. - */ - public void reset() { - this.cacheModeLocal = false; - this.failSilently = false; - this.suppressLocking = false; - this.forceWriteLock = false; - this.forceAsynchronous = false; - this.forceSynchronous = false; - this.lockAcquisitionTimeout = -1; - this.suppressPersistence = false; - } - - /** - * Forces a write lock to be acquired on the call, regardless of whether it is a read or write. - * - * @param forceWriteLock - * @since 1.0 - */ - public void setForceWriteLock(boolean forceWriteLock) { - this.forceWriteLock = forceWriteLock; - } - - - /** - * Tests whether a write lock has been forced on the call, regardless of whether it is a read or write. - * - * @since 1.0 - */ - public boolean isForceWriteLock() { - return forceWriteLock; - } - - /** - * If set to true, cache lifecycle checks will be skipped. DO NOT USE unless you really know what you're doing. - * - * @since 1.0 - */ - public void setSkipCacheStatusCheck(boolean skipCacheStatusCheck) { - this.skipCacheStatusCheck = skipCacheStatusCheck; - } - - /** - * @return true if skipCacheStatusCheck is true - * @since 1.0 - */ - public boolean isSkipCacheStatusCheck() { - return skipCacheStatusCheck; - } - - /** - * @return the value of the sync replication timeout (used when cache mode is either {@link - * org.horizon.config.Configuration.CacheMode#REPL_SYNC} or {@link org.horizon.config.Configuration.CacheMode#INVALIDATION_SYNC}) - * to be used for this specific call, or -1 (default) if the default value in {@link - * Configuration#getSyncReplTimeout()} is to be used instead. - * @since 1.0 - */ - public long getSyncReplTimeout() { - return syncReplTimeout; - } - - /** - * Used to override the value in {@link Configuration#getSyncReplTimeout()} (used when cache mode is either {@link - * org.horizon.config.Configuration.CacheMode#REPL_SYNC} or {@link org.horizon.config.Configuration.CacheMode#INVALIDATION_SYNC}) - * for this specific invocation. Defaults to -1, which means use the default in the configuration. - * - * @param syncReplTimeout new timeout value for this invocation. - * @since 1.0 - */ - public void setSyncReplTimeout(long syncReplTimeout) { - this.syncReplTimeout = syncReplTimeout; - } - - /** - * If set to true, any persistence to a cache loader will be suppressed for the current invocation only. Does not - * apply to transactional calls. - * - * @return true if persistence is suppressed. - * @since 1.0 - */ - public boolean isSuppressPersistence() { - return suppressPersistence; - } - - /** - * If set to true, any persistence to a cache loader will be suppressed for the current invocation only. Does not - * apply to transactional calls. - * - * @param suppressPersistence if true, will suppress persistence. - * @since 1.0 - */ - public void setSuppressPersistence(boolean suppressPersistence) { - this.suppressPersistence = suppressPersistence; - } -} Added: core/branches/flat/src/main/java/org/horizon/context/AbstractContext.java =================================================================== --- core/branches/flat/src/main/java/org/horizon/context/AbstractContext.java (rev 0) +++ core/branches/flat/src/main/java/org/horizon/context/AbstractContext.java 2009-02-09 18:30:59 UTC (rev 7669) @@ -0,0 +1,188 @@ +package org.horizon.context; + +import org.horizon.container.MVCCEntry; +import org.horizon.invocation.Options; +import org.horizon.util.FastCopyHashMap; +import org.horizon.util.Immutables; + +import java.util.Arrays; +import java.util.Collection; +import java.util.Collections; +import java.util.EnumSet; +import java.util.LinkedHashSet; +import java.util.List; +import java.util.Map; +import java.util.Set; + +/** + * Common features of transaction and invocation contexts + * + * @author Manik Surtani + * @since 1.0 + */ +public abstract class AbstractContext { + + protected EnumSet<Options> options; + protected byte contextFlags; + /** + * LinkedHashSet of locks acquired by the invocation. We use a LinkedHashSet because we need efficient Set semantics + * but also need guaranteed ordering for use by lock release code (see JBCCACHE-874). + */ + protected LinkedHashSet<Object> locks; + protected FastCopyHashMap<Object, MVCCEntry> lookedUpEntries = null; + + + protected static enum ContextFlags { + FORCE_SYNCHRONOUS(0x1), FORCE_ASYNCHRONOUS(0x2), ORIGIN_LOCAL(0x4), LOCAL_ROLLBACK_ONLY(0x8); + final byte mask; + + ContextFlags(int mask) { + this.mask = (byte) mask; + } + } + + protected final boolean isFlagSet(ContextFlags flag) { + return (contextFlags & flag.mask) != 0; + } + + protected final void setFlag(ContextFlags flag) { + contextFlags |= flag.mask; + } + + protected final void unsetFlag(ContextFlags flag) { + contextFlags &= ~flag.mask; + } + + protected final void setFlag(ContextFlags flag, boolean value) { + if (value) + setFlag(flag); + else + unsetFlag(flag); + } + + public boolean hasOption(Options o) { + return options != null && options.contains(o); + } + + public Set<Options> getOptions() { + return options; + } + + public void setOptions(Options... options) { + if (options == null || options.length == 0) return; + if (this.options == null) + this.options = EnumSet.copyOf(Arrays.asList(options)); + else + this.options.addAll(Arrays.asList(options)); + } + + public void setOptions(Collection<Options> options) { + if (options == null || options.size() == 0) return; + if (this.options == null) + this.options = EnumSet.copyOf(options); + else + this.options.addAll(options); + } + + public void resetOptions() { + options = null; + } + + public boolean isOptionsUninit() { + return options == null; + } + + protected abstract int getLockSetSize(); + + public void addKeyLocked(Object lock) { + // no need to worry about concurrency here - a context is only valid for a single thread. + if (locks == null) locks = new LinkedHashSet<Object>(getLockSetSize()); + locks.add(lock); + } + + public void removeKeyLocked(Object lock) { + if (locks != null) locks.remove(lock); + } + + public void clearKeysLocked() { + if (locks != null) locks.clear(); + } + + public void addAllKeysLocked(List<Object> newLocks) { + // no need to worry about concurrency here - a context is only valid for a single thread. + if (locks == null) locks = new LinkedHashSet<Object>(getLockSetSize()); + locks.addAll(newLocks); + } + + public List<Object> getKeysLocked() { + return locks == null || locks.isEmpty() ? Collections.emptyList() : Immutables.immutableListConvert(locks); + } + + public boolean hasLockedKey(Object lock) { + return locks != null && locks.contains(lock); + } + + public MVCCEntry lookupEntry(Object key) { + return lookedUpEntries.get(key); + } + + public void removeLookedUpEntry(Object key) { + lookedUpEntries.remove(key); + } + + public void putLookedUpEntry(Object key, MVCCEntry entry) { + lookedUpEntries.put(key, entry); + } + + public void clearLookedUpEntries() { + lookedUpEntries.clear(); + } + + public Map<Object, MVCCEntry> getLookedUpEntries() { + return lookedUpEntries; + } + + public void putLookedUpEntries(Map<Object, MVCCEntry> lookedUpEntries) { + lookedUpEntries.putAll(lookedUpEntries); + } + + public void reset() { + if (lookedUpEntries != null) lookedUpEntries.clear(); + if (locks != null) locks.clear(); + options = null; + contextFlags = 0; + } + + @Override + public boolean equals(Object o) { + if (this == o) return true; + if (!(o instanceof AbstractContext)) return false; + + AbstractContext that = (AbstractContext) o; + + if (contextFlags != that.contextFlags) return false; + if (locks != null ? !locks.equals(that.locks) : that.locks != null) return false; + if (lookedUpEntries != null ? !lookedUpEntries.equals(that.lookedUpEntries) : that.lookedUpEntries != null) + return false; + if (options != null ? !options.equals(that.options) : that.options != null) return false; + + return true; + } + + @Override + public int hashCode() { + int result = options != null ? options.hashCode() : 0; + result = 31 * result + (int) contextFlags; + result = 31 * result + (locks != null ? locks.hashCode() : 0); + result = 31 * result + (lookedUpEntries != null ? lookedUpEntries.hashCode() : 0); + return result; + } + + @SuppressWarnings("unchecked") + protected void copyInto(AbstractContext ctx) { + if (options != null) ctx.options = EnumSet.copyOf(options); + ctx.contextFlags = contextFlags; + if (locks != null) ctx.locks = new LinkedHashSet<Object>(locks); + if (lookedUpEntries != null) ctx.lookedUpEntries = (FastCopyHashMap<Object, MVCCEntry>) lookedUpEntries.clone(); + } +} Modified: core/branches/flat/src/main/java/org/horizon/context/EntryLookup.java =================================================================== --- core/branches/flat/src/main/java/org/horizon/context/EntryLookup.java 2009-02-09 18:29:53 UTC (rev 7668) +++ core/branches/flat/src/main/java/org/horizon/context/EntryLookup.java 2009-02-09 18:30:59 UTC (rev 7669) @@ -23,6 +23,7 @@ import org.horizon.container.MVCCEntry; +import java.util.List; import java.util.Map; /** @@ -32,15 +33,108 @@ * @since 1.0 */ public interface EntryLookup { + /** + * Retrieves an entry from the collection of looked up entries in the current scope. + * + * If a transaction is in progress, implementations should delegate to {@link org.horizon.context.TransactionContext#lookupEntry(Object)} + * + * + * @param key key to look up + * @return an entry, or null if it cannot be found. + */ MVCCEntry lookupEntry(Object key); + /** + * Retrieves a map of entries looked up within the current scope. + * + * If a transaction is in progress, implementations should delegate to {@link org.horizon.context.TransactionContext#getLookedUpEntries()}. + * + * + * @return a map of looked up entries. + */ Map<Object, MVCCEntry> getLookedUpEntries(); + /** + * Puts an entry in the registry of looked up nodes in the current scope. + * + * If a transaction is in progress, implementations should delegate to {@link TransactionContext#putLookedUpEntry(Object, + * org.horizon.container.MVCCEntry)} + * + * + * @param key key to store + * @param e entry to store + */ void putLookedUpEntry(Object key, MVCCEntry e); void putLookedUpEntries(Map<Object, MVCCEntry> lookedUpEntries); void removeLookedUpEntry(Object key); + /** + * Clears the collection of entries looked up + */ void clearLookedUpEntries(); + + /** + * Returns an immutable, defensive copy of the List of locks currently maintained for the current scope. + * + * Note that if a transaction is in scope, implementations should retrieve these locks from the {@link + * TransactionContext}. Retrieving locks from this method should always ensure they are retrieved from the + * appropriate scope. + * + * @return keys locked in current scope. + */ + List<Object> getKeysLocked(); + + /** + * Adds a List of locks to the currently maintained collection of locks acquired. + * + * Note that if a transaction is in scope, implementations should record locks on the {@link TransactionContext}. + * Adding locks using this method should always ensure they are applied to the appropriate scope. + * + * + * @param keys keys locked + */ + void addAllKeysLocked(List<Object> keys); + + /** + * Adds a lock to the currently maintained collection of locks acquired. + * + * Note that if a transaction is in scope, implementations should record this lock on the {@link TransactionContext}. + * Using this method should always ensure that the appropriate scope is used. + * + * + * @param key key that was locked + */ + void addKeyLocked(Object key); + + /** + * Removes a lock from the currently maintained collection of locks acquired. + * + * Note that if a transaction is in scope, implementations should remove this lock from the {@link + * TransactionContext}. Using this method should always ensure that the lock is removed from the appropriate scope. + * + * + * @param key key that was unlocked + */ + void removeKeyLocked(Object key); + + /** + * Clears all locks from the currently maintained collection of locks acquired. + * + * Note that if a transaction is in scope, implementations should clear locks from the {@link TransactionContext}. + * Using this method should always ensure locks are cleared in the appropriate scope. + * + */ + void clearKeysLocked(); + + /** + * Note that if a transaction is in scope, implementations should test this lock from on {@link TransactionContext}. + * Using this method should always ensure locks checked in the appropriate scope. + * + * @param key lock to test + * @return true if the lock being tested is already held in the current scope, false otherwise. + */ + boolean hasLockedKey(Object key); + } Modified: core/branches/flat/src/main/java/org/horizon/context/InvocationContext.java =================================================================== --- core/branches/flat/src/main/java/org/horizon/context/InvocationContext.java 2009-02-09 18:29:53 UTC (rev 7668) +++ core/branches/flat/src/main/java/org/horizon/context/InvocationContext.java 2009-02-09 18:30:59 UTC (rev 7669) @@ -21,19 +21,19 @@ */ package org.horizon.context; -import org.horizon.config.Option; import org.horizon.transaction.GlobalTransaction; import javax.transaction.Transaction; -import java.util.List; /** - * // TODO: MANIK: Document this + * A context that contains information pertaining to a given invocation. These contexts typically have the lifespan of + * a single invocation. * * @author Manik Surtani (<a href="mailto:manik@jboss.org">manik(a)jboss.org</a>) * @since 1.0 */ -public interface InvocationContext extends EntryLookup { +public interface InvocationContext extends EntryLookup, OptionContainer { + void setLocalRollbackOnly(boolean localRollbackOnly); Transaction getTransaction(); @@ -48,28 +48,8 @@ void setGlobalTransaction(GlobalTransaction globalTransaction); - Option getOptionOverrides(); - - boolean isOptionsUninitialised(); - - void setOptionOverrides(Option optionOverrides); - boolean isOriginLocal(); - List<Object> getKeysLocked(); - - void addAllKeysLocked(List<Object> keysLocked); - - void addKeyLocked(Object keyLocked); - - void removeKeyLocked(Object keyLocked); - - void clearKeysLocked(); - - boolean hasLockedKey(Object key); - - boolean isLockingSuppressed(); - void setOriginLocal(boolean originLocal); boolean isLocalRollbackOnly(); @@ -80,9 +60,5 @@ void setState(InvocationContext template); - long getLockAcquisitionTimeout(long timeout); - boolean isValidTransaction(); - - void throwIfNeeded(Throwable e) throws Throwable; } Modified: core/branches/flat/src/main/java/org/horizon/context/InvocationContextImpl.java =================================================================== --- core/branches/flat/src/main/java/org/horizon/context/InvocationContextImpl.java 2009-02-09 18:29:53 UTC (rev 7668) +++ core/branches/flat/src/main/java/org/horizon/context/InvocationContextImpl.java 2009-02-09 18:30:59 UTC (rev 7669) @@ -21,55 +21,36 @@ */ package org.horizon.context; -import org.horizon.config.Option; import org.horizon.container.MVCCEntry; -import org.horizon.logging.Log; -import org.horizon.logging.LogFactory; import org.horizon.transaction.GlobalTransaction; import org.horizon.transaction.TransactionTable; import org.horizon.util.FastCopyHashMap; -import org.horizon.util.Immutables; import javax.transaction.Transaction; import java.util.Collections; -import java.util.LinkedHashSet; import java.util.List; import java.util.Map; -/** - * // TODO: MANIK: Document this - * - * @author Manik Surtani (<a href="mailto:manik@jboss.org">manik(a)jboss.org</a>) - * @since 1.0 - */ -public class InvocationContextImpl implements InvocationContext { - private static final Log log = LogFactory.getLog(InvocationContext.class); - private static final boolean trace = log.isTraceEnabled(); - +public class InvocationContextImpl extends AbstractContext implements InvocationContext { private Transaction transaction; private GlobalTransaction globalTransaction; protected volatile TransactionContext transactionContext; - private Option optionOverrides; - // defaults to true. - private boolean originLocal = true; - private boolean localRollbackOnly; - /** - * LinkedHashSet of locks acquired by the invocation. We use a LinkedHashSet because we need efficient Set semantics - * but also need guaranteed ordering for use by lock release code (see JBCCACHE-874). - */ - protected LinkedHashSet<Object> invocationLocks; - private FastCopyHashMap<Object, MVCCEntry> lookedUpEntries = null; + public InvocationContextImpl() { + // set this to true by default + setFlag(ContextFlags.ORIGIN_LOCAL); + } - /** - * Retrieves a node from the registry of looked up nodes in the current scope. - * - * If a transaction is in progress, implementations should delegate to {@link org.horizon.context.TransactionContext#lookupEntry(Object)} - * - * - * @param k key to look up - * @return a node, or null if it cannot be found. - */ + protected final int getLockSetSize() { + // always use 4 for invocation locks + return 4; + } + + private void initLookedUpEntries() { + if (lookedUpEntries == null) lookedUpEntries = new FastCopyHashMap<Object, MVCCEntry>(4); + } + + @Override public MVCCEntry lookupEntry(Object k) { if (transactionContext != null) { return transactionContext.lookupEntry(k); @@ -78,6 +59,7 @@ } } + @Override public void removeLookedUpEntry(Object key) { if (transactionContext != null) { transactionContext.removeLookedUpEntry(key); @@ -86,50 +68,31 @@ } } - /** - * Puts an entry in the registry of looked up nodes in the current scope. - * - * If a transaction is in progress, implementations should delegate to {@link TransactionContext#putLookedUpEntry(Object, - * org.horizon.container.MVCCEntry)} - * - * - * @param key - */ + @Override public void putLookedUpEntry(Object key, MVCCEntry e) { if (transactionContext != null) transactionContext.putLookedUpEntry(key, e); else { - if (lookedUpEntries == null) lookedUpEntries = new FastCopyHashMap<Object, MVCCEntry>(4); + initLookedUpEntries(); lookedUpEntries.put(key, e); } } + @Override public void putLookedUpEntries(Map<Object, MVCCEntry> lookedUpEntries) { if (transactionContext != null) transactionContext.putLookedUpEntries(lookedUpEntries); else { - if (this.lookedUpEntries == null) - this.lookedUpEntries = new FastCopyHashMap<Object, MVCCEntry>(); - - this.lookedUpEntries.putAll(lookedUpEntries); + initLookedUpEntries(); + lookedUpEntries.putAll(lookedUpEntries); } } - /** - * Clears the registry of looked up nodes. - */ + @Override public void clearLookedUpEntries() { if (lookedUpEntries != null) lookedUpEntries.clear(); } - /** - * Retrieves a map of nodes looked up within the current invocation's scope. - * - * If a transaction is in progress, implementations should delegate to {@link org.horizon.context.TransactionContext#getLookedUpEntries()}. - * - * - * @return a map of looked up nodes. - */ @SuppressWarnings("unchecked") public Map<Object, MVCCEntry> getLookedUpEntries() { if (transactionContext != null) return transactionContext.getLookedUpEntries(); @@ -139,8 +102,10 @@ @SuppressWarnings("unchecked") public InvocationContext copy() { InvocationContextImpl copy = new InvocationContextImpl(); - doCopy(copy); - if (lookedUpEntries != null) copy.lookedUpEntries = (FastCopyHashMap<Object, MVCCEntry>) lookedUpEntries.clone(); + copyInto(copy); + copy.globalTransaction = globalTransaction; + copy.transaction = transaction; + copy.transactionContext = transactionContext; return copy; } @@ -151,7 +116,7 @@ * @param localRollbackOnly if true, the context is only rolling back. */ public void setLocalRollbackOnly(boolean localRollbackOnly) { - this.localRollbackOnly = localRollbackOnly; + setFlag(ContextFlags.LOCAL_ROLLBACK_ONLY, localRollbackOnly); } /** @@ -209,192 +174,95 @@ this.globalTransaction = globalTransaction; } - /** - * Retrieves the option overrides associated with this invocation - * - * @return the option overrides associated with this invocation - */ - public Option getOptionOverrides() { - if (optionOverrides == null) { - optionOverrides = new Option(); - } - return optionOverrides; - } - - /** - * @return true of no options have been set on this context, false otherwise. - */ - public boolean isOptionsUninitialised() { - return optionOverrides == null; - } - - /** - * Sets the option overrides to be associated with this invocation - * - * @param optionOverrides options to set - */ - public void setOptionOverrides(Option optionOverrides) { - this.optionOverrides = optionOverrides; - } - - /** * Tests if this invocation originated locally or from a remote cache. * * @return true if the invocation originated locally. */ public boolean isOriginLocal() { - return originLocal; + return isFlagSet(ContextFlags.ORIGIN_LOCAL); } - /** - * Returns an immutable, defensive copy of the List of locks currently maintained for the current scope. - * - * Note that if a transaction is in scope, implementations should retrieve these locks from the {@link - * TransactionContext}. Retrieving locks from this method should always ensure they are retrieved from the - * appropriate scope. - * - * @return locks held in current scope. - */ - @SuppressWarnings("unchecked") + @Override public List<Object> getKeysLocked() { // first check transactional scope if (transactionContext != null) return transactionContext.getKeysLocked(); - return invocationLocks == null || invocationLocks.isEmpty() ? Collections.emptyList() : Immutables.immutableListConvert(invocationLocks); + return super.getKeysLocked(); } - /** - * Adds a List of locks to the currently maintained collection of locks acquired. - * - * Note that if a transaction is in scope, implementations should record locks on the {@link TransactionContext}. - * Adding locks using this method should always ensure they are applied to the appropriate scope. - * - * - * @param locks locks to add - */ - @SuppressWarnings("unchecked") - public void addAllKeysLocked(List<Object> locks) { + @Override + public void addAllKeysLocked(List<Object> keys) { // first check transactional scope - if (transactionContext != null) { - transactionContext.addAllKeysLocked(locks); - } else { - // no need to worry about concurrency here - a context is only valid for a single thread. - if (invocationLocks == null) invocationLocks = new LinkedHashSet(4); - invocationLocks.addAll(locks); - } + if (transactionContext != null) + transactionContext.addAllKeysLocked(keys); + else + super.addAllKeysLocked(keys); + } - /** - * Adds a lock to the currently maintained collection of locks acquired. - * - * Note that if a transaction is in scope, implementations should record this lock on the {@link TransactionContext}. - * Using this method should always ensure that the appropriate scope is used. - * - * - * @param lock lock to add - */ - @SuppressWarnings("unchecked") - public void addKeyLocked(Object lock) { + @Override + public void addKeyLocked(Object key) { // first check transactional scope - if (transactionContext != null) { - transactionContext.addKeyLocked(lock); - } else { - // no need to worry about concurrency here - a context is only valid for a single thread. - if (invocationLocks == null) invocationLocks = new LinkedHashSet(4); - invocationLocks.add(lock); - } + if (transactionContext != null) + transactionContext.addKeyLocked(key); + else + super.addKeyLocked(key); } - /** - * Removes a lock from the currently maintained collection of locks acquired. - * - * Note that if a transaction is in scope, implementations should remove this lock from the {@link - * TransactionContext}. Using this method should always ensure that the lock is removed from the appropriate scope. - * - * - * @param lock lock to remove - */ - @SuppressWarnings("unchecked") - public void removeKeyLocked(Object lock) { + @Override + public void removeKeyLocked(Object key) { // first check transactional scope - if (transactionContext != null) { - transactionContext.removeKeyLocked(lock); - } else { - // no need to worry about concurrency here - a context is only valid for a single thread. - if (invocationLocks != null) invocationLocks.remove(lock); - } + if (transactionContext != null) + transactionContext.removeKeyLocked(key); + else + super.removeKeyLocked(key); } - /** - * Clears all locks from the currently maintained collection of locks acquired. - * - * Note that if a transaction is in scope, implementations should clear locks from the {@link TransactionContext}. - * Using this method should always ensure locks are cleared in the appropriate scope. - * - */ + @Override public void clearKeysLocked() { // first check transactional scope - if (transactionContext != null) { + if (transactionContext != null) transactionContext.clearKeysLocked(); - } else { - // no need to worry about concurrency here - a context is only valid for a single thread. - if (invocationLocks != null) invocationLocks.clear(); - } + else + super.clearKeysLocked(); } - /** - * Note that if a transaction is in scope, implementations should test this lock from on {@link TransactionContext}. - * Using this method should always ensure locks checked in the appropriate scope. - * - * @param lock lock to test - * @return true if the lock being tested is already held in the current scope, false otherwise. - */ - public boolean hasLockedKey(Object lock) { + @Override + public boolean hasLockedKey(Object key) { // first check transactional scope - if (transactionContext != null) { - return transactionContext.hasLockedKey(lock); - } else { - return invocationLocks != null && invocationLocks.contains(lock); - } + if (transactionContext != null) + return transactionContext.hasLockedKey(key); + else + return super.hasLockedKey(key); } /** - * @return true if options exist to suppress locking - false otherwise. - */ - public boolean isLockingSuppressed() { - return getOptionOverrides() != null && getOptionOverrides().isSuppressLocking(); - } - - /** * If set to true, the invocation is assumed to have originated locally. If set to false, assumed to have originated * from a remote cache. * * @param originLocal flag to set */ public void setOriginLocal(boolean originLocal) { - this.originLocal = originLocal; + setFlag(ContextFlags.ORIGIN_LOCAL, originLocal); } /** * @return true if the current transaction is set to rollback only. */ public boolean isLocalRollbackOnly() { - return localRollbackOnly; + return isFlagSet(ContextFlags.LOCAL_ROLLBACK_ONLY); } /** * Resets the context, freeing up any references. */ public void reset() { + super.reset(); transaction = null; globalTransaction = null; - optionOverrides = null; - originLocal = true; - invocationLocks = null; - if (lookedUpEntries != null) { - lookedUpEntries.clear(); - lookedUpEntries = null; - } + transactionContext = null; + setFlag(ContextFlags.ORIGIN_LOCAL); + lookedUpEntries = null; } /** @@ -409,28 +277,12 @@ this.setGlobalTransaction(template.getGlobalTransaction()); this.setLocalRollbackOnly(template.isLocalRollbackOnly()); - this.setOptionOverrides(template.getOptionOverrides()); + this.setOptions(template.getOptions()); this.setOriginLocal(template.isOriginLocal()); this.setTransaction(template.getTransaction()); } /** - * If the lock acquisition timeout is overridden for current call using an option, then return that one. If not - * overridden, return default value. - * - * @param timeout timeout to fall back to - * @return timeout to use - */ - public long getLockAcquisitionTimeout(long timeout) { - // TODO: this stuff really doesn't belong here. Put it somewhere else. - if (getOptionOverrides() != null - && getOptionOverrides().getLockAcquisitionTimeout() >= 0) { - timeout = getOptionOverrides().getLockAcquisitionTimeout(); - } - return timeout; - } - - /** * @return true if there is current transaction associated with the invocation, and this transaction is in a valid * state. */ @@ -439,53 +291,16 @@ return transaction != null && TransactionTable.isValid(transaction); } - /** - * Throws the given throwable provided no options suppress or prevent this from happening. - * - * @param e throwable to throw - * @throws Throwable if allowed to throw one. - */ - public void throwIfNeeded(Throwable e) throws Throwable { - // TODO: this stuff really doesn't belong here. Put it somewhere else. - Option optionOverride = getOptionOverrides(); - boolean shouldRethtrow = optionOverride == null || !optionOverride.isFailSilently(); - if (!shouldRethtrow) { - if (trace) - log.trace("There was a problem handling this request, but failSilently was set, so suppressing exception", e); - return; - } - throw e; - } - - @SuppressWarnings("unchecked") - protected void doCopy(InvocationContext c) { - InvocationContextImpl copy = (InvocationContextImpl) c; - copy.globalTransaction = globalTransaction; - copy.invocationLocks = invocationLocks == null ? null : new LinkedHashSet(invocationLocks); - copy.localRollbackOnly = localRollbackOnly; - copy.optionOverrides = optionOverrides == null ? null : optionOverrides.copy(); - copy.originLocal = originLocal; - copy.transaction = transaction; - copy.transactionContext = transactionContext; - } - @Override public boolean equals(Object o) { if (this == o) return true; if (o == null || getClass() != o.getClass()) return false; + if (!super.equals(o)) return false; InvocationContextImpl that = (InvocationContextImpl) o; - if (localRollbackOnly != that.localRollbackOnly) return false; - if (originLocal != that.originLocal) return false; if (globalTransaction != null ? !globalTransaction.equals(that.globalTransaction) : that.globalTransaction != null) return false; - if (invocationLocks != null ? !invocationLocks.equals(that.invocationLocks) : that.invocationLocks != null) - return false; - if (lookedUpEntries != null ? !lookedUpEntries.equals(that.lookedUpEntries) : that.lookedUpEntries != null) - return false; - if (optionOverrides != null ? !optionOverrides.equals(that.optionOverrides) : that.optionOverrides != null) - return false; if (transaction != null ? !transaction.equals(that.transaction) : that.transaction != null) return false; if (transactionContext != null ? !transactionContext.equals(that.transactionContext) : that.transactionContext != null) return false; @@ -495,14 +310,10 @@ @Override public int hashCode() { - int result = transaction != null ? transaction.hashCode() : 0; + int result = super.hashCode(); + result = 31 * result + (transaction != null ? transaction.hashCode() : 0); result = 31 * result + (globalTransaction != null ? globalTransaction.hashCode() : 0); result = 31 * result + (transactionContext != null ? transactionContext.hashCode() : 0); - result = 31 * result + (optionOverrides != null ? optionOverrides.hashCode() : 0); - result = 31 * result + (originLocal ? 1 : 0); - result = 31 * result + (localRollbackOnly ? 1 : 0); - result = 31 * result + (invocationLocks != null ? invocationLocks.hashCode() : 0); - result = 31 * result + (lookedUpEntries != null ? lookedUpEntries.hashCode() : 0); return result; } @@ -512,10 +323,9 @@ "transaction=" + transaction + ", globalTransaction=" + globalTransaction + ", transactionContext=" + transactionContext + - ", optionOverrides=" + optionOverrides + - ", originLocal=" + originLocal + - ", localRollbackOnly=" + localRollbackOnly + - ", invocationLocks=" + invocationLocks + + ", options=" + options + + ", contextFlags=" + contextFlags + + ", invocationLocks=" + locks + ", lookedUpEntries=" + lookedUpEntries + '}'; } Added: core/branches/flat/src/main/java/org/horizon/context/OptionContainer.java =================================================================== --- core/branches/flat/src/main/java/org/horizon/context/OptionContainer.java (rev 0) +++ core/branches/flat/src/main/java/org/horizon/context/OptionContainer.java 2009-02-09 18:30:59 UTC (rev 7669) @@ -0,0 +1,27 @@ +package org.horizon.context; + +import org.horizon.invocation.Options; + +import java.util.Collection; +import java.util.Set; + +/** + * Interface that defines access to and manipulation of {@link Options}. + * + * @author Manik Surtani + * @since 1.0 + */ +public interface OptionContainer { + + boolean hasOption(Options o); + + Set<Options> getOptions(); + + void setOptions(Options... options); + + void setOptions(Collection<Options> options); + + void resetOptions(); + + boolean isOptionsUninit(); +} Modified: core/branches/flat/src/main/java/org/horizon/context/TransactionContext.java =================================================================== --- core/branches/flat/src/main/java/org/horizon/context/TransactionContext.java 2009-02-09 18:29:53 UTC (rev 7668) +++ core/branches/flat/src/main/java/org/horizon/context/TransactionContext.java 2009-02-09 18:30:59 UTC (rev 7669) @@ -22,23 +22,20 @@ package org.horizon.context; import org.horizon.commands.VisitableCommand; -import org.horizon.config.Option; import org.horizon.transaction.GlobalTransaction; import javax.transaction.Transaction; import java.util.List; /** - * Captures information pertaining to a specific JTA transaction. - * - * This was a concrete class called TransactionEntry prior to 3.0. - * + * A context that contains information pertaining to a given transaction. These contexts typically have the lifespan of + * the entire transaction. * * @author Manik Surtani (<a href="mailto:manik@jboss.org">manik(a)jboss.org</a>) * @see InvocationContext * @since 1.0 */ -public interface TransactionContext extends EntryLookup { +public interface TransactionContext extends EntryLookup, OptionContainer { /** * Adds a modification to the modification list. * @@ -103,69 +100,6 @@ Transaction getTransaction(); /** - * Adds a lock to the currently maintained collection of locks acquired. - * - * Most code could not use this method directly, but use {@link InvocationContext#addKeyLocked(Object)} instead, - * which would delegate to this method if a transaction is in scope or otherwise use invocation-specific locks. - * - * @param lock lock to add - */ - @SuppressWarnings("unchecked") - void addKeyLocked(Object lock); - - /** - * Removes a lock from the currently maintained collection of locks acquired. - * - * Most code could not use this method directly, but use {@link InvocationContext#removeKeyLocked(Object)} instead, - * which would delegate to this method if a transaction is in scope or otherwise use invocation-specific locks. - * - * @param lock lock to remove - */ - @SuppressWarnings("unchecked") - void removeKeyLocked(Object lock); - - /** - * Clears all locks from the currently maintained collection of locks acquired. - * - * Most code could not use this method directly, but use {@link InvocationContext#clearKeysLocked()} instead, which - * would delegate to this method if a transaction is in scope or otherwise use invocation-specific locks. - */ - void clearKeysLocked(); - - /** - * Adds a List of locks to the currently maintained collection of locks acquired. - * - * Most code could not use this method directly, but use {@link InvocationContext#addAllKeysLocked(java.util.List)} - * instead, which would delegate to this method if a transaction is in scope or otherwise use invocation-specific - * locks. - * - * @param newLocks locks to add - */ - @SuppressWarnings("unchecked") - void addAllKeysLocked(List<Object> newLocks); - - /** - * Returns an immutable, defensive copy of the List of locks currently maintained for the transaction. - * - * Most code could not use this method directly, but use {@link org.horizon.context.InvocationContext#getKeysLocked()} - * instead, which would delegate to this method if a transaction is in scope or otherwise use invocation-specific - * locks. - * - * @return locks held in current scope. - */ - @SuppressWarnings("unchecked") - List<Object> getKeysLocked(); - - /** - * Most code could not use this method directly, but use {@link InvocationContext#hasLockedKey(Object)} ()} instead, - * which would delegate to this method if a transaction is in scope or otherwise use invocation-specific locks. - * - * @param lock lock to test - * @return true if the lock being tested is already held in the current scope, false otherwise. - */ - boolean hasLockedKey(Object lock); - - /** * Gets the value of the forceAsyncReplication flag. * * @return true if the forceAsyncReplication flag is set to true. @@ -206,20 +140,6 @@ List<Object> getDummyEntriesCreatedByCacheLoader(); /** - * Sets a transaction-scope option override - * - * @param o option to set - */ - void setOption(Option o); - - /** - * Retrieves a transaction scope option override - * - * @return option - */ - Option getOption(); - - /** * @return true if modifications were registered. */ boolean hasModifications(); Modified: core/branches/flat/src/main/java/org/horizon/context/TransactionContextImpl.java =================================================================== --- core/branches/flat/src/main/java/org/horizon/context/TransactionContextImpl.java 2009-02-09 18:29:53 UTC (rev 7668) +++ core/branches/flat/src/main/java/org/horizon/context/TransactionContextImpl.java 2009-02-09 18:30:59 UTC (rev 7669) @@ -22,18 +22,15 @@ package org.horizon.context; import org.horizon.commands.VisitableCommand; -import org.horizon.config.Option; import org.horizon.container.MVCCEntry; import org.horizon.transaction.GlobalTransaction; import org.horizon.util.FastCopyHashMap; -import org.horizon.util.Immutables; import javax.transaction.RollbackException; import javax.transaction.SystemException; import javax.transaction.Transaction; import java.util.ArrayList; import java.util.Collections; -import java.util.LinkedHashSet; import java.util.LinkedList; import java.util.List; import java.util.Map; @@ -44,14 +41,11 @@ * @author Manik Surtani (<a href="mailto:manik@jboss.org">manik(a)jboss.org</a>) * @since 1.0 */ -public class TransactionContextImpl implements TransactionContext { +public class TransactionContextImpl extends AbstractContext implements TransactionContext { /** * Local transaction */ private Transaction ltx = null; - private Option option; - private boolean forceAsyncReplication = false; - private boolean forceSyncReplication = false; /** * List<VisitableCommand> of modifications. They will be replicated on TX commit @@ -64,12 +58,6 @@ private List<VisitableCommand> localModifications; /** - * LinkedHashSet of locks acquired by the transaction. We use a LinkedHashSet because we need efficient Set semantics - * but also need guaranteed ordering for use by lock release code (see JBCCACHE-874). - */ - private LinkedHashSet<Object> transactionLocks; - - /** * A list of dummy uninitialised entries created by the cache loader interceptor to load data for a given entry in * this tx. */ @@ -80,41 +68,25 @@ */ private List<Object> removedKeys = null; - private final FastCopyHashMap<Object, MVCCEntry> lookedUpEntries = new FastCopyHashMap<Object, MVCCEntry>(8); private GlobalTransaction gtx; + protected final int getLockSetSize() { + // always initialize the lock collection to 8 entries + return 8; + } + public TransactionContextImpl(Transaction tx) throws SystemException, RollbackException { ltx = tx; + lookedUpEntries = new FastCopyHashMap<Object, MVCCEntry>(8); } - public MVCCEntry lookupEntry(Object key) { - return lookedUpEntries.get(key); - } - - public void removeLookedUpEntry(Object key) { - lookedUpEntries.remove(key); - } - - public void putLookedUpEntry(Object key, MVCCEntry entry) { - lookedUpEntries.put(key, entry); - } - - public void clearLookedUpEntries() { - lookedUpEntries.clear(); - } - - public Map<Object, MVCCEntry> getLookedUpEntries() { - return lookedUpEntries; - } - public void reset() { + super.reset(); modificationList = null; localModifications = null; - option = null; - if (transactionLocks != null) transactionLocks.clear(); if (dummyEntriesCreatedByCacheLoader != null) dummyEntriesCreatedByCacheLoader.clear(); if (removedKeys != null) removedKeys.clear(); - lookedUpEntries.clear(); + lookedUpEntries = new FastCopyHashMap<Object, MVCCEntry>(8); } public GlobalTransaction getGobalTransaction() { @@ -171,59 +143,22 @@ return ltx; } - @SuppressWarnings("unchecked") - public void addKeyLocked(Object lock) { - // no need to worry about concurrency here - a context is only valid for a single thread. - if (transactionLocks == null) transactionLocks = new LinkedHashSet(5); - transactionLocks.add(lock); - } - - @SuppressWarnings("unchecked") - public void removeKeyLocked(Object lock) { - // no need to worry about concurrency here - a context is only valid for a single thread. - if (transactionLocks != null) transactionLocks.remove(lock); - } - - public void clearKeysLocked() { - if (transactionLocks != null) transactionLocks.clear(); - } - - @SuppressWarnings("unchecked") - public void addAllKeysLocked(List<Object> newLocks) { - // no need to worry about concurrency here - a context is only valid for a single thread. - if (transactionLocks == null) transactionLocks = new LinkedHashSet(5); - transactionLocks.addAll(newLocks); - } - - @SuppressWarnings("unchecked") - public List<Object> getKeysLocked() { - return transactionLocks == null || transactionLocks.isEmpty() ? Collections.emptyList() : Immutables.immutableListConvert(transactionLocks); - } - - public boolean hasLockedKey(Object lock) { - return transactionLocks != null && transactionLocks.contains(lock); - } - public boolean isForceAsyncReplication() { - return forceAsyncReplication; + return isFlagSet(ContextFlags.FORCE_ASYNCHRONOUS); } public void setForceAsyncReplication(boolean forceAsyncReplication) { - this.forceAsyncReplication = forceAsyncReplication; - if (forceAsyncReplication) { - forceSyncReplication = false; - } + setFlag(ContextFlags.FORCE_ASYNCHRONOUS, forceAsyncReplication); + if (forceAsyncReplication) unsetFlag(ContextFlags.FORCE_SYNCHRONOUS); } public boolean isForceSyncReplication() { - return forceSyncReplication; + return isFlagSet(ContextFlags.FORCE_SYNCHRONOUS); } public void setForceSyncReplication(boolean forceSyncReplication) { - this.forceSyncReplication = forceSyncReplication; - if (forceSyncReplication) { - forceAsyncReplication = false; - } + setFlag(ContextFlags.FORCE_SYNCHRONOUS, forceSyncReplication); + if (forceSyncReplication) unsetFlag(ContextFlags.FORCE_ASYNCHRONOUS); } /** @@ -247,14 +182,6 @@ return dummyEntriesCreatedByCacheLoader; } - public void setOption(Option o) { - this.option = o; - } - - public Option getOption() { - return this.option; - } - public boolean hasModifications() { return modificationList != null && !modificationList.isEmpty(); } @@ -266,4 +193,37 @@ public boolean hasAnyModifications() { return hasModifications() || hasLocalModifications(); } + + @Override + public boolean equals(Object o) { + if (this == o) return true; + if (o == null || getClass() != o.getClass()) return false; + if (!super.equals(o)) return false; + + TransactionContextImpl that = (TransactionContextImpl) o; + + if (dummyEntriesCreatedByCacheLoader != null ? !dummyEntriesCreatedByCacheLoader.equals(that.dummyEntriesCreatedByCacheLoader) : that.dummyEntriesCreatedByCacheLoader != null) + return false; + if (gtx != null ? !gtx.equals(that.gtx) : that.gtx != null) return false; + if (localModifications != null ? !localModifications.equals(that.localModifications) : that.localModifications != null) + return false; + if (ltx != null ? !ltx.equals(that.ltx) : that.ltx != null) return false; + if (modificationList != null ? !modificationList.equals(that.modificationList) : that.modificationList != null) + return false; + if (removedKeys != null ? !removedKeys.equals(that.removedKeys) : that.removedKeys != null) return false; + + return true; + } + + @Override + public int hashCode() { + int result = super.hashCode(); + result = 31 * result + (ltx != null ? ltx.hashCode() : 0); + result = 31 * result + (modificationList != null ? modificationList.hashCode() : 0); + result = 31 * result + (localModifications != null ? localModifications.hashCode() : 0); + result = 31 * result + (dummyEntriesCreatedByCacheLoader != null ? dummyEntriesCreatedByCacheLoader.hashCode() : 0); + result = 31 * result + (removedKeys != null ? removedKeys.hashCode() : 0); + result = 31 * result + (gtx != null ? gtx.hashCode() : 0); + return result; + } } Modified: core/branches/flat/src/main/java/org/horizon/factories/BootstrapFactory.java =================================================================== --- core/branches/flat/src/main/java/org/horizon/factories/BootstrapFactory.java 2009-02-09 18:29:53 UTC (rev 7668) +++ core/branches/flat/src/main/java/org/horizon/factories/BootstrapFactory.java 2009-02-09 18:30:59 UTC (rev 7669) @@ -21,9 +21,9 @@ */ package org.horizon.factories; +import org.horizon.AdvancedCache; import org.horizon.Cache; import org.horizon.CacheException; -import org.horizon.CacheSPI; import org.horizon.config.Configuration; import org.horizon.factories.annotations.DefaultFactoryFor; import org.horizon.factories.annotations.NonVolatile; @@ -34,22 +34,22 @@ * @author Manik Surtani (<a href="mailto:manik@jboss.org">manik(a)jboss.org</a>) * @since 1.0 */ -@DefaultFactoryFor(classes = {Cache.class, CacheSPI.class, Configuration.class, ComponentRegistry.class}) +@DefaultFactoryFor(classes = {Cache.class, AdvancedCache.class, Configuration.class, ComponentRegistry.class}) @NonVolatile public class BootstrapFactory extends AbstractNamedCacheComponentFactory { - CacheSPI cacheSPI; + AdvancedCache advancedCache; - public BootstrapFactory(CacheSPI cacheSPI, Configuration configuration, ComponentRegistry componentRegistry) { + public BootstrapFactory(AdvancedCache advancedCache, Configuration configuration, ComponentRegistry componentRegistry) { this.componentRegistry = componentRegistry; this.configuration = configuration; - this.cacheSPI = cacheSPI; + this.advancedCache = advancedCache; } @Override public <T> T construct(Class<T> componentType) { Object comp = null; - if (componentType.isAssignableFrom(CacheSPI.class)) { - comp = cacheSPI; + if (componentType.isAssignableFrom(AdvancedCache.class)) { + comp = advancedCache; } else if (componentType.isAssignableFrom(Configuration.class)) { comp = configuration; } else if (componentType.isAssignableFrom(ComponentRegistry.class)) { Modified: core/branches/flat/src/main/java/org/horizon/factories/ComponentRegistry.java =================================================================== --- core/branches/flat/src/main/java/org/horizon/factories/ComponentRegistry.java 2009-02-09 18:29:53 UTC (rev 7668) +++ core/branches/flat/src/main/java/org/horizon/factories/ComponentRegistry.java 2009-02-09 18:30:59 UTC (rev 7669) @@ -1,7 +1,7 @@ package org.horizon.factories; +import org.horizon.AdvancedCache; import org.horizon.CacheException; -import org.horizon.CacheSPI; import org.horizon.ComponentStatus; import org.horizon.config.Configuration; import org.horizon.config.ConfigurationException; @@ -39,7 +39,7 @@ * @param cache cache * @param globalComponents Shared Component Registry to delegate to */ - public ComponentRegistry(String cacheName, Configuration configuration, CacheSPI cache, GlobalComponentRegistry globalComponents) { + public ComponentRegistry(String cacheName, Configuration configuration, AdvancedCache cache, GlobalComponentRegistry globalComponents) { try { this.cacheName = cacheName; Modified: core/branches/flat/src/main/java/org/horizon/factories/DefaultCacheFactory.java =================================================================== --- core/branches/flat/src/main/java/org/horizon/factories/DefaultCacheFactory.java 2009-02-09 18:29:53 UTC (rev 7668) +++ core/branches/flat/src/main/java/org/horizon/factories/DefaultCacheFactory.java 2009-02-09 18:30:59 UTC (rev 7669) @@ -21,9 +21,9 @@ */ package org.horizon.factories; +import org.horizon.AdvancedCache; import org.horizon.Cache; import org.horizon.CacheDelegate; -import org.horizon.CacheSPI; import org.horizon.config.Configuration; import org.horizon.config.ConfigurationException; import org.horizon.jmx.PlatformMBeanServerRegistration; @@ -54,7 +54,7 @@ */ public Cache<K, V> createCache(Configuration configuration, GlobalComponentRegistry globalComponentRegistry, String cacheName) throws ConfigurationException { try { - CacheSPI<K, V> cache = createAndWire(configuration, globalComponentRegistry, cacheName); + AdvancedCache<K, V> cache = createAndWire(configuration, globalComponentRegistry, cacheName); cache.start(); return cache; } @@ -73,8 +73,8 @@ return createCache(configuration, null, DefaultCacheManager.DEFAULT_CACHE_NAME); } - protected CacheSPI<K, V> createAndWire(Configuration configuration, GlobalComponentRegistry globalComponentRegistry, String cacheName) throws Exception { - CacheSPI<K, V> spi = new CacheDelegate<K, V>(cacheName); + protected AdvancedCache<K, V> createAndWire(Configuration configuration, GlobalComponentRegistry globalComponentRegistry, String cacheName) throws Exception { + AdvancedCache<K, V> spi = new CacheDelegate<K, V>(cacheName); bootstrap(cacheName, spi, configuration, globalComponentRegistry); return spi; } @@ -82,13 +82,13 @@ /** * Bootstraps this factory with a Configuration and a ComponentRegistry. */ - private void bootstrap(String cacheName, CacheSPI spi, Configuration configuration, GlobalComponentRegistry globalComponentRegistry) { + private void bootstrap(String cacheName, AdvancedCache spi, Configuration configuration, GlobalComponentRegistry globalComponentRegistry) { this.configuration = configuration; // injection bootstrap stuff componentRegistry = new ComponentRegistry(cacheName, configuration, spi, globalComponentRegistry); componentRegistry.registerDefaultClassLoader(defaultClassLoader); - componentRegistry.registerComponent(spi, CacheSPI.class); + componentRegistry.registerComponent(spi, AdvancedCache.class); componentRegistry.registerComponent(new PlatformMBeanServerRegistration(), PlatformMBeanServerRegistration.class); } Modified: core/branches/flat/src/main/java/org/horizon/factories/EntryFactoryImpl.java =================================================================== --- core/branches/flat/src/main/java/org/horizon/factories/EntryFactoryImpl.java 2009-02-09 18:29:53 UTC (rev 7668) +++ core/branches/flat/src/main/java/org/horizon/factories/EntryFactoryImpl.java 2009-02-09 18:30:59 UTC (rev 7669) @@ -30,6 +30,7 @@ import org.horizon.context.InvocationContext; import org.horizon.factories.annotations.Inject; import org.horizon.factories.annotations.Start; +import org.horizon.invocation.Options; import org.horizon.lock.IsolationLevel; import org.horizon.lock.LockManager; import org.horizon.lock.TimeoutException; @@ -37,12 +38,6 @@ import org.horizon.logging.LogFactory; import org.horizon.notifications.cachelistener.CacheNotifier; -/** - * // TODO: MANIK: Document this - * - * @author Manik Surtani (<a href="mailto:manik@jboss.org">manik(a)jboss.org</a>) - * @since 1.0 - */ public class EntryFactoryImpl implements EntryFactory { private boolean useRepeatableRead; private static final NullMarkerEntry NULL_MARKER = new NullMarkerEntry(); @@ -50,7 +45,6 @@ boolean writeSkewCheck; LockManager lockManager; Configuration configuration; - long defaultLockAcquisitionTimeout; CacheNotifier notifier; private static final Log log = LogFactory.getLog(EntryFactoryImpl.class); @@ -67,7 +61,6 @@ @Start public void init() { useRepeatableRead = configuration.getIsolationLevel() == IsolationLevel.REPEATABLE_READ; - defaultLockAcquisitionTimeout = configuration.getLockAcquisitionTimeout(); writeSkewCheck = configuration.isWriteSkewCheck(); } @@ -168,18 +161,24 @@ // nothing wrong, just means that we fail to record the lock. And that is a problem. // Better to check our records and lock again if necessary. if (!ctx.hasLockedKey(key)) { - if (ctx.getOptionOverrides().isSuppressLocking()) { + if (ctx.hasOption(Options.SKIP_LOCKING)) { // just record this in the ctx and rtn ctx.addKeyLocked(key); } else if (!lockManager.lockAndRecord(key, ctx)) { Object owner = lockManager.getOwner(key); - throw new TimeoutException("Unable to acquire lock on key [" + key + "] after [" + ctx.getLockAcquisitionTimeout(defaultLockAcquisitionTimeout) + "] milliseconds for requestor [" + lockManager.getLockOwner(ctx) + "]! Lock held by [" + owner + "]"); + throw new TimeoutException("Unable to acquire lock on key [" + key + "] after [" + getLockAcquisitionTImeout(ctx) + + "] milliseconds for requestor [" + lockManager.getLockOwner(ctx) + "]! Lock held by [" + owner + "]"); } return true; } return false; } + private long getLockAcquisitionTImeout(InvocationContext ctx) { + return ctx.hasOption(Options.ZERO_LOCK_ACQUISITION_TIMEOUT) ? + 0 : configuration.getLockAcquisitionTimeout(); + } + public void releaseLock(Object key) { lockManager.unlock(key, lockManager.getOwner(key)); } Modified: core/branches/flat/src/main/java/org/horizon/factories/annotations/NonVolatile.java =================================================================== --- core/branches/flat/src/main/java/org/horizon/factories/annotations/NonVolatile.java 2009-02-09 18:29:53 UTC (rev 7668) +++ core/branches/flat/src/main/java/org/horizon/factories/annotations/NonVolatile.java 2009-02-09 18:30:59 UTC (rev 7669) @@ -28,11 +28,11 @@ /** * This annotation is used for components that will be registered in the {@link org.horizon.factories.ComponentRegistry}, - * that are resilient to changes in configuration. Examples are the {@link org.horizon.CacheSPI} implementation used, - * which does not change regardless of the configuration. Components such as the {@link org.horizon.lock.LockManager}, - * though, should never be marked as <tt>@NonVolatile</tt> since based on the configuration, different lock - * manager implementations may be selected. LockManager is, hence, not resilient to changes in the - * configuration. + * that are resilient to changes in configuration. Examples are the {@link org.horizon.factories.ComponentRegistry} + * implementation used, which does not change regardless of the configuration. Components such as the {@link + * org.horizon.lock.LockManager}, though, should never be marked as <tt>@NonVolatile</tt> since based on the + * configuration, different lock manager implementations may be selected. LockManager is, hence, not resilient + * to changes in the configuration. * * @author Manik Surtani (<a href="mailto:manik@jboss.org">manik(a)jboss.org</a>) * @since 1.0 Modified: core/branches/flat/src/main/java/org/horizon/interceptors/CacheStoreInterceptor.java =================================================================== --- core/branches/flat/src/main/java/org/horizon/interceptors/CacheStoreInterceptor.java 2009-02-09 18:29:53 UTC (rev 7668) +++ core/branches/flat/src/main/java/org/horizon/interceptors/CacheStoreInterceptor.java 2009-02-09 18:30:59 UTC (rev 7669) @@ -36,6 +36,7 @@ import org.horizon.factories.annotations.Inject; import org.horizon.factories.annotations.Start; import org.horizon.interceptors.base.JmxStatsCommandInterceptor; +import org.horizon.invocation.Options; import org.horizon.jmx.annotations.ManagedAttribute; import org.horizon.jmx.annotations.ManagedOperation; import org.horizon.loader.CacheLoader; @@ -96,7 +97,7 @@ * if this is a shared cache loader and the call is of remote origin, pass up the chain */ public final boolean skip(InvocationContext ctx, VisitableCommand command) { - if ((!ctx.isOriginLocal() && loaderConfig.isShared()) || ctx.getOptionOverrides().isSuppressPersistence()) { + if ((!ctx.isOriginLocal() && loaderConfig.isShared()) || ctx.hasOption(Options.SKIP_CACHE_STORE)) { if (trace) log.trace("Passing up method call and bypassing this interceptor since the cache loader is shared and this call originated remotely."); return true; Modified: core/branches/flat/src/main/java/org/horizon/interceptors/InvalidationInterceptor.java =================================================================== --- core/branches/flat/src/main/java/org/horizon/interceptors/InvalidationInterceptor.java 2009-02-09 18:29:53 UTC (rev 7668) +++ core/branches/flat/src/main/java/org/horizon/interceptors/InvalidationInterceptor.java 2009-02-09 18:30:59 UTC (rev 7669) @@ -36,7 +36,6 @@ import org.horizon.commands.write.RemoveCommand; import org.horizon.commands.write.ReplaceCommand; import org.horizon.commands.write.WriteCommand; -import org.horizon.config.Option; import org.horizon.context.InvocationContext; import org.horizon.context.TransactionContext; import org.horizon.factories.annotations.Inject; @@ -101,7 +100,7 @@ public Object visitClearCommand(InvocationContext ctx, ClearCommand command) throws Throwable { // just broadcast the clear command - this is simplest! Object retval = invokeNextInterceptor(ctx, command); - if (ctx.isOriginLocal()) replicateCall(ctx, command, defaultSynchronous, ctx.getOptionOverrides()); + if (ctx.isOriginLocal()) replicateCall(ctx, command, defaultSynchronous); return retval; } @@ -147,14 +146,13 @@ Object retval = invokeNextInterceptor(ctx, command); if (command.isSuccessful()) { Transaction tx = ctx.getTransaction(); - Option optionOverride = ctx.getOptionOverrides(); if (log.isDebugEnabled()) log.debug("Is a CRUD method"); if (keys != null && keys.length != 0) { // could be potentially TRANSACTIONAL. Ignore if it is, until we see a prepare(). if (tx == null || !TransactionTable.isValid(tx)) { // the no-tx case: //replicate an evict call. - invalidateAcrossCluster(isSynchronous(optionOverride), ctx, keys); + invalidateAcrossCluster(isSynchronous(ctx), ctx, keys); } else { if (isLocalModeForced(ctx)) ctx.getTransactionContext().addLocalModification(command); } @@ -221,7 +219,7 @@ InvalidateCommand command = commandsFactory.buildInvalidateCommand(keys); if (log.isDebugEnabled()) log.debug("Cache [" + rpcManager.getAddress() + "] replicating " + command); // voila, invalidated! - replicateCall(ctx, command, synchronous, ctx.getOptionOverrides()); + replicateCall(ctx, command, synchronous); } } Modified: core/branches/flat/src/main/java/org/horizon/interceptors/InvocationContextInterceptor.java =================================================================== --- core/branches/flat/src/main/java/org/horizon/interceptors/InvocationContextInterceptor.java 2009-02-09 18:29:53 UTC (rev 7668) +++ core/branches/flat/src/main/java/org/horizon/interceptors/InvocationContextInterceptor.java 2009-02-09 18:30:59 UTC (rev 7669) @@ -31,10 +31,10 @@ import org.horizon.commands.write.PutMapCommand; import org.horizon.commands.write.RemoveCommand; import org.horizon.commands.write.ReplaceCommand; -import org.horizon.config.Option; import org.horizon.context.InvocationContext; import org.horizon.context.TransactionContext; import org.horizon.factories.annotations.Inject; +import org.horizon.invocation.Options; import org.horizon.remoting.RPCManager; import org.horizon.transaction.GlobalTransaction; import org.horizon.transaction.TransactionTable; @@ -96,7 +96,6 @@ } private Object handleAll(InvocationContext ctx, VisitableCommand command, GlobalTransaction gtx, boolean scrubContextOnCompletion) throws Throwable { - Option optionOverride = ctx.getOptionOverrides(); boolean suppressExceptions = false; Transaction suspendedTransaction = null; boolean resumeSuspended = false; @@ -113,18 +112,16 @@ setTransactionalContext(null, null, null, ctx); } - if (optionOverride != null) { - if (optionOverride.isFailSilently()) { - log.debug("FAIL_SILENTLY Option is present - suspending any ongoing transaction."); - suppressExceptions = true; - if (ctx.getTransaction() != null) { - suspendedTransaction = txManager.suspend(); - setTransactionalContext(null, null, null, ctx); - if (trace) log.trace("Suspending transaction " + suspendedTransaction); - resumeSuspended = true; - } else { - if (trace) log.trace("No ongoing transaction to suspend"); - } + if (ctx.hasOption(Options.FAIL_SILENTLY)) { + log.debug("FAIL_SILENTLY Option is present - suspending any ongoing transaction."); + suppressExceptions = true; + if (ctx.getTransaction() != null) { + suspendedTransaction = txManager.suspend(); + setTransactionalContext(null, null, null, ctx); + if (trace) log.trace("Suspending transaction " + suspendedTransaction); + resumeSuspended = true; + } else { + if (trace) log.trace("No ongoing transaction to suspend"); } } @@ -156,7 +153,7 @@ // clean up any invocation-scope options set up if (trace) log.trace("Resetting invocation-scope options"); - ctx.getOptionOverrides().reset(); + ctx.resetOptions(); // if this is a prepare, opt prepare or @@ -205,10 +202,8 @@ // notify the transaction tCtx that this override is in place. TransactionContext tCtx = ctx.getTransactionContext(); if (tCtx != null) { - Option txScopeOption = new Option(); - txScopeOption.setCacheModeLocal(ctx.getOptionOverrides() != null && ctx.getOptionOverrides().isCacheModeLocal()); - txScopeOption.setSkipCacheStatusCheck(ctx.getOptionOverrides() != null && ctx.getOptionOverrides().isSkipCacheStatusCheck()); - tCtx.setOption(txScopeOption); + if (ctx.hasOption(Options.CACHE_MODE_LOCAL)) tCtx.setOptions(Options.CACHE_MODE_LOCAL); + if (ctx.hasOption(Options.SKIP_CACHE_STATUS_CHECK)) tCtx.setOptions(Options.SKIP_CACHE_STATUS_CHECK); } } } \ No newline at end of file Modified: core/branches/flat/src/main/java/org/horizon/interceptors/LockingInterceptor.java =================================================================== --- core/branches/flat/src/main/java/org/horizon/interceptors/LockingInterceptor.java 2009-02-09 18:29:53 UTC (rev 7668) +++ core/branches/flat/src/main/java/org/horizon/interceptors/LockingInterceptor.java 2009-02-09 18:30:59 UTC (rev 7669) @@ -165,8 +165,7 @@ public Object visitPutKeyValueCommand(InvocationContext ctx, PutKeyValueCommand command) throws Throwable { try { entryFactory.wrapEntryForWriting(ctx, command.getKey(), true, false, command.getLifespanMillis()); - Object o = invokeNextInterceptor(ctx, command); - return o; + return invokeNextInterceptor(ctx, command); } finally { doAfterCall(ctx); Modified: core/branches/flat/src/main/java/org/horizon/interceptors/ReplicationInterceptor.java =================================================================== --- core/branches/flat/src/main/java/org/horizon/interceptors/ReplicationInterceptor.java 2009-02-09 18:29:53 UTC (rev 7668) +++ core/branches/flat/src/main/java/org/horizon/interceptors/ReplicationInterceptor.java 2009-02-09 18:30:59 UTC (rev 7669) @@ -48,7 +48,7 @@ @Override public Object visitCommitCommand(InvocationContext ctx, CommitCommand command) throws Throwable { if (!skipReplicationOfTransactionMethod(ctx)) - replicateCall(ctx, command, configuration.isSyncCommitPhase(), ctx.getOptionOverrides(), true); + replicateCall(ctx, command, configuration.isSyncCommitPhase(), true); return invokeNextInterceptor(ctx, command); } @@ -69,7 +69,7 @@ @Override public Object visitRollbackCommand(InvocationContext ctx, RollbackCommand command) throws Throwable { if (!skipReplicationOfTransactionMethod(ctx) && !ctx.isLocalRollbackOnly()) { - replicateCall(ctx, command, configuration.isSyncRollbackPhase(), ctx.getOptionOverrides()); + replicateCall(ctx, command, configuration.isSyncRollbackPhase()); } return invokeNextInterceptor(ctx, command); } @@ -118,7 +118,7 @@ configuration.getSyncReplTimeout()); } - replicateCall(ctx, command, isSynchronous(ctx.getOptionOverrides()), ctx.getOptionOverrides()); + replicateCall(ctx, command, isSynchronous(ctx)); } else { if (local) ctx.getTransactionContext().addLocalModification(command); } @@ -143,6 +143,6 @@ } // this method will return immediately if we're the only member (because exclude_self=true) - replicateCall(ctx, prepareMethod, !async, ctx.getOptionOverrides()); + replicateCall(ctx, prepareMethod, !async); } } \ No newline at end of file Modified: core/branches/flat/src/main/java/org/horizon/interceptors/TxInterceptor.java =================================================================== --- core/branches/flat/src/main/java/org/horizon/interceptors/TxInterceptor.java 2009-02-09 18:29:53 UTC (rev 7668) +++ core/branches/flat/src/main/java/org/horizon/interceptors/TxInterceptor.java 2009-02-09 18:30:59 UTC (rev 7669) @@ -30,13 +30,13 @@ import org.horizon.commands.tx.CommitCommand; import org.horizon.commands.tx.PrepareCommand; import org.horizon.commands.tx.RollbackCommand; -import org.horizon.config.Option; import org.horizon.context.InvocationContext; import org.horizon.context.TransactionContext; import org.horizon.factories.ComponentRegistry; import org.horizon.factories.annotations.Inject; import org.horizon.factories.context.ContextFactory; import org.horizon.invocation.InvocationContextContainer; +import org.horizon.invocation.Options; import org.horizon.lock.LockManager; import org.horizon.manager.CacheManager; import org.horizon.notifications.cachelistener.CacheNotifier; @@ -116,12 +116,19 @@ } } catch (Throwable e) { - ctx.throwIfNeeded(e); + throwIfNeeded(ctx, e); } return result; } + private void throwIfNeeded(InvocationContext ctx, Throwable throwable) throws Throwable { + if (ctx.hasOption(Options.FAIL_SILENTLY)) + log.trace("There was a problem handling this request, but FAIL_SLIENTLY was set, so suppressing exception", throwable); + else + throw throwable; + } + @Override public Object visitCommitCommand(InvocationContext ctx, CommitCommand command) throws Throwable { if (!ctx.getGlobalTransaction().isRemote()) { @@ -160,7 +167,7 @@ if (log.isDebugEnabled()) log.debug("Finished remote rollback method for " + gtx); } catch (Throwable throwable) { - ctx.throwIfNeeded(throwable); + throwIfNeeded(ctx, throwable); } return null; } @@ -210,7 +217,7 @@ if (log.isDebugEnabled()) log.debug("Finished remote commit/rollback method for " + gtx); } catch (Throwable throwable) { - ctx.throwIfNeeded(throwable); + throwIfNeeded(ctx, throwable); } return null; @@ -222,7 +229,7 @@ return attachGtxAndPassUpChain(ctx, command); } catch (Throwable throwable) { - ctx.throwIfNeeded(throwable); + throwIfNeeded(ctx, throwable); return null; } } @@ -639,8 +646,7 @@ ctx = invocationContextContainer.get(); setTransactionalContext(tx, gtx, transactionContext, ctx); - if (ctx.isOptionsUninitialised() && transactionContext.getOption() != null) - ctx.setOptionOverrides(transactionContext.getOption()); + if (ctx.isOptionsUninit()) ctx.setOptions(transactionContext.getOptions()); assertCanContinue(); @@ -655,9 +661,9 @@ ctx = invocationContextContainer.get(); setTransactionalContext(tx, gtx, transactionContext, ctx); - if (ctx.isOptionsUninitialised() && transactionContext != null && transactionContext.getOption() != null) { + if (ctx.isOptionsUninit() && transactionContext != null) { // use the options from the transaction entry instead - ctx.setOptionOverrides(transactionContext.getOption()); + ctx.setOptions(transactionContext.getOptions()); } } @@ -677,7 +683,7 @@ if (transactionContext != null) { // this should ideally be set in beforeCompletion(), after compacting the list. if (modifications == null) modifications = transactionContext.getModifications(); - ctx.setOptionOverrides(transactionContext.getOption()); + ctx.setOptions(transactionContext.getOptions()); } if (tx != null) transactions.remove(tx); @@ -714,7 +720,7 @@ } private void assertCanContinue() { - if (!componentRegistry.invocationsAllowed(true) && (ctx.getOptionOverrides() == null || !ctx.getOptionOverrides().isSkipCacheStatusCheck())) + if (!componentRegistry.invocationsAllowed(true) && !ctx.hasOption(Options.SKIP_CACHE_STATUS_CHECK)) throw new IllegalStateException("Cache not in STARTED state!"); } @@ -752,7 +758,7 @@ // This is STILL remotely originating though and this needs to be made explicit here. // this can be checked by inspecting the InvocationContext.isOriginLocal() at the time of registering the sync. private boolean remoteLocal = false; - private Option originalOptions, transactionalOptions; + private Set<Options> originalOptions, transactionalOptions; /** * A Synchronization for locally originating txs. @@ -787,9 +793,9 @@ } // set any transaction wide options as current for this thread, caching original options that would then be reset - originalOptions = ctx.getOptionOverrides(); - transactionalOptions = transactionContext.getOption(); - ctx.setOptionOverrides(transactionalOptions); + originalOptions = ctx.getOptions(); + transactionalOptions = transactionContext.getOptions(); + ctx.setOptions(transactionalOptions); try { switch (tx.getStatus()) { @@ -827,7 +833,7 @@ finally { localRollbackOnly = false; setTransactionalContext(null, null, null, ctx); - ctx.setOptionOverrides(originalOptions); + ctx.setOptions(originalOptions); } } @@ -837,12 +843,12 @@ if (ctx == null) ctx = invocationContextContainer.get(); ctx.setLocalRollbackOnly(localRollbackOnly); setTransactionalContext(tx, gtx, transactionContext, ctx); - if (transactionalOptions != null) ctx.setOptionOverrides(transactionalOptions); + if (transactionalOptions != null) ctx.setOptions(transactionalOptions); try { super.afterCompletion(status); } finally { - ctx.setOptionOverrides(originalOptions); + ctx.setOptions(originalOptions); } } Modified: core/branches/flat/src/main/java/org/horizon/interceptors/base/BaseRpcInterceptor.java =================================================================== --- core/branches/flat/src/main/java/org/horizon/interceptors/base/BaseRpcInterceptor.java 2009-02-09 18:29:53 UTC (rev 7668) +++ core/branches/flat/src/main/java/org/horizon/interceptors/base/BaseRpcInterceptor.java 2009-02-09 18:30:59 UTC (rev 7669) @@ -25,11 +25,11 @@ import org.horizon.commands.CommandsFactory; import org.horizon.commands.RPCCommand; import org.horizon.commands.ReplicableCommand; -import org.horizon.config.Option; import org.horizon.context.InvocationContext; import org.horizon.context.TransactionContext; import org.horizon.factories.annotations.Inject; import org.horizon.factories.annotations.Start; +import org.horizon.invocation.Options; import org.horizon.remoting.RPCManager; import org.horizon.remoting.ResponseMode; import org.horizon.remoting.transport.Address; @@ -83,33 +83,28 @@ } } - protected void replicateCall(InvocationContext ctx, RPCCommand call, boolean sync, Option o, boolean useOutOfBandMessage) throws Throwable { - replicateCall(ctx, null, call, sync, o, useOutOfBandMessage); + protected void replicateCall(InvocationContext ctx, RPCCommand call, boolean sync, boolean useOutOfBandMessage) throws Throwable { + replicateCall(ctx, null, call, sync, useOutOfBandMessage); } - protected void replicateCall(InvocationContext ctx, ReplicableCommand call, boolean sync, Option o, boolean useOutOfBandMessage) throws Throwable { - replicateCall(ctx, null, commandsFactory.buildReplicateCommand(call), sync, o, useOutOfBandMessage); + protected void replicateCall(InvocationContext ctx, ReplicableCommand call, boolean sync, boolean useOutOfBandMessage) throws Throwable { + replicateCall(ctx, null, commandsFactory.buildReplicateCommand(call), sync, useOutOfBandMessage); } - protected void replicateCall(InvocationContext ctx, RPCCommand call, boolean sync, Option o) throws Throwable { - replicateCall(ctx, null, call, sync, o, false); + protected void replicateCall(InvocationContext ctx, RPCCommand call, boolean sync) throws Throwable { + replicateCall(ctx, null, call, sync, false); } - protected void replicateCall(InvocationContext ctx, ReplicableCommand call, boolean sync, Option o) throws Throwable { - replicateCall(ctx, null, commandsFactory.buildReplicateCommand(call), sync, o, false); + protected void replicateCall(InvocationContext ctx, ReplicableCommand call, boolean sync) throws Throwable { + replicateCall(ctx, null, commandsFactory.buildReplicateCommand(call), sync, false); } - protected void replicateCall(InvocationContext ctx, List<Address> recipients, RPCCommand c, boolean sync, Option o, boolean useOutOfBandMessage) throws Throwable { + protected void replicateCall(InvocationContext ctx, List<Address> recipients, RPCCommand c, boolean sync, boolean useOutOfBandMessage) throws Throwable { long syncReplTimeout = configuration.getSyncReplTimeout(); - // test for option overrides - if (o != null) { - if (o.isForceAsynchronous()) sync = false; - else if (o.isForceSynchronous()) sync = true; + if (ctx.hasOption(Options.FORCE_ASYNCHRONOUS)) sync = false; + else if (ctx.hasOption(Options.FORCE_SYNCHRONOUS)) sync = true; - if (o.getSyncReplTimeout() > 0) syncReplTimeout = o.getSyncReplTimeout(); - } - // tx-level overrides are more important Transaction tx = ctx.getTransaction(); if (tx != null) { @@ -157,32 +152,32 @@ * - the current transaction did not modify any data * </pre> */ - protected boolean skipReplicationOfTransactionMethod(InvocationContext ctx) { + protected final boolean skipReplicationOfTransactionMethod(InvocationContext ctx) { GlobalTransaction gtx = ctx.getGlobalTransaction(); - return ctx.getTransaction() == null || gtx == null || gtx.isRemote() || ctx.getOptionOverrides().isCacheModeLocal() || !ctx.getTransactionContext().hasModifications(); + return ctx.getTransaction() == null || gtx == null || gtx.isRemote() || ctx.hasOption(Options.CACHE_MODE_LOCAL) + || !ctx.getTransactionContext().hasModifications(); } /** * The call runs in a transaction and it was initiated on this node of the cluster. */ - protected boolean isTransactionalAndLocal(InvocationContext ctx) { + protected final boolean isTransactionalAndLocal(InvocationContext ctx) { GlobalTransaction gtx = ctx.getGlobalTransaction(); boolean isInitiatedHere = gtx != null && !gtx.isRemote(); return isInitiatedHere && (ctx.getTransaction() != null); } - protected boolean isSynchronous(Option option) { - if (option != null) { - if (option.isForceSynchronous()) - return true; - else if (option.isForceAsynchronous()) - return false; - } + protected final boolean isSynchronous(InvocationContext ctx) { + if (ctx.hasOption(Options.FORCE_SYNCHRONOUS)) + return true; + else if (ctx.hasOption(Options.FORCE_ASYNCHRONOUS)) + return false; + return defaultSynchronous; } - protected boolean isLocalModeForced(InvocationContext ctx) { - if (ctx.getOptionOverrides() != null && ctx.getOptionOverrides().isCacheModeLocal()) { + protected final boolean isLocalModeForced(InvocationContext ctx) { + if (ctx.hasOption(Options.CACHE_MODE_LOCAL)) { if (log.isDebugEnabled()) log.debug("LOCAL mode forced on invocation. Suppressing clustered events."); return true; } Modified: core/branches/flat/src/main/java/org/horizon/invocation/InvocationContextContainer.java =================================================================== --- core/branches/flat/src/main/java/org/horizon/invocation/InvocationContextContainer.java 2009-02-09 18:29:53 UTC (rev 7668) +++ core/branches/flat/src/main/java/org/horizon/invocation/InvocationContextContainer.java 2009-02-09 18:30:59 UTC (rev 7669) @@ -46,8 +46,12 @@ } @Override - protected InvocationContext initialValue() { + protected final InvocationContext initialValue() { // create if this is initially unset return contextFactory.createInvocationContext(); } + + public void reset() { + set(initialValue()); + } } \ No newline at end of file Added: core/branches/flat/src/main/java/org/horizon/invocation/Options.java =================================================================== --- core/branches/flat/src/main/java/org/horizon/invocation/Options.java (rev 0) +++ core/branches/flat/src/main/java/org/horizon/invocation/Options.java 2009-02-09 18:30:59 UTC (rev 7669) @@ -0,0 +1,20 @@ +package org.horizon.invocation; + +/** + * Available options, which may be set on a per-invocation basis + * + * @author Manik Surtani + * @since 1.0 + */ +public enum Options { + ZERO_LOCK_ACQUISITION_TIMEOUT, + CACHE_MODE_LOCAL, + SKIP_LOCKING, + FORCE_WRITE_LOCK, + SKIP_CACHE_STATUS_CHECK, + FORCE_ASYNCHRONOUS, + FORCE_SYNCHRONOUS, + SKIP_CACHE_STORE, + FAIL_SILENTLY + +} Modified: core/branches/flat/src/main/java/org/horizon/jmx/JmxRegistrationManager.java =================================================================== --- core/branches/flat/src/main/java/org/horizon/jmx/JmxRegistrationManager.java 2009-02-09 18:29:53 UTC (rev 7668) +++ core/branches/flat/src/main/java/org/horizon/jmx/JmxRegistrationManager.java 2009-02-09 18:30:59 UTC (rev 7669) @@ -21,9 +21,8 @@ */ package org.horizon.jmx; -import org.horizon.Cache; +import org.horizon.AdvancedCache; import org.horizon.CacheException; -import org.horizon.CacheSPI; import org.horizon.config.Configuration; import org.horizon.factories.ComponentRegistry; import org.horizon.logging.Log; @@ -75,7 +74,7 @@ private String objectNameBase; - private CacheSPI cacheSpi; + private AdvancedCache cache; /** * C-tor. @@ -84,18 +83,18 @@ * @param cache cache that needs to be monitored * @param objectNameBase path in the MBeanServer where to register cache MBeans */ - public JmxRegistrationManager(MBeanServer mBeanServer, Cache cache, ObjectName objectNameBase) { + public JmxRegistrationManager(MBeanServer mBeanServer, AdvancedCache cache, ObjectName objectNameBase) { this.mBeanServer = mBeanServer; - this.cacheSpi = (CacheSPI) cache; + this.cache = cache; processBaseName(objectNameBase); } /** * @throws IllegalArgumentException if the supplied objectNameBase name isn't valid */ - public JmxRegistrationManager(MBeanServer mBeanServer, Cache cache, String objectNameBase) { + public JmxRegistrationManager(MBeanServer mBeanServer, AdvancedCache cache, String objectNameBase) { this.mBeanServer = mBeanServer; - this.cacheSpi = (CacheSPI) cache; + this.cache = cache; try { processBaseName(new ObjectName(objectNameBase)); } @@ -111,11 +110,11 @@ * @see <a href="http://java.sun.com/j2se/1.5.0/docs/guide/management/mxbeans.html#mbean_s...">platform * MBeanServer</a> */ - public JmxRegistrationManager(Cache cache, ObjectName objectNameBase) { + public JmxRegistrationManager(AdvancedCache cache, ObjectName objectNameBase) { this(ManagementFactory.getPlatformMBeanServer(), cache, objectNameBase); } - public JmxRegistrationManager(Cache cache) { + public JmxRegistrationManager(AdvancedCache cache) { this(cache, null); } @@ -161,7 +160,7 @@ private List<ResourceDMBean> getResourceDMBeans() { List<ResourceDMBean> resourceDMBeans = new ArrayList<ResourceDMBean>(); - for (ComponentRegistry.Component component : cacheSpi.getComponentRegistry().getRegisteredComponents()) { + for (ComponentRegistry.Component component : cache.getComponentRegistry().getRegisteredComponents()) { ResourceDMBean resourceDMBean = new ResourceDMBean(component.getInstance()); if (resourceDMBean.isManagedResource()) { resourceDMBeans.add(resourceDMBean); @@ -175,13 +174,13 @@ this.objectNameBase = baseName.getCanonicalName(); return; } - if (cacheSpi.getConfiguration().getCacheMode().equals(Configuration.CacheMode.LOCAL)) { - objectNameBase = LOCAL_CACHE_PREFIX + ",instance=" + Integer.toHexString(System.identityHashCode(cacheSpi)); + if (cache.getConfiguration().getCacheMode().equals(Configuration.CacheMode.LOCAL)) { + objectNameBase = LOCAL_CACHE_PREFIX + ",instance=" + Integer.toHexString(System.identityHashCode(cache)); } else //the cache is clustered { - objectNameBase = REPLICATED_CACHE_PREFIX + cacheSpi.getConfiguration().getGlobalConfiguration().getClusterName(); + objectNameBase = REPLICATED_CACHE_PREFIX + cache.getConfiguration().getGlobalConfiguration().getClusterName(); } - objectNameBase = objectNameBase + ",cacheName=" + cacheSpi.getName(); + objectNameBase = objectNameBase + ",cacheName=" + cache.getName(); } public String getObjectName(String resourceName) { Modified: core/branches/flat/src/main/java/org/horizon/jmx/PlatformMBeanServerRegistration.java =================================================================== --- core/branches/flat/src/main/java/org/horizon/jmx/PlatformMBeanServerRegistration.java 2009-02-09 18:29:53 UTC (rev 7668) +++ core/branches/flat/src/main/java/org/horizon/jmx/PlatformMBeanServerRegistration.java 2009-02-09 18:30:59 UTC (rev 7669) @@ -21,7 +21,7 @@ */ package org.horizon.jmx; -import org.horizon.CacheSPI; +import org.horizon.AdvancedCache; import org.horizon.config.Configuration; import org.horizon.factories.annotations.Inject; import org.horizon.factories.annotations.NonVolatile; @@ -31,7 +31,7 @@ import org.horizon.logging.LogFactory; /** - * If {@link Configuration#getExposeManagementStatistics()} is true, then class will register all the MBeans from the + * If {@link Configuration#isExposeManagementStatistics()} is true, then class will register all the MBeans from the * ConfigurationRegistry to the pltform MBean server. * * Note: to enable platform MBeanServer the following system property should be passet to the JVM: @@ -45,10 +45,10 @@ public class PlatformMBeanServerRegistration { private static final Log log = LogFactory.getLog(PlatformMBeanServerRegistration.class); - private CacheSPI cache; + private AdvancedCache cache; @Inject - public void initialize(CacheSPI cache) { + public void initialize(AdvancedCache cache) { this.cache = cache; } Modified: core/branches/flat/src/main/java/org/horizon/loader/AbstractCacheLoader.java =================================================================== --- core/branches/flat/src/main/java/org/horizon/loader/AbstractCacheLoader.java 2009-02-09 18:29:53 UTC (rev 7668) +++ core/branches/flat/src/main/java/org/horizon/loader/AbstractCacheLoader.java 2009-02-09 18:30:59 UTC (rev 7669) @@ -21,8 +21,8 @@ */ package org.horizon.loader; +import org.horizon.Cache; import org.horizon.CacheException; -import org.horizon.CacheSPI; import org.horizon.logging.Log; import org.horizon.logging.LogFactory; import org.horizon.marshall.EntryData; @@ -51,7 +51,7 @@ * @since 1.0 */ public abstract class AbstractCacheLoader<K, V> implements CacheLoader<K, V> { - protected CacheSPI<K, V> cache; + protected Cache<K, V> cache; private static final Log log = LogFactory.getLog(AbstractCacheLoader.class); private static final boolean trace = log.isTraceEnabled(); /** @@ -62,13 +62,14 @@ public void storeEntireState(ObjectInputStream in) { // store new state - Object objectFromStream; - try { - objectFromStream = cache.getMarshaller().objectFromObjectStream(in); - } - catch (Exception e) { - throw new CacheException(e.getMessage(), e); - } + Object objectFromStream = null; + // TODO fix me +// try { +// objectFromStream = cache.getMarshaller().objectFromObjectStream(in); +// } +// catch (Exception e) { +// throw new CacheException(e.getMessage(), e); +// } if (objectFromStream instanceof EntryDataMarker) { // no persistent state sent across; return? @@ -90,16 +91,17 @@ public void loadEntireState(ObjectOutputStream os) { List<EntryData<K, V>> list = getAllEntries(); if (trace) log.trace("Loading state of " + list.size() + " nodes into stream"); - try { - cache.getMarshaller().objectToObjectStream(list, os); - } - catch (Exception e) { - throw new CacheException(e.getMessage(), e); - } + // TODO fix me +// try { +// cache.getMarshaller().objectToObjectStream(list, os); +// } +// catch (Exception e) { +// throw new CacheException(e.getMessage(), e); +// } } - public void setCache(CacheSPI<K, V> c) { + public void setCache(Cache<K, V> c) { this.cache = c; } @@ -122,7 +124,9 @@ } protected Marshaller getMarshaller() { - return cache.getMarshaller(); + return null; + // todo fix me +// return cache.getMarshaller(); } // empty implementations for loaders that do not wish to implement lifecycle. Modified: core/branches/flat/src/main/java/org/horizon/loader/AbstractDelegatingCacheLoader.java =================================================================== --- core/branches/flat/src/main/java/org/horizon/loader/AbstractDelegatingCacheLoader.java 2009-02-09 18:29:53 UTC (rev 7668) +++ core/branches/flat/src/main/java/org/horizon/loader/AbstractDelegatingCacheLoader.java 2009-02-09 18:30:59 UTC (rev 7669) @@ -21,7 +21,7 @@ */ package org.horizon.loader; -import org.horizon.CacheSPI; +import org.horizon.Cache; import org.horizon.config.CacheLoaderConfig.IndividualCacheLoaderConfig; import org.horizon.marshall.EntryData; @@ -103,7 +103,7 @@ cacheLoader.rollback(tx); } - public void setCache(CacheSPI<K, V> c) { + public void setCache(Cache<K, V> c) { cacheLoader.setCache(c); } Modified: core/branches/flat/src/main/java/org/horizon/loader/CacheLoader.java =================================================================== --- core/branches/flat/src/main/java/org/horizon/loader/CacheLoader.java 2009-02-09 18:29:53 UTC (rev 7668) +++ core/branches/flat/src/main/java/org/horizon/loader/CacheLoader.java 2009-02-09 18:30:59 UTC (rev 7669) @@ -22,7 +22,7 @@ package org.horizon.loader; import net.jcip.annotations.ThreadSafe; -import org.horizon.CacheSPI; +import org.horizon.Cache; import org.horizon.config.CacheLoaderConfig.IndividualCacheLoaderConfig; import org.horizon.factories.scopes.Scope; import org.horizon.factories.scopes.Scopes; @@ -75,13 +75,13 @@ IndividualCacheLoaderConfig getConfig(); /** - * Sets the {@link CacheSPI} that is maintaining this CacheLoader. This method allows this CacheLoader to set a - * reference to the {@link CacheSPI}. This method is called be called after the CacheLoader instance has been + * Sets the {@link Cache} that is maintaining this CacheLoader. This method allows this CacheLoader to set a + * reference to the {@link Cache}. This method is called be called after the CacheLoader instance has been * constructed. * * @param c The cache on which this loader works */ - void setCache(CacheSPI<K, V> c); + void setCache(Cache<K, V> c); /** * Returns all keys and values from the persistent store, given a {@link Fqn} Modified: core/branches/flat/src/main/java/org/horizon/loader/CacheLoaderManager.java =================================================================== --- core/branches/flat/src/main/java/org/horizon/loader/CacheLoaderManager.java 2009-02-09 18:29:53 UTC (rev 7668) +++ core/branches/flat/src/main/java/org/horizon/loader/CacheLoaderManager.java 2009-02-09 18:30:59 UTC (rev 7669) @@ -21,8 +21,8 @@ */ package org.horizon.loader; +import org.horizon.Cache; import org.horizon.CacheException; -import org.horizon.CacheSPI; import org.horizon.config.CacheLoaderConfig; import org.horizon.config.CacheLoaderConfig.IndividualCacheLoaderConfig; import org.horizon.config.CacheLoaderConfig.IndividualCacheLoaderConfig.SingletonStoreConfig; @@ -57,14 +57,14 @@ public class CacheLoaderManager { private static final Log log = LogFactory.getLog(CacheLoaderManager.class); private CacheLoaderConfig config; - private CacheSPI<Object, Object> cache; + private Cache<Object, Object> cache; private CacheLoader<Object, Object> loader; private boolean fetchPersistentState; private Configuration configuration; private ComponentRegistry registry; @Inject - public void injectDependencies(CacheSPI<Object, Object> cache, Configuration configuration, ComponentRegistry registry) { + public void injectDependencies(Cache<Object, Object> cache, Configuration configuration, ComponentRegistry registry) { // TODO: Inject CacheSPI once we have the cache loaders not relying on a tree structure this.config = configuration.getCacheLoaderConfig(); this.cache = cache; @@ -88,7 +88,7 @@ * @param cache * @throws CacheException */ - public void setConfig(CacheLoaderConfig config, CacheSPI<Object, Object> cache, Configuration configuration) throws CacheException { + public void setConfig(CacheLoaderConfig config, Cache<Object, Object> cache, Configuration configuration) throws CacheException { this.config = config == null ? configuration.getCacheLoaderConfig() : config; this.cache = cache; this.configuration = configuration; @@ -177,7 +177,7 @@ * @return a cache loader * @throws Exception */ - private CacheLoader<Object, Object> createCacheLoader(CacheLoaderConfig.IndividualCacheLoaderConfig cfg, CacheSPI<Object, Object> cache) throws Exception { + private CacheLoader<Object, Object> createCacheLoader(CacheLoaderConfig.IndividualCacheLoaderConfig cfg, Cache<Object, Object> cache) throws Exception { // create loader CacheLoader<Object, Object> tmpLoader = cfg.getCacheLoader() == null ? createInstance(cfg.getClassName()) : cfg.getCacheLoader(); @@ -233,7 +233,7 @@ * @param c instance of cache to be set in cache loader * @param loader cache loader to which assign the cache instance */ - protected void setCacheInLoader(CacheSPI<Object, Object> c, CacheLoader<Object, Object> loader) { + protected void setCacheInLoader(Cache<Object, Object> c, CacheLoader<Object, Object> loader) { loader.setCache(c); } Modified: core/branches/flat/src/main/java/org/horizon/loader/ClusteredCacheLoader.java =================================================================== --- core/branches/flat/src/main/java/org/horizon/loader/ClusteredCacheLoader.java 2009-02-09 18:29:53 UTC (rev 7668) +++ core/branches/flat/src/main/java/org/horizon/loader/ClusteredCacheLoader.java 2009-02-09 18:30:59 UTC (rev 7669) @@ -115,8 +115,12 @@ return null; // TODO: Manik: Customise this generated block } + private boolean isOriginLocal() { + return cache.getAdvancedCache().getInvocationContextContainer().get().isOriginLocal(); + } + public Set getChildrenNames(Fqn fqn) throws Exception { - if (!isCacheReady() || !cache.getInvocationContext().isOriginLocal()) return Collections.emptySet(); + if (!isCacheReady() || !isOriginLocal()) return Collections.emptySet(); lock.acquireLock(fqn, true); // try // { @@ -188,7 +192,7 @@ protected Map get0(Fqn name) throws Exception { // DON'T make a remote call if this is a remote call in the first place - leads to deadlocks - JBCACHE-1103 - if (!isCacheReady() || !cache.getInvocationContext().isOriginLocal()) return Collections.emptyMap(); + if (!isCacheReady() || !isOriginLocal()) return Collections.emptyMap(); lock.acquireLock(name, true); // try // { @@ -205,7 +209,7 @@ public boolean exists(Fqn name) throws Exception { // DON'T make a remote call if this is a remote call in the first place - leads to deadlocks - JBCACHE-1103 - if (!isCacheReady() || !cache.getInvocationContext().isOriginLocal()) return false; + if (!isCacheReady() || !isOriginLocal()) return false; lock.acquireLock(name, false); // try @@ -223,7 +227,7 @@ public Object put(Fqn name, Object key, Object value) throws Exception { // DON'T make a remote call if this is a remote call in the first place - leads to deadlocks - JBCACHE-1103 - if (!isCacheReady() || !cache.getInvocationContext().isOriginLocal()) return null; + if (!isCacheReady() || !isOriginLocal()) return null; lock.acquireLock(name, true); try { // NodeSPI n = cache.peek(name, false); @@ -263,7 +267,7 @@ */ public Object remove(Fqn name, Object key) throws Exception { // DON'T make a remote call if this is a remote call in the first place - leads to deadlocks - JBCACHE-1103 - if (!isCacheReady() || !cache.getInvocationContext().isOriginLocal()) return false; + if (!isCacheReady() || !isOriginLocal()) return false; lock.acquireLock(name, true); try { // NodeSPI n = cache.peek(name, true); Modified: core/branches/flat/src/main/java/org/horizon/loader/SingletonStoreCacheLoader.java =================================================================== --- core/branches/flat/src/main/java/org/horizon/loader/SingletonStoreCacheLoader.java 2009-02-09 18:29:53 UTC (rev 7668) +++ core/branches/flat/src/main/java/org/horizon/loader/SingletonStoreCacheLoader.java 2009-02-09 18:30:59 UTC (rev 7669) @@ -458,7 +458,7 @@ @CacheStarted public void cacheStarted(Event e) { localAddress = cache.getCacheManager().getAddress(); - active = cache.getRPCManager().isCoordinator(); + active = cache.getCacheManager().isCoordinator(); if (log.isDebugEnabled()) log.debug("cache started: " + this); } Modified: core/branches/flat/src/main/java/org/horizon/lock/StripedLockManager.java =================================================================== --- core/branches/flat/src/main/java/org/horizon/lock/StripedLockManager.java 2009-02-09 18:29:53 UTC (rev 7668) +++ core/branches/flat/src/main/java/org/horizon/lock/StripedLockManager.java 2009-02-09 18:30:59 UTC (rev 7669) @@ -26,6 +26,7 @@ import org.horizon.factories.annotations.Inject; import org.horizon.factories.annotations.Start; import org.horizon.invocation.InvocationContextContainer; +import org.horizon.invocation.Options; import org.horizon.logging.Log; import org.horizon.logging.LogFactory; import org.horizon.util.concurrent.locks.LockContainer; @@ -84,7 +85,7 @@ public boolean lockAndRecord(Object key, InvocationContext ctx) throws InterruptedException { if (trace) log.trace("Attempting to lock " + key); Lock lock = lockContainer.getLock(key); - if (lock.tryLock(ctx.getLockAcquisitionTimeout(configuration.getLockAcquisitionTimeout()), MILLISECONDS)) { + if (lock.tryLock(getLockAcquisitionTimeout(ctx), MILLISECONDS)) { ctx.addKeyLocked(key); return true; } @@ -93,6 +94,11 @@ return false; } + private long getLockAcquisitionTimeout(InvocationContext ctx) { + return ctx.hasOption(Options.ZERO_LOCK_ACQUISITION_TIMEOUT) ? + 0 : configuration.getLockAcquisitionTimeout(); + } + public void unlock(Object key, Object owner) { if (trace) log.trace("Attempting to unlock " + key); Lock lock = lockContainer.getLock(key); Modified: core/branches/flat/src/main/java/org/horizon/notifications/cachelistener/CacheNotifierImpl.java =================================================================== --- core/branches/flat/src/main/java/org/horizon/notifications/cachelistener/CacheNotifierImpl.java 2009-02-09 18:29:53 UTC (rev 7668) +++ core/branches/flat/src/main/java/org/horizon/notifications/cachelistener/CacheNotifierImpl.java 2009-02-09 18:30:59 UTC (rev 7669) @@ -22,9 +22,9 @@ package org.horizon.notifications.cachelistener; import org.horizon.Cache; -import org.horizon.CacheSPI; import org.horizon.context.InvocationContext; import org.horizon.factories.annotations.Inject; +import org.horizon.invocation.InvocationContextContainer; import org.horizon.logging.Log; import org.horizon.logging.LogFactory; import org.horizon.notifications.AbstractListenerImpl; @@ -77,6 +77,7 @@ final List<ListenerInvocation> transactionRegisteredListeners = new CopyOnWriteArrayList<ListenerInvocation>(); final List<ListenerInvocation> transactionCompletedListeners = new CopyOnWriteArrayList<ListenerInvocation>(); + private InvocationContextContainer icc; private Cache cache; public CacheNotifierImpl() { @@ -95,7 +96,8 @@ } @Inject - void injectDependencies(CacheSPI cache) { + void injectDependencies(InvocationContextContainer icc, Cache cache) { + this.icc = icc; this.cache = cache; } @@ -288,10 +290,7 @@ } private void restoreInvocationContext(InvocationContext backup) { - InvocationContext currentIC = cache.getInvocationContext(); - backup.clearLookedUpEntries(); - backup.putLookedUpEntries(currentIC.getLookedUpEntries()); - cache.setInvocationContext(backup); + icc.set(backup); } /** @@ -303,10 +302,11 @@ */ private InvocationContext resetInvocationContext(InvocationContext ctx) { // wipe current context. - cache.setInvocationContext(null); + icc.reset(); // get a new Invocation Context - InvocationContext newContext = cache.getInvocationContext(); + InvocationContext newContext = icc.get(); newContext.putLookedUpEntries(ctx.getLookedUpEntries()); + newContext.addAllKeysLocked(ctx.getKeysLocked()); return ctx; } } Modified: core/branches/flat/src/main/java/org/horizon/statetransfer/DefaultStateTransferManager.java =================================================================== --- core/branches/flat/src/main/java/org/horizon/statetransfer/DefaultStateTransferManager.java 2009-02-09 18:29:53 UTC (rev 7668) +++ core/branches/flat/src/main/java/org/horizon/statetransfer/DefaultStateTransferManager.java 2009-02-09 18:30:59 UTC (rev 7669) @@ -21,7 +21,6 @@ */ package org.horizon.statetransfer; -import org.horizon.CacheSPI; import org.horizon.config.Configuration; import org.horizon.factories.annotations.Inject; import org.horizon.factories.annotations.Start; @@ -48,7 +47,7 @@ public static final String PARTIAL_STATE_DELIMITER = "_PARTIAL_STATE_DELIMITER"; - protected CacheSPI cache; + // protected CacheSPI cache; protected Marshaller marshaller; // protected RegionManager regionManager; protected Configuration configuration; @@ -62,7 +61,7 @@ @Inject public void injectDependencies() { - this.cache = cache; +// this.cache = cache; // this.regionManager = regionManager; this.marshaller = marshaller; this.configuration = configuration; Modified: core/branches/flat/src/main/java/org/horizon/tree/Node.java =================================================================== --- core/branches/flat/src/main/java/org/horizon/tree/Node.java 2009-02-09 18:29:53 UTC (rev 7668) +++ core/branches/flat/src/main/java/org/horizon/tree/Node.java 2009-02-09 18:30:59 UTC (rev 7669) @@ -22,6 +22,7 @@ package org.horizon.tree; import net.jcip.annotations.ThreadSafe; +import org.horizon.invocation.Options; import java.util.Map; import java.util.Set; @@ -53,6 +54,8 @@ */ Node<K, V> getParent(); + Node<K, V> getParent(Options... options); + /** * Returns an immutable set of children nodes. * @@ -60,6 +63,8 @@ */ Set<Node<K, V>> getChildren(); + Set<Node<K, V>> getChildren(Options... options); + /** * Returns an immutable set of children node names. * @@ -67,6 +72,8 @@ */ Set<Object> getChildrenNames(); + Set<Object> getChildrenNames(Options... options); + /** * Returns a map containing the data in this {@link Node}. * @@ -75,6 +82,8 @@ */ Map<K, V> getData(); + Map<K, V> getData(Options... options); + /** * Returns a {@link Set} containing the data in this {@link Node}. * @@ -83,6 +92,8 @@ */ Set<K> getKeys(); + Set<K> getKeys(Options... options); + /** * Returns the {@link Fqn} which represents the location of this {@link Node} in the cache structure. The {@link * Fqn} returned is absolute. @@ -105,16 +116,20 @@ */ Node<K, V> addChild(Fqn f); + Node<K, V> addChild(Fqn f, Options... options); + /** * Removes a child node specified by the given relative {@link Fqn}. * - * If you wish to remove children based on absolute {@link Fqn}s, use the {@link Cache} interface instead. + * If you wish to remove children based on absolute {@link Fqn}s, use the {@link TreeCache} interface instead. * * @param f {@link Fqn} of the child node, relative to the current node. * @return true if the node was found and removed, false otherwise */ boolean removeChild(Fqn f); + boolean removeChild(Fqn f, Options... options); + /** * Removes a child node specified by the given name. * @@ -123,6 +138,7 @@ */ boolean removeChild(Object childName); + boolean removeChild(Object childName, Options... options); /** * Returns the child node @@ -132,12 +148,17 @@ */ Node<K, V> getChild(Fqn f); + Node<K, V> getChild(Fqn f, Options... options); + /** * @param name name of the child * @return a direct child of the current node. */ Node<K, V> getChild(Object name); + Node<K, V> getChild(Object name, Options... options); + + /** * Associates the specified value with the specified key for this node. If this node previously contained a mapping * for this key, the old value is replaced by the specified value. @@ -148,6 +169,8 @@ */ V put(K key, V value); + V put(K key, V value, Options... options); + /** * If the specified key is not already associated with a value, associate it with the given value, and returns the * Object (if any) that occupied the space, or null. @@ -168,6 +191,8 @@ */ V putIfAbsent(K key, V value); + V putIfAbsent(K key, V value, Options... options); + /** * Replace entry for key only if currently mapped to some value. Acts as * <pre> @@ -187,6 +212,8 @@ */ V replace(K key, V value); + V replace(K key, V value, Options... options); + /** * Replace entry for key only if currently mapped to given value. Acts as * <pre> @@ -208,7 +235,9 @@ */ boolean replace(K key, V oldValue, V newValue); + boolean replace(K key, V oldValue, V value, Options... options); + /** * Copies all of the mappings from the specified map to this node's map. If any data exists, existing keys are * overwritten with the keys in the new map. The behavior is equivalent to: @@ -222,6 +251,8 @@ */ void putAll(Map<? extends K, ? extends V> map); + void putAll(Map<? extends K, ? extends V> map, Options... options); + /** * Similar to {@link #putAll(java.util.Map)} except that it removes any entries that exists in the data map first. * Note that this happens atomically, under a single lock. This is the analogous to doing a {@link #clearData()} @@ -231,6 +262,7 @@ */ void replaceAll(Map<? extends K, ? extends V> map); + void replaceAll(Map<? extends K, ? extends V> map, Options... options); /** * Returns the value to which this node maps the specified key. Returns <code>null</code> if the node contains no @@ -242,6 +274,8 @@ */ V get(K key); + V get(K key, Options... options); + /** * Removes the mapping for this key from this node if it is present. Returns the value to which the node previously * associated the key, or <code>null</code> if the node contained no mapping for this key @@ -251,16 +285,22 @@ */ V remove(K key); + V remove(K key, Options... options); + /** * Removes all mappings from the node's data map. */ void clearData(); + void clearData(Options... options); + /** * @return the number of elements (key/value pairs) in the node's data map. */ int dataSize(); + int dataSize(Options... options); + /** * Returns true if the child node denoted by the relative {@link Fqn} passed in exists. * @@ -269,6 +309,8 @@ */ boolean hasChild(Fqn f); + boolean hasChild(Fqn f, Options... options); + /** * Returns true if the child node denoted by the Object name passed in exists. * @@ -277,6 +319,8 @@ */ boolean hasChild(Object o); + boolean hasChild(Object o, Options... options); + /** * Tests if a node reference is still valid. A node reference may become invalid if it has been removed, invalidated * or moved, either locally or remotely. If a node is invalid, it should be fetched again from the cache or a valid @@ -286,7 +330,7 @@ */ boolean isValid(); - void evict(); + void removeChildren(); - void removeChildren(); + void removeChildren(Options... options); } Modified: core/branches/flat/src/main/java/org/horizon/tree/NodeImpl.java =================================================================== --- core/branches/flat/src/main/java/org/horizon/tree/NodeImpl.java 2009-02-09 18:29:53 UTC (rev 7668) +++ core/branches/flat/src/main/java/org/horizon/tree/NodeImpl.java 2009-02-09 18:30:59 UTC (rev 7669) @@ -23,6 +23,9 @@ import org.horizon.Cache; import org.horizon.atomic.AtomicMap; +import org.horizon.batch.BatchContainer; +import org.horizon.invocation.InvocationContextContainer; +import org.horizon.invocation.Options; import org.horizon.util.Immutables; import org.horizon.util.Util; @@ -42,8 +45,8 @@ Fqn fqn; NodeKey dataKey, structureKey; - public NodeImpl(Fqn fqn, Cache cache) { - super(cache); + public NodeImpl(Fqn fqn, Cache cache, BatchContainer batchContainer, InvocationContextContainer icc) { + super(cache, batchContainer, icc); this.fqn = fqn; dataKey = new NodeKey(fqn, NodeKey.Type.DATA); structureKey = new NodeKey(fqn, NodeKey.Type.STRUCTURE); @@ -51,15 +54,20 @@ public Node<K, V> getParent() { if (fqn.isRoot()) return this; - return new NodeImpl(fqn.getParent(), cache); + return new NodeImpl<K, V>(fqn.getParent(), cache, batchContainer, icc); } + public Node<K, V> getParent(Options... options) { + icc.get().setOptions(options); + return getParent(); + } + public Set<Node<K, V>> getChildren() { startAtomic(); try { - Set set = new HashSet(); + Set<Node<K, V>> set = new HashSet<Node<K, V>>(); for (Fqn f : getStructure().values()) { - NodeImpl n = new NodeImpl(f, cache); + NodeImpl<K, V> n = new NodeImpl<K, V>(f, cache, batchContainer, icc); set.add(n); } return Immutables.immutableSetWrap(set); @@ -69,16 +77,30 @@ } } + public Set<Node<K, V>> getChildren(Options... options) { + icc.get().setOptions(options); + return getChildren(); + } + public Set<Object> getChildrenNames() { return Immutables.immutableSetCopy(getStructure().keySet()); } + public Set<Object> getChildrenNames(Options... options) { + icc.get().setOptions(options); + return getChildrenNames(); + } + @SuppressWarnings("unchecked") public Map<K, V> getData() { return Collections.unmodifiableMap(new HashMap(getDataInternal())); -// return Immutables.immutableMapCopy(getDataInternal()); } + public Map<K, V> getData(Options... options) { + icc.get().setOptions(options); + return getData(); + } + public Set<K> getKeys() { startAtomic(); try { @@ -89,6 +111,11 @@ } } + public Set<K> getKeys(Options... options) { + icc.get().setOptions(options); + return getKeys(); + } + public Fqn getFqn() { return fqn; } @@ -97,10 +124,9 @@ startAtomic(); try { Fqn absoluteChildFqn = Fqn.fromRelativeFqn(fqn, f); - NodeImpl child = new NodeImpl(absoluteChildFqn, cache); + NodeImpl<K, V> child = new NodeImpl<K, V>(absoluteChildFqn, cache, batchContainer, icc); AtomicMap<Object, Fqn> s = getStructure(); s.put(f.getLastElement(), absoluteChildFqn); -// updateStructure(s); createNodeInCache(absoluteChildFqn); return child; } @@ -109,17 +135,27 @@ } } + public Node<K, V> addChild(Fqn f, Options... options) { + icc.get().setOptions(options); + return addChild(f); + } + public boolean removeChild(Fqn f) { return removeChild(f.getLastElement()); } + public boolean removeChild(Fqn f, Options... options) { + icc.get().setOptions(options); + return removeChild(f); + } + public boolean removeChild(Object childName) { startAtomic(); try { AtomicMap<Object, Fqn> s = getStructure(); Fqn childFqn = s.remove(childName); if (childFqn != null) { - Node child = new NodeImpl(childFqn, cache); + Node<K, V> child = new NodeImpl<K, V>(childFqn, cache, batchContainer, icc); child.removeChildren(); child.clearData(); // this is necessary in case we have a remove and then an add on the same node, in the same tx. cache.remove(new NodeKey(childFqn, NodeKey.Type.DATA)); @@ -134,11 +170,16 @@ } } + public boolean removeChild(Object childName, Options... options) { + icc.get().setOptions(options); + return removeChild(childName); + } + public Node<K, V> getChild(Fqn f) { startAtomic(); try { if (hasChild(f)) - return new NodeImpl(Fqn.fromRelativeFqn(fqn, f), cache); + return new NodeImpl<K, V>(Fqn.fromRelativeFqn(fqn, f), cache, batchContainer, icc); else return null; } @@ -147,11 +188,16 @@ } } + public Node<K, V> getChild(Fqn f, Options... options) { + icc.get().setOptions(options); + return getChild(f); + } + public Node<K, V> getChild(Object name) { startAtomic(); try { if (hasChild(name)) - return new NodeImpl(Fqn.fromRelativeElements(fqn, name), cache); + return new NodeImpl<K, V>(Fqn.fromRelativeElements(fqn, name), cache, batchContainer, icc); else return null; } @@ -160,6 +206,11 @@ } } + public Node<K, V> getChild(Object name, Options... options) { + icc.get().setOptions(options); + return getChild(name); + } + public V put(K key, V value) { startAtomic(); try { @@ -170,6 +221,11 @@ } } + public V put(K key, V value, Options... options) { + icc.get().setOptions(options); + return put(key, value); + } + public V putIfAbsent(K key, V value) { startAtomic(); try { @@ -183,6 +239,11 @@ } } + public V putIfAbsent(K key, V value, Options... options) { + icc.get().setOptions(options); + return putIfAbsent(key, value); + } + public V replace(K key, V value) { startAtomic(); try { @@ -197,6 +258,11 @@ } } + public V replace(K key, V value, Options... options) { + icc.get().setOptions(options); + return replace(key, value); + } + public boolean replace(K key, V oldValue, V newValue) { startAtomic(); try { @@ -213,6 +279,11 @@ } } + public boolean replace(K key, V oldValue, V value, Options... options) { + icc.get().setOptions(options); + return replace(key, oldValue, value); + } + public void putAll(Map<? extends K, ? extends V> map) { startAtomic(); try { @@ -223,6 +294,11 @@ } } + public void putAll(Map<? extends K, ? extends V> map, Options... options) { + icc.get().setOptions(options); + putAll(map); + } + public void replaceAll(Map<? extends K, ? extends V> map) { startAtomic(); try { @@ -235,10 +311,20 @@ } } + public void replaceAll(Map<? extends K, ? extends V> map, Options... options) { + icc.get().setOptions(options); + replaceAll(map); + } + public V get(K key) { return getData().get(key); } + public V get(K key, Options... options) { + icc.get().setOptions(options); + return get(key); + } + public V remove(K key) { startAtomic(); try { @@ -249,14 +335,29 @@ } } + public V remove(K key, Options... options) { + icc.get().setOptions(options); + return remove(key); + } + public void clearData() { getDataInternal().clear(); } + public void clearData(Options... options) { + icc.get().setOptions(options); + clearData(); + } + public int dataSize() { return getData().size(); } + public int dataSize(Options... options) { + icc.get().setOptions(options); + return dataSize(); + } + public boolean hasChild(Fqn f) { if (f.size() > 1) { // indirect child. @@ -267,10 +368,20 @@ } } + public boolean hasChild(Fqn f, Options... options) { + icc.get().setOptions(options); + return hasChild(f); + } + public boolean hasChild(Object o) { return getStructure().containsKey(o); } + public boolean hasChild(Object o, Options... options) { + icc.get().setOptions(options); + return hasChild(o); + } + public boolean isValid() { return cache.containsKey(dataKey); } @@ -286,26 +397,15 @@ } } - public void evict() { - startAtomic(); - try { - cache.evict(structureKey); - cache.evict(dataKey); - } - finally { - endAtomic(); - } + public void removeChildren(Options... options) { + icc.get().setOptions(options); + removeChildren(); } AtomicMap<K, V> getDataInternal() { return (AtomicMap<K, V>) cache.getAtomicMap(dataKey); } -// void updateStructure(FastCopyHashMap<Object, Fqn> s) -// { -// cache.put(structureKey, s.clone()); -// } - AtomicMap<Object, Fqn> getStructure() { return cache.getAtomicMap(structureKey, Object.class, Fqn.class); } Modified: core/branches/flat/src/main/java/org/horizon/tree/TreeCache.java =================================================================== --- core/branches/flat/src/main/java/org/horizon/tree/TreeCache.java 2009-02-09 18:29:53 UTC (rev 7668) +++ core/branches/flat/src/main/java/org/horizon/tree/TreeCache.java 2009-02-09 18:30:59 UTC (rev 7669) @@ -23,6 +23,7 @@ import org.horizon.Cache; import org.horizon.CacheException; +import org.horizon.invocation.Options; import org.horizon.lifecycle.Lifecycle; import java.util.Map; @@ -56,6 +57,8 @@ */ Node<K, V> getRoot(); + Node<K, V> getRoot(Options... options); + /** * Associates the specified value with the specified key for a {@link Node} in this cache. If the {@link Node} * previously contained a mapping for this key, the old value is replaced by the specified value. @@ -70,6 +73,8 @@ */ V put(Fqn fqn, K key, V value); + V put(Fqn fqn, K key, V value, Options... options); + /** * Convenience method that takes a string representation of an Fqn. Otherwise identical to {@link #put(Fqn, Object, * Object)} @@ -85,31 +90,7 @@ V put(String fqn, K key, V value); - /** - * Under special operating behavior, associates the value with the specified key for a node identified by the Fqn - * passed in. <ul> <li> Only goes through if the node specified does not exist; no-op otherwise. <li> Force - * asynchronous mode for replication to prevent any blocking.</li> <li> invalidation does not take place. </li> <li> - * 0ms lock timeout to prevent any blocking here either. If the lock is not acquired, this method is a no-op, and - * swallows the timeout exception.</li> <li> Ongoing transactions are suspended before this call, so failures here - * will not affect any ongoing transactions.</li> <li> Errors and exceptions are 'silent' - logged at a much lower - * level than normal, and this method does not throw exceptions</li> </ul> This method is for caching data that has - * an external representation in storage, where, concurrent modification and transactions are not a consideration, - * and failure to put the data in the cache should be treated as a 'suboptimal outcome' rather than a 'failing - * outcome'. - * - * An example of when this method is useful is when data is read from, for example, a legacy datastore, and is cached - * before returning the data to the caller. Subsequent calls would prefer to get the data from the cache and if the - * data doesn't exist in the cache, fetch again from the legacy datastore. - * - * See <a href="http://jira.jboss.com/jira/browse/JBCACHE-848">JBCACHE-848</a> for details around this feature. - * - * - * @param fqn absolute {@link Fqn} to the {@link Node} to be accessed. - * @param key key with which the specified value is to be associated. - * @param value value to be associated with the specified key. - * @throws IllegalStateException if {@link #getCacheStatus()} would not return {@link org.horizon.ComponentStatus#STARTED}. - */ - void putForExternalRead(Fqn fqn, K key, V value); + V put(String fqn, K key, V value, Options... options); /** * Copies all of the mappings from the specified map to a {@link Node}. @@ -120,6 +101,8 @@ */ void put(Fqn fqn, Map<? extends K, ? extends V> data); + void put(Fqn fqn, Map<? extends K, ? extends V> data, Options... options); + /** * Convenience method that takes a string representation of an Fqn. Otherwise identical to {@link #put(Fqn, * java.util.Map)} @@ -130,6 +113,8 @@ */ void put(String fqn, Map<? extends K, ? extends V> data); + void put(String fqn, Map<? extends K, ? extends V> data, Options... options); + /** * Removes the mapping for this key from a Node. Returns the value to which the Node previously associated the key, * or <code>null</code> if the Node contained no mapping for this key. @@ -141,6 +126,8 @@ */ V remove(Fqn fqn, K key); + V remove(Fqn fqn, K key, Options... options); + /** * Convenience method that takes a string representation of an Fqn. Otherwise identical to {@link #remove(Fqn, * Object)} @@ -152,6 +139,8 @@ */ V remove(String fqn, K key); + V remove(String fqn, K key, Options... options); + /** * Removes a {@link Node} indicated by absolute {@link Fqn}. * @@ -161,6 +150,8 @@ */ boolean removeNode(Fqn fqn); + boolean removeNode(Fqn fqn, Options... options); + /** * Convenience method that takes a string representation of an Fqn. Otherwise identical to {@link #removeNode(Fqn)} * @@ -170,6 +161,8 @@ */ boolean removeNode(String fqn); + boolean removeNode(String fqn, Options... options); + /** * A convenience method to retrieve a node directly from the cache. Equivalent to calling * cache.getRoot().getChild(fqn). @@ -180,6 +173,8 @@ */ Node<K, V> getNode(Fqn fqn); + Node<K, V> getNode(Fqn fqn, Options... options); + /** * Convenience method that takes a string representation of an Fqn. Otherwise identical to {@link #getNode(Fqn)} * @@ -189,7 +184,9 @@ */ Node<K, V> getNode(String fqn); + Node<K, V> getNode(String fqn, Options... options); + /** * Convenience method that allows for direct access to the data in a {@link Node}. * @@ -200,6 +197,8 @@ */ V get(Fqn fqn, K key); + V get(Fqn fqn, K key, Options... options); + /** * Convenience method that takes a string representation of an Fqn. Otherwise identical to {@link #get(Fqn, * Object)} @@ -211,24 +210,9 @@ */ V get(String fqn, K key); - /** - * Eviction call that evicts the specified {@link Node} from memory. - * - * @param fqn absolute {@link Fqn} to the {@link Node} to be evicted. - * @param recursive evicts children as well - * @throws IllegalStateException if the cache is not in a started state - */ - void evict(Fqn fqn, boolean recursive); + V get(String fqn, K key, Options... options); /** - * Eviction call that evicts the specified {@link Node} from memory. Not recursive. - * - * @param fqn absolute {@link Fqn} to the {@link Node} to be evicted. - * @throws IllegalStateException if the cache is not in a started state - */ - void evict(Fqn fqn); - - /** * Moves a part of the cache to a different subtree. * * E.g.: @@ -280,17 +264,23 @@ * @param newParent new location under which to attach the node being moved. * @throws NodeNotExistsException may throw one of these if the target node does not exist or if a different thread * has moved this node elsewhere already. - * @throws IllegalStateException if {@link #getCacheStatus()} would not return {@link org.horizon.ComponentStatus#STARTED}. + * @throws IllegalStateException if {@link Cache#getCacheStatus()} would not return {@link + * org.horizon.ComponentStatus#STARTED}. */ void move(Fqn nodeToMove, Fqn newParent) throws NodeNotExistsException; + void move(Fqn nodeToMove, Fqn newParent, Options... options) throws NodeNotExistsException; + /** * Convenience method that takes in string representations of Fqns. Otherwise identical to {@link #move(Fqn, Fqn)} * - * @throws IllegalStateException if {@link #getCacheStatus()} would not return {@link org.horizon.ComponentStatus#STARTED}. + * @throws IllegalStateException if {@link Cache#getCacheStatus()} would not return {@link + * org.horizon.ComponentStatus#STARTED}. */ void move(String nodeToMove, String newParent) throws NodeNotExistsException; + void move(String nodeToMove, String newParent, Options... options) throws NodeNotExistsException; + /** * Retrieves a defensively copied data map of the underlying node. A convenience method to retrieving a node and * getting data from the node directly. @@ -298,16 +288,21 @@ * @param fqn * @return map of data, or an empty map * @throws CacheException - * @throws IllegalStateException if {@link #getCacheStatus()} would not return {@link org.horizon.ComponentStatus#STARTED}. + * @throws IllegalStateException if {@link Cache#getCacheStatus()} would not return {@link + * org.horizon.ComponentStatus#STARTED}. */ Map<K, V> getData(Fqn fqn); + Map<K, V> getData(Fqn fqn, Options... options); + /** * Convenience method that takes in a String represenation of the Fqn. Otherwise identical to {@link * #getKeys(Fqn)}. */ Set<K> getKeys(String fqn); + Set<K> getKeys(String fqn, Options... options); + /** * Returns a set of attribute keys for the Fqn. Returns null if the node is not found, otherwise a Set. The set is a * copy of the actual keys for this node. @@ -315,28 +310,37 @@ * A convenience method to retrieving a node and getting keys from the node directly. * * @param fqn name of the node - * @throws IllegalStateException if {@link #getCacheStatus()} would not return {@link org.horizon.ComponentStatus#STARTED}. + * @throws IllegalStateException if {@link Cache#getCacheStatus()} would not return {@link + * org.horizon.ComponentStatus#STARTED}. */ Set<K> getKeys(Fqn fqn); + Set<K> getKeys(Fqn fqn, Options... options); + /** * Convenience method that takes in a String represenation of the Fqn. Otherwise identical to {@link * #clearData(Fqn)}. * - * @throws IllegalStateException if {@link #getCacheStatus()} would not return {@link org.horizon.ComponentStatus#STARTED}. + * @throws IllegalStateException if {@link Cache#getCacheStatus()} would not return {@link + * org.horizon.ComponentStatus#STARTED}. */ void clearData(String fqn); + void clearData(String fqn, Options... options); + /** * Removes the keys and properties from a named node. * * A convenience method to retrieving a node and getting keys from the node directly. * * @param fqn name of the node - * @throws IllegalStateException if {@link #getCacheStatus()} would not return {@link org.horizon.ComponentStatus#STARTED}. + * @throws IllegalStateException if {@link Cache#getCacheStatus()} would not return {@link + * org.horizon.ComponentStatus#STARTED}. */ void clearData(Fqn fqn); + void clearData(Fqn fqn, Options... options); + /** * @return a reference to the underlying cache instance */ @@ -350,6 +354,8 @@ */ boolean exists(String fqn); + boolean exists(String fqn, Options... options); + /** * Tests if an Fqn exists. * @@ -357,4 +363,6 @@ * @return true if the fqn exists, false otherwise */ boolean exists(Fqn fqn); + + boolean exists(Fqn fqn, Options... options); } Modified: core/branches/flat/src/main/java/org/horizon/tree/TreeCacheImpl.java =================================================================== --- core/branches/flat/src/main/java/org/horizon/tree/TreeCacheImpl.java 2009-02-09 18:29:53 UTC (rev 7668) +++ core/branches/flat/src/main/java/org/horizon/tree/TreeCacheImpl.java 2009-02-09 18:30:59 UTC (rev 7669) @@ -21,9 +21,11 @@ */ package org.horizon.tree; +import org.horizon.AdvancedCache; import org.horizon.Cache; import org.horizon.CacheException; import org.horizon.atomic.AtomicMap; +import org.horizon.invocation.Options; import org.horizon.logging.Log; import org.horizon.logging.LogFactory; @@ -39,21 +41,28 @@ private static final boolean trace = log.isTraceEnabled(); public TreeCacheImpl(Cache<K, V> cache) { - super(cache); + super(cache, ((AdvancedCache) cache).getBatchContainer(), + ((AdvancedCache) cache).getInvocationContextContainer()); assertBatchingSupported(cache.getConfiguration()); createRoot(); } public Node<K, V> getRoot() { - return new NodeImpl(Fqn.ROOT, cache); + return new NodeImpl<K, V>(Fqn.ROOT, cache, batchContainer, icc); } + public Node<K, V> getRoot(Options... options) { + icc.get().setOptions(options); + return getRoot(); + } + public V put(String fqn, K key, V value) { return put(Fqn.fromString(fqn), key, value); } - public void putForExternalRead(Fqn fqn, K key, V value) { - put(fqn, key, value); // TODO implement this properly + public V put(String fqn, K key, V value, Options... options) { + icc.get().setOptions(options); + return put(fqn, key, value); } public void put(Fqn fqn, Map<? extends K, ? extends V> data) { @@ -66,10 +75,20 @@ } } + public void put(Fqn fqn, Map<? extends K, ? extends V> data, Options... options) { + icc.get().setOptions(options); + put(fqn, data); + } + public void put(String fqn, Map<? extends K, ? extends V> data) { put(Fqn.fromString(fqn), data); } + public void put(String fqn, Map<? extends K, ? extends V> data, Options... options) { + icc.get().setOptions(options); + put(fqn, data); + } + @SuppressWarnings("unchecked") public V remove(Fqn fqn, K key) { startAtomic(); @@ -82,10 +101,20 @@ } } + public V remove(Fqn fqn, K key, Options... options) { + icc.get().setOptions(options); + return remove(fqn, key); + } + public V remove(String fqn, K key) { return remove(Fqn.fromString(fqn), key); } + public V remove(String fqn, K key, Options... options) { + icc.get().setOptions(options); + return remove(fqn, key); + } + public boolean removeNode(Fqn fqn) { if (fqn.isRoot()) return false; startAtomic(); @@ -98,15 +127,25 @@ } } + public boolean removeNode(Fqn fqn, Options... options) { + icc.get().setOptions(options); + return removeNode(fqn); + } + public boolean removeNode(String fqn) { return removeNode(Fqn.fromString(fqn)); } + public boolean removeNode(String fqn, Options... options) { + icc.get().setOptions(options); + return removeNode(fqn); + } + public Node<K, V> getNode(Fqn fqn) { startAtomic(); try { if (exists(fqn)) - return new NodeImpl(fqn, cache); + return new NodeImpl<K, V>(fqn, cache, batchContainer, icc); else return null; } finally { @@ -114,10 +153,20 @@ } } + public Node<K, V> getNode(Fqn fqn, Options... options) { + icc.get().setOptions(options); + return getNode(fqn); + } + public Node<K, V> getNode(String fqn) { return getNode(Fqn.fromString(fqn)); } + public Node<K, V> getNode(String fqn, Options... options) { + icc.get().setOptions(options); + return getNode(fqn); + } + @SuppressWarnings("unchecked") public V get(Fqn fqn, K key) { Map m = cache.getAtomicMap(new NodeKey(fqn, NodeKey.Type.DATA)); @@ -125,68 +174,34 @@ return (V) m.get(key); } + public V get(Fqn fqn, K key, Options... options) { + icc.get().setOptions(options); + return get(fqn, key); + } + public boolean exists(String f) { return exists(Fqn.fromString(f)); } - public V get(String fqn, K key) { - return get(Fqn.fromString(fqn), key); + public boolean exists(String fqn, Options... options) { + icc.get().setOptions(options); + return exists(fqn); } - public void evict(Fqn fqn, boolean recursive) { - boolean removeFromParent; - if (recursive) { - childFirstEvict(fqn); - removeFromParent = true; - } else { - removeFromParent = evictNode((NodeImpl) getNode(fqn), false); - } - - if (!fqn.isRoot() && removeFromParent) { - Node parent = getNode(fqn.getParent()); - parent.removeChild(fqn.getLastElement()); - } + public boolean exists(Fqn fqn, Options... options) { + icc.get().setOptions(options); + return exists(fqn); } - private void childFirstEvict(Fqn fqn) { - Node n = getNode(fqn); - if (n != null) { - for (Object childName : n.getChildrenNames()) { - childFirstEvict(Fqn.fromRelativeElements(fqn, childName)); - } - } - evictNode((NodeImpl) n, true); + public V get(String fqn, K key) { + return get(Fqn.fromString(fqn), key); } - /** - * Returns true if the node was completely removed; false if just the data was evicted. - * - * @param node - * @param recursive - * @return - */ - private boolean evictNode(NodeImpl node, boolean recursive) { - boolean retval = false; - if (node != null) { - if (recursive || node.getChildrenNames().isEmpty()) { - cache.evict(node.structureKey); - retval = true; - } - cache.evict(node.dataKey); - } - return retval; + public V get(String fqn, K key, Options... options) { + icc.get().setOptions(options); + return get(fqn, key); } - public void evict(Fqn fqn) { - startAtomic(); - try { - getNode(fqn).evict(); - } - finally { - endAtomic(); - } - } - public void move(Fqn nodeToMove, Fqn newParent) throws NodeNotExistsException { if (nodeToMove == null || newParent == null) throw new NullPointerException("Cannot accept null parameters!"); @@ -224,10 +239,20 @@ } } + public void move(Fqn nodeToMove, Fqn newParent, Options... options) throws NodeNotExistsException { + icc.get().setOptions(options); + move(nodeToMove, newParent); + } + public void move(String nodeToMove, String newParent) throws NodeNotExistsException { move(Fqn.fromString(nodeToMove), Fqn.fromString(newParent)); } + public void move(String nodeToMove, String newParent, Options... options) throws NodeNotExistsException { + icc.get().setOptions(options); + move(nodeToMove, newParent); + } + public Map<K, V> getData(Fqn fqn) { startAtomic(); try { @@ -238,10 +263,20 @@ } } + public Map<K, V> getData(Fqn fqn, Options... options) { + icc.get().setOptions(options); + return getData(fqn); + } + public Set<K> getKeys(String fqn) { return getKeys(Fqn.fromString(fqn)); } + public Set<K> getKeys(String fqn, Options... options) { + icc.get().setOptions(options); + return getKeys(fqn); + } + public Set<K> getKeys(Fqn fqn) { startAtomic(); try { @@ -252,10 +287,19 @@ } } + public Set<K> getKeys(Fqn fqn, Options... options) { + icc.get().setOptions(options); + return getKeys(fqn); + } + public void clearData(String fqn) { clearData(Fqn.fromString(fqn)); } + public void clearData(String fqn, Options... options) { + icc.get().setOptions(options); + } + public void clearData(Fqn fqn) { startAtomic(); try { @@ -266,6 +310,10 @@ } } + public void clearData(Fqn fqn, Options... options) { + icc.get().setOptions(options); + } + @SuppressWarnings("unchecked") public V put(Fqn fqn, K key, V value) { if (trace) log.trace("Start: Putting value under key [" + key + "] for node [" + fqn + "]"); @@ -280,6 +328,11 @@ } } + public V put(Fqn fqn, K key, V value, Options... options) { + icc.get().setOptions(options); + return put(fqn, key, value); + } + // ------------------ nothing different; just delegate to the cache public Cache getCache() { return cache; Modified: core/branches/flat/src/main/java/org/horizon/tree/TreeStructureSupport.java =================================================================== --- core/branches/flat/src/main/java/org/horizon/tree/TreeStructureSupport.java 2009-02-09 18:29:53 UTC (rev 7668) +++ core/branches/flat/src/main/java/org/horizon/tree/TreeStructureSupport.java 2009-02-09 18:30:59 UTC (rev 7669) @@ -22,17 +22,22 @@ package org.horizon.tree; import org.horizon.Cache; -import org.horizon.CacheSPI; import org.horizon.atomic.AtomicMap; import org.horizon.atomic.AtomicMapCache; import org.horizon.batch.AutoBatchSupport; +import org.horizon.batch.BatchContainer; +import org.horizon.invocation.InvocationContextContainer; +import org.horizon.invocation.Options; +import org.horizon.lock.LockManager; public class TreeStructureSupport extends AutoBatchSupport { AtomicMapCache cache; + InvocationContextContainer icc; - public TreeStructureSupport(Cache cache) { + public TreeStructureSupport(Cache cache, BatchContainer batchContainer, InvocationContextContainer icc) { this.cache = (AtomicMapCache) cache; - batchContainer = ((CacheSPI) cache).getBatchContainer(); + this.batchContainer = batchContainer; + this.icc = icc; } public boolean exists(Fqn f) { @@ -60,7 +65,7 @@ if (!exists(parent)) createNodeInCache(parent); AtomicMap<Object, Fqn> parentStructure = getStructure(parent); // don't lock parents for child insert/removes! - cache.getInvocationContext().getOptionOverrides().setSuppressLocking(true); + icc.get().setOptions(Options.SKIP_LOCKING); parentStructure.put(fqn.getLastElement(), fqn); } cache.getAtomicMap(structureKey); @@ -81,8 +86,7 @@ // cache.put(new NodeKey(fqn, NodeKey.Type.STRUCTURE), structure.clone()); // } - public static boolean isLocked(Cache c, Fqn fqn) { - org.horizon.lock.LockManager lockManager = ((CacheSPI) c).getLockManager(); + public static boolean isLocked(Cache c, LockManager lockManager, Fqn fqn) { return lockManager.isLocked(new NodeKey(fqn, NodeKey.Type.STRUCTURE)) && lockManager.isLocked(new NodeKey(fqn, NodeKey.Type.DATA)); } Modified: core/branches/flat/src/main/java/org/horizon/util/TestingUtil.java =================================================================== --- core/branches/flat/src/main/java/org/horizon/util/TestingUtil.java 2009-02-09 18:29:53 UTC (rev 7668) +++ core/branches/flat/src/main/java/org/horizon/util/TestingUtil.java 2009-02-09 18:30:59 UTC (rev 7669) @@ -7,9 +7,9 @@ package org.horizon.util; +import org.horizon.AdvancedCache; import org.horizon.Cache; import org.horizon.CacheDelegate; -import org.horizon.CacheSPI; import org.horizon.ComponentStatus; import org.horizon.commands.CommandsFactory; import org.horizon.commands.VisitableCommand; @@ -82,8 +82,8 @@ } } - public static <T extends CommandInterceptor> T findInterceptor(CacheSPI<?, ?> cache, Class<T> interceptorToFind) { - for (CommandInterceptor i : cache.getInterceptorChain()) { + public static <T extends CommandInterceptor> T findInterceptor(Cache<?, ?> cache, Class<T> interceptorToFind) { + for (CommandInterceptor i : cache.getAdvancedCache().getInterceptorChain()) { if (interceptorToFind.isInstance(i)) return interceptorToFind.cast(i); } return null; @@ -147,20 +147,20 @@ * @throws RuntimeException if <code>timeout</code> ms have elapse without all caches having the same number of * members. */ - public static void blockUntilViewsReceived(CacheSPI[] caches, long timeout) { - long failTime = System.currentTimeMillis() + timeout; +// public static void blockUntilViewsReceived(Cache[] caches, long timeout) { +// long failTime = System.currentTimeMillis() + timeout; +// +// while (System.currentTimeMillis() < failTime) { +// sleepThread(100); +// if (areCacheViewsComplete(caches)) { +// return; +// } +// } +// +// throw new RuntimeException("timed out before caches had complete views"); +// } - while (System.currentTimeMillis() < failTime) { - sleepThread(100); - if (areCacheViewsComplete(caches)) { - return; - } - } - throw new RuntimeException("timed out before caches had complete views"); - } - - /** * An overloaded version of {@link #blockUntilViewsReceived(long,Cache[])} that allows for 'shrinking' clusters. * I.e., the usual method barfs if there are more members than expected. This one takes a param @@ -193,11 +193,11 @@ * @throws RuntimeException if <code>timeout</code> ms have elapse without all caches having the same number of * members. */ - public static void blockUntilViewReceived(CacheSPI cache, int groupSize, long timeout) { + public static void blockUntilViewReceived(Cache cache, int groupSize, long timeout) { blockUntilViewReceived(cache, groupSize, timeout, true); } - public static void blockUntilViewReceived(CacheSPI cache, int groupSize, long timeout, boolean barfIfTooManyMembersInView) { + public static void blockUntilViewReceived(Cache cache, int groupSize, long timeout, boolean barfIfTooManyMembersInView) { long failTime = System.currentTimeMillis() + timeout; while (System.currentTimeMillis() < failTime) { @@ -234,21 +234,6 @@ return true; } - /** - * Checks each cache to see if the number of elements in the array returned by {@link RPCManager#getMembers()} - * matches the size of the <code>caches</code> parameter. - * - * @param caches caches that should form a View - * @return <code>true</code> if all caches have <code>caches.length</code> members; false otherwise - * @throws IllegalStateException if any of the caches have MORE view members than caches.length - */ - public static boolean areCacheViewsComplete(CacheSPI[] caches) { - if (caches == null) throw new NullPointerException("Cache impl array is null"); - Cache[] c = new Cache[caches.length]; - for (int i = 0; i < caches.length; i++) c[i] = caches[i]; - return areCacheViewsComplete(c); - } - public static boolean areCacheViewsComplete(boolean barfIfTooManyMembers, CacheManager... cacheManagers) { if (cacheManagers == null) throw new NullPointerException("Cache Manager array is null"); int memberCount = cacheManagers.length; @@ -262,37 +247,37 @@ return true; } - /** - * @param cache - * @param memberCount - */ - public static boolean isCacheViewComplete(CacheSPI cache, int memberCount) { - List members = cache.getRPCManager().getMembers(); - if (members == null || memberCount > members.size()) { - return false; - } else if (memberCount < members.size()) { - // This is an exceptional condition - StringBuilder sb = new StringBuilder("Cache at address "); - sb.append(cache.getCacheManager().getAddress()); - sb.append(" had "); - sb.append(members.size()); - sb.append(" members; expecting "); - sb.append(memberCount); - sb.append(". Members were ("); - for (int j = 0; j < members.size(); j++) { - if (j > 0) { - sb.append(", "); - } - sb.append(members.get(j)); - } - sb.append(')'); +// /** +// * @param cache +// * @param memberCount +// */ +// public static boolean isCacheViewComplete(Cache cache, int memberCount) { +// List members = cache.getCacheManager().getMembers(); +// if (members == null || memberCount > members.size()) { +// return false; +// } else if (memberCount < members.size()) { +// // This is an exceptional condition +// StringBuilder sb = new StringBuilder("Cache at address "); +// sb.append(cache.getCacheManager().getAddress()); +// sb.append(" had "); +// sb.append(members.size()); +// sb.append(" members; expecting "); +// sb.append(memberCount); +// sb.append(". Members were ("); +// for (int j = 0; j < members.size(); j++) { +// if (j > 0) { +// sb.append(", "); +// } +// sb.append(members.get(j)); +// } +// sb.append(')'); +// +// throw new IllegalStateException(sb.toString()); +// } +// +// return true; +// } - throw new IllegalStateException(sb.toString()); - } - - return true; - } - /** * @param c * @param memberCount @@ -399,16 +384,16 @@ for (Cache c : caches) { try { if (c != null && c.getCacheStatus() == ComponentStatus.STARTED) { - CacheSPI spi = (CacheSPI) c; - if (spi.getTransactionManager() != null) { + TransactionManager tm = getTransactionManager(c); + if (tm != null) { try { - spi.getTransactionManager().rollback(); + tm.rollback(); } catch (Exception e) { // don't care } } - spi.stop(); + c.stop(); } } catch (Throwable t) { @@ -440,10 +425,10 @@ public static void killTransactions(Cache... caches) { for (Cache c : caches) { if (c != null && c.getCacheStatus() == ComponentStatus.STARTED) { - CacheSPI ci = (CacheSPI) c; - if (ci.getTransactionManager() != null) { + TransactionManager tm = getTransactionManager(c); + if (tm != null) { try { - ci.getTransactionManager().rollback(); + tm.rollback(); } catch (Exception e) { // don't care @@ -489,7 +474,7 @@ * @param cache cache that needs to be altered * @param interceptor the first interceptor in the new chain. */ - public static void replaceInterceptorChain(CacheSPI<?, ?> cache, CommandInterceptor interceptor) { + public static void replaceInterceptorChain(Cache<?, ?> cache, CommandInterceptor interceptor) { ComponentRegistry cr = extractComponentRegistry(cache); // make sure all interceptors here are wired. CommandInterceptor i = interceptor; @@ -509,9 +494,8 @@ * @param cache cache instance for which a remote delegate is to be retrieved * @return remote delegate, or null if the cacge is not configured for replication. */ - public static CacheDelegate getInvocationDelegate(CacheSPI cache) { - ComponentRegistry cr = extractComponentRegistry(cache); - return cr.getComponent(CacheDelegate.class); + public static CacheDelegate getInvocationDelegate(Cache cache) { + return (CacheDelegate) cache; } /** @@ -522,7 +506,7 @@ * @param timeout timeout to wait for */ public static void blockUntilCacheStatusAchieved(Cache cache, ComponentStatus cacheStatus, long timeout) { - CacheSPI spi = (CacheSPI) cache; + AdvancedCache spi = cache.getAdvancedCache(); long killTime = System.currentTimeMillis() + timeout; while (System.currentTimeMillis() < killTime) { if (spi.getCacheStatus() == cacheStatus) return; @@ -531,7 +515,7 @@ throw new RuntimeException("Timed out waiting for condition"); } - public static void replicateCommand(CacheSPI cache, VisitableCommand command) throws Throwable { + public static void replicateCommand(Cache cache, VisitableCommand command) throws Throwable { ComponentRegistry cr = extractComponentRegistry(cache); InterceptorChain ic = cr.getComponent(InterceptorChain.class); ic.invoke(command); @@ -542,7 +526,7 @@ } - public static CommandsFactory extractCommandsFactory(CacheSPI<Object, Object> cache) { + public static CommandsFactory extractCommandsFactory(Cache<Object, Object> cache) { return (CommandsFactory) extractField(cache, "commandsFactory"); } @@ -550,7 +534,7 @@ System.out.println("**** START: Cache Contents ****"); int count = 1; for (Object o : caches) { - CacheSPI c = (CacheSPI) o; + Cache c = (Cache) o; if (c == null) { System.out.println(" ** Cache " + count + " is null!"); } else { Modified: core/branches/flat/src/test/java/org/horizon/BaseClusteredTest.java =================================================================== --- core/branches/flat/src/test/java/org/horizon/BaseClusteredTest.java 2009-02-09 18:29:53 UTC (rev 7668) +++ core/branches/flat/src/test/java/org/horizon/BaseClusteredTest.java 2009-02-09 18:30:59 UTC (rev 7669) @@ -113,7 +113,7 @@ public ReplListener(Cache c) { this.c = c; - this.c.addInterceptor(new ReplListenerInterceptor(), 0); + this.c.getAdvancedCache().addInterceptor(new ReplListenerInterceptor(), 0); } /** Modified: core/branches/flat/src/test/java/org/horizon/api/CacheAPITest.java =================================================================== --- core/branches/flat/src/test/java/org/horizon/api/CacheAPITest.java 2009-02-09 18:29:53 UTC (rev 7668) +++ core/branches/flat/src/test/java/org/horizon/api/CacheAPITest.java 2009-02-09 18:30:59 UTC (rev 7669) @@ -1,7 +1,6 @@ package org.horizon.api; import org.horizon.Cache; -import org.horizon.CacheSPI; import org.horizon.UnitTestCacheFactory; import org.horizon.config.Configuration; import org.horizon.config.ConfigurationException; @@ -26,7 +25,7 @@ @Test(groups = "functional", sequential = true) public abstract class CacheAPITest { - private ThreadLocal<CacheSPI<String, String>> cacheTL = new ThreadLocal<CacheSPI<String, String>>(); + private ThreadLocal<Cache<String, String>> cacheTL = new ThreadLocal<Cache<String, String>>(); @BeforeMethod(alwaysRun = true) public void setUp() throws Exception { @@ -35,7 +34,7 @@ c.setIsolationLevel(getIsolationLevel()); c.setTransactionManagerLookupClass(DummyTransactionManagerLookup.class.getName()); UnitTestCacheFactory<String, String> cf = new UnitTestCacheFactory<String, String>(); - CacheSPI<String, String> cache = (CacheSPI<String, String>) cf.createCache(c.clone()); + Cache<String, String> cache = cf.createCache(c.clone()); cacheTL.set(cache); } @@ -43,7 +42,7 @@ @AfterMethod(alwaysRun = true) public void tearDown() { - CacheSPI<String, String> cache = cacheTL.get(); + Cache<String, String> cache = cacheTL.get(); TestingUtil.killCaches(cache); cacheTL.set(null); } @@ -52,7 +51,7 @@ * Tests that the configuration contains the values expected, as well as immutability of certain elements */ public void testConfiguration() { - CacheSPI<String, String> cache = cacheTL.get(); + Cache<String, String> cache = cacheTL.get(); Configuration c = cache.getConfiguration(); assertEquals(Configuration.CacheMode.LOCAL, c.getCacheMode()); assertEquals(DummyTransactionManagerLookup.class.getName(), c.getTransactionManagerLookupClass()); @@ -71,12 +70,12 @@ } public void testGetMembersInLocalMode() { - CacheSPI<String, String> cache = cacheTL.get(); + Cache<String, String> cache = cacheTL.get(); assert cache.getCacheManager().getAddress() == null : "Cache members should be null if running in LOCAL mode"; } public void testConvenienceMethods() { - CacheSPI<String, String> cache = cacheTL.get(); + Cache<String, String> cache = cacheTL.get(); String key = "key", value = "value"; Map<String, String> data = new HashMap<String, String>(); data.put(key, value); @@ -100,7 +99,7 @@ * Tests basic eviction */ public void testEvict() { - CacheSPI<String, String> cache = cacheTL.get(); + Cache<String, String> cache = cacheTL.get(); String key1 = "keyOne", key2 = "keyTwo", value = "value"; cache.put(key1, value); @@ -125,7 +124,7 @@ } public void testStopClearsData() throws Exception { - CacheSPI<String, String> cache = cacheTL.get(); + Cache<String, String> cache = cacheTL.get(); String key = "key", value = "value"; cache.put(key, value); assert cache.get(key).equals(value); @@ -139,7 +138,7 @@ } public void testRollbackAfterPut() throws Exception { - CacheSPI<String, String> cache = cacheTL.get(); + Cache<String, String> cache = cacheTL.get(); String key = "key", value = "value"; cache.put(key, value); assert cache.get(key).equals(value); @@ -155,7 +154,7 @@ } public void testRollbackAfterOverwrite() throws Exception { - CacheSPI<String, String> cache = cacheTL.get(); + Cache<String, String> cache = cacheTL.get(); String key = "key", value = "value"; cache.put(key, value); assert cache.get(key).equals(value); @@ -172,7 +171,7 @@ } public void testRollbackAfterRemove() throws Exception { - CacheSPI<String, String> cache = cacheTL.get(); + Cache<String, String> cache = cacheTL.get(); String key = "key", value = "value"; cache.put(key, value); assert cache.get(key).equals(value); @@ -188,7 +187,7 @@ } public void testRollbackAfterClear() throws Exception { - CacheSPI<String, String> cache = cacheTL.get(); + Cache<String, String> cache = cacheTL.get(); String key = "key", value = "value"; cache.put(key, value); assert cache.get(key).equals(value); @@ -204,7 +203,7 @@ } public void testConcurrentMapMethods() { - CacheSPI<String, String> c = cacheTL.get(); + Cache<String, String> c = cacheTL.get(); assert c.putIfAbsent("A", "B") == null; assert c.putIfAbsent("A", "C").equals("B"); Modified: core/branches/flat/src/test/java/org/horizon/api/MixedModeTest.java =================================================================== --- core/branches/flat/src/test/java/org/horizon/api/MixedModeTest.java 2009-02-09 18:29:53 UTC (rev 7668) +++ core/branches/flat/src/test/java/org/horizon/api/MixedModeTest.java 2009-02-09 18:30:59 UTC (rev 7669) @@ -1,8 +1,9 @@ package org.horizon.api; +import org.horizon.AdvancedCache; import org.horizon.BaseClusteredTest; -import org.horizon.Cache; import org.horizon.config.Configuration; +import org.horizon.invocation.Options; import org.horizon.manager.CacheManager; import org.horizon.util.TestingUtil; import org.testng.annotations.BeforeMethod; @@ -10,11 +11,11 @@ @Test(groups = "functional", sequential = true) public class MixedModeTest extends BaseClusteredTest { - Cache replSyncCache1, replSyncCache2; - Cache replAsyncCache1, replAsyncCache2; - Cache invalAsyncCache1, invalAsyncCache2; - Cache invalSyncCache1, invalSyncCache2; - Cache localCache1, localCache2; + AdvancedCache replSyncCache1, replSyncCache2; + AdvancedCache replAsyncCache1, replAsyncCache2; + AdvancedCache invalAsyncCache1, invalAsyncCache2; + AdvancedCache invalSyncCache1, invalSyncCache2; + AdvancedCache localCache1, localCache2; @BeforeMethod public void setUp() { @@ -42,16 +43,16 @@ defineCacheOnAllManagers("invalAsync", invalAsync); defineCacheOnAllManagers("local", local); - replSyncCache1 = cm1.getCache("replSync"); - replSyncCache2 = cm2.getCache("replSync"); - replAsyncCache1 = cm1.getCache("replAsync"); - replAsyncCache2 = cm2.getCache("replAsync"); - invalSyncCache1 = cm1.getCache("invalSync"); - invalSyncCache2 = cm2.getCache("invalSync"); - invalAsyncCache1 = cm1.getCache("invalAsync"); - invalAsyncCache2 = cm2.getCache("invalAsync"); - localCache1 = cm1.getCache("local"); - localCache2 = cm2.getCache("local"); + replSyncCache1 = cm1.getCache("replSync").getAdvancedCache(); + replSyncCache2 = cm2.getCache("replSync").getAdvancedCache(); + replAsyncCache1 = cm1.getCache("replAsync").getAdvancedCache(); + replAsyncCache2 = cm2.getCache("replAsync").getAdvancedCache(); + invalSyncCache1 = cm1.getCache("invalSync").getAdvancedCache(); + invalSyncCache2 = cm2.getCache("invalSync").getAdvancedCache(); + invalAsyncCache1 = cm1.getCache("invalAsync").getAdvancedCache(); + invalAsyncCache2 = cm2.getCache("invalAsync").getAdvancedCache(); + localCache1 = cm1.getCache("local").getAdvancedCache(); + localCache2 = cm2.getCache("local").getAdvancedCache(); TestingUtil.blockUntilViewsReceived(60000, cm1, cm2); } @@ -60,12 +61,10 @@ ReplListener r1 = attachReplicationListener(replAsyncCache2); ReplListener r2 = attachReplicationListener(invalAsyncCache2); - invalSyncCache2.getInvocationContext().getOptionOverrides().setCacheModeLocal(true); - invalSyncCache2.put("k", "v"); + invalSyncCache2.put("k", "v", Options.CACHE_MODE_LOCAL); assert invalSyncCache2.get("k").equals("v"); assert invalSyncCache1.get("k") == null; - invalAsyncCache2.getInvocationContext().getOptionOverrides().setCacheModeLocal(true); - invalAsyncCache2.put("k", "v"); + invalAsyncCache2.put("k", "v", Options.CACHE_MODE_LOCAL); assert invalAsyncCache2.get("k").equals("v"); assert invalAsyncCache1.get("k") == null; Modified: core/branches/flat/src/test/java/org/horizon/api/mvcc/PutForExternalReadTest.java =================================================================== --- core/branches/flat/src/test/java/org/horizon/api/mvcc/PutForExternalReadTest.java 2009-02-09 18:29:53 UTC (rev 7668) +++ core/branches/flat/src/test/java/org/horizon/api/mvcc/PutForExternalReadTest.java 2009-02-09 18:30:59 UTC (rev 7669) @@ -8,6 +8,7 @@ import org.horizon.commands.write.PutKeyValueCommand; import org.horizon.commands.write.RemoveCommand; import org.horizon.config.Configuration; +import org.horizon.invocation.Options; import org.horizon.manager.CacheManager; import org.horizon.remoting.RPCManager; import org.horizon.remoting.RPCManagerImpl; @@ -309,8 +310,7 @@ if (transactional) tm1.begin(); - cache1.getInvocationContext().getOptionOverrides().setCacheModeLocal(true); - cache1.putForExternalRead(key, value); + cache1.getAdvancedCache().putForExternalRead(key, value, Options.CACHE_MODE_LOCAL); if (transactional) tm1.commit(); Modified: core/branches/flat/src/test/java/org/horizon/api/tree/NodeLockSupport.java =================================================================== --- core/branches/flat/src/test/java/org/horizon/api/tree/NodeLockSupport.java 2009-02-09 18:29:53 UTC (rev 7668) +++ core/branches/flat/src/test/java/org/horizon/api/tree/NodeLockSupport.java 2009-02-09 18:30:59 UTC (rev 7669) @@ -24,11 +24,11 @@ package org.horizon.api.tree; import org.horizon.Cache; -import org.horizon.CacheSPI; import org.horizon.lock.LockManager; import org.horizon.tree.Fqn; import org.horizon.tree.TreeCache; import org.horizon.tree.TreeStructureSupport; +import org.horizon.util.TestingUtil; import javax.transaction.TransactionManager; @@ -49,31 +49,31 @@ protected void checkLocks() { Cache<Object, Object> cache = cacheTL.get(); - - assert !TreeStructureSupport.isLocked(cache, A); - assert !TreeStructureSupport.isLocked(cache, Fqn.ROOT); - assert TreeStructureSupport.isLocked(cache, C); - assert TreeStructureSupport.isLocked(cache, A_B); - assert TreeStructureSupport.isLocked(cache, A_B_C); + LockManager lm = TestingUtil.extractLockManager(cache); + assert !TreeStructureSupport.isLocked(cache, lm, A); + assert !TreeStructureSupport.isLocked(cache, lm, Fqn.ROOT); + assert TreeStructureSupport.isLocked(cache, lm, C); + assert TreeStructureSupport.isLocked(cache, lm, A_B); + assert TreeStructureSupport.isLocked(cache, lm, A_B_C); } protected void checkLocksDeep() { Cache<Object, Object> cache = cacheTL.get(); + LockManager lm = TestingUtil.extractLockManager(cache); + assert !TreeStructureSupport.isLocked(cache, lm, A); + assert !TreeStructureSupport.isLocked(cache, lm, Fqn.ROOT); + assert !TreeStructureSupport.isLocked(cache, lm, A_B_D); - assert !TreeStructureSupport.isLocked(cache, A); - assert !TreeStructureSupport.isLocked(cache, Fqn.ROOT); - assert !TreeStructureSupport.isLocked(cache, A_B_D); - - assert TreeStructureSupport.isLocked(cache, C); - assert TreeStructureSupport.isLocked(cache, C_E); - assert TreeStructureSupport.isLocked(cache, A_B); - assert TreeStructureSupport.isLocked(cache, A_B_C); - assert TreeStructureSupport.isLocked(cache, A_B_C_E); + assert TreeStructureSupport.isLocked(cache, lm, C); + assert TreeStructureSupport.isLocked(cache, lm, C_E); + assert TreeStructureSupport.isLocked(cache, lm, A_B); + assert TreeStructureSupport.isLocked(cache, lm, A_B_C); + assert TreeStructureSupport.isLocked(cache, lm, A_B_C_E); } protected void assertNoLocks() { Cache<Object, Object> cache = cacheTL.get(); - LockManager lm = ((CacheSPI) cache).getLockManager(); + LockManager lm = TestingUtil.extractLockManager(cache); for (Object key : cache.keySet()) assert !lm.isLocked(key); } } Modified: core/branches/flat/src/test/java/org/horizon/api/tree/NodeMoveAPITest.java =================================================================== --- core/branches/flat/src/test/java/org/horizon/api/tree/NodeMoveAPITest.java 2009-02-09 18:29:53 UTC (rev 7668) +++ core/branches/flat/src/test/java/org/horizon/api/tree/NodeMoveAPITest.java 2009-02-09 18:30:59 UTC (rev 7669) @@ -1,7 +1,6 @@ package org.horizon.api.tree; import org.horizon.Cache; -import org.horizon.CacheSPI; import org.horizon.UnitTestCacheFactory; import org.horizon.api.mvcc.LockAssert; import org.horizon.config.CacheLoaderConfig; @@ -58,10 +57,10 @@ Configuration c = new Configuration(); c.setFetchInMemoryState(false); c.setInvocationBatchingEnabled(true); - CacheSPI<Object, Object> cache = (CacheSPI<Object, Object>) new UnitTestCacheFactory<Object, Object>().createCache(c); + Cache<Object, Object> cache = new UnitTestCacheFactory<Object, Object>().createCache(c); cacheTL.set(new TreeCacheImpl<Object, Object>(cache)); - tmTL.set(cache.getTransactionManager()); + tmTL.set(TestingUtil.getTransactionManager(cache)); } @AfterMethod(alwaysRun = true) @@ -554,20 +553,21 @@ protected void checkLocks() { TreeCache<Object, Object> tree = cacheTL.get(); Cache<Object, Object> cache = tree.getCache(); - - assert TreeStructureSupport.isLocked(cache, C); - assert TreeStructureSupport.isLocked(cache, A_B_C); + LockManager lm = TestingUtil.extractLockManager(cache); + assert TreeStructureSupport.isLocked(cache, lm, C); + assert TreeStructureSupport.isLocked(cache, lm, A_B_C); } protected void checkLocksDeep() { TreeCache<Object, Object> tree = cacheTL.get(); Cache<Object, Object> cache = tree.getCache(); + LockManager lm = TestingUtil.extractLockManager(cache); // /a/b, /c, /c/e, /a/b/c and /a/b/c/e should all be locked. - assert TreeStructureSupport.isLocked(cache, C); - assert TreeStructureSupport.isLocked(cache, C_E); - assert TreeStructureSupport.isLocked(cache, A_B_C); - assert TreeStructureSupport.isLocked(cache, A_B_C_E); + assert TreeStructureSupport.isLocked(cache, lm, C); + assert TreeStructureSupport.isLocked(cache, lm, C_E); + assert TreeStructureSupport.isLocked(cache, lm, A_B_C); + assert TreeStructureSupport.isLocked(cache, lm, A_B_C_E); } protected void assertNoLocks() { Modified: core/branches/flat/src/test/java/org/horizon/api/tree/SyncReplTest.java =================================================================== --- core/branches/flat/src/test/java/org/horizon/api/tree/SyncReplTest.java 2009-02-09 18:29:53 UTC (rev 7668) +++ core/branches/flat/src/test/java/org/horizon/api/tree/SyncReplTest.java 2009-02-09 18:30:59 UTC (rev 7669) @@ -10,6 +10,7 @@ import org.horizon.BaseClusteredTest; import org.horizon.Cache; import org.horizon.config.Configuration; +import org.horizon.invocation.Options; import org.horizon.manager.CacheManager; import org.horizon.tree.Fqn; import org.horizon.tree.Node; @@ -93,18 +94,14 @@ Map<Object, Object> map = new HashMap<Object, Object>(); map.put("1", "1"); map.put("2", "2"); - cache1.getCache().getInvocationContext().getOptionOverrides().setSuppressLocking(true); - cache1.getRoot().addChild(fqn).putAll(map); - cache1.getCache().getInvocationContext().getOptionOverrides().setSuppressLocking(true); - assertEquals("Value should be set", "1", cache1.get(fqn, "1")); + cache1.getRoot().addChild(fqn).putAll(map, Options.SKIP_LOCKING); + assertEquals("Value should be set", "1", cache1.get(fqn, "1", Options.SKIP_LOCKING)); map = new HashMap<Object, Object>(); map.put("3", "3"); map.put("4", "4"); - cache1.getCache().getInvocationContext().getOptionOverrides().setSuppressLocking(true); - cache1.getRoot().addChild(fqn1).putAll(map); + cache1.getRoot().addChild(fqn1).putAll(map, Options.SKIP_LOCKING); - cache1.getCache().getInvocationContext().getOptionOverrides().setSuppressLocking(true); - assertEquals("Value should be set", "2", cache1.get(fqn, "2")); + assertEquals("Value should be set", "2", cache1.get(fqn, "2", Options.SKIP_LOCKING)); } } Modified: core/branches/flat/src/test/java/org/horizon/api/tree/TreeCacheAPITest.java =================================================================== --- core/branches/flat/src/test/java/org/horizon/api/tree/TreeCacheAPITest.java 2009-02-09 18:29:53 UTC (rev 7668) +++ core/branches/flat/src/test/java/org/horizon/api/tree/TreeCacheAPITest.java 2009-02-09 18:30:59 UTC (rev 7669) @@ -1,7 +1,6 @@ package org.horizon.api.tree; import org.horizon.Cache; -import org.horizon.CacheSPI; import org.horizon.config.Configuration; import org.horizon.manager.DefaultCacheManager; import org.horizon.transaction.DummyTransactionManagerLookup; @@ -41,7 +40,7 @@ Cache flatcache = cm.getCache(); cache = new TreeCacheImpl(flatcache); - tm = ((CacheSPI) cache.getCache()).getTransactionManager(); + tm = TestingUtil.getTransactionManager(flatcache); } @AfterMethod(alwaysRun = true) @@ -110,78 +109,6 @@ assertEquals(false, cache.removeNode(fqn)); } - /** - * Tests basic eviction - */ - public void testEvict() { - Fqn one = Fqn.fromString("/one"); - Fqn two = Fqn.fromString("/one/two"); - String key = "key", value = "value"; - - cache.getRoot().addChild(one).put(key, value); - cache.getRoot().addChild(two).put(key, value); - - assertTrue(cache.getRoot().hasChild(one)); - assertFalse(cache.getRoot().getChild(one).getData().isEmpty()); - assertTrue(cache.getRoot().hasChild(two)); - assertFalse(cache.getRoot().getChild(two).getData().isEmpty()); - - // evict two - cache.evict(two, false); - - assertTrue(cache.getRoot().hasChild(one)); - assertTrue(cache.getRoot().getChild(one).getKeys().contains(key)); - assertFalse(cache.getRoot().hasChild(two)); - - // now add 2 again... - cache.getRoot().addChild(two).put(key, value); - - // now evict one, NOT recursive - cache.evict(one, false); - - // one will NOT be removed, just emptied. - assertTrue(cache.getRoot().hasChild(one)); - assertFalse(cache.getRoot().getChild(one).getKeys().contains(key)); - - // two will be unaffected - assertTrue(cache.getRoot().hasChild(two)); - assertTrue(cache.getRoot().getChild(two).getKeys().contains(key)); - } - - - /** - * Tests recursive eviction - */ - public void testEvictRecursive() { - Fqn one = Fqn.fromString("/one"); - Fqn two = Fqn.fromString("/one/two"); - String key = "key", value = "value"; - - cache.getRoot().addChild(one).put(key, value); - cache.getRoot().addChild(two).put(key, value); - - assertTrue(cache.getRoot().hasChild(one)); - assertFalse(cache.getRoot().getChild(one).getData().isEmpty()); - assertTrue(cache.getRoot().hasChild(two)); - assertFalse(cache.getRoot().getChild(two).getData().isEmpty()); - - // evict two - cache.evict(two, true); - - assertTrue(cache.getRoot().hasChild(one)); - assertFalse(cache.getRoot().getChild(one).getData().isEmpty()); - assertFalse(cache.getRoot().hasChild(two)); - - // now add 2 again... - cache.getRoot().addChild(two).put(key, value); - - // now evict one, recursive - cache.evict(one, true); - - assertFalse(cache.getRoot().hasChild(one)); - assertFalse(cache.getRoot().hasChild(two)); - } - public void testStopClearsData() throws Exception { Fqn a = Fqn.fromString("/a"); Fqn b = Fqn.fromString("/a/b"); Modified: core/branches/flat/src/test/java/org/horizon/invalidation/BaseInvalidationTest.java =================================================================== --- core/branches/flat/src/test/java/org/horizon/invalidation/BaseInvalidationTest.java 2009-02-09 18:29:53 UTC (rev 7668) +++ core/branches/flat/src/test/java/org/horizon/invalidation/BaseInvalidationTest.java 2009-02-09 18:30:59 UTC (rev 7669) @@ -1,12 +1,14 @@ package org.horizon.invalidation; import static org.easymock.EasyMock.*; +import org.horizon.AdvancedCache; import org.horizon.BaseClusteredTest; import org.horizon.Cache; import org.horizon.commands.RPCCommand; import org.horizon.commands.write.ClearCommand; import org.horizon.commands.write.InvalidateCommand; import org.horizon.config.Configuration; +import org.horizon.invocation.Options; import org.horizon.remoting.RPCManager; import org.horizon.remoting.RPCManagerImpl; import org.horizon.remoting.ResponseFilter; @@ -27,7 +29,7 @@ @Test(groups = "functional", sequential = true) public abstract class BaseInvalidationTest extends BaseClusteredTest { - protected Cache cache1, cache2; + protected AdvancedCache cache1, cache2; protected boolean isSync; @BeforeMethod @@ -38,17 +40,15 @@ c.setCacheMode(isSync ? Configuration.CacheMode.INVALIDATION_SYNC : Configuration.CacheMode.INVALIDATION_ASYNC); c.setTransactionManagerLookupClass(DummyTransactionManagerLookup.class.getName()); List<Cache> caches = createClusteredCaches(2, "invalidation", c); - cache1 = caches.get(0); - cache2 = caches.get(1); + cache1 = caches.get(0).getAdvancedCache(); + cache2 = caches.get(1).getAdvancedCache(); TestingUtil.blockUntilViewsReceived(10000, cache1, cache2); } public void testRemove() throws Exception { - cache1.getInvocationContext().getOptionOverrides().setCacheModeLocal(true); - cache1.put("key", "value"); + cache1.put("key", "value", Options.CACHE_MODE_LOCAL); assertEquals("value", cache1.get("key")); - cache2.getInvocationContext().getOptionOverrides().setCacheModeLocal(true); - cache2.put("key", "value"); + cache2.put("key", "value", Options.CACHE_MODE_LOCAL); assertEquals("value", cache2.get("key")); ReplListener rl = attachReplicationListener(cache2); @@ -193,8 +193,7 @@ } public void testPutIfAbsent() { - cache2.getInvocationContext().getOptionOverrides().setCacheModeLocal(true); - cache2.put("key", "value"); + cache2.put("key", "value", Options.CACHE_MODE_LOCAL); assert cache2.get("key").equals("value"); assert cache1.get("key") == null; @@ -206,8 +205,7 @@ assert cache1.get("key").equals("value"); assert cache2.get("key") == null; - cache2.getInvocationContext().getOptionOverrides().setCacheModeLocal(true); - cache2.put("key", "value2"); + cache2.put("key", "value2", Options.CACHE_MODE_LOCAL); assert cache1.get("key").equals("value"); assert cache2.get("key").equals("value2"); @@ -219,10 +217,8 @@ } public void testRemoveIfPresent() { - cache1.getInvocationContext().getOptionOverrides().setCacheModeLocal(true); - cache1.put("key", "value1"); - cache2.getInvocationContext().getOptionOverrides().setCacheModeLocal(true); - cache2.put("key", "value2"); + cache1.put("key", "value1", Options.CACHE_MODE_LOCAL); + cache2.put("key", "value2", Options.CACHE_MODE_LOCAL); assert cache1.get("key").equals("value1"); assert cache2.get("key").equals("value2"); @@ -241,10 +237,8 @@ } public void testClear() { - cache1.getInvocationContext().getOptionOverrides().setCacheModeLocal(true); - cache1.put("key", "value1"); - cache2.getInvocationContext().getOptionOverrides().setCacheModeLocal(true); - cache2.put("key", "value2"); + cache1.put("key", "value1", Options.CACHE_MODE_LOCAL); + cache2.put("key", "value2", Options.CACHE_MODE_LOCAL); assert cache1.get("key").equals("value1"); assert cache2.get("key").equals("value2"); @@ -258,8 +252,7 @@ } public void testReplace() { - cache2.getInvocationContext().getOptionOverrides().setCacheModeLocal(true); - cache2.put("key", "value2"); + cache2.put("key", "value2", Options.CACHE_MODE_LOCAL); assert cache1.get("key") == null; assert cache2.get("key").equals("value2"); @@ -268,8 +261,7 @@ assert cache1.get("key") == null; assert cache2.get("key").equals("value2"); - cache1.getInvocationContext().getOptionOverrides().setCacheModeLocal(true); - cache1.put("key", "valueN"); + cache1.put("key", "valueN", Options.CACHE_MODE_LOCAL); ReplListener r = attachReplicationListener(cache2); r.expect(InvalidateCommand.class); @@ -281,8 +273,7 @@ } public void testReplaceWithOldVal() { - cache2.getInvocationContext().getOptionOverrides().setCacheModeLocal(true); - cache2.put("key", "value2"); + cache2.put("key", "value2", Options.CACHE_MODE_LOCAL); assert cache1.get("key") == null; assert cache2.get("key").equals("value2"); @@ -291,8 +282,7 @@ assert cache1.get("key") == null; assert cache2.get("key").equals("value2"); - cache1.getInvocationContext().getOptionOverrides().setCacheModeLocal(true); - cache1.put("key", "valueN"); + cache1.put("key", "valueN", Options.CACHE_MODE_LOCAL); cache1.replace("key", "valueOld", "value1"); // should do nothing since there is nothing to replace on cache1 Modified: core/branches/flat/src/test/java/org/horizon/notifications/cachelistener/CacheNotifierImplTest.java =================================================================== --- core/branches/flat/src/test/java/org/horizon/notifications/cachelistener/CacheNotifierImplTest.java 2009-02-09 18:29:53 UTC (rev 7668) +++ core/branches/flat/src/test/java/org/horizon/notifications/cachelistener/CacheNotifierImplTest.java 2009-02-09 18:30:59 UTC (rev 7669) @@ -2,9 +2,11 @@ import org.easymock.EasyMock; import static org.easymock.EasyMock.createNiceMock; -import org.horizon.CacheSPI; +import org.horizon.Cache; import org.horizon.context.InvocationContext; import org.horizon.context.InvocationContextImpl; +import org.horizon.factories.context.ContextFactory; +import org.horizon.invocation.InvocationContextContainer; import org.horizon.notifications.cachelistener.event.CacheEntryEvent; import org.horizon.notifications.cachelistener.event.CacheEntryModifiedEvent; import org.horizon.notifications.cachelistener.event.CacheEntryRemovedEvent; @@ -19,17 +21,18 @@ @Test(groups = "unit", sequential = true) public class CacheNotifierImplTest { CacheNotifierImpl n; - CacheSPI mockCache; + Cache mockCache; CacheListener cl; InvocationContext ctx; @BeforeMethod public void setUp() { n = new CacheNotifierImpl(); - mockCache = createNiceMock(CacheSPI.class); - EasyMock.expect(mockCache.getInvocationContext()).andReturn(new InvocationContextImpl()).anyTimes(); + mockCache = createNiceMock(Cache.class); EasyMock.replay(mockCache); - n.injectDependencies(mockCache); + InvocationContextContainer icc = new InvocationContextContainer(); + icc.injectContextFactory(new ContextFactory()); + n.injectDependencies(icc, mockCache); cl = new CacheListener(); n.start(); n.addListener(cl); Modified: core/branches/flat/src/test/java/org/horizon/replication/BaseReplicatedAPITest.java =================================================================== --- core/branches/flat/src/test/java/org/horizon/replication/BaseReplicatedAPITest.java 2009-02-09 18:29:53 UTC (rev 7668) +++ core/branches/flat/src/test/java/org/horizon/replication/BaseReplicatedAPITest.java 2009-02-09 18:30:59 UTC (rev 7669) @@ -1,5 +1,6 @@ package org.horizon.replication; +import org.horizon.AdvancedCache; import org.horizon.BaseClusteredTest; import org.horizon.Cache; import org.horizon.commands.write.ClearCommand; @@ -8,6 +9,7 @@ import org.horizon.commands.write.RemoveCommand; import org.horizon.commands.write.ReplaceCommand; import org.horizon.config.Configuration; +import org.horizon.invocation.Options; import org.horizon.transaction.DummyTransactionManagerLookup; import org.horizon.util.TestingUtil; import org.testng.annotations.BeforeMethod; @@ -20,7 +22,7 @@ @Test(groups = "functional", sequential = true) public abstract class BaseReplicatedAPITest extends BaseClusteredTest { - Cache cache1, cache2; + AdvancedCache cache1, cache2; protected boolean isSync; @BeforeMethod @@ -31,8 +33,8 @@ c.setCacheMode(isSync ? Configuration.CacheMode.REPL_SYNC : Configuration.CacheMode.REPL_ASYNC); c.setTransactionManagerLookupClass(DummyTransactionManagerLookup.class.getName()); List<Cache> caches = createClusteredCaches(2, "replication", c); - cache1 = caches.get(0); - cache2 = caches.get(1); + cache1 = caches.get(0).getAdvancedCache(); + cache2 = caches.get(1).getAdvancedCache(); TestingUtil.blockUntilViewsReceived(10000, cache1, cache2); } @@ -66,8 +68,7 @@ } public void remove() { - cache2.getInvocationContext().getOptionOverrides().setCacheModeLocal(true); - cache2.put("key", "value"); + cache2.put("key", "value", Options.CACHE_MODE_LOCAL); assert cache2.get("key").equals("value"); assert cache1.get("key") == null; @@ -79,10 +80,8 @@ assert cache1.get("key") == null; assert cache2.get("key") == null; - cache1.getInvocationContext().getOptionOverrides().setCacheModeLocal(true); - cache1.put("key", "value"); - cache2.getInvocationContext().getOptionOverrides().setCacheModeLocal(true); - cache2.put("key", "value"); + cache1.put("key", "value", Options.CACHE_MODE_LOCAL); + cache2.put("key", "value", Options.CACHE_MODE_LOCAL); assert cache1.get("key").equals("value"); assert cache2.get("key").equals("value"); @@ -95,8 +94,7 @@ } public void testPutIfAbsent() { - cache2.getInvocationContext().getOptionOverrides().setCacheModeLocal(true); - cache2.put("key", "valueOld"); + cache2.put("key", "valueOld", Options.CACHE_MODE_LOCAL); assert cache2.get("key").equals("valueOld"); assert cache1.get("key") == null; @@ -108,8 +106,7 @@ assert cache1.get("key").equals("value"); assert cache2.get("key").equals("value"); - cache2.getInvocationContext().getOptionOverrides().setCacheModeLocal(true); - cache2.put("key", "value2"); + cache2.put("key", "value2", Options.CACHE_MODE_LOCAL); assert cache1.get("key").equals("value"); assert cache2.get("key").equals("value2"); @@ -121,10 +118,8 @@ } public void testRemoveIfPresent() { - cache1.getInvocationContext().getOptionOverrides().setCacheModeLocal(true); - cache1.put("key", "value1"); - cache2.getInvocationContext().getOptionOverrides().setCacheModeLocal(true); - cache2.put("key", "value2"); + cache1.put("key", "value1", Options.CACHE_MODE_LOCAL); + cache2.put("key", "value2", Options.CACHE_MODE_LOCAL); assert cache1.get("key").equals("value1"); assert cache2.get("key").equals("value2"); @@ -143,10 +138,8 @@ } public void testClear() { - cache1.getInvocationContext().getOptionOverrides().setCacheModeLocal(true); - cache1.put("key", "value1"); - cache2.getInvocationContext().getOptionOverrides().setCacheModeLocal(true); - cache2.put("key", "value2"); + cache1.put("key", "value1", Options.CACHE_MODE_LOCAL); + cache2.put("key", "value2", Options.CACHE_MODE_LOCAL); assert cache1.get("key").equals("value1"); assert cache2.get("key").equals("value2"); @@ -160,8 +153,7 @@ } public void testReplace() { - cache2.getInvocationContext().getOptionOverrides().setCacheModeLocal(true); - cache2.put("key", "value2"); + cache2.put("key", "value2", Options.CACHE_MODE_LOCAL); assert cache1.get("key") == null; assert cache2.get("key").equals("value2"); @@ -170,8 +162,7 @@ assert cache1.get("key") == null; assert cache2.get("key").equals("value2"); - cache1.getInvocationContext().getOptionOverrides().setCacheModeLocal(true); - cache1.put("key", "valueN"); + cache1.put("key", "valueN", Options.CACHE_MODE_LOCAL); BaseClusteredTest.ReplListener r = attachReplicationListener(cache2); r.expect(ReplaceCommand.class); @@ -183,8 +174,7 @@ } public void testReplaceWithOldVal() { - cache2.getInvocationContext().getOptionOverrides().setCacheModeLocal(true); - cache2.put("key", "value2"); + cache2.put("key", "value2", Options.CACHE_MODE_LOCAL); assert cache1.get("key") == null; assert cache2.get("key").equals("value2"); @@ -193,8 +183,7 @@ assert cache1.get("key") == null; assert cache2.get("key").equals("value2"); - cache1.getInvocationContext().getOptionOverrides().setCacheModeLocal(true); - cache1.put("key", "valueN"); + cache1.put("key", "valueN", Options.CACHE_MODE_LOCAL); cache1.replace("key", "valueOld", "value1"); // should do nothing since there is nothing to replace on cache1 Modified: core/branches/flat/src/test/java/org/horizon/replication/ReplicationExceptionTest.java =================================================================== --- core/branches/flat/src/test/java/org/horizon/replication/ReplicationExceptionTest.java 2009-02-09 18:29:53 UTC (rev 7668) +++ core/branches/flat/src/test/java/org/horizon/replication/ReplicationExceptionTest.java 2009-02-09 18:30:59 UTC (rev 7669) @@ -7,6 +7,7 @@ */ package org.horizon.replication; +import org.horizon.AdvancedCache; import org.horizon.BaseClusteredTest; import org.horizon.Cache; import org.horizon.commands.VisitableCommand; @@ -32,7 +33,7 @@ @Test(groups = "functional", sequential = true) public class ReplicationExceptionTest extends BaseClusteredTest { - private Cache cache1, cache2; + private AdvancedCache cache1, cache2; @BeforeMethod public void setUp() { @@ -46,8 +47,8 @@ List<Cache> caches = createClusteredCaches(2, "replicatinExceptionTest", configuration); - cache1 = caches.get(0); - cache2 = caches.get(1); + cache1 = caches.get(0).getAdvancedCache(); + cache2 = caches.get(1).getAdvancedCache(); } private TransactionManager beginTransaction() throws SystemException, NotSupportedException { Modified: core/branches/flat/src/test/java/org/horizon/tx/LocalModeTxTest.java =================================================================== --- core/branches/flat/src/test/java/org/horizon/tx/LocalModeTxTest.java 2009-02-09 18:29:53 UTC (rev 7668) +++ core/branches/flat/src/test/java/org/horizon/tx/LocalModeTxTest.java 2009-02-09 18:30:59 UTC (rev 7669) @@ -21,7 +21,7 @@ */ package org.horizon.tx; -import org.horizon.CacheSPI; +import org.horizon.Cache; import org.horizon.UnitTestCacheManager; import org.horizon.config.Configuration; import org.horizon.transaction.DummyTransactionManagerLookup; @@ -33,18 +33,18 @@ @Test(groups = "functional") public class LocalModeTxTest { - private CacheSPI<String, String> createCache() { + private Cache<String, String> createCache() { Configuration cfg = new Configuration(); cfg.setTransactionManagerLookupClass(DummyTransactionManagerLookup.class.getName()); UnitTestCacheManager cm = new UnitTestCacheManager(cfg); - return (CacheSPI<String, String>) cm.createCache("test"); + return cm.createCache("test"); } public void testTxCommit1() throws Exception { - CacheSPI c = null; + Cache c = null; try { c = createCache(); - TransactionManager tm = c.getTransactionManager(); + TransactionManager tm = TestingUtil.getTransactionManager(c); tm.begin(); c.put("key", "value"); Transaction t = tm.suspend(); @@ -59,10 +59,10 @@ } public void testTxCommit2() throws Exception { - CacheSPI c = null; + Cache c = null; try { c = createCache(); - TransactionManager tm = c.getTransactionManager(); + TransactionManager tm = TestingUtil.getTransactionManager(c); c.put("key", "old"); tm.begin(); assert c.get("key").equals("old"); Modified: core/branches/flat/src/test/java/org/horizon/tx/MarkAsRollbackTest.java =================================================================== --- core/branches/flat/src/test/java/org/horizon/tx/MarkAsRollbackTest.java 2009-02-09 18:29:53 UTC (rev 7668) +++ core/branches/flat/src/test/java/org/horizon/tx/MarkAsRollbackTest.java 2009-02-09 18:30:59 UTC (rev 7669) @@ -2,7 +2,7 @@ import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import org.horizon.CacheSPI; +import org.horizon.Cache; import org.horizon.UnitTestCacheFactory; import org.horizon.config.Configuration; import org.horizon.transaction.DummyTransactionManagerLookup; @@ -19,9 +19,9 @@ public void testMarkAsRollbackAfterMods() throws Exception { Configuration c = new Configuration(); c.setTransactionManagerLookupClass(DummyTransactionManagerLookup.class.getName()); - CacheSPI<String, String> cache = (CacheSPI<String, String>) new UnitTestCacheFactory<String, String>().createCache(c); + Cache<String, String> cache = new UnitTestCacheFactory<String, String>().createCache(c); try { - TransactionManager tm = cache.getTransactionManager(); + TransactionManager tm = TestingUtil.getTransactionManager(cache); assert tm != null; tm.begin(); cache.put("k", "v"); @@ -46,9 +46,9 @@ public void testMarkAsRollbackBeforeMods() throws Exception { Configuration c = new Configuration(); c.setTransactionManagerLookupClass(DummyTransactionManagerLookup.class.getName()); - CacheSPI<String, String> cache = (CacheSPI<String, String>) new UnitTestCacheFactory<String, String>().createCache(c); + Cache<String, String> cache = new UnitTestCacheFactory<String, String>().createCache(c); try { - TransactionManager tm = cache.getTransactionManager(); + TransactionManager tm = TestingUtil.getTransactionManager(cache); assert tm != null; tm.begin(); tm.setRollbackOnly();

15 years, 10 months

1
0
0 / 0

JBoss Cache SVN: r7668 - core/branches/flat/src/test/java/org/horizon/api.

by jbosscache-commits＠lists.jboss.org

Author: manik.surtani(a)jboss.com Date: 2009-02-09 13:29:53 -0500 (Mon, 09 Feb 2009) New Revision: 7668 Added: core/branches/flat/src/test/java/org/horizon/api/CacheClusterJoinTest.java Removed: core/branches/flat/src/test/java/org/horizon/api/CacheSPITest.java Log: Renamed test Copied: core/branches/flat/src/test/java/org/horizon/api/CacheClusterJoinTest.java (from rev 7666, core/branches/flat/src/test/java/org/horizon/api/CacheSPITest.java) =================================================================== --- core/branches/flat/src/test/java/org/horizon/api/CacheClusterJoinTest.java (rev 0) +++ core/branches/flat/src/test/java/org/horizon/api/CacheClusterJoinTest.java 2009-02-09 18:29:53 UTC (rev 7668) @@ -0,0 +1,65 @@ +package org.horizon.api; + +import org.horizon.BaseClusteredTest; +import org.horizon.Cache; +import org.horizon.config.Configuration; +import org.horizon.config.Configuration.CacheMode; +import org.horizon.manager.CacheManager; +import org.horizon.util.TestingUtil; +import org.testng.annotations.BeforeMethod; +import org.testng.annotations.Test; + +import java.util.List; + +@Test(groups = "functional", sequential = true) +public class CacheClusterJoinTest extends BaseClusteredTest { + Cache cache1, cache2; + CacheManager cm1, cm2; + Configuration cfg; + + @BeforeMethod(alwaysRun = true) + public void setUp() throws Exception { + cm1 = addClusterEnabledCacheManager(); + cfg = new Configuration(); + cfg.setCacheMode(CacheMode.REPL_SYNC); + cm1.defineCache("cache", cfg); + } + + public void testGetMembers() throws Exception { + cm1.getCache("cache"); // this will make sure any lazy components are started. + List memb1 = cm1.getMembers(); + assert 1 == memb1.size(); + + Object coord = memb1.get(0); + + cm2 = addClusterEnabledCacheManager(); + cm2.defineCache("cache", cfg); + cm2.getCache("cache"); // this will make sure any lazy components are started. + TestingUtil.blockUntilViewsReceived(50000, true, cm1, cm2); + memb1 = cm1.getMembers(); + List memb2 = cm2.getMembers(); + assert 2 == memb1.size(); + assert memb1.equals(memb2); + + cm1.stop(); + TestingUtil.blockUntilViewsReceived(50000, false, cm2); + memb2 = cm2.getMembers(); + assert 1 == memb2.size(); + assert !coord.equals(memb2.get(0)); + } + + public void testIsCoordinator() throws Exception { + cm1.getCache("cache"); // this will make sure any lazy components are started. + assert cm1.isCoordinator(); + + cm2 = addClusterEnabledCacheManager(); + cm2.defineCache("cache", cfg); + cm2.getCache("cache"); // this will make sure any lazy components are started. + assert cm1.isCoordinator(); + assert !cm2.isCoordinator(); + cm1.stop(); + // wait till cache2 gets the view change notification + TestingUtil.blockUntilViewsReceived(50000, false, cm2); + assert cm2.isCoordinator(); + } +} \ No newline at end of file Property changes on: core/branches/flat/src/test/java/org/horizon/api/CacheClusterJoinTest.java ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Deleted: core/branches/flat/src/test/java/org/horizon/api/CacheSPITest.java =================================================================== --- core/branches/flat/src/test/java/org/horizon/api/CacheSPITest.java 2009-02-09 18:29:38 UTC (rev 7667) +++ core/branches/flat/src/test/java/org/horizon/api/CacheSPITest.java 2009-02-09 18:29:53 UTC (rev 7668) @@ -1,80 +0,0 @@ -package org.horizon.api; - -import org.horizon.config.Configuration; -import org.horizon.config.Configuration.CacheMode; -import org.horizon.config.GlobalConfiguration; -import org.horizon.manager.CacheManager; -import org.horizon.manager.DefaultCacheManager; -import org.horizon.util.TestingUtil; -import org.testng.annotations.AfterMethod; -import org.testng.annotations.BeforeMethod; -import org.testng.annotations.Test; - -import java.util.List; - -@Test(groups = "functional") -public class CacheSPITest { - private ThreadLocal<CacheManager> cacheManager1TL = new ThreadLocal<CacheManager>(); - private ThreadLocal<CacheManager> cacheManager2TL = new ThreadLocal<CacheManager>(); - - @BeforeMethod(alwaysRun = true) - public void setUp() throws Exception { - GlobalConfiguration gc = GlobalConfiguration.getClusteredDefault(); - Configuration conf = new Configuration(); - conf.setCacheMode(CacheMode.REPL_SYNC); - - cacheManager1TL.set(new DefaultCacheManager(gc, conf, false)); - cacheManager2TL.set(new DefaultCacheManager(gc, conf, false)); - } - - @AfterMethod(alwaysRun = true) - public void tearDown() throws Exception { - TestingUtil.killCacheManagers(cacheManager1TL.get(), cacheManager2TL.get()); - cacheManager1TL.set(null); - cacheManager2TL.set(null); - } - - public void testGetMembers() throws Exception { - CacheManager cm1 = cacheManager1TL.get(); - CacheManager cm2 = cacheManager2TL.get(); - - cm1.start(); - cm1.getCache(); // this will make sure any lazy components are started. - List memb1 = cm1.getMembers(); - assert 1 == memb1.size(); - - Object coord = memb1.get(0); - - cm2.start(); - cm2.getCache(); // this will make sure any lazy components are started. - TestingUtil.blockUntilViewsReceived(50000, true, cm1, cm2); - memb1 = cm1.getMembers(); - List memb2 = cm2.getMembers(); - assert 2 == memb1.size(); - assert memb1.equals(memb2); - - cm1.stop(); - TestingUtil.blockUntilViewsReceived(50000, false, cm2); - memb2 = cm2.getMembers(); - assert 1 == memb2.size(); - assert !coord.equals(memb2.get(0)); - } - - public void testIsCoordinator() throws Exception { - CacheManager cm1 = cacheManager1TL.get(); - CacheManager cm2 = cacheManager2TL.get(); - - cm1.start(); - cm1.getCache(); // this will make sure any lazy components are started. - assert cm1.isCoordinator(); - - cm2.start(); - cm2.getCache(); // this will make sure any lazy components are started. - assert cm1.isCoordinator(); - assert !cm2.isCoordinator(); - cm1.stop(); - // wait till cache2 gets the view change notification - TestingUtil.blockUntilViewsReceived(50000, false, cm2); - assert cm2.isCoordinator(); - } -} \ No newline at end of file

15 years, 10 months

1
0
0 / 0

JBoss Cache SVN: r7667 - core/branches/flat/src/test/java/org/horizon/expiry.

by jbosscache-commits＠lists.jboss.org

Author: manik.surtani(a)jboss.com Date: 2009-02-09 13:29:38 -0500 (Mon, 09 Feb 2009) New Revision: 7667 Added: core/branches/flat/src/test/java/org/horizon/expiry/ReplicatedExpiryTest.java Log: Added new expiry test Added: core/branches/flat/src/test/java/org/horizon/expiry/ReplicatedExpiryTest.java =================================================================== --- core/branches/flat/src/test/java/org/horizon/expiry/ReplicatedExpiryTest.java (rev 0) +++ core/branches/flat/src/test/java/org/horizon/expiry/ReplicatedExpiryTest.java 2009-02-09 18:29:38 UTC (rev 7667) @@ -0,0 +1,42 @@ +package org.horizon.expiry; + +import org.horizon.BaseClusteredTest; +import org.horizon.Cache; +import org.horizon.config.Configuration; +import org.testng.annotations.BeforeMethod; +import org.testng.annotations.Test; + +import java.util.List; +import java.util.concurrent.TimeUnit; + +@Test(groups = "functional", sequential = true) +public class ReplicatedExpiryTest extends BaseClusteredTest { + + Cache c1, c2; + + @BeforeMethod + public void setUp() { + Configuration cfg = new Configuration(); + cfg.setCacheMode(Configuration.CacheMode.REPL_SYNC); + List<Cache> caches = createClusteredCaches(2, "cache", cfg); + c1 = caches.get(0); + c2 = caches.get(1); + } + + public void testExpiryReplicates() throws InterruptedException { + long start = System.currentTimeMillis(); + long lifespan = 10000; + c1.put("k", "v", lifespan, TimeUnit.MILLISECONDS); + + while (System.currentTimeMillis() < start + lifespan + 1000) { + if (System.currentTimeMillis() < start + lifespan) { + assert c1.get("k").equals("v"); + assert c2.get("k").equals("v"); + } else { + assert c1.get("k") == null; + assert c2.get("k") == null; + } + Thread.sleep(250); + } + } +}

15 years, 10 months

1
0
0 / 0

JBoss Cache SVN: r7666 - core/branches/flat.

by jbosscache-commits＠lists.jboss.org

Author: manik.surtani(a)jboss.com Date: 2009-02-08 06:42:36 -0500 (Sun, 08 Feb 2009) New Revision: 7666 Modified: core/branches/flat/pom.xml Log: Fixed threadcount Modified: core/branches/flat/pom.xml =================================================================== --- core/branches/flat/pom.xml 2009-02-08 11:42:01 UTC (rev 7665) +++ core/branches/flat/pom.xml 2009-02-08 11:42:36 UTC (rev 7666) @@ -88,7 +88,7 @@ <optional>true</optional> </dependency> -  +  <dependency> <groupId>hsqldb</groupId> <artifactId>hsqldb</artifactId> @@ -148,7 +148,7 @@ <version>2.4.3-JBOSS</version> <configuration> <parallel>methods</parallel> - <threadCount>10</threadCount> + <threadCount>1</threadCount> <forkMode>none</forkMode> <trimStackTrace>false</trimStackTrace> <properties>

15 years, 10 months

1
0
0 / 0

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

jbosscache-commits February 2009