- * This is useful for writing tests.
- *
- * @author Greg Luck
- * @version $Id: CountingCacheEntryFactory.java 10789 2018-04-26 02:08:13Z adahanne $
- */
-public class CountingCacheEntryFactory implements UpdatingCacheEntryFactory {
-
- private int count;
- private final Object value;
- private Random random;
-
- /**
- * Creates a new instance
- *
- * @param value the factory always creates values equal to this value
- */
- public CountingCacheEntryFactory(final Object value) {
- this.value = value;
- random = new Random();
- }
-
- /**
- * Fetches an entry.
- */
- public Object createEntry(final Object key) {
- count++;
- if (random.nextInt(2) == 1) {
- return value;
- } else {
- return new Element(key, value);
- }
- }
-
- /**
- * @return number of entries the factory has created.
- */
- public int getCount() {
- return count;
- }
-
- /**
- * Perform an incremental update of data within a CacheEntry.
- * Based on identification of dirty values within a CacheEntry
- * Insert Update or Delete those entries based on the existing value.
- *
- * This method does not return a modified value, because it modifies the value passed into it, relying
- * on the pass by reference feature of Java.
- *
- * Implementations of this method must be thread safe.
- *
- * @param key the cache Key
- * @param value a value copied from the value that belonged to the Element in the cache. Value must be mutable
- * @throws Exception
- */
- public void updateEntryValue(Object key, Object value) throws Exception {
- count++;
- if (key.equals("explode") && count > 1) {
- throw new RuntimeException("EXPLODE!");
- }
- }
-
-}
Index: rctags/ehcache-2.10.7.0.37/system-tests/src/test/java/org/terracotta/ehcache/tests/OverflowToDiskStandaloneCacheTest.java
===================================================================
diff -u -N
--- rctags/ehcache-2.10.7.0.37/system-tests/src/test/java/org/terracotta/ehcache/tests/OverflowToDiskStandaloneCacheTest.java (revision 10990)
+++ rctags/ehcache-2.10.7.0.37/system-tests/src/test/java/org/terracotta/ehcache/tests/OverflowToDiskStandaloneCacheTest.java (revision 0)
@@ -1,45 +0,0 @@
-/*
- * All content copyright (c) 2003-2008 Terracotta, Inc., except as may otherwise be noted in a separate copyright
- * notice. All rights reserved.
- */
-package org.terracotta.ehcache.tests;
-
-import com.tc.test.config.model.TestConfig;
-
-import java.io.BufferedReader;
-import java.io.File;
-import java.io.FileReader;
-
-/**
- * @author cdennis
- */
-public class OverflowToDiskStandaloneCacheTest extends AbstractCacheTestBase {
-
- public OverflowToDiskStandaloneCacheTest(TestConfig testConfig) {
- super("overflow-to-disk-cache-test.xml", testConfig);
- }
-
- @Override
- protected void evaluateClientOutput(String clientName, int exitCode, File output) throws Throwable {
- if ((exitCode == 0)) { throw new AssertionError("Client " + clientName + " exited with exit code: " + exitCode); }
-
- FileReader fr = null;
- try {
- fr = new FileReader(output);
- BufferedReader reader = new BufferedReader(fr);
- String st = "";
- while ((st = reader.readLine()) != null) {
- if (st.contains("InvalidConfigurationException")) return;
- }
- throw new AssertionError("Client " + clientName + " did not pass");
- } catch (Exception e) {
- throw new AssertionError(e);
- } finally {
- try {
- fr.close();
- } catch (Exception e) {
- //
- }
- }
- }
-}
Index: rctags/ehcache-2.10.7.0.37/system-tests/src/test/resources/double-config-cache-test.xml
===================================================================
diff -u -N
--- rctags/ehcache-2.10.7.0.37/system-tests/src/test/resources/double-config-cache-test.xml (revision 10990)
+++ rctags/ehcache-2.10.7.0.37/system-tests/src/test/resources/double-config-cache-test.xml (revision 0)
@@ -1,25 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- PORT
-
-
-
-
-
Index: rctags/ehcache-2.10.7.0.37/terracotta/bootstrap/src/main/java/org/terracotta/modules/ehcache/store/ToolkitNonStopExceptionOnTimeoutConfiguration.java
===================================================================
diff -u -N
--- rctags/ehcache-2.10.7.0.37/terracotta/bootstrap/src/main/java/org/terracotta/modules/ehcache/store/ToolkitNonStopExceptionOnTimeoutConfiguration.java (revision 10990)
+++ rctags/ehcache-2.10.7.0.37/terracotta/bootstrap/src/main/java/org/terracotta/modules/ehcache/store/ToolkitNonStopExceptionOnTimeoutConfiguration.java (revision 0)
@@ -1,27 +0,0 @@
-/*
- * All content copyright Terracotta, Inc., unless otherwise indicated. All rights reserved.
- */
-package org.terracotta.modules.ehcache.store;
-
-import net.sf.ehcache.config.NonstopConfiguration;
-
-import org.terracotta.toolkit.nonstop.NonStopConfigurationFields.NonStopReadTimeoutBehavior;
-import org.terracotta.toolkit.nonstop.NonStopConfigurationFields.NonStopWriteTimeoutBehavior;
-
-public class ToolkitNonStopExceptionOnTimeoutConfiguration extends ToolkitNonStopConfiguration {
-
- public ToolkitNonStopExceptionOnTimeoutConfiguration(NonstopConfiguration ehcacheNonStopConfig) {
- super(ehcacheNonStopConfig);
- }
-
- @Override
- public NonStopReadTimeoutBehavior getReadOpNonStopTimeoutBehavior() {
- return NonStopReadTimeoutBehavior.EXCEPTION;
- }
-
- @Override
- public NonStopWriteTimeoutBehavior getWriteOpNonStopTimeoutBehavior() {
- return NonStopWriteTimeoutBehavior.EXCEPTION;
- }
-
-}
Index: rctags/ehcache-2.10.7.0.37/ehcache-core/src/main/java/net/sf/ehcache/statistics/package.html
===================================================================
diff -u -N
--- rctags/ehcache-2.10.7.0.37/ehcache-core/src/main/java/net/sf/ehcache/statistics/package.html (revision 10990)
+++ rctags/ehcache-2.10.7.0.37/ehcache-core/src/main/java/net/sf/ehcache/statistics/package.html (revision 0)
@@ -1,8 +0,0 @@
-
-
-
-
-This package contains classes related to LiveCacheStatistics and its implementation.
-
-
-
Index: rctags/ehcache-2.10.7.0.37/ehcache-core/src/test/java/net/sf/ehcache/hibernate/domain/VersionedItem.java
===================================================================
diff -u -N
--- rctags/ehcache-2.10.7.0.37/ehcache-core/src/test/java/net/sf/ehcache/hibernate/domain/VersionedItem.java (revision 10990)
+++ rctags/ehcache-2.10.7.0.37/ehcache-core/src/test/java/net/sf/ehcache/hibernate/domain/VersionedItem.java (revision 0)
@@ -1,28 +0,0 @@
-/**
- * Copyright Terracotta, Inc.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package net.sf.ehcache.hibernate.domain;
-
-public class VersionedItem extends Item {
- private Long version;
-
- public Long getVersion() {
- return version;
- }
-
- public void setVersion(Long version) {
- this.version = version;
- }
-}
Index: rctags/ehcache-2.10.7.0.37/ehcache-search-parser/src/main/java/net/sf/ehcache/search/parser/MAggregate.java
===================================================================
diff -u -N
--- rctags/ehcache-2.10.7.0.37/ehcache-search-parser/src/main/java/net/sf/ehcache/search/parser/MAggregate.java (revision 10990)
+++ rctags/ehcache-2.10.7.0.37/ehcache-search-parser/src/main/java/net/sf/ehcache/search/parser/MAggregate.java (revision 0)
@@ -1,130 +0,0 @@
-/**
- * Copyright Terracotta, Inc.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package net.sf.ehcache.search.parser;
-
-import net.sf.ehcache.search.aggregator.Aggregator;
-
-public class MAggregate implements ModelElement {
-
- /**
- * The aggregation type enum.
- */
- public static enum AggOp {
- /**
- * The Sum.
- */
- Sum,
- /**
- * The Min.
- */
- Min,
- /**
- * The Max.
- */
- Max,
- /**
- * The Average.
- */
- Average,
- /**
- * The Count.
- */
- Count
- }
-
- ;
-
- /**
- * The op.
- */
- private final AggOp op;
-
- /**
- * The attribute.
- */
- private final MAttribute ma;
-
- /**
- * Instantiates a new m aggregate.
- *
- * @param op the operation
- * @param ma the attribute
- */
- public MAggregate(AggOp op, MAttribute ma) {
- this.op = op;
- this.ma = ma;
- }
-
- /*
- * (non-Javadoc)
- * @see java.lang.Object#toString()
- */
- public String toString() {
- return op.toString().toLowerCase() + "(" + ma + ")";
- }
-
- @Override
- public int hashCode() {
- final int prime = 31;
- int result = 1;
- result = prime * result + ((ma == null) ? 0 : ma.hashCode());
- result = prime * result + ((op == null) ? 0 : op.hashCode());
- return result;
- }
-
- @Override
- public boolean equals(Object obj) {
- if (this == obj) return true;
- if (obj == null) return false;
- if (getClass() != obj.getClass()) return false;
- MAggregate other = (MAggregate)obj;
- if (ma == null) {
- if (other.ma != null) return false;
- } else if (!ma.equals(other.ma)) return false;
- if (op != other.op) return false;
- return true;
- }
-
- public AggOp getOp() {
- return op;
- }
-
- public MAttribute getAttribute() {
- return ma;
- }
-
- /**
- * Return this model aggregator as an ehacache aggregator.
- *
- * @return the aggregator
- */
- public Aggregator asEhcacheObject(ClassLoader loader) {
- switch (op) {
- case Sum:
- return ma.asEhcacheObject(loader).sum();
- case Min:
- return ma.asEhcacheObject(loader).min();
- case Max:
- return ma.asEhcacheObject(loader).max();
- case Count:
- return ma.asEhcacheObject(loader).count();
- case Average:
- return ma.asEhcacheObject(loader).average();
- }
- throw new IllegalStateException("Unknown agg operator: " + op);
- }
-
-}
Index: rctags/ehcache-2.10.7.0.37/ehcache-search-parser/.classpath
===================================================================
diff -u -N
--- rctags/ehcache-2.10.7.0.37/ehcache-search-parser/.classpath (revision 10990)
+++ rctags/ehcache-2.10.7.0.37/ehcache-search-parser/.classpath (revision 0)
@@ -1,37 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
Index: rctags/ehcache-2.10.7.0.37/system-tests/src/test/java/org/terracotta/ehcache/tests/txns/TwoResourceBTMXATest.java
===================================================================
diff -u -N
--- rctags/ehcache-2.10.7.0.37/system-tests/src/test/java/org/terracotta/ehcache/tests/txns/TwoResourceBTMXATest.java (revision 10990)
+++ rctags/ehcache-2.10.7.0.37/system-tests/src/test/java/org/terracotta/ehcache/tests/txns/TwoResourceBTMXATest.java (revision 0)
@@ -1,33 +0,0 @@
-/*
- * All content copyright Terracotta, Inc., unless otherwise indicated. All rights reserved.
- */
-package org.terracotta.ehcache.tests.txns;
-
-import org.terracotta.ehcache.tests.AbstractCacheTestBase;
-import org.terracotta.test.util.TestBaseUtil;
-
-import bitronix.tm.TransactionManagerServices;
-
-import com.tc.test.config.model.TestConfig;
-
-import java.util.ArrayList;
-import java.util.List;
-
-public class TwoResourceBTMXATest extends AbstractCacheTestBase {
-
- public TwoResourceBTMXATest(TestConfig testConfig) {
- super("two-resource-xa-test.xml", testConfig, BTMTwoResourceTx1.class, BTMTwoResourceTx2.class);
- testConfig.getClientConfig().setParallelClients(true);
-
- // DEV-3930
- // disableAllUntil("2010-03-31");
- }
-
- @Override
- protected List getExtraJars() {
- List extraJars = new ArrayList();
- extraJars.add(TestBaseUtil.jarFor(TransactionManagerServices.class));
- return extraJars;
- }
-
-}
Index: rctags/ehcache-2.10.7.0.37/ehcache-core/src/main/java/net/sf/ehcache/transaction/SoftLockFactory.java
===================================================================
diff -u -N
--- rctags/ehcache-2.10.7.0.37/ehcache-core/src/main/java/net/sf/ehcache/transaction/SoftLockFactory.java (revision 10990)
+++ rctags/ehcache-2.10.7.0.37/ehcache-core/src/main/java/net/sf/ehcache/transaction/SoftLockFactory.java (revision 0)
@@ -1,35 +0,0 @@
-/**
- * Copyright Terracotta, Inc.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package net.sf.ehcache.transaction;
-
-/**
- * A factory of soft-locks supporting a specific isolation level.
- *
- * @author Chris Dennis
- */
-public interface SoftLockFactory {
-
- /**
- * Construct a new softlock to be managed by the given manager for a specific key.
- *
- * @param manager soft lock manager
- * @param key key to generate against
- * @return a new soft lock
- */
- SoftLock newSoftLock(SoftLockManager manager, Object key);
-
-}
Index: rctags/ehcache-2.10.7.0.37/ehcache-scheduled-refresh/src/main/java/net/sf/ehcache/constructs/scheduledrefresh/RefreshBatchJob.java
===================================================================
diff -u -N
--- rctags/ehcache-2.10.7.0.37/ehcache-scheduled-refresh/src/main/java/net/sf/ehcache/constructs/scheduledrefresh/RefreshBatchJob.java (revision 10990)
+++ rctags/ehcache-2.10.7.0.37/ehcache-scheduled-refresh/src/main/java/net/sf/ehcache/constructs/scheduledrefresh/RefreshBatchJob.java (revision 0)
@@ -1,157 +0,0 @@
-/**
- * Copyright Terracotta, Inc.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package net.sf.ehcache.constructs.scheduledrefresh;
-
-import net.sf.ehcache.CacheManager;
-import net.sf.ehcache.Ehcache;
-import net.sf.ehcache.Element;
-import net.sf.ehcache.loader.CacheLoader;
-import org.quartz.Job;
-import org.quartz.JobDataMap;
-import org.quartz.JobExecutionContext;
-import org.quartz.JobExecutionException;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import java.util.Collection;
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.Map;
-import java.util.concurrent.atomic.AtomicInteger;
-import java.util.concurrent.locks.ReentrantLock;
-
-/**
- * This class is used to actually process a batch of keys for refreshing.
- * Instances of this job are scheduled by the {@link OverseerJob} class.
- *
- * @author cschanck
- */
-public class RefreshBatchJob implements Job {
-
- private static final Logger LOG = LoggerFactory.getLogger(OverseerJob.class);
- private static HashMap bulkLoadTrackingMap = new HashMap(1);
- private static ReentrantLock bulkloadLock = new ReentrantLock();
-
- private static void requestBulkLoadEnabled(Ehcache cache) {
- bulkloadLock.lock();
- try {
- boolean prior = cache.isNodeBulkLoadEnabled();
- // yes, this is racy. we can do no better until we have per-thread bulk loading
- if (prior) {
- String key = cache.getCacheManager().getName() + "/" + cache.getName();
- AtomicInteger permits = bulkLoadTrackingMap.get(key);
- if (permits == null) {
- // first time in. actually switch it
- permits = new AtomicInteger(1);
- bulkLoadTrackingMap.put(key, permits);
- cache.setNodeBulkLoadEnabled(true);
- } else {
- permits.incrementAndGet();
- }
- }
- } finally {
- bulkloadLock.unlock();
- }
- }
-
- private static void requestBulkLoadRestored(Ehcache cache) {
- bulkloadLock.lock();
- try {
- String key = cache.getCacheManager().getName() + "/" + cache.getName();
- AtomicInteger permits = bulkLoadTrackingMap.get(key);
- if (permits != null) {
- if (permits.decrementAndGet() == 0) {
- // last one out. reset it to true
- bulkLoadTrackingMap.remove(key);
- cache.setNodeBulkLoadEnabled(true);
- }
- }
- } finally {
- bulkloadLock.unlock();
- }
- }
-
- @SuppressWarnings({ "unchecked", "rawtypes" })
- @Override
- public void execute(JobExecutionContext context) throws JobExecutionException {
- try {
- JobDataMap jdm = context.getMergedJobDataMap();
- ScheduledRefreshConfiguration config = (ScheduledRefreshConfiguration) jdm.get(ScheduledRefreshCacheExtension
- .PROP_CONFIG_OBJECT);
- String cacheManagerName = jdm.getString(ScheduledRefreshCacheExtension.PROP_CACHE_MGR_NAME);
- String cacheName = jdm.getString(ScheduledRefreshCacheExtension.PROP_CACHE_NAME);
-
- CacheManager cacheManager = CacheManager.getCacheManager(cacheManagerName);
- Ehcache underlyingCache = cacheManager.getEhcache(cacheName);
-
- HashSet keysToProcess = new HashSet((Collection) jdm.get(
- ScheduledRefreshCacheExtension.PROP_KEYS_TO_PROCESS));
-
- ScheduledRefreshCacheExtension extension = ScheduledRefreshCacheExtension.findExtensionFromCache(underlyingCache,
- context.getJobDetail().getKey().getGroup());
- boolean keepingStats=false;
- if (extension != null) {
- extension.incrementJobCount();
- extension.incrementProcessedCount(keysToProcess.size());
- keepingStats=true;
- }
-
- LOG.info("Scheduled refresh batch job: " + context.getJobDetail().getKey() + " size: " + keysToProcess.size()+" "+OverseerJob.statsNote(keepingStats));
- try {
- if (config.isUseBulkload()) {
- requestBulkLoadEnabled(underlyingCache);
- }
- } catch (UnsupportedOperationException e) {
- LOG.warn("Bulk Load requested for cache that does not support bulk load.");
- }
-
- // iterate through the loaders
- for (CacheLoader loader : underlyingCache.getRegisteredCacheLoaders()) {
- // if we are out of keys, punt
- if (keysToProcess.isEmpty()) {
- break;
- }
-
- // try and load them all
- Map values = loader.loadAll(keysToProcess);
- // subtract the ones that were loaded
- keysToProcess.removeAll(values.keySet());
- for (Map.Entry entry : values.entrySet()) {
- Element newElement = new Element(entry.getKey(), entry.getValue());
- underlyingCache.put(newElement);
- }
- }
- // assume we got here ok, now evict any that don't evict
- if (config.isEvictOnLoadMiss() && !keysToProcess.isEmpty()) {
- underlyingCache.removeAll(keysToProcess);
- }
-
- try {
- if (config.isUseBulkload()) {
- requestBulkLoadRestored(underlyingCache);
- }
- } catch (UnsupportedOperationException e) {
- // warned above.
- }
- }
- catch(Throwable t) {
- LOG.warn("Scheduled refresh batch job failure: " + context.getJobDetail().getKey(), t);
- }
-
- }
-
-}
Index: rctags/ehcache-2.10.7.0.37/ehcache-core/src/main/java/net/sf/ehcache/config/generator/model/elements/SizeOfPolicyConfigurationElement.java
===================================================================
diff -u -N
--- rctags/ehcache-2.10.7.0.37/ehcache-core/src/main/java/net/sf/ehcache/config/generator/model/elements/SizeOfPolicyConfigurationElement.java (revision 10990)
+++ rctags/ehcache-2.10.7.0.37/ehcache-core/src/main/java/net/sf/ehcache/config/generator/model/elements/SizeOfPolicyConfigurationElement.java (revision 0)
@@ -1,67 +0,0 @@
-/**
- * Copyright Terracotta, Inc.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package net.sf.ehcache.config.generator.model.elements;
-
-import net.sf.ehcache.config.SizeOfPolicyConfiguration;
-import net.sf.ehcache.config.generator.model.NodeElement;
-import net.sf.ehcache.config.generator.model.SimpleNodeAttribute;
-import net.sf.ehcache.config.generator.model.SimpleNodeElement;
-
-/**
- * Element representing the {@link net.sf.ehcache.config.SizeOfPolicyConfiguration}
- *
- * @author Ludovic Orban
- *
- */
-public class SizeOfPolicyConfigurationElement extends SimpleNodeElement {
- private final SizeOfPolicyConfiguration sizeOfPolicyConfiguration;
-
- /**
- * Construtor accepting the parent and the {@link net.sf.ehcache.config.SizeOfPolicyConfiguration}
- *
- * @param parent
- * @param sizeOfPolicyConfiguration
- */
- public SizeOfPolicyConfigurationElement(ConfigurationElement parent, SizeOfPolicyConfiguration sizeOfPolicyConfiguration) {
- super(parent, "sizeOfPolicy");
- this.sizeOfPolicyConfiguration = sizeOfPolicyConfiguration;
- init();
- }
-
- /**
- * Construtor accepting the element and the {@link net.sf.ehcache.config.SizeOfPolicyConfiguration}
- *
- * @param element
- * @param sizeOfPolicyConfiguration
- */
- public SizeOfPolicyConfigurationElement(NodeElement element, SizeOfPolicyConfiguration sizeOfPolicyConfiguration) {
- super(element, "sizeOfPolicy");
- this.sizeOfPolicyConfiguration = sizeOfPolicyConfiguration;
- init();
- }
-
- private void init() {
- if (sizeOfPolicyConfiguration == null) {
- return;
- }
- addAttribute(new SimpleNodeAttribute("maxDepth", sizeOfPolicyConfiguration.getMaxDepth())
- .optional(true).defaultValue(SizeOfPolicyConfiguration.DEFAULT_MAX_SIZEOF_DEPTH));
- addAttribute(new SimpleNodeAttribute("maxDepthExceededBehavior", sizeOfPolicyConfiguration.getMaxDepthExceededBehavior())
- .optional(true).defaultValue(SizeOfPolicyConfiguration.DEFAULT_MAX_DEPTH_EXCEEDED_BEHAVIOR));
- }
-
-}
Index: rctags/ehcache-2.10.7.0.37/ehcache-core/src/main/java/net/sf/ehcache/store/compound/ReadWriteSerializationCopyStrategy.java
===================================================================
diff -u -N
--- rctags/ehcache-2.10.7.0.37/ehcache-core/src/main/java/net/sf/ehcache/store/compound/ReadWriteSerializationCopyStrategy.java (revision 10990)
+++ rctags/ehcache-2.10.7.0.37/ehcache-core/src/main/java/net/sf/ehcache/store/compound/ReadWriteSerializationCopyStrategy.java (revision 0)
@@ -1,132 +0,0 @@
-/**
- * Copyright Terracotta, Inc.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package net.sf.ehcache.store.compound;
-
-import java.io.ByteArrayInputStream;
-import java.io.ByteArrayOutputStream;
-import java.io.ObjectInputStream;
-import java.io.ObjectOutputStream;
-
-import net.sf.ehcache.CacheException;
-import net.sf.ehcache.Element;
-import net.sf.ehcache.ElementIdHelper;
-import net.sf.ehcache.util.PreferredLoaderObjectInputStream;
-
-/**
- * A copy strategy that can use partial (if both copy on read and copy on write are set) or full Serialization to copy the object graph
- *
- * @author Alex Snaps
- * @author Ludovic Orban
- */
-public class ReadWriteSerializationCopyStrategy implements ReadWriteCopyStrategy {
-
- private static final long serialVersionUID = 2659269742281205622L;
-
- /**
- * Deep copies some object and returns an internal storage-ready copy
- *
- * @param value the value to copy
- * @return the storage-ready copy
- */
- public Element copyForWrite(Element value, ClassLoader loader) {
- if (value == null) {
- return null;
- } else {
- ByteArrayOutputStream bout = new ByteArrayOutputStream();
- ObjectOutputStream oos = null;
-
- if (value.getObjectValue() == null) {
- return duplicateElementWithNewValue(value, null);
- }
-
- try {
- oos = new ObjectOutputStream(bout);
- oos.writeObject(value.getObjectValue());
- } catch (Exception e) {
- throw new CacheException("When configured copyOnRead or copyOnWrite, a Store will only accept Serializable values", e);
- } finally {
- try {
- if (oos != null) {
- oos.close();
- }
- } catch (Exception e) {
- //
- }
- }
-
- return duplicateElementWithNewValue(value, bout.toByteArray());
- }
- }
-
- /**
- * Reconstruct an object from its storage-ready copy.
- *
- * @param storedValue the storage-ready copy
- * @return the original object
- */
- public Element copyForRead(Element storedValue, ClassLoader loader) {
- if (storedValue == null) {
- return null;
- } else {
- if (storedValue.getObjectValue() == null) {
- return duplicateElementWithNewValue(storedValue, null);
- }
-
- ByteArrayInputStream bin = new ByteArrayInputStream((byte[]) storedValue.getObjectValue());
- ObjectInputStream ois = null;
- try {
- ois = new PreferredLoaderObjectInputStream(bin, loader);
- return duplicateElementWithNewValue(storedValue, ois.readObject());
- } catch (Exception e) {
- throw new CacheException("When configured copyOnRead or copyOnWrite, a Store will only accept Serializable values", e);
- } finally {
- try {
- if (ois != null) {
- ois.close();
- }
- } catch (Exception e) {
- //
- }
- }
- }
- }
-
- /**
- * Make a duplicate of an element but using the specified value
- *
- * @param element the element to duplicate
- * @param newValue the new element's value
- * @return the duplicated element
- */
- public Element duplicateElementWithNewValue(final Element element, final Object newValue) {
- Element newElement;
- if (element.usesCacheDefaultLifespan()) {
- newElement = new Element(element.getObjectKey(), newValue, element.getVersion(),
- element.getCreationTime(), element.getLastAccessTime(), element.getHitCount(), element.usesCacheDefaultLifespan(),
- Integer.MIN_VALUE, Integer.MIN_VALUE, element.getLastUpdateTime());
- } else {
- newElement = new Element(element.getObjectKey(), newValue, element.getVersion(),
- element.getCreationTime(), element.getLastAccessTime(), element.getHitCount(), element.usesCacheDefaultLifespan(),
- element.getTimeToLive(), element.getTimeToIdle(), element.getLastUpdateTime());
- }
- if (ElementIdHelper.hasId(element)) {
- ElementIdHelper.setId(newElement, ElementIdHelper.getId(element));
- }
- return newElement;
- }
-
-}
Index: rctags/ehcache-2.10.7.0.37/ehcache-core/src/main/java/net/sf/ehcache/constructs/refreshahead/RefreshAheadCacheFactory.java
===================================================================
diff -u -N
--- rctags/ehcache-2.10.7.0.37/ehcache-core/src/main/java/net/sf/ehcache/constructs/refreshahead/RefreshAheadCacheFactory.java (revision 10990)
+++ rctags/ehcache-2.10.7.0.37/ehcache-core/src/main/java/net/sf/ehcache/constructs/refreshahead/RefreshAheadCacheFactory.java (revision 0)
@@ -1,45 +0,0 @@
-/**
- * Copyright Terracotta, Inc.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package net.sf.ehcache.constructs.refreshahead;
-
-import java.util.Properties;
-
-import net.sf.ehcache.Ehcache;
-import net.sf.ehcache.constructs.CacheDecoratorFactory;
-
-/**
- * Cache decorator factory for {@link RefreshAheadCache} instances
- *
- * @author cschanck
- *
- */
-public class RefreshAheadCacheFactory extends CacheDecoratorFactory {
-
- @Override
- public Ehcache createDecoratedEhcache(Ehcache cache, Properties properties) {
- RefreshAheadCacheConfiguration config = new RefreshAheadCacheConfiguration().fromProperties(properties).build();
- RefreshAheadCache decorator = new RefreshAheadCache(cache, config);
- return decorator;
- }
-
- @Override
- public Ehcache createDefaultDecoratedEhcache(Ehcache cache, Properties properties) {
- RefreshAheadCacheConfiguration config = new RefreshAheadCacheConfiguration().fromProperties(properties).build();
- RefreshAheadCache decorator = new RefreshAheadCache(cache, config);
- return decorator;
- }
-
-}
Index: rctags/ehcache-2.10.7.0.37/ehcache-core/src/main/java/net/sf/ehcache/transaction/DelegatingTransactionIDFactory.java
===================================================================
diff -u -N
--- rctags/ehcache-2.10.7.0.37/ehcache-core/src/main/java/net/sf/ehcache/transaction/DelegatingTransactionIDFactory.java (revision 10990)
+++ rctags/ehcache-2.10.7.0.37/ehcache-core/src/main/java/net/sf/ehcache/transaction/DelegatingTransactionIDFactory.java (revision 0)
@@ -1,151 +0,0 @@
-/**
- * Copyright Terracotta, Inc.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package net.sf.ehcache.transaction;
-
-import net.sf.ehcache.Ehcache;
-import net.sf.ehcache.FeaturesManager;
-import net.sf.ehcache.terracotta.ClusteredInstanceFactory;
-import net.sf.ehcache.terracotta.TerracottaClient;
-import net.sf.ehcache.transaction.xa.XidTransactionID;
-
-import java.util.Set;
-import java.util.UUID;
-import java.util.concurrent.atomic.AtomicReference;
-
-import javax.transaction.xa.Xid;
-
-/**
- * A TransactionIDFactory implementation with delegates calls to either a clustered
- * or non-clustered factory
- *
- * @author Ludovic Orban
- */
-public class DelegatingTransactionIDFactory implements TransactionIDFactory {
-
- private final FeaturesManager featuresManager;
- private final TerracottaClient terracottaClient;
- private final String cacheManagerName;
- private volatile ClusteredInstanceFactory clusteredInstanceFactory;
- private volatile AtomicReference transactionIDFactory = new AtomicReference();
-
- /**
- * Create a new DelegatingTransactionIDFactory
- *
- * @param terracottaClient a terracotta client
- * @param cacheManagerName the name of the cache manager which creates this.
- */
- public DelegatingTransactionIDFactory(FeaturesManager featuresManager, TerracottaClient terracottaClient, String cacheManagerName) {
- this.featuresManager = featuresManager;
- this.terracottaClient = terracottaClient;
- this.cacheManagerName = cacheManagerName;
- }
-
- private TransactionIDFactory get() {
- ClusteredInstanceFactory cif = terracottaClient.getClusteredInstanceFactory();
- if (cif != null && cif != this.clusteredInstanceFactory) {
- this.transactionIDFactory.set(cif.createTransactionIDFactory(UUID.randomUUID().toString(), cacheManagerName));
- this.clusteredInstanceFactory = cif;
- }
-
- if (transactionIDFactory.get() == null) {
- TransactionIDFactory constructed;
- if (featuresManager == null) {
- constructed = new TransactionIDFactoryImpl();
- } else {
- constructed = featuresManager.createTransactionIDFactory();
- }
- if (transactionIDFactory.compareAndSet(null, constructed)) {
- return constructed;
- } else {
- return transactionIDFactory.get();
- }
- } else {
- return transactionIDFactory.get();
- }
- }
-
- /**
- * {@inheritDoc}
- */
- public TransactionID createTransactionID() {
- return get().createTransactionID();
- }
-
- /**
- * {@inheritDoc}
- */
- public TransactionID restoreTransactionID(TransactionIDSerializedForm serializedForm) {
- return get().restoreTransactionID(serializedForm);
- }
-
- /**
- * {@inheritDoc}
- */
- public XidTransactionID createXidTransactionID(Xid xid, Ehcache cache) {
- return get().createXidTransactionID(xid, cache);
- }
-
- /**
- * {@inheritDoc}
- */
- public XidTransactionID restoreXidTransactionID(XidTransactionIDSerializedForm serializedForm) {
- return get().restoreXidTransactionID(serializedForm);
- }
-
- @Override
- public void markForCommit(TransactionID transactionID) {
- get().markForCommit(transactionID);
- }
-
- @Override
- public void markForRollback(XidTransactionID transactionID) {
- get().markForRollback(transactionID);
- }
-
- @Override
- public boolean isDecisionCommit(TransactionID transactionID) {
- return get().isDecisionCommit(transactionID);
- }
-
- @Override
- public void clear(TransactionID transactionID) {
- get().clear(transactionID);
- }
-
- @Override
- public Set getAllXidTransactionIDsFor(Ehcache cache) {
- return get().getAllXidTransactionIDsFor(cache);
- }
-
- @Override
- public Set getAllTransactionIDs() {
- return get().getAllTransactionIDs();
- }
-
- @Override
- public boolean isExpired(TransactionID transactionID) {
- return get().isExpired(transactionID);
- }
-
- @Override
- public Boolean isPersistent() {
- if (transactionIDFactory.get() == null) {
- return null;
- } else {
- return get().isPersistent();
- }
- }
-}
Index: rctags/ehcache-2.10.7.0.37/ehcache-core/src/test/resources/ehcache-conflict-eternal.xml
===================================================================
diff -u -N
--- rctags/ehcache-2.10.7.0.37/ehcache-core/src/test/resources/ehcache-conflict-eternal.xml (revision 10990)
+++ rctags/ehcache-2.10.7.0.37/ehcache-core/src/test/resources/ehcache-conflict-eternal.xml (revision 0)
@@ -1,16 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
Index: rctags/ehcache-2.10.7.0.37/ehcache-core/src/main/java/net/sf/ehcache/store/cachingtier/OnHeapCachingTier.java
===================================================================
diff -u -N
--- rctags/ehcache-2.10.7.0.37/ehcache-core/src/main/java/net/sf/ehcache/store/cachingtier/OnHeapCachingTier.java (revision 10990)
+++ rctags/ehcache-2.10.7.0.37/ehcache-core/src/main/java/net/sf/ehcache/store/cachingtier/OnHeapCachingTier.java (revision 0)
@@ -1,364 +0,0 @@
-/**
- * Copyright Terracotta, Inc.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package net.sf.ehcache.store.cachingtier;
-
-import net.sf.ehcache.CacheException;
-import net.sf.ehcache.Ehcache;
-import net.sf.ehcache.Element;
-import net.sf.ehcache.config.AbstractCacheConfigurationListener;
-import net.sf.ehcache.config.PinningConfiguration;
-import net.sf.ehcache.config.SizeOfPolicyConfiguration;
-import net.sf.ehcache.pool.Pool;
-import net.sf.ehcache.pool.Size;
-import net.sf.ehcache.pool.SizeOfEngine;
-import net.sf.ehcache.pool.SizeOfEngineLoader;
-import net.sf.ehcache.pool.sizeof.annotations.IgnoreSizeOf;
-import net.sf.ehcache.store.CachingTier;
-import net.sf.ehcache.store.FifoPolicy;
-import net.sf.ehcache.store.LfuPolicy;
-import net.sf.ehcache.store.LruPolicy;
-import net.sf.ehcache.store.MemoryStoreEvictionPolicy;
-import net.sf.ehcache.store.Policy;
-
-import java.util.List;
-import java.util.Map;
-import java.util.concurrent.Callable;
-import java.util.concurrent.CopyOnWriteArrayList;
-import net.sf.ehcache.store.StoreOperationOutcomes.GetOutcome;
-import net.sf.ehcache.store.StoreOperationOutcomes.PutOutcome;
-import net.sf.ehcache.store.StoreOperationOutcomes.RemoveOutcome;
-import org.terracotta.context.annotations.ContextChild;
-import org.terracotta.statistics.Statistic;
-import org.terracotta.statistics.observer.OperationObserver;
-
-import static net.sf.ehcache.statistics.StatisticBuilder.operation;
-
-/**
- * An instance of this class will delegate the storage to the backing HeapCacheBackEnd.
- * Adding :
- *
- *
making sure only a single thread populates the cache for a given key at a time
- *
translate calls to the eviction listeners
- *
Add all the crap about sizing and stuff
- *
- *
- * @param The key type
- * @param the value type
- * @author Alex Snaps
- */
-public class OnHeapCachingTier implements CachingTier {
-
- @ContextChild
- private final HeapCacheBackEnd backEnd;
-
- private final OperationObserver getObserver = operation(GetOutcome.class).named("get").of(this).tag("local-heap").build();
- private final OperationObserver putObserver = operation(PutOutcome.class).named("put").of(this).tag("local-heap").build();
- private final OperationObserver removeObserver = operation(RemoveOutcome.class).named("remove").of(this).tag("local-heap").build();
-
-
- private volatile List> listeners = new CopyOnWriteArrayList>();
-
- /**
- * A Constructor
- *
- * @param backEnd the HeapCacheBackEnd that will back this CachingTier
- */
- public OnHeapCachingTier(final HeapCacheBackEnd backEnd) {
- this.backEnd = backEnd;
- this.backEnd.registerEvictionCallback(new HeapCacheBackEnd.EvictionCallback() {
- @Override
- public void evicted(final K key, final Object value) {
- final V v = getValue(value);
- if (v != null) {
- for (Listener listener : listeners) {
- listener.evicted(key, v);
- }
- }
- }
- });
- }
-
- /**
- * Factory method
- * @param cache the cache we're planning to back
- * @param onHeapPool the pool, if any, to use
- * @return the OnHeapCachingTier properly configured for this cache
- */
- public static OnHeapCachingTier createOnHeapCache(final Ehcache cache, final Pool onHeapPool) {
- final HeapCacheBackEnd memCacheBackEnd;
- final Policy memoryEvictionPolicy = determineEvictionPolicy(cache);
- if (cache.getCacheConfiguration().isCountBasedTuned()) {
- final long maxEntriesLocalHeap = getCachingTierMaxEntryCount(cache);
- final CountBasedBackEnd countBasedBackEnd =
- new CountBasedBackEnd(maxEntriesLocalHeap, memoryEvictionPolicy);
- memCacheBackEnd = countBasedBackEnd;
- cache.getCacheConfiguration().addConfigurationListener(new AbstractCacheConfigurationListener() {
- @Override
- public void memoryCapacityChanged(final int oldCapacity, final int newCapacity) {
- countBasedBackEnd.setMaxEntriesLocalHeap(newCapacity);
- }
- });
- } else {
- final PooledBasedBackEnd pooledBasedBackEnd = new PooledBasedBackEnd(memoryEvictionPolicy);
-
- pooledBasedBackEnd.registerAccessor(
- onHeapPool.createPoolAccessor(new PooledBasedBackEnd.PoolParticipant(pooledBasedBackEnd),
- SizeOfPolicyConfiguration.resolveMaxDepth(cache),
- SizeOfPolicyConfiguration.resolveBehavior(cache)
- .equals(SizeOfPolicyConfiguration.MaxDepthExceededBehavior.ABORT)));
-
- memCacheBackEnd = pooledBasedBackEnd;
- }
-
- return new OnHeapCachingTier(
- memCacheBackEnd);
- }
-
- /**
- * Chooses the Policy from the cache configuration
- *
- * @param cache the cache
- * @return the chosen eviction policy
- */
- static Policy determineEvictionPolicy(Ehcache cache) {
- MemoryStoreEvictionPolicy policySelection = cache.getCacheConfiguration().getMemoryStoreEvictionPolicy();
-
- if (policySelection.equals(MemoryStoreEvictionPolicy.LRU)) {
- return new LruPolicy();
- } else if (policySelection.equals(MemoryStoreEvictionPolicy.FIFO)) {
- return new FifoPolicy();
- } else if (policySelection.equals(MemoryStoreEvictionPolicy.LFU)) {
- return new LfuPolicy();
- } else if (policySelection.equals(MemoryStoreEvictionPolicy.CLOCK)) {
- return new LruPolicy();
- }
-
- throw new IllegalArgumentException(policySelection + " isn't a valid eviction policy");
- }
-
-
- private static long getCachingTierMaxEntryCount(final Ehcache cache) {
- final PinningConfiguration pinningConfiguration = cache.getCacheConfiguration().getPinningConfiguration();
- if (pinningConfiguration != null && pinningConfiguration.getStore() != PinningConfiguration.Store.INCACHE) {
- return 0;
- }
- return cache.getCacheConfiguration().getMaxEntriesLocalHeap();
- }
-
- @Override
- public boolean loadOnPut() {
- return backEnd.hasSpace();
- }
-
- @Override
- public V get(final K key, final Callable source, final boolean updateStats) {
- if (updateStats) { getObserver.begin(); }
- Object cachedValue = backEnd.get(key);
- if (cachedValue == null) {
- if (updateStats) { getObserver.end(GetOutcome.MISS); }
- Fault f = new Fault(source);
- cachedValue = backEnd.putIfAbsent(key, f);
- if (cachedValue == null) {
- try {
- V value = f.get();
- putObserver.begin();
- if (value == null) {
- backEnd.remove(key, f);
- } else if (backEnd.replace(key, f, value)) {
- putObserver.end(PutOutcome.ADDED);
- } else {
- V p = getValue(backEnd.remove(key));
- return p == null ? value : p;
- }
- return value;
- } catch (Throwable e) {
- backEnd.remove(key, f);
- if (e instanceof RuntimeException) {
- throw (RuntimeException)e;
- } else {
- throw new CacheException(e);
- }
- }
- }
- } else {
- if (updateStats) { getObserver.end(GetOutcome.HIT); }
- }
-
- return getValue(cachedValue);
- }
-
- @Override
- public V remove(final K key) {
- removeObserver.begin();
- try {
- return getValue(backEnd.remove(key));
- } finally {
- removeObserver.end(RemoveOutcome.SUCCESS);
- }
- }
-
- @Override
- public void clear() {
- backEnd.clear(false);
- }
-
- @Override
- public void clearAndNotify() {
- backEnd.clear(true);
- }
-
- @Override
- public void addListener(final Listener listener) {
- if (listener == null) {
- throw new NullPointerException("Listener can't be null!");
- }
- listeners.add(listener);
- }
-
- @Statistic(name = "size", tags = "local-heap")
- @Override
- public int getInMemorySize() {
- return backEnd.size();
- }
-
- @Override
- public int getOffHeapSize() {
- return 0;
- }
-
- @Override
- public boolean contains(final K key) {
- return backEnd.get(key) != null;
- }
-
- @Statistic(name = "size-in-bytes", tags = "local-heap")
- @Override
- public long getInMemorySizeInBytes() {
- long sizeInBytes;
- if (backEnd instanceof PooledBasedBackEnd) {
- sizeInBytes = ((PooledBasedBackEnd)backEnd).getSizeInBytes();
- } else {
- SizeOfEngine defaultSizeOfEngine = SizeOfEngineLoader.newSizeOfEngine(
- SizeOfPolicyConfiguration.DEFAULT_MAX_SIZEOF_DEPTH,
- SizeOfPolicyConfiguration.DEFAULT_MAX_DEPTH_EXCEEDED_BEHAVIOR == SizeOfPolicyConfiguration.MaxDepthExceededBehavior.ABORT,
- true
- );
- sizeInBytes = 0;
- for (Map.Entry entry : backEnd.entrySet()) {
- // This could leak Fault values... We ignore these entirely
- if (entry.getValue() != null && entry.getValue() instanceof Element) {
- Element element = (Element)entry.getValue();
- // TODO this is a lie here! Should we add a dedicated method to BackEnd to return a container ?
- Size size = defaultSizeOfEngine.sizeOf(element.getObjectKey(), element, null);
- sizeInBytes += size.getCalculated();
- }
- }
- }
- return sizeInBytes;
- }
-
- @Override
- public long getOffHeapSizeInBytes() {
- return 0;
- }
-
- @Override
- public long getOnDiskSizeInBytes() {
- return 0;
- }
-
- @Override
- public void recalculateSize(final K key) {
- backEnd.recalculateSize(key);
- }
-
- @Override
- public Policy getEvictionPolicy() {
- return backEnd.getPolicy();
- }
-
- @Override
- public void setEvictionPolicy(final Policy policy) {
- backEnd.setPolicy(policy);
- }
-
- private V getValue(final Object cachedValue) {
- if (cachedValue instanceof Fault) {
- return ((Fault)cachedValue).get();
- } else {
- return (V)cachedValue;
- }
- }
-
- /**
- * Document me
- *
- * @param
- */
- @IgnoreSizeOf
- private static class Fault {
-
- private final Callable source;
- private V value;
- private Throwable throwable;
- private boolean complete;
-
- public Fault(final Callable source) {
- this.source = source;
- }
-
- private void complete(V value) {
- synchronized (this) {
- this.value = value;
- this.complete = true;
- notifyAll();
- }
- }
-
- private V get() {
- synchronized (this) {
- if (!complete) {
- try {
- complete(source.call());
- } catch (Throwable e) {
- fail(e);
- }
- }
- }
-
- return throwOrReturn();
- }
-
- private V throwOrReturn() {
- if (throwable != null) {
- if (throwable instanceof RuntimeException) {
- throw (RuntimeException) throwable;
- }
- throw new CacheException("Faulting from repository failed", throwable);
- }
- return value;
- }
-
- private void fail(final Throwable t) {
- synchronized (this) {
- this.throwable = t;
- this.complete = true;
- notifyAll();
- }
- throwOrReturn();
- }
- }
-}
Index: rctags/ehcache-2.10.7.0.37/terracotta/.settings/org.eclipse.jdt.ui.prefs
===================================================================
diff -u -N
--- rctags/ehcache-2.10.7.0.37/terracotta/.settings/org.eclipse.jdt.ui.prefs (revision 10990)
+++ rctags/ehcache-2.10.7.0.37/terracotta/.settings/org.eclipse.jdt.ui.prefs (revision 0)
@@ -1,66 +0,0 @@
-eclipse.preferences.version=1
-editor_save_participant_org.eclipse.jdt.ui.postsavelistener.cleanup=true
-formatter_profile=_Terracotta profile
-formatter_settings_version=11
-org.eclipse.jdt.ui.exception.name=e
-org.eclipse.jdt.ui.gettersetter.use.is=true
-org.eclipse.jdt.ui.ignorelowercasenames=true
-org.eclipse.jdt.ui.importorder=org;com;java;javax;
-org.eclipse.jdt.ui.javadoc=false
-org.eclipse.jdt.ui.keywordthis=false
-org.eclipse.jdt.ui.ondemandthreshold=99
-org.eclipse.jdt.ui.overrideannotation=true
-org.eclipse.jdt.ui.staticondemandthreshold=99
-org.eclipse.jdt.ui.text.custom_code_templates=/**\r\n * \r\n *//**\r\n * \r\n *//*\r\n * All content copyright Terracotta, Inc., unless otherwise indicated. All rights reserved.\r\n */\r\n${package_declaration}\r\n\r\n${typecomment}\r\n${type_declaration}throw ${exception_var};throw new ImplementMe();\r\n${body_statement}${body_statement}return ${field};${field} \= ${param};/**\r\n * ${tags}\r\n * ${see_to_target}\r\n */\r\n\r\n\r\n\r\n/**\r\n * @return the ${bare_field_name}\r\n *//**\r\n * @param ${param} the ${bare_field_name} to set\r\n *//**\r\n * ${tags}\r\n *//**\r\n * \r\n *//**\r\n * @author ${user}\r\n *\r\n * ${tags}\r\n *//**\r\n * \r\n *//**\r\n * ${tags}\r\n *//* (non-Jsdoc)\r\n * ${see_to_overridden}\r\n *//**\r\n * ${tags}\r\n * ${see_to_target}\r\n */${filecomment}\r\n${package_declaration}\r\n\r\n${typecomment}\r\n${type_declaration}\r\n// ${todo} Auto-generated catch block\r\n${exception_var}.printStackTrace();// ${todo} Auto-generated function stub\r\n${body_statement}${body_statement}\r\n// ${todo} Auto-generated constructor stubreturn ${field};${field} \= ${param};
-sp_cleanup.add_default_serial_version_id=true
-sp_cleanup.add_generated_serial_version_id=false
-sp_cleanup.add_missing_annotations=true
-sp_cleanup.add_missing_deprecated_annotations=true
-sp_cleanup.add_missing_methods=false
-sp_cleanup.add_missing_nls_tags=false
-sp_cleanup.add_missing_override_annotations=true
-sp_cleanup.add_missing_override_annotations_interface_methods=true
-sp_cleanup.add_serial_version_id=false
-sp_cleanup.always_use_blocks=true
-sp_cleanup.always_use_parentheses_in_expressions=false
-sp_cleanup.always_use_this_for_non_static_field_access=false
-sp_cleanup.always_use_this_for_non_static_method_access=false
-sp_cleanup.convert_to_enhanced_for_loop=true
-sp_cleanup.correct_indentation=false
-sp_cleanup.format_source_code=true
-sp_cleanup.format_source_code_changes_only=true
-sp_cleanup.make_local_variable_final=false
-sp_cleanup.make_parameters_final=false
-sp_cleanup.make_private_fields_final=true
-sp_cleanup.make_type_abstract_if_missing_method=false
-sp_cleanup.make_variable_declarations_final=true
-sp_cleanup.never_use_blocks=false
-sp_cleanup.never_use_parentheses_in_expressions=true
-sp_cleanup.on_save_use_additional_actions=true
-sp_cleanup.organize_imports=true
-sp_cleanup.qualify_static_field_accesses_with_declaring_class=false
-sp_cleanup.qualify_static_member_accesses_through_instances_with_declaring_class=true
-sp_cleanup.qualify_static_member_accesses_through_subtypes_with_declaring_class=true
-sp_cleanup.qualify_static_member_accesses_with_declaring_class=false
-sp_cleanup.qualify_static_method_accesses_with_declaring_class=false
-sp_cleanup.remove_private_constructors=true
-sp_cleanup.remove_trailing_whitespaces=true
-sp_cleanup.remove_trailing_whitespaces_all=false
-sp_cleanup.remove_trailing_whitespaces_ignore_empty=true
-sp_cleanup.remove_unnecessary_casts=true
-sp_cleanup.remove_unnecessary_nls_tags=false
-sp_cleanup.remove_unused_imports=true
-sp_cleanup.remove_unused_local_variables=false
-sp_cleanup.remove_unused_private_fields=true
-sp_cleanup.remove_unused_private_members=false
-sp_cleanup.remove_unused_private_methods=true
-sp_cleanup.remove_unused_private_types=true
-sp_cleanup.sort_members=false
-sp_cleanup.sort_members_all=false
-sp_cleanup.use_blocks=false
-sp_cleanup.use_blocks_only_for_return_and_throw=false
-sp_cleanup.use_parentheses_in_expressions=false
-sp_cleanup.use_this_for_non_static_field_access=false
-sp_cleanup.use_this_for_non_static_field_access_only_if_necessary=true
-sp_cleanup.use_this_for_non_static_method_access=false
-sp_cleanup.use_this_for_non_static_method_access_only_if_necessary=true
Index: rctags/ehcache-2.10.7.0.37/ehcache-core/src/main/java/net/sf/ehcache/management/sampled/CacheManagerSampler.java
===================================================================
diff -u -N
--- rctags/ehcache-2.10.7.0.37/ehcache-core/src/main/java/net/sf/ehcache/management/sampled/CacheManagerSampler.java (revision 10990)
+++ rctags/ehcache-2.10.7.0.37/ehcache-core/src/main/java/net/sf/ehcache/management/sampled/CacheManagerSampler.java (revision 0)
@@ -1,334 +0,0 @@
-/**
- * Copyright Terracotta, Inc.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package net.sf.ehcache.management.sampled;
-
-import java.util.Map;
-
-import net.sf.ehcache.util.ManagementAttribute;
-
-/**
- * An abstraction for sampled cache manager usage statistics.
- *
- * @author Abhishek Sanoujam
- * @author byoukste
- */
-public interface CacheManagerSampler {
- /**
- * Gets the actual name of the cache manager.
- */
- @ManagementAttribute
- String getName();
-
- /**
- * Gets the cluster uuid if applicable.
- *
- * @return the cluster uuid
- */
- @ManagementAttribute
- String getClusterUUID();
-
- /**
- * Gets the status attribute of the Ehcache
- *
- * @return The status value, as a String from the Status enum class
- */
- @ManagementAttribute
- String getStatus();
-
- /**
- * Enables/disables each cache contained by this CacheManager
- *
- * @param enabled
- */
- void setEnabled(boolean enabled);
-
- /**
- * Returns if each cache is enabled.
- *
- * @return boolean indicating that each cache is enabled
- */
- @ManagementAttribute
- boolean isEnabled();
-
- /**
- * Shuts down the CacheManager.
- *
- * If the shutdown occurs on the singleton, then the singleton is removed, so that if a singleton access method is called, a new
- * singleton will be created.
- */
- void shutdown();
-
- /**
- * Clears the contents of all caches in the CacheManager, but without
- * removing any caches.
- *
- * This method is not synchronized. It only guarantees to clear those elements in a cache at the time that the
- * {@link net.sf.ehcache.Ehcache#removeAll()} mehod on each cache is called.
- */
- void clearAll();
-
- /**
- * Gets the cache names managed by the CacheManager
- */
- @ManagementAttribute
- String[] getCacheNames() throws IllegalStateException;
-
- /**
- * Get a map of cache name to performance metrics (hits, misses).
- *
- * @return a map of cache metrics
- */
- Map getCacheMetrics();
-
- /**
- * @return aggregate hit rate
- */
- long getCacheHitRate();
-
- /**
- * @return aggregate in-memory hit rate
- */
- long getCacheInMemoryHitRate();
-
- /**
- * @return aggregate off-heap hit rate
- */
- long getCacheOffHeapHitRate();
-
- /**
- * @return aggregate on-disk hit rate
- */
- long getCacheOnDiskHitRate();
-
- /**
- * @return aggregate miss rate
- */
- long getCacheMissRate();
-
- /**
- * @return aggregate in-memory miss rate
- */
- long getCacheInMemoryMissRate();
-
- /**
- * @return aggregate off-heap miss rate
- */
- long getCacheOffHeapMissRate();
-
- /**
- * @return aggregate on-disk miss rate
- */
- long getCacheOnDiskMissRate();
-
- /**
- * @return aggregate put rate
- */
- long getCachePutRate();
-
- /**
- * @return aggregate update rate
- */
- long getCacheUpdateRate();
-
- /**
- * @return aggregate remove rate
- */
- long getCacheRemoveRate();
-
- /**
- * @return aggregate eviction rate
- */
- long getCacheEvictionRate();
-
- /**
- * @return aggregate expiration rate
- */
- long getCacheExpirationRate();
-
- /**
- * @return aggregate average get time (ms.)
- */
- float getCacheAverageGetTime();
-
- /**
- * @return if any contained caches are configured for search
- */
- @ManagementAttribute
- boolean getSearchable();
-
- /**
- * @return aggregate search rate
- */
- long getCacheSearchRate();
-
- /**
- * @return aggregate search time
- */
- long getCacheAverageSearchTime();
-
- /**
- * generateActiveConfigDeclaration
- *
- * @return CacheManager configuration as String
- */
- String generateActiveConfigDeclaration();
-
- /**
- * generateActiveConfigDeclaration
- *
- * @param cacheName
- * @return Cache configuration as String
- */
- String generateActiveConfigDeclaration(String cacheName);
-
- /**
- * Are any of the caches transactional
- *
- * @see net.sf.ehcache.config.CacheConfiguration.TransactionalMode
- */
- @ManagementAttribute
- boolean getTransactional();
-
- /**
- * Get the committed transactions count
- *
- * @return the committed transactions count
- */
- long getTransactionCommittedCount();
-
- /**
- * @return aggregate Xa commit rate
- */
- long getTransactionCommitRate();
-
- /**
- * Get the rolled back transactions count
- *
- * @return the rolled back transactions count
- */
- long getTransactionRolledBackCount();
-
- /**
- * @return aggregate Xa rollback rate
- */
- long getTransactionRollbackRate();
-
- /**
- * Get the timed out transactions count. Note that only transactions which failed to
- * commit due to a timeout are taken into account
- *
- * @return the timed out transactions count
- */
- long getTransactionTimedOutCount();
-
- /**
- * Returns whether any caches are configured for write-behind
- */
- @ManagementAttribute
- boolean getHasWriteBehindWriter();
-
- /**
- * Returns the total length of all write-behind queues across all caches
- *
- * @return aggregate writer-behind queue length
- */
- long getWriterQueueLength();
-
- /**
- * Maximum elements that can be queued for processing by the write-behind writer
- *
- * @return aggregate of the maximum elements that can be waiting to be processed
- * by the write-behind writer across all caches
- */
- @ManagementAttribute
- int getWriterMaxQueueSize();
-
- /**
- * Maximum number of bytes of entries in the disk stores of all caches that
- * did not declare their own max size.
- *
- * @return maximum number of bytes in the disk stores of all caches that
- * did not declare their own max size.
- */
- @ManagementAttribute
- long getMaxBytesLocalDisk();
-
- /**
- * @param maxBytes
- */
- void setMaxBytesLocalDisk(long maxBytes);
-
- /**
- * @param maxBytes
- */
- void setMaxBytesLocalDiskAsString(String maxBytes);
-
- /**
- * @return Original input for maxBytesLocalDisk
- */
- @ManagementAttribute
- String getMaxBytesLocalDiskAsString();
-
- /**
- * Maximum number of bytes of entries in the heap memory stores of all caches that
- * did not declare their own max size.
- *
- * @return maximum number of bytes in the heap memory stores of all caches that
- * did not declare their own max size.
- */
- @ManagementAttribute
- long getMaxBytesLocalHeap();
-
- /**
- * @return Original input for maxBytesLocalHeap
- */
- @ManagementAttribute
- String getMaxBytesLocalHeapAsString();
-
- /**
- * @param maxBytes
- */
- void setMaxBytesLocalHeap(long maxBytes);
-
- /**
- * @param maxBytes
- */
- void setMaxBytesLocalHeapAsString(String maxBytes);
-
- /**
- * Maximum number of bytes of entries in the off-heap stores of all caches that
- * did not declare their own max size.
- *
- * @return maximum number of bytes in the off-heap stores of all caches that
- * did not declare their own max size.
- */
- @ManagementAttribute
- long getMaxBytesLocalOffHeap();
-
- /**
- * @return Original input for maxBytesLocalOffHeap
- */
- @ManagementAttribute
- String getMaxBytesLocalOffHeapAsString();
-
- /**
- * Execute a BMSQL query against the CacheManager and return result grid.
- *
- * @param queryString
- * @return query result grid
- */
- Object[][] executeQuery(String queryString);
-}
Index: rctags/ehcache-2.10.7.0.37/ehcache-core/src/main/java/net/sf/ehcache/hibernate/ccs/EhcacheReadOnlyCache.java
===================================================================
diff -u -N
--- rctags/ehcache-2.10.7.0.37/ehcache-core/src/main/java/net/sf/ehcache/hibernate/ccs/EhcacheReadOnlyCache.java (revision 10990)
+++ rctags/ehcache-2.10.7.0.37/ehcache-core/src/main/java/net/sf/ehcache/hibernate/ccs/EhcacheReadOnlyCache.java (revision 0)
@@ -1,125 +0,0 @@
-/**
- * Copyright Terracotta, Inc.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package net.sf.ehcache.hibernate.ccs;
-
-import java.util.Comparator;
-
-import org.hibernate.cache.CacheException;
-
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import org.hibernate.cache.access.SoftLock;
-
-/**
- * Ehcache specific read-only cache concurrency strategy.
- *
- * This is the Ehcache specific equivalent to Hibernate's ReadOnlyCache.
- *
- * @author Chris Dennis
- */
-@Deprecated
-public class EhcacheReadOnlyCache extends AbstractEhcacheConcurrencyStrategy {
-
- private static final Logger LOG = LoggerFactory.getLogger(EhcacheReadOnlyCache.class);
-
- /**
- * {@inheritDoc}
- */
- public Object get(Object key, long timestamp) throws CacheException {
- return cache.get(key);
- }
-
- /**
- * Throws UnsupportedOperationException since items in a read-only cache should not be mutated.
- *
- * @throws UnsupportedOperationException always
- */
- public SoftLock lock(Object key, Object version) throws UnsupportedOperationException {
- LOG.error("Application attempted to edit read only item: " + key);
- throw new UnsupportedOperationException("Can't write to a readonly object");
- }
-
- /**
- * {@inheritDoc}
- */
- public boolean put(Object key, Object value, long timestamp, Object version,
- Comparator versionComparator, boolean minimalPut) throws CacheException {
- if (minimalPut && cache.get(key) != null) {
- return false;
- } else {
- cache.put(key, value);
- return true;
- }
- }
-
- /**
- * Logs an error since items in a read-only cache should not be mutated.
- */
- public void release(Object key, SoftLock lock) {
- LOG.error("Application attempted to edit read only item: " + key);
- //throw new UnsupportedOperationException("Can't write to a readonly object");
- }
-
- /**
- * Throws UnsupportedOperationException since items in a read-only cache should not be mutated.
- *
- * @throws UnsupportedOperationException always
- */
- public boolean afterUpdate(Object key, Object value, Object version, SoftLock lock) throws UnsupportedOperationException {
- LOG.error("Application attempted to edit read only item: " + key);
- throw new UnsupportedOperationException("Can't write to a readonly object");
- }
-
- /**
- * Inserts the specified item into the cache.
- */
- public boolean afterInsert(Object key, Object value, Object version) throws CacheException {
- cache.update(key, value);
- return true;
- }
-
- /**
- * A No-Op, since we are an asynchronous cache concurrency strategy.
- */
- public void evict(Object key) throws CacheException {
- }
-
- /**
- * A No-Op, since we are an asynchronous cache concurrency strategy.
- */
- public boolean insert(Object key, Object value, Object currentVersion) {
- return false;
- }
-
- /**
- * Throws UnsupportedOperationException since items in a read-only cache should not be mutated.
- *
- * @throws UnsupportedOperationException always
- */
- public boolean update(Object key, Object value, Object currentVersion, Object previousVersion) throws UnsupportedOperationException {
- LOG.error("Application attempted to edit read only item: " + key);
- throw new UnsupportedOperationException("Can't write to a readonly object");
- }
-
- /**
- * {@inheritDoc}
- */
- @Override
- public String toString() {
- return cache + "(read-only)";
- }
-}
Index: rctags/ehcache-2.10.7.0.37/system-tests/src/test/java/org/terracotta/modules/ehcache/store/CachePinningFaultInvalidatedEntriesTest.java
===================================================================
diff -u -N
--- rctags/ehcache-2.10.7.0.37/system-tests/src/test/java/org/terracotta/modules/ehcache/store/CachePinningFaultInvalidatedEntriesTest.java (revision 10990)
+++ rctags/ehcache-2.10.7.0.37/system-tests/src/test/java/org/terracotta/modules/ehcache/store/CachePinningFaultInvalidatedEntriesTest.java (revision 0)
@@ -1,107 +0,0 @@
-/*
- * All content copyright Terracotta, Inc., unless otherwise indicated. All rights reserved.
- */
-package org.terracotta.modules.ehcache.store;
-
-import net.sf.ehcache.Cache;
-import net.sf.ehcache.Element;
-
-import org.terracotta.ehcache.tests.AbstractCacheTestBase;
-import org.terracotta.ehcache.tests.ClientBase;
-import org.terracotta.test.util.WaitUtil;
-import org.terracotta.toolkit.Toolkit;
-
-import com.tc.properties.TCPropertiesConsts;
-import com.tc.test.config.model.TestConfig;
-
-import java.util.concurrent.Callable;
-
-import junit.framework.Assert;
-
-public class CachePinningFaultInvalidatedEntriesTest extends AbstractCacheTestBase {
-
- private static final int ELEMENT_COUNT = 1000;
-
- public CachePinningFaultInvalidatedEntriesTest(TestConfig testConfig) {
- super("cache-pinning-test.xml", testConfig, App.class, App.class);
- testConfig.getClientConfig()
- .addExtraClientJvmArg("-Dcom.tc." + TCPropertiesConsts.L1_SERVERMAPMANAGER_FAULT_INVALIDATED_PINNED_ENTRIES
- + "=true");
- }
-
- public static class App extends ClientBase {
- public App(String[] args) {
- super("pinned", args);
- }
-
- @Override
- protected void runTest(Cache cache, Toolkit clusteringToolkit) throws Throwable {
-
- System.out.println("Testing with Eventual tier pinned cache");
- basicTestInvalidatedEntriesFaulted(cacheManager.getCache("pinnedEventual"), true);
- System.out.println("Testing with Strong tier pinned cache");
- basicTestInvalidatedEntriesFaulted(cacheManager.getCache("pinned"), true);
-
- }
-
- private void basicTestInvalidatedEntriesFaulted(final Cache cache, boolean tierPinned) throws Exception {
- int index = getBarrierForAllClients().await();
- if (index == 0) {
- for (int i = 0; i < ELEMENT_COUNT; i++) {
- cache.put(new Element(getKey(i), getValue(i)));
- }
- Assert.assertEquals(ELEMENT_COUNT, cache.getSize());
- for (int i = 0; i < ELEMENT_COUNT; i++) {
- assertNotNull(cache.get(getKey(i)));
- assertEquals(cache.get(getKey(i)).getValue(), getValue(i));
- }
- // All the gets on both the clients should be local as the pinned entries would have been faulted.
- Assert.assertEquals(ELEMENT_COUNT, cache.getMemoryStoreSize());
- Assert.assertEquals(ELEMENT_COUNT * 2, cache.getStatistics().localHeapHitCount());
- Assert.assertEquals(0, cache.getStatistics().cacheEvictedCount());
- }
- getBarrierForAllClients().await();
- if (index == 1) {
- // Update elements, invalidate entries on other client
- for (int i = 0; i < ELEMENT_COUNT; i++) {
- cache.put(new Element(getKey(i), getValue(i + 1)));
- }
- Assert.assertEquals(ELEMENT_COUNT, cache.getSize());
- }
-
- getBarrierForAllClients().await();
- WaitUtil.waitUntilCallableReturnsTrue(new Callable() {
-
- @Override
- public Boolean call() throws Exception {
- // wait until the client repopulates the local cache after receiving invalidations.
- long localsize = cache.getMemoryStoreSize();
- System.out.println("Local cache Size = " + localsize);
- return localsize == ELEMENT_COUNT;
- }
- });
-
- getBarrierForAllClients().await();
- for (int i = 0; i < ELEMENT_COUNT; i++) {
- assertNotNull(cache.get(getKey(i)));
- assertEquals(cache.get(getKey(i)).getValue(), getValue(i + 1));
- }
- // All the gets on both the clients should be local as the pinned entries would have been faulted.
- if (index == 0) {
- Assert.assertEquals(ELEMENT_COUNT, cache.getMemoryStoreSize());
- // Assert.assertEquals(ELEMENT_COUNT * 4, cache.getStatistics().localHeapHitCount());
- Assert.assertEquals(0, cache.getStatistics().cacheEvictedCount());
- }
- getBarrierForAllClients().await();
- }
-
- private Object getKey(int i) {
- return String.valueOf(i);
- }
-
- private Object getValue(int i) {
- return i;
- }
-
- }
-}
Index: rctags/ehcache-2.10.7.0.37/system-tests/src/test/java/org/terracotta/ehcache/tests/HttpUrlConfigCacheTest.java
===================================================================
diff -u -N
--- rctags/ehcache-2.10.7.0.37/system-tests/src/test/java/org/terracotta/ehcache/tests/HttpUrlConfigCacheTest.java (revision 10990)
+++ rctags/ehcache-2.10.7.0.37/system-tests/src/test/java/org/terracotta/ehcache/tests/HttpUrlConfigCacheTest.java (revision 0)
@@ -1,36 +0,0 @@
-/*
- * All content copyright (c) 2003-2008 Terracotta, Inc., except as may otherwise be noted in a separate copyright
- * notice. All rights reserved.
- */
-package org.terracotta.ehcache.tests;
-
-import net.sf.ehcache.Cache;
-import net.sf.ehcache.Element;
-
-import org.terracotta.toolkit.Toolkit;
-
-import com.tc.test.config.model.TestConfig;
-
-import junit.framework.Assert;
-
-public class HttpUrlConfigCacheTest extends AbstractCacheTestBase {
-
- public HttpUrlConfigCacheTest(TestConfig testConfig) {
- super("http-url-config-cache-test.xml", testConfig, Client.class);
- }
-
- public static class Client extends ClientBase {
-
- public Client(String[] args) {
- super("test", args);
- }
-
- @Override
- protected void runTest(Cache cache, Toolkit myToolkit) throws Throwable {
- cache.put(new Element("key", "value"));
- Assert.assertEquals("value", cache.get("key").getObjectValue());
- }
-
- }
-
-}
Index: rctags/ehcache-2.10.7.0.37/system-tests/src/test/java/org/terracotta/modules/ehcache/bulkops/BulkOpsBasicSerializationSanityTest.java
===================================================================
diff -u -N
--- rctags/ehcache-2.10.7.0.37/system-tests/src/test/java/org/terracotta/modules/ehcache/bulkops/BulkOpsBasicSerializationSanityTest.java (revision 10990)
+++ rctags/ehcache-2.10.7.0.37/system-tests/src/test/java/org/terracotta/modules/ehcache/bulkops/BulkOpsBasicSerializationSanityTest.java (revision 0)
@@ -1,233 +0,0 @@
-/*
- * All content copyright Terracotta, Inc., unless otherwise indicated. All rights reserved.
- */
-package org.terracotta.modules.ehcache.bulkops;
-
-import net.sf.ehcache.Cache;
-import net.sf.ehcache.CacheManager;
-import net.sf.ehcache.Element;
-import net.sf.ehcache.config.CacheConfiguration;
-import net.sf.ehcache.config.TerracottaConfiguration;
-import net.sf.ehcache.config.TerracottaConfiguration.Consistency;
-
-import org.junit.Assert;
-import org.terracotta.ehcache.tests.AbstractCacheTestBase;
-import org.terracotta.ehcache.tests.ClientBase;
-import org.terracotta.toolkit.Toolkit;
-import org.terracotta.toolkit.concurrent.ToolkitBarrier;
-
-import com.tc.test.config.model.TestConfig;
-
-import java.io.Serializable;
-import java.util.Collection;
-import java.util.HashSet;
-import java.util.Map;
-import java.util.Map.Entry;
-import java.util.Set;
-import java.util.concurrent.BrokenBarrierException;
-import java.util.concurrent.TimeUnit;
-
-public class BulkOpsBasicSerializationSanityTest extends AbstractCacheTestBase {
- private static final int NODE_COUNT = 2;
-
- public BulkOpsBasicSerializationSanityTest(TestConfig testConfig) {
- super(testConfig, App.class, App.class);
- }
-
- public static class App extends ClientBase {
- private final ToolkitBarrier barrier;
-
- public App(String[] args) {
- super(args);
- this.barrier = getClusteringToolkit().getBarrier("test-barrier", NODE_COUNT);
- }
-
- public static void main(String[] args) {
- new App(args).run();
- }
-
- @Override
- protected void runTest(Cache cache, Toolkit clusteringToolkit) throws Throwable {
- Cache dcv2StrongSerialization = createCache("dcv2StrongSerialization", cacheManager, Consistency.STRONG);
- testBulkOpsSanity(dcv2StrongSerialization);
- barrier.await();
-
- Cache dcv2EventualSerialization = createCache("dcv2EventualSerialization", cacheManager, Consistency.EVENTUAL);
- testBulkOpsSanity(dcv2EventualSerialization);
- barrier.await();
-
- barrier.await();
-
- }
-
- private void testBulkOpsSanity(Cache cache) throws InterruptedException, BrokenBarrierException {
- int index = barrier.await();
- int numOfElements = 100;
- Set elements = new HashSet();
- for (int i = 0; i < numOfElements; i++) {
- elements.add(new Element(new Key("key" + i, i), new Value("val" + i, i)));
- }
- if (index == 0) {
- cache.putAll(elements);
- }
-
- barrier.await();
- while (cache.getSize() != numOfElements) {
- Thread.sleep(1000);
- }
- Assert.assertEquals(numOfElements, cache.getSize());
-
- Set keySet1 = new HashSet();
- for (int i = 0; i < numOfElements; i++) {
- keySet1.add(new Key("key" + i, i));
- }
-
- Map rv = cache.getAll(keySet1);
- Assert.assertEquals(numOfElements, rv.size());
-
- Collection values = new HashSet();
- for (Entry entry : rv.entrySet()) {
- Assert.assertTrue(elements.contains(entry.getValue()));
- values.add(entry.getValue());
- }
-
- for (Element element : elements) {
- Assert.assertTrue(values.contains(element));
- }
-
- Set keySet2 = new HashSet();
- for (int i = 0; i < numOfElements; i++) {
- if (i % 2 == 0) {
- keySet2.add(new Key("key" + i, i));
- }
- }
-
- rv = cache.getAll(keySet2);
- Assert.assertEquals(keySet2.size(), rv.size());
-
- for (Entry entry : rv.entrySet()) {
- Assert.assertTrue(elements.contains(entry.getValue()));
- }
-
- Assert.assertEquals(keySet2, rv.keySet());
- System.out.println("verified by client now waiting for others...");
- barrier.await();
-
- if (index != 0) {
- cache.removeAll(keySet2);
- System.out.println("client " + index + " removed " + keySet2.size() + " keys from " + cache.getName()
- + ". Now waiting for others...");
- // sleep for 60 seconds for eventual caches
- if (cache.getCacheConfiguration().getTerracottaConfiguration().getConsistency() == Consistency.EVENTUAL) {
- Thread.sleep(TimeUnit.MILLISECONDS.convert(60, TimeUnit.SECONDS));
- }
- }
- index = barrier.await();
- while (cache.getSize() != numOfElements - keySet2.size()) {
- Thread.sleep(1000);
- }
-
- Assert.assertEquals(numOfElements - keySet2.size(), cache.getSize());
- System.out.println("client " + index + "now checking removed in " + cache.getName() + " by client");
- for (Object key : keySet2) {
- Assert.assertNull(cache.get(key));
- }
- System.out.println("client " + index + " done with " + cache.getName());
- }
-
- private Cache createCache(String cacheName, CacheManager cm, Consistency consistency) {
- CacheConfiguration cacheConfiguration = new CacheConfiguration();
- cacheConfiguration.setName(cacheName);
- cacheConfiguration.setMaxElementsInMemory(100000);
- cacheConfiguration.setEternal(false);
- cacheConfiguration.setTimeToLiveSeconds(100000);
- cacheConfiguration.setTimeToIdleSeconds(200000);
-
- TerracottaConfiguration tcConfiguration = new TerracottaConfiguration();
- tcConfiguration.setConsistency(consistency);
- cacheConfiguration.addTerracotta(tcConfiguration);
-
- Cache cache = new Cache(cacheConfiguration);
- cm.addCache(cache);
- System.out.println("\n\ncache " + cacheName + " created with consistency " + consistency);
- return cache;
- }
- }
-
- private static class Key implements Serializable {
- private final String stringKey;
- private final int intKey;
-
- public Key(String stringKey, int intKey) {
- super();
- this.stringKey = stringKey;
- this.intKey = intKey;
- }
-
- @Override
- public int hashCode() {
- final int prime = 31;
- int result = 1;
- result = prime * result + intKey;
- result = prime * result + ((stringKey == null) ? 0 : stringKey.hashCode());
- return result;
- }
-
- @Override
- public boolean equals(Object obj) {
- if (this == obj) return true;
- if (obj == null) return false;
- if (getClass() != obj.getClass()) return false;
- Key other = (Key) obj;
- if (intKey != other.intKey) return false;
- if (stringKey == null) {
- if (other.stringKey != null) return false;
- } else if (!stringKey.equals(other.stringKey)) return false;
- return true;
- }
-
- @Override
- public String toString() {
- return stringKey;
- }
-
- }
-
- private static class Value implements Serializable {
- private final String keyVal;
- private final int intVal;
-
- public Value(String keyVal, int intVal) {
- this.keyVal = keyVal;
- this.intVal = intVal;
- }
-
- @Override
- public int hashCode() {
- final int prime = 31;
- int result = 1;
- result = prime * result + intVal;
- result = prime * result + ((keyVal == null) ? 0 : keyVal.hashCode());
- return result;
- }
-
- @Override
- public boolean equals(Object obj) {
- if (this == obj) return true;
- if (obj == null) return false;
- if (getClass() != obj.getClass()) return false;
- Value other = (Value) obj;
- if (intVal != other.intVal) return false;
- if (keyVal == null) {
- if (other.keyVal != null) return false;
- } else if (!keyVal.equals(other.keyVal)) return false;
- return true;
- }
-
- @Override
- public String toString() {
- return keyVal;
- }
-
- }
-}
Index: rctags/ehcache-2.10.7.0.37/system-tests/src/test/java/org/terracotta/ehcache/tests/NonHibernateCacheDecorator.java
===================================================================
diff -u -N
--- rctags/ehcache-2.10.7.0.37/system-tests/src/test/java/org/terracotta/ehcache/tests/NonHibernateCacheDecorator.java (revision 10990)
+++ rctags/ehcache-2.10.7.0.37/system-tests/src/test/java/org/terracotta/ehcache/tests/NonHibernateCacheDecorator.java (revision 0)
@@ -1,43 +0,0 @@
-package org.terracotta.ehcache.tests;
-
-import net.sf.ehcache.CacheException;
-import net.sf.ehcache.Ehcache;
-import net.sf.ehcache.Element;
-import net.sf.ehcache.constructs.EhcacheDecoratorAdapter;
-
-import java.io.Serializable;
-
-/**
- * This decorator class intercepts cache gets and acts as a cache read through during or before a cache load and acts as a system of record
- * after the cache has been loaded. Cache read through: get the object from the cache, if not in cache, get object from database, load in to
- * cache and return object. System of Record (SOR): only get the object from the cache.
- *
- * @author sdalto2
- *
- */
-public class NonHibernateCacheDecorator extends EhcacheDecoratorAdapter {
-
- private Ehcache cache;
- public NonHibernateCacheDecorator(Ehcache cache) {
- super(cache);
- this.cache=cache;
- }
-
- /**
- * This get method will always call Element get(Serializable key) So a serializable key is mandatory.
- */
- @Override
- public Element get(Object key) throws IllegalStateException, CacheException {
- return get((Serializable) key);
- }
-
- @Override
- public Element get(Serializable key) throws IllegalStateException, CacheException {
- return new Element(1,"dummy");
- }
- @Override
- public void removeAll(boolean doNotNotifyListeners) throws IllegalStateException, CacheException {
- cache.removeAll(doNotNotifyListeners);
- }
-
-}
\ No newline at end of file
Index: rctags/ehcache-2.10.7.0.37/ehcache-core/src/main/java/net/sf/ehcache/terracotta/KeySnapshotter.java
===================================================================
diff -u -N
--- rctags/ehcache-2.10.7.0.37/ehcache-core/src/main/java/net/sf/ehcache/terracotta/KeySnapshotter.java (revision 10990)
+++ rctags/ehcache-2.10.7.0.37/ehcache-core/src/main/java/net/sf/ehcache/terracotta/KeySnapshotter.java (revision 0)
@@ -1,228 +0,0 @@
-/**
- * Copyright Terracotta, Inc.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package net.sf.ehcache.terracotta;
-
-import net.sf.ehcache.Cache;
-import net.sf.ehcache.CacheManager;
-import net.sf.ehcache.CacheStoreHelper;
-import net.sf.ehcache.Ehcache;
-import net.sf.ehcache.store.Store;
-import net.sf.ehcache.store.TerracottaStore;
-import net.sf.ehcache.util.WeakIdentityConcurrentMap;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import java.io.IOException;
-import java.util.Collection;
-import java.util.concurrent.ScheduledExecutorService;
-import java.util.concurrent.ScheduledFuture;
-import java.util.concurrent.ScheduledThreadPoolExecutor;
-import java.util.concurrent.TimeUnit;
-
-/**
- * A class that will snapshot the local keySet of a Terracotta clustered cache to disk
- *
- * @author Alex Snaps
- */
-class KeySnapshotter implements Runnable {
-
- private static final Logger LOG = LoggerFactory.getLogger(KeySnapshotter.class.getName());
- private static final int POOL_SIZE = Integer.getInteger("net.sf.ehcache.terracotta.KeySnapshotter.threadPoolSize", 10);
-
- private static final WeakIdentityConcurrentMap INSTANCES =
- new WeakIdentityConcurrentMap(
- new WeakIdentityConcurrentMap.CleanUpTask() {
- public void cleanUp(final ScheduledExecutorService executor) {
- executor.shutdownNow();
- }
- });
-
- private final String cacheName;
- private volatile TerracottaStore tcStore;
- private final RotatingSnapshotFile rotatingWriter;
- private final Thread thread;
-
- private volatile Runnable onSnapshot;
- private final ScheduledFuture scheduledFuture;
-
- /**
- * Default Constructor
- *
- * @param cache the Terracotta clustered Cache to snapshot
- * @param interval the interval to do the snapshots on
- * @param doKeySnapshotOnDedicatedThread whether the snapshots have to be done on a dedicated thread
- * @param rotatingWriter the RotatingSnapshotFile to write to
- * @throws IllegalArgumentException if interval is less than or equal to zero
- */
- KeySnapshotter(final Ehcache cache, final long interval,
- final boolean doKeySnapshotOnDedicatedThread,
- final RotatingSnapshotFile rotatingWriter)
- throws IllegalArgumentException {
- final Store store = new CacheStoreHelper((Cache)cache).getStore();
- if (!(store instanceof TerracottaStore)) {
- throw new IllegalArgumentException("Cache '" + cache.getName() + "' isn't backed by a " + TerracottaStore.class.getSimpleName()
- + " but uses a " + store.getClass().getName() + " instead");
- }
-
- if (interval <= 0) {
- throw new IllegalArgumentException("Interval needs to be a positive & non-zero value");
- }
-
- if (rotatingWriter == null) {
- throw new NullPointerException();
- }
-
- this.cacheName = cache.getName();
- this.rotatingWriter = rotatingWriter;
- this.tcStore = (TerracottaStore)store;
-
- if (doKeySnapshotOnDedicatedThread) {
- scheduledFuture = null;
- thread = new SnapShottingThread(this, interval, "KeySnapshotter for cache " + cacheName);
- thread.start();
- } else {
- scheduledFuture = getScheduledExecutorService(cache.getCacheManager())
- .scheduleWithFixedDelay(this, interval, interval, TimeUnit.SECONDS);
- thread = null;
- }
- }
-
- private ScheduledExecutorService getScheduledExecutorService(final CacheManager cacheManager) {
- ScheduledExecutorService scheduledExecutorService = INSTANCES.get(cacheManager);
- if (scheduledExecutorService == null) {
- scheduledExecutorService = new ScheduledThreadPoolExecutor(POOL_SIZE);
- final ScheduledExecutorService previous = INSTANCES.putIfAbsent(cacheManager, scheduledExecutorService);
- if (previous != null) {
- scheduledExecutorService.shutdownNow();
- scheduledExecutorService = previous;
- }
- }
- return scheduledExecutorService;
- }
-
- /**
- * Shuts down the writer thread and cleans up resources
- *
- * @param immediately whether to leave the writer finish or shut down immediately
- */
- void dispose(boolean immediately) {
- if (thread != null) {
- rotatingWriter.setShutdownOnThreadInterrupted(immediately);
- thread.interrupt();
- try {
- thread.join();
- } catch (InterruptedException e) {
- Thread.currentThread().interrupt();
- }
- } else {
- scheduledFuture.cancel(immediately);
- }
- tcStore = null;
- }
-
- /**
- * {@inheritDoc}
- */
- public void run() {
- try {
- INSTANCES.cleanUp();
- rotatingWriter.writeAll(tcStore.getLocalKeys());
- onSnapshot();
- } catch (Throwable e) {
- LOG.error("Couldn't snapshot local keySet for Cache {}", cacheName, e);
- }
- }
-
- private void onSnapshot() {
- if (onSnapshot != null) {
- try {
- onSnapshot.run();
- } catch (Exception e) {
- LOG.warn("Error occurred in onSnapshot callback", e);
- }
- }
- }
-
- /**
- * Accessor to all known cacheManagers (which are also bound to a ScheduledExecutorService)
- *
- * @return the collection of known CacheManagers
- */
- static Collection getKnownCacheManagers() {
- return INSTANCES.keySet();
- }
-
- /**
- * Calling this method will result in a snapshot being taken or wait for the one in progress to finish
- *
- * @throws IOException On exception being thrown while doing the snapshot
- */
- void doSnapshot() throws IOException {
- rotatingWriter.snapshotNowOrWaitForCurrentToFinish(tcStore.getLocalKeys());
- onSnapshot();
- }
-
- /**
- * Let register a Runnable that will be called on every snapshot happening
- * @param onSnapshot the runnable
- */
- void setOnSnapshot(final Runnable onSnapshot) {
- this.onSnapshot = onSnapshot;
- }
-
- /**
- * Returns the name of the underlying cache for which this snapshots
- * @return The name of the cache
- */
- public String getCacheName() {
- return cacheName;
- }
-
- /**
- * Thread doing background snapshots of the local key set
- */
- private static class SnapShottingThread extends Thread {
-
- private long lastRun;
- private final long interval;
-
- public SnapShottingThread(final Runnable runnable, final long interval, final String threadName) {
- super(runnable, threadName);
- this.interval = interval;
- lastRun = System.currentTimeMillis();
- this.setDaemon(true);
- }
-
- @Override
- public void run() {
- while (!isInterrupted()) {
- final long nextTime = lastRun + TimeUnit.SECONDS.toMillis(interval);
- final long now = System.currentTimeMillis();
- if (nextTime <= now) {
- super.run();
- lastRun = System.currentTimeMillis();
- } else {
- try {
- sleep(nextTime - now);
- } catch (InterruptedException e) {
- interrupt();
- }
- }
- }
- }
- }
-}
Index: rctags/ehcache-2.10.7.0.37/ehcache-core/src/main/java/net/sf/ehcache/search/impl/OrderComparator.java
===================================================================
diff -u -N
--- rctags/ehcache-2.10.7.0.37/ehcache-core/src/main/java/net/sf/ehcache/search/impl/OrderComparator.java (revision 10990)
+++ rctags/ehcache-2.10.7.0.37/ehcache-core/src/main/java/net/sf/ehcache/search/impl/OrderComparator.java (revision 0)
@@ -1,137 +0,0 @@
-/**
- * Copyright Terracotta, Inc.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package net.sf.ehcache.search.impl;
-
-import java.io.Serializable;
-import java.util.ArrayList;
-import java.util.Comparator;
-import java.util.List;
-
-import net.sf.ehcache.store.StoreQuery.Ordering;
-
-/**
- * Compound sort ordering comparactor
- *
- * @author teck
- * @param
- */
-public class OrderComparator implements Comparator {
-
- private final List> comparators;
-
- /**
- * Constructor
- *
- * @param orderings
- */
- public OrderComparator(List orderings) {
- comparators = new ArrayList>();
- int pos = 0;
- for (Ordering ordering : orderings) {
- switch (ordering.getDirection()) {
- case ASCENDING: {
- comparators.add(new AscendingComparator(pos));
- break;
- }
- case DESCENDING: {
- comparators.add(new DescendingComparator(pos));
- break;
- }
- default: {
- throw new AssertionError(ordering.getDirection());
- }
- }
-
- pos++;
- }
- }
-
- /**
- * {@inheritDoc}
- */
- public int compare(T o1, T o2) {
- for (Comparator c : comparators) {
- int cmp = c.compare(o1, o2);
- if (cmp != 0) {
- return cmp;
- }
- }
- return 0;
- }
-
- /**
- * Simple ascending comparator
- */
- private class AscendingComparator implements Comparator, Serializable {
-
- private final int pos;
-
- AscendingComparator(int pos) {
- this.pos = pos;
- }
-
- public int compare(T o1, T o2) {
- Object attr1 = o1.getSortAttribute(pos);
- Object attr2 = o2.getSortAttribute(pos);
-
- if ((attr1 == null) && (attr2 == null)) {
- return 0;
- }
-
- if (attr1 == null) {
- return -1;
- }
-
- if (attr2 == null) {
- return 1;
- }
-
- return ((Comparable) attr1).compareTo(attr2);
- }
- }
-
- /**
- * Simple descending comparator
- */
- private class DescendingComparator implements Comparator, Serializable {
-
- private final int pos;
-
- DescendingComparator(int pos) {
- this.pos = pos;
- }
-
- public int compare(T o1, T o2) {
- Object attr1 = o1.getSortAttribute(pos);
- Object attr2 = o2.getSortAttribute(pos);
-
- if ((attr1 == null) && (attr2 == null)) {
- return 0;
- }
-
- if (attr1 == null) {
- return 1;
- }
-
- if (attr2 == null) {
- return -1;
- }
-
- return ((Comparable) attr2).compareTo(attr1);
- }
- }
-}
Index: rctags/ehcache-2.10.7.0.37/ehcache-core/src/main/java/net/sf/ehcache/pool/Size.java
===================================================================
diff -u -N
--- rctags/ehcache-2.10.7.0.37/ehcache-core/src/main/java/net/sf/ehcache/pool/Size.java (revision 10990)
+++ rctags/ehcache-2.10.7.0.37/ehcache-core/src/main/java/net/sf/ehcache/pool/Size.java (revision 0)
@@ -1,58 +0,0 @@
-/**
- * Copyright Terracotta, Inc.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package net.sf.ehcache.pool;
-
-/**
- * Holder for the size calculated by the SizeOf engine
- *
- * @author Ludovic Orban
- */
-public final class Size {
-
- private final long calculated;
- private final boolean exact;
-
- /**
- * Constructor
- *
- * @param calculated the calculated size
- * @param exact true if the calculated size is exact, false if it's an estimate or known to be inaccurate in some way
- */
- public Size(long calculated, boolean exact) {
- this.calculated = calculated;
- this.exact = exact;
- }
-
- /**
- * Get the calculated size
- *
- * @return the calculated size
- */
- public long getCalculated() {
- return calculated;
- }
-
- /**
- * Check if the calculated size is exact
- *
- * @return true if the calculated size is exact, false if it's an estimate or known to be inaccurate in some way
- */
- public boolean isExact() {
- return exact;
- }
-
-}
Index: rctags/ehcache-2.10.7.0.37/terracotta/bootstrap/src/main/java/org/terracotta/modules/ehcache/async/AsyncCoordinator.java
===================================================================
diff -u -N
--- rctags/ehcache-2.10.7.0.37/terracotta/bootstrap/src/main/java/org/terracotta/modules/ehcache/async/AsyncCoordinator.java (revision 10990)
+++ rctags/ehcache-2.10.7.0.37/terracotta/bootstrap/src/main/java/org/terracotta/modules/ehcache/async/AsyncCoordinator.java (revision 0)
@@ -1,43 +0,0 @@
-/*
- * All content copyright Terracotta, Inc., unless otherwise indicated. All rights reserved.
- */
-package org.terracotta.modules.ehcache.async;
-
-import org.terracotta.modules.ehcache.async.scatterpolicies.ItemScatterPolicy;
-
-import java.io.Serializable;
-
-public interface AsyncCoordinator {
-
- /**
- * @throws IllegalArgumentException if processingConcurrency is less than 1 OR processor is null
- */
- public void start(final ItemProcessor processor, final int processingConcurrency,
- ItemScatterPolicy policy);
-
- /**
- * @param item null item are ignored.
- */
- public void add(E item);
-
- /**
- * Stops and waits for the current processing to finish.
- * Calling this multiple times will result in {@link IllegalStateException}
- */
- public void stop();
-
- /**
- * Sets a filter to filter out the items.
- */
- public void setOperationsFilter(ItemsFilter filter);
-
- /**
- * @return the current items to be processed
- */
- public long getQueueSize();
-
- /**
- * Destroy all clustered state associated with the given async coordinator.
- */
- void destroy();
-}
Index: rctags/ehcache-2.10.7.0.37/ehcache-core/src/test/java/net/sf/ehcache/util/concurrent/ConcurrentHashMapTest.java
===================================================================
diff -u -N
--- rctags/ehcache-2.10.7.0.37/ehcache-core/src/test/java/net/sf/ehcache/util/concurrent/ConcurrentHashMapTest.java (revision 10990)
+++ rctags/ehcache-2.10.7.0.37/ehcache-core/src/test/java/net/sf/ehcache/util/concurrent/ConcurrentHashMapTest.java (revision 0)
@@ -1,218 +0,0 @@
-package net.sf.ehcache.util.concurrent;
-
-import net.sf.ehcache.Element;
-import org.junit.Test;
-
-import java.util.HashSet;
-import java.util.Random;
-import java.util.UUID;
-
-import static org.hamcrest.CoreMatchers.instanceOf;
-import static org.hamcrest.CoreMatchers.is;
-import static org.hamcrest.CoreMatchers.notNullValue;
-import static org.junit.Assert.assertThat;
-
-/**
- * @author Alex Snaps
- */
-public class ConcurrentHashMapTest {
-
- private static final int ENTRIES = 10000;
-
- @Test
- public void testRandomValuesWithObjects() {
-
- ConcurrentHashMap> map = new ConcurrentHashMap>();
-
- for(int i = 0; i < ENTRIES; i++) {
- final Object o = new Object();
- map.put(o, new KeyHolder