- * This implementation returns Ehcache specific access strategy instances for all the non-transactional access types. Transactional access
- * is not supported.
- *
- * @author Chris Dennis
- * @author Abhishek Sanoujam
- */
-public class EhcacheEntityRegion extends EhcacheTransactionalDataRegion implements EntityRegion {
-
- private static final Logger LOG = LoggerFactory.getLogger(EhcacheEntityRegion.class);
-
- /**
- * Constructs an EhcacheEntityRegion around the given underlying cache.
- *
- * @param accessStrategyFactory
- */
- public EhcacheEntityRegion(EhcacheAccessStrategyFactory accessStrategyFactory, Ehcache underlyingCache, Settings settings,
- CacheDataDescription metadata, Properties properties) {
- super(accessStrategyFactory, underlyingCache, settings, metadata, properties);
- }
-
- /**
- * {@inheritDoc}
- */
- public EntityRegionAccessStrategy buildAccessStrategy(AccessType accessType) throws CacheException {
- return accessStrategyFactory.createEntityRegionAccessStrategy(this, accessType);
- }
-}
Index: rctags/ehcache-2.10.7.0.43/ehcache-search-parser/src/main/java/net/sf/ehcache/search/parser/MAggregate.java
===================================================================
diff -u -N
--- rctags/ehcache-2.10.7.0.43/ehcache-search-parser/src/main/java/net/sf/ehcache/search/parser/MAggregate.java (revision 11002)
+++ rctags/ehcache-2.10.7.0.43/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.43/ehcache-core/src/main/java/net/sf/ehcache/transaction/ExpiredTransactionIDImpl.java
===================================================================
diff -u -N
--- rctags/ehcache-2.10.7.0.43/ehcache-core/src/main/java/net/sf/ehcache/transaction/ExpiredTransactionIDImpl.java (revision 11002)
+++ rctags/ehcache-2.10.7.0.43/ehcache-core/src/main/java/net/sf/ehcache/transaction/ExpiredTransactionIDImpl.java (revision 0)
@@ -1,32 +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;
-
-
-/**
- * @author Ludovic Orban
- */
-public class ExpiredTransactionIDImpl extends TransactionIDImpl {
-
- /**
- * Create an expired transaction ID
- * @param transactionId the non-expired transaction ID to copy
- */
- public ExpiredTransactionIDImpl(TransactionIDImpl transactionId) {
- super(transactionId);
- }
-
-}
Index: rctags/ehcache-2.10.7.0.43/terracotta/bootstrap/src/main/java/org/terracotta/modules/ehcache/async/DefaultAsyncConfig.java
===================================================================
diff -u -N
--- rctags/ehcache-2.10.7.0.43/terracotta/bootstrap/src/main/java/org/terracotta/modules/ehcache/async/DefaultAsyncConfig.java (revision 11002)
+++ rctags/ehcache-2.10.7.0.43/terracotta/bootstrap/src/main/java/org/terracotta/modules/ehcache/async/DefaultAsyncConfig.java (revision 0)
@@ -1,78 +0,0 @@
-/*
- * All content copyright Terracotta, Inc., unless otherwise indicated. All rights reserved.
- */
-package org.terracotta.modules.ehcache.async;
-
-import java.util.concurrent.TimeUnit;
-
-public class DefaultAsyncConfig implements AsyncConfig {
- private final static AsyncConfig INSTANCE = new DefaultAsyncConfig();
-
- public final static long WORK_DELAY = TimeUnit.SECONDS.toMillis(1L); // 1 second
- public final static long MAX_ALLOWED_FALLBEHIND = TimeUnit.SECONDS.toMillis(2L); // 2 seconds
- public final static int BATCH_SIZE = 1;
- public final static boolean BATCHING_ENABLED = false;
- public final static boolean SYNCHRONOUS_WRITE = false;
- public final static int RETRY_ATTEMPTS = 0;
- public final static long RETRY_ATTEMPT_DELAY = TimeUnit.SECONDS.toMillis(1L); // 1 second
- public final static int RATE_LIMIT = 0;
- public final static int MAX_QUEUE_SIZE = 0;
-
- /**
- * Return an {@code AsyncConfig} instance representing the default configuration.
- *
- * @return the default configuration
- */
- public static AsyncConfig getInstance() {
- return INSTANCE;
- }
-
- protected DefaultAsyncConfig() {
- // private constructor for singleton
- }
-
- @Override
- public long getWorkDelay() {
- return WORK_DELAY;
- }
-
- @Override
- public long getMaxAllowedFallBehind() {
- return MAX_ALLOWED_FALLBEHIND;
- }
-
- @Override
- public int getBatchSize() {
- return BATCH_SIZE;
- }
-
- @Override
- public boolean isBatchingEnabled() {
- return BATCHING_ENABLED;
- }
-
- @Override
- public boolean isSynchronousWrite() {
- return SYNCHRONOUS_WRITE;
- }
-
- @Override
- public int getRetryAttempts() {
- return RETRY_ATTEMPTS;
- }
-
- @Override
- public long getRetryAttemptDelay() {
- return RETRY_ATTEMPT_DELAY;
- }
-
- @Override
- public int getRateLimit() {
- return RATE_LIMIT;
- }
-
- @Override
- public int getMaxQueueSize() {
- return MAX_QUEUE_SIZE;
- }
-}
Index: rctags/ehcache-2.10.7.0.43/ehcache-core/src/main/java/net/sf/ehcache/config/generator/model/elements/SizeOfPolicyConfigurationElement.java
===================================================================
diff -u -N
--- rctags/ehcache-2.10.7.0.43/ehcache-core/src/main/java/net/sf/ehcache/config/generator/model/elements/SizeOfPolicyConfigurationElement.java (revision 11002)
+++ rctags/ehcache-2.10.7.0.43/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.43/system-tests/src/test/java/org/terracotta/ehcache/tests/txns/TwoResourceBTMXATest.java
===================================================================
diff -u -N
--- rctags/ehcache-2.10.7.0.43/system-tests/src/test/java/org/terracotta/ehcache/tests/txns/TwoResourceBTMXATest.java (revision 11002)
+++ rctags/ehcache-2.10.7.0.43/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.43/ehcache-core/src/main/java/net/sf/ehcache/search/impl/OrderComparator.java
===================================================================
diff -u -N
--- rctags/ehcache-2.10.7.0.43/ehcache-core/src/main/java/net/sf/ehcache/search/impl/OrderComparator.java (revision 11002)
+++ rctags/ehcache-2.10.7.0.43/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.43/ehcache-core/src/main/java/net/sf/ehcache/pool/Size.java
===================================================================
diff -u -N
--- rctags/ehcache-2.10.7.0.43/ehcache-core/src/main/java/net/sf/ehcache/pool/Size.java (revision 11002)
+++ rctags/ehcache-2.10.7.0.43/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.43/ehcache-core/src/main/java/net/sf/ehcache/transaction/SoftLockFactory.java
===================================================================
diff -u -N
--- rctags/ehcache-2.10.7.0.43/ehcache-core/src/main/java/net/sf/ehcache/transaction/SoftLockFactory.java (revision 11002)
+++ rctags/ehcache-2.10.7.0.43/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.43/ehcache-scheduled-refresh/src/main/java/net/sf/ehcache/constructs/scheduledrefresh/RefreshBatchJob.java
===================================================================
diff -u -N
--- rctags/ehcache-2.10.7.0.43/ehcache-scheduled-refresh/src/main/java/net/sf/ehcache/constructs/scheduledrefresh/RefreshBatchJob.java (revision 11002)
+++ rctags/ehcache-2.10.7.0.43/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.43/distribution/events/src/assemble/bin/stop-jetty.bat
===================================================================
diff -u -N
--- rctags/ehcache-2.10.7.0.43/distribution/events/src/assemble/bin/stop-jetty.bat (revision 11002)
+++ rctags/ehcache-2.10.7.0.43/distribution/events/src/assemble/bin/stop-jetty.bat (revision 0)
@@ -1,38 +0,0 @@
-@echo off
-
-if not defined JAVA_HOME (
- echo JAVA_HOME is not defined
- exit /b 1
-)
-
-setlocal
-
-set jetty_instance=%1
-
-if "%jetty_instance%" == "" (
- echo Need to specify which instance of Jetty: 9081 or 9082
- exit /b 1
-)
-
-pushd "%~d0%~p0"
-for /f "tokens=*" %%a in ('call relative-paths.bat tc_install_dir') do set tc_install_dir=%%a
-pushd
-cd %tc_install_dir%
-set tc_install_dir=%CD%
-set tc_install_dir="%tc_install_dir:"=%"
-popd
-popd
-
-set JAVA_HOME="%JAVA_HOME:"=%"
-set root=%~d0%~p0..
-set root="%root:"=%"
-set jetty_work_dir=%root%\jetty6.1\%jetty_instance%
-set jetty_home=%tc_install_dir%\third-party\jetty-6.1.15
-set start_jar=%jetty_home%\start.jar
-set /a stop_port=jetty_instance + 2
-
-cd %jetty_work_dir%
-echo Stopping Jetty %jetty_instance%...
-%JAVA_HOME%\bin\java -Djetty.home=%jetty_home% -DSTOP.PORT=%stop_port% -DSTOP.KEY=secret -jar %start_jar% --stop
-
-endlocal
Index: rctags/ehcache-2.10.7.0.43/ehcache-core/src/main/java/net/sf/ehcache/search/impl/ResultImpl.java
===================================================================
diff -u -N
--- rctags/ehcache-2.10.7.0.43/ehcache-core/src/main/java/net/sf/ehcache/search/impl/ResultImpl.java (revision 11002)
+++ rctags/ehcache-2.10.7.0.43/ehcache-core/src/main/java/net/sf/ehcache/search/impl/ResultImpl.java (revision 0)
@@ -1,77 +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.util.Map;
-
-import net.sf.ehcache.store.StoreQuery;
-
-/**
- * Result implementation
- *
- * @author teck
- */
-public class ResultImpl extends BaseResult {
-
- private final Object key;
- private final Object value;
- private final Map attributes;
- private final Object[] sortAttributes;
-
- /**
- * Constructor
- *
- * @param key
- * @param value
- * @param query
- * @param attributes
- * @param sortAttributes
- */
- public ResultImpl(Object key, Object value, StoreQuery query, Map attributes, Object[] sortAttributes) {
- super(query);
- this.key = key;
- this.value = value;
- this.attributes = attributes;
- this.sortAttributes = sortAttributes;
- }
-
- /**
- * Get attribute value for use in sorting
- *
- * @param pos
- * @return
- */
- Object getSortAttribute(int pos) {
- return sortAttributes[pos];
- }
-
- @Override
- protected Object basicGetKey() {
- return key;
- }
-
- @Override
- protected Object basicGetValue() {
- return value;
- }
-
- @Override
- protected Object basicGetAttribute(String name) {
- return attributes.get(name);
- }
-
-}
Index: rctags/ehcache-2.10.7.0.43/ehcache-core/src/main/java/net/sf/ehcache/transaction/DelegatingTransactionIDFactory.java
===================================================================
diff -u -N
--- rctags/ehcache-2.10.7.0.43/ehcache-core/src/main/java/net/sf/ehcache/transaction/DelegatingTransactionIDFactory.java (revision 11002)
+++ rctags/ehcache-2.10.7.0.43/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.43/system-tests/src/test/java/org/terracotta/ehcache/tests/servermap/ServerMapElementTTLExpressTest.java
===================================================================
diff -u -N
--- rctags/ehcache-2.10.7.0.43/system-tests/src/test/java/org/terracotta/ehcache/tests/servermap/ServerMapElementTTLExpressTest.java (revision 11002)
+++ rctags/ehcache-2.10.7.0.43/system-tests/src/test/java/org/terracotta/ehcache/tests/servermap/ServerMapElementTTLExpressTest.java (revision 0)
@@ -1,37 +0,0 @@
-/*
- * All content copyright Terracotta, Inc., unless otherwise indicated. All rights reserved.
- */
-package org.terracotta.ehcache.tests.servermap;
-
-import org.terracotta.ehcache.tests.AbstractCacheTestBase;
-
-import com.tc.properties.TCPropertiesConsts;
-import com.tc.test.config.model.TestConfig;
-
-import java.util.Iterator;
-
-public class ServerMapElementTTLExpressTest extends AbstractCacheTestBase {
-
- public ServerMapElementTTLExpressTest(TestConfig testConfig) {
- super("/servermap/basic-servermap-cache-test.xml", testConfig, ServerMapElementTTLExpressTestClient.class);
- testConfig.setDgcEnabled(true);
- testConfig.setDgcIntervalInSec(60);
- testConfig.addTcProperty("ehcache.evictor.logging.enabled", "true");
- testConfig.addTcProperty(TCPropertiesConsts.EHCACHE_EVICTOR_LOGGING_ENABLED, "true");
- testConfig.addTcProperty(TCPropertiesConsts.EHCACHE_STORAGESTRATEGY_DCV2_EVICT_UNEXPIRED_ENTRIES_ENABLED, "false");
- testConfig.addTcProperty(TCPropertiesConsts.EHCACHE_STORAGESTRATEGY_DCV2_PERELEMENT_TTI_TTL_ENABLED, "true");
-
- final Iterator iter = testConfig.getClientConfig().getExtraClientJvmArgs().iterator();
- while (iter.hasNext()) {
- final String prop = iter.next();
- if (prop.contains("ehcache.storageStrategy.dcv2.localcache.enabled")) {
- // remove it and always disable localcache for this test
- iter.remove();
- }
- }
- // always disable local cache
- testConfig.getClientConfig().addExtraClientJvmArg("-Dcom.tc.ehcache.storageStrategy.dcv2.localcache.enabled=false");
- testConfig.getClientConfig().addExtraClientJvmArg("-Dcom.tc.ehcache.evictor.logging.enabled=true");
- }
-
-}
Index: rctags/ehcache-2.10.7.0.43/system-tests/src/test/resources/one-cache-test.xml
===================================================================
diff -u -N
--- rctags/ehcache-2.10.7.0.43/system-tests/src/test/resources/one-cache-test.xml (revision 11002)
+++ rctags/ehcache-2.10.7.0.43/system-tests/src/test/resources/one-cache-test.xml (revision 0)
@@ -1,14 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
Index: rctags/ehcache-2.10.7.0.43/ehcache-core/src/test/java/net/sf/ehcache/search/DynamicAttributeExtractorTest.java
===================================================================
diff -u -N
--- rctags/ehcache-2.10.7.0.43/ehcache-core/src/test/java/net/sf/ehcache/search/DynamicAttributeExtractorTest.java (revision 11002)
+++ rctags/ehcache-2.10.7.0.43/ehcache-core/src/test/java/net/sf/ehcache/search/DynamicAttributeExtractorTest.java (revision 0)
@@ -1,180 +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;
-
-import java.util.Arrays;
-import java.util.Collections;
-import java.util.HashSet;
-import java.util.Map;
-import java.util.Set;
-
-import static junit.framework.Assert.*;
-
-import net.sf.ehcache.CacheManager;
-import net.sf.ehcache.Ehcache;
-import net.sf.ehcache.Element;
-import net.sf.ehcache.config.CacheConfiguration;
-import net.sf.ehcache.config.Configuration;
-import net.sf.ehcache.config.SearchAttribute;
-import net.sf.ehcache.config.Searchable;
-import net.sf.ehcache.search.Person.Gender;
-import net.sf.ehcache.search.aggregator.Aggregators;
-import net.sf.ehcache.search.attribute.DynamicAttributesExtractor;
-
-import org.junit.After;
-import org.junit.Before;
-import org.junit.Test;
-
-public class DynamicAttributeExtractorTest {
-
- private CacheManager cm;
- private Ehcache cache;
-
- private Attribute age;
- private Attribute name;
- private Attribute dept;
-
- private final Attribute gender = new Attribute("gender"); // dynamically extracted
-
- private final DynamicAttributesExtractor indexer = new DynamicAttributesExtractor() {
-
- @Override
- public Map attributesFor(Element element) {
- Person p = (Person) element.getObjectValue();
- return Collections.singletonMap("gender", p.getGender());
- }
- };
-
- @Before
- public void setUp() throws Exception {
- Configuration cfg = new Configuration();
- CacheConfiguration cacheCfg = new CacheConfiguration("searchCache", 1000);
- Searchable s = new Searchable();
- s.keys(true);
- s.allowDynamicIndexing(true);
- s.addSearchAttribute(new SearchAttribute().name("age"));
- s.addSearchAttribute(new SearchAttribute().name("name"));
- s.addSearchAttribute(new SearchAttribute().name("department"));
- cacheCfg.searchable(s);
- cfg.addCache(cacheCfg);
-
- cm = new CacheManager(cfg);
- cache = cm.getCache("searchCache");
- cache.registerDynamicAttributesExtractor(indexer);
- SearchTestUtil.populateData(cache);
-
- age = cache.getSearchAttribute("age");
- dept = cache.getSearchAttribute("department");
- name = cache.getSearchAttribute("name");
- }
-
- @After
- public void tearDown() throws Exception {
- cm.shutdown();
- }
-
- private void verifyOrdered(Query q, int... expectedKeys) {
- Results results = q.execute();
- assertEquals(expectedKeys.length, results.size());
- if (expectedKeys.length == 0) {
- assertFalse(results.hasKeys());
- } else {
- assertTrue(results.hasKeys());
- }
- assertFalse(results.hasAttributes());
-
- int i = 0;
- for (Result result : results.all()) {
-
- int key = (Integer) result.getKey();
- assertEquals(expectedKeys[i++], key);
- }
- }
-
- private void verify(Query q, Integer... expectedKeys) {
- Results results = q.execute();
- assertEquals(expectedKeys.length, results.size());
- if (expectedKeys.length == 0) {
- assertFalse(results.hasKeys());
- } else {
- assertTrue(results.hasKeys());
- }
- assertFalse(results.hasAttributes());
-
- Set keys = new HashSet(Arrays.asList(expectedKeys));
- for (Result result : results.all()) {
-
- int key = (Integer) result.getKey();
- if (!keys.remove(key)) {
- throw new AssertionError("unexpected key: " + key);
- }
- }
- }
-
- @Test
- public void testBasicCriteria() {
- Query q = cache.createQuery();
- q.addCriteria(gender.eq(Gender.MALE));
- q.includeKeys();
- verify(q, 1, 3, 4);
-
- q.addCriteria(age.lt(31));
- verify(q, 4);
-
- q = cache.createQuery();
- q.includeKeys();
- q.addCriteria(gender.ne(Gender.MALE).and(dept.ilike("eng?")));
- verify(q, 2);
-
- }
-
- @Test
- public void testSorting() {
- Query q = cache.createQuery().includeKeys();
- q.addOrderBy(gender, Direction.DESCENDING);
- q.addOrderBy(name, Direction.ASCENDING);
- verifyOrdered(q, 2, 3, 4, 1);
- }
-
- @Test
- public void testGroupBy() {
- Query q = cache.createQuery().addGroupBy(gender);
- q.includeAggregator(age.max());
- Results res = q.execute();
- assertEquals(2, res.size());
- }
-
- @Test
- public void testAggregators() {
- Query q = cache.createQuery().addCriteria(gender.eq(Gender.MALE));
- q.includeAggregator(Aggregators.count());
- q.addCriteria(dept.ilike("sales*").not());
- Results res = q.execute();
- assertEquals(1, res.size());
- assertEquals(3, res.all().get(0).getAggregatorResults().get(0));
- }
-
- @Test
- public void testAttributeSelect() {
- Query q = cache.createQuery().includeAttribute(gender, age).addCriteria(gender.ne(Gender.MALE));
- Results res = q.execute();
- assertEquals(1, res.size());
- Result r = res.all().get(0);
- assertEquals(Gender.FEMALE, r.getAttribute(gender));
- assertEquals(23, r.getAttribute(age).intValue());
- }
-}
Index: rctags/ehcache-2.10.7.0.43/ehcache-core/src/main/java/net/sf/ehcache/constructs/blocking/package.html
===================================================================
diff -u -N
--- rctags/ehcache-2.10.7.0.43/ehcache-core/src/main/java/net/sf/ehcache/constructs/blocking/package.html (revision 11002)
+++ rctags/ehcache-2.10.7.0.43/ehcache-core/src/main/java/net/sf/ehcache/constructs/blocking/package.html (revision 0)
@@ -1,11 +0,0 @@
-
-
-
-
- Doug Lea in his book Concurrent Programming in Java talks about concurrency support constructs.
- One meaning of a construct is "an abstract or general idea inferred or derived from specific instances".
- Just like patterns emerge from noting the similarities of problems and gradually finding a solution to
- classes of them, so to constructs are general solutions to commond problems. With the constructs package,
- concrete, extensible implementations are offered to solve these common problems.
-
-
Index: rctags/ehcache-2.10.7.0.43/system-tests/src/test/resources/cache-locks-test.xml
===================================================================
diff -u -N
--- rctags/ehcache-2.10.7.0.43/system-tests/src/test/resources/cache-locks-test.xml (revision 11002)
+++ rctags/ehcache-2.10.7.0.43/system-tests/src/test/resources/cache-locks-test.xml (revision 0)
@@ -1,19 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
Index: rctags/ehcache-2.10.7.0.43/system-tests/src/test/java/org/terracotta/modules/ehcache/store/DynamicCacheConfigurationTest.java
===================================================================
diff -u -N
--- rctags/ehcache-2.10.7.0.43/system-tests/src/test/java/org/terracotta/modules/ehcache/store/DynamicCacheConfigurationTest.java (revision 11002)
+++ rctags/ehcache-2.10.7.0.43/system-tests/src/test/java/org/terracotta/modules/ehcache/store/DynamicCacheConfigurationTest.java (revision 0)
@@ -1,368 +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.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.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 static java.util.concurrent.TimeUnit.SECONDS;
-
-/**
- * @author cdennis
- */
-public class DynamicCacheConfigurationTest extends AbstractCacheTestBase {
- public DynamicCacheConfigurationTest(TestConfig testConfig) {
- super(testConfig, App.class);
- testConfig.addTcProperty(TCPropertiesConsts.L2_SERVERMAP_EVICTION_CLIENTOBJECT_REFERENCES_REFRESH_INTERVAL, "5000");
- testConfig.addTcProperty(TCPropertiesConsts.EHCACHE_EVICTOR_LOGGING_ENABLED, "true");
- }
-
- public static class App extends ClientBase {
- private static final double TOLERANCE = 0.1;
-
- public App(String[] args) {
- super(args);
- }
-
- public static void main(String[] args) {
- new App(args).run();
- }
-
- @Override
- protected void runTest(Cache cache, Toolkit clusteringToolkit) throws Throwable {
- testTTIChange(cacheManager);
- testTTLChange(cacheManager);
- testDiskCapacityChange(cacheManager);
- testMemoryCapacityChange(cacheManager);
- testTTIChangeWithCustomElements(cacheManager);
- testTTLChangeWithCustomElements(cacheManager);
- }
-
- private Cache createCache(String cacheName, int maxMemory, boolean eternal, long ttl, long tti) {
- return new Cache(new CacheConfiguration(cacheName, maxMemory)
- .eternal(eternal)
- .timeToLiveSeconds(ttl)
- .timeToIdleSeconds(tti)
- .clearOnFlush(true)
- .terracotta(new TerracottaConfiguration().clustered(true).consistency(Consistency.STRONG)
- .coherentReads(true).orphanEviction(true).orphanEvictionPeriod(4).localKeyCache(false)
- .localKeyCacheSize(0).copyOnRead(false)).logging(true));
- }
-
- private void testTTIChange(CacheManager manager) throws InterruptedException {
- Cache cache = createCache("testTTIChange", 10, false, 0, 10);
- manager.addCache(cache);
-
- cache.put(new Element("key1", new byte[0]));
- cache.put(new Element("key2", new byte[0]));
-
- SECONDS.sleep(6);
-
- cache.get("key2");
-
- SECONDS.sleep(6);
-
- Assert.assertNull(cache.get("key1"));
- Assert.assertNotNull(cache.get("key2"));
-
- cache.getCacheConfiguration().setTimeToIdleSeconds(20);
- long currentTime = System.currentTimeMillis();
-
- cache.put(new Element("key1", new byte[0]));
-
- SECONDS.sleep(15);
-
- Assert.assertNotNull(cache.get("key1"));
- if (System.currentTimeMillis() - currentTime < 20000 ) {
- Assert.assertNotNull(cache.get("key2"));
- } else {
- Assert.assertNull(cache.get("key2"));
- }
-
- SECONDS.sleep(25);
-
- Assert.assertNull(cache.get("key1"));
- Assert.assertNull(cache.get("key2"));
-
- cache.getCacheConfiguration().setTimeToIdleSeconds(4);
-
- cache.put(new Element("key1", new byte[0]));
- cache.put(new Element("key2", new byte[0]));
-
- SECONDS.sleep(8);
-
- Assert.assertNull(cache.get("key1"));
- Assert.assertNull(cache.get("key2"));
-
- cache.removeAll();
- }
-
- private void testTTLChange(CacheManager cm) throws InterruptedException {
- Cache cache = createCache("testTTLChange", 10, false, 10, 0);
- cm.addCache(cache);
-
- cache.put(new Element("key1", new byte[0]));
-
- SECONDS.sleep(6);
-
- Assert.assertNotNull(cache.get("key1"));
- cache.put(new Element("key2", new byte[0]));
-
- SECONDS.sleep(6);
-
- Assert.assertNull(cache.get("key1"));
- Assert.assertNotNull(cache.get("key2"));
-
- cache.getCacheConfiguration().setTimeToLiveSeconds(20);
-
- cache.put(new Element("key1", new byte[0]));
-
- SECONDS.sleep(8);
-
- Assert.assertNotNull(cache.get("key1"));
- Assert.assertNotNull(cache.get("key2"));
-
- SECONDS.sleep(8);
-
- Assert.assertNotNull(cache.get("key1"));
- Assert.assertNull(cache.get("key2"));
-
- SECONDS.sleep(10);
-
- Assert.assertNull(cache.get("key1"));
-
- cache.getCacheConfiguration().setTimeToLiveSeconds(4);
-
- cache.put(new Element("key1", new byte[0]));
- cache.put(new Element("key2", new byte[0]));
-
- SECONDS.sleep(8);
-
- Assert.assertNull(cache.get("key1"));
- Assert.assertNull(cache.get("key2"));
-
- cache.removeAll();
- }
-
- public void testTTIChangeWithCustomElements(CacheManager cm) throws InterruptedException {
- Cache cache = createCache("testTTIChangeWithCustomElements", 10, false, 0, 10);
- cm.addCache(cache);
-
- cache.put(new Element("default", new byte[0]));
- cache.put(new Element("eternal", new byte[0], true, 0, 0));
- cache.put(new Element("short", new byte[0], false, 1, 1));
- cache.put(new Element("long", new byte[0], true, 100, 100));
-
- SECONDS.sleep(6);
-
- Assert.assertNull(cache.get("short"));
-
- SECONDS.sleep(6);
-
- Assert.assertNull(cache.get("default"));
- Assert.assertNotNull(cache.get("eternal"));
- Assert.assertNull(cache.get("short"));
- Assert.assertNotNull(cache.get("long"));
-
- cache.getCacheConfiguration().setTimeToIdleSeconds(20);
-
- cache.put(new Element("default", new byte[0]));
- cache.put(new Element("short", new byte[0], false, 1, 1));
-
- SECONDS.sleep(15);
-
- Assert.assertNotNull(cache.get("default"));
- Assert.assertNotNull(cache.get("eternal"));
- Assert.assertNull(cache.get("short"));
- Assert.assertNotNull(cache.get("long"));
-
- SECONDS.sleep(25);
-
- Assert.assertNull(cache.get("default"));
- Assert.assertNotNull(cache.get("eternal"));
- Assert.assertNull(cache.get("short"));
- Assert.assertNotNull(cache.get("long"));
-
- cache.getCacheConfiguration().setTimeToIdleSeconds(4);
-
- cache.put(new Element("default", new byte[0]));
- cache.put(new Element("short", new byte[0], false, 1, 1));
-
- SECONDS.sleep(8);
-
- Assert.assertNull(cache.get("default"));
- Assert.assertNotNull(cache.get("eternal"));
- Assert.assertNull(cache.get("short"));
- Assert.assertNotNull(cache.get("long"));
-
- cache.removeAll();
- }
-
- public void testTTLChangeWithCustomElements(CacheManager cm) throws InterruptedException {
- Cache cache = createCache("testTTLChangeWithCustomElements", 10, false, 10, 0);
- cm.addCache(cache);
-
- cache.put(new Element("default", new byte[0]));
- cache.put(new Element("eternal", new byte[0], true, 0, 0));
- cache.put(new Element("short", new byte[0], false, 1, 1));
- cache.put(new Element("long", new byte[0], true, 100, 100));
-
- SECONDS.sleep(6);
-
- Assert.assertNotNull(cache.get("default"));
- Assert.assertNotNull(cache.get("eternal"));
- Assert.assertNull(cache.get("short"));
- Assert.assertNotNull(cache.get("long"));
-
- SECONDS.sleep(6);
-
- Assert.assertNull(cache.get("default"));
- Assert.assertNotNull(cache.get("eternal"));
- Assert.assertNull(cache.get("short"));
- Assert.assertNotNull(cache.get("long"));
-
- cache.getCacheConfiguration().setTimeToLiveSeconds(20);
-
- cache.put(new Element("default", new byte[0]));
- cache.put(new Element("short", new byte[0], false, 1, 1));
-
- SECONDS.sleep(6);
-
- Assert.assertNotNull(cache.get("default"));
- Assert.assertNotNull(cache.get("eternal"));
- Assert.assertNull(cache.get("short"));
- Assert.assertNotNull(cache.get("long"));
-
- SECONDS.sleep(6);
-
- Assert.assertNotNull(cache.get("default"));
- Assert.assertNotNull(cache.get("eternal"));
- Assert.assertNull(cache.get("short"));
- Assert.assertNotNull(cache.get("long"));
-
- SECONDS.sleep(10);
-
- Assert.assertNull(cache.get("default"));
- Assert.assertNotNull(cache.get("eternal"));
- Assert.assertNull(cache.get("short"));
- Assert.assertNotNull(cache.get("long"));
-
- cache.getCacheConfiguration().setTimeToLiveSeconds(4);
-
- cache.put(new Element("default", new byte[0]));
- cache.put(new Element("short", new byte[0], false, 1, 1));
-
- SECONDS.sleep(8);
-
- Assert.assertNull(cache.get("default"));
- Assert.assertNotNull(cache.get("eternal"));
- Assert.assertNull(cache.get("short"));
- Assert.assertNotNull(cache.get("long"));
-
- cache.removeAll();
- }
-
- private void testMemoryCapacityChange(CacheManager cm) throws Exception {
- final Cache cache = createCache("testMemoryCapacityChange", 100, true, 0, 0);
- cache.getCacheConfiguration().getTerracottaConfiguration()
- .consistency(TerracottaConfiguration.Consistency.STRONG);
- cm.addCache(cache);
-
- int i = 0;
- for (; i < 150; i++) {
- cache.put(new Element("key" + i, new byte[0]));
- }
-
- waitForCacheMemoryStoreSize(cache, 100);
-
- cache.getCacheConfiguration().setMaxEntriesLocalHeap(200);
-
- for (; i < 250; i++) {
- cache.put(new Element("key" + i, new byte[0]));
- }
-
- waitForCacheMemoryStoreSize(cache, 100, 200);
-
- cache.getCacheConfiguration().setMaxEntriesLocalHeap(50);
-
- for (; i < 350; i++) {
- cache.put(new Element("key" + i, new byte[0]));
- }
-
- waitForCacheMemoryStoreSize(cache, 50);
-
- cache.removeAll();
- }
-
- private void waitForCacheMemoryStoreSize(final Cache cache, final int lowerBound, final int upperBound)
- throws Exception {
- final int min = (int) ((1 - TOLERANCE) * lowerBound);
- final int max = (int) ((1 + TOLERANCE) * upperBound);
- WaitUtil.waitUntilCallableReturnsTrue(new Callable() {
- @Override
- public Boolean call() throws Exception {
- if (cache.getStatistics().getLocalHeapSize() <= max && cache.getStatistics().getLocalHeapSize() >= min) {
- return true;
- }
- System.out.println("Still waiting for memory store size to fall in bounds [" + lowerBound + ", " + upperBound
- + "] current=" + cache.getStatistics().getLocalHeapSize());
- return false;
- }
- });
- }
-
- private void waitForCacheMemoryStoreSize(final Cache cache, final int upperBound) throws Exception {
- waitForCacheMemoryStoreSize(cache, 0, upperBound);
- }
-
- public void testDiskCapacityChange(CacheManager cm) throws Exception {
- final Cache cache = createCache("testDiskCapacityChange", 10, true, 0, 0);
- cache.getCacheConfiguration().maxEntriesLocalHeap(1).maxEntriesInCache(100).getTerracottaConfiguration()
- .consistency(TerracottaConfiguration.Consistency.STRONG).concurrency(16);
- cm.addCache(cache);
-
- testCacheDiskCapacity(cache, 100);
-
- cache.getCacheConfiguration().setMaxEntriesInCache(200);
-
- testCacheDiskCapacity(cache, 200);
-
- cache.getCacheConfiguration().setMaxEntriesInCache(50);
-
- testCacheDiskCapacity(cache, 50);
-
- cache.removeAll();
- }
-
- private void testCacheDiskCapacity(final Cache cache, final int capacity) throws Exception {
- for (int i = 0; i < 1000; i++) {
- cache.put(new Element("key" + i, new byte[0]));
- }
- System.out.println("Waiting on capacoty of " + capacity);
- WaitUtil.waitUntilCallableReturnsTrue(new Callable() {
- @Override
- public Boolean call() throws Exception {
- System.out.println("Current cache size " + cache.getSize());
- Assert.assertTrue(cache.getSize() > capacity * .85);
- return cache.getSize() >= capacity * 0.9 && cache.getSize() <= capacity * 1.1;
- }
- });
- }
-
- }
-}
Index: rctags/ehcache-2.10.7.0.43/ehcache-core/src/main/java/net/sf/ehcache/hibernate/ccs/EhcacheReadOnlyCache.java
===================================================================
diff -u -N
--- rctags/ehcache-2.10.7.0.43/ehcache-core/src/main/java/net/sf/ehcache/hibernate/ccs/EhcacheReadOnlyCache.java (revision 11002)
+++ rctags/ehcache-2.10.7.0.43/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.43/system-tests/src/test/java/org/terracotta/ehcache/tests/OverflowToDiskStandaloneCacheTest.java
===================================================================
diff -u -N
--- rctags/ehcache-2.10.7.0.43/system-tests/src/test/java/org/terracotta/ehcache/tests/OverflowToDiskStandaloneCacheTest.java (revision 11002)
+++ rctags/ehcache-2.10.7.0.43/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.43/ehcache-core/src/main/java/net/sf/ehcache/store/compound/ReadWriteSerializationCopyStrategy.java
===================================================================
diff -u -N
--- rctags/ehcache-2.10.7.0.43/ehcache-core/src/main/java/net/sf/ehcache/store/compound/ReadWriteSerializationCopyStrategy.java (revision 11002)
+++ rctags/ehcache-2.10.7.0.43/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.43/ehcache-core/src/main/java/net/sf/ehcache/statistics/extended/OperationImpl.java
===================================================================
diff -u -N
--- rctags/ehcache-2.10.7.0.43/ehcache-core/src/main/java/net/sf/ehcache/statistics/extended/OperationImpl.java (revision 11002)
+++ rctags/ehcache-2.10.7.0.43/ehcache-core/src/main/java/net/sf/ehcache/statistics/extended/OperationImpl.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.statistics.extended;
-
-import java.util.Set;
-import java.util.concurrent.ScheduledExecutorService;
-
-import net.sf.ehcache.statistics.extended.ExtendedStatistics.Latency;
-import net.sf.ehcache.statistics.extended.ExtendedStatistics.Result;
-import net.sf.ehcache.statistics.extended.ExtendedStatistics.Statistic;
-
-import org.terracotta.statistics.OperationStatistic;
-
-/**
- * The Class OperationImpl.
- *
- * @param the generic type
- * @author cdennis
- */
-class OperationImpl> implements Result {
-
- /** The source. */
- private final OperationStatistic source;
-
- /** The count. */
- private final SemiExpiringStatistic count;
-
- /** The rate. */
- private final RateImpl rate;
-
- /** The latency. */
- private final LatencyImpl latency;
-
- /**
- * Instantiates a new operation impl.
- *
- * @param source the source
- * @param targets the targets
- * @param averageNanos the average nanos
- * @param executor the executor
- * @param historySize the history size
- * @param historyNanos the history nanos
- */
- public OperationImpl(OperationStatistic source, Set targets, long averageNanos,
- ScheduledExecutorService executor, int historySize, long historyNanos) {
- this.source = source;
- this.count = new SemiExpiringStatistic(source.statistic(targets), executor, historySize, historyNanos);
- this.latency = new LatencyImpl(source, targets, averageNanos, executor, historySize, historyNanos);
- this.rate = new RateImpl(source, targets, averageNanos, executor, historySize, historyNanos);
- }
-
- /* (non-Javadoc)
- * @see net.sf.ehcache.statisticsV2.extended.ExtendedStatistics.Result#rate()
- */
- @Override
- public Statistic rate() {
- return rate;
- }
-
- /* (non-Javadoc)
- * @see net.sf.ehcache.statisticsV2.extended.ExtendedStatistics.Result#latency()
- */
- @Override
- public Latency latency() throws UnsupportedOperationException {
- return latency;
- }
-
- /* (non-Javadoc)
- * @see net.sf.ehcache.statisticsV2.extended.ExtendedStatistics.Result#count()
- */
- @Override
- public Statistic count() {
- return count;
- }
-
- /**
- * Start.
- */
- void start() {
- count.start();
- rate.start();
- latency.start();
- }
-
- /**
- * Expire.
- *
- * @param expiryTime the expiry time
- * @return true, if successful
- */
- boolean expire(long expiryTime) {
- return (count.expire(expiryTime) & rate.expire(expiryTime) & latency.expire(expiryTime));
- }
-
- /**
- * Sets the window.
- *
- * @param averageNanos the new window
- */
- void setWindow(long averageNanos) {
- rate.setWindow(averageNanos);
- latency.setWindow(averageNanos);
- }
-
- /**
- * Sets the history.
- *
- * @param historySize the history size
- * @param historyNanos the history nanos
- */
- void setHistory(int historySize, long historyNanos) {
- count.setHistory(historySize, historyNanos);
- rate.setHistory(historySize, historyNanos);
- latency.setHistory(historySize, historyNanos);
- }
-}
Index: rctags/ehcache-2.10.7.0.43/ehcache-core/src/main/java/net/sf/ehcache/terracotta/KeySnapshotter.java
===================================================================
diff -u -N
--- rctags/ehcache-2.10.7.0.43/ehcache-core/src/main/java/net/sf/ehcache/terracotta/KeySnapshotter.java (revision 11002)
+++ rctags/ehcache-2.10.7.0.43/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.43/ehcache-core/src/test/java/net/sf/ehcache/loader/NullCountingCacheLoaderFactory.java
===================================================================
diff -u -N
--- rctags/ehcache-2.10.7.0.43/ehcache-core/src/test/java/net/sf/ehcache/loader/NullCountingCacheLoaderFactory.java (revision 11002)
+++ rctags/ehcache-2.10.7.0.43/ehcache-core/src/test/java/net/sf/ehcache/loader/NullCountingCacheLoaderFactory.java (revision 0)
@@ -1,52 +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.loader;
-
-
-import net.sf.ehcache.Ehcache;
-
-import java.util.Map;
-import java.util.Properties;
-
-/**
- * A factory for creating counting cache loaders. This can be hooked up to the JCacheFactory by
- * specifying "cacheLoaderFactoryClassName" in the environment
- *
- * @author Greg Luck
- * @version $Id: NullCountingCacheLoaderFactory.java 5594 2012-05-07 16:04:31Z cdennis $
- */
-public class NullCountingCacheLoaderFactory extends CacheLoaderFactory {
-
-
- /**
- */
- public CacheLoader createCacheLoader(Map environment) {
- return new NullCountingCacheLoader();
- }
-
- /**
- * Creates a CacheLoader using the Ehcache configuration mechanism at the time the associated cache is created.
- *
- * @param properties implementation specific properties. These are configured as comma
- * separated name value pairs in ehcache.xml
- * @return a constructed CacheLoader
- */
- public CacheLoader createCacheLoader(Ehcache cache, Properties properties) {
- return new NullCountingCacheLoader();
- }
-
-}
\ No newline at end of file
Index: rctags/ehcache-2.10.7.0.43/ehcache-core/src/main/java/net/sf/ehcache/statistics/package.html
===================================================================
diff -u -N
--- rctags/ehcache-2.10.7.0.43/ehcache-core/src/main/java/net/sf/ehcache/statistics/package.html (revision 11002)
+++ rctags/ehcache-2.10.7.0.43/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.43/ehcache-core/src/test/java/net/sf/ehcache/hibernate/domain/VersionedItem.java
===================================================================
diff -u -N
--- rctags/ehcache-2.10.7.0.43/ehcache-core/src/test/java/net/sf/ehcache/hibernate/domain/VersionedItem.java (revision 11002)
+++ rctags/ehcache-2.10.7.0.43/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.43/system-tests/src/test/java/org/terracotta/modules/ehcache/store/CachePinningFaultInvalidatedEntriesTest.java
===================================================================
diff -u -N
--- rctags/ehcache-2.10.7.0.43/system-tests/src/test/java/org/terracotta/modules/ehcache/store/CachePinningFaultInvalidatedEntriesTest.java (revision 11002)
+++ rctags/ehcache-2.10.7.0.43/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.43/system-tests/src/test/java/org/terracotta/ehcache/tests/NonHibernateCacheDecorator.java
===================================================================
diff -u -N
--- rctags/ehcache-2.10.7.0.43/system-tests/src/test/java/org/terracotta/ehcache/tests/NonHibernateCacheDecorator.java (revision 11002)
+++ rctags/ehcache-2.10.7.0.43/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.43/system-tests/src/test/resources/hibernate-config/shutdowntest/domain/Item.hbm.xml
===================================================================
diff -u -N
--- rctags/ehcache-2.10.7.0.43/system-tests/src/test/resources/hibernate-config/shutdowntest/domain/Item.hbm.xml (revision 11002)
+++ rctags/ehcache-2.10.7.0.43/system-tests/src/test/resources/hibernate-config/shutdowntest/domain/Item.hbm.xml (revision 0)
@@ -1,28 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
Index: rctags/ehcache-2.10.7.0.43/ehcache-core/src/main/java/net/sf/ehcache/transaction/Decision.java
===================================================================
diff -u -N
--- rctags/ehcache-2.10.7.0.43/ehcache-core/src/main/java/net/sf/ehcache/transaction/Decision.java (revision 11002)
+++ rctags/ehcache-2.10.7.0.43/ehcache-core/src/main/java/net/sf/ehcache/transaction/Decision.java (revision 0)
@@ -1,40 +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;
-
-/**
- * The decision types a Transaction ID can be in
- *
- * @author Ludovic Orban
- */
-public enum Decision {
-
- /**
- * Transaction decision not yet made.
- */
- IN_DOUBT,
-
- /**
- * Transaction has been marked for commit.
- */
- COMMIT,
-
- /**
- * Transaction has been marked for rollback.
- */
- ROLLBACK
-}
\ No newline at end of file
Index: rctags/ehcache-2.10.7.0.43/terracotta/bootstrap/src/main/java/org/terracotta/modules/ehcache/async/scatterpolicies/SingleBucketScatterPolicy.java
===================================================================
diff -u -N
--- rctags/ehcache-2.10.7.0.43/terracotta/bootstrap/src/main/java/org/terracotta/modules/ehcache/async/scatterpolicies/SingleBucketScatterPolicy.java (revision 11002)
+++ rctags/ehcache-2.10.7.0.43/terracotta/bootstrap/src/main/java/org/terracotta/modules/ehcache/async/scatterpolicies/SingleBucketScatterPolicy.java (revision 0)
@@ -1,15 +0,0 @@
-/*
- * All content copyright Terracotta, Inc., unless otherwise indicated. All rights reserved.
- */
-package org.terracotta.modules.ehcache.async.scatterpolicies;
-
-
-import java.io.Serializable;
-
-public class SingleBucketScatterPolicy implements ItemScatterPolicy {
-
- public int selectBucket(final int count, final E item) {
- return 0;
- }
-
-}
Index: rctags/ehcache-2.10.7.0.43/ehcache-core/checkstyle/suppressions.xml
===================================================================
diff -u -N
--- rctags/ehcache-2.10.7.0.43/ehcache-core/checkstyle/suppressions.xml (revision 11002)
+++ rctags/ehcache-2.10.7.0.43/ehcache-core/checkstyle/suppressions.xml (revision 0)
@@ -1,451 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
Index: rctags/ehcache-2.10.7.0.43/terracotta/bootstrap/src/test/java/org/terracotta/modules/ehcache/ToolkitInstanceFactoryImplTest.java
===================================================================
diff -u -N
--- rctags/ehcache-2.10.7.0.43/terracotta/bootstrap/src/test/java/org/terracotta/modules/ehcache/ToolkitInstanceFactoryImplTest.java (revision 11002)
+++ rctags/ehcache-2.10.7.0.43/terracotta/bootstrap/src/test/java/org/terracotta/modules/ehcache/ToolkitInstanceFactoryImplTest.java (revision 0)
@@ -1,433 +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 org.terracotta.modules.ehcache;
-
-import static org.hamcrest.CoreMatchers.containsString;
-import static org.hamcrest.CoreMatchers.is;
-import static org.hamcrest.CoreMatchers.not;
-import static org.junit.Assert.assertThat;
-import static org.mockito.Matchers.any;
-import static org.mockito.Matchers.anyString;
-import static org.mockito.Matchers.eq;
-import static org.mockito.Mockito.doAnswer;
-import static org.mockito.Mockito.inOrder;
-import static org.mockito.Mockito.mock;
-import static org.mockito.Mockito.times;
-import static org.mockito.Mockito.verify;
-import static org.mockito.Mockito.verifyNoMoreInteractions;
-import static org.mockito.Mockito.when;
-import net.sf.ehcache.CacheException;
-import net.sf.ehcache.CacheManager;
-import net.sf.ehcache.Ehcache;
-import net.sf.ehcache.config.CacheConfiguration;
-import net.sf.ehcache.config.TerracottaConfiguration;
-
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.experimental.categories.Category;
-import org.mockito.ArgumentCaptor;
-import org.mockito.InOrder;
-import org.mockito.Mock;
-import org.mockito.MockitoAnnotations;
-import org.mockito.invocation.InvocationOnMock;
-import org.mockito.stubbing.Answer;
-import org.terracotta.modules.ehcache.wan.WANUtil;
-import org.terracotta.modules.ehcache.wan.Watchdog;
-import org.terracotta.test.categories.CheckShorts;
-import org.terracotta.toolkit.Toolkit;
-import org.terracotta.toolkit.ToolkitFeatureType;
-import org.terracotta.toolkit.collections.ToolkitMap;
-import org.terracotta.toolkit.concurrent.locks.ToolkitLock;
-import org.terracotta.toolkit.concurrent.locks.ToolkitReadWriteLock;
-import org.terracotta.toolkit.config.Configuration;
-import org.terracotta.toolkit.feature.NonStopFeature;
-import org.terracotta.toolkit.internal.ToolkitInternal;
-import org.terracotta.toolkit.internal.ToolkitLogger;
-import org.terracotta.toolkit.internal.cache.BufferingToolkitCache;
-import org.terracotta.toolkit.internal.cache.ToolkitCacheInternal;
-import org.terracotta.toolkit.nonstop.NonStopConfigurationRegistry;
-import org.terracotta.toolkit.store.ToolkitConfigFields;
-
-import com.terracotta.entity.ClusteredEntityManager;
-import com.terracotta.entity.EntityLockHandler;
-import com.terracotta.entity.ehcache.ClusteredCache;
-import com.terracotta.entity.ehcache.ClusteredCacheManager;
-import com.terracotta.entity.ehcache.ClusteredCacheManagerConfiguration;
-import com.terracotta.entity.ehcache.EhcacheEntitiesNaming;
-import com.terracotta.entity.ehcache.ToolkitBackedClusteredCacheManager;
-
-import java.io.Serializable;
-
-import junit.framework.Assert;
-
-/**
- * ToolkitInstanceFactoryImplTest
- */
-@Category(CheckShorts.class)
-public class ToolkitInstanceFactoryImplTest {
-
- private static final String CACHE_MANAGER_NAME = "CACHE_MANAGER_NAME";
- private static final String CACHE_NAME = "CACHE_NAME";
-
- @Mock private Toolkit toolkit;
- @Mock private WANUtil wanUtil;
- @Mock private Ehcache ehcache;
- @Mock private CacheManager cacheManager;
-
- private ToolkitInstanceFactoryImpl factory;
- private ToolkitCacheInternal resultantCache;
-
- @Before
- public void setUp() {
- MockitoAnnotations.initMocks(this);
- toolkit = getMockToolkit();
- final ToolkitMap toolkitMap = mockMap();
- when(toolkit.getMap(anyString(), any(Class.class), any(Class.class))).thenReturn(toolkitMap);
- when(toolkit.getCache(anyString(), any(Configuration.class), any(Class.class)))
- .thenReturn(mock(BufferingToolkitCache.class));
- ToolkitReadWriteLock rwLock = mockReadWriteLock();
- when(toolkit.getReadWriteLock(any(String.class))).thenReturn(rwLock);
- makeToolkitReturnNonStopConfigurationRegistry();
-
- wanUtil = mock(WANUtil.class);
- final Watchdog wanWatchdog = mock(Watchdog.class);
- ehcache = mock(Ehcache.class);
- when(cacheManager.isNamed()).thenReturn(true);
- when(cacheManager.getName()).thenReturn(CACHE_MANAGER_NAME);
- when(ehcache.getCacheManager()).thenReturn(cacheManager);
- when(ehcache.getName()).thenReturn(CACHE_NAME);
- CacheConfiguration configuration = new CacheConfiguration().terracotta(new TerracottaConfiguration());
- when(ehcache.getCacheConfiguration()).thenReturn(configuration);
-
- ClusteredEntityManager clusteredEntityManager = mock(ClusteredEntityManager.class);
- ToolkitBackedClusteredCacheManager clusteredCacheManager = new ToolkitBackedClusteredCacheManager("aName", new ClusteredCacheManagerConfiguration(defaultCMConfig));
- clusteredCacheManager.setToolkit(toolkit);
- clusteredCacheManager.setEntityLockHandler(mock(EntityLockHandler.class));
- when(clusteredEntityManager.getRootEntity(any(String.class), any(Class.class))).thenReturn(clusteredCacheManager);
- when(clusteredEntityManager.getEntityLock(anyString())).thenReturn(mock(ToolkitReadWriteLock.class));
- factory = new ToolkitInstanceFactoryImpl(toolkit, clusteredEntityManager, wanUtil, wanWatchdog);
- factory.linkClusteredCacheManager(CACHE_MANAGER_NAME, null);
- }
-
- private ToolkitMap mockMap() {
- ToolkitMap map = mock(ToolkitMap.class);
- ToolkitReadWriteLock readWriteLock = mockReadWriteLock();
- when(map.getReadWriteLock()).thenReturn(readWriteLock);
- return map;
- }
-
- private ToolkitReadWriteLock mockReadWriteLock() {
- ToolkitReadWriteLock readWriteLock = mock(ToolkitReadWriteLock.class);
- ToolkitLock lock = mockLock();
- when(readWriteLock.readLock()).thenReturn(lock);
- when(readWriteLock.writeLock()).thenReturn(lock);
- return readWriteLock;
- }
-
- private ToolkitLock mockLock() {
- return when(mock(ToolkitLock.class).tryLock()).thenReturn(true).getMock();
- }
-
- @Test
- public void testGetOrCreateToolkitCacheForWanEnabled() throws Exception {
- whenCacheIsWanEnabled().callGetOrCreateToolkitCache().assertInstanceOfWanAwareToolkitCache(true);
- }
-
- @Test
- public void testGetOrCreateToolkitCacheForWanDisabled() throws Exception {
- whenCacheIsWanDisabled().callGetOrCreateToolkitCache().assertInstanceOfWanAwareToolkitCache(false);
- }
-
- @Test(expected = CacheException.class)
- public void testWanAwareToolkitCacheDoesNotSupportDynamicConfigChange() throws Exception {
- whenCacheIsWanEnabled().callGetOrCreateToolkitCache().assertInstanceOfWanAwareToolkitCache(true).updateTimeToLive();
- }
-
- @Test
- public void testMaxEntriesInCacheToMaxTotalCountTransformation() {
- CacheConfiguration configuration = new CacheConfiguration().terracotta(new TerracottaConfiguration()).maxEntriesInCache(10);
- forEhcacheConfig(configuration).callGetOrCreateToolkitCache().validateMaxTotalCountForToolkitCacheIs(10);
- }
-
- private void updateTimeToLive() {
- ehcache.getCacheConfiguration().setTimeToLiveSeconds(10);
- }
-
- private void validateMaxTotalCountForToolkitCacheIs(int maxTotalCount) {
- ArgumentCaptor captor = ArgumentCaptor.forClass(Configuration.class);
- verify(toolkit).getCache(anyString(), captor.capture(), eq(Serializable.class));
- assertThat(captor.getValue().getInt(ToolkitConfigFields.MAX_TOTAL_COUNT_FIELD_NAME), is(10));
- }
-
- private ToolkitInstanceFactoryImplTest forEhcacheConfig(CacheConfiguration configuration) {
- when(ehcache.getCacheConfiguration()).thenReturn(configuration);
- return this;
- }
-
-
- private void makeToolkitReturnNonStopConfigurationRegistry() {
- NonStopFeature feature = mock(NonStopFeature.class);
- when(toolkit.getFeature(any(ToolkitFeatureType.class))).thenReturn(feature);
- when(feature.getNonStopConfigurationRegistry()).thenReturn(mock(NonStopConfigurationRegistry.class));
- }
-
- /**
- * This test case was added while fixing DEV-9223. From now on, we assume that the default value for maxTotalCount in
- * Toolkit (-1), and the default value for maxEntriesInCache in EhCache (0) will be aligned. That is, they both will
- * mean the same thing. Currently they mean no-limit cache. If someone changes the default value of one of those, then
- * this test case will fail and we would need to handle it.
- */
- @Test
- public void testToolkitAndEhCacheDefaultsAreAligned() {
- Assert.assertEquals(0, CacheConfiguration.DEFAULT_MAX_ENTRIES_IN_CACHE);
- Assert.assertEquals(-1, ToolkitConfigFields.DEFAULT_MAX_TOTAL_COUNT);
- }
-
-
- private ToolkitInstanceFactoryImplTest assertInstanceOfWanAwareToolkitCache(boolean expectedResult) {
- Assert.assertEquals(expectedResult, (resultantCache instanceof WanAwareToolkitCache));
- return this;
- }
-
- private ToolkitInstanceFactoryImplTest callGetOrCreateToolkitCache() {
- resultantCache = factory.getOrCreateToolkitCache(ehcache);
- return this;
- }
-
- private ToolkitInstanceFactoryImplTest whenCacheIsWanEnabled() {
- when(wanUtil.isWanEnabledCache(CACHE_MANAGER_NAME, CACHE_NAME)).thenReturn(true);
- return this;
- }
-
- private ToolkitInstanceFactoryImplTest whenCacheIsWanDisabled() {
- when(wanUtil.isWanEnabledCache(CACHE_MANAGER_NAME, CACHE_NAME)).thenReturn(false);
- return this;
- }
-
- @Test
- public void testAddCacheEntityInfo() {
- factory.addCacheEntityInfo(CACHE_NAME, new CacheConfiguration(), "testTKCacheName");
- }
-
- @Test
- public void testRetrievingExistingClusteredCacheManagerEntity() {
- String name = "existing";
- net.sf.ehcache.config.Configuration configuration = new net.sf.ehcache.config.Configuration();
-
- Toolkit toolkit = getMockToolkit();
- when(toolkit.getMap(anyString(), eq(String.class), eq(ClusteredCache.class))).thenReturn(mock(ToolkitMap.class));
-
- ClusteredEntityManager clusteredEntityManager = mock(ClusteredEntityManager.class);
- ToolkitBackedClusteredCacheManager cacheManagerEntity = new ToolkitBackedClusteredCacheManager(name, new ClusteredCacheManagerConfiguration("test"));
- cacheManagerEntity.setEntityLockHandler(mock(EntityLockHandler.class));
- when(clusteredEntityManager.getRootEntity(name, ClusteredCacheManager.class))
- .thenReturn(cacheManagerEntity);
- when(clusteredEntityManager.getEntityLock(anyString())).thenReturn(mock(ToolkitReadWriteLock.class));
- ToolkitInstanceFactoryImpl toolkitInstanceFactory = new ToolkitInstanceFactoryImpl(getMockToolkit(),
- clusteredEntityManager);
-
- toolkitInstanceFactory.linkClusteredCacheManager(name, configuration);
- verify(clusteredEntityManager).getRootEntity(name, ClusteredCacheManager.class);
- verify(clusteredEntityManager).getEntityLock(anyString());
- verifyNoMoreInteractions(clusteredEntityManager);
- }
-
- @Test
- public void testCreatingNewClusteredCacheManagerEntity() {
- String name = "newCM";
-
- net.sf.ehcache.config.Configuration configuration = new net.sf.ehcache.config.Configuration();
-
- ClusteredEntityManager clusteredEntityManager = mock(ClusteredEntityManager.class);
- doAnswer(new Answer() {
- @Override
- public Object answer(InvocationOnMock invocationOnMock) throws Throwable {
- Object[] arguments = invocationOnMock.getArguments();
- ((ToolkitBackedClusteredCacheManager)arguments[2]).setEntityLockHandler(mock(EntityLockHandler.class));
- return null;
- }
- }).when(clusteredEntityManager).addRootEntityIfAbsent(eq(name), eq(ClusteredCacheManager.class), any(ClusteredCacheManager.class));
- ToolkitReadWriteLock rwLock = mock(ToolkitReadWriteLock.class);
- ToolkitLock writeLock = mock(ToolkitLock.class);
- when(writeLock.tryLock()).thenReturn(true);
- when(rwLock.writeLock()).thenReturn(writeLock);
- when(clusteredEntityManager.getEntityLock(any(String.class))).thenReturn(rwLock);
-
- ToolkitInstanceFactoryImpl toolkitInstanceFactory = new ToolkitInstanceFactoryImpl(getMockToolkit(),
- clusteredEntityManager);
-
- toolkitInstanceFactory.linkClusteredCacheManager(name, configuration);
- verify(clusteredEntityManager).getRootEntity(name, ClusteredCacheManager.class);
- verify(clusteredEntityManager).getEntityLock(EhcacheEntitiesNaming.getCacheManagerLockNameFor(name));
- verify(clusteredEntityManager).addRootEntityIfAbsent(eq(name), any(Class.class), any(ClusteredCacheManager.class));
- verifyNoMoreInteractions(clusteredEntityManager);
- }
-
- @Test
- public void testTryingToCreateNewClusteredCacheManagerEntityButLooseRace() {
- String name = "newCM";
-
- net.sf.ehcache.config.Configuration configuration = new net.sf.ehcache.config.Configuration();
-
- ClusteredEntityManager clusteredEntityManager = mock(ClusteredEntityManager.class);
- when(clusteredEntityManager.addRootEntityIfAbsent(eq(name), any(Class.class), any(ClusteredCacheManager.class))).thenReturn(mock(ClusteredCacheManager.class));
- when(clusteredEntityManager.getRootEntity(name, ClusteredCacheManager.class)).thenReturn(null, mock(ClusteredCacheManager.class));
- ToolkitReadWriteLock rwLock = mock(ToolkitReadWriteLock.class);
- ToolkitLock writeLock = mock(ToolkitLock.class);
- when(writeLock.tryLock()).thenReturn(true);
- when(rwLock.writeLock()).thenReturn(writeLock);
- when(clusteredEntityManager.getEntityLock(any(String.class))).thenReturn(rwLock);
-
- ToolkitInstanceFactoryImpl toolkitInstanceFactory = new ToolkitInstanceFactoryImpl(getMockToolkit(),
- clusteredEntityManager);
-
- toolkitInstanceFactory.linkClusteredCacheManager(name, configuration);
- InOrder inOrder = inOrder(clusteredEntityManager);
- inOrder.verify(clusteredEntityManager).getRootEntity(name, ClusteredCacheManager.class);
- inOrder.verify(clusteredEntityManager).getEntityLock(EhcacheEntitiesNaming.getCacheManagerLockNameFor(name));
- inOrder.verify(clusteredEntityManager).addRootEntityIfAbsent(eq(name), any(Class.class), any(ClusteredCacheManager.class));
- verifyNoMoreInteractions(clusteredEntityManager);
- }
-
- @Test
- public void testConfigurationSavedContainsNoCachesAnymore() {
- String name = "newCM";
-
- net.sf.ehcache.config.Configuration configuration = new net.sf.ehcache.config.Configuration();
- configuration.addCache(new CacheConfiguration("test", 1));
-
- ClusteredEntityManager clusteredEntityManager = mock(ClusteredEntityManager.class);
- doAnswer(new Answer() {
- @Override
- public Object answer(InvocationOnMock invocationOnMock) throws Throwable {
- Object[] arguments = invocationOnMock.getArguments();
- ((ToolkitBackedClusteredCacheManager)arguments[2]).setEntityLockHandler(mock(EntityLockHandler.class));
- return null;
- }
- }).when(clusteredEntityManager).addRootEntityIfAbsent(eq(name), eq(ClusteredCacheManager.class), any(ClusteredCacheManager.class));
- ToolkitReadWriteLock rwLock = mock(ToolkitReadWriteLock.class);
- ToolkitLock writeLock = mock(ToolkitLock.class);
- when(writeLock.tryLock()).thenReturn(true);
- when(rwLock.writeLock()).thenReturn(writeLock);
- when(clusteredEntityManager.getEntityLock(any(String.class))).thenReturn(rwLock);
-
- ToolkitInstanceFactoryImpl toolkitInstanceFactory = new ToolkitInstanceFactoryImpl(getMockToolkit(),
- clusteredEntityManager);
-
- toolkitInstanceFactory.linkClusteredCacheManager(name, configuration);
- ArgumentCaptor captor = ArgumentCaptor.forClass(ClusteredCacheManager.class);
- verify(clusteredEntityManager).addRootEntityIfAbsent(eq(name), any(Class.class), captor.capture());
-
- assertThat(captor.getValue().getConfiguration().getConfigurationAsText(), not(containsString(" captor = ArgumentCaptor.forClass(ClusteredCacheManager.class);
- verify(clusteredEntityManager).addRootEntityIfAbsent(eq(name), any(Class.class), captor.capture());
-
- assertThat(captor.getValue().getConfiguration().getConfigurationAsText(), containsString("name=\"" + name));
- }
-
- @Test
- public void testClusterRejoinedCacheManagerDestroyed() {
- Toolkit toolkit = getMockToolkit();
- ClusteredEntityManager entityManager = mock(ClusteredEntityManager.class);
- ToolkitInstanceFactoryImpl toolkitInstanceFactory = new ToolkitInstanceFactoryImpl(toolkit, entityManager);
-
- toolkitInstanceFactory.clusterRejoined();
-
- verify(entityManager).dispose();
- verify(toolkit).shutdown();
- }
-
- @Test
- public void testClusterRejoinedCMDestroyedBetweenGetAndLock() {
- Toolkit toolkit = getMockToolkit();
- ClusteredEntityManager entityManager = mock(ClusteredEntityManager.class);
- ClusteredCacheManager cmEntity = mock(ClusteredCacheManager.class);
- ClusteredCache cEntity = mock(ClusteredCache.class);
- when(cmEntity.getCache(CACHE_NAME)).thenReturn(cEntity);
-
- when(entityManager.getRootEntity(CACHE_MANAGER_NAME, ClusteredCacheManager.class)).thenReturn(cmEntity, cmEntity, null);
- when(entityManager.getEntityLock(any(String.class))).thenReturn(mock(ToolkitReadWriteLock.class));
-
- ToolkitInstanceFactoryImpl toolkitInstanceFactory = new ToolkitInstanceFactoryImpl(toolkit, entityManager);
- toolkitInstanceFactory.linkClusteredCacheManager(CACHE_MANAGER_NAME, null);
- toolkitInstanceFactory.addCacheEntityInfo(CACHE_NAME, null, EhcacheEntitiesNaming.getToolkitCacheNameFor(CACHE_MANAGER_NAME, CACHE_NAME));
-
- toolkitInstanceFactory.clusterRejoined();
-
- verify(cmEntity, times(2)).markInUse();
- verify(entityManager).dispose();
- verify(toolkit).shutdown();
- }
-
- private Toolkit getMockToolkit() {
- ToolkitInternal toolkitInternal = mock(ToolkitInternal.class);
- when(toolkitInternal.getLogger(anyString())).thenReturn(mock(ToolkitLogger.class));
-
- return toolkitInternal;
- }
-
- @Test
- public void testClusterRejoined() {
- Toolkit toolkit = getMockToolkit();
- ClusteredEntityManager entityManager = mock(ClusteredEntityManager.class);
- ClusteredCacheManager cmEntity = mock(ClusteredCacheManager.class);
- ClusteredCache cEntity = mock(ClusteredCache.class);
- when(cmEntity.getCache(CACHE_NAME)).thenReturn(cEntity);
-
- when(entityManager.getRootEntity(CACHE_MANAGER_NAME, ClusteredCacheManager.class)).thenReturn(cmEntity);
- when(entityManager.getEntityLock(any(String.class))).thenReturn(mock(ToolkitReadWriteLock.class));
-
- ToolkitInstanceFactoryImpl toolkitInstanceFactory = new ToolkitInstanceFactoryImpl(toolkit, entityManager);
- toolkitInstanceFactory.linkClusteredCacheManager(CACHE_MANAGER_NAME, null);
- toolkitInstanceFactory.addCacheEntityInfo(CACHE_NAME, null, EhcacheEntitiesNaming.getToolkitCacheNameFor(CACHE_MANAGER_NAME, CACHE_NAME));
-
- toolkitInstanceFactory.clusterRejoined();
-
- verify(cmEntity, times(2)).markInUse();
- verify(cmEntity, times(2)).markCacheInUse(cEntity);
- }
-
- private final String defaultCMConfig = "" +
- " " +
- " " +
- "";
-
-}
Index: rctags/ehcache-2.10.7.0.43/ehcache-core/src/main/java/net/sf/ehcache/management/sampled/CacheManagerSampler.java
===================================================================
diff -u -N
--- rctags/ehcache-2.10.7.0.43/ehcache-core/src/main/java/net/sf/ehcache/management/sampled/CacheManagerSampler.java (revision 11002)
+++ rctags/ehcache-2.10.7.0.43/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.43/ehcache-core/src/main/java/net/sf/ehcache/constructs/refreshahead/RefreshAheadCacheFactory.java
===================================================================
diff -u -N
--- rctags/ehcache-2.10.7.0.43/ehcache-core/src/main/java/net/sf/ehcache/constructs/refreshahead/RefreshAheadCacheFactory.java (revision 11002)
+++ rctags/ehcache-2.10.7.0.43/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.43/ehcache-core/src/main/java/net/sf/ehcache/transaction/local/LocalRecoveryManager.java
===================================================================
diff -u -N
--- rctags/ehcache-2.10.7.0.43/ehcache-core/src/main/java/net/sf/ehcache/transaction/local/LocalRecoveryManager.java (revision 11002)
+++ rctags/ehcache-2.10.7.0.43/ehcache-core/src/main/java/net/sf/ehcache/transaction/local/LocalRecoveryManager.java (revision 0)
@@ -1,90 +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.local;
-
-import net.sf.ehcache.transaction.TransactionID;
-import net.sf.ehcache.transaction.TransactionIDFactory;
-
-import java.util.Collections;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Set;
-import java.util.concurrent.CopyOnWriteArrayList;
-
-/**
- * The local transactions mode recovery manager which is used to trigger full recovery of all
- * caches configured with local transaction mode.
- *
- * @author Ludovic Orban
- */
-public class LocalRecoveryManager {
-
- private final TransactionIDFactory transactionIdFactory;
- private final List localTransactionStores = new CopyOnWriteArrayList();
- private volatile Set previouslyRecoveredTransactionIDs = Collections.emptySet();
-
- /**
- * Create a LocalRecoveryManager instance
- * @param transactionIdFactory the TransactionIDFactory
- */
- public LocalRecoveryManager(TransactionIDFactory transactionIdFactory) {
- this.transactionIdFactory = transactionIdFactory;
- }
-
- /**
- * Register a LocalTransactionStore from the recovery manager
- * @param localTransactionStore the LocalTransactionStore
- */
- void register(LocalTransactionStore localTransactionStore) {
- localTransactionStores.add(localTransactionStore);
- }
-
- /**
- * Unregister a LocalTransactionStore from the recovery manager
- * @param localTransactionStore the LocalTransactionStore
- */
- void unregister(LocalTransactionStore localTransactionStore) {
- localTransactionStores.remove(localTransactionStore);
- }
-
- /**
- * Run recovery on all registered local transaction stores. The latter
- * are used internally by caches when they're configured with local transaction mode.
- * @return the set of recovered TransactionIDs
- */
- public Set recover() {
- Set recovered = new HashSet();
- // first ask all stores to cleanup their soft locks
- for (LocalTransactionStore localTransactionStore : localTransactionStores) {
- recovered.addAll(localTransactionStore.recover());
- }
- // then clear the transaction ID
- for (TransactionID transactionId : recovered) {
- transactionIdFactory.clear(transactionId);
- }
-
- previouslyRecoveredTransactionIDs = recovered;
- return recovered;
- }
-
- /**
- * Get the set of transaction IDs collected by the previous recover() call
- * @return the set of previously recovered TransactionIDs
- */
- public Set getPreviouslyRecoveredTransactionIDs() {
- return previouslyRecoveredTransactionIDs;
- }
-}
Index: rctags/ehcache-2.10.7.0.43/ehcache-core/src/test/java/net/sf/ehcache/config/generator/DecoratedCacheConfigTest.java
===================================================================
diff -u -N
--- rctags/ehcache-2.10.7.0.43/ehcache-core/src/test/java/net/sf/ehcache/config/generator/DecoratedCacheConfigTest.java (revision 11002)
+++ rctags/ehcache-2.10.7.0.43/ehcache-core/src/test/java/net/sf/ehcache/config/generator/DecoratedCacheConfigTest.java (revision 0)
@@ -1,60 +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;
-
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.List;
-
-import junit.framework.Assert;
-import net.sf.ehcache.CacheManager;
-
-import org.junit.Test;
-import org.junit.experimental.categories.Category;
-import org.terracotta.test.categories.CheckShorts;
-
-@Category(CheckShorts.class)
-public class DecoratedCacheConfigTest {
-
- private static final List ALL_CACHE_NAMES = Arrays.asList(new String[] {"noDecoratorCache", "oneDecoratorCache",
- "oneDecoratorCacheFirst", "twoDecoratorCache", "twoDecoratorCacheSecond", "twoDecoratorCacheFirst"});
-
- @Test
- public void testDecoratedCacheConfig() {
- CacheManager cm = CacheManager.newInstance(DecoratedCacheConfigTest.class.getClassLoader().getResource(
- "ehcache-decorator-noname-test.xml"));
- try {
- List names = new ArrayList(Arrays.asList(cm.getCacheNames()));
- names.removeAll(ALL_CACHE_NAMES);
- Assert.assertEquals("This list should be empty - " + names, 0, names.size());
- // System.out.println("Original config: " + cm.getOriginalConfigurationText());
- String text = cm.getActiveConfigurationText();
- // System.out.println("Cache manager config: " + text);
- for (String name : ALL_CACHE_NAMES) {
- Assert.assertTrue("Config not generated for cache name: " + name, text.contains("name=\"" + name + "\""));
- String cacheConfigTest = cm.getActiveConfigurationText(name);
- // System.out.println("Config for cache: '"+name+"': " + cacheConfigTest);
- Assert.assertTrue("Config not generated for cache name: " + name + ", with explicit call: ",
- cacheConfigTest.contains("name=\"" + name + "\""));
- }
-
- } finally {
- cm.shutdown();
- }
-
- }
-}
Index: rctags/ehcache-2.10.7.0.43/system-tests/src/test/java/org/terracotta/modules/ehcache/hibernate/domain/Person.java
===================================================================
diff -u -N
--- rctags/ehcache-2.10.7.0.43/system-tests/src/test/java/org/terracotta/modules/ehcache/hibernate/domain/Person.java (revision 11002)
+++ rctags/ehcache-2.10.7.0.43/system-tests/src/test/java/org/terracotta/modules/ehcache/hibernate/domain/Person.java (revision 0)
@@ -1,108 +0,0 @@
-/*
- * All content copyright Terracotta, Inc., unless otherwise indicated. All rights reserved.
- */
-
-package org.terracotta.modules.ehcache.hibernate.domain;
-
-import java.util.ArrayList;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Set;
-
-public class Person {
-
- private Long id;
- private int age;
- private String firstname;
- private String lastname;
- private List events = new ArrayList(); // list semantics, e.g., indexed
- private Set emailAddresses = new HashSet();
- private Set phoneNumbers = new HashSet();
- private List talismans = new ArrayList(); // a Bag of good-luck charms.
-
- public Person() {
- //
- }
-
- public List getEvents() {
- return events;
- }
-
- protected void setEvents(List events) {
- this.events = events;
- }
-
- public void addToEvent(Event event) {
- this.getEvents().add(event);
- event.getParticipants().add(this);
- }
-
- public void removeFromEvent(Event event) {
- this.getEvents().remove(event);
- event.getParticipants().remove(this);
- }
-
- public int getAge() {
- return age;
- }
-
- public void setAge(int age) {
- this.age = age;
- }
-
- public String getFirstname() {
- return firstname;
- }
-
- public void setFirstname(String firstname) {
- this.firstname = firstname;
- }
-
- public Long getId() {
- return id;
- }
-
- public void setId(Long id) {
- this.id = id;
- }
-
- public String getLastname() {
- return lastname;
- }
-
- public void setLastname(String lastname) {
- this.lastname = lastname;
- }
-
- public Set getEmailAddresses() {
- return emailAddresses;
- }
-
- public void setEmailAddresses(Set emailAddresses) {
- this.emailAddresses = emailAddresses;
- }
-
- public Set getPhoneNumbers() {
- return phoneNumbers;
- }
-
- public void setPhoneNumbers(Set phoneNumbers) {
- this.phoneNumbers = phoneNumbers;
- }
-
- public void addTalisman(String name) {
- talismans.add(name);
- }
-
- public List getTalismans() {
- return talismans;
- }
-
- public void setTalismans(List talismans) {
- this.talismans = talismans;
- }
-
- public String toString() {
- return getFirstname() + " " + getLastname();
- }
-}
Index: rctags/ehcache-2.10.7.0.43/ehcache-core/src/main/java/net/sf/ehcache/pool/sizeof/filter/package.html
===================================================================
diff -u -N
--- rctags/ehcache-2.10.7.0.43/ehcache-core/src/main/java/net/sf/ehcache/pool/sizeof/filter/package.html (revision 11002)
+++ rctags/ehcache-2.10.7.0.43/ehcache-core/src/main/java/net/sf/ehcache/pool/sizeof/filter/package.html (revision 0)
@@ -1,7 +0,0 @@
-
-
-
-
-This package contains the SizeOf filtering interface and implementations for the pooling in Ehcache.
-
-
Index: rctags/ehcache-2.10.7.0.43/ehcache-core/src/main/java/net/sf/ehcache/store/cachingtier/OnHeapCachingTier.java
===================================================================
diff -u -N
--- rctags/ehcache-2.10.7.0.43/ehcache-core/src/main/java/net/sf/ehcache/store/cachingtier/OnHeapCachingTier.java (revision 11002)
+++ rctags/ehcache-2.10.7.0.43/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.43/terracotta/bootstrap/src/main/java/org/terracotta/modules/ehcache/async/AsyncCoordinator.java
===================================================================
diff -u -N
--- rctags/ehcache-2.10.7.0.43/terracotta/bootstrap/src/main/java/org/terracotta/modules/ehcache/async/AsyncCoordinator.java (revision 11002)
+++ rctags/ehcache-2.10.7.0.43/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.43/ehcache-core/src/test/java/net/sf/ehcache/servermaplocalcache/ServerMapLocalCache.java
===================================================================
diff -u -N
--- rctags/ehcache-2.10.7.0.43/ehcache-core/src/test/java/net/sf/ehcache/servermaplocalcache/ServerMapLocalCache.java (revision 11002)
+++ rctags/ehcache-2.10.7.0.43/ehcache-core/src/test/java/net/sf/ehcache/servermaplocalcache/ServerMapLocalCache.java (revision 0)
@@ -1,194 +0,0 @@
-/**
- * All content copyright 2010 (c) Terracotta, Inc., except as may otherwise be noted in a separate copyright notice. All
- * rights reserved.
- */
-package net.sf.ehcache.servermaplocalcache;
-
-import java.util.concurrent.ExecutorService;
-import java.util.concurrent.Executors;
-import java.util.concurrent.ThreadFactory;
-import java.util.concurrent.atomic.AtomicInteger;
-import java.util.concurrent.locks.ReentrantReadWriteLock;
-import java.util.concurrent.locks.ReentrantReadWriteLock.WriteLock;
-
-import net.sf.ehcache.Cache;
-import net.sf.ehcache.Ehcache;
-import net.sf.ehcache.Element;
-import net.sf.ehcache.event.CacheEventListenerAdapter;
-
-public class ServerMapLocalCache {
-
- private final static int CONCURRENCY = 256;
- private volatile TCObjectSelfStore tcoSelfStore;
- private volatile Cache ehcache;
- private final ReentrantReadWriteLock[] locks = new ReentrantReadWriteLock[CONCURRENCY];
- private final Object localSync = new Object();
- private static final ExecutorService evictionHandlerStage = Executors.newFixedThreadPool(4, new ThreadFactory() {
- private final AtomicInteger count = new AtomicInteger();
-
- public Thread newThread(Runnable r) {
- Thread t = new Thread(r, "eviction_handler_stage_thread_" + count.incrementAndGet());
- t.setDaemon(true);
- return t;
- }
- });
-
- public ServerMapLocalCache(TCObjectSelfStore tcoSelfStore, Cache ehcache) {
- this.tcoSelfStore = tcoSelfStore;
- this.ehcache = ehcache;
- ehcache.getCacheEventNotificationService().registerListener(new EvictionListener(this));
- for (int i = 0; i < CONCURRENCY; i++) {
- locks[i] = new ReentrantReadWriteLock();
- }
- }
-
- private ReentrantReadWriteLock getLock(Object key) {
- return locks[Math.abs(key.hashCode() % CONCURRENCY)];
- }
-
- public void put(TCObjectSelf tcoSelf) {
- synchronized (localSync) {
- tcoSelfStore.addTCObjectSelf(tcoSelf);
- addToCache(tcoSelf);
- }
- }
-
- public TCObjectSelf getFromTCObjectSelfStore(Long oid) {
- synchronized (localSync) {
- return tcoSelfStore.getById(oid);
- }
- }
-
- // public void remove(String key) {
- // synchronized (localSync) {
- // removeFromCache(key);
- // }
- // }
- //
- // private void removeFromCache(String key) {
- // WriteLock writeLock = getLock(key).writeLock();
- // writeLock.lock();
- // try {
- // // remove key-value mapping: key->value
- // Element element = ehcache.removeAndReturnElement(key);
- // if (element != null) {
- // TCObjectSelf tcoSelf = (TCObjectSelf) element.getObjectValue();
- // if (tcoSelf != null) {
- // handleKeyValueMappingRemoved(key, tcoSelf);
- // }
- // }
- //
- // } finally {
- // writeLock.unlock();
- // }
- // }
-
- private void handleKeyValueMappingRemoved(String key, TCObjectSelf tcoSelf) {
- // remote remove
- tcoSelfStore.removeTCObjectSelf(tcoSelf);
- if (tcoSelf != null) {
- // clean up meta-mapping: id->key
- ehcache.remove(tcoSelf.getOid());
- }
- }
-
- private void addToCache(TCObjectSelf tcoSelf) {
- ReentrantReadWriteLock lock = getLock(tcoSelf.getKey());
- lock.writeLock().lock();
- try {
- if (DebugUtil.DEBUG) {
- DebugUtil.debug("Add to cache: " + tcoSelf);
- }
-
- // add meta mapping: oid->key
- ehcache.put(new Element(tcoSelf.getOid(), tcoSelf.getKey()));
-
- // add the key->value mapping
- ehcache.put(new Element(tcoSelf.getKey(), tcoSelf));
-
- } finally {
- lock.writeLock().unlock();
- }
- }
-
- public void entryEvicted(Object objectKey, Object objectValue) {
- if (DebugUtil.DEBUG) {
- DebugUtil.debug("Entry evicted; evictedKey: " + objectKey + ", evictedValue: " + objectValue);
- }
- if (objectValue instanceof TCObjectSelf) {
- // key-value mapping evicted
- keyValueMappingEvicted((String) objectKey, (TCObjectSelf) objectValue);
- } else {
- // oid-> key mapping removed
- objectIdMappingEvicted((Long) objectKey, (String) objectValue);
- }
- }
-
- private void objectIdMappingEvicted(Long oid, String key) {
- WriteLock writeLock = getLock(key).writeLock();
- writeLock.lock();
- Element element = null;
- try {
- element = ehcache.get(key);
- if (element != null) {
- TCObjectSelf tcoSelf = (TCObjectSelf) element.getObjectValue();
- if (tcoSelf != null && tcoSelf.getOid() == oid) {
- // clean up key-value mapping
- ehcache.remove(key);
- tcoSelfStore.removeTCObjectSelf(tcoSelf);
- }
- }
- } finally {
- writeLock.unlock();
- }
- if (DebugUtil.DEBUG) {
- DebugUtil.debug("[objectIdEvicted] oid: " + oid + ", key: " + key + ", was mapped to value: "
- + (element == null ? "null" : element.getObjectValue()));
- }
- }
-
- private void keyValueMappingEvicted(String objectKey, TCObjectSelf objectValue) {
- WriteLock writeLock = getLock(objectKey).writeLock();
- writeLock.lock();
- try {
- if (DebugUtil.DEBUG) {
- DebugUtil.debug("[keyValueMappingEvicted] key: " + objectKey + ", value: " + objectValue);
- }
- handleKeyValueMappingRemoved(objectKey, objectValue);
- } finally {
- writeLock.unlock();
- }
- }
-
- private static class EvictionListener extends CacheEventListenerAdapter {
- private final ServerMapLocalCache serverMapLocalCache;
-
- public EvictionListener(ServerMapLocalCache serverMapLocalCache) {
- this.serverMapLocalCache = serverMapLocalCache;
- }
-
- @Override
- public void notifyElementExpired(Ehcache cache, final Element element) {
- if (DebugUtil.DEBUG) {
- DebugUtil.debug("[ElementExpired] expiredKey: " + element.getObjectKey() + ", expiredValue: " + element.getObjectValue());
- }
- evictionHandlerStage.submit(new Runnable() {
- public void run() {
- serverMapLocalCache.entryEvicted(element.getObjectKey(), element.getObjectValue());
- }
- });
- }
-
- @Override
- public void notifyElementEvicted(Ehcache cache, final Element element) {
- if (DebugUtil.DEBUG) {
- DebugUtil.debug("[ElementEvicted] expiredKey: " + element.getObjectKey() + ", expiredValue: " + element.getObjectValue());
- }
- evictionHandlerStage.submit(new Runnable() {
- public void run() {
- serverMapLocalCache.entryEvicted(element.getObjectKey(), element.getObjectValue());
- }
- });
- }
- }
-}
Index: rctags/ehcache-2.10.7.0.43/system-tests/src/test/java/org/terracotta/modules/ehcache/bulkops/BulkOpsBasicSerializationSanityTest.java
===================================================================
diff -u -N
--- rctags/ehcache-2.10.7.0.43/system-tests/src/test/java/org/terracotta/modules/ehcache/bulkops/BulkOpsBasicSerializationSanityTest.java (revision 11002)
+++ rctags/ehcache-2.10.7.0.43/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.43/distribution/colorcache/src/assemble/distribution.xml
===================================================================
diff -u -N
--- rctags/ehcache-2.10.7.0.43/distribution/colorcache/src/assemble/distribution.xml (revision 11002)
+++ rctags/ehcache-2.10.7.0.43/distribution/colorcache/src/assemble/distribution.xml (revision 0)
@@ -1,45 +0,0 @@
-
- distribution
-
- tar.gz
-
-
-
-
-
-
-
-
-
-
-
- ${basedir}/src
- /src
-
-
- ${project.build.directory}/${project.name}
-
- **/ehcache*.jar
- **/terracotta-toolkit*-runtime*.jar
-
- /webapps/${project.name}
-
-
- ${basedir}/src/assemble
-
- README.*
-
- /
-
-
- ${basedir}/src/assemble/jetty6.1
- /jetty6.1
-
-
- ${basedir}/src/assemble/bin
- /bin
- 0755
-
-
-
-
Index: rctags/ehcache-2.10.7.0.43/ehcache-core/src/test/java/net/sf/ehcache/config/generator/StandaloneEntryBasedConfigAttributesValueFactory.java
===================================================================
diff -u -N
--- rctags/ehcache-2.10.7.0.43/ehcache-core/src/test/java/net/sf/ehcache/config/generator/StandaloneEntryBasedConfigAttributesValueFactory.java (revision 11002)
+++ rctags/ehcache-2.10.7.0.43/ehcache-core/src/test/java/net/sf/ehcache/config/generator/StandaloneEntryBasedConfigAttributesValueFactory.java (revision 0)
@@ -1,98 +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;
-
-import net.sf.ehcache.config.generator.model.NodeAttribute;
-import net.sf.ehcache.config.generator.model.NodeElement;
-import net.sf.ehcache.config.generator.xsom.XSDAttributeValueFactory;
-import net.sf.ehcache.config.generator.xsom.XSDAttributeValueType;
-
-public class StandaloneEntryBasedConfigAttributesValueFactory implements XSDAttributeValueFactory {
-
- public String createValueForAttribute(NodeElement element, NodeAttribute attribute, XSDAttributeValueType xsdAttributeValueType) {
- if ("terracotta".equals(element.getName())) {
- if("coherent".equals(attribute.getName())) {
- // returning null will skip this attribute
- // can skip "coherent" attribute as its deprecated by consistency attribute
- return null;
- }
- if("clustered".equals(attribute.getName())) {
- return "false";
- }
- }
- if ("pinning".equals(element.getName())) {
- if ("storage".equals(attribute.getName())) {
- return "inMemory";
- }
- }
- if ("sizeOfPolicy".equals(element.getName())) {
- if ("maxDepth".equals(attribute.getName())) {
- return "100";
- } else if ("maxDepthExceededBehavior".equals(attribute.getName())) {
- return "continue";
- }
- }
- // always generate with eternal=false
- if ("defaultCache".equals(element.getName()) || "cache".equals(element.getName())) {
- if("eternal".equals(attribute.getName())) {
- return "false";
- }
- if("transactionalMode".equals(attribute.getName())) {
- return "off";
- }
- // these are deprecated
- if ("maxElementsInMemory".equals(attribute.getName()) ||
- "maxMemoryOffHeap".equals(attribute.getName()) ||
- "diskPersistent".equals(attribute.getName()) ||
- "overflowToDisk".equals(attribute.getName())) {
- return null;
- }
- if ("maxElementsOnDisk".equals(attribute.getName()) ||
- "maxBytesLocalHeap".equals(attribute.getName()) ||
- "maxBytesLocalOffHeap".equals(attribute.getName()) ||
- "maxBytesLocalDisk".equals(attribute.getName())) {
- return null;
- }
- if("maxEntriesLocalHeap".equals(attribute.getName()) ||
- "maxEntriesLocalOffHeap".equals(attribute.getName()) ||
- "maxEntriesLocalDisk".equals(attribute.getName())) {
- return "10000";
- }
- if("maxEntriesInCache".equals(attribute.getName())) {
- return null;
- }
- }
- if ("ehcache".equals(element.getName())) {
- if("maxBytesLocalHeap".equals(attribute.getName()) ||
- "maxBytesLocalOffHeap".equals(attribute.getName()) ||
- "maxBytesLocalDisk".equals(attribute.getName())) {
- return null;
- }
- }
- if ("searchAttribute".equals(element.getName())) {
- if ("expression".equals(attribute.getName())) {
- return "value.toString()";
- } else if ("name".equals(attribute.getName())) {
- return "name";
- } else {
- return null;
- }
- }
-
- return xsdAttributeValueType.getRandomAllowedValue();
- }
-}
Index: rctags/ehcache-2.10.7.0.43/ehcache-core/src/main/java/net/sf/ehcache/CacheQuery.java
===================================================================
diff -u -N
--- rctags/ehcache-2.10.7.0.43/ehcache-core/src/main/java/net/sf/ehcache/CacheQuery.java (revision 11002)
+++ rctags/ehcache-2.10.7.0.43/ehcache-core/src/main/java/net/sf/ehcache/CacheQuery.java (revision 0)
@@ -1,440 +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;
-
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Set;
-
-import net.sf.ehcache.search.Attribute;
-import net.sf.ehcache.search.Direction;
-import net.sf.ehcache.search.ExecutionHints;
-import net.sf.ehcache.search.Query;
-import net.sf.ehcache.search.Results;
-import net.sf.ehcache.search.SearchException;
-import net.sf.ehcache.search.aggregator.Aggregator;
-import net.sf.ehcache.search.aggregator.AggregatorException;
-import net.sf.ehcache.search.aggregator.AggregatorInstance;
-import net.sf.ehcache.search.expression.AlwaysMatch;
-import net.sf.ehcache.search.expression.Criteria;
-import net.sf.ehcache.store.StoreQuery;
-
-/**
- * Query builder implementation. Instances are bound to a specific cache
- *
- * @author teck
- */
-class CacheQuery implements Query, StoreQuery {
-
- private volatile boolean frozen;
- private volatile boolean includeKeys;
- private volatile boolean includeValues;
- private volatile int maxResults = -1;
- private String[] targets;
-
- private final List orderings = Collections.synchronizedList(new ArrayList());
- private final Set> includedAttributes = Collections.synchronizedSet(new HashSet>());
- private final List criteria = Collections.synchronizedList(new ArrayList());
- private final List aggregators = Collections.synchronizedList(new ArrayList());
- private final Set> groupByAttributes = Collections.synchronizedSet(new HashSet>());
-
- private final Cache cache;
- private volatile ExecutionHints hints;
-
- /**
- * Create a new builder instance
- *
- * @param cache
- */
- public CacheQuery(Cache cache) {
- this.cache = cache;
- }
-
- /**
- * {@inheritDoc}
- */
- public Query includeKeys() {
- checkFrozen();
- this.includeKeys = true;
- return this;
- }
-
- /**
- * {@inheritDoc}
- */
- public Query includeValues() {
- checkFrozen();
- this.includeValues = true;
- return this;
- }
-
- /**
- * {@inheritDoc}
- */
- public Query includeAttribute(Attribute... attributes) {
- checkFrozen();
-
- if (attributes == null) {
- throw new NullPointerException();
- }
-
- for (Attribute attribute : attributes) {
- if (attribute == null) {
- throw new NullPointerException("null attribute");
- }
-
- this.includedAttributes.add(attribute);
- }
- return this;
- }
-
- /**
- * {@inheritDoc}
- */
- public Query includeAggregator(Aggregator... aggregators) throws SearchException, AggregatorException {
- checkFrozen();
-
- if (aggregators == null) {
- throw new NullPointerException();
- }
-
- for (Aggregator aggregator : aggregators) {
- if (aggregator == null) {
- throw new NullPointerException("null aggregator");
- }
-
- this.aggregators.add(aggregator);
- }
-
- return this;
- }
-
- /**
- * {@inheritDoc}
- */
- public Query addOrderBy(Attribute attribute, Direction direction) {
- checkFrozen();
- this.orderings.add(new OrderingImpl(attribute, direction));
- return this;
- }
-
- /**
- * {@inheritDoc}
- */
- public Query addGroupBy(Attribute... attributes) {
- checkFrozen();
-
- if (attributes == null) {
- throw new NullPointerException();
- }
-
- for (Attribute attribute : attributes) {
- if (attribute == null) {
- throw new NullPointerException("null attribute");
- }
- groupByAttributes.add(attribute);
- }
- return this;
- }
-
- /**
- * {@inheritDoc}
- */
- public Query maxResults(int maxResults) {
- checkFrozen();
- this.maxResults = maxResults;
- return this;
- }
-
- /**
- * {@inheritDoc}
- */
- public Query addCriteria(Criteria criteria) {
- checkFrozen();
-
- if (criteria == null) {
- throw new NullPointerException("null criteria");
- }
-
- this.criteria.add(criteria);
- return this;
- }
-
- /**
- * {@inheritDoc}
- */
- public Results execute() throws SearchException {
- return cache.executeQuery(snapshot());
- }
-
- /**
- * {@inheritDoc}
- */
- public Results execute(ExecutionHints params) throws SearchException {
- this.hints = params;
- return cache.executeQuery(snapshot());
- }
-
-
- /**
- * {@inheritDoc}
- */
- public Query end() {
- frozen = true;
- return this;
- }
-
- /**
- * {@inheritDoc}
- */
- public List getOrdering() {
- assertFrozen();
- return Collections.unmodifiableList(orderings);
- }
-
- /**
- * {@inheritDoc}
- */
- public Criteria getCriteria() {
- assertFrozen();
- return getEffectiveCriteriaCopy();
- }
-
- /**
- * {@inheritDoc}
- */
- public boolean requestsKeys() {
- assertFrozen();
- return includeKeys;
- }
-
- /**
- * {@inheritDoc}
- */
- public boolean requestsValues() {
- assertFrozen();
- return includeValues;
- }
-
- /**
- * {@inheritDoc}
- */
- public Cache getCache() {
- assertFrozen();
- return cache;
- }
-
- /**
- * {@inheritDoc}
- */
- public Set> requestedAttributes() {
- assertFrozen();
- return Collections.unmodifiableSet(this.includedAttributes);
- }
-
- /**
- * {@inheritDoc}
- */
- public Set> groupByAttributes() {
- assertFrozen();
- return Collections.unmodifiableSet(this.groupByAttributes);
- }
-
- /**
- * {@inheritDoc}
- */
- public int maxResults() {
- assertFrozen();
- return maxResults;
- }
-
-
- /**
- * {@inheritDoc}
- */
- @Override
- public ExecutionHints getExecutionHints() {
- assertFrozen();
- return hints;
- }
-
- /**
- * {@inheritDoc}
- */
- public List getAggregators() {
- return Collections.unmodifiableList(this.aggregators);
- }
-
- /**
- * {@inheritDoc}
- */
- public List> getAggregatorInstances() {
- assertFrozen();
- return Collections.unmodifiableList(createAggregatorInstances(aggregators));
- }
-
- private static List> createAggregatorInstances(List aggregators) {
- List> rv = new ArrayList>(aggregators.size());
- for (Aggregator aggregator : aggregators) {
- rv.add(aggregator.createInstance());
- }
-
- return rv;
- }
-
- private Criteria getEffectiveCriteriaCopy() {
- Criteria result = new AlwaysMatch();
- for (Criteria c : criteria) {
- result = result.and(c);
- }
- return result;
- }
-
- private void assertFrozen() {
- if (!frozen) {
- throw new AssertionError("not frozen");
- }
- }
-
- private StoreQuery snapshot() {
- if (frozen) {
- return this;
- }
-
- return new StoreQueryImpl();
- }
-
- private void checkFrozen() {
- if (frozen) {
- throw new SearchException("Query is frozen and cannot be mutated");
- }
- }
-
- /**
- * {@inheritDoc}
- */
- public String[] getTargets() {
- return this.targets;
- }
-
- /**
- * {@inheritDoc}
- */
- @Override
- public void targets(final String[] targets) {
- this.targets = targets;
- }
-
- /**
- * StoreQuery implementation (essentially a snapshot of this (non-frozen) query builder
- */
- private class StoreQueryImpl implements StoreQuery {
- private final Criteria copiedCriteria = CacheQuery.this.getEffectiveCriteriaCopy();
- private final boolean copiedIncludeKeys = includeKeys;
- private final boolean copiedIncludeValues = includeValues;
- private final Set> copiedAttributes = Collections.unmodifiableSet(new HashSet>(includedAttributes));
- private final int copiedMaxResults = maxResults;
- private final List copiedOrdering = Collections.unmodifiableList(new ArrayList(orderings));
- private final List copiedAggregators = Collections.unmodifiableList(aggregators);
- private final List> copiedAggregatorInstances = Collections.unmodifiableList(createAggregatorInstances(aggregators));
- private final Set> copiedGroupByAttributes = Collections.unmodifiableSet(new HashSet>(groupByAttributes));
- private final ExecutionHints execHints = hints;
-
- public Criteria getCriteria() {
- return copiedCriteria;
- }
-
- public boolean requestsKeys() {
- return copiedIncludeKeys;
- }
-
- public boolean requestsValues() {
- return copiedIncludeValues;
- }
-
- public Cache getCache() {
- return cache;
- }
-
- public Set> requestedAttributes() {
- return copiedAttributes;
- }
-
- public Set> groupByAttributes() {
- return copiedGroupByAttributes;
- }
-
- public int maxResults() {
- return copiedMaxResults;
- }
-
- public List getOrdering() {
- return copiedOrdering;
- }
-
- public List getAggregators() {
- return copiedAggregators;
- }
-
- public List> getAggregatorInstances() {
- return copiedAggregatorInstances;
- }
-
- public String[] getTargets() {
- return targets;
- }
-
- /**
- * {@inheritDoc}
- */
- public void targets(String[] targets) {
- CacheQuery.this.targets = targets;
- }
-
- public ExecutionHints getExecutionHints() {
- return execHints;
- }
- }
-
- /**
- * An attribute/direction pair
- */
- private static class OrderingImpl implements Ordering {
-
- private final Attribute attribute;
- private final Direction direction;
-
- public OrderingImpl(Attribute attribute, Direction direction) {
- if ((attribute == null) || (direction == null)) {
- throw new NullPointerException();
- }
-
- this.attribute = attribute;
- this.direction = direction;
- }
-
- public Attribute getAttribute() {
- return attribute;
- }
-
- public Direction getDirection() {
- return direction;
- }
- }
-}
Index: rctags/ehcache-2.10.7.0.43/system-tests/src/test/java/org/terracotta/ehcache/tests/ConcurrencyValueTest.java
===================================================================
diff -u -N
--- rctags/ehcache-2.10.7.0.43/system-tests/src/test/java/org/terracotta/ehcache/tests/ConcurrencyValueTest.java (revision 11002)
+++ rctags/ehcache-2.10.7.0.43/system-tests/src/test/java/org/terracotta/ehcache/tests/ConcurrencyValueTest.java (revision 0)
@@ -1,56 +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;
-
-public class ConcurrencyValueTest extends AbstractCacheTestBase {
- private static final int CDM_DEFAULT_CONCURRENCY = 256;
-
- public ConcurrencyValueTest(TestConfig testConfig) {
- super("basic-cache-test.xml", testConfig, Client1.class);
- }
-
- @Override
- protected void evaluateClientOutput(String clientName, int exitCode, File clientOutput) throws Throwable {
- super.evaluateClientOutput(clientName, exitCode, clientOutput);
-
- FileReader fr = null;
- boolean currencyValueLogged1 = false;
- boolean currencyValueLogged2 = false;
- String currencyValueLogMsg1 = getConcurrencyValueLogMsg("defaultConcurrencyCache", CDM_DEFAULT_CONCURRENCY);
- String currencyValueLogMsg2 = getConcurrencyValueLogMsg("configuredConcurrencyCache", 123);
- try {
- fr = new FileReader(clientOutput);
- BufferedReader reader = new BufferedReader(fr);
- String st = "";
- while ((st = reader.readLine()) != null) {
- if (st.contains(currencyValueLogMsg1)) currencyValueLogged1 = true;
- if (st.contains(currencyValueLogMsg2)) currencyValueLogged2 = true;
- }
- } catch (Exception e) {
- throw new AssertionError(e);
- } finally {
- try {
- fr.close();
- } catch (Exception e) {
- //
- }
- }
-
- if (!currencyValueLogged1) { throw new AssertionError(); }
-
- if (!currencyValueLogged2) { throw new AssertionError(); }
- }
-
- private static String getConcurrencyValueLogMsg(String name, int concurrency) {
- return "Cache [" + name + "] using concurrency: " + concurrency;
- }
-
-}
Index: rctags/ehcache-2.10.7.0.43/ehcache-core/src/test/java/net/sf/ehcache/exceptionhandler/CacheExceptionHandlerTest.java
===================================================================
diff -u -N
--- rctags/ehcache-2.10.7.0.43/ehcache-core/src/test/java/net/sf/ehcache/exceptionhandler/CacheExceptionHandlerTest.java (revision 11002)
+++ rctags/ehcache-2.10.7.0.43/ehcache-core/src/test/java/net/sf/ehcache/exceptionhandler/CacheExceptionHandlerTest.java (revision 0)
@@ -1,224 +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.exceptionhandler;
-
-
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.fail;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import net.sf.ehcache.AbstractCacheTest;
-import net.sf.ehcache.CacheException;
-import net.sf.ehcache.CacheManager;
-import net.sf.ehcache.Ehcache;
-import net.sf.ehcache.loader.CacheLoader;
-import net.sf.ehcache.loader.ExceptionThrowingLoader;
-
-import org.junit.After;
-import org.junit.Before;
-import org.junit.Test;
-
-/**
- * @author Greg Luck
- * @version $Id: CacheExceptionHandlerTest.java 5594 2012-05-07 16:04:31Z cdennis $
- */
-public class CacheExceptionHandlerTest {
-
- /**
- * manager
- */
- protected CacheManager manager;
- /**
- * the cache name we wish to test
- */
- protected String cacheName = "exceptionHandlingCache";
- /**
- * the cache we wish to test
- */
- protected Ehcache cache;
-
- /**
- * {@inheritDoc}
- *
- * @throws Exception
- */
- @Before
- public void setUp() throws Exception {
- manager = CacheManager.create(AbstractCacheTest.TEST_CONFIG_DIR + "ehcache.xml");
- cache = manager.getEhcache(cacheName);
- cache.removeAll();
- }
-
-
- /**
- * {@inheritDoc}
- *
- * @throws Exception
- */
- @After
- public void tearDown() throws Exception {
- CountingExceptionHandler.resetCounters();
- manager.shutdown();
- }
-
- /**
- * Test a cache which has been configured to have a CountingExceptionHandler configured
- */
- @Test
- public void testConfiguredCache() {
- manager.removeCache("exceptionHandlingCache");
- //Would normally throw an IllegalStateException
- cache.get("key1");
-
- assertEquals(1, CountingExceptionHandler.HANDLED_EXCEPTIONS.size());
- assertEquals(null, ((CountingExceptionHandler.HandledException) CountingExceptionHandler.HANDLED_EXCEPTIONS.get(0)).getKey());
- assertEquals(IllegalStateException.class, ((CountingExceptionHandler.HandledException) CountingExceptionHandler.HANDLED_EXCEPTIONS
- .get(0)).getException().getClass());
- }
-
- /**
- * Test a cache which has been configured to have an ExceptionThrowingLoader screw up loading.
- * This one should have a key set.
- */
- @Test
- public void testKeyWithConfiguredCache() {
-
- List loaders = new ArrayList(cache.getRegisteredCacheLoaders());
- for (CacheLoader loader : loaders) {
- cache.unregisterCacheLoader(loader);
- }
-
- cache.registerCacheLoader(new ExceptionThrowingLoader());
- cache.getWithLoader("key1", null, null);
-
- assertEquals(1, CountingExceptionHandler.HANDLED_EXCEPTIONS.size());
- assertEquals("key1", ((CountingExceptionHandler.HandledException) CountingExceptionHandler.HANDLED_EXCEPTIONS.get(0)).getKey());
- assertEquals(CacheException.class, ((CountingExceptionHandler.HandledException) CountingExceptionHandler.HANDLED_EXCEPTIONS
- .get(0)).getException().getClass());
- }
-
- /**
- * Double proxy test
- */
- @Test
- public void testCacheExceptionHandler() {
- Ehcache proxiedCache = ExceptionHandlingDynamicCacheProxy.createProxy(cache);
-
- List loaders = new ArrayList(cache.getRegisteredCacheLoaders());
- for (CacheLoader loader : loaders) {
- cache.unregisterCacheLoader(loader);
- }
- cache.registerCacheLoader(new CustomExceptionThrowingLoader());
- proxiedCache.getWithLoader("key1", null, null);
-
-
- //Would normally throw an IllegalArgumentException
-// proxiedCache.put(null);
-
- assertEquals(1, CountingExceptionHandler.HANDLED_EXCEPTIONS.size());
- assertEquals("key1", ((CountingExceptionHandler.HandledException) CountingExceptionHandler.HANDLED_EXCEPTIONS.get(0)).getKey());
- assertEquals(CacheException.class, ((CountingExceptionHandler.HandledException) CountingExceptionHandler.HANDLED_EXCEPTIONS
- .get(0)).getException().getClass());
- }
-
-
- /**
- * Test some gnarly parsing code
- */
- @Test
- public void testKeyExtraction() {
-
- String testMessage = "For key 1234";
- String key = ExceptionHandlingDynamicCacheProxy.extractKey(testMessage);
- assertEquals("1234", key);
-
- testMessage = "key 1234";
- key = ExceptionHandlingDynamicCacheProxy.extractKey(testMessage);
- assertEquals("1234", key);
-
- testMessage = null;
- key = ExceptionHandlingDynamicCacheProxy.extractKey(testMessage);
- assertEquals(null, key);
-
- testMessage = "";
- key = ExceptionHandlingDynamicCacheProxy.extractKey(testMessage);
- assertEquals(null, key);
-
- testMessage = "key 1234 ";
- key = ExceptionHandlingDynamicCacheProxy.extractKey(testMessage);
- assertEquals("1234", key);
-
- testMessage = "key 1234 .";
- key = ExceptionHandlingDynamicCacheProxy.extractKey(testMessage);
- assertEquals("1234", key);
-
- testMessage = "key .";
- key = ExceptionHandlingDynamicCacheProxy.extractKey(testMessage);
- assertEquals(".", key);
-
- testMessage = "key";
- key = ExceptionHandlingDynamicCacheProxy.extractKey(testMessage);
- assertEquals(null, key);
-
- }
-
- /**
- * Tests that the exception thrown by a configured loader, is
- * actually passed on to exception handler
- */
- @Test
- public void testExceptionThrown() {
-
- List loaders = new ArrayList(cache.getRegisteredCacheLoaders());
- for (CacheLoader loader : loaders) {
- cache.unregisterCacheLoader(loader);
- }
- cache.registerCacheLoader(new CustomExceptionThrowingLoader());
-
- cache.getWithLoader("key1", null, null);
-
- assertEquals(1, CountingExceptionHandler.HANDLED_EXCEPTIONS.size());
- assertEquals("key1", ((CountingExceptionHandler.HandledException) CountingExceptionHandler.HANDLED_EXCEPTIONS.get(0)).getKey());
-
-
- Class expectedExceptionClass = UnsupportedOperationException.class;
-
- Exception e = ((CountingExceptionHandler.HandledException) CountingExceptionHandler.HANDLED_EXCEPTIONS
- .get(0)).getException();
-
- Throwable cause = e;
- boolean foundExceptionInChain = false;
-
-
- //Recurse through the chain
- while ((cause = cause.getCause()) != null) {
-
- if (cause.getClass().equals(expectedExceptionClass)) {
- foundExceptionInChain = true;
- break;
- }
- }
-
- if (!foundExceptionInChain) {
- fail();
- }
-
-
- }
-}
Index: rctags/ehcache-2.10.7.0.43/ehcache-core/src/test/java/net/sf/ehcache/CacheCopyOnRwReplaceRemoveTest.java
===================================================================
diff -u -N
--- rctags/ehcache-2.10.7.0.43/ehcache-core/src/test/java/net/sf/ehcache/CacheCopyOnRwReplaceRemoveTest.java (revision 11002)
+++ rctags/ehcache-2.10.7.0.43/ehcache-core/src/test/java/net/sf/ehcache/CacheCopyOnRwReplaceRemoveTest.java (revision 0)
@@ -1,113 +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;
-
-import net.sf.ehcache.config.CacheConfiguration;
-import net.sf.ehcache.config.Configuration;
-import net.sf.ehcache.config.DiskStoreConfiguration;
-import net.sf.ehcache.config.MemoryUnit;
-import net.sf.ehcache.config.PersistenceConfiguration;
-
-import org.junit.After;
-import org.junit.Assert;
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.experimental.categories.Category;
-import org.junit.runner.RunWith;
-import org.junit.runners.Parameterized;
-import org.junit.runners.Parameterized.Parameters;
-import org.terracotta.test.categories.CheckShorts;
-
-import java.util.Arrays;
-import java.util.Collection;
-
-@Category(CheckShorts.class)
-@RunWith(Parameterized.class)
-public class CacheCopyOnRwReplaceRemoveTest {
-
- public static final String MEMORY_CACHE = "memoryCache";
- public static final String DISK_CACHE = "diskCache";
-
- @Parameters(name = "copyOnRead:{0}, copyOnWrite:{1}")
- public static Collection data() {
- Object[][] data = new Object[][] { { true, false }, { false, true }, { true, true } };
- return Arrays.asList(data);
- }
-
- private final boolean copyOnRead;
- private final boolean copyOnWrite;
-
- private CacheManager cacheManager;
-
- public CacheCopyOnRwReplaceRemoveTest(boolean copyOnRead, boolean copyOnWrite) {
- this.copyOnRead = copyOnRead;
- this.copyOnWrite = copyOnWrite;
- }
-
- @Before
- public void setUp() throws Exception {
- cacheManager = CacheManager.create( new Configuration()
- .name("copyOnRWReplaceRemoveManager")
- .diskStore(new DiskStoreConfiguration().path(System.getProperty("java.io.tmpdir")))
- .maxBytesLocalHeap(100, MemoryUnit.KILOBYTES)
- .maxBytesLocalDisk(200, MemoryUnit.KILOBYTES));
- cacheManager.addCache(new Cache(new CacheConfiguration().name(MEMORY_CACHE)
- .copyOnRead(copyOnRead)
- .copyOnWrite(copyOnWrite)));
- cacheManager.addCache(new Cache(new CacheConfiguration().name(DISK_CACHE)
- .persistence(new PersistenceConfiguration().strategy(PersistenceConfiguration.Strategy.LOCALTEMPSWAP))
- .copyOnRead(copyOnRead)
- .copyOnWrite(copyOnWrite)));
- }
-
- @After
- public void tearDown() {
- cacheManager.shutdown();
- }
-
- @Test
- public void testMemoryCache() throws Exception {
- Ehcache cache = cacheManager.getCache(MEMORY_CACHE);
- testReplaceElement(cache);
- testRemoveElement(cache);
- }
-
- @Test
- public void testDiskCache() throws Exception {
- Ehcache cache = cacheManager.getCache(DISK_CACHE);
- testReplaceElement(cache);
- testRemoveElement(cache);
- }
-
- private void testReplaceElement(Ehcache cache) {
- Long key = System.nanoTime();
- String value = "value" + key;
- cache.put(new Element(new Long(key), new String(value)));
- Assert.assertEquals(cache.get(key).getValue(), new Element(new Long(key), new String(value)).getValue());
- String nextValue = value + "1";
- Assert.assertTrue(cache.replace(new Element(new Long(key), new String(value)), new Element(new Long(key), new String(nextValue))));
- }
-
- private void testRemoveElement(Ehcache cache) {
- Long key = System.nanoTime();
- String value = "value" + key;
- cache.put(new Element(new Long(key), new String(value)));
- Assert.assertEquals(cache.get(key).getValue(), new Element(new Long(key), new String(value)).getValue());
- Assert.assertTrue(cache.removeElement(new Element(new Long(key), new String(value))));
- }
-
-}
Index: rctags/ehcache-2.10.7.0.43/ehcache-core/src/test/resources/distribution/ehcache-distributed-big-payload-3.xml
===================================================================
diff -u -N
--- rctags/ehcache-2.10.7.0.43/ehcache-core/src/test/resources/distribution/ehcache-distributed-big-payload-3.xml (revision 11002)
+++ rctags/ehcache-2.10.7.0.43/ehcache-core/src/test/resources/distribution/ehcache-distributed-big-payload-3.xml (revision 0)
@@ -1,425 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
Index: rctags/ehcache-2.10.7.0.43/ehcache-core/src/main/java/net/sf/ehcache/store/MemoryStoreEvictionPolicy.java
===================================================================
diff -u -N
--- rctags/ehcache-2.10.7.0.43/ehcache-core/src/main/java/net/sf/ehcache/store/MemoryStoreEvictionPolicy.java (revision 11002)
+++ rctags/ehcache-2.10.7.0.43/ehcache-core/src/main/java/net/sf/ehcache/store/MemoryStoreEvictionPolicy.java (revision 0)
@@ -1,123 +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;
-
-
-import java.io.Serializable;
-
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-/**
- * A typesafe enumeration of eviction policies.
- * The policy used to evict elements from the {@link net.sf.ehcache.store.MemoryStore}.
- * This can be one of:
- *
- *
LRU - least recently used
- *
LFU - least frequently used
- *
FIFO - first in first out, the oldest element by creation time
- *
- * The default value is LRU
- *
- * @author Greg Luck
- * @version $Id: MemoryStoreEvictionPolicy.java 5594 2012-05-07 16:04:31Z cdennis $
- * @since 1.2
- */
-public final class MemoryStoreEvictionPolicy implements Serializable {
-
- /**
- * LRU - least recently used.
- */
- public static final MemoryStoreEvictionPolicy LRU = new MemoryStoreEvictionPolicy("LRU");
-
- /**
- * LFU - least frequently used.
- */
-
- public static final MemoryStoreEvictionPolicy LFU = new MemoryStoreEvictionPolicy("LFU");
-
- /**
- * FIFO - first in first out, the oldest element by creation time.
- */
- public static final MemoryStoreEvictionPolicy FIFO = new MemoryStoreEvictionPolicy("FIFO");
-
- /**
- * FIFO - first in first out, the oldest element by creation time.
- */
- public static final MemoryStoreEvictionPolicy CLOCK = new MemoryStoreEvictionPolicy("CLOCK");
-
- private static final Logger LOG = LoggerFactory.getLogger(MemoryStoreEvictionPolicy.class.getName());
-
- private final String myName;
-
- /**
- * This class should not be subclassed or have instances created.
- * @param policy
- */
- private MemoryStoreEvictionPolicy(String policy) {
- myName = policy;
- }
-
- /**
- * @return a String representation of the policy
- */
- @Override
- public String toString() {
- return myName;
- }
-
- /**
- * Converts a string representation of the policy into a policy.
- *
- * @param policy either LRU, LFU or FIFO
- * @return one of the static instances
- */
- public static MemoryStoreEvictionPolicy fromString(String policy) {
- if (policy != null) {
- if (policy.equalsIgnoreCase("LRU")) {
- return LRU;
- } else if (policy.equalsIgnoreCase("LFU")) {
- return LFU;
- } else if (policy.equalsIgnoreCase("FIFO")) {
- return FIFO;
- } else if (policy.equalsIgnoreCase("CLOCK")) {
- return CLOCK;
- }
- }
- LOG.warn("The memoryStoreEvictionPolicy of {} cannot be resolved. The policy will be set to LRU", policy);
- return LRU;
- }
-
- /**
- * Enum for {@link MemoryStoreEvictionPolicy}
- *
- */
- public static enum MemoryStoreEvictionPolicyEnum {
- /**
- * Value for {@link MemoryStoreEvictionPolicy#LFU}
- */
- LFU,
- /**
- * Value for {@link MemoryStoreEvictionPolicy#LRU}
- */
- LRU,
- /**
- * Value for {@link MemoryStoreEvictionPolicy#FIFO}
- */
- FIFO;
- }
-}
Index: rctags/ehcache-2.10.7.0.43/ehcache-core/src/test/resources/META-INF/services/net.sf.ehcache.management.ManagementServer
===================================================================
diff -u -N
--- rctags/ehcache-2.10.7.0.43/ehcache-core/src/test/resources/META-INF/services/net.sf.ehcache.management.ManagementServer (revision 11002)
+++ rctags/ehcache-2.10.7.0.43/ehcache-core/src/test/resources/META-INF/services/net.sf.ehcache.management.ManagementServer (revision 0)
@@ -1,2 +0,0 @@
-#used by ManagementServerLoaderTest
-net.sf.ehcache.management.DummyManagementServerImpl
\ No newline at end of file
Index: rctags/ehcache-2.10.7.0.43/ehcache-core/src/test/java/net/sf/ehcache/OverflowCacheTest.java
===================================================================
diff -u -N
--- rctags/ehcache-2.10.7.0.43/ehcache-core/src/test/java/net/sf/ehcache/OverflowCacheTest.java (revision 11002)
+++ rctags/ehcache-2.10.7.0.43/ehcache-core/src/test/java/net/sf/ehcache/OverflowCacheTest.java (revision 0)
@@ -1,73 +0,0 @@
-package net.sf.ehcache;
-
-import net.sf.ehcache.config.CacheConfiguration;
-import org.junit.After;
-import org.junit.Before;
-import org.junit.Test;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.fail;
-
-/**
- * @author Alex Snaps
- */
-public class OverflowCacheTest {
-
- private static final Logger LOG = LoggerFactory.getLogger(CacheTest.class.getName());
-
- private CacheManager manager;
-
- @Before
- public void setUp() throws Exception {
- manager = CacheManager.create();
- }
-
- /**
- * teardown
- */
- @After
- public void tearDown() throws Exception {
- if (manager != null) {
- manager.shutdown();
- }
- }
-
-
- /**
- * Shows the effect of jamming large amounts of puts into a cache that overflows to disk.
- * The DiskStore should cause puts to back off and avoid an out of memory error.
- */
- @Test
- public void testBehaviourOnDiskStoreBackUp() throws Exception {
- Cache cache = new Cache(new CacheConfiguration().name("testBehaviourOnDiskStoreBackUp")
- .maxElementsInMemory(1000)
- .overflowToDisk(true)
- .eternal(false)
- .timeToLiveSeconds(100)
- .timeToIdleSeconds(200)
- .diskPersistent(false)
- .diskExpiryThreadIntervalSeconds(0)
- .diskSpoolBufferSizeMB(10));
- manager.addCache(cache);
-
- assertEquals(0, cache.getStatistics().getLocalHeapSize());
-
- Element a;
- int i = 0;
- try {
- for (; i < 150000; i++) {
- String key = i + "";
- String value = key;
- a = new Element(key, value + "DDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDD");
- cache.put(a);
- }
- } catch (OutOfMemoryError e) {
- LOG.info("OutOfMemoryError: " + e.getMessage() + " " + i);
- fail();
- }
- }
-
-
-}
Index: rctags/ehcache-2.10.7.0.43/ehcache-core/src/main/java/net/sf/ehcache/FeaturesManager.java
===================================================================
diff -u -N
--- rctags/ehcache-2.10.7.0.43/ehcache-core/src/main/java/net/sf/ehcache/FeaturesManager.java (revision 11002)
+++ rctags/ehcache-2.10.7.0.43/ehcache-core/src/main/java/net/sf/ehcache/FeaturesManager.java (revision 0)
@@ -1,79 +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;
-
-import net.sf.ehcache.pool.Pool;
-import net.sf.ehcache.store.Store;
-import net.sf.ehcache.transaction.SoftLockFactory;
-import net.sf.ehcache.transaction.SoftLockManager;
-import net.sf.ehcache.transaction.TransactionIDFactory;
-import net.sf.ehcache.writer.writebehind.WriteBehind;
-
-/**
- * Interface implemented by classes providing access to extended functionality.
- *
- * @author Chris Dennis
- */
-public interface FeaturesManager {
-
- /**
- * Fully qualified classname of the enterprise features manager
- */
- public static final String ENTERPRISE_FM_CLASSNAME = "net.sf.ehcache.EnterpriseFeaturesManager";
-
- /**
- * Create a WriteBehind instance for the given cache.
- *
- * @param cache cache to create write behind for
- * @return a write behind instance
- */
- WriteBehind createWriteBehind(Cache cache);
-
- /**
- * Create a store for the given cache.
- *
- * @param cache cache to create a store for
- * @param onHeapPool on-heap pool
- * @param onDiskPool on-disk pool
- * @return a store for the given cache
- */
- Store createStore(Cache cache, Pool onHeapPool, Pool onDiskPool);
-
- /**
- * Create a transaction map for the associated cache manager
- *
- * @return a transaction map for the cache manager
- */
- TransactionIDFactory createTransactionIDFactory();
-
- /**
- * Create a soft-lock map for the given cache
- *
- * @return a soft-lcok map for the given cache
- */
- SoftLockManager createSoftLockManager(Ehcache cache, SoftLockFactory lockFactory);
-
- /**
- * Called on {@code CacheManager} creation.
- */
- void startup();
-
- /**
- * Called on {@code CacheManager} shutdown and on exception during CacheManager bootstrapping.
- */
- void dispose();
-}
Index: rctags/ehcache-2.10.7.0.43/system-tests/src/test/resources/cache-event-eviction-exception-test.xml
===================================================================
diff -u -N
--- rctags/ehcache-2.10.7.0.43/system-tests/src/test/resources/cache-event-eviction-exception-test.xml (revision 11002)
+++ rctags/ehcache-2.10.7.0.43/system-tests/src/test/resources/cache-event-eviction-exception-test.xml (revision 0)
@@ -1,9 +0,0 @@
-
-
-
-
-
-
-
-
-
Index: rctags/ehcache-2.10.7.0.43/ehcache-core/src/test/java/net/sf/ehcache/constructs/blocking/UpdatingSelfPopulatingCacheTest.java
===================================================================
diff -u -N
--- rctags/ehcache-2.10.7.0.43/ehcache-core/src/test/java/net/sf/ehcache/constructs/blocking/UpdatingSelfPopulatingCacheTest.java (revision 11002)
+++ rctags/ehcache-2.10.7.0.43/ehcache-core/src/test/java/net/sf/ehcache/constructs/blocking/UpdatingSelfPopulatingCacheTest.java (revision 0)
@@ -1,147 +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.blocking;
-
-import net.sf.ehcache.Cache;
-import net.sf.ehcache.CacheException;
-import net.sf.ehcache.CacheManager;
-import net.sf.ehcache.Element;
-import net.sf.ehcache.config.CacheConfiguration;
-import net.sf.ehcache.config.Configuration;
-import net.sf.ehcache.config.DiskStoreConfiguration;
-
-import org.junit.After;
-import org.junit.Before;
-import org.junit.Rule;
-import org.junit.Test;
-import org.junit.rules.TemporaryFolder;
-
-import static org.hamcrest.Matchers.is;
-import static org.hamcrest.Matchers.sameInstance;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertThat;
-import static org.junit.Assert.fail;
-
-
-/**
- * Test cases for the {@link UpdatingSelfPopulatingCache}.
- *
- * @author Greg Luck
- * @version $Id: UpdatingSelfPopulatingCacheTest.java 8281 2013-10-04 08:41:51Z ljacomet $
- */
-public class UpdatingSelfPopulatingCacheTest {
-
- @Rule
- public TemporaryFolder temporaryFolder = new TemporaryFolder();
-
- private CacheManager cacheManager;
- private Cache cache;
-
- @Before
- public void setUp() throws Exception {
- Configuration configuration = new Configuration();
- configuration.name("upSelfPopCM")
- .diskStore(new DiskStoreConfiguration().path(temporaryFolder.newFolder().getAbsolutePath()))
- .addCache(new CacheConfiguration("cache", 1).timeToIdleSeconds(2)
- .timeToLiveSeconds(5)
- .overflowToDisk(true)
- .diskPersistent(true));
- cacheManager = CacheManager.newInstance(configuration);
- cache = cacheManager.getCache("cache");
- }
-
- @After
- public void tearDown() {
- cacheManager.shutdown();
- }
-
- /**
- * Tests fetching an entry, and then an update.
- */
- @Test
- public void testFetchAndUpdate() throws Exception {
- final Object value = "value";
- final CountingCacheEntryFactory factory = new CountingCacheEntryFactory(value);
- UpdatingSelfPopulatingCache selfPopulatingCache = new UpdatingSelfPopulatingCache(cache, factory);
-
-
- //test null
- Element element = selfPopulatingCache.get(null);
-
- // Lookup
- element = selfPopulatingCache.get("key");
- assertThat(element.getObjectValue(), sameInstance(value));
- assertThat(factory.getCount(), is(2));
-
- Object actualValue = selfPopulatingCache.get("key").getObjectValue();
- assertThat(actualValue, sameInstance(value));
- assertThat(factory.getCount(), is(3));
-
- actualValue = selfPopulatingCache.get("key").getObjectValue();
- assertThat(actualValue, sameInstance(value));
- assertThat(factory.getCount(), is(4));
- }
-
- /**
- * Tests when fetch fails.
- */
- @Test
- public void testFetchFail() throws Exception {
- final Exception exception = new Exception("Failed.");
- final UpdatingCacheEntryFactory factory = new UpdatingCacheEntryFactory() {
- public Object createEntry(final Object key)
- throws Exception {
- throw exception;
- }
-
- public void updateEntryValue(Object key, Object value)
- throws Exception {
- throw exception;
- }
- };
-
- UpdatingSelfPopulatingCache selfPopulatingCache = new UpdatingSelfPopulatingCache(cache, factory);
-
- // Lookup
- try {
- selfPopulatingCache.get("key");
- fail();
- } catch (final Exception e) {
- // Check the error
- assertEquals("Could not update object for cache entry with key \"key\".", e.getMessage());
- }
- }
-
- /**
- * Tests refreshing the entries.
- */
- @Test
- public void testRefresh() throws Exception {
- final String value = "value";
- final CountingCacheEntryFactory factory = new CountingCacheEntryFactory(value);
- UpdatingSelfPopulatingCache selfPopulatingCache = new UpdatingSelfPopulatingCache(cache, factory);
-
- // Refresh
- try {
- selfPopulatingCache.refresh();
- fail();
- } catch (CacheException e) {
- //expected.
- assertEquals("UpdatingSelfPopulatingCache objects should not be refreshed.", e.getMessage());
- }
- }
-}
Index: rctags/ehcache-2.10.7.0.43/ehcache-core/src/main/java/net/sf/ehcache/pool/impl/BoundedPool.java
===================================================================
diff -u -N
--- rctags/ehcache-2.10.7.0.43/ehcache-core/src/main/java/net/sf/ehcache/pool/impl/BoundedPool.java (revision 11002)
+++ rctags/ehcache-2.10.7.0.43/ehcache-core/src/main/java/net/sf/ehcache/pool/impl/BoundedPool.java (revision 0)
@@ -1,52 +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.impl;
-
-import net.sf.ehcache.pool.PoolParticipant;
-import net.sf.ehcache.pool.SizeOfEngine;
-import net.sf.ehcache.pool.PoolAccessor;
-import net.sf.ehcache.pool.PoolEvictor;
-
-/**
- * A pool which loosely obeys to its bound: it can allow the accessors to consume more bytes than what
- * has been configured if that helps concurrency.
-
- * @author Ludovic Orban
- * @author Chris Dennis
- */
-public class BoundedPool extends AbstractPool {
-
- /**
- * Create a BoundedPool instance
- *
- * @param maximumPoolSize the maximum size of the pool, in bytes.
- * @param evictor the pool evictor, for cross-store eviction.
- * @param defaultSizeOfEngine the default SizeOf engine used by the accessors.
- */
- public BoundedPool(long maximumPoolSize, PoolEvictor evictor, SizeOfEngine defaultSizeOfEngine) {
- super(maximumPoolSize, evictor, defaultSizeOfEngine);
- }
-
- /**
- * {@inheritDoc}
- */
- public PoolAccessor createPoolAccessor(PoolParticipant participant, SizeOfEngine sizeOfEngine) {
- AtomicPoolAccessor accessor = new AtomicPoolAccessor(this, participant, sizeOfEngine, 0);
- registerPoolAccessor(accessor);
- return accessor;
- }
-}
Index: rctags/ehcache-2.10.7.0.43/ehcache-core/src/main/java/net/sf/ehcache/bootstrap/BootstrapCacheLoader.java
===================================================================
diff -u -N
--- rctags/ehcache-2.10.7.0.43/ehcache-core/src/main/java/net/sf/ehcache/bootstrap/BootstrapCacheLoader.java (revision 11002)
+++ rctags/ehcache-2.10.7.0.43/ehcache-core/src/main/java/net/sf/ehcache/bootstrap/BootstrapCacheLoader.java (revision 0)
@@ -1,48 +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.bootstrap;
-
-import net.sf.ehcache.CacheException;
-import net.sf.ehcache.Ehcache;
-
-/**
- * @author Greg Luck
- * @version $Id: BootstrapCacheLoader.java 10789 2018-04-26 02:08:13Z adahanne $
- */
-public interface BootstrapCacheLoader {
-
- /**
- * Instructs the loader to load the given cache
- * @param cache cache to load
- */
- void load(Ehcache cache) throws CacheException;
-
- /**
- *
- * @return true if this bootstrap loader is asynchronous
- */
- boolean isAsynchronous();
-
- /**
- * Clones the loader
- *
- * @return clone of this instance
- * @throws CloneNotSupportedException if the object's class does not support the {@code Cloneable} interface.
- */
- Object clone() throws CloneNotSupportedException;
-
-}
Index: rctags/ehcache-2.10.7.0.43/distribution/colorcache/src/assemble/bin/package.sh
===================================================================
diff -u -N
--- rctags/ehcache-2.10.7.0.43/distribution/colorcache/src/assemble/bin/package.sh (revision 11002)
+++ rctags/ehcache-2.10.7.0.43/distribution/colorcache/src/assemble/bin/package.sh (revision 0)
@@ -1,53 +0,0 @@
-#!/bin/bash
-
-cygwin=false
-if [ `uname | grep CYGWIN` ]; then
- cygwin=true
-fi
-
-if [ "$JAVA_HOME" = "" ]; then
- echo "JAVA_HOME is not defined"
- exit 1
-fi
-
-appname=colorcache
-
-
-unset CDPATH
-root=`dirname $0`/..
-root=`cd $root && pwd`
-
-jetty1=$root/jetty6.1/9081
-jetty2=$root/jetty6.1/9082
-webapp_lib=$root/webapps/$appname/WEB-INF/lib
-
-tc_install_dir=$root/bin/`$root/bin/relative-paths.sh tc_install_dir`
-ehcache_jars_dir=$root/bin/`$root/bin/relative-paths.sh ehcache_jars_dir`
-
-# package ehcache-core and ehcache-terracotta
-cp $ehcache_jars_dir/lib/ehcache*.jar $webapp_lib
-
-# package toolkit runtime. It could be in 2 different places depending on which kit (ehcache vs tc)
-toolkit_runtime=$tc_install_dir/common/terracotta-toolkit*-runtime*.jar
-
-if [ ! -f $toolkit_runtime ]; then
- # not found under 'common', try 'lib'
- toolkit_runtime=$ehcache_jars_dir/lib/terracotta-toolkit*-runtime*.jar
- if [ ! -f $toolkit_runtime ]; then
- echo "Couldn't locate toolkit runtime jar"
- exit 1
- fi
-fi
-
-cp $toolkit_runtime $webapp_lib
-
-if [ $? -eq 0 ]; then
- echo "Deploying demo..."
- cp -r $root/webapps $jetty1
- cp -r $root/webapps $jetty2
- echo "Done."
- exit 0
-else
- echo "Error packaging the sample"
- exit 1
-fi
Index: rctags/ehcache-2.10.7.0.43/system-tests/src/test/resources/byteman/debugEhcacheTxnsState.btm
===================================================================
diff -u -N
--- rctags/ehcache-2.10.7.0.43/system-tests/src/test/resources/byteman/debugEhcacheTxnsState.btm (revision 11002)
+++ rctags/ehcache-2.10.7.0.43/system-tests/src/test/resources/byteman/debugEhcacheTxnsState.btm (revision 0)
@@ -1,44 +0,0 @@
-
-
-RULE trace EhcacheTxnsClusteredStateFacadeImpl getXATransactionDecision
-CLASS EhcacheTxnsClusteredStateFacadeImpl
-METHOD getXATransactionDecision
-AT EXIT
-IF true
-DO traceln("[ehcache txns facade] getXATransactionDecision - key.hashCode(): " + $key.hashCode() + " returning:-> " + $!);
-ENDRULE
-
-RULE trace EhcacheTxnsClusteredStateFacadeImpl updateXATransactionDecision
-CLASS EhcacheTxnsClusteredStateFacadeImpl
-METHOD updateXATransactionDecision
-AT EXIT
-IF true
-DO traceln("[ehcache txns facade] updateXATransactionDecision - key.hashCode(): " + $key.hashCode() + ", newDecision: " + $newDecision);
-ENDRULE
-
-RULE trace EhcacheTxnsClusteredStateFacadeImpl getSoftLockState
-CLASS EhcacheTxnsClusteredStateFacadeImpl
-METHOD getSoftLockState
-AT EXIT
-IF true
-DO traceln("[ehcache txns facade] getSoftLockState - key.hashCode(): " + $key.hashCode() + " returning:-> " + $!);
-ENDRULE
-
-RULE trace EhcacheTxnsClusteredStateFacadeImpl updateSoftLockState
-CLASS EhcacheTxnsClusteredStateFacadeImpl
-METHOD updateSoftLockState
-AFTER INVOKE put
-IF true
-DO traceln("[ehcache txns facade] updateSoftLockState, after put - key.hashCode(): " + $key.hashCode() + ", newSoftLockState: " + $newSoftLockState);
-AT EXIT
-IF true
-DO traceln("[ehcache txns facade] updateSoftLockState, returning for key.hashCode(): " + $key.hashCode() + " returning:-> " + $!);
-ENDRULE
-
-RULE trace EhcacheTxnsClusteredStateFacadeImpl isExpired
-CLASS EhcacheTxnsClusteredStateFacadeImpl
-METHOD isExpired
-AT EXIT
-IF true
-DO traceln("[ehcache txns facade] isExpired - softLockId.hashCode(): " + serializeToString($softLockId).hashCode() + " returning:-> " + $!);
-ENDRULE
Index: rctags/ehcache-2.10.7.0.43/system-tests/src/test/java/org/terracotta/modules/ehcache/lifecycle/CacheManagerDestroyCrashTest.java
===================================================================
diff -u -N
--- rctags/ehcache-2.10.7.0.43/system-tests/src/test/java/org/terracotta/modules/ehcache/lifecycle/CacheManagerDestroyCrashTest.java (revision 11002)
+++ rctags/ehcache-2.10.7.0.43/system-tests/src/test/java/org/terracotta/modules/ehcache/lifecycle/CacheManagerDestroyCrashTest.java (revision 0)
@@ -1,159 +0,0 @@
-/*
- * All content copyright Terracotta, Inc., unless otherwise indicated. All rights reserved.
- */
-package org.terracotta.modules.ehcache.lifecycle;
-
-import net.sf.ehcache.Cache;
-import net.sf.ehcache.Element;
-import net.sf.ehcache.config.CacheConfiguration;
-import net.sf.ehcache.config.Configuration;
-import net.sf.ehcache.config.ConfigurationFactory;
-import net.sf.ehcache.config.TerracottaConfiguration;
-
-import org.mockito.Mockito;
-import org.objenesis.ObjenesisStd;
-import org.terracotta.ehcache.tests.AbstractCacheTestBase;
-import org.terracotta.ehcache.tests.ClientBase;
-import org.terracotta.test.util.TestBaseUtil;
-import org.terracotta.toolkit.Toolkit;
-
-import com.tc.test.config.model.TestConfig;
-import com.terracotta.entity.ClusteredEntityManager;
-import com.terracotta.entity.ehcache.ClusteredCacheManager;
-
-import java.io.IOException;
-import java.util.Map;
-import java.util.concurrent.TimeUnit;
-
-import static org.mockito.Matchers.any;
-import static org.mockito.Mockito.doThrow;
-import static org.mockito.Mockito.never;
-import static org.mockito.Mockito.reset;
-import static org.mockito.Mockito.spy;
-import static org.mockito.Mockito.verify;
-
-public class CacheManagerDestroyCrashTest extends AbstractCacheTestBase {
- private static final String CACHE_NAME = "cache1";
-
- public CacheManagerDestroyCrashTest(TestConfig testConfig) {
- super("lifecycle/cache-destroy.xml", testConfig, CacheManagerCreateClient.class,
- CacheManagerEntityDestroyCrashClient.class);
- }
-
- @Override
- protected String createClassPath(Class client) throws IOException {
- String classpath = super.createClassPath(client);
- classpath = addToClasspath(classpath, TestBaseUtil.jarFor(Mockito.class));
- classpath = addToClasspath(classpath, TestBaseUtil.jarFor(ObjenesisStd.class));
- return classpath;
- }
-
- public static class CacheManagerCreateClient extends ClientBase {
-
- public CacheManagerCreateClient(String[] mainArgs) {
- super(mainArgs);
- }
-
- @Override
- protected void runTest(Cache cache, Toolkit myToolkit) throws Throwable {
-
- CacheConfiguration cacheConfig = new CacheConfiguration(CACHE_NAME, 100)
- .terracotta(new TerracottaConfiguration());
- cacheManager.addCache(new Cache(cacheConfig));
- cache = cacheManager.getCache(CACHE_NAME);
- cache.put(new Element("key", "value", true));
-
- cacheManager.shutdown();
-
- // Notify client to destroy
- getBarrierForAllClients().await(10, TimeUnit.SECONDS); // hit 1
-
- // Waiting for other client to signal destroy done
- getBarrierForAllClients().await(1, TimeUnit.MINUTES); // hit 2
-
- // Making sure adding back cache does not resurrect old data structures
- setupCacheManager();
- cacheManager.addCache(new Cache(cacheConfig));
- cache = cacheManager.getCache(CACHE_NAME);
- assertNull(cache.get("key"));
- }
-
- @Override
- protected Cache getCache() {
- return null;
- }
-
- }
-
- public static class CacheManagerEntityDestroyCrashClient extends ClientBase {
-
- public CacheManagerEntityDestroyCrashClient(String[] mainArgs) {
- super(mainArgs);
- }
-
- @Override
- protected void runTest(Cache cache, Toolkit myToolkit) throws Throwable {
- // Waiting for CM to be created
-
- waitForAllClients(); // hit 1
-
- Toolkit spiedToolkit = spy(getClusteringToolkit());
-
- ClusteredEntityManager clusteredEntityManager1 = new ClusteredEntityManager(spiedToolkit);
- Configuration configuration = ConfigurationFactory.parseConfiguration(getEhcacheXmlAsStream());
- String cmName = configuration.getName();
-
- Map cacheManagers = clusteredEntityManager1
- .getRootEntities(ClusteredCacheManager.class);
-
- ClusteredCacheManager clusteredCacheManager = cacheManagers.get(cmName);
-
- while(clusteredCacheManager.isUsed()) {
- TimeUnit.MILLISECONDS.sleep(200);
- }
-
-
- doThrow(new TestDestroyCrashException("Crashing destroy"))
- .when(spiedToolkit)
- .getCache(any(String.class), any(org.terracotta.toolkit.config.Configuration.class), any(Class.class));
- try {
- clusteredEntityManager1.destroyRootEntity(cmName, ClusteredCacheManager.class, clusteredCacheManager);
- fail("Destroy should have thrown an exception");
- } catch(TestDestroyCrashException e) {
- // Expected as we want destroy to crash
- e.printStackTrace();
- }
- reset(spiedToolkit);
-
- clusteredEntityManager1.getRootEntity(cmName, ClusteredCacheManager.class);
- // Shows inline clean up performed
- verify(spiedToolkit).getCache(any(String.class), any(org.terracotta.toolkit.config.Configuration.class), any(Class.class));
-
- reset(spiedToolkit);
-
- ClusteredEntityManager clusteredEntityManager2 = new ClusteredEntityManager(spiedToolkit);
- assertNull(clusteredEntityManager2.getRootEntity(cmName, ClusteredCacheManager.class));
-
- verify(spiedToolkit, never()).getCache(any(String.class), any(org.terracotta.toolkit.config.Configuration.class), any(Class.class));
-
- getBarrierForAllClients().await(10, TimeUnit.SECONDS); // hit 2
- }
-
- @Override
- protected void setupCacheManager() {
- // Do nothing here
- }
-
- @Override
- protected Cache getCache() {
- // Do nothing here
- return null;
- }
- }
-
- public static class TestDestroyCrashException extends RuntimeException {
- public TestDestroyCrashException(String msg) {
- super(msg);
- }
- }
-}
Index: rctags/ehcache-2.10.7.0.43/ehcache-core/src/test/resources/services/net.sf.ehcache.pool.SizeOfEngineFactory.txt
===================================================================
diff -u -N
--- rctags/ehcache-2.10.7.0.43/ehcache-core/src/test/resources/services/net.sf.ehcache.pool.SizeOfEngineFactory.txt (revision 11002)
+++ rctags/ehcache-2.10.7.0.43/ehcache-core/src/test/resources/services/net.sf.ehcache.pool.SizeOfEngineFactory.txt (revision 0)
@@ -1 +0,0 @@
-net.sf.ehcache.pool.SizeOfEngineLoaderTest$MyRealFactory
\ No newline at end of file
Index: rctags/ehcache-2.10.7.0.43/system-tests/src/test/resources/basic-xa-test.xml
===================================================================
diff -u -N
--- rctags/ehcache-2.10.7.0.43/system-tests/src/test/resources/basic-xa-test.xml (revision 11002)
+++ rctags/ehcache-2.10.7.0.43/system-tests/src/test/resources/basic-xa-test.xml (revision 0)
@@ -1,27 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
Index: rctags/ehcache-2.10.7.0.43/ehcache-core/src/main/java/net/sf/ehcache/store/TxCopyStrategyHandler.java
===================================================================
diff -u -N
--- rctags/ehcache-2.10.7.0.43/ehcache-core/src/main/java/net/sf/ehcache/store/TxCopyStrategyHandler.java (revision 11002)
+++ rctags/ehcache-2.10.7.0.43/ehcache-core/src/main/java/net/sf/ehcache/store/TxCopyStrategyHandler.java (revision 0)
@@ -1,49 +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;
-
-import net.sf.ehcache.Element;
-import net.sf.ehcache.store.compound.ReadWriteCopyStrategy;
-import net.sf.ehcache.transaction.SoftLockID;
-
-/**
- * @author Alex Snaps
- */
-public class TxCopyStrategyHandler extends CopyStrategyHandler {
-
- /**
- * Creates a TxCopyStrategyHandler based on the copy configuration
- *
- * @param copyOnRead copy on read flag
- * @param copyOnWrite copy on write flag
- * @param copyStrategy the copy strategy to use
- * @param loader
- */
- public TxCopyStrategyHandler(final boolean copyOnRead, final boolean copyOnWrite,
- final ReadWriteCopyStrategy copyStrategy, final ClassLoader loader) {
- super(copyOnRead, copyOnWrite, copyStrategy, loader);
- }
-
- @Override
- public Element copyElementForReadIfNeeded(final Element element) {
- final Object objectValue = element.getObjectValue();
- if (objectValue instanceof SoftLockID) {
- return super.copyElementForReadIfNeeded(((SoftLockID)objectValue).getOldElement());
- }
- return super.copyElementForReadIfNeeded(element);
- }
-}
Index: rctags/ehcache-2.10.7.0.43/system-tests/src/test/java/org/terracotta/ehcache/tests/ExplicitlyUnclusteredStandaloneCacheTest.java
===================================================================
diff -u -N
--- rctags/ehcache-2.10.7.0.43/system-tests/src/test/java/org/terracotta/ehcache/tests/ExplicitlyUnclusteredStandaloneCacheTest.java (revision 11002)
+++ rctags/ehcache-2.10.7.0.43/system-tests/src/test/java/org/terracotta/ehcache/tests/ExplicitlyUnclusteredStandaloneCacheTest.java (revision 0)
@@ -1,18 +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;
-
-/**
- * @author cdennis
- */
-public class ExplicitlyUnclusteredStandaloneCacheTest extends AbstractCacheTestBase {
-
- public ExplicitlyUnclusteredStandaloneCacheTest(TestConfig testConfig) {
- super("explicitly-unclustered-cache-test.xml", testConfig, UnclusteredClient.class, UnclusteredClient.class);
- }
-
-}
Index: rctags/ehcache-2.10.7.0.43/ehcache-search-parser/src/test/java/net/sf/ehcache/search/parser/MCriteriaTest.java
===================================================================
diff -u -N
--- rctags/ehcache-2.10.7.0.43/ehcache-search-parser/src/test/java/net/sf/ehcache/search/parser/MCriteriaTest.java (revision 11002)
+++ rctags/ehcache-2.10.7.0.43/ehcache-search-parser/src/test/java/net/sf/ehcache/search/parser/MCriteriaTest.java (revision 0)
@@ -1,161 +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.expression.And;
-import net.sf.ehcache.search.expression.EqualTo;
-import net.sf.ehcache.search.expression.GreaterThan;
-import net.sf.ehcache.search.expression.GreaterThanOrEqual;
-import net.sf.ehcache.search.expression.ILike;
-import net.sf.ehcache.search.expression.LessThan;
-import net.sf.ehcache.search.expression.LessThanOrEqual;
-import net.sf.ehcache.search.expression.Not;
-import net.sf.ehcache.search.expression.NotEqualTo;
-import net.sf.ehcache.search.expression.Or;
-import net.sf.ehcache.search.parser.MCriteria.Between;
-import net.sf.ehcache.search.parser.MCriteria.Simple;
-import net.sf.ehcache.search.parser.MValue.MInt;
-
-import org.junit.Assert;
-import org.junit.Test;
-
-public class MCriteriaTest {
-
- private final ClassLoader loader = getClass().getClassLoader();
-
- @Test
- public void testSimpleModelCriteria() throws CustomParseException {
- {
- MInt obj = new MValue.MInt(null, "0");
- Simple mcrit = new MCriteria.Simple(new MAttribute("foo"), MCriteria.SimpleOp.EQ, obj);
- EqualTo crit = (EqualTo)mcrit.asEhcacheObject(loader);
- Assert.assertEquals(crit.getAttributeName(), "foo");
- Assert.assertEquals(crit.getValue(), obj.asEhcacheObject(loader));
- }
- {
- MInt obj = new MValue.MInt(null, "0");
- Simple mcrit = new MCriteria.Simple(new MAttribute("foo"), MCriteria.SimpleOp.NE, obj);
- NotEqualTo crit = (NotEqualTo)mcrit.asEhcacheObject(loader);
- Assert.assertEquals(crit.getAttributeName(), "foo");
- Assert.assertEquals(crit.getValue(), obj.asEhcacheObject(loader));
- }
- {
- MInt obj = new MValue.MInt(null, "0");
- Simple mcrit = new MCriteria.Simple(new MAttribute("foo"), MCriteria.SimpleOp.GE, obj);
- GreaterThanOrEqual crit = (GreaterThanOrEqual)mcrit.asEhcacheObject(loader);
- Assert.assertEquals(crit.getAttributeName(), "foo");
- Assert.assertEquals(crit.getComparableValue(), obj.asEhcacheObject(loader));
- }
- {
- MInt obj = new MValue.MInt(null, "0");
- Simple mcrit = new MCriteria.Simple(new MAttribute("foo"), MCriteria.SimpleOp.GT, obj);
- GreaterThan crit = (GreaterThan)mcrit.asEhcacheObject(loader);
- Assert.assertEquals(crit.getAttributeName(), "foo");
- Assert.assertEquals(crit.getComparableValue(), obj.asEhcacheObject(loader));
- }
- {
- MInt obj = new MValue.MInt(null, "0");
- Simple mcrit = new MCriteria.Simple(new MAttribute("foo"), MCriteria.SimpleOp.LT, obj);
- LessThan crit = (LessThan)mcrit.asEhcacheObject(loader);
- Assert.assertEquals(crit.getAttributeName(), "foo");
- Assert.assertEquals(crit.getComparableValue(), obj.asEhcacheObject(loader));
- }
- {
- MInt obj = new MValue.MInt(null, "0");
- Simple mcrit = new MCriteria.Simple(new MAttribute("foo"), MCriteria.SimpleOp.LE, obj);
- LessThanOrEqual crit = (LessThanOrEqual)mcrit.asEhcacheObject(loader);
- Assert.assertEquals(crit.getAttributeName(), "foo");
- Assert.assertEquals(crit.getComparableValue(), obj.asEhcacheObject(loader));
- }
- }
-
- void checkBetween(String name, ModelElement obj1, boolean min, ModelElement obj2, boolean max) {
- Between between = new MCriteria.Between(new MAttribute(name), obj1, min, obj2, max);
- net.sf.ehcache.search.expression.Between crit = (net.sf.ehcache.search.expression.Between)between.asEhcacheObject(loader);
- Assert.assertEquals(crit.getAttributeName(), name);
- Assert.assertEquals(crit.getMin(), obj1.asEhcacheObject(loader));
- Assert.assertEquals(crit.getMax(), obj2.asEhcacheObject(loader));
- Assert.assertEquals(crit.isMinInclusive(), min);
- Assert.assertEquals(crit.isMaxInclusive(), max);
- }
-
- @Test
- public void testBetween() throws CustomParseException {
- MInt obj1 = new MValue.MInt(null, "0");
- MInt obj2 = new MValue.MInt(null, "110");
- checkBetween("foo", obj1, false, obj2, false);
- checkBetween("foo", obj1, true, obj2, false);
- checkBetween("foo", obj1, false, obj2, true);
- checkBetween("foo", obj1, true, obj2, true);
- }
-
- @Test
- public void testIlike() {
- MCriteria.ILike ilike = new MCriteria.ILike(MAttribute.KEY, "foo.*foo");
- ILike crit = (ILike)ilike.asEhcacheObject(loader);
- Assert.assertEquals(crit.getRegex(), "foo.*foo");
- Assert.assertEquals(crit.getAttributeName(), MAttribute.KEY.getName());
- }
-
- @Test
- public void testLike() {
- MCriteria.Like like = new MCriteria.Like(MAttribute.KEY, "foo.%foo");
- ILike crit = (ILike)like.asEhcacheObject(loader);
- Assert.assertEquals(like.getLikeRegex(), "foo.%foo");
- Assert.assertEquals(like.getILikeRegex(), "foo.*foo");
- Assert.assertEquals(crit.getRegex(), "foo.*foo");
- Assert.assertEquals(crit.getAttributeName(), MAttribute.KEY.getName());
- }
-
- @Test
- public void testNot() throws CustomParseException {
- MCriteria.Simple simple = new MCriteria.Simple(MAttribute.KEY, MCriteria.SimpleOp.EQ, new MValue.MInt(null, "1"));
- MCriteria.Not not = new MCriteria.Not(simple);
- Not crit = (Not)not.asEhcacheObject(loader);
- @SuppressWarnings("unused")
- EqualTo inner = (EqualTo)crit.getCriteria();
- Assert.assertTrue(true); // the casts are sufficient for the test.
- }
-
- @Test
- public void testAnd() throws CustomParseException {
- Simple mcrit1 = new MCriteria.Simple(new MAttribute("foo"), MCriteria.SimpleOp.GT, new MValue.MInt(null, "0"));
- Simple mcrit2 = new MCriteria.Simple(new MAttribute("foo"), MCriteria.SimpleOp.LT, new MValue.MInt(null, "10"));
- Simple mcrit3 = new MCriteria.Simple(new MAttribute("foo"), MCriteria.SimpleOp.NE, new MValue.MInt(null, "5"));
-
- MCriteria.And and = new MCriteria.And(mcrit1, mcrit2, mcrit3);
- And crit = (And)and.asEhcacheObject(loader);
- Assert.assertTrue(crit.getCriterion()[0] instanceof GreaterThan);
- Assert.assertTrue(crit.getCriterion()[1] instanceof And);
- And crit2 = (And)crit.getCriterion()[1];
- Assert.assertTrue(crit2.getCriterion()[0] instanceof LessThan);
- Assert.assertTrue(crit2.getCriterion()[1] instanceof NotEqualTo);
-
- }
-
- @Test
- public void testOr() throws CustomParseException {
- Simple mcrit1 = new MCriteria.Simple(new MAttribute("foo"), MCriteria.SimpleOp.GT, new MValue.MInt(null, "100"));
- Simple mcrit2 = new MCriteria.Simple(new MAttribute("foo"), MCriteria.SimpleOp.LT, new MValue.MInt(null, "10"));
- MCriteria.Or or = new MCriteria.Or(mcrit1, mcrit2);
-
- Or crit = (Or)or.asEhcacheObject(loader);
- Assert.assertTrue(crit.getCriterion()[0] instanceof GreaterThan);
- Assert.assertTrue(crit.getCriterion()[1] instanceof LessThan);
- }
-
-}
Index: rctags/ehcache-2.10.7.0.43/distribution/src/main/assembly/root/README.html
===================================================================
diff -u -N
--- rctags/ehcache-2.10.7.0.43/distribution/src/main/assembly/root/README.html (revision 11002)
+++ rctags/ehcache-2.10.7.0.43/distribution/src/main/assembly/root/README.html (revision 0)
@@ -1,151 +0,0 @@
-
-
-
-
README Notes For Ehcache ${project.version}
-
- The project home page is http://ehcache.org. Please see http://ehcache.org for a full change log, usage, product versions
- and comprehensive documentation.
-
-
- Introduction
- ============
- Ehcache is a pure Java, in-process cache with the following features:
-
- 1. Fast and Light Weight
- 1.1 Fast
- 1.2 Simple
- 1.3 Small foot print
- 1.4 Minimal dependencies
- 2. Scalable
- 2.1 Provides Memory and Disk stores for scalabilty into gigabytes
- 2.4 Scalable to hundreds of caches
- 2.3 Tuned for high concurrent load on large multi-cpu servers
- 2.4 Multiple CacheManagers per virtual machine
- 3. Flexible
- 3.1 Supports Object or Serializable caching
- 3.2 Support cache-wide or Element-based expiry policies
- 3.3 Provides LRU, LFU and FIFO cache eviction policies
- 3.4 Provides Memory and Disk stores
- 3.5 Distributed
- 3.6 Dynamic, Runtime Configuration of Caches
- 4. Standards Based
- 4.1 Full implementation of JSR107 JCACHE API
- 5. Extensible
- 5.1 Listeners may be plugged in
- 5.2 Peer Discovery, Replicators and Listeners may be plugged in
- 5.3 Cache Extensions may be plugged in
- 5.4 Cache Loaders may be plugged in
- 5.5 Cache Exception Handlers may be plugged in
- 6. Application Persistence
- 6.1 Persistent disk store which stores data between VM restarts
- 6.2 Flush to disk on demand
- 7. Listeners
- 7.1 CacheManager listeners
- 7.2 Cache event listeners
- 8. JMX Enabled
- 9. Distributed Caching
- 10. Support for replication via RMI or JGroups
- 10.1 Peer Discovery
- 10.2 Reliable Delivery
- 10.3 Synchronous Or Asynchronous Replication
- 10.4 Copy Or Invalidate Replication
- 10.5 Transparent Replication
- 10.6 Extensible
- 10.7 Bootstrapping from Peers
- 11. Cache Server
- 11.1 RESTful cache server
- 11.2 SOAP cache server
- 11.3 comes as a WAR or as a complete server
- 12. Java EE and Applied Caching
- 12.1 Blocking Cache to avoid duplicate processing for concurrent operations
- 12.2 SelfPopulating Cache for pull through caching of expensive operations
- 12.3 Java EE Gzipping Servlet Filter
- 12.4 Cacheable Commands
- 12.5 Works with Hibernate
- 12.6 Works with Google App Engine
- 12.7 Transactional support through JTA
- 13. High Quality
- 13.1 High Test Coverage
- 13.2 Automated Load, Limit and Performance System Tests
- 13.3 Specific Concurrency Testing
- 13.4 Production tested
- 13.5 Fully documented
- 13.6 Trusted by Popular Frameworks
- 13.7 Conservative Commit policy
- 13.8 Full public information on the history of every bug
- 13.9 Responsiveness to serious bugs
- 14. Open Source Licensing
- 14.1 Apache 2.0 license
-
- Java Requirements
- =================
-
- Ehcache 1.7.2 and above supports Java 1.5 and 1.6 at runtime. Ehcache final releases are compiled with -target 1.5.
-
- The Ehcache 1.5 branch is being maintained for Java 1.4 users.
-
- Dependencies
- ============
-
- SLF4J API and one concrete logging implementation. The API jar and the JDK14 logging jar are included in the distribution.
-
- Maven POM snippet
- =================
-
- All Ehcache releases are placed in the central Maven repository.
-
- The Maven snippet for Ehcache is:
-
- <dependency>
- <groupid>net.sf.ehcache</groupid>
- <artifactid>ehcache</artifactid>
- <version>${project.version}</version>
- </dependency>
-
- Installation
- ============
- Place the ehcache-core.jar, slf4j-api.jar and slf4j-jdk14.jar, or the concrete SLF4J logging implementation library of your choice into your classpath.
-
- For use with Terracotta, copy the ehcache-terracotta.jar to your classpath.
-
- Create an ehcache.xml configuration from the one supplied in the distribution and place it in the root of your classpath.
-
- The Terracotta server is in the terracotta directory. It includes start and stop scripts.
-
- For Maven based development, there is a tc-maven-plugin which works much like the Jetty plugin. See UsingWithMaven.txt,
- which shows how to add the server to your integration test phase and interactive command use.
-
- For Ant based development, the tc-maven-plugin can be called from Ant. See UsingWithAnt.txt,
- which shows how to add the server to your Ant build, and how to use the server interactively from Ant.
-
-
- Samples
- =======
- See the samples directory for ready-to-run samples which show to use the full features of Ehcache, including use with Terracotta.
-
-
-
- Documentation
- =============
- See http://ehcache.org/documentation for full documentation.
-
- The JavaDoc is in the distribution and also online at http://ehcache.org/apidocs
-
- Licenses
- ========
- This kit contains ehcache code which is governed by the Apache License, version 2.0. The license is in the licenses folder.
-
- Ehcache 1.7.1 and higher uses SLF4J for logging. The SLF4J license is included in the licenses folder.
-
- Known Issues
- ============
-
- 1. There are a number of known issues and workarounds for Tomcat. See the Using Ehcache with Tomcat chapter
- in the online documentation.
-
- 2. See the FAQ online for a current list.
-
-
-
-
-
Index: rctags/ehcache-2.10.7.0.43/terracotta/bootstrap/src/main/java/org/terracotta/modules/ehcache/async/AsyncCoordinatorFactory.java
===================================================================
diff -u -N
--- rctags/ehcache-2.10.7.0.43/terracotta/bootstrap/src/main/java/org/terracotta/modules/ehcache/async/AsyncCoordinatorFactory.java (revision 11002)
+++ rctags/ehcache-2.10.7.0.43/terracotta/bootstrap/src/main/java/org/terracotta/modules/ehcache/async/AsyncCoordinatorFactory.java (revision 0)
@@ -1,12 +0,0 @@
-/*
- * All content copyright Terracotta, Inc., unless otherwise indicated. All rights reserved.
- */
-package org.terracotta.modules.ehcache.async;
-
-import net.sf.ehcache.Ehcache;
-
-public interface AsyncCoordinatorFactory {
- AsyncCoordinator getOrCreateAsyncCoordinator(final Ehcache cache, final AsyncConfig config);
-
- boolean destroy(String cacheManagerName, String cacheName);
-}
Index: rctags/ehcache-2.10.7.0.43/system-tests/src/test/java/org/terracotta/ehcache/tests/servermap/ServerMapL2EvictionReachesOneL1Test.java
===================================================================
diff -u -N
--- rctags/ehcache-2.10.7.0.43/system-tests/src/test/java/org/terracotta/ehcache/tests/servermap/ServerMapL2EvictionReachesOneL1Test.java (revision 11002)
+++ rctags/ehcache-2.10.7.0.43/system-tests/src/test/java/org/terracotta/ehcache/tests/servermap/ServerMapL2EvictionReachesOneL1Test.java (revision 0)
@@ -1,21 +0,0 @@
-package org.terracotta.ehcache.tests.servermap;
-
-import org.terracotta.ehcache.tests.AbstractCacheTestBase;
-
-import com.tc.test.config.model.TestConfig;
-
-public class ServerMapL2EvictionReachesOneL1Test extends AbstractCacheTestBase {
-
- public ServerMapL2EvictionReachesOneL1Test(TestConfig testConfig) {
- super("/servermap/servermap-l2-eviction-reaches-one-l1-test.xml", testConfig,
- ServerMapL2EvictionReachesOneL1TestClient.class, ServerMapL2EvictionReachesOneL1Verifier.class);
- testConfig.setDgcEnabled(true);
- testConfig.setDgcIntervalInSec(60);
- testConfig.addTcProperty("ehcache.evictor.logging.enabled", "true");
-
- testConfig.getClientConfig().addExtraClientJvmArg("-Dcom.tc.l1.cachemanager.enabled=false");
- testConfig.getClientConfig().addExtraClientJvmArg("-Dcom.tc.ehcache.evictor.logging.enabled=true");
- testConfig.getClientConfig().addExtraClientJvmArg("-Dcom.tc.l1.lockmanager.timeout.interval=60000");
- }
-
-}
Index: rctags/ehcache-2.10.7.0.43/system-tests/src/test/java/org/terracotta/ehcache/tests/container/hibernate/domain/HolidayCalendar.java
===================================================================
diff -u -N
--- rctags/ehcache-2.10.7.0.43/system-tests/src/test/java/org/terracotta/ehcache/tests/container/hibernate/domain/HolidayCalendar.java (revision 11002)
+++ rctags/ehcache-2.10.7.0.43/system-tests/src/test/java/org/terracotta/ehcache/tests/container/hibernate/domain/HolidayCalendar.java (revision 0)
@@ -1,59 +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.container.hibernate.domain;
-
-import java.text.DateFormat;
-import java.text.ParseException;
-import java.text.SimpleDateFormat;
-import java.util.Date;
-import java.util.HashMap;
-import java.util.Map;
-
-public class HolidayCalendar {
- private Long id;
- private Map holidays = new HashMap(); // Date -> String
-
- public HolidayCalendar init() {
- DateFormat df = new SimpleDateFormat("yyyy.MM.dd");
- try {
- holidays.clear();
- holidays.put(df.parse("2009.01.01"), "New Year's Day");
- holidays.put(df.parse("2009.02.14"), "Valentine's Day");
- holidays.put(df.parse("2009.11.11"), "Armistice Day");
- } catch (ParseException e) {
- System.out.println("Error parsing date string");
- throw new RuntimeException(e);
- }
- return this;
- }
-
- public Map getHolidays() {
- return holidays;
- }
-
- protected void setHolidays(Map holidays) {
- this.holidays = holidays;
- }
-
- public void addHoliday(Date d, String name) {
- holidays.put(d, name);
- }
-
- public String getHoliday(Date d) {
- return (String)holidays.get(d);
- }
-
- public boolean isHoliday(Date d) {
- return holidays.containsKey(d);
- }
-
- protected Long getId() {
- return id;
- }
-
- protected void setId(Long id) {
- this.id = id;
- }
-}
-
Index: rctags/ehcache-2.10.7.0.43/terracotta/bootstrap/src/main/java/org/terracotta/modules/ehcache/wan/Watchable.java
===================================================================
diff -u -N
--- rctags/ehcache-2.10.7.0.43/terracotta/bootstrap/src/main/java/org/terracotta/modules/ehcache/wan/Watchable.java (revision 11002)
+++ rctags/ehcache-2.10.7.0.43/terracotta/bootstrap/src/main/java/org/terracotta/modules/ehcache/wan/Watchable.java (revision 0)
@@ -1,32 +0,0 @@
-/*
- * All content copyright Terracotta, Inc., unless otherwise indicated. All rights reserved.
- */
-
-package org.terracotta.modules.ehcache.wan;
-
-/**
- * @author Eugene Shelestovich
- */
-public interface Watchable {
-
- /**
- *
- */
- void goLive();
-
- void die();
-
- /**
- * Checks whether or not a given Watchable is alive.
- *
- * @return {@code true} if a given Watchable is alive, {@code false} otherwise
- */
- boolean probeLiveness();
-
- /**
- * Returns a name which uniquely identifies the Watchable.
- *
- * @return unique name
- */
- String name();
-}
Index: rctags/ehcache-2.10.7.0.43/system-tests/src/test/java/org/terracotta/ehcache/tests/servermap/ServerMapTTLExpressTest.java
===================================================================
diff -u -N
--- rctags/ehcache-2.10.7.0.43/system-tests/src/test/java/org/terracotta/ehcache/tests/servermap/ServerMapTTLExpressTest.java (revision 11002)
+++ rctags/ehcache-2.10.7.0.43/system-tests/src/test/java/org/terracotta/ehcache/tests/servermap/ServerMapTTLExpressTest.java (revision 0)
@@ -1,33 +0,0 @@
-/*
- * All content copyright Terracotta, Inc., unless otherwise indicated. All rights reserved.
- */
-package org.terracotta.ehcache.tests.servermap;
-
-import org.terracotta.ehcache.tests.AbstractCacheTestBase;
-
-import com.tc.test.config.model.TestConfig;
-
-import java.util.Iterator;
-
-public class ServerMapTTLExpressTest extends AbstractCacheTestBase {
-
- public ServerMapTTLExpressTest(TestConfig testConfig) {
- super("/servermap/basic-servermap-cache-test.xml", testConfig, ServerMapTTLExpressTestClient.class);
- testConfig.setDgcEnabled(true);
- testConfig.setDgcIntervalInSec(60);
- testConfig.addTcProperty("ehcache.evictor.logging.enabled", "true");
-
- // L1 properties
- final Iterator iter = testConfig.getClientConfig().getExtraClientJvmArgs().iterator();
- while (iter.hasNext()) {
- final String prop = iter.next();
- if (prop.contains("ehcache.storageStrategy.dcv2.localcache.enabled")) {
- // remove it and always disable localcache for this test
- iter.remove();
- }
- }
- // always disable local cache
- testConfig.getClientConfig().addExtraClientJvmArg("-Dcom.tc.ehcache.storageStrategy.dcv2.localcache.enabled=false");
- }
-
-}
Index: rctags/ehcache-2.10.7.0.43/system-tests/src/test/java/org/terracotta/modules/ehcache/l1bm/L1BMOnHeapReadWriteTest.java
===================================================================
diff -u -N
--- rctags/ehcache-2.10.7.0.43/system-tests/src/test/java/org/terracotta/modules/ehcache/l1bm/L1BMOnHeapReadWriteTest.java (revision 11002)
+++ rctags/ehcache-2.10.7.0.43/system-tests/src/test/java/org/terracotta/modules/ehcache/l1bm/L1BMOnHeapReadWriteTest.java (revision 0)
@@ -1,149 +0,0 @@
-/*
- * All content copyright Terracotta, Inc., unless otherwise indicated. All rights reserved.
- */
-package org.terracotta.modules.ehcache.l1bm;
-
-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 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.util.Random;
-import java.util.concurrent.BrokenBarrierException;
-
-import junit.framework.Assert;
-
-public class L1BMOnHeapReadWriteTest extends AbstractCacheTestBase {
- private static final int NODE_COUNT = 2;
- private static final int NUM_OF_ELEMENTS = 1000;
- private static final int NUM_OF_THREADS = 10;
- private static final int WRITE_PERCENTAGE = 5;
-
- public L1BMOnHeapReadWriteTest(TestConfig testConfig) {
- super(testConfig, L1BMOnHeapReadWriteTestApp.class, L1BMOnHeapReadWriteTestApp.class);
- }
-
- public static class L1BMOnHeapReadWriteTestApp extends ClientBase {
- private final ToolkitBarrier barrier;
-
- public L1BMOnHeapReadWriteTestApp(String[] args) {
- super(args);
- this.barrier = getClusteringToolkit().getBarrier("test-barrier", NODE_COUNT);
- }
-
- public static void main(String[] args) {
- new L1BMOnHeapReadWriteTestApp(args).run();
- }
-
- @Override
- protected void runTest(Cache cache, Toolkit clusteringToolkit) throws Throwable {
- boolean shouldWait = true;
- Cache eventualWithStatsCache = createCache("eventualWithStatsCache", cacheManager, "EVENTUAL", true);
- testL1BigMemorySanity(eventualWithStatsCache, shouldWait);
- eventualWithStatsCache.removeAll();
-
- Cache eventualWithoutStatsCache = createCache("eventualWithoutStatsCache", cacheManager, "EVENTUAL", false);
- testL1BigMemorySanity(eventualWithoutStatsCache, shouldWait);
- eventualWithoutStatsCache.removeAll();
-
- shouldWait = false;
- Cache strongWithStatsCache = createCache("strongWithStatsCache", cacheManager, "STRONG", true);
- testL1BigMemorySanity(strongWithStatsCache, shouldWait);
- strongWithStatsCache.removeAll();
-
- shouldWait = false;
- Cache strongWithoutStatsCache = createCache("strongWithoutStatsCache", cacheManager, "STRONG", false);
- testL1BigMemorySanity(strongWithoutStatsCache, shouldWait);
- strongWithoutStatsCache.removeAll();
- }
-
- private void testL1BigMemorySanity(Cache cache, boolean shouldWait) throws InterruptedException,
- BrokenBarrierException {
- int index = barrier.await();
- if (index == 0) {
- System.out.println("XXXXXX putting " + NUM_OF_ELEMENTS + " in the cache");
- for (int i = 0; i < NUM_OF_ELEMENTS; i++) {
- cache.put(new Element("key" + i, "val" + i));
- }
- System.out.println("XXXXX done with putting " + cache.getSize() + " entries");
- }
- barrier.await();
- if (shouldWait) {
- while (cache.getSize() != NUM_OF_ELEMENTS) {
- Thread.sleep(1000);
- }
- }
- Assert.assertEquals(NUM_OF_ELEMENTS, cache.getSize());
- System.out.println("XXXXXX client " + index + " cache size: " + cache.getSize() + " local: "
- + cache.getStatistics().getLocalHeapSize());
- if (index == 0) {
- Assert.assertTrue(cache.getStatistics().getLocalHeapSize() > 0);
- } else {
- Assert.assertEquals(0, cache.getStatistics().getLocalHeapSize());
- }
-
- System.out.println("XXXXX starting test threads....");
- Thread ths[] = new Thread[NUM_OF_THREADS];
- for (int i = 0; i < NUM_OF_THREADS; i++) {
- ths[i] = new Thread(new TestThread(cache, i, index), "testThread" + i);
- ths[i].start();
- }
-
- for (Thread th : ths) {
- th.join();
- }
- barrier.await();
- System.out.println("XXXXXX done with " + cache.getName());
- }
-
- private Cache createCache(String cacheName, CacheManager cm, String consistency, boolean isWithStats) {
- CacheConfiguration cacheConfiguration = new CacheConfiguration();
- cacheConfiguration.setName(cacheName);
- cacheConfiguration.setMaxBytesLocalHeap(10485760L);
-
- TerracottaConfiguration tcConfiguration = new TerracottaConfiguration();
- tcConfiguration.setConsistency(consistency);
- cacheConfiguration.addTerracotta(tcConfiguration);
-
- Cache cache = new Cache(cacheConfiguration);
- cm.addCache(cache);
- return cache;
- }
-
- private static class TestThread implements Runnable {
- private final long TIME_TO_RUN = 1 * 60 * 1000;
- private final Cache cache;
- private final int threadIndex;
- private final int clientIndex;
-
- public TestThread(Cache cache, int threadIndex, int clientIndex) {
- this.cache = cache;
- this.threadIndex = threadIndex;
- this.clientIndex = clientIndex;
- }
-
- @Override
- public void run() {
- System.out.println("XXXXX client[" + clientIndex + "] started thread " + threadIndex);
- long start = System.currentTimeMillis();
- Random rand = new Random(start);
- while (System.currentTimeMillis() - start < TIME_TO_RUN) {
- if (rand.nextInt(100) < WRITE_PERCENTAGE) {
- this.cache.put(new Element("key" + rand.nextInt(NUM_OF_ELEMENTS), "val" + rand.nextInt(NUM_OF_ELEMENTS)));
- } else {
- String key = "key" + rand.nextInt(NUM_OF_ELEMENTS);
- Assert.assertNotNull("value for " + key + " is null", this.cache.get(key));
- }
- }
- }
- }
- }
-}
Index: rctags/ehcache-2.10.7.0.43/distribution/events/src/assemble/bin/stop-db.bat
===================================================================
diff -u -N
--- rctags/ehcache-2.10.7.0.43/distribution/events/src/assemble/bin/stop-db.bat (revision 11002)
+++ rctags/ehcache-2.10.7.0.43/distribution/events/src/assemble/bin/stop-db.bat (revision 0)
@@ -1,19 +0,0 @@
-@echo off
-
-if not defined JAVA_HOME (
- echo JAVA_HOME is not defined
- exit /b 1
-)
-
-setlocal
-
-set JAVA_HOME="%JAVA_HOME:"=%"
-set root=%~d0%~p0..
-set root="%root:"=%"
-
-cd %root%
-set h2_jar=%root%\src\main\webapp\WEB-INF\lib\h2-1.1.116.jar
-
-call %JAVA_HOME%\bin\java -cp %h2_jar% org.h2.tools.Server -tcpShutdown tcp://localhost:9092
-
-endlocal
Index: rctags/ehcache-2.10.7.0.43/terracotta/bootstrap/src/main/java/org/terracotta/modules/ehcache/store/ToolkitNonStopExceptionOnTimeoutConfiguration.java
===================================================================
diff -u -N
--- rctags/ehcache-2.10.7.0.43/terracotta/bootstrap/src/main/java/org/terracotta/modules/ehcache/store/ToolkitNonStopExceptionOnTimeoutConfiguration.java (revision 11002)
+++ rctags/ehcache-2.10.7.0.43/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.43/ehcache-search-parser/.classpath
===================================================================
diff -u -N
--- rctags/ehcache-2.10.7.0.43/ehcache-search-parser/.classpath (revision 11002)
+++ rctags/ehcache-2.10.7.0.43/ehcache-search-parser/.classpath (revision 0)
@@ -1,37 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
Index: rctags/ehcache-2.10.7.0.43/system-tests/src/test/java/org/terracotta/ehcache/tests/servermap/ServerMapElementTTIExpressTestClient.java
===================================================================
diff -u -N
--- rctags/ehcache-2.10.7.0.43/system-tests/src/test/java/org/terracotta/ehcache/tests/servermap/ServerMapElementTTIExpressTestClient.java (revision 11002)
+++ rctags/ehcache-2.10.7.0.43/system-tests/src/test/java/org/terracotta/ehcache/tests/servermap/ServerMapElementTTIExpressTestClient.java (revision 0)
@@ -1,90 +0,0 @@
-/*
- * All content copyright Terracotta, Inc., unless otherwise indicated. All rights reserved.
- */
-package org.terracotta.ehcache.tests.servermap;
-
-import net.sf.ehcache.Cache;
-import net.sf.ehcache.Element;
-
-import org.terracotta.toolkit.Toolkit;
-
-import java.util.Date;
-
-import junit.framework.Assert;
-
-public class ServerMapElementTTIExpressTestClient extends ServerMapClientBase {
-
- public ServerMapElementTTIExpressTestClient(String[] args) {
- super("testWithElementEvictionTTI", args);
- }
-
- public static void main(String[] args) {
- new ServerMapElementTTIExpressTestClient(args).run();
- }
-
- @Override
- protected void runTest(Cache cache, Toolkit clusteringToolkit) throws Throwable {
- int size = cache.getSize();
- assertEquals(0, size);
- System.out.println("Client populating cache.");
-
- for (int i = 0; i < 1500; i++) {
- cache.put(new Element("key-" + i, "value-" + i));
- }
-
- for (int i = 1500; i < 2000; i++) {
- Element element = new Element("key-" + i, "value-" + i);
- element.setTimeToIdle(60 * 4); // setting TTI of 1500-2000 keys as 4 min
- cache.put(element);
- }
-
- System.out.println("Cache populate. Size: " + cache.getSize());
-
- Date date = new Date();
- System.out.println("Sleeping for 2 mins (now=" + date + ", " + date.getTime() + ") ... ");
- // Sleep for TTI to kick in:
- Thread.sleep(2 * 60 * 1000);
-
- date = new Date();
- System.out.println("After sleeping 2 mins. Size: " + cache.getSize() + " (now=" + date + ", " + date.getTime()
- + ")");
-
- for (int i = 0; i < 1500; i++) {
- Element element = cache.get("key-" + i);
- Assert.assertNull("Element should be null of key-" + i + " actual: " + element, element);
- }
-
- date = new Date();
- System.out.println("Touching elements from 1500-2000 (now=" + date + ", " + date.getTime() + ")");
- for (int i = 1500; i < 2000; i++) {
- Element element = cache.get("key-" + i);
- Assert.assertTrue(element.getValue().equals("value-" + i));
- }
-
- for (int i = 2000; i < 2500; i++) {
- Element element = new Element("key-" + i, "value-" + i);
- element.setTimeToIdle(15 * 60); // setting TTI of 2000-2500 keys as 15 min
- cache.put(element);
- }
-
- date = new Date();
- System.out.println("Sleeping for 5 mins (now=" + date + ", " + date.getTime() + ") ... ");
- // Sleep for TTI to kick in:
- Thread.sleep(5 * 60 * 1000);
-
- date = new Date();
- System.out.println("After sleeping 5 mins. Size: " + cache.getSize() + " (now=" + date + ", " + date.getTime()
- + ")");
-
- for (int i = 1500; i < 2000; i++) {
- Element element = cache.get("key-" + i);
- Assert.assertNull("Element should be null of key-" + i + " actual: " + element, element);
- }
-
- for (int i = 2000; i < 2500; i++) {
- Element element = cache.get("key-" + i);
- Assert.assertTrue(element.getValue().equals("value-" + i));
- }
- }
-
-}
Index: rctags/ehcache-2.10.7.0.43/ehcache-core/src/main/java/net/sf/ehcache/search/expression/ILike.java
===================================================================
diff -u -N
--- rctags/ehcache-2.10.7.0.43/ehcache-core/src/main/java/net/sf/ehcache/search/expression/ILike.java (revision 11002)
+++ rctags/ehcache-2.10.7.0.43/ehcache-core/src/main/java/net/sf/ehcache/search/expression/ILike.java (revision 0)
@@ -1,163 +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.expression;
-
-import java.util.Collections;
-import java.util.Map;
-import java.util.Set;
-import java.util.regex.Pattern;
-
-import net.sf.ehcache.Element;
-import net.sf.ehcache.search.Attribute;
-import net.sf.ehcache.search.SearchException;
-import net.sf.ehcache.search.attribute.AttributeExtractor;
-
-/**
- * A regular expression criteria that matches attribute string values. For non java.lang.String attributes,
- * the toString() form is used in the comparison.
- *
- * Expressions are always case insensitive
- *
- * The following special characters are supported:
- *
- *
'?' - match any one single character
- *
'*' - match any multiple character(s) (including zero)
- *
- * The supported wildcard characters can be escaped with a backslash '\', and a literal backslash can be included with '\\'
- *
- * WARN: Expressions starting with a leading wildcard character are potentially very expensive (ie. full scan) for indexed caches
- *
- *
- * @author teck
- */
-public class ILike extends BaseCriteria {
-
- private final String attributeName;
- private final String regex;
- private final Pattern pattern;
-
- /**
- * Construct a "like" criteria for the given expression
- *
- * @param attributeName attribute name
- * @param regex expression
- */
- public ILike(String attributeName, String regex) {
- if ((attributeName == null) || (regex == null)) {
- throw new SearchException("Both the attribute name and regex must be non null.");
- }
-
- this.attributeName = attributeName;
- this.regex = regex;
- this.pattern = convertRegex(regex.trim());
- }
-
- /**
- * Return attribute name.
- *
- * @return String attribute name
- */
- public String getAttributeName() {
- return attributeName;
- }
-
- /**
- * Return regex string.
- *
- * @return String regex.
- */
- public String getRegex() {
- return regex;
- }
-
- private static Pattern convertRegex(final String expr) {
- if (expr.length() == 0) {
- throw new SearchException("Zero length regex");
- }
-
- StringBuilder javaRegex = new StringBuilder("^");
-
- boolean escape = false;
- for (int i = 0; i < expr.length(); i++) {
- char ch = expr.charAt(i);
-
- if (escape) {
- switch (ch) {
- case '\\':
- case '?':
- case '*': {
- javaRegex.append(Pattern.quote(lowerCase(ch)));
- break;
- }
-
- default: {
- throw new SearchException("Illegal escape character (" + ch + ") in regex: " + expr);
- }
- }
-
- escape = false;
- } else {
- switch (ch) {
- case '\\': {
- escape = true;
- break;
- }
- case '?': {
- javaRegex.append(".");
- break;
- }
- case '*': {
- javaRegex.append(".*");
- break;
- }
- default: {
- javaRegex.append(Pattern.quote(lowerCase(ch)));
- }
- }
- }
- }
-
- javaRegex.append("$");
-
- return Pattern.compile(javaRegex.toString(), Pattern.DOTALL);
- }
-
- private static String lowerCase(char ch) {
- // heeding the advice in Character.toLowerCase() and using String.toLowerCase() instead here
- return Character.toString(ch).toLowerCase();
- }
-
- /**
- * {@inheritDoc}
- */
- public boolean execute(Element e, Map attributeExtractors) {
- Object value = getExtractor(attributeName, attributeExtractors).attributeFor(e, attributeName);
- if (value == null) {
- return false;
- }
-
- String asString = value.toString().toLowerCase();
-
- return pattern.matcher(asString).matches();
- }
-
- @Override
- public Set> getAttributes() {
- return Collections.>singleton(new Attribute(attributeName));
- }
-
-}
Index: rctags/ehcache-2.10.7.0.43/management-ehcache-impl/management-ehcache-impl-v2/src/main/java/net/sf/ehcache/management/service/impl/CacheStatisticSampleEntityBuilderV2.java
===================================================================
diff -u -N
--- rctags/ehcache-2.10.7.0.43/management-ehcache-impl/management-ehcache-impl-v2/src/main/java/net/sf/ehcache/management/service/impl/CacheStatisticSampleEntityBuilderV2.java (revision 11002)
+++ rctags/ehcache-2.10.7.0.43/management-ehcache-impl/management-ehcache-impl-v2/src/main/java/net/sf/ehcache/management/service/impl/CacheStatisticSampleEntityBuilderV2.java (revision 0)
@@ -1,162 +0,0 @@
-/*
- * All content copyright (c) 2003-2012 Terracotta, Inc., except as may otherwise be noted in a separate copyright
- * notice. All rights reserved.
- */
-package net.sf.ehcache.management.service.impl;
-
-import java.lang.reflect.InvocationTargetException;
-import java.lang.reflect.Method;
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.Collections;
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.Map;
-import java.util.Set;
-import java.util.TreeMap;
-
-import net.sf.ehcache.management.resource.CacheStatisticSampleEntityV2;
-import net.sf.ehcache.management.sampled.CacheSampler;
-import net.sf.ehcache.management.service.AccessorPrefix;
-import net.sf.ehcache.util.counter.sampled.SampledCounter;
-import net.sf.ehcache.util.counter.sampled.TimeStampedCounterValue;
-
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.terracotta.management.resource.AgentEntityV2;
-
-/**
- * A builder for {@link CacheStatisticSampleEntityV2} resource objects.
- *
- * @author brandony
- */
-final class CacheStatisticSampleEntityBuilderV2 {
- private static final Logger LOG = LoggerFactory.getLogger(CacheStatisticSampleEntityBuilderV2.class);
-
- private static final String SAMPLE_SUFFIX = "Sample";
-
- private final Set sampleNames;
-
- private final Map> samplersByCMName = new HashMap>();
-
- static CacheStatisticSampleEntityBuilderV2 createWith(Set statisticSampleName) {
- return new CacheStatisticSampleEntityBuilderV2(statisticSampleName);
- }
-
- private CacheStatisticSampleEntityBuilderV2(Set sampleNames) {
- this.sampleNames = sampleNames;
- }
-
- CacheStatisticSampleEntityBuilderV2 add(CacheSampler sampler,
- String cacheManagerName) {
- addSampler(sampler, cacheManagerName);
- return this;
- }
-
- Collection build() {
- Collection csses = new ArrayList();
-
- for (Map.Entry> entry : samplersByCMName.entrySet()) {
- for (CacheSampler sampler : entry.getValue()) {
- if (sampleNames == null) {
- for (Method m : CacheSampler.class.getMethods()) {
- if (AccessorPrefix.isAccessor(m.getName()) && SampledCounter.class.isAssignableFrom(m.getReturnType())) {
- CacheStatisticSampleEntityV2 csse = makeStatResource(m, sampler, entry.getKey());
- if (csse != null) {
- csses.add(csse);
- }
- }
- }
- } else {
- for (String sampleName : sampleNames) {
- Method sampleMethod;
- try {
- sampleMethod = CacheSampler.class.getMethod(AccessorPrefix.get + sampleName + SAMPLE_SUFFIX);
- } catch (NoSuchMethodException e) {
- LOG.warn("A statistic sample with the name '{}' does not exist.", sampleName);
- continue;
- }
-
- if (SampledCounter.class.isAssignableFrom(sampleMethod.getReturnType())) {
- CacheStatisticSampleEntityV2 csse = makeStatResource(sampleMethod, sampler, entry.getKey());
- if (csse != null) {
- csses.add(csse);
- }
- }
- }
- }
- }
- }
-
- return csses;
- }
-
- private CacheStatisticSampleEntityV2 makeStatResource(Method sampleMethod,
- CacheSampler sampler,
- String cmName) {
- SampledCounter sCntr;
- try {
- sCntr = SampledCounter.class.cast(sampleMethod.invoke(sampler));
- } catch (IllegalAccessException e) {
- LOG.warn("Failed to invoke method '{}' while constructing entity due to access restriction.",
- sampleMethod.getName());
- sCntr = null;
- } catch (InvocationTargetException e) {
- LOG.warn(String.format("Failed to invoke method %s while constructing entity.", sampleMethod.getName()), e);
- sCntr = null;
- }
-
- if (sCntr != null) {
- CacheStatisticSampleEntityV2 csse = new CacheStatisticSampleEntityV2();
- csse.setCacheManagerName(cmName);
- csse.setName(sampler.getCacheName());
- csse.setAgentId(AgentEntityV2.EMBEDDED_AGENT_ID);
- // csse.setVersion(this.getClass().getPackage().getImplementationVersion());
- csse.setStatName(AccessorPrefix.trimPrefix(sampleMethod.getName()).replace(SAMPLE_SUFFIX, ""));
-
- TimeStampedCounterValue[] tscvs;
- if (getExcludedMethodNames(sampler).contains(sampleMethod.getName())) {
- tscvs = new TimeStampedCounterValue[0];
- } else {
- tscvs = sCntr.getAllSampleValues();
- }
-
- Map statValueByTime = new TreeMap();
- csse.setStatValueByTimeMillis(statValueByTime);
-
- for (TimeStampedCounterValue tscv : tscvs) {
- statValueByTime.put(tscv.getTimestamp(), tscv.getCounterValue());
- }
- return csse;
- }
-
- return null;
- }
-
- private Set getExcludedMethodNames(CacheSampler sampler) {
- if (sampler.isLocalHeapCountBased()) {
- return Collections.singleton("getLocalHeapSizeInBytesSample");
- }
- return Collections.emptySet();
- }
-
- private void addSampler(CacheSampler sampler,
- String cacheManagerName) {
- if (sampler == null) {
- throw new IllegalArgumentException("sampler == null");
- }
-
- if (cacheManagerName == null) {
- throw new IllegalArgumentException("cacheManagerName == null");
- }
-
- Set samplers = samplersByCMName.get(cacheManagerName);
-
- if (samplers == null) {
- samplers = new HashSet();
- samplersByCMName.put(cacheManagerName, samplers);
- }
-
- samplers.add(sampler);
- }
-}
Index: rctags/ehcache-2.10.7.0.43/management-ehcache-impl/management-ehcache-impl-v1/src/main/java/net/sf/ehcache/management/service/impl/CacheConfigurationEntityBuilder.java
===================================================================
diff -u -N
--- rctags/ehcache-2.10.7.0.43/management-ehcache-impl/management-ehcache-impl-v1/src/main/java/net/sf/ehcache/management/service/impl/CacheConfigurationEntityBuilder.java (revision 11002)
+++ rctags/ehcache-2.10.7.0.43/management-ehcache-impl/management-ehcache-impl-v1/src/main/java/net/sf/ehcache/management/service/impl/CacheConfigurationEntityBuilder.java (revision 0)
@@ -1,73 +0,0 @@
-/*
- * All content copyright (c) 2003-2012 Terracotta, Inc., except as may otherwise be noted in a separate copyright
- * notice. All rights reserved.
- */
-package net.sf.ehcache.management.service.impl;
-
-import net.sf.ehcache.management.resource.CacheConfigEntity;
-import net.sf.ehcache.management.sampled.CacheManagerSampler;
-import org.terracotta.management.resource.AgentEntity;
-
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Collection;
-import java.util.HashMap;
-import java.util.Map;
-
-/**
- * @author brandony
- */
-final class CacheConfigurationEntityBuilder {
-
- private final Map samplersByCName = new HashMap();
-
- static CacheConfigurationEntityBuilder createWith(CacheManagerSampler sampler,
- String cacheName) {
- return new CacheConfigurationEntityBuilder(sampler, cacheName);
- }
-
- private CacheConfigurationEntityBuilder(CacheManagerSampler sampler,
- String cacheName) {
- addSampler(sampler, cacheName);
- }
-
- CacheConfigurationEntityBuilder add(CacheManagerSampler sampler,
- String cacheName) {
- addSampler(sampler, cacheName);
- return this;
- }
-
- Collection build() {
- Collection cces = new ArrayList();
-
- for (Map.Entry entry : samplersByCName.entrySet()) {
- CacheConfigEntity cce = new CacheConfigEntity();
-
- String cacheName = entry.getKey();
- cce.setCacheName(cacheName);
- cce.setAgentId(AgentEntity.EMBEDDED_AGENT_ID);
- cce.setVersion(this.getClass().getPackage().getImplementationVersion());
-
- CacheManagerSampler sampler = entry.getValue();
- cce.setCacheManagerName(sampler.getName());
- cce.setXml(sampler.generateActiveConfigDeclaration(cacheName));
-
- cces.add(cce);
- }
-
- return cces;
- }
-
- private void addSampler(CacheManagerSampler sampler,
- String cacheName) {
- if (sampler == null) throw new IllegalArgumentException("sampler == null");
-
- if (cacheName == null) throw new IllegalArgumentException("cacheName == null");
-
- if(!Arrays.asList(sampler.getCacheNames()).contains(cacheName)) {
- throw new IllegalArgumentException(String.format("Invalid cache name: %s.", cacheName));
- }
-
- samplersByCName.put(cacheName, sampler);
- }
-}
Index: rctags/ehcache-2.10.7.0.43/system-tests/src/test/resources/net/sf/ehcache/osgi/Event.hbm.xml
===================================================================
diff -u -N
--- rctags/ehcache-2.10.7.0.43/system-tests/src/test/resources/net/sf/ehcache/osgi/Event.hbm.xml (revision 11002)
+++ rctags/ehcache-2.10.7.0.43/system-tests/src/test/resources/net/sf/ehcache/osgi/Event.hbm.xml (revision 0)
@@ -1,26 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
Index: rctags/ehcache-2.10.7.0.43/ehcache-search-parser/src/main/java/net/sf/ehcache/search/parser/MOrderBy.java
===================================================================
diff -u -N
--- rctags/ehcache-2.10.7.0.43/ehcache-search-parser/src/main/java/net/sf/ehcache/search/parser/MOrderBy.java (revision 11002)
+++ rctags/ehcache-2.10.7.0.43/ehcache-search-parser/src/main/java/net/sf/ehcache/search/parser/MOrderBy.java (revision 0)
@@ -1,89 +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;
-
-public class MOrderBy {
-
- /**
- * The attr.
- */
- private final MAttribute attr;
-
- /**
- * The asc.
- */
- private final boolean asc;
-
- /**
- * Instantiates a new model order by.
- *
- * @param attr the attr
- * @param asc the asc
- */
- public MOrderBy(MAttribute attr, boolean asc) {
- this.attr = attr;
- this.asc = asc;
- }
-
- /**
- * Gets the attribute.
- *
- * @return the attribute
- */
- public MAttribute getAttribute() {
- return attr;
- }
-
- /**
- * Checks if is order ascending.
- *
- * @return true, if is order ascending
- */
- public boolean isOrderAscending() {
- return asc;
- }
-
- /* (non-Javadoc)
- * @see java.lang.Object#toString()
- */
- @Override
- public String toString() {
- return "order by " + attr + (asc ? " ascending" : " descending");
- }
-
- @Override
- public int hashCode() {
- final int prime = 31;
- int result = 1;
- result = prime * result + (asc ? 1231 : 1237);
- result = prime * result + ((attr == null) ? 0 : attr.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;
- MOrderBy other = (MOrderBy)obj;
- if (asc != other.asc) return false;
- if (attr == null) {
- if (other.attr != null) return false;
- } else if (!attr.equals(other.attr)) return false;
- return true;
- }
-
-}
Index: rctags/ehcache-2.10.7.0.43/ehcache-core/src/main/java/net/sf/ehcache/cluster/CacheCluster.java
===================================================================
diff -u -N
--- rctags/ehcache-2.10.7.0.43/ehcache-core/src/main/java/net/sf/ehcache/cluster/CacheCluster.java (revision 11002)
+++ rctags/ehcache-2.10.7.0.43/ehcache-core/src/main/java/net/sf/ehcache/cluster/CacheCluster.java (revision 0)
@@ -1,93 +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.cluster;
-
-import java.util.Collection;
-import java.util.List;
-
-/**
- * Allows you to explore the Terracotta cluster nodes and register for events about the cluster.
- *
- * @author Geert Bevin, Abhishek Sanoujam
- * @since 2.0
- */
-public interface CacheCluster {
-
- /**
- * Get scheme name for this cluster info.
- *
- * @return a scheme name for the cluster information.
- * Currently TERRACOTTA is the only scheme supported.
- */
- ClusterScheme getScheme();
-
- /**
- * Retrieves the {@code ClusterNode} instance that corresponds to the current node.
- *
- * @return the {@code ClusterNode} instance that corresponds to the current node
- */
- ClusterNode getCurrentNode();
-
- /**
- * Waits until the current node has successfully joined the cluster.
- *
- * @return the {@code ClusterNode} instance that corresponds to the current node
- */
- ClusterNode waitUntilNodeJoinsCluster();
-
- /**
- * Get all the nodes in the cluster
- *
- * @return information on all the nodes in the cluster, including ID, hostname, and IP address.
- */
- Collection getNodes();
-
- /**
- * Find out if the current node is connected to the cluster or not
- *
- * @return true if cluster is online otherwise false
- */
- boolean isClusterOnline();
-
- /**
- * Add a listener for cluster events
- *
- * @param listener Listener
- * @return True if already listening
- */
- boolean addTopologyListener(ClusterTopologyListener listener);
-
- /**
- * Remove a listener for cluster events
- *
- * @param listener Listener
- * @return True if not listening
- */
- boolean removeTopologyListener(ClusterTopologyListener listener);
-
- /**
- * Removes all listeners for cluster events
- */
- void removeAllListeners();
-
- /**
- * Get all the topology listeners
- *
- * @return a list of all the topology listeners
- */
- List getTopologyListeners();
-}
Index: rctags/ehcache-2.10.7.0.43/ehcache-core/src/main/java/net/sf/ehcache/config/generator/model/elements/TerracottaConfigConfigurationElement.java
===================================================================
diff -u -N
--- rctags/ehcache-2.10.7.0.43/ehcache-core/src/main/java/net/sf/ehcache/config/generator/model/elements/TerracottaConfigConfigurationElement.java (revision 11002)
+++ rctags/ehcache-2.10.7.0.43/ehcache-core/src/main/java/net/sf/ehcache/config/generator/model/elements/TerracottaConfigConfigurationElement.java (revision 0)
@@ -1,84 +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.TerracottaClientConfiguration;
-import net.sf.ehcache.config.generator.model.NodeElement;
-import net.sf.ehcache.config.generator.model.SimpleNodeAttribute;
-import net.sf.ehcache.config.generator.model.SimpleNodeElement;
-
-/**
- * {@link NodeElement} representing the {@link TerracottaClientConfiguration}
- *
- * @author Abhishek Sanoujam
- *
- */
-public class TerracottaConfigConfigurationElement extends SimpleNodeElement {
-
- private final TerracottaClientConfiguration tcConfigConfiguration;
-
- /**
- * Constructor accepting the parent and the {@link TerracottaClientConfiguration}
- *
- * @param parent
- * @param tcConfigConfiguration
- */
- public TerracottaConfigConfigurationElement(NodeElement parent, TerracottaClientConfiguration tcConfigConfiguration) {
- super(parent, "terracottaConfig");
- this.tcConfigConfiguration = tcConfigConfiguration;
- init();
- }
-
- private void init() {
- if (tcConfigConfiguration == null) {
- return;
- }
- if (tcConfigConfiguration.getUrl() != null) {
- addAttribute(new SimpleNodeAttribute("url", tcConfigConfiguration.getUrl()).optional(true));
- }
- addAttribute(new SimpleNodeAttribute("rejoin", tcConfigConfiguration.isRejoin()).optional(true).defaultValue(
- TerracottaClientConfiguration.DEFAULT_REJOIN_VALUE));
-
- addAttribute(new SimpleNodeAttribute("wanEnabledTSA", tcConfigConfiguration.isWanEnabledTSA()).optional(true).defaultValue(
- TerracottaClientConfiguration.DEFAULT_WAN_ENABLED_TSA_VALUE));
-
- if (tcConfigConfiguration.getOriginalEmbeddedConfig() != null) {
- addChildElement(new TCConfigElement(this, tcConfigConfiguration.getOriginalEmbeddedConfig()));
- }
- }
-
- /**
- * Element representing the "tc-config" element inside "terracottaConfig"
- *
- * @author Abhishek Sanoujam
- *
- */
- private static class TCConfigElement extends SimpleNodeElement {
-
- /**
- * Constructor accepting the {@link TerracottaConfigConfigurationElement} parent and the inner string content
- *
- * @param parent
- * @param content
- */
- public TCConfigElement(TerracottaConfigConfigurationElement parent, String content) {
- super(parent, "tc-config");
- this.setInnerContent(content);
- }
-
- }
-}
Index: rctags/ehcache-2.10.7.0.43/ehcache-core/src/test/java/net/sf/ehcache/store/PoolableMemoryStoreTest.java
===================================================================
diff -u -N
--- rctags/ehcache-2.10.7.0.43/ehcache-core/src/test/java/net/sf/ehcache/store/PoolableMemoryStoreTest.java (revision 11002)
+++ rctags/ehcache-2.10.7.0.43/ehcache-core/src/test/java/net/sf/ehcache/store/PoolableMemoryStoreTest.java (revision 0)
@@ -1,234 +0,0 @@
-package net.sf.ehcache.store;
-
-import net.sf.ehcache.Cache;
-import net.sf.ehcache.CacheException;
-import net.sf.ehcache.Ehcache;
-import net.sf.ehcache.Element;
-import net.sf.ehcache.config.CacheConfiguration;
-import net.sf.ehcache.event.CacheEventListener;
-import net.sf.ehcache.pool.impl.BoundedPool;
-import net.sf.ehcache.pool.impl.ConstantSizeOfEngine;
-import net.sf.ehcache.pool.impl.RoundRobinOnHeapPoolEvictor;
-
-import org.junit.After;
-import org.junit.Before;
-import org.junit.Ignore;
-import org.junit.Test;
-
-import java.util.Collection;
-import java.util.concurrent.ConcurrentLinkedQueue;
-import java.util.concurrent.ExecutorService;
-import java.util.concurrent.Executors;
-import java.util.concurrent.Future;
-import java.util.concurrent.atomic.AtomicReference;
-import org.hamcrest.number.OrderingComparison;
-
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertThat;
-import static org.junit.Assert.assertTrue;
-import static org.junit.Assert.fail;
-
-/**
- * @author Ludovic Orban
- */
-public class PoolableMemoryStoreTest {
-
- private static final int ENTRIES = 2;
- private volatile Cache cache;
- private volatile BoundedPool onHeapPool;
- private volatile Store memoryStore;
-
- private static Collection