();
- for (Field f : Locale.class.getFields()) {
- int modifiers = f.getModifiers();
- if (Modifier.isPublic(modifiers) && Modifier.isStatic(modifiers) && Locale.class.equals(f.getType())) {
- try {
- locales.put((Locale) f.get(null), null);
- } catch (IllegalArgumentException e) {
- continue;
- } catch (IllegalAccessException e) {
- continue;
- }
- }
- }
- GLOBAL_LOCALES = locales.keySet();
- }
-
- private final Class clazz;
-
- private FlyweightType(final Class clazz) {
- this.clazz = clazz;
- }
-
- /**
- * Whether this is a shared object
- * @param obj the object to check for
- * @return true, if shared
- */
- abstract boolean isShared(Object obj);
-
- /**
- * Will return the Flyweight enum instance for the flyweight Class, or null if type isn't flyweight
- * @param aClazz the class we need the FlyweightType instance for
- * @return the FlyweightType, or null
- */
- static FlyweightType getFlyweightType(final Class aClazz) {
- if (aClazz.isEnum() || (aClazz.getSuperclass() != null && aClazz.getSuperclass().isEnum())) {
- return ENUM;
- } else {
- FlyweightType flyweightType = TYPE_MAPPINGS.get(aClazz);
- return flyweightType != null ? flyweightType : MISC;
- }
- }
-}
Index: rctags/ehcache-2.10.8.2.20/ehcache-core/src/main/java/net/sf/ehcache/transaction/TransactionIDSerializedForm.java
===================================================================
diff -u -N
--- rctags/ehcache-2.10.8.2.20/ehcache-core/src/main/java/net/sf/ehcache/transaction/TransactionIDSerializedForm.java (revision 11355)
+++ rctags/ehcache-2.10.8.2.20/ehcache-core/src/main/java/net/sf/ehcache/transaction/TransactionIDSerializedForm.java (revision 0)
@@ -1,110 +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.CacheManager;
-
-import java.io.Serializable;
-
-/**
- * A replacement serialized form for transaction IDs. It can be used by transaction ID factories
- * to create IDs that serialize to this form (using writeReplace()) if they don't want or cannot
- * provide directly serializable IDs.
- *
- * During deserialization, objects of this class will be replaced by the result of the
- * CacheManager.restoreTransactionID() call.
- *
- * @author Ludovic Orban
- */
-public class TransactionIDSerializedForm implements Serializable {
- private final String cacheManagerName;
- private final String clusterUUID;
- private final String ownerID;
- private final long creationTime;
- private final int id;
-
- /**
- * Constructor
- *
- * @param cacheManagerName the name of the cache manager which contains the factory
- * that created the original TransactionID
- * @param clusterUUID the TransactionID's cluster UUID
- * @param creationTime the TransactionID's creation time
- * @param id the TransactionID's internal ID
- */
- public TransactionIDSerializedForm(String cacheManagerName, String clusterUUID, String ownerID, long creationTime, int id) {
- this.cacheManagerName = cacheManagerName;
- this.clusterUUID = clusterUUID;
- this.ownerID = ownerID;
- this.creationTime = creationTime;
- this.id = id;
- }
-
- /**
- * Get the name of the cache manager which contains the factory that created the
- * original TransactionID
- *
- * @return the cache manager name
- */
- public String getCacheManagerName() {
- return cacheManagerName;
- }
-
- /**
- * Get the original TransactionID's cluster UUID
- *
- * @return the original TransactionID's cluster UUID
- */
- public String getClusterUUID() {
- return clusterUUID;
- }
-
- /**
- * Get the original TransactionID's owner id
- *
- * @return the original TransactionID's owner id
- */
- public String getOwnerID() {
- return ownerID;
- }
-
- /**
- * Get the original TransactionID's creation time
- *
- * @return the original TransactionID's creation time
- */
- public long getCreationTime() {
- return creationTime;
- }
-
- /**
- * Get the original TransactionID's internal ID
- *
- * @return the original TransactionID's internal ID
- */
- public int getId() {
- return id;
- }
-
- private Object readResolve() {
- CacheManager cacheManager = CacheManager.getCacheManager(cacheManagerName);
- if (cacheManager == null) {
- throw new TransactionException("unable to restore transaction ID from " + cacheManagerName);
- }
- return cacheManager.getOrCreateTransactionIDFactory().restoreTransactionID(this);
- }
-
-}
Index: rctags/ehcache-2.10.8.2.20/system-tests/src/test/java/org/terracotta/ehcache/tests/NoTcConfigStandaloneCacheTest.java
===================================================================
diff -u -N
--- rctags/ehcache-2.10.8.2.20/system-tests/src/test/java/org/terracotta/ehcache/tests/NoTcConfigStandaloneCacheTest.java (revision 11355)
+++ rctags/ehcache-2.10.8.2.20/system-tests/src/test/java/org/terracotta/ehcache/tests/NoTcConfigStandaloneCacheTest.java (revision 0)
@@ -1,52 +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 NoTcConfigStandaloneCacheTest extends AbstractCacheTestBase {
-
- public NoTcConfigStandaloneCacheTest(TestConfig testConfig) {
- super("no-tcconfig-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;
- boolean cacheException = false;
- boolean tcConfig = false;
- try {
- fr = new FileReader(output);
- BufferedReader reader = new BufferedReader(fr);
- String st = "";
- while ((st = reader.readLine()) != null) {
- if (st.contains("CacheException")) cacheException = true;
- if (st.contains("")) tcConfig = true;
- }
- } catch (Exception e) {
- throw new AssertionError(e);
- } finally {
- try {
- fr.close();
- } catch (Exception e) {
- //
- }
- }
-
- if (!cacheException) { throw new AssertionError("Expected Exception"); }
-
- if (!tcConfig) { throw new AssertionError("Expected "); }
- }
-
-}
Index: rctags/ehcache-2.10.8.2.20/ehcache-search-parser/src/main/java/net/sf/ehcache/search/parser/MOrderBy.java
===================================================================
diff -u -N
--- rctags/ehcache-2.10.8.2.20/ehcache-search-parser/src/main/java/net/sf/ehcache/search/parser/MOrderBy.java (revision 11355)
+++ rctags/ehcache-2.10.8.2.20/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.8.2.20/ehcache-core/src/main/java/net/sf/ehcache/terracotta/ClusteredInstanceFactory.java
===================================================================
diff -u -N
--- rctags/ehcache-2.10.8.2.20/ehcache-core/src/main/java/net/sf/ehcache/terracotta/ClusteredInstanceFactory.java (revision 11355)
+++ rctags/ehcache-2.10.8.2.20/ehcache-core/src/main/java/net/sf/ehcache/terracotta/ClusteredInstanceFactory.java (revision 0)
@@ -1,149 +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.Ehcache;
-import net.sf.ehcache.cluster.CacheCluster;
-import net.sf.ehcache.config.Configuration;
-import net.sf.ehcache.event.CacheEventListener;
-import net.sf.ehcache.management.event.ManagementEventSink;
-import net.sf.ehcache.store.Store;
-import net.sf.ehcache.store.TerracottaStore;
-import net.sf.ehcache.transaction.SoftLockManager;
-import net.sf.ehcache.transaction.TransactionIDFactory;
-import net.sf.ehcache.writer.writebehind.WriteBehind;
-
-import java.util.concurrent.Callable;
-
-/**
- * Factory for creating clustered instances
- *
- * @author Tim Eck
- * @author Geert Bevin
- * @since 1.7
- */
-public interface ClusteredInstanceFactory {
-
- /**
- * Create a Store instance for the given cache
- *
- * @param cache the cache will backed by the returned store
- * @return store instance
- */
- Store createStore(Ehcache cache);
-
- /**
- * Get an api for looking at the clustered node topology.
- */
- CacheCluster getTopology();
-
- /**
- * Create an WriteBehind instance for the given cache
- *
- * @param cache the cache to which the write behind will be tied
- * @return write behind instance
- */
- WriteBehind createWriteBehind(Ehcache cache);
-
- /**
- * Create a replicator for the cache events of a given cache
- *
- * @param cache the cache to which the replicator will be bound
- * @return cache event replicator
- */
- CacheEventListener createEventReplicator(Ehcache cache);
-
- /**
- * Returns a universally unique identifiers for this factory.
- *
- * @return the identifier as a string
- */
- String getUUID();
-
- /**
- * Enable or disable NonStop for the current thread only.
- *
- * @param enable true to enable NonStop, false otherwise.
- */
- void enableNonStopForCurrentThread(boolean enable);
-
- /**
- * Cleans up any resources left behind after the shutdown of the associated CacheManager
- */
- void shutdown();
-
- /**
- * Create a TransactionIDFactory
- *
- * @param uuid a UUID unique to the cluster
- * @param cacheManagerName the name of the cache manager creating a TransactionIDFactory
- * @return a TransactionIDFactory
- */
- TransactionIDFactory createTransactionIDFactory(String uuid, String cacheManagerName);
-
- /**
- * Create a SoftLockManager for a cache
- *
- * @param cache the cache for which to create a SoftLockManager
- * @return a SoftLockManager
- */
- SoftLockManager getOrCreateSoftLockManager(Ehcache cache);
-
- /**
- * Create a NonStopStoreWrapper for a terracottaStore
- *
- * @param store the store for which to create a NonStopStore
- * @return a NonStopStore
- */
- TerracottaStore createNonStopStore(Callable store, Ehcache cache);
-
- /**
- * Destroys the specified cache
- *
- * @param cacheManagerName name of the cache manager the cache belongs to
- * @param cacheName name of the cache
- * @return true if the cache existed before being destroyed
- */
- boolean destroyCache(String cacheManagerName, String cacheName);
-
- /**
- * Wait until the Orchestrator is running for the given CacheManager
- * @param cacheManagerName name of the CacheManager
- */
- public void waitForOrchestrator(String cacheManagerName);
-
- /**
- * Links this cache manager to the cluster
- *
- * @param cacheManagerName the name of the cache manager
- * @param configuration the cache manager configuration
- */
- void linkClusteredCacheManager(String cacheManagerName, Configuration configuration);
-
- /**
- * Un-links the cache from its cluster entity
- *
- * @param cacheName the cache to unlink
- */
- void unlinkCache(String cacheName);
-
- /**
- * Create a management event sink
- *
- * @return a management event sink
- */
- ManagementEventSink createEventSink();
-}
Index: rctags/ehcache-2.10.8.2.20/system-tests/src/test/resources/byteman/writeBehindAtomicity.btm
===================================================================
diff -u -N
--- rctags/ehcache-2.10.8.2.20/system-tests/src/test/resources/byteman/writeBehindAtomicity.btm (revision 11355)
+++ rctags/ehcache-2.10.8.2.20/system-tests/src/test/resources/byteman/writeBehindAtomicity.btm (revision 0)
@@ -1,40 +0,0 @@
-RULE trace RemoteTransactionManagerImpl commitWithoutThrottling
-CLASS RemoteTransactionManagerImpl
-METHOD commitWithoutThrottling
-AT ENTRY
-IF true
-DO traceln("COMMITTRANSACTION :" + Thread.currentThread().getName());
-ENDRULE
-
-RULE trace ClusteredStore putWithWriterEntry
-CLASS ClusteredStore
-METHOD putWithWriter
-AT ENTRY
-IF true
-DO traceln("BEGINOPERATION putWithWriterThread :" + Thread.currentThread().getName());
-ENDRULE
-
-RULE trace ClusteredStore putWithWriterExit
-CLASS ClusteredStore
-METHOD putWithWriter
-AT EXIT
-IF true
-DO traceln("ENDOPERATION putWithWriter Thread :" + Thread.currentThread().getName());
-ENDRULE
-
-RULE trace ClusteredStore removeWithWriterEntry
-CLASS ClusteredStore
-METHOD removeWithWriter
-AT ENTRY
-IF true
-DO traceln("BEGINOPERATION removeWithWriterThread :" + Thread.currentThread().getName());
-ENDRULE
-
-RULE trace ClusteredStore removeWithWriterExit
-CLASS ClusteredStore
-METHOD removeWithWriter
-AT EXIT
-IF true
-DO traceln("ENDOPERATION removeWithWriter Thread :" + Thread.currentThread().getName());
-ENDRULE
-
Index: rctags/ehcache-2.10.8.2.20/ehcache-core/src/test/java/net/sf/ehcache/CacheCopyOnRwReplaceRemoveTest.java
===================================================================
diff -u -N
--- rctags/ehcache-2.10.8.2.20/ehcache-core/src/test/java/net/sf/ehcache/CacheCopyOnRwReplaceRemoveTest.java (revision 11355)
+++ rctags/ehcache-2.10.8.2.20/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.8.2.20/ehcache-core/src/test/java/net/sf/ehcache/search/BasicSearchTest.java
===================================================================
diff -u -N
--- rctags/ehcache-2.10.8.2.20/ehcache-core/src/test/java/net/sf/ehcache/search/BasicSearchTest.java (revision 11355)
+++ rctags/ehcache-2.10.8.2.20/ehcache-core/src/test/java/net/sf/ehcache/search/BasicSearchTest.java (revision 0)
@@ -1,1194 +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 net.sf.ehcache.Cache;
-import net.sf.ehcache.CacheException;
-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.SearchAttribute;
-import net.sf.ehcache.config.Searchable;
-import net.sf.ehcache.search.Person.Gender;
-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.aggregator.Aggregators;
-import net.sf.ehcache.search.expression.Criteria;
-import net.sf.ehcache.search.expression.LessThan;
-import net.sf.ehcache.search.expression.Or;
-import net.sf.ehcache.search.impl.GroupedResultImpl;
-
-import org.junit.After;
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.experimental.categories.Category;
-import org.terracotta.test.categories.CheckShorts;
-
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Collection;
-import java.util.Collections;
-import java.util.HashSet;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Map;
-import java.util.Random;
-import java.util.Set;
-
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertTrue;
-import static org.junit.Assert.fail;
-
-@Category(CheckShorts.class)
-public class BasicSearchTest {
- private CacheManager cacheManager;
-
- @Before
- public void setup() {
- this.cacheManager = new CacheManager(getClass().getResource("/ehcache-search.xml"));
- }
-
- @After
- public void tearDown() {
- this.cacheManager.shutdown();
- }
-
- @Test
- public void testInvalidConfiguration() {
- try {
- new CacheManager(getClass().getResource("/ehcache-search-invalid-key.xml"));
- fail();
- } catch (CacheException ce) {
- // expected
- }
-
- try {
- new CacheManager(getClass().getResource("/ehcache-search-invalid-value.xml"));
- fail();
- } catch (CacheException ce) {
- // expected
- }
- }
-
- @Test
- public void testKeysValuesDisabled() {
- Cache cache = cacheManager.getCache("searchable-no-keys-values");
-
- CacheConfiguration config = cache.getCacheConfiguration();
-
- Searchable searchable = config.getSearchable();
-
- assertFalse(searchable.keys());
- assertFalse(searchable.values());
-
- try {
- cache.getSearchAttribute(Query.KEY.getAttributeName());
- fail();
- } catch (CacheException se) {
- // expected
- System.err.println(se.getMessage());
- }
-
- try {
- cache.getSearchAttribute(Query.VALUE.getAttributeName());
- fail();
- } catch (CacheException se) {
- // expected
- System.err.println(se.getMessage());
- }
- }
-
- @Test
- public void testNonSearchableCache() {
- Ehcache cache = cacheManager.getEhcache("not-searchable");
- assertFalse(cache.isSearchable());
-
- try {
- cache.createQuery();
- fail();
- } catch (CacheException e) {
- // expected
- }
- }
-
- @Test
- public void testDefaultSearchableCache() {
- Ehcache cache = cacheManager.getEhcache("default-searchable");
- assertTrue(cache.isSearchable());
-
- cache.put(new Element("key", new Object()));
- cache.put(new Element(new Object(), "value"));
- cache.put(new Element(new Object(), new Object()));
- cache.put(new Element(null, null));
-
- Query query;
- Results results;
-
- query = cache.createQuery();
- query.includeKeys();
- query.addCriteria(Query.KEY.eq("key")).end();
- results = query.execute();
- assertEquals(1, results.size());
- assertEquals("key", results.all().iterator().next().getKey());
-
- query = cache.createQuery();
- query.includeKeys();
- query.addCriteria(Query.VALUE.eq("value")).end();
- results = query.execute();
- assertEquals(1, results.size());
- Object key = results.all().iterator().next().getKey();
- assertEquals("value", cache.get(key).getObjectValue());
- }
-
- @Test
- public void testQueryBuilder() {
- Ehcache cache = cacheManager.getEhcache("cache1");
-
- Query query1 = cache.createQuery();
- Query query2 = cache.createQuery();
-
- // query instances should be unique
- assertFalse(query1 == query2);
-
- // null checks
- try {
- query1.addCriteria(null);
- fail();
- } catch (NullPointerException npe) {
- // expected
- }
- try {
- query1.addOrderBy(null, Direction.ASCENDING);
- fail();
- } catch (NullPointerException npe) {
- // expected
- }
- try {
- query1.addOrderBy(new Attribute("foo"), null);
- fail();
- } catch (NullPointerException npe) {
- // expected
- }
- try {
- query1.includeAggregator((Aggregator[]) null);
- fail();
- } catch (NullPointerException npe) {
- // expected
- }
- try {
- query1.includeAttribute((Attribute[]) null);
- fail();
- } catch (NullPointerException npe) {
- // expected
- }
- try {
- query1.includeAttribute(new Attribute[] {new Attribute("foo"), null});
- fail();
- } catch (NullPointerException npe) {
- // expected
- } catch (SearchException e) {
- // expected
- }
-
- // freeze query
- query1.end();
-
- try {
- query1.addCriteria(new Attribute("foo").le(35));
- fail();
- } catch (SearchException se) {
- // expected
- }
- try {
- query1.addOrderBy(new Attribute("foo"), Direction.ASCENDING);
- fail();
- } catch (SearchException se) {
- // expected
- }
- try {
- query1.includeAggregator(new Attribute("foo").max());
- fail();
- } catch (SearchException se) {
- // expected
- }
- try {
- query1.includeAttribute(new Attribute("foo"));
- fail();
- } catch (SearchException se) {
- // expected
- }
- try {
- query1.includeKeys();
- fail();
- } catch (SearchException se) {
- // expected
- }
- try {
- query1.maxResults(3);
- fail();
- } catch (SearchException se) {
- // expected
- }
- }
-
- @Test
- public void testRange() {
- Ehcache cache = cacheManager.getEhcache("cache1");
- SearchTestUtil.populateData(cache);
-
- Query query = cache.createQuery();
- query.includeKeys();
- query.end();
-
- Results results = query.execute();
- assertEquals(4, results.all().size());
-
- List keys = new ArrayList();
- for (int i = 0; i < 4; i++) {
- List range = results.range(i, 1);
- assertEquals(1, range.size());
- keys.add((Integer) range.get(0).getKey());
- }
- assertEquals(4, keys.size());
-
- for (int i = 0; i < 4; i++) {
- assertEquals(0, results.range(i, 0).size());
- }
-
- assertEquals(0, results.range(0, 0).size());
- assertEquals(1, results.range(0, 1).size());
- assertEquals(2, results.range(0, 2).size());
- assertEquals(3, results.range(0, 3).size());
- assertEquals(4, results.range(0, 4).size());
- assertEquals(4, results.range(0, 5).size());
- assertEquals(4, results.range(0, Integer.MAX_VALUE).size());
-
- try {
- results.range(-1, 1);
- fail();
- } catch (IllegalArgumentException iae) {
- // expected
- }
-
- try {
- results.range(0, -1);
- fail();
- } catch (IllegalArgumentException iae) {
- // expected
- }
- }
-
- @Test
- public void testBasic() {
- // uses expression attribute extractors
- basicQueries(cacheManager.getEhcache("cache1"));
-
- // uses a "custom" attribute extractor too
- basicQueries(cacheManager.getEhcache("cache2"));
-
- // uses copyOnRead / copyOnWrite
- basicQueries(cacheManager.getEhcache("cache3"));
-
- // uses bean attributes
- basicQueries(cacheManager.getEhcache("bean-attributes"));
- }
-
- @Test
- public void testCustomAggregator() {
- Ehcache cache = cacheManager.getEhcache("cache1");
- SearchTestUtil.populateData(cache);
-
- Attribute age = cache.getSearchAttribute("age");
-
- Query query = cache.createQuery();
- query.includeAggregator(new Aggregator() {
- public AggregatorInstance createInstance() {
- return new AggregatorInstance() {
-
- private int doubledSum;
-
- public void accept(Object input) throws AggregatorException {
- if (doubledSum == 0) {
- doubledSum = (2 * (Integer) input);
- } else {
- doubledSum += (2 * (Integer) input);
- }
- }
-
- public AggregatorInstance createClone() {
- return this;
- }
-
- public Integer aggregateResult() {
- return doubledSum;
- }
-
- public Attribute getAttribute() {
- return new Attribute("age");
- }
- };
- }
- });
- query.end();
-
- Results results = query.execute();
- assertEquals(1, results.size());
- for (Result result : results.all()) {
- assertEquals(246, result.getAggregatorResults().get(0));
- }
- }
-
- @Test
- public void testBuiltinFunctions() {
- Ehcache cache = cacheManager.getEhcache("cache1");
- SearchTestUtil.populateData(cache);
-
- Attribute age = cache.getSearchAttribute("age");
-
- {
- Query query = cache.createQuery();
- query.includeAggregator(age.count());
- query.end();
-
- Results results = query.execute();
- assertTrue(results.hasAggregators());
- assertEquals(1, results.size());
- for (Result result : results.all()) {
- System.err.println(result); // exercise toString()
- assertEquals(4, result.getAggregatorResults().get(0));
- }
- }
-
- {
- Query query = cache.createQuery();
- query.includeAggregator(age.max());
- query.end();
-
- Results results = query.execute();
- assertTrue(results.hasAggregators());
- assertEquals(1, results.size());
- for (Result result : results.all()) {
- assertEquals(35, result.getAggregatorResults().get(0));
- }
- }
-
- {
- Query query = cache.createQuery();
- query.includeAggregator(age.min());
- query.end();
-
- Results results = query.execute();
- assertTrue(results.hasAggregators());
- assertEquals(1, results.size());
- for (Result result : results.all()) {
- assertEquals(23, result.getAggregatorResults().get(0));
- }
- }
-
- {
- Query query = cache.createQuery();
- query.includeAggregator(age.sum());
- query.end();
-
- Results results = query.execute();
- assertTrue(results.hasAggregators());
- assertEquals(1, results.size());
- for (Result result : results.all()) {
- assertEquals(123L, result.getAggregatorResults().get(0));
- }
- }
-
- {
- Query query = cache.createQuery();
- query.includeAggregator(age.average());
- query.end();
-
- Results results = query.execute();
- assertTrue(results.hasAggregators());
- assertEquals(1, results.size());
- for (Result result : results.all()) {
- assertEquals(30.75F, result.getAggregatorResults().get(0));
- }
- }
-
- {
- // multiple aggregators
- Query query = cache.createQuery();
- query.includeAggregator(age.min());
- query.includeAggregator(age.max());
- query.end();
-
- Results results = query.execute();
- assertTrue(results.hasAggregators());
- assertEquals(1, results.size());
- for (Result result : results.all()) {
- assertEquals(23, result.getAggregatorResults().get(0));
- assertEquals(35, result.getAggregatorResults().get(1));
- }
- }
-
- {
- // use criteria with an aggregator
- Query query = cache.createQuery();
- query.includeAggregator(age.average());
- query.addCriteria(age.between(0, 32));
- query.end();
-
- Results results = query.execute();
- assertTrue(results.hasAggregators());
- assertEquals(1, results.size());
- for (Result result : results.all()) {
- assertEquals(26.5F, result.getAggregatorResults().get(0));
- }
- }
-
- {
- // includeKeys in addition to an aggregator
- Query query = cache.createQuery();
- query.includeKeys();
- query.includeAggregator(age.average());
- query.addCriteria(age.between(0, 32));
- query.end();
-
- Results results = query.execute();
- assertTrue(results.hasAggregators());
- assertTrue(results.hasKeys());
- assertEquals(2, results.size());
- for (Result result : results.all()) {
- assertEquals(26.5F, result.getAggregatorResults().get(0));
- }
-
- verify(cache, query, 2, 4);
- }
-
- {
- // execute query twice
- Query query = cache.createQuery();
- query.includeAggregator(age.count());
- query.end();
-
- Results results = query.execute();
- assertTrue(results.hasAggregators());
- assertFalse(results.hasKeys());
- for (Result result : results.all()) {
- assertEquals(4, result.getAggregatorResults().get(0));
- }
-
- results = query.execute();
- assertTrue(results.hasAggregators());
- assertFalse(results.hasKeys());
- for (Result result : results.all()) {
- assertEquals(4, result.getAggregatorResults().get(0));
- }
- }
-
- }
-
- @Test
- public void testMaxResults() {
- Ehcache cache = cacheManager.getEhcache("cache1");
- SearchTestUtil.populateData(cache);
-
- Attribute age = cache.getSearchAttribute("age");
- Attribute gender = cache.getSearchAttribute("gender");
-
- Query query = cache.createQuery();
- query.includeKeys();
- query.addCriteria(age.ne(35));
- query.maxResults(1);
- query.end();
-
- Results results = query.execute();
- assertEquals(1, results.size());
- for (Result result : results.all()) {
- switch ((Integer) result.getKey()) {
- case 2:
- case 4: {
- break;
- }
- default: {
- throw new AssertionError(result.getKey());
- }
- }
- }
-
- query = cache.createQuery();
- query.includeKeys();
- query.addCriteria(age.ne(35));
- query.maxResults(0);
- query.end();
-
- results = query.execute();
- assertEquals(0, results.size());
-
- query = cache.createQuery();
- query.includeKeys();
- query.addCriteria(age.ne(35));
- query.maxResults(2);
- query.end();
-
- results = query.execute();
- assertEquals(2, results.size());
-
- query = cache.createQuery();
- query.includeKeys();
- query.addCriteria(age.ne(35));
- query.maxResults(2);
- query.end();
-
- results = query.execute();
- assertEquals(2, results.size());
-
- query = cache.createQuery();
- query.includeKeys();
- query.addCriteria(age.ne(35));
- query.maxResults(-1);
- query.end();
-
- results = query.execute();
- assertEquals(2, results.size());
-
- }
-
- @Test
- public void testAttributeQuery() {
- Ehcache cache = cacheManager.getEhcache("cache1");
- SearchTestUtil.populateData(cache);
-
- Attribute age = cache.getSearchAttribute("age");
- Attribute gender = cache.getSearchAttribute("gender");
-
- Query query = cache.createQuery();
- // not including keys
- query.addCriteria(age.ne(35));
- query.includeAttribute(age, gender);
- query.end();
-
- Results results = query.execute();
- assertFalse(results.hasKeys());
- assertFalse(results.hasAggregators());
- assertTrue(results.hasAttributes());
-
- for (Result result : results.all()) {
- System.err.println(result.toString()); // exercise toString()
-
- try {
- result.getKey();
- fail();
- } catch (SearchException se) {
- // expected
- }
-
- try {
- result.getKey();
- fail();
- } catch (SearchException se) {
- // expected
- }
-
- int ageAttr = result.getAttribute(age);
- if (ageAttr == 23) {
- assertEquals(Gender.FEMALE, result.getAttribute(gender));
- } else if (ageAttr == 30) {
- assertEquals(Gender.MALE, result.getAttribute(gender));
- } else {
- throw new AssertionError("unexpected age: " + ageAttr);
- }
-
- try {
- result.getAttribute(new Attribute("does-not-exist"));
- fail();
- } catch (SearchException se) {
- // expected
- }
- }
-
- }
-
- private void basicQueries(Ehcache cache) {
- SearchTestUtil.populateData(cache);
-
- Query query;
- Attribute age = cache.getSearchAttribute("age");
-
- query = cache.createQuery();
- query.includeKeys();
- query.addCriteria(age.ne(35));
- query.end();
- verify(cache, query, 2, 4);
-
- query = cache.createQuery();
- query.includeKeys();
- query.addCriteria(cache.getSearchAttribute("age").lt(30));
- query.end();
- query.execute();
- verify(cache, query, 2);
-
- query = cache.createQuery();
- query.includeKeys();
- query.addCriteria(cache.getSearchAttribute("age").le(30));
- query.end();
- query.execute();
- verify(cache, query, 2, 4);
-
- query = cache.createQuery();
- query.includeKeys();
- query.addCriteria(cache.getSearchAttribute("age").in(new HashSet(Arrays.asList(23, 35))));
- query.end();
- query.execute();
- verify(cache, query, 1, 2, 3);
-
- query = cache.createQuery();
- query.includeKeys();
- query.addCriteria(cache.getSearchAttribute("age").gt(30));
- query.end();
- query.execute();
- verify(cache, query, 1, 3);
-
- query = cache.createQuery();
- query.includeKeys();
- query.addCriteria(cache.getSearchAttribute("age").between(23, 35, true, false));
- query.end();
- query.execute();
- verify(cache, query, 2, 4);
-
- query = cache.createQuery();
- query.includeKeys();
- query.addCriteria(cache.getSearchAttribute("age").ge(30));
- query.end();
- query.execute();
- verify(cache, query, 1, 3, 4);
-
- query = cache.createQuery();
- query.includeKeys();
- query.addCriteria(cache.getSearchAttribute("age").eq(35).or(cache.getSearchAttribute("gender").eq(Gender.FEMALE)));
- query.end();
- verify(cache, query, 1, 2, 3);
-
- query = cache.createQuery();
- query.includeKeys();
- query.addCriteria(cache.getSearchAttribute("age").eq(35).and(cache.getSearchAttribute("gender").eq(Gender.MALE)));
- query.end();
- verify(cache, query, 1, 3);
-
- query = cache.createQuery();
- query.includeKeys();
- query.addCriteria(cache.getSearchAttribute("age").eq(35).and(cache.getSearchAttribute("gender").eq(Gender.FEMALE)));
- query.end();
- verify(cache, query);
-
- query = cache.createQuery();
- query.includeKeys();
- query.addCriteria(cache.getSearchAttribute("age").eq(35));
- query.addCriteria(cache.getSearchAttribute("gender").eq(Gender.FEMALE));
- query.end();
- verify(cache, query);
-
- query = cache.createQuery();
- query.includeKeys();
- query.addCriteria(cache.getSearchAttribute("gender").eq(Gender.MALE).not());
- query.end();
- verify(cache, query, 2);
-
- query = cache.createQuery();
- query.includeKeys();
- query.addCriteria(cache.getSearchAttribute("name").eq("Tim Eck"));
- query.addCriteria(cache.getSearchAttribute("gender").eq(Gender.MALE));
- query.addCriteria(cache.getSearchAttribute("age").eq(35));
- query.end();
- verify(cache, query, 1);
-
- query = cache.createQuery();
- query.includeKeys();
- Attribute name = cache.getSearchAttribute("name");
- query.addCriteria(name.eq("Tim Eck").or(name.eq("Ari Zilka")).or(name.eq("Nabib El-Rahman")));
- query.end();
- verify(cache, query, 1, 3, 4);
-
- try {
- cache.getSearchAttribute("DOES_NOT_EXIST_PLEASE_DO_NOT_CREATE_ME");
- fail();
- } catch (CacheException ce) {
- // expected
- }
- }
-
- @Test
- public void testOrdering() {
- Ehcache cache = cacheManager.getEhcache("cache1");
- SearchTestUtil.populateData(cache);
-
- Attribute age = cache.getSearchAttribute("age");
- Attribute name = cache.getSearchAttribute("name");
-
- Query query;
-
- query = cache.createQuery();
- query.includeKeys();
- // no critera -- select all elements
- query.addOrderBy(age, Direction.DESCENDING);
- query.addOrderBy(name, Direction.ASCENDING);
- query.end();
-
- verifyOrdered(cache, query, 3, 1, 4, 2);
-
- query = cache.createQuery();
- query.includeKeys();
- // no critera -- select all elements
- query.addOrderBy(age, Direction.DESCENDING);
- query.addOrderBy(name, Direction.ASCENDING);
- query.maxResults(2);
- query.end();
-
- verifyOrdered(cache, query, 3, 1);
- }
-
- @Test
- public void testILike() {
- Ehcache cache = cacheManager.getEhcache("cache1");
- SearchTestUtil.populateData(cache);
-
- Attribute name = cache.getSearchAttribute("name");
-
- Query query;
-
- query = cache.createQuery();
- query.includeKeys();
- query.addCriteria(new Or(name.ilike("tim*"), name.ilike("ari*")));
- query.end();
-
- verify(cache, query, 3, 1);
-
- cache.removeAll();
- cache.put(new Element(1, new Person("Test \\ Bob * ?", 35, Gender.MALE)));
- cache.put(new Element(2, new Person("(..Test", 35, Gender.MALE)));
- cache.put(new Element(3, new Person("lowercase", 35, Gender.MALE)));
- cache.put(new Element(4, new Person("UPPERCASE", 35, Gender.MALE)));
- cache.put(new Element(5, new Person("MiXeD", 35, Gender.MALE)));
- cache.put(new Element(6, new Person("Hello there\nI am on a newline\nMe too\n", 999, Gender.MALE)));
-
- query = cache.createQuery();
- query.includeKeys();
- query.addCriteria(name.ilike("Test \\\\ Bob \\* \\?"));
- query.end();
-
- verify(cache, query, 1);
-
- query = cache.createQuery();
- query.includeKeys();
- query.addCriteria(name.ilike("*Test*"));
- query.end();
-
- verify(cache, query, 1, 2);
-
- query = cache.createQuery();
- query.includeKeys();
- query.addCriteria(name.ilike("Test*\\?"));
- query.end();
-
- verify(cache, query, 1);
-
- query = cache.createQuery();
- query.includeKeys();
- query.addCriteria(name.ilike("(..*"));
- query.end();
-
- verify(cache, query, 2);
-
- query = cache.createQuery();
- query.includeKeys();
- query.addCriteria(name.ilike("Lowercase"));
- query.end();
-
- verify(cache, query, 3);
-
- query = cache.createQuery();
- query.includeKeys();
- query.addCriteria(name.ilike("LOWER*"));
- query.end();
-
- verify(cache, query, 3);
-
- query = cache.createQuery();
- query.includeKeys();
- query.addCriteria(name.ilike("uppercase"));
- query.end();
-
- verify(cache, query, 4);
-
- query = cache.createQuery();
- query.includeKeys();
- query.addCriteria(name.ilike("mixed"));
- query.end();
-
- verify(cache, query, 5);
-
- query = cache.createQuery();
- query.includeKeys();
- query.addCriteria(name.ilike("*am on a*"));
- query.end();
-
- verify(cache, query, 6);
- }
-
- @Test
- public void testTypeChecking() {
- CacheConfiguration config = new CacheConfiguration("test", 0);
- config.setOverflowToDisk(false);
- config.diskPersistent(false);
- config.setEternal(true);
- Searchable searchable = new Searchable().searchAttribute(new SearchAttribute().name("attr").expression("value.getAttr()"));
- config.addSearchable(searchable);
-
- cacheManager.addCache(new Cache(config));
-
- class Value {
- private final Object attr;
-
- Value(Object attr) {
- this.attr = attr;
- }
-
- Object getAttr() {
- return attr;
- }
- }
-
- Ehcache cache = cacheManager.getEhcache("test");
- cache.put(new Element(1, new Value("foo")));
-
- Query query = cache.createQuery();
- query.includeKeys();
- query.addCriteria(cache.getSearchAttribute("attr").le(4));
- query.end();
-
- try {
- query.execute();
- fail();
- } catch (SearchException se) {
- // expected since the criteria wants INT, but actual attribute value is STRING
- }
-
- // with proper type search will execute
- cache.put(new Element(1, new Value(4)));
- assertEquals(1, query.execute().all().iterator().next().getKey());
- }
-
- @Test
- public void testEmptyQueries() {
- Ehcache cache = cacheManager.getEhcache("cache1");
- SearchTestUtil.populateData(cache);
-
- {
- Query query = cache.createQuery();
- query.end();
- try {
- query.execute();
- fail();
- } catch (SearchException e) {
- System.err.println("Expected " + e);
- }
- }
-
- {
- Attribute age = cache.getSearchAttribute("age");
- Query query = cache.createQuery();
- query.addCriteria(age.ne(35));
- query.end();
- try {
- query.execute();
- fail();
- } catch (SearchException e) {
- System.err.println("Expected " + e);
- }
- }
- }
-
- @Test
- public void testIncludeValues() {
- Ehcache cache = cacheManager.getEhcache("cache1");
- SearchTestUtil.populateData(cache);
-
- {
- Query query = cache.createQuery();
- query.includeValues();
- query.end();
- Results results = query.execute();
- assertTrue(results.hasValues());
- assertEquals(4, results.size());
- int ageSum = 0;
- for (Result result : results.all()) {
- System.err.println(result.toString()); // exercise toString()
-
- Person p = (Person) result.getValue();
- ageSum += p.getAge();
- try {
- result.getKey();
- } catch (SearchException se) {
- // expected since keys not included
- }
- }
-
- assertEquals(123, ageSum);
- }
-
- {
- Query query = cache.createQuery();
- query.includeKeys();
- query.end();
- Results results = query.execute();
- assertFalse(results.hasValues());
- assertEquals(4, results.size());
- for (Result result : results.all()) {
- try {
- result.getValue();
- fail();
- } catch (SearchException se) {
- // expected since keys not included
- }
- }
- }
- }
-
- @Test
- public void testSearchUnknownAttribute() {
- Ehcache cache = cacheManager.getEhcache("cache1");
- SearchTestUtil.populateData(cache);
-
- Attribute address = new Attribute("address");
-
- try {
- cache.getSearchAttribute(address.getAttributeName());
- fail(address.getAttributeName() + " not expected in cache search config");
- }
- catch (CacheException e) {
- // expected
- }
-
- try {
- cache.createQuery().includeAttribute(address).execute();
- fail("Expected to fail due to unknown attribute");
- }
- catch (SearchException ex) {
- // expected
- }
-
- Aggregator[] aggs = new Aggregator[] { Aggregators.average(address), Aggregators.min(address), Aggregators.max(address),
- Aggregators.sum(address) } ;
- for (Aggregator a: aggs) {
- Query q = cache.createQuery().includeAggregator(a);
- try {
- q.execute();
- fail("Expected to fail due to bad attribute used in aggregator");
- }
- catch (SearchException e) {
- // expected
- }
- }
- }
-
- @Test
- public void testBadAttributeInCriteria() {
- Ehcache cache = cacheManager.getEhcache("cache1");
- SearchTestUtil.populateData(cache);
-
- Attribute address = new Attribute("address");
- try {
- cache.getSearchAttribute(address.getAttributeName());
- fail(address.getAttributeName() + " not expected in cache search config");
- }
- catch (CacheException e) {
- // expected
- }
-
- Collection expr = new ArrayList();
- expr.add(address.between("aaa", "zzz"));
- expr.add(new LessThan("address", "Elm St"));
- expr.add(address.eq("ehcache"));
- expr.add(address.ge("rocks"));
- expr.add(address.gt("FOO"));
- expr.add(address.ne("bAr"));
- expr.add(address.ilike("likethis*"));
- expr.add(address.le("1000"));
- expr.add(address.in(Collections.singleton("XYZ")));
-
- for (Criteria c: expr) {
- Query q = cache.createQuery().addCriteria(c);
-
- try {
- q.execute();
- fail("Expected to fail due to unknown attribute in search criteria");
- }
- catch (SearchException e) {
- // expected
- }
- }
-
- Criteria bool = null;
- Random r = new Random();
- for (Criteria c: expr) {
- if (bool == null) {
- bool = c;
- continue;
- }
- switch (r.nextInt(2)) {
- case 0:
- bool = bool.and(c);
- break;
- case 1:
- bool = bool.or(c);
- break;
- case 2:
- bool = bool.not();
- break;
- default:
- throw new AssertionError();
- }
- }
-
- Query q = cache.createQuery().addCriteria(bool);
-
- try {
- q.execute();
- fail("Expected to fail due to unknown attribute in search criteria chain");
- }
- catch (SearchException e) {
- // expected
- }
-
-
- }
-
- @Test
- public void testBasicGroupBy() {
- Ehcache cache = cacheManager.getEhcache("cache1");
- assertTrue(cache.isSearchable());
-
- int numOfDepts = 10;
- int numOfMalesPerDept = 100;
- int numOfFemalesPerDept = 100;
-
- for (int i = 0; i < numOfDepts; i++) {
- for (int j = 0; j < numOfMalesPerDept; j++) {
- cache.put(new Element("male" + i + "-" + j, new Person("male" + j, j, Gender.MALE, "dept" + i)));
- }
-
- for (int j = 0; j < numOfFemalesPerDept; j++) {
- cache.put(new Element("female" + i + "-" + j, new Person("female" + j, j, Gender.FEMALE, "dept" + i)));
- }
- }
-
- Query query;
- Results results;
-
- query = cache.createQuery();
- query.includeAttribute(cache.getSearchAttribute("dept"));
- query.includeAttribute(cache.getSearchAttribute("gender"));
- query.includeAggregator(cache.getSearchAttribute("age").sum());
- query.includeAggregator(cache.getSearchAttribute("age").min());
- query.includeAggregator(cache.getSearchAttribute("age").max());
- query.addGroupBy(cache.getSearchAttribute("dept"));
- query.addOrderBy(cache.getSearchAttribute("dept"), Direction.DESCENDING);
- query.addOrderBy(cache.getSearchAttribute("gender"), Direction.ASCENDING);
- query.addGroupBy(cache.getSearchAttribute("gender"));
- query.end();
-
- results = query.execute();
-
- assertEquals(numOfDepts * 2, results.size());
-
- int i = 1;
- for (Iterator iter = results.all().iterator(); iter.hasNext();) {
- Result maleResult = iter.next();
- System.out.println("XXXXXXXXX: " + maleResult);
- assertEquals("dept" + (numOfDepts - i), maleResult.getAttribute(cache.getSearchAttribute("dept")));
- assertEquals(Gender.MALE, maleResult.getAttribute(cache.getSearchAttribute("gender")));
-
- assertTrue(maleResult instanceof GroupedResultImpl);
- Map groupByValues = ((GroupedResultImpl) maleResult).getGroupByValues();
- assertEquals(2, groupByValues.size());
- assertEquals("dept" + (numOfDepts - i), groupByValues.get("dept"));
- assertEquals(Gender.MALE, groupByValues.get("gender"));
-
- List aggregateResults = maleResult.getAggregatorResults();
- assertEquals(3, aggregateResults.size());
- assertEquals(numOfMalesPerDept * (numOfMalesPerDept - 1) / 2, ((Long) aggregateResults.get(0)).intValue());
- assertEquals(0, ((Integer) aggregateResults.get(1)).intValue());
- assertEquals(numOfMalesPerDept - 1, ((Integer) aggregateResults.get(2)).intValue());
-
- Result femaleResult = iter.next();
- System.out.println("XXXXXXXXX: " + femaleResult);
-
- assertEquals("dept" + (numOfDepts - i), femaleResult.getAttribute(cache.getSearchAttribute("dept")));
- assertEquals(Gender.FEMALE, femaleResult.getAttribute(cache.getSearchAttribute("gender")));
-
- assertTrue(femaleResult instanceof GroupedResultImpl);
- groupByValues = ((GroupedResultImpl) femaleResult).getGroupByValues();
- assertEquals(2, groupByValues.size());
- assertEquals("dept" + (numOfDepts - i), groupByValues.get("dept"));
- assertEquals(Gender.FEMALE, groupByValues.get("gender"));
-
- aggregateResults = femaleResult.getAggregatorResults();
- assertEquals(3, aggregateResults.size());
- assertEquals(numOfFemalesPerDept * (numOfFemalesPerDept - 1) / 2, ((Long) aggregateResults.get(0)).intValue());
- assertEquals(0, ((Integer) aggregateResults.get(1)).intValue());
- assertEquals(numOfFemalesPerDept - 1, ((Integer) aggregateResults.get(2)).intValue());
-
- i++;
- }
-
- }
-
- private void verify(Ehcache cache, Query query, Integer... expectedKeys) {
- Results results = query.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));
-
- System.err.println(results.toString()); // call toString() just to make sure it doesn't blow up
-
- for (Result result : results.all()) {
- System.err.println(result.toString()); // call toString() just to make sure it doesn't blow up
-
- int key = (Integer) result.getKey();
- if (!keys.remove(key)) {
- throw new AssertionError("unexpected key: " + key);
- }
- }
- }
-
- private void verifyOrdered(Ehcache cache, Query query, Integer... expectedKeys) {
- Results results = query.execute();
- assertEquals(results.size(), expectedKeys.length);
-
- int pos = 0;
- for (Result result : results.all()) {
- Object expectedKey = expectedKeys[pos++];
- assertEquals(expectedKey, result.getKey());
- }
- }
-
-}
Index: rctags/ehcache-2.10.8.2.20/terracotta/bootstrap/src/main/java/org/terracotta/modules/ehcache/writebehind/operations/SingleAsyncOperation.java
===================================================================
diff -u -N
--- rctags/ehcache-2.10.8.2.20/terracotta/bootstrap/src/main/java/org/terracotta/modules/ehcache/writebehind/operations/SingleAsyncOperation.java (revision 11355)
+++ rctags/ehcache-2.10.8.2.20/terracotta/bootstrap/src/main/java/org/terracotta/modules/ehcache/writebehind/operations/SingleAsyncOperation.java (revision 0)
@@ -1,50 +0,0 @@
-/*
- * All content copyright Terracotta, Inc., unless otherwise indicated. All rights reserved.
- */
-package org.terracotta.modules.ehcache.writebehind.operations;
-
-import net.sf.ehcache.Element;
-import net.sf.ehcache.writer.CacheWriter;
-
-import java.io.IOException;
-import java.io.Serializable;
-
-/**
- * Interface to implement single operations that are performed in the write behind implementation that using an
- * AsyncCoordinator underneath
- *
- * @author Abhishek Maheshwari
- */
-public interface SingleAsyncOperation extends Serializable {
- /**
- * Perform this operation as a single execution with the provided cache writer
- *
- * @param cacheWriter the cache writer this operation should be performed upon
- */
- public void performSingleOperation(CacheWriter cacheWriter) throws ClassNotFoundException, IOException;
-
- /**
- * Retrieves the key for this operation.
- *
- * @return this operation's key
- */
- Object getKey();
-
- Element getElement();
-
- /**
- * Retrieves the moment when the operation was created.
- *
- * @return the creation time in milliseconds
- */
- public long getCreationTime();
-
- /**
- * This method will be called to throw the item away.
- *
- * @param cacheWriter
- * @param e
- */
- void throwAwayElement(CacheWriter cacheWriter, RuntimeException e);
-
-}
Index: rctags/ehcache-2.10.8.2.20/system-tests/src/test/resources/byteman/debugEhcacheTxnsState.btm
===================================================================
diff -u -N
--- rctags/ehcache-2.10.8.2.20/system-tests/src/test/resources/byteman/debugEhcacheTxnsState.btm (revision 11355)
+++ rctags/ehcache-2.10.8.2.20/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.8.2.20/system-tests/src/test/java/org/terracotta/modules/ehcache/lifecycle/CacheManagerDestroyCrashTest.java
===================================================================
diff -u -N
--- rctags/ehcache-2.10.8.2.20/system-tests/src/test/java/org/terracotta/modules/ehcache/lifecycle/CacheManagerDestroyCrashTest.java (revision 11355)
+++ rctags/ehcache-2.10.8.2.20/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.8.2.20/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.8.2.20/management-ehcache-impl/management-ehcache-impl-v1/src/main/java/net/sf/ehcache/management/service/impl/CacheConfigurationEntityBuilder.java (revision 11355)
+++ rctags/ehcache-2.10.8.2.20/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.8.2.20/ehcache/src/test/java/net/sf/ehcache/terracotta/upgradability/serialization/NonEternalElementDataSerializationTest.java
===================================================================
diff -u -N
--- rctags/ehcache-2.10.8.2.20/ehcache/src/test/java/net/sf/ehcache/terracotta/upgradability/serialization/NonEternalElementDataSerializationTest.java (revision 11355)
+++ rctags/ehcache-2.10.8.2.20/ehcache/src/test/java/net/sf/ehcache/terracotta/upgradability/serialization/NonEternalElementDataSerializationTest.java (revision 0)
@@ -1,46 +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.upgradability.serialization;
-
-import java.io.IOException;
-import java.util.Comparator;
-
-import net.sf.ehcache.Element;
-import net.sf.ehcache.NonEternalElementData;
-import org.junit.Test;
-
-import static org.terracotta.upgradability.serialization.SerializationUpgradabilityTesting.validateSerializedForm;
-
-/**
- *
- * @author cdennis
- */
-public class NonEternalElementDataSerializationTest {
-
- private static final Comparator COMPARATOR = new Comparator() {
-
- @Override
- public int compare(NonEternalElementData o1, NonEternalElementData o2) {
- return ElementSerializationTest.COMPARATOR.compare(o1.createElement("foo"), o2.createElement("foo"));
- }
- };
-
- @Test
- public void testBasic() throws IOException, ClassNotFoundException {
- validateSerializedForm(new NonEternalElementData(new Element("foo", "bar", 1000L, 2000L, 3000L, 4000L, false, 5000, 6000, 7000L)), COMPARATOR, "serializedforms/NonEternalElementDataSerializationTest.testBasic.ser");
- }
-}
Index: rctags/ehcache-2.10.8.2.20/ehcache-core/src/main/java/net/sf/ehcache/management/sampled/CacheManagerSampler.java
===================================================================
diff -u -N
--- rctags/ehcache-2.10.8.2.20/ehcache-core/src/main/java/net/sf/ehcache/management/sampled/CacheManagerSampler.java (revision 11355)
+++ rctags/ehcache-2.10.8.2.20/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.8.2.20/ehcache-core/src/test/java/net/sf/ehcache/store/LruMemoryStorePerfTest.java
===================================================================
diff -u -N
--- rctags/ehcache-2.10.8.2.20/ehcache-core/src/test/java/net/sf/ehcache/store/LruMemoryStorePerfTest.java (revision 11355)
+++ rctags/ehcache-2.10.8.2.20/ehcache-core/src/test/java/net/sf/ehcache/store/LruMemoryStorePerfTest.java (revision 0)
@@ -1,31 +0,0 @@
-package net.sf.ehcache.store;
-
-import net.sf.ehcache.Cache;
-import net.sf.ehcache.CacheException;
-import net.sf.ehcache.MemoryStorePerfTester;
-import org.junit.Test;
-
-/**
- * @author Alex Snaps
- */
-public class LruMemoryStorePerfTest extends MemoryStorePerfTester {
-
- @Override
- protected Cache createCache() throws CacheException {
- return new Cache("LruMemoryStorePerfTest", 12000, MemoryStoreEvictionPolicy.FIFO, false, System.getProperty("java.io.tmpdir"),
- true, 60, 30, false, 60, null);
- }
-
- /**
- * Benchmark to test speed. This uses both memory and disk and tries to be realistic
- * v 1.38 DiskStore 7355
- * v 1.41 DiskStore 1609
- * Adjusted for change to laptop
- */
- @Test
- public void testBenchmarkPutGetSurya() throws Exception {
- benchmarkPutGetSuryaTest(2500);
- }
-
-
-}
Index: rctags/ehcache-2.10.8.2.20/terracotta/.settings/org.eclipse.jdt.ui.prefs
===================================================================
diff -u -N
--- rctags/ehcache-2.10.8.2.20/terracotta/.settings/org.eclipse.jdt.ui.prefs (revision 11355)
+++ rctags/ehcache-2.10.8.2.20/terracotta/.settings/org.eclipse.jdt.ui.prefs (revision 0)
@@ -1,66 +0,0 @@
-eclipse.preferences.version=1
-editor_save_participant_org.eclipse.jdt.ui.postsavelistener.cleanup=true
-formatter_profile=_Terracotta profile
-formatter_settings_version=11
-org.eclipse.jdt.ui.exception.name=e
-org.eclipse.jdt.ui.gettersetter.use.is=true
-org.eclipse.jdt.ui.ignorelowercasenames=true
-org.eclipse.jdt.ui.importorder=org;com;java;javax;
-org.eclipse.jdt.ui.javadoc=false
-org.eclipse.jdt.ui.keywordthis=false
-org.eclipse.jdt.ui.ondemandthreshold=99
-org.eclipse.jdt.ui.overrideannotation=true
-org.eclipse.jdt.ui.staticondemandthreshold=99
-org.eclipse.jdt.ui.text.custom_code_templates=/**\r\n * \r\n *//**\r\n * \r\n *//*\r\n * All content copyright Terracotta, Inc., unless otherwise indicated. All rights reserved.\r\n */\r\n${package_declaration}\r\n\r\n${typecomment}\r\n${type_declaration}throw ${exception_var};throw new ImplementMe();\r\n${body_statement}${body_statement}return ${field};${field} \= ${param};/**\r\n * ${tags}\r\n * ${see_to_target}\r\n */\r\n\r\n\r\n\r\n/**\r\n * @return the ${bare_field_name}\r\n *//**\r\n * @param ${param} the ${bare_field_name} to set\r\n *//**\r\n * ${tags}\r\n *//**\r\n * \r\n *//**\r\n * @author ${user}\r\n *\r\n * ${tags}\r\n *//**\r\n * \r\n *//**\r\n * ${tags}\r\n *//* (non-Jsdoc)\r\n * ${see_to_overridden}\r\n *//**\r\n * ${tags}\r\n * ${see_to_target}\r\n */${filecomment}\r\n${package_declaration}\r\n\r\n${typecomment}\r\n${type_declaration}\r\n// ${todo} Auto-generated catch block\r\n${exception_var}.printStackTrace();// ${todo} Auto-generated function stub\r\n${body_statement}${body_statement}\r\n// ${todo} Auto-generated constructor stubreturn ${field};${field} \= ${param};
-sp_cleanup.add_default_serial_version_id=true
-sp_cleanup.add_generated_serial_version_id=false
-sp_cleanup.add_missing_annotations=true
-sp_cleanup.add_missing_deprecated_annotations=true
-sp_cleanup.add_missing_methods=false
-sp_cleanup.add_missing_nls_tags=false
-sp_cleanup.add_missing_override_annotations=true
-sp_cleanup.add_missing_override_annotations_interface_methods=true
-sp_cleanup.add_serial_version_id=false
-sp_cleanup.always_use_blocks=true
-sp_cleanup.always_use_parentheses_in_expressions=false
-sp_cleanup.always_use_this_for_non_static_field_access=false
-sp_cleanup.always_use_this_for_non_static_method_access=false
-sp_cleanup.convert_to_enhanced_for_loop=true
-sp_cleanup.correct_indentation=false
-sp_cleanup.format_source_code=true
-sp_cleanup.format_source_code_changes_only=true
-sp_cleanup.make_local_variable_final=false
-sp_cleanup.make_parameters_final=false
-sp_cleanup.make_private_fields_final=true
-sp_cleanup.make_type_abstract_if_missing_method=false
-sp_cleanup.make_variable_declarations_final=true
-sp_cleanup.never_use_blocks=false
-sp_cleanup.never_use_parentheses_in_expressions=true
-sp_cleanup.on_save_use_additional_actions=true
-sp_cleanup.organize_imports=true
-sp_cleanup.qualify_static_field_accesses_with_declaring_class=false
-sp_cleanup.qualify_static_member_accesses_through_instances_with_declaring_class=true
-sp_cleanup.qualify_static_member_accesses_through_subtypes_with_declaring_class=true
-sp_cleanup.qualify_static_member_accesses_with_declaring_class=false
-sp_cleanup.qualify_static_method_accesses_with_declaring_class=false
-sp_cleanup.remove_private_constructors=true
-sp_cleanup.remove_trailing_whitespaces=true
-sp_cleanup.remove_trailing_whitespaces_all=false
-sp_cleanup.remove_trailing_whitespaces_ignore_empty=true
-sp_cleanup.remove_unnecessary_casts=true
-sp_cleanup.remove_unnecessary_nls_tags=false
-sp_cleanup.remove_unused_imports=true
-sp_cleanup.remove_unused_local_variables=false
-sp_cleanup.remove_unused_private_fields=true
-sp_cleanup.remove_unused_private_members=false
-sp_cleanup.remove_unused_private_methods=true
-sp_cleanup.remove_unused_private_types=true
-sp_cleanup.sort_members=false
-sp_cleanup.sort_members_all=false
-sp_cleanup.use_blocks=false
-sp_cleanup.use_blocks_only_for_return_and_throw=false
-sp_cleanup.use_parentheses_in_expressions=false
-sp_cleanup.use_this_for_non_static_field_access=false
-sp_cleanup.use_this_for_non_static_field_access_only_if_necessary=true
-sp_cleanup.use_this_for_non_static_method_access=false
-sp_cleanup.use_this_for_non_static_method_access_only_if_necessary=true
Index: rctags/ehcache-2.10.8.2.20/management-ehcache-v1/src/main/java/net/sf/ehcache/management/resource/services/CachesResourceServiceImpl.java
===================================================================
diff -u -N
--- rctags/ehcache-2.10.8.2.20/management-ehcache-v1/src/main/java/net/sf/ehcache/management/resource/services/CachesResourceServiceImpl.java (revision 11355)
+++ rctags/ehcache-2.10.8.2.20/management-ehcache-v1/src/main/java/net/sf/ehcache/management/resource/services/CachesResourceServiceImpl.java (revision 0)
@@ -1,122 +0,0 @@
-package net.sf.ehcache.management.resource.services;
-
-import java.util.Arrays;
-import java.util.Collection;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Set;
-
-import javax.ws.rs.Consumes;
-import javax.ws.rs.GET;
-import javax.ws.rs.PUT;
-import javax.ws.rs.Path;
-import javax.ws.rs.Produces;
-import javax.ws.rs.core.Context;
-import javax.ws.rs.core.MediaType;
-import javax.ws.rs.core.MultivaluedMap;
-import javax.ws.rs.core.Response;
-import javax.ws.rs.core.UriInfo;
-
-import net.sf.ehcache.management.resource.CacheEntity;
-import net.sf.ehcache.management.service.CacheService;
-import net.sf.ehcache.management.service.EntityResourceFactory;
-
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.terracotta.management.ServiceExecutionException;
-import org.terracotta.management.ServiceLocator;
-import org.terracotta.management.resource.exceptions.ResourceRuntimeException;
-import org.terracotta.management.resource.services.validator.RequestValidator;
-
-/**
- *
- *
- * A resource service for interacting with ehcache caches via the {@link CacheEntity}.
- *
- *
- * @author brandony
- */
-@Path("/agents/cacheManagers/caches")
-public final class CachesResourceServiceImpl {
-
- public static final String ATTR_QUERY_KEY = "show";
-
- private final static Logger LOG = LoggerFactory.getLogger(CachesResourceServiceImpl.class);
-
- private final EntityResourceFactory entityResourceFactory;
-
- private final CacheService cacheSvc;
-
- private final RequestValidator validator;
-
- public CachesResourceServiceImpl() {
- this.entityResourceFactory = ServiceLocator.locate(EntityResourceFactory.class);
- this.validator = ServiceLocator.locate(RequestValidator.class);
- this.cacheSvc = ServiceLocator.locate(CacheService.class);
- }
-
- /**
- *
- * Get a {@code Collection} of {@link CacheEntity} objects representing the cache information provided by the
- * associated monitorable entity's agent given the request path.
- *
- *
- * @param info
- * {@link UriInfo} for this resource request
- * @return a collection of {@link CacheEntity} objects when successful.
- */
- @GET
- @Produces(MediaType.APPLICATION_JSON)
- public Collection getCaches(@Context UriInfo info) {
- LOG.debug(String.format("Invoking CachesResourceServiceImpl.getCaches: %s", info.getRequestUri()));
-
- validator.validateSafe(info);
-
- String cacheManagerNames = info.getPathSegments().get(1).getMatrixParameters().getFirst("names");
- Set cmNames = cacheManagerNames == null ? null : new HashSet(
- Arrays.asList(cacheManagerNames.split(",")));
-
- String cacheNames = info.getPathSegments().get(2).getMatrixParameters().getFirst("names");
- Set cNames = cacheNames == null ? null : new HashSet(Arrays.asList(cacheNames.split(",")));
-
- MultivaluedMap qParams = info.getQueryParameters();
- List attrs = qParams.get(ATTR_QUERY_KEY);
- Set cAttrs = attrs == null || attrs.isEmpty() ? null : new HashSet(attrs);
-
- try {
- return entityResourceFactory.createCacheEntities(cmNames, cNames, cAttrs);
- } catch (ServiceExecutionException e) {
- throw new ResourceRuntimeException("Failed to get caches", e, Response.Status.BAD_REQUEST.getStatusCode());
- }
- }
-
- /**
- *
- * Create or update a cache with the name specified in the request path, for a specific agent and cache manager. The
- * request path that does not identify a unique cache resource for creation or identifies a cache that already exists
- * will constitute a bad request and will be denied, resulting in a response with a 400 and 409 respectively.
- *
- *
- * @param info
- * {@link UriInfo} for this resource request
- * @param resource
- * {@code CacheEntity} resource for update or creation
- */
- @PUT
- @Consumes(MediaType.APPLICATION_JSON)
- public void createOrUpdateCache(@Context UriInfo info, CacheEntity resource) {
- LOG.debug(String.format("Invoking CachesResourceServiceImpl.createOrUpdateCache: %s", info.getRequestUri()));
-
- validator.validate(info);
-
- String cacheManagerName = info.getPathSegments().get(1).getMatrixParameters().getFirst("names");
-
- String cacheName = info.getPathSegments().get(2).getMatrixParameters().getFirst("names");
-
- try {
- cacheSvc.createOrUpdateCache(cacheManagerName, cacheName, resource);
- } catch (ServiceExecutionException e) {
- throw new ResourceRuntimeException("Failed to create or update cache", e, Response.Status.BAD_REQUEST.getStatusCode());
- }
- }
-}
Index: rctags/ehcache-2.10.8.2.20/terracotta/bootstrap/src/main/java/org/terracotta/modules/ehcache/store/ToolkitNonStopExceptionOnTimeoutConfiguration.java
===================================================================
diff -u -N
--- rctags/ehcache-2.10.8.2.20/terracotta/bootstrap/src/main/java/org/terracotta/modules/ehcache/store/ToolkitNonStopExceptionOnTimeoutConfiguration.java (revision 11355)
+++ rctags/ehcache-2.10.8.2.20/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.8.2.20/distribution/events/src/assemble/bin/start-sample.sh
===================================================================
diff -u -N
--- rctags/ehcache-2.10.8.2.20/distribution/events/src/assemble/bin/start-sample.sh (revision 11355)
+++ rctags/ehcache-2.10.8.2.20/distribution/events/src/assemble/bin/start-sample.sh (revision 0)
@@ -1,31 +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=events
-
-unset CDPATH
-root=`dirname $0`/..
-root=`cd $root && pwd`
-
-$root/bin/package.sh
-
-if [ $? -ne 0 ]; then
- exit 1
-fi
-
-$root/bin/start-jetty.sh 9081
-echo "Go to: http://localhost:9081/$appname"
-echo
-sleep 3
-$root/bin/start-jetty.sh 9082
-echo "Go to: http://localhost:9082/$appname"
-echo
Index: rctags/ehcache-2.10.8.2.20/terracotta/bootstrap/src/main/java/org/terracotta/modules/ehcache/writebehind/KeyBasedOperationWrapper.java
===================================================================
diff -u -N
--- rctags/ehcache-2.10.8.2.20/terracotta/bootstrap/src/main/java/org/terracotta/modules/ehcache/writebehind/KeyBasedOperationWrapper.java (revision 11355)
+++ rctags/ehcache-2.10.8.2.20/terracotta/bootstrap/src/main/java/org/terracotta/modules/ehcache/writebehind/KeyBasedOperationWrapper.java (revision 0)
@@ -1,24 +0,0 @@
-/*
- * All content copyright Terracotta, Inc., unless otherwise indicated. All rights reserved.
- */
-package org.terracotta.modules.ehcache.writebehind;
-
-import net.sf.ehcache.writer.writebehind.operations.KeyBasedOperation;
-
-public class KeyBasedOperationWrapper implements KeyBasedOperation {
- private final Object key;
- private final long creationTime;
-
- public KeyBasedOperationWrapper(Object key, long creationTime) {
- this.key = key;
- this.creationTime = creationTime;
- }
-
- public Object getKey() {
- return key;
- }
-
- public long getCreationTime() {
- return creationTime;
- }
-}
Index: rctags/ehcache-2.10.8.2.20/system-tests/src/test/resources/servermap/servermap-l2-eviction-reaches-one-l1-test.xml
===================================================================
diff -u -N
--- rctags/ehcache-2.10.8.2.20/system-tests/src/test/resources/servermap/servermap-l2-eviction-reaches-one-l1-test.xml (revision 11355)
+++ rctags/ehcache-2.10.8.2.20/system-tests/src/test/resources/servermap/servermap-l2-eviction-reaches-one-l1-test.xml (revision 0)
@@ -1,27 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
Index: rctags/ehcache-2.10.8.2.20/ehcache/src/test/resources/serializedforms/SerializationCopyStrategySerializationTest.testBasic.ser
===================================================================
diff -u -N -r11355 -r11388
Binary files differ
Index: rctags/ehcache-2.10.8.2.20/system-tests/src/test/java/org/terracotta/ehcache/tests/NonHibernateCacheDecorator.java
===================================================================
diff -u -N
--- rctags/ehcache-2.10.8.2.20/system-tests/src/test/java/org/terracotta/ehcache/tests/NonHibernateCacheDecorator.java (revision 11355)
+++ rctags/ehcache-2.10.8.2.20/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.8.2.20/ehcache-core/src/main/java/net/sf/ehcache/pool/sizeof/AgentLoader.java
===================================================================
diff -u -N
--- rctags/ehcache-2.10.8.2.20/ehcache-core/src/main/java/net/sf/ehcache/pool/sizeof/AgentLoader.java (revision 11355)
+++ rctags/ehcache-2.10.8.2.20/ehcache-core/src/main/java/net/sf/ehcache/pool/sizeof/AgentLoader.java (revision 0)
@@ -1,242 +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.sizeof;
-
-import net.sf.ehcache.config.MemoryUnit;
-
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import java.io.File;
-import java.io.FileOutputStream;
-import java.io.IOException;
-import java.io.InputStream;
-import java.lang.instrument.Instrumentation;
-import java.lang.management.ManagementFactory;
-import java.lang.reflect.InvocationTargetException;
-import java.lang.reflect.Method;
-import java.net.URISyntaxException;
-import java.net.URL;
-import java.net.URLClassLoader;
-import java.security.AccessController;
-import java.security.PrivilegedActionException;
-import java.security.PrivilegedExceptionAction;
-import java.util.ArrayList;
-import java.util.List;
-
-/**
- * This will try to load the agent using the Attach API of JDK6.
- * If you are on an older JDK (v5) you can still use the agent by adding the -javaagent:[pathTojar] to your VM
- * startup script
- *
- * @author Alex Snaps
- */
-final class AgentLoader {
-
- private static final Logger LOGGER = LoggerFactory.getLogger(AgentLoader.class);
-
- private static final String INSTRUMENTATION_INSTANCE_SYSTEM_PROPERTY_NAME = "net.sf.ehcache.sizeof.agent.instrumentation";
- private static final String SIZEOF_AGENT_CLASSNAME = "net.sf.ehcache.pool.sizeof.SizeOfAgent";
- private static final String VIRTUAL_MACHINE_CLASSNAME = "com.sun.tools.attach.VirtualMachine";
- private static final Method VIRTUAL_MACHINE_ATTACH;
- private static final Method VIRTUAL_MACHINE_DETACH;
- private static final Method VIRTUAL_MACHINE_LOAD_AGENT;
-
- private static volatile Instrumentation instrumentation;
-
- static {
- Method attach = null;
- Method detach = null;
- Method loadAgent = null;
- try {
- Class virtualMachineClass = getVirtualMachineClass();
- attach = virtualMachineClass.getMethod("attach", String.class);
- detach = virtualMachineClass.getMethod("detach");
- loadAgent = virtualMachineClass.getMethod("loadAgent", String.class);
- } catch (Throwable e) {
- LOGGER.info("Unavailable or unrecognised attach API : {}", e.toString());
- }
- VIRTUAL_MACHINE_ATTACH = attach;
- VIRTUAL_MACHINE_DETACH = detach;
- VIRTUAL_MACHINE_LOAD_AGENT = loadAgent;
- }
-
- private static Class getVirtualMachineClass() throws ClassNotFoundException {
- try {
- return AccessController.doPrivileged(new PrivilegedExceptionAction>() {
- public Class run() throws Exception {
- try {
- return ClassLoader.getSystemClassLoader().loadClass(VIRTUAL_MACHINE_CLASSNAME);
- } catch (ClassNotFoundException cnfe) {
- for (File jar : getPossibleToolsJars()) {
- try {
- Class vmClass = new URLClassLoader(new URL[] {jar.toURL()}).loadClass(VIRTUAL_MACHINE_CLASSNAME);
- LOGGER.info("Located valid 'tools.jar' at '{}'", jar);
- return vmClass;
- } catch (Throwable t) {
- LOGGER.info("Exception while loading tools.jar from '{}': {}", jar, t);
- }
- }
- throw new ClassNotFoundException(VIRTUAL_MACHINE_CLASSNAME);
- }
- }
- });
- } catch (PrivilegedActionException pae) {
- Throwable actual = pae.getCause();
- if (actual instanceof ClassNotFoundException) {
- throw (ClassNotFoundException) actual;
- }
- throw new AssertionError("Unexpected checked exception : " + actual);
- }
- }
-
- private static List getPossibleToolsJars() {
- List jars = new ArrayList();
-
- File javaHome = new File(System.getProperty("java.home"));
- File jreSourced = new File(javaHome, "lib/tools.jar");
- if (jreSourced.exists()) {
- jars.add(jreSourced);
- }
- if ("jre".equals(javaHome.getName())) {
- File jdkHome = new File(javaHome, "../");
- File jdkSourced = new File(jdkHome, "lib/tools.jar");
- if (jdkSourced.exists()) {
- jars.add(jdkSourced);
- }
- }
- return jars;
- }
-
- /**
- * Attempts to load the agent through the Attach API
- * @return true if agent was loaded (which could have happened thought the -javaagent switch)
- */
- static boolean loadAgent() {
- synchronized (AgentLoader.class.getName().intern()) {
- if (!agentIsAvailable() && VIRTUAL_MACHINE_LOAD_AGENT != null) {
- try {
- warnIfOSX();
- String name = ManagementFactory.getRuntimeMXBean().getName();
- Object vm = VIRTUAL_MACHINE_ATTACH.invoke(null, name.substring(0, name.indexOf('@')));
- try {
- File agent = getAgentFile();
- LOGGER.info("Trying to load agent @ {}", agent);
- if (agent != null) {
- VIRTUAL_MACHINE_LOAD_AGENT.invoke(vm, agent.getAbsolutePath());
- }
- } finally {
- VIRTUAL_MACHINE_DETACH.invoke(vm);
- }
- } catch (InvocationTargetException ite) {
- Throwable cause = ite.getCause();
- LOGGER.info("Failed to attach to VM and load the agent: {}: {}", cause.getClass(), cause.getMessage());
- } catch (Throwable t) {
- LOGGER.info("Failed to attach to VM and load the agent: {}: {}", t.getClass(), t.getMessage());
- }
- }
-
- return agentIsAvailable();
- }
- }
-
- private static void warnIfOSX() {
- if (JvmInformation.isOSX() && System.getProperty("java.io.tmpdir") != null) {
- LOGGER.warn("Loading the SizeOfAgent will probably fail, as you are running on Apple OS X and have a value set for java.io.tmpdir\n" +
- "They both result in a bug, not yet fixed by Apple, that won't let us attach to the VM and load the agent.\n" +
- "Most probably, you'll also get a full thread-dump after this because of the failure... Nothing to worry about!\n" +
- "You can bypass trying to load the Agent entirely by setting the System property '"
- + net.sf.ehcache.pool.sizeof.AgentSizeOf.BYPASS_LOADING + "' to true");
- }
- }
-
- private static File getAgentFile() throws IOException, URISyntaxException {
- URL agent = AgentLoader.class.getResource("sizeof-agent.jar");
- if (agent == null) {
- return null;
- } else if (agent.getProtocol().equals("file")) {
- return new File(agent.toURI());
- } else {
- File temp = File.createTempFile("ehcache-sizeof-agent", ".jar");
- try {
- FileOutputStream fout = new FileOutputStream(temp);
- try {
- InputStream in = agent.openStream();
- try {
- byte[] buffer = new byte[(int)MemoryUnit.KILOBYTES.toBytes(1)];
- while (true) {
- int read = in.read(buffer);
- if (read < 0) {
- break;
- } else {
- fout.write(buffer, 0, read);
- }
- }
- } finally {
- in.close();
- }
- } finally {
- fout.close();
- }
- } finally {
- temp.deleteOnExit();
- }
- LOGGER.info("Extracted agent jar to temporary file {}", temp);
- return temp;
- }
- }
-
- /**
- * Checks whether the agent is available
- * @return true if available
- */
- static boolean agentIsAvailable() {
- try {
- if (instrumentation == null) {
- instrumentation = (Instrumentation)System.getProperties().get(INSTRUMENTATION_INSTANCE_SYSTEM_PROPERTY_NAME);
- }
- if (instrumentation == null) {
- Class sizeOfAgentClass = ClassLoader.getSystemClassLoader().loadClass(SIZEOF_AGENT_CLASSNAME);
- Method getInstrumentationMethod = sizeOfAgentClass.getMethod("getInstrumentation");
- instrumentation = (Instrumentation)getInstrumentationMethod.invoke(sizeOfAgentClass);
- }
- return instrumentation != null;
- } catch (SecurityException e) {
- LOGGER.warn("Couldn't access the system classloader because of the security policies applied by " +
- "the security manager. You either want to loosen these, so ClassLoader.getSystemClassLoader() and " +
- "reflection API calls are permitted or the sizing will be done using some other mechanism.\n" +
- "Alternatively, set the system property net.sf.ehcache.sizeof.agent.instrumentationSystemProperty to true " +
- "to have the agent put the required instances in the System Properties for the loader to access.");
- return false;
- } catch (Throwable e) {
- return false;
- }
- }
-
- /**
- * Returns the size of this Java object as calculated by the loaded agent.
- *
- * @param obj object to be sized
- * @return size of the object in bytes
- */
- static long agentSizeOf(Object obj) {
- if (instrumentation == null) {
- throw new UnsupportedOperationException("Sizeof agent is not available");
- }
- return instrumentation.getObjectSize(obj);
- }
-}
Index: rctags/ehcache-2.10.8.2.20/system-tests/src/test/java/org/terracotta/ehcache/tests/HttpUrlConfigCacheTest.java
===================================================================
diff -u -N
--- rctags/ehcache-2.10.8.2.20/system-tests/src/test/java/org/terracotta/ehcache/tests/HttpUrlConfigCacheTest.java (revision 11355)
+++ rctags/ehcache-2.10.8.2.20/system-tests/src/test/java/org/terracotta/ehcache/tests/HttpUrlConfigCacheTest.java (revision 0)
@@ -1,36 +0,0 @@
-/*
- * All content copyright (c) 2003-2008 Terracotta, Inc., except as may otherwise be noted in a separate copyright
- * notice. All rights reserved.
- */
-package org.terracotta.ehcache.tests;
-
-import net.sf.ehcache.Cache;
-import net.sf.ehcache.Element;
-
-import org.terracotta.toolkit.Toolkit;
-
-import com.tc.test.config.model.TestConfig;
-
-import junit.framework.Assert;
-
-public class HttpUrlConfigCacheTest extends AbstractCacheTestBase {
-
- public HttpUrlConfigCacheTest(TestConfig testConfig) {
- super("http-url-config-cache-test.xml", testConfig, Client.class);
- }
-
- public static class Client extends ClientBase {
-
- public Client(String[] args) {
- super("test", args);
- }
-
- @Override
- protected void runTest(Cache cache, Toolkit myToolkit) throws Throwable {
- cache.put(new Element("key", "value"));
- Assert.assertEquals("value", cache.get("key").getObjectValue());
- }
-
- }
-
-}
Index: rctags/ehcache-2.10.8.2.20/ehcache-core/src/test/java/net/sf/ehcache/CachePoolPinningTest.java
===================================================================
diff -u -N
--- rctags/ehcache-2.10.8.2.20/ehcache-core/src/test/java/net/sf/ehcache/CachePoolPinningTest.java (revision 11355)
+++ rctags/ehcache-2.10.8.2.20/ehcache-core/src/test/java/net/sf/ehcache/CachePoolPinningTest.java (revision 0)
@@ -1,122 +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 junit.framework.Assert;
-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.PinningConfiguration;
-import org.junit.After;
-import org.junit.Before;
-import org.junit.Ignore;
-import org.junit.Test;
-
-
-import static org.junit.Assert.assertNotNull;
-
-/**
- * Tests for Cache pinning with pools
- *
- * @author Ludovic Orban
- */
-public class CachePoolPinningTest {
-
- private static final int ELEMENT_COUNT = 4000;
-
- private CacheManager cacheManager;
-
- @Before
- public void setUp() throws Exception {
- cacheManager = new CacheManager(
- new Configuration()
- .diskStore(new DiskStoreConfiguration().path(System.getProperty("java.io.tmpdir")))
- .maxBytesLocalHeap(100, MemoryUnit.KILOBYTES)
- .maxBytesLocalDisk(200, MemoryUnit.KILOBYTES)
- );
- }
-
- @After
- public void tearDown() {
- cacheManager.shutdown();
- cacheManager = null;
- }
-
- @Test
- public void testClassicLru() throws Exception {
- System.setProperty(Cache.NET_SF_EHCACHE_USE_CLASSIC_LRU, "true");
- try {
- testMemoryOnly();
- } finally {
- System.setProperty(Cache.NET_SF_EHCACHE_USE_CLASSIC_LRU, "false");
- }
- }
-
- @Test
- public void testMemoryOnly() throws Exception {
- cacheManager.addCache(new Cache(
- new CacheConfiguration()
- .name("memoryOnlyCache_inCache")
- .overflowToDisk(false)
- .pinning(new PinningConfiguration().store(PinningConfiguration.Store.INCACHE))
- ));
- doAssertions(cacheManager.getCache("memoryOnlyCache_inCache"), ELEMENT_COUNT, 0);
- }
-
- @Test
- @Ignore
- public void testOverflowToDisk() throws Exception {
- cacheManager.addCache(new Cache(
- new CacheConfiguration()
- .name("overflowToDiskCache_inCache")
- .pinning(new PinningConfiguration().store(PinningConfiguration.Store.INCACHE))
- ));
- doAssertions(cacheManager.getCache("overflowToDiskCache_inCache"), 0, ELEMENT_COUNT);
- }
-
- @Test
- @Ignore
- public void testDiskPersistent() throws Exception {
- cacheManager.addCache(new Cache(
- new CacheConfiguration()
- .diskPersistent(true)
- .name("diskPersistentCache_inCache")
- .pinning(new PinningConfiguration().store(PinningConfiguration.Store.INCACHE))
- ));
- doAssertions(cacheManager.getCache("diskPersistentCache_inCache"), 0, ELEMENT_COUNT);
- }
-
- private void doAssertions(Cache cache, long expectedMemoryHits, long expectedDiskHits) {
- for (int i = 0; i < ELEMENT_COUNT; i++) {
- cache.put(new Element(i, i));
- }
-
- Assert.assertEquals(ELEMENT_COUNT, cache.getSize());
-
- for (int i = 0; i < ELEMENT_COUNT; i++) {
- assertNotNull(cache.get(i));
- }
-
- Assert.assertEquals(expectedMemoryHits, cache.getStatistics().localHeapHitCount());
- Assert.assertEquals(ELEMENT_COUNT - expectedMemoryHits, cache.getStatistics().localHeapMissCount());
- Assert.assertEquals(expectedDiskHits, cache.getStatistics().localDiskHitCount());
- Assert.assertEquals(0, cache.getStatistics().localDiskMissCount());
- }
-
-}
-
Index: rctags/ehcache-2.10.8.2.20/ehcache-core/src/test/resources/ehcache-conflict-eternal.xml
===================================================================
diff -u -N
--- rctags/ehcache-2.10.8.2.20/ehcache-core/src/test/resources/ehcache-conflict-eternal.xml (revision 11355)
+++ rctags/ehcache-2.10.8.2.20/ehcache-core/src/test/resources/ehcache-conflict-eternal.xml (revision 0)
@@ -1,16 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
Index: rctags/ehcache-2.10.8.2.20/ehcache-core/src/main/java/net/sf/ehcache/store/MemoryStoreEvictionPolicy.java
===================================================================
diff -u -N
--- rctags/ehcache-2.10.8.2.20/ehcache-core/src/main/java/net/sf/ehcache/store/MemoryStoreEvictionPolicy.java (revision 11355)
+++ rctags/ehcache-2.10.8.2.20/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.8.2.20/system-tests/src/test/resources/basic-xa-test.xml
===================================================================
diff -u -N
--- rctags/ehcache-2.10.8.2.20/system-tests/src/test/resources/basic-xa-test.xml (revision 11355)
+++ rctags/ehcache-2.10.8.2.20/system-tests/src/test/resources/basic-xa-test.xml (revision 0)
@@ -1,27 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
Index: rctags/ehcache-2.10.8.2.20/system-tests/src/test/resources/byteman/LocalTxTestDebug.btm
===================================================================
diff -u -N
--- rctags/ehcache-2.10.8.2.20/system-tests/src/test/resources/byteman/LocalTxTestDebug.btm (revision 11355)
+++ rctags/ehcache-2.10.8.2.20/system-tests/src/test/resources/byteman/LocalTxTestDebug.btm (revision 0)
@@ -1,77 +0,0 @@
-
-
-RULE trace ServerMap gets
-CLASS ServerMap
-METHOD doGet
-AT EXIT
-#IF NOT $getType.name().equals("UNSAFE")
-IF false
-DO traceln(" ____ ServerMap.doGet key.hashCode(): \"" + $key.hashCode() + "\", \"" + $getType + "\", \"" + $quiet + " -> " + $!);
-ENDRULE
-
-RULE trace ServerMap puts
-CLASS ServerMap
-METHOD doLogicalPut
-AT ENTRY
-IF false
-DO traceln(" _____ ServerMap.doLogicalPut - key.hashCode(): \"" + $key.hashCode() + "\", mutateType: \"" + $type + "\", value: \"" + $value);
-ENDRULE
-
-
-RULE trace ServerMap removes
-CLASS ServerMap
-METHOD doLogicalRemove
-AT ENTRY
-IF false
-DO traceln(" _____ ServerMap.doLogicalRemove - key.hashCode(): \"" + $key.hashCode() + "\", mutateType: \"" + $type);
-ENDRULE
-
-RULE trace clusteredStore doPut
-CLASS ClusteredStore
-METHOD doPut
-AT EXIT
-IF false
-DO traceln(" _____ ClusteredStore.doPut - pkey.hashCode(): \"" + $portableKey.hashCode() + "\", return: \"" + $!);
-ENDRULE
-
-RULE trace clusteredStore replace
-CLASS ClusteredStore
-METHOD replace(Element,Element,ElementValueComparator)
-AT EXIT
-IF false
-DO traceln(" _____ ClusteredStore.replace old: "+$old+" element: "+$element+" return: \"" + $!);
-ENDRULE
-
-RULE trace CustomLifespanSerializedEntry isExpired
-CLASS CustomLifespanSerializedEntry
-METHOD isExpired
-AT EXIT
-IF false
-DO traceln(" _____ CustomLifespanSerializedEntry isExpired atTime: " +$atTime+ " maxTTISeconds: "+$maxTTISeconds+" maxTTLSeconds: "+$maxTTLSeconds+" lastAccessedTime: "+$0.lastAccessedTime+" createTime: "+$0.createTime+" return: " + $!);
-ENDRULE
-
-RULE trace ServerMap createSerializedEntry
-CLASS ServerMap
-METHOD createSerializedEntry
-AT ENTRY
-IF false
-DO traceln(" _____XXX ServerMap createSerializedEntry createTime: "+$createTimeInSecs+" now: " + $0.timeSource.now());
-ENDRULE
-
-RULE trace DefaultElementValueComparator
-CLASS DefaultElementValueComparator
-METHOD equals(Element, Element)
-AT ENTRY
-IF false
-DO traceln(" _____XXX DefaultElementValueComparator: e1: " + $e1 + ", e2: " + $e2);
-ENDRULE
-
-
-RULE trace EhcacheTxnsClusteredStateFacadeImpl clear
-CLASS EhcacheTxnsClusteredStateFacadeImpl
-METHOD clearSoftLock
-AT ENTRY
-IF false
-DO traceln(" _____XXX clearSoftLock: softLockId: " + $softLockId);
-ENDRULE
-
Index: rctags/ehcache-2.10.8.2.20/ehcache-core/src/main/java/net/sf/ehcache/transaction/SoftLockFactory.java
===================================================================
diff -u -N
--- rctags/ehcache-2.10.8.2.20/ehcache-core/src/main/java/net/sf/ehcache/transaction/SoftLockFactory.java (revision 11355)
+++ rctags/ehcache-2.10.8.2.20/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.8.2.20/ehcache-core/src/main/java/net/sf/ehcache/store/LfuPolicy.java
===================================================================
diff -u -N
--- rctags/ehcache-2.10.8.2.20/ehcache-core/src/main/java/net/sf/ehcache/store/LfuPolicy.java (revision 11355)
+++ rctags/ehcache-2.10.8.2.20/ehcache-core/src/main/java/net/sf/ehcache/store/LfuPolicy.java (revision 0)
@@ -1,57 +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;
-
-
-/**
- * Contains common LFU policy code for use between the LfuMemoryStore and the DiskStore, which also
- * uses an LfuPolicy for evictions.
- *
- * @author Greg Luck
- * @version $Id: LfuPolicy.java 5594 2012-05-07 16:04:31Z cdennis $
- */
-public class LfuPolicy extends AbstractPolicy {
-
- /**
- * The name of this policy as a string literal
- */
- public static final String NAME = "LFU";
-
- /**
- * @return the name of the Policy. Inbuilt examples are LRU, LFU and FIFO.
- */
- public String getName() {
- return NAME;
- }
-
- /**
- * Compares the desirableness for eviction of two elements
- *
- * Compares hit counts. If both zero,
- *
- * @param element1 the element to compare against
- * @param element2 the element to compare
- * @return true if the second element is preferable to the first element for ths policy
- */
- public boolean compare(Element element1, Element element2) {
- return element2.getHitCount() < element1.getHitCount();
-
- }
-
-}
Index: rctags/ehcache-2.10.8.2.20/ehcache-core/src/test/java/net/sf/ehcache/search/DynamicAttributeExtractorTest.java
===================================================================
diff -u -N
--- rctags/ehcache-2.10.8.2.20/ehcache-core/src/test/java/net/sf/ehcache/search/DynamicAttributeExtractorTest.java (revision 11355)
+++ rctags/ehcache-2.10.8.2.20/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.8.2.20/ehcache-core/src/main/java/net/sf/ehcache/event/RegisteredEventListeners.java
===================================================================
diff -u -N
--- rctags/ehcache-2.10.8.2.20/ehcache-core/src/main/java/net/sf/ehcache/event/RegisteredEventListeners.java (revision 11355)
+++ rctags/ehcache-2.10.8.2.20/ehcache-core/src/main/java/net/sf/ehcache/event/RegisteredEventListeners.java (revision 0)
@@ -1,619 +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.event;
-
-import net.sf.ehcache.Cache;
-import net.sf.ehcache.CacheException;
-import net.sf.ehcache.CacheOperationOutcomes;
-import net.sf.ehcache.CacheOperationOutcomes.ExpiredOutcome;
-import net.sf.ehcache.CacheStoreHelper;
-import net.sf.ehcache.Ehcache;
-import net.sf.ehcache.Element;
-import net.sf.ehcache.Status;
-import net.sf.ehcache.distribution.CacheReplicator;
-import net.sf.ehcache.store.TerracottaStore;
-import org.terracotta.statistics.StatisticsManager;
-import org.terracotta.statistics.observer.OperationObserver;
-
-import java.util.HashSet;
-import java.util.Iterator;
-import java.util.Set;
-import java.util.concurrent.CopyOnWriteArraySet;
-import java.util.concurrent.atomic.AtomicBoolean;
-
-import static net.sf.ehcache.statistics.StatisticBuilder.operation;
-
-/**
- * Registered listeners for registering and unregistering CacheEventListeners and multicasting notifications to registrants.
- *
- * There is one of these per Cache.
- *
- * @author Greg Luck
- * @author Geert Bevin
- * @version $Id: RegisteredEventListeners.java 10789 2018-04-26 02:08:13Z adahanne $
- */
-public class RegisteredEventListeners {
-
- /**
- * A Set of CacheEventListeners keyed by listener instance.
- * CacheEventListener implementations that will be notified of this cache's events.
- *
- * @see CacheEventListener
- */
- private final Set cacheEventListeners = new CopyOnWriteArraySet();
- private final Set orderedListeners = new CopyOnWriteArraySet();
- private final Ehcache cache;
-
- private final AtomicBoolean hasReplicator = new AtomicBoolean(false);
-
- private final CacheStoreHelper helper;
-
- private final OperationObserver expiryObserver = operation(ExpiredOutcome.class).named("expiry")
- .of(this).tag("cache").build();
-
- /**
- * Constructs a new notification service
- *
- * @param cache
- */
- public RegisteredEventListeners(Cache cache) {
- this(cache, new CacheStoreHelper(cache));
- }
-
- /**
- * Construct a registered event listeners service
- *
- * @param cache the {@link Cache}
- * @param helper helper for getting the {@link net.sf.ehcache.store.Store} out of the {@link Cache}
- */
- public RegisteredEventListeners(Ehcache cache, CacheStoreHelper helper) {
- //XXX this isn't really very nice
- StatisticsManager.associate(this).withParent(cache);
- this.cache = cache;
- this.helper = helper;
- }
-
- /**
- * Notifies {@link InternalCacheEventListener}s, when an update happens
- * @param oldElement the old element
- * @param newElement the new element
- */
- public final void notifyElementUpdatedOrdered(Element oldElement, Element newElement) {
- if (!orderedListeners.isEmpty()) {
- for (InternalCacheEventListener listener : orderedListeners) {
- listener.notifyElementRemoved(cache, oldElement);
- listener.notifyElementPut(cache, newElement);
- }
- }
- }
-
- /**
- * Notifies {@link InternalCacheEventListener}s, when a remove happens
- * @param element the element removes
- */
- public final void notifyElementRemovedOrdered(Element element) {
- if (!orderedListeners.isEmpty()) {
- for (InternalCacheEventListener listener : orderedListeners) {
- listener.notifyElementRemoved(cache, element);
- }
- }
- }
-
- /**
- * Notifies {@link InternalCacheEventListener}s, when a put happens
- * @param element the element put
- */
- public final void notifyElementPutOrdered(Element element) {
- if (!orderedListeners.isEmpty()) {
- for (InternalCacheEventListener listener : orderedListeners) {
- listener.notifyElementPut(cache, element);
- }
- }
- }
-
- /**
- * Notifies all registered listeners, in no guaranteed order, that an element was removed
- *
- * @param element
- * @param remoteEvent whether the event came from a remote cache peer
- * @see CacheEventListener#notifyElementRemoved
- */
- public final void notifyElementRemoved(Element element, boolean remoteEvent) throws CacheException {
- internalNotifyElementRemoved(element, null, remoteEvent);
- }
-
- /**
- * Notifies all registered listeners, in no guaranteed order, that an element was removed
- *
- * @param callback
- * @param remoteEvent whether the event came from a remote cache peer
- * @see CacheEventListener#notifyElementRemoved
- */
- public final void notifyElementRemoved(ElementCreationCallback callback, boolean remoteEvent) throws CacheException {
- internalNotifyElementRemoved(null, callback, remoteEvent);
- }
-
- void internalNotifyElementRemoved(Element element, ElementCreationCallback callback, boolean remoteEvent) {
- if (hasCacheEventListeners()) {
- for (ListenerWrapper listenerWrapper : cacheEventListeners) {
- if (listenerWrapper.getScope().shouldDeliver(remoteEvent)
- && !isCircularNotification(remoteEvent, listenerWrapper.getListener())) {
- CacheEventListener listener = listenerWrapper.getListener();
- listener.notifyElementRemoved(cache, resolveElement(listener, element, callback));
- }
- }
- }
- }
-
- /**
- * Notifies all registered listeners, in no guaranteed order, that an element was put into the cache
- *
- * @param element
- * @param remoteEvent whether the event came from a remote cache peer
- * @see CacheEventListener#notifyElementPut(net.sf.ehcache.Ehcache,net.sf.ehcache.Element)
- */
- public final void notifyElementPut(Element element, boolean remoteEvent) throws CacheException {
- internalNotifyElementPut(element, null, remoteEvent);
- }
-
- /**
- * Notifies all registered listeners, in no guaranteed order, that an element was put into the cache
- *
- * @param callback
- * @param remoteEvent whether the event came from a remote cache peer
- * @see CacheEventListener#notifyElementPut(net.sf.ehcache.Ehcache,net.sf.ehcache.Element)
- */
-
- public final void notifyElementPut(ElementCreationCallback callback, boolean remoteEvent) throws CacheException {
- internalNotifyElementPut(null, callback, remoteEvent);
- }
-
- void internalNotifyElementPut(Element element, ElementCreationCallback callback, boolean remoteEvent) {
- if (hasCacheEventListeners()) {
- for (ListenerWrapper listenerWrapper : cacheEventListeners) {
- if (listenerWrapper.getScope().shouldDeliver(remoteEvent)
- && !isCircularNotification(remoteEvent, listenerWrapper.getListener())) {
- CacheEventListener listener = listenerWrapper.getListener();
-
- listener.notifyElementPut(cache, resolveElement(listener, element, callback));
- }
- }
- }
- }
-
- /**
- * Notifies all registered listeners, in no guaranteed order, that an element in the cache was updated
- *
- * @param element
- * @param remoteEvent whether the event came from a remote cache peer
- * @see CacheEventListener#notifyElementPut(net.sf.ehcache.Ehcache,net.sf.ehcache.Element)
- */
- public final void notifyElementUpdated(Element element, boolean remoteEvent) {
- internalNotifyElementUpdated(element, null, remoteEvent);
- }
-
- /**
- * Notifies all registered listeners, in no guaranteed order, that an element in the cache was updated
- *
- * @param callback
- * @param remoteEvent whether the event came from a remote cache peer
- * @see CacheEventListener#notifyElementPut(net.sf.ehcache.Ehcache,net.sf.ehcache.Element)
- */
-
- public final void notifyElementUpdated(ElementCreationCallback callback, boolean remoteEvent) {
- internalNotifyElementUpdated(null, callback, remoteEvent);
- }
-
- void internalNotifyElementUpdated(Element element, ElementCreationCallback callback, boolean remoteEvent) {
- if (hasCacheEventListeners()) {
- for (ListenerWrapper listenerWrapper : cacheEventListeners) {
- if (listenerWrapper.getScope().shouldDeliver(remoteEvent)
- && !isCircularNotification(remoteEvent, listenerWrapper.getListener())) {
- CacheEventListener listener = listenerWrapper.getListener();
-
- listener.notifyElementUpdated(cache, resolveElement(listener, element, callback));
- }
- }
- }
- }
-
- /**
- * Notifies all registered listeners, in no guaranteed order, that an element has expired
- *
- * @param element the Element to perform the notification on
- * @param remoteEvent whether the event came from a remote cache peer
- * @see CacheEventListener#notifyElementExpired
- */
- public final void notifyElementExpiry(Element element, boolean remoteEvent) {
- internalNotifyElementExpiry(element, null, remoteEvent);
- }
-
- /**
- * Notifies all registered listeners, in no guaranteed order, that an element has expired
- *
- * @param callback
- * @param remoteEvent whether the event came from a remote cache peer
- * @see CacheEventListener#notifyElementExpired
- */
-
- public final void notifyElementExpiry(ElementCreationCallback callback, boolean remoteEvent) {
- internalNotifyElementExpiry(null, callback, remoteEvent);
- }
-
- void internalNotifyElementExpiry(Element element, ElementCreationCallback callback, boolean remoteEvent) {
- if (!remoteEvent) {
- expiryObserver.begin();
- expiryObserver.end(ExpiredOutcome.SUCCESS);
- }
- if (hasCacheEventListeners()) {
- for (ListenerWrapper listenerWrapper : cacheEventListeners) {
- if (listenerWrapper.getScope().shouldDeliver(remoteEvent)
- && !isCircularNotification(remoteEvent, listenerWrapper.getListener())) {
- CacheEventListener listener = listenerWrapper.getListener();
-
- listener.notifyElementExpired(cache, resolveElement(listener, element, callback));
- }
- }
- }
- }
-
- /**
- * Returns whether or not at least one cache event listeners has been registered.
- *
- * @return true if a one or more listeners have registered, otherwise false
- */
- public final boolean hasCacheEventListeners() {
- return !cacheEventListeners.isEmpty();
- }
-
- /**
- * Notifies all registered listeners, in no guaranteed order, that an element has been
- * evicted from the cache
- *
- * @param element the Element to perform the notification on
- * @param remoteEvent whether the event came from a remote cache peer
- * @see CacheEventListener#notifyElementEvicted
- */
- public final void notifyElementEvicted(Element element, boolean remoteEvent) {
- internalNotifyElementEvicted(element, null, remoteEvent);
- }
-
- /**
- * Notifies all registered listeners, in no guaranteed order, that an element has been
- * evicted from the cache
- *
- * @param callback
- * @param remoteEvent whether the event came from a remote cache peer
- * @see CacheEventListener#notifyElementEvicted
- */
-
- public final void notifyElementEvicted(ElementCreationCallback callback, boolean remoteEvent) {
- internalNotifyElementEvicted(null, callback, remoteEvent);
- }
-
- void internalNotifyElementEvicted(Element element, ElementCreationCallback callback, boolean remoteEvent) {
- if (hasCacheEventListeners()) {
- for (ListenerWrapper listenerWrapper : cacheEventListeners) {
- if (listenerWrapper.getScope().shouldDeliver(remoteEvent)
- && !isCircularNotification(remoteEvent, listenerWrapper.getListener())) {
- CacheEventListener listener = listenerWrapper.getListener();
-
- listener.notifyElementEvicted(cache, resolveElement(listener, element, callback));
- }
- }
- }
- }
-
- private Element resolveElement(final CacheEventListener listener, final Element element, final ElementCreationCallback callback) {
- if (callback != null) {
- return callback.createElement(listener.getClass().getClassLoader());
- } else {
- return element;
- }
- }
-
- /**
- * Notifies all registered listeners, in no guaranteed order, that removeAll
- * has been called and all elements cleared
- *
- * @param remoteEvent whether the event came from a remote cache peer
- * @see CacheEventListener#notifyElementEvicted
- */
- public final void notifyRemoveAll(boolean remoteEvent) {
- if (hasCacheEventListeners()) {
- for (ListenerWrapper listenerWrapper : cacheEventListeners) {
- if (listenerWrapper.getScope().shouldDeliver(remoteEvent)
- && !isCircularNotification(remoteEvent, listenerWrapper.getListener())) {
- listenerWrapper.getListener().notifyRemoveAll(cache);
- }
- }
- }
- }
-
- /**
- * CacheReplicators should not be notified of events received remotely, as this would cause
- * a circular notification
- *
- * @param remoteEvent
- * @param cacheEventListener
- * @return true is notifiying the listener would cause a circular notification
- */
- private static boolean isCircularNotification(boolean remoteEvent, CacheEventListener cacheEventListener) {
- return remoteEvent
- && (cacheEventListener instanceof CacheReplicator || cacheEventListener instanceof TerracottaCacheEventReplication);
- }
-
-
- /**
- * Adds a listener to the notification service. No guarantee is made that listeners will be
- * notified in the order they were added.
- *
- * @param cacheEventListener
- * @return true if the listener is being added and was not already added
- */
- public final boolean registerListener(CacheEventListener cacheEventListener) {
- return registerListener(cacheEventListener, NotificationScope.ALL);
- }
-
- /**
- * Adds a listener to the notification service. No guarantee is made that listeners will be
- * notified in the order they were added.
- *
- * If a cache is configured in a cluster, listeners in each node will get triggered by an event
- * depending on the value of the
listenFor
parameter.
- *
- * @param cacheEventListener The listener to add
- * @param scope The notification scope
- * @return true if the listener is being added and was not already added
- * @since 2.0
- */
- public final boolean registerListener(CacheEventListener cacheEventListener, NotificationScope scope) {
- if (cacheEventListener == null) {
- return false;
- }
- boolean result = cacheEventListeners.add(new ListenerWrapper(cacheEventListener, scope));
- if (result && cacheEventListener instanceof CacheReplicator) {
- this.hasReplicator.set(true);
- }
- if (result) {
- notifyEventListenersChangedIfNecessary();
- }
- return result;
- }
-
- /**
- * Adds a listener to the notification service. No guarantee is made that listeners will be
- * notified in the order they were added.
- *
- *
- * @param cacheEventListener The listener to add
- * @return true if the listener is being added and was not already added
- * @since 2.8
- */
- final boolean registerOrderedListener(InternalCacheEventListener cacheEventListener) {
- if (cacheEventListener == null) {
- return false;
- }
- return orderedListeners.add(cacheEventListener);
- }
-
- /**
- * Removes a listener from the notification service.
- *
- * @param cacheEventListener
- * @return true if the listener was present
- */
- public final boolean unregisterListener(CacheEventListener cacheEventListener) {
- boolean result = false;
- int cacheReplicators = 0;
- Iterator it = cacheEventListeners.iterator();
- while (it.hasNext()) {
- ListenerWrapper listenerWrapper = it.next();
- if (listenerWrapper.getListener().equals(cacheEventListener)) {
- cacheEventListeners.remove(listenerWrapper);
- result = true;
- } else {
- if (listenerWrapper.getListener() instanceof CacheReplicator) {
- cacheReplicators++;
- }
- }
- }
-
- if (cacheReplicators > 0) {
- hasReplicator.set(true);
- } else {
- hasReplicator.set(false);
- }
- if (result) {
- notifyEventListenersChangedIfNecessary();
- }
- return result;
- }
-
- /**
- * Removes a listener from the notification service.
- *
- * @param cacheEventListener
- * @return true if the listener was present
- */
- final boolean unregisterOrderedListener(InternalCacheEventListener cacheEventListener) {
- return orderedListeners.remove(cacheEventListener);
- }
-
- /**
- * Determines whether any registered listeners are CacheReplicators.
- *
- * @return whether any registered listeners are CacheReplicators.
- */
- public final boolean hasCacheReplicators() {
- return hasReplicator.get();
- }
-
- /**
- * Gets a copy of the set of the listeners registered to this class
- *
- * @return a set of type CacheEventListener
- */
- public final Set getCacheEventListeners() {
- Set listenerSet = new HashSet();
- for (ListenerWrapper listenerWrapper : cacheEventListeners) {
- listenerSet.add(listenerWrapper.getListener());
- }
- return listenerSet;
- }
-
- /**
- * Tell listeners to dispose themselves.
- * Because this method is only ever called from a synchronized cache method, it does not itself need to be
- * synchronized.
- */
- public final void dispose() {
- for (ListenerWrapper listenerWrapper : cacheEventListeners) {
- listenerWrapper.getListener().dispose();
- }
- cacheEventListeners.clear();
-
- notifyEventListenersChangedIfNecessary();
-
- for (InternalCacheEventListener orderedListener : orderedListeners) {
- orderedListener.dispose();
- }
- orderedListeners.clear();
- }
-
- /**
- * Returns a string representation of the object. In general, the
- * toString method returns a string that
- * "textually represents" this object. The result should
- * be a concise but informative representation that is easy for a
- * person to read.
- *
- * @return a string representation of the object.
- */
- @Override
- public final String toString() {
- StringBuilder sb = new StringBuilder(" cacheEventListeners: ");
- for (ListenerWrapper listenerWrapper : cacheEventListeners) {
- sb.append(listenerWrapper.getListener().getClass().getName()).append(" ");
- }
- sb.append("; orderedCacheEventListeners: ");
- for (InternalCacheEventListener orderedListener : orderedListeners) {
- sb.append(orderedListener.getClass().getName()).append(" ");
- }
- return sb.toString();
- }
-
- /**
- * Combine a Listener and its NotificationScope. Equality and hashcode are based purely on the listener.
- * This implies that the same listener cannot be added to the set of registered listeners more than
- * once with different notification scopes.
- *
- * @author Alex Miller
- */
- private static final class ListenerWrapper {
- private final CacheEventListener listener;
- private final NotificationScope scope;
-
- private ListenerWrapper(CacheEventListener listener, NotificationScope scope) {
- this.listener = listener;
- this.scope = scope;
- }
-
- private CacheEventListener getListener() {
- return this.listener;
- }
-
- private NotificationScope getScope() {
- return this.scope;
- }
-
- /**
- * Hash code based on listener
- *
- * @see java.lang.Object#hashCode()
- */
- @Override
- public int hashCode() {
- return listener.hashCode();
- }
-
- /**
- * Equals based on listener (NOT based on scope) - can't have same listener with two different scopes
- *
- * @see java.lang.Object#equals(java.lang.Object)
- */
- @Override
- public boolean equals(Object obj) {
- if (this == obj) {
- return true;
- }
- if (obj == null) {
- return false;
- }
- if (getClass() != obj.getClass()) {
- return false;
- }
- ListenerWrapper other = (ListenerWrapper) obj;
- if (listener == null) {
- if (other.listener != null) {
- return false;
- }
- } else if (!listener.equals(other.listener)) {
- return false;
- }
- return true;
- }
-
- @Override
- public String toString() {
- return listener.toString();
- }
- }
-
- /**
- * Callback interface for creating elements to pass to registered listeners.
- * For replicated/clustered caches the event notification thread that receives
- * events from the network might not have the correct context for resolving
- * cache values
- *
- * @author teck
- *
- */
- public interface ElementCreationCallback {
- /**
- * Materialize the relevant element in the given classloader
- *
- * @param loader
- * @return element
- */
- Element createElement(ClassLoader loader);
- }
-
- /**
- * Event callback types
- */
- private static enum Event {
- EVICTED, PUT, EXPIRY, UPDATED, REMOVED;
- }
-
-
- private void notifyEventListenersChangedIfNecessary() {
- if (cache.getStatus() == Status.STATUS_ALIVE && helper.getStore() instanceof TerracottaStore) {
- ((TerracottaStore)helper.getStore()).notifyCacheEventListenersChanged();
- }
- }
-}
Index: rctags/ehcache-2.10.8.2.20/ehcache-core/src/test/java/net/sf/ehcache/constructs/blocking/CountingCacheEntryFactory.java
===================================================================
diff -u -N
--- rctags/ehcache-2.10.8.2.20/ehcache-core/src/test/java/net/sf/ehcache/constructs/blocking/CountingCacheEntryFactory.java (revision 11355)
+++ rctags/ehcache-2.10.8.2.20/ehcache-core/src/test/java/net/sf/ehcache/constructs/blocking/CountingCacheEntryFactory.java (revision 0)
@@ -1,87 +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.Element;
-
-import java.util.Random;
-
-/**
- * A cache entry factory that counts the number of entries it has created.
- *
- * This is useful for writing tests.
- *
- * @author Greg Luck
- * @version $Id: CountingCacheEntryFactory.java 10789 2018-04-26 02:08:13Z adahanne $
- */
-public class CountingCacheEntryFactory implements UpdatingCacheEntryFactory {
-
- private int count;
- private final Object value;
- private Random random;
-
- /**
- * Creates a new instance
- *
- * @param value the factory always creates values equal to this value
- */
- public CountingCacheEntryFactory(final Object value) {
- this.value = value;
- random = new Random();
- }
-
- /**
- * Fetches an entry.
- */
- public Object createEntry(final Object key) {
- count++;
- if (random.nextInt(2) == 1) {
- return value;
- } else {
- return new Element(key, value);
- }
- }
-
- /**
- * @return number of entries the factory has created.
- */
- public int getCount() {
- return count;
- }
-
- /**
- * Perform an incremental update of data within a CacheEntry.
- * Based on identification of dirty values within a CacheEntry
- * Insert Update or Delete those entries based on the existing value.
- *
- * This method does not return a modified value, because it modifies the value passed into it, relying
- * on the pass by reference feature of Java.
- *
- * Implementations of this method must be thread safe.
- *
- * @param key the cache Key
- * @param value a value copied from the value that belonged to the Element in the cache. Value must be mutable
- * @throws Exception
- */
- public void updateEntryValue(Object key, Object value) throws Exception {
- count++;
- if (key.equals("explode") && count > 1) {
- throw new RuntimeException("EXPLODE!");
- }
- }
-
-}
Index: rctags/ehcache-2.10.8.2.20/ehcache-core/checkstyle/suppressions.xml
===================================================================
diff -u -N
--- rctags/ehcache-2.10.8.2.20/ehcache-core/checkstyle/suppressions.xml (revision 11355)
+++ rctags/ehcache-2.10.8.2.20/ehcache-core/checkstyle/suppressions.xml (revision 0)
@@ -1,432 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
Index: rctags/ehcache-2.10.8.2.20/system-tests/src/test/java/org/terracotta/modules/ehcache/hibernate/domain/Item.java
===================================================================
diff -u -N
--- rctags/ehcache-2.10.8.2.20/system-tests/src/test/java/org/terracotta/modules/ehcache/hibernate/domain/Item.java (revision 11355)
+++ rctags/ehcache-2.10.8.2.20/system-tests/src/test/java/org/terracotta/modules/ehcache/hibernate/domain/Item.java (revision 0)
@@ -1,29 +0,0 @@
-/*
- * All content copyright Terracotta, Inc., unless otherwise indicated. All rights reserved.
- */
-package org.terracotta.modules.ehcache.hibernate.domain;
-
-public class Item {
- private Long id;
- private String name;
- private String description;
-
- public String getDescription() {
- return description;
- }
- public void setDescription(String description) {
- this.description = description;
- }
- public Long getId() {
- return id;
- }
- public void setId(Long id) {
- this.id = id;
- }
- public String getName() {
- return name;
- }
- public void setName(String name) {
- this.name = name;
- }
-}
Index: rctags/ehcache-2.10.8.2.20/ehcache-core/src/main/java/net/sf/ehcache/search/impl/OrderComparator.java
===================================================================
diff -u -N
--- rctags/ehcache-2.10.8.2.20/ehcache-core/src/main/java/net/sf/ehcache/search/impl/OrderComparator.java (revision 11355)
+++ rctags/ehcache-2.10.8.2.20/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.8.2.20/ehcache-core/src/main/java/net/sf/ehcache/store/LruPolicy.java
===================================================================
diff -u -N
--- rctags/ehcache-2.10.8.2.20/ehcache-core/src/main/java/net/sf/ehcache/store/LruPolicy.java (revision 11355)
+++ rctags/ehcache-2.10.8.2.20/ehcache-core/src/main/java/net/sf/ehcache/store/LruPolicy.java (revision 0)
@@ -1,57 +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;
-
-
-/**
- * Contains common LFU policy code for use between the LfuMemoryStore and the DiskStore, which also
- * uses an LfuPolicy for evictions.
- *
- * @author Greg Luck
- * @version $Id: LruPolicy.java 5594 2012-05-07 16:04:31Z cdennis $
- */
-public class LruPolicy extends AbstractPolicy {
-
- /**
- * The name of this policy as a string literal
- */
- public static final String NAME = "LRU";
-
- /**
- * @return the name of the Policy. Inbuilt examples are LRU, LFU and FIFO.
- */
- public String getName() {
- return NAME;
- }
-
- /**
- * Compares the desirableness for eviction of two elements
- *
- * Compares hit counts. If both zero,
- *
- * @param element1 the element to compare against
- * @param element2 the element to compare
- * @return true if the second element is preferable to the first element for ths policy
- */
- public boolean compare(Element element1, Element element2) {
- return element2.getLastAccessTime() < element1.getLastAccessTime();
-
- }
-
-}
Index: rctags/ehcache-2.10.8.2.20/system-tests/src/test/java/org/terracotta/ehcache/tests/servermap/ServerMapElementTTLExpressTest.java
===================================================================
diff -u -N
--- rctags/ehcache-2.10.8.2.20/system-tests/src/test/java/org/terracotta/ehcache/tests/servermap/ServerMapElementTTLExpressTest.java (revision 11355)
+++ rctags/ehcache-2.10.8.2.20/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.8.2.20/terracotta/bootstrap/src/main/java/org/terracotta/modules/ehcache/async/DefaultAsyncConfig.java
===================================================================
diff -u -N
--- rctags/ehcache-2.10.8.2.20/terracotta/bootstrap/src/main/java/org/terracotta/modules/ehcache/async/DefaultAsyncConfig.java (revision 11355)
+++ rctags/ehcache-2.10.8.2.20/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.8.2.20/system-tests/src/test/resources/scheduled-refresh-cache-test.xml
===================================================================
diff -u -N
--- rctags/ehcache-2.10.8.2.20/system-tests/src/test/resources/scheduled-refresh-cache-test.xml (revision 11355)
+++ rctags/ehcache-2.10.8.2.20/system-tests/src/test/resources/scheduled-refresh-cache-test.xml (revision 0)
@@ -1,23 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
Index: rctags/ehcache-2.10.8.2.20/ehcache-core/src/main/java/net/sf/ehcache/distribution/RMIBootstrapCacheLoaderFactory.java
===================================================================
diff -u -N
--- rctags/ehcache-2.10.8.2.20/ehcache-core/src/main/java/net/sf/ehcache/distribution/RMIBootstrapCacheLoaderFactory.java (revision 11355)
+++ rctags/ehcache-2.10.8.2.20/ehcache-core/src/main/java/net/sf/ehcache/distribution/RMIBootstrapCacheLoaderFactory.java (revision 0)
@@ -1,100 +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.distribution;
-
-import net.sf.ehcache.bootstrap.BootstrapCacheLoaderFactory;
-import net.sf.ehcache.util.PropertyUtil;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import java.util.Properties;
-
-
-/**
- * A factory to create a configured RMIBootstrapCacheLoader
- * @author Greg Luck
- * @version $Id: RMIBootstrapCacheLoaderFactory.java 5594 2012-05-07 16:04:31Z cdennis $
- */
-public class RMIBootstrapCacheLoaderFactory extends BootstrapCacheLoaderFactory {
-
-
- /**
- * The property name expected in ehcache.xml for the maximum chunk size in bytes
- */
- public static final String MAXIMUM_CHUNK_SIZE_BYTES = "maximumChunkSizeBytes";
-
- /**
- * The default maximum serialized size of the elements to request from a remote cache peer during bootstrap.
- */
- protected static final int DEFAULT_MAXIMUM_CHUNK_SIZE_BYTES = 5000000;
-
- /**
- * The highest reasonable chunk size in bytes
- */
- protected static final int ONE_HUNDRED_MB = 100000000;
-
- /**
- * The lowest reasonable chunk size in bytes
- */
- protected static final int FIVE_KB = 5000;
-
- private static final Logger LOG = LoggerFactory.getLogger(RMIBootstrapCacheLoaderFactory.class.getName());
-
-
- /**
- * Create a BootstrapCacheLoader
- *
- * @param properties implementation specific properties. These are configured as comma
- * separated name value pairs in ehcache.xml
- * @return a constructed BootstrapCacheLoader
- */
- public RMIBootstrapCacheLoader createBootstrapCacheLoader(Properties properties) {
- boolean bootstrapAsynchronously = extractBootstrapAsynchronously(properties);
- int maximumChunkSizeBytes = extractMaximumChunkSizeBytes(properties);
- return new RMIBootstrapCacheLoader(bootstrapAsynchronously, maximumChunkSizeBytes);
- }
-
- /**
- *
- * @param properties the properties passed by the CacheManager, read from the configuration file
- * @return the max chunk size in bytes
- */
- protected int extractMaximumChunkSizeBytes(Properties properties) {
- int maximumChunkSizeBytes;
- String maximumChunkSizeBytesString = PropertyUtil.extractAndLogProperty(MAXIMUM_CHUNK_SIZE_BYTES, properties);
- if (maximumChunkSizeBytesString != null) {
- try {
- int maximumChunkSizeBytesCandidate = Integer.parseInt(maximumChunkSizeBytesString);
- if ((maximumChunkSizeBytesCandidate < FIVE_KB) || (maximumChunkSizeBytesCandidate > ONE_HUNDRED_MB)) {
- LOG.warn("Trying to set the chunk size to an unreasonable number. Using the default instead.");
- maximumChunkSizeBytes = DEFAULT_MAXIMUM_CHUNK_SIZE_BYTES;
- } else {
- maximumChunkSizeBytes = maximumChunkSizeBytesCandidate;
- }
- } catch (NumberFormatException e) {
- LOG.warn("Number format exception trying to set chunk size. Using the default instead.");
- maximumChunkSizeBytes = DEFAULT_MAXIMUM_CHUNK_SIZE_BYTES;
- }
-
- } else {
- maximumChunkSizeBytes = DEFAULT_MAXIMUM_CHUNK_SIZE_BYTES;
- }
- return maximumChunkSizeBytes;
- }
-
-
-}
Index: rctags/ehcache-2.10.8.2.20/system-tests/src/test/resources/double-config-cache-test.xml
===================================================================
diff -u -N
--- rctags/ehcache-2.10.8.2.20/system-tests/src/test/resources/double-config-cache-test.xml (revision 11355)
+++ rctags/ehcache-2.10.8.2.20/system-tests/src/test/resources/double-config-cache-test.xml (revision 0)
@@ -1,25 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- PORT
-
-
-
-
-
Index: rctags/ehcache-2.10.8.2.20/system-tests/src/test/java/org/terracotta/ehcache/tests/ThreadIgnore.java
===================================================================
diff -u -N
--- rctags/ehcache-2.10.8.2.20/system-tests/src/test/java/org/terracotta/ehcache/tests/ThreadIgnore.java (revision 11355)
+++ rctags/ehcache-2.10.8.2.20/system-tests/src/test/java/org/terracotta/ehcache/tests/ThreadIgnore.java (revision 0)
@@ -1,29 +0,0 @@
-/*
- * All content copyright Terracotta, Inc., unless otherwise indicated. All rights reserved.
- */
-package org.terracotta.ehcache.tests;
-
-public class ThreadIgnore {
- private final String firstFramePackage;
- private final String threadNamePrefix;
-
- public ThreadIgnore(String threadNamePrefix, String firstFramePackage) {
- this.threadNamePrefix = threadNamePrefix;
- this.firstFramePackage = firstFramePackage;
- }
-
- public boolean canIgnore(SimpleThreadInfo info) {
- if (info.getName().startsWith(threadNamePrefix)) {
-
- String[] stack = info.getStackTraceArray();
- if (stack.length > 1) {
- String frame = stack[stack.length - 2].trim().replaceFirst("at ", "");
- if (frame.startsWith(firstFramePackage)) { return true; }
- } else {
- return true;
- }
- }
-
- return false;
- }
-}
Index: rctags/ehcache-2.10.8.2.20/ehcache-core/src/main/java/net/sf/ehcache/statistics/CoreStatisticsImpl.java
===================================================================
diff -u -N
--- rctags/ehcache-2.10.8.2.20/ehcache-core/src/main/java/net/sf/ehcache/statistics/CoreStatisticsImpl.java (revision 11355)
+++ rctags/ehcache-2.10.8.2.20/ehcache-core/src/main/java/net/sf/ehcache/statistics/CoreStatisticsImpl.java (revision 0)
@@ -1,291 +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;
-
-import net.sf.ehcache.CacheOperationOutcomes;
-import net.sf.ehcache.CacheOperationOutcomes.ClusterEventOutcomes;
-import net.sf.ehcache.CacheOperationOutcomes.EvictionOutcome;
-import net.sf.ehcache.CacheOperationOutcomes.ExpiredOutcome;
-import net.sf.ehcache.statistics.extended.ExtendedStatistics;
-import net.sf.ehcache.statistics.extended.ExtendedStatistics.Operation;
-import net.sf.ehcache.store.StoreOperationOutcomes.GetOutcome;
-import net.sf.ehcache.store.StoreOperationOutcomes.PutOutcome;
-import net.sf.ehcache.store.StoreOperationOutcomes.RemoveOutcome;
-import net.sf.ehcache.transaction.xa.XaCommitOutcome;
-import net.sf.ehcache.transaction.xa.XaRecoveryOutcome;
-import net.sf.ehcache.transaction.xa.XaRollbackOutcome;
-
-import java.util.Arrays;
-import java.util.EnumSet;
-
-/**
- * The CoreStatisticsImpl class.
- *
- * @author cschanck
- */
-public class CoreStatisticsImpl implements CoreStatistics {
-
- private final ExtendedStatistics extended;
- private final CountOperation cacheGet;
- private final CountOperation cachePut;
- private final CountOperation cacheRemove;
- private final CountOperation cacheReplace1;
- private final CountOperation cacheReplace2;
- private final CountOperation cachePutIfAbsent;
- private final CountOperation cacheRemoveElement;
- private final CountOperation localHeapGet;
- private final CountOperation localHeapPut;
-
- private final CountOperation localHeapRemove;
- private final CountOperation localOffHeapGet;
- private final CountOperation localOffHeapPut;
- private final CountOperation localOffHeapRemove;
- private final CountOperation localDiskGet;
- private final CountOperation localDiskPut;
- private final CountOperation localDiskRemove;
- private final CountOperation xaCommit;
- private final CountOperation xaRecovery;
- private final CountOperation xaRollback;
- private final CountOperation evicted;
- private final CountOperation expired;
-
- private final CountOperation cacheClusterEvent;
-
- /**
- * Instantiates a new core statistics impl.
- *
- * @param extended the extended
- */
- public CoreStatisticsImpl(ExtendedStatistics extended) {
- this.extended = extended;
- this.cacheGet = asCountOperation(extended.get());
- this.cachePut = asCountOperation(extended.put());
- this.cacheRemove = asCountOperation(extended.remove());
- this.cacheReplace1 = asCountOperation(extended.replaceOneArg());
- this.cacheReplace2 = asCountOperation(extended.replaceOneArg());
- this.cachePutIfAbsent = asCountOperation(extended.putIfAbsent());
- this.cacheRemoveElement = asCountOperation(extended.removeElement());
- this.localHeapGet = asCountOperation(extended.heapGet());
- this.localHeapPut = asCountOperation(extended.heapPut());
- this.localHeapRemove = asCountOperation(extended.heapRemove());
-
- this.localOffHeapGet = asCountOperation(extended.offheapGet());
- this.localOffHeapPut = asCountOperation(extended.offheapPut());
- this.localOffHeapRemove = asCountOperation(extended.offheapRemove());
-
- this.localDiskGet = asCountOperation(extended.diskGet());
- this.localDiskPut = asCountOperation(extended.diskPut());
- this.localDiskRemove = asCountOperation(extended.diskRemove());
-
- this.xaCommit = asCountOperation(extended.xaCommit());
- this.xaRecovery = asCountOperation(extended.xaRecovery());
- this.xaRollback = asCountOperation(extended.xaRollback());
-
- this.evicted = asCountOperation(extended.eviction());
- this.expired = asCountOperation(extended.expiry());
-
- this.cacheClusterEvent = asCountOperation(extended.clusterEvent());
- }
-
- private static > CountOperation asCountOperation(final Operation compoundOp) {
- return new CountOperation() {
- @Override
- public long value(T result) {
- return compoundOp.component(result).count().value();
- }
-
- @Override
- public long value(T... results) {
- return compoundOp.compound(EnumSet.copyOf(Arrays.asList(results))).count().value();
- }
-
- };
- }
-
- /* (non-Javadoc)
- * @see net.sf.ehcache.statistics.CoreStatistics#get()
- */
- @Override
- public CountOperation get() {
- return cacheGet;
- }
-
- /* (non-Javadoc)
- * @see net.sf.ehcache.statistics.CoreStatistics#put()
- */
- @Override
- public CountOperation put() {
- return cachePut;
- }
-
- /* (non-Javadoc)
- * @see net.sf.ehcache.statistics.CoreStatistics#remove()
- */
- @Override
- public CountOperation remove() {
- return cacheRemove;
- }
-
- /* (non-Javadoc)
- * @see net.sf.ehcache.statistics.CoreStatistics#replaceOneArg()
- */
- @Override
- public CountOperation replaceOneArg() {
- return cacheReplace1;
- }
-
- /* (non-Javadoc)
- * @see net.sf.ehcache.statistics.CoreStatistics#replaceTwoArg()
- */
- @Override
- public CountOperation replaceTwoArg() {
- return cacheReplace2;
- }
-
- /* (non-Javadoc)
- * @see net.sf.ehcache.statistics.CoreStatistics#putIfAbsent()
- */
- @Override
- public CountOperation putIfAbsent() {
- return cachePutIfAbsent;
- }
-
- /* (non-Javadoc)
- * @see net.sf.ehcache.statistics.CoreStatistics#removeElement()
- */
- @Override
- public CountOperation removeElement() {
- return cacheRemoveElement;
- }
-
- /* (non-Javadoc)
- * @see net.sf.ehcache.statistics.CoreStatistics#localHeapGet()
- */
- @Override
- public CountOperation localHeapGet() {
- return localHeapGet;
- }
-
- /* (non-Javadoc)
- * @see net.sf.ehcache.statistics.CoreStatistics#localHeapPut()
- */
- @Override
- public CountOperation localHeapPut() {
- return localHeapPut;
- }
-
- /* (non-Javadoc)
- * @see net.sf.ehcache.statistics.CoreStatistics#localHeapRemove()
- */
- @Override
- public CountOperation localHeapRemove() {
- return localHeapRemove;
- }
-
- /* (non-Javadoc)
- * @see net.sf.ehcache.statistics.CoreStatistics#localOffHeapGet()
- */
- @Override
- public CountOperation localOffHeapGet() {
- return localOffHeapGet;
- }
-
- /* (non-Javadoc)
- * @see net.sf.ehcache.statistics.CoreStatistics#localOffHeapPut()
- */
- @Override
- public CountOperation localOffHeapPut() {
- return localOffHeapPut;
- }
-
- /* (non-Javadoc)
- * @see net.sf.ehcache.statistics.CoreStatistics#localOffHeapRemove()
- */
- @Override
- public CountOperation localOffHeapRemove() {
- return localOffHeapRemove;
- }
-
- /* (non-Javadoc)
- * @see net.sf.ehcache.statistics.CoreStatistics#localDiskGet()
- */
- @Override
- public CountOperation localDiskGet() {
- return localDiskGet;
- }
-
- /* (non-Javadoc)
- * @see net.sf.ehcache.statistics.CoreStatistics#localDiskPut()
- */
- @Override
- public CountOperation localDiskPut() {
- return localDiskPut;
- }
-
- /* (non-Javadoc)
- * @see net.sf.ehcache.statistics.CoreStatistics#localDiskRemove()
- */
- @Override
- public CountOperation localDiskRemove() {
- return localDiskRemove;
- }
-
- /**
- * {@inheritDoc}
- */
- public CountOperation xaCommit() {
- return xaCommit;
- }
-
- /**
- * {@inheritDoc}
- */
- @Override
- public CountOperation xaRecovery() {
- return xaRecovery;
- }
-
- /**
- * {@inheritDoc}
- */
- @Override
- public CountOperation xaRollback() {
- return xaRollback;
- }
-
- /*
- * {@inheritDoc}
- */
- @Override
- public CountOperation cacheEviction() {
- return evicted;
- }
-
- /*
- * {@inheritDoc}
- */
- @Override
- public CountOperation cacheExpiration() {
- return expired;
- }
-
- @Override
- public CountOperation cacheClusterEvent() {
- return cacheClusterEvent;
- }
-
-}
\ No newline at end of file
Index: rctags/ehcache-2.10.8.2.20/ehcache-core/src/main/java/net/sf/ehcache/store/Store.java
===================================================================
diff -u -N
--- rctags/ehcache-2.10.8.2.20/ehcache-core/src/main/java/net/sf/ehcache/store/Store.java (revision 11355)
+++ rctags/ehcache-2.10.8.2.20/ehcache-core/src/main/java/net/sf/ehcache/store/Store.java (revision 0)
@@ -1,439 +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.CacheException;
-import net.sf.ehcache.Element;
-import net.sf.ehcache.Status;
-import net.sf.ehcache.search.Attribute;
-import net.sf.ehcache.search.Results;
-import net.sf.ehcache.search.SearchException;
-import net.sf.ehcache.search.attribute.AttributeExtractor;
-import net.sf.ehcache.terracotta.TerracottaNotRunningException;
-import net.sf.ehcache.writer.CacheWriterManager;
-
-import java.io.IOException;
-import java.util.Collection;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
-
-/**
- * This is the interface for all stores. A store is a physical counterpart to a cache, which
- * is a logical concept.
- *
- * @author Greg Luck
- * @version $Id: Store.java 10789 2018-04-26 02:08:13Z adahanne $
- */
-public interface Store {
-
- /**
- * clusterCoherent property
- */
- static final String CLUSTER_COHERENT = "ClusterCoherent";
-
- /**
- * nodeCoherent property
- */
- static final String NODE_COHERENT = "NodeCoherent";
-
- /**
- * Add a listener to the store.
- * @param listener
- */
- void addStoreListener(StoreListener listener);
-
- /**
- * Remove listener from store.
- * @param listener
- */
- void removeStoreListener(StoreListener listener);
-
- /**
- * Puts an item into the store.
- * @return true if this is a new put for the key or element is null. Returns false if it was an update.
- */
- boolean put(Element element) throws CacheException;
-
- /**
- * Puts a collection of elements into the store.
- * @param elements Collection of elements to be put in the store
- */
- void putAll(Collection elements) throws CacheException;
-
- /**
- * Puts an item into the store and the cache writer manager in an atomic operation
- * @return true if this is a new put for the key or element is null. Returns false if it was an update.
- */
- boolean putWithWriter(Element element, CacheWriterManager writerManager) throws CacheException;
-
- /**
- * Gets an item from the cache.
- */
- Element get(Object key);
-
- /**
- * Gets an {@link Element} from the Store, without updating statistics
- *
- * @return The element
- */
- Element getQuiet(Object key);
-
- /**
- * Gets an Array of the keys for all elements in the disk store.
- *
- * @return An List of {@link java.io.Serializable} keys
- */
- List getKeys();
-
- /**
- * Removes an item from the cache.
- *
- * @since signature changed in 1.2 from boolean to Element to support notifications
- */
- Element remove(Object key);
-
- /**
- * Removes a collection of elements from the cache.
- */
- void removeAll(Collection keys);
-
- /**
- * Removes an item from the store and the cache writer manager in an atomic operation.
- */
- Element removeWithWriter(Object key, CacheWriterManager writerManager) throws CacheException;
-
- /**
- * Remove all of the elements from the store.
- *
- * If there are registered CacheEventListeners they are notified of the expiry or removal
- * of the Element as each is removed.
- */
- void removeAll() throws CacheException;
-
- /**
- * Put an element in the store if no element is currently mapped to the elements key.
- *
- * @param element element to be added
- * @return the element previously cached for this key, or null if none.
- *
- * @throws NullPointerException if the element is null, or has a null key
- */
- Element putIfAbsent(Element element) throws NullPointerException;
-
- /**
- * Remove the Element mapped to the key for the supplied element if the value of the supplied Element
- * is equal to the value of the cached Element. This is a CAS operation. It is consistent even against
- * a distributed cache that is not coherent. If the old value is stale when this operation is attempted
- * the remove does not take place.
- *
- * @param element Element to be removed
- * @param comparator ElementValueComparator to use to compare elements
- * @return the Element removed or null if no Element was removed
- *
- * @throws NullPointerException if the element is null, or has a null key
- */
- Element removeElement(Element element, ElementValueComparator comparator) throws NullPointerException;
-
- /**
- * Replace the cached element only if the value of the current Element is equal to the value of the
- * supplied old Element.
- *
- * @param old Element to be test against
- * @param element Element to be cached
- * @param comparator ElementValueComparator to use to compare elements
- * @return true is the Element was replaced
- * @throws NullPointerException if the either Element is null or has a null key
- * @throws IllegalArgumentException if the two Element keys are non-null but not equal
- */
- boolean replace(Element old, Element element, ElementValueComparator comparator) throws NullPointerException, IllegalArgumentException;
-
- /**
- * Replace the cached element only if an Element is currently cached for this key
- * @param element Element to be cached
- * @return the Element previously cached for this key, or null if no Element was cached
- * @throws NullPointerException if the Element is null or has a null key
- */
- Element replace(Element element) throws NullPointerException;
-
- /**
- * Prepares for shutdown.
- */
- void dispose();
-
- /**
- * Returns the current local store size
- * @return the count of the Elements in the Store on the local machine
- */
- int getSize();
-
- /**
- * Returns the current local in-memory store size
- * @return the count of the Elements in the Store and in-memory on the local machine
- */
- int getInMemorySize();
-
- /**
- * Returns the current local off-heap store size
- * @return the count of the Elements in the Store and off-heap on the local machine
- */
- int getOffHeapSize();
-
- /**
- * Returns the current local on-disk store size
- * @return the count of the Elements in the Store and on-disk on the local machine
- */
- int getOnDiskSize();
-
- /**
- * Returns the current Terracotta clustered store size
- * @return the count of the Elements in the Store across the cluster
- */
- int getTerracottaClusteredSize();
-
- /**
- * Gets the size of the in-memory portion of the store, in bytes.
- *
- * This method may be expensive to run, depending on implementation. Implementers may choose to return
- * an approximate size.
- *
- * @return the approximate in-memory size of the store in bytes
- */
- long getInMemorySizeInBytes();
-
- /**
- * Gets the size of the off-heap portion of the store, in bytes.
- *
- * @return the approximate off-heap size of the store in bytes
- */
- long getOffHeapSizeInBytes();
-
- /**
- * Gets the size of the on-disk portion of the store, in bytes.
- *
- * @return the on-disk size of the store in bytes
- */
- long getOnDiskSizeInBytes();
-
- /**
- * Checks if the cache may contain elements for which the SizeOf engine gave up and only
- * partially calculated the size.
- *
- * @return true if at least one partially sized element may be in the cache
- */
- boolean hasAbortedSizeOf();
-
- /**
- * Returns the cache status.
- */
- Status getStatus();
-
-
- /**
- * A check to see if a key is in the Store.
- *
- * @param key The Element key
- * @return true if found. No check is made to see if the Element is expired.
- * 1.2
- */
- boolean containsKey(Object key);
-
- /**
- * A check to see if a key is in the Store and is currently held on disk.
- *
- * @param key The Element key
- * @return true if found. No check is made to see if the Element is expired.
- */
- boolean containsKeyOnDisk(Object key);
-
- /**
- * A check to see if a key is in the Store and is currently held off-heap.
- *
- * @param key The Element key
- * @return true if found. No check is made to see if the Element is expired.
- */
- boolean containsKeyOffHeap(Object key);
-
- /**
- * A check to see if a key is in the Store and is currently held in memory.
- *
- * @param key The Element key
- * @return true if found. No check is made to see if the Element is expired.
- */
- boolean containsKeyInMemory(Object key);
-
- /**
- * Expire all elements.
- */
- public void expireElements();
-
- /**
- * Flush elements to persistent store.
- * @throws IOException if any IO error occurs
- */
- void flush() throws IOException;
-
- /**
- * Some store types, such as the disk stores can fill their write buffers if puts
- * come in too fast. The thread will wait for a short time before checking again.
- * @return true if the store write buffer is backed up.
- */
- boolean bufferFull();
-
- /**
- * @return the current eviction policy. This may not be the configured policy, if it has been
- * dynamically set.
- * @see #setInMemoryEvictionPolicy(Policy)
- */
- Policy getInMemoryEvictionPolicy();
-
- /**
- * Sets the eviction policy strategy. The Store will use a policy at startup. The store may allow changing
- * the eviction policy strategy dynamically. Otherwise implementations will throw an exception if this method
- * is called.
- *
- * @param policy the new policy
- */
- void setInMemoryEvictionPolicy(Policy policy);
-
- /**
- * This should not be used, and will generally return null
- * @return some internal context (probably null)
- */
- Object getInternalContext();
-
- /**
- * Indicates whether this store provides a coherent view of all the elements
- * in a cache.
- *
- * Note that this is same as calling {@link #isClusterCoherent()} (introduced since 2.0)
- * Use {@link #isNodeCoherent()} to find out if the cache is coherent in the current node in the cluster
- *
- * @return {@code true} if the store is coherent; or {@code false} if the
- * store potentially splits the cache storage with another store or
- * isn't internally coherent
- * @since 1.7
- */
- boolean isCacheCoherent();
-
- /**
- * Returns true if the cache is in coherent mode cluster-wide. Returns false otherwise.
- *
- * It applies to coherent clustering mechanisms only e.g. Terracotta
- *
- * @return true if the cache is in coherent mode cluster-wide, false otherwise
- * @since 2.0
- */
- public boolean isClusterCoherent() throws TerracottaNotRunningException;
-
- /**
- * Returns true if the cache is in coherent mode for the current node. Returns false otherwise.
- *
- * It applies to coherent clustering mechanisms only e.g. Terracotta
- *
- * @return true if the cache is in coherent mode cluster-wide, false otherwise
- * @since 2.0
- */
- public boolean isNodeCoherent() throws TerracottaNotRunningException;
-
- /**
- * Sets the cache in coherent or incoherent mode for the current node depending on the parameter.
- * Calling {@code setNodeCoherent(true)} when the cache is already in coherent mode or
- * calling {@code setNodeCoherent(false)} when already in incoherent mode will be a no-op.
- *
- * It applies to coherent clustering mechanisms only e.g. Terracotta
- *
- * @param coherent
- * true transitions to coherent mode, false to incoherent mode
- * @throws UnsupportedOperationException if this store does not support cache coherence, like RMI replication
- * @since 2.0
- */
- public void setNodeCoherent(boolean coherent) throws UnsupportedOperationException, TerracottaNotRunningException;
-
- /**
- * This method waits until the cache is in coherent mode in all the connected nodes. If the cache is already in coherent mode it returns
- * immediately
- *
- * It applies to coherent clustering mechanisms only e.g. Terracotta
- * @throws UnsupportedOperationException if this store does not support cache coherence, like RMI replication
- * @throws InterruptedException
- * @since 2.0
- */
- public void waitUntilClusterCoherent() throws UnsupportedOperationException, TerracottaNotRunningException, InterruptedException;
-
- /**
- * Optional implementation specific MBean exposed by the store.
- *
- * @return implementation specific management bean
- */
- public Object getMBean();
-
- /**
- * Inform this store of the configured attribute extractors. Stores that will not invoke extractors are free to ignore this call
- *
- * @param extractors
- */
- public void setAttributeExtractors(Map extractors);
-
- /**
- * Execute the given query on this store
- *
- * @param query query to execute
- * @return query results
- */
- public Results executeQuery(StoreQuery query) throws SearchException;
-
- /**
- * @return all search attributes known to this store at the time of invoking the method
- */
- public Set getSearchAttributes();
-
- /**
- * Retrieve the given named search attribute
- *
- * @param type of the attribute
- * @param attributeName the name of the attribute to retrieve
- * @return the search attribute or null if non-existent
- */
- public Attribute getSearchAttribute(String attributeName);
-
- /**
- * Retries the elements associated with a set of keys without updating the statistics
- * Keys which are not present in the cache will have null values associated
- * with them in the returned map
- *
- * @param keys a collection of keys to look for
- * @return a map of keys and their corresponding values
- */
- Map getAllQuiet(Collection keys);
-
- /**
- * Retries the elements associated with a set of keys and update the statistics
- * Keys which are not present in the cache will have null values associated
- * with them in the returned map
- *
- * @param keys a collection of keys to look for
- * @return a map of keys and their corresponding values
- */
- Map getAll(Collection keys);
-
- /**
- * Recalculate size of the element mapped to the key
- * @param key the key
- */
- void recalculateSize(Object key);
-}
Index: rctags/ehcache-2.10.8.2.20/ehcache-core/src/main/java/net/sf/ehcache/writer/writebehind/operations/WriteAllOperation.java
===================================================================
diff -u -N
--- rctags/ehcache-2.10.8.2.20/ehcache-core/src/main/java/net/sf/ehcache/writer/writebehind/operations/WriteAllOperation.java (revision 11355)
+++ rctags/ehcache-2.10.8.2.20/ehcache-core/src/main/java/net/sf/ehcache/writer/writebehind/operations/WriteAllOperation.java (revision 0)
@@ -1,47 +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.writer.writebehind.operations;
-
-import net.sf.ehcache.Element;
-import net.sf.ehcache.writer.CacheWriter;
-
-import java.util.List;
-
-/**
- * Implements the write all operation for write behind
- *
- * @author Geert Bevin
- * @version $Id: WriteAllOperation.java 5594 2012-05-07 16:04:31Z cdennis $
- */
-public class WriteAllOperation implements BatchOperation {
- private final List elements;
-
- /**
- * Create a new write all operation for the provided list of element
- *
- * @param elements the list of elements that are part of this operation
- */
- public WriteAllOperation(List elements) {
- this.elements = elements;
- }
-
- /**
- * {@inheritDoc}
- */
- public void performBatchOperation(CacheWriter cacheWriter) {
- cacheWriter.writeAll(elements);
- }
-}
Index: rctags/ehcache-2.10.8.2.20/system-tests/src/test/resources/net/sf/ehcache/osgi/simple-ehcache.xml
===================================================================
diff -u -N
--- rctags/ehcache-2.10.8.2.20/system-tests/src/test/resources/net/sf/ehcache/osgi/simple-ehcache.xml (revision 11355)
+++ rctags/ehcache-2.10.8.2.20/system-tests/src/test/resources/net/sf/ehcache/osgi/simple-ehcache.xml (revision 0)
@@ -1,19 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
Index: rctags/ehcache-2.10.8.2.20/terracotta/bootstrap/src/test/java/org/terracotta/modules/ehcache/ToolkitInstanceFactoryImplTest.java
===================================================================
diff -u -N
--- rctags/ehcache-2.10.8.2.20/terracotta/bootstrap/src/test/java/org/terracotta/modules/ehcache/ToolkitInstanceFactoryImplTest.java (revision 11355)
+++ rctags/ehcache-2.10.8.2.20/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.8.2.20/ehcache-search-parser/src/main/java/net/sf/ehcache/search/parser/MAggregate.java
===================================================================
diff -u -N
--- rctags/ehcache-2.10.8.2.20/ehcache-search-parser/src/main/java/net/sf/ehcache/search/parser/MAggregate.java (revision 11355)
+++ rctags/ehcache-2.10.8.2.20/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.8.2.20/system-tests/src/test/resources/lifecycle/cache-manager-minimal.xml
===================================================================
diff -u -N
--- rctags/ehcache-2.10.8.2.20/system-tests/src/test/resources/lifecycle/cache-manager-minimal.xml (revision 11355)
+++ rctags/ehcache-2.10.8.2.20/system-tests/src/test/resources/lifecycle/cache-manager-minimal.xml (revision 0)
@@ -1,11 +0,0 @@
-
-
-
-
-
-
-
-
-
Index: rctags/ehcache-2.10.8.2.20/ehcache-core/src/test/java/net/sf/ehcache/event/NullCacheEventListener.java
===================================================================
diff -u -N
--- rctags/ehcache-2.10.8.2.20/ehcache-core/src/test/java/net/sf/ehcache/event/NullCacheEventListener.java (revision 11355)
+++ rctags/ehcache-2.10.8.2.20/ehcache-core/src/test/java/net/sf/ehcache/event/NullCacheEventListener.java (revision 0)
@@ -1,129 +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.event;
-
-import net.sf.ehcache.CacheException;
-import net.sf.ehcache.Ehcache;
-import net.sf.ehcache.Element;
-
-
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-
-/**
- * A Null Object Pattern implementation of CacheEventListener. It simply logs the calls made.
- *
- * @author Greg Luck
- * @version $Id: NullCacheEventListener.java 10789 2018-04-26 02:08:13Z adahanne $
- * @since 1.2
- */
-public class NullCacheEventListener implements CacheEventListener {
-
- private static final Logger LOG = LoggerFactory.getLogger(NullCacheEventListener.class.getName());
-
-
- /**
- * {@inheritDoc}
- */
- public void notifyElementRemoved(final Ehcache cache, final Element element) {
- if (LOG.isDebugEnabled()) {
- LOG.debug("notifyElementRemoved called for cache " + cache + " for element with key " + element.getObjectKey());
- }
- }
-
- /**
- * {@inheritDoc}
- */
- public void notifyElementPut(final Ehcache cache, final Element element) {
-
- Object key = null;
- if (element != null) {
- key = element.getObjectKey();
- }
- if (LOG.isDebugEnabled()) {
- LOG.debug("notifyElementPut called for cache " + cache.getName() + " for element with key " + key);
- }
- }
-
- /**
- * Called immediately after an element has been put into the cache and the element already
- * existed in the cache. This is thus an update.
- *
- * The {@link net.sf.ehcache.Cache#put(net.sf.ehcache.Element)} method
- * will block until this method returns.
- *
- * Implementers may wish to have access to the Element's fields, including value, so the element is provided.
- * Implementers should be careful not to modify the element. The effect of any modifications is undefined.
- *
- * @param cache the cache emitting the notification
- * @param element the element which was just put into the cache.
- */
- public void notifyElementUpdated(final Ehcache cache, final Element element) throws CacheException {
-
- Object key = null;
- if (element != null) {
- key = element.getObjectKey();
- }
- if (LOG.isDebugEnabled()) {
- LOG.debug("notifyElementUpdated called for cache " + cache.getName() + " for element with key " + key);
- }
- }
-
- /**
- * {@inheritDoc}
- */
- public void notifyElementExpired(final Ehcache cache, final Element element) {
- if (LOG.isDebugEnabled()) {
- LOG.debug("notifyElementExpired called for cache " + cache.getName() + " for element with key " + element.getObjectKey());
- }
- }
-
- /**
- * {@inheritDoc}
- */
- public void notifyElementEvicted(final Ehcache cache, final Element element) {
- //
- }
-
- /**
- * {@inheritDoc}
- */
- public void notifyRemoveAll(final Ehcache cache) {
- //
- }
-
- /**
- * Give the replicator a chance to cleanup and free resources when no longer needed
- */
- public void dispose() {
- //nothing to do
- }
-
- /**
- * Creates a clone of this listener. This method will only be called by ehcache before a cache is initialized.
- *
- * This may not be possible for listeners after they have been initialized. Implementations should throw
- * CloneNotSupportedException if they do not support clone.
- *
- * @return a clone
- * @throws CloneNotSupportedException if the listener could not be cloned.
- */
- public Object clone() throws CloneNotSupportedException {
- return super.clone();
- }
-}
Index: rctags/ehcache-2.10.8.2.20/ehcache/src/test/resources/serializedforms/ReflectionAttributeExtractorSerializationTest.testFieldsKey.ser
===================================================================
diff -u -N -r11355 -r11388
Binary files differ
Index: rctags/ehcache-2.10.8.2.20/ehcache-core/src/main/java/net/sf/ehcache/distribution/CacheManagerPeerProviderFactory.java
===================================================================
diff -u -N
--- rctags/ehcache-2.10.8.2.20/ehcache-core/src/main/java/net/sf/ehcache/distribution/CacheManagerPeerProviderFactory.java (revision 11355)
+++ rctags/ehcache-2.10.8.2.20/ehcache-core/src/main/java/net/sf/ehcache/distribution/CacheManagerPeerProviderFactory.java (revision 0)
@@ -1,42 +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.distribution;
-
-import net.sf.ehcache.CacheManager;
-
-import java.util.Properties;
-
-/**
- * An abstract factory for creating peers. Implementers should provide their own
- * concrete factory extending this factory. It can then be configured in ehcache.xml
- * @author Greg Luck
- * @version $Id: CacheManagerPeerProviderFactory.java 5594 2012-05-07 16:04:31Z cdennis $
- */
-public abstract class CacheManagerPeerProviderFactory {
-
- /**
- * Create a peer provider.
- * @param cacheManager the CacheManager instance connected to this peer provider
- * @param properties implementation specific properties. These are configured as comma
- * separated name value pairs in ehcache.xml
- * @return a constructed CacheManagerPeerProvider
- */
- public abstract CacheManagerPeerProvider createCachePeerProvider(CacheManager cacheManager, Properties properties);
-
-
-
-}
Index: rctags/ehcache-2.10.8.2.20/ehcache-core/src/test/resources/ehcache-listener-scope.xml
===================================================================
diff -u -N
--- rctags/ehcache-2.10.8.2.20/ehcache-core/src/test/resources/ehcache-listener-scope.xml (revision 11355)
+++ rctags/ehcache-2.10.8.2.20/ehcache-core/src/test/resources/ehcache-listener-scope.xml (revision 0)
@@ -1,57 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
Index: rctags/ehcache-2.10.8.2.20/distribution/events/src/assemble/bin/start-sample.bat
===================================================================
diff -u -N
--- rctags/ehcache-2.10.8.2.20/distribution/events/src/assemble/bin/start-sample.bat (revision 11355)
+++ rctags/ehcache-2.10.8.2.20/distribution/events/src/assemble/bin/start-sample.bat (revision 0)
@@ -1,24 +0,0 @@
-@echo off
-
-setlocal
-
-set root=%~d0%~p0..
-set root="%root:"=%"
-
-cd %root%
-call bin\package.bat
-
-if not %errorlevel% == 0 (
- exit /b 1
-)
-
-set appname=events
-call bin\start-jetty.bat 9081
-echo Go to: http://localhost:9081/%appname%
-echo off
-
-call bin\start-jetty.bat 9082
-echo Go to: http://localhost:9082/%appname%
-echo off
-
-endlocal
Index: rctags/ehcache-2.10.8.2.20/system-tests/src/test/java/org/terracotta/ehcache/tests/mbean/DSOMBeanController.java
===================================================================
diff -u -N
--- rctags/ehcache-2.10.8.2.20/system-tests/src/test/java/org/terracotta/ehcache/tests/mbean/DSOMBeanController.java (revision 11355)
+++ rctags/ehcache-2.10.8.2.20/system-tests/src/test/java/org/terracotta/ehcache/tests/mbean/DSOMBeanController.java (revision 0)
@@ -1,212 +0,0 @@
-/*
- * All content copyright Terracotta, Inc., unless otherwise indicated. All rights reserved.
- */
-package org.terracotta.ehcache.tests.mbean;
-
-import org.terracotta.test.util.JMXUtils;
-
-import java.io.IOException;
-import java.util.Map;
-
-import javax.management.MBeanServerConnection;
-import javax.management.ObjectName;
-import javax.management.remote.JMXConnector;
-
-/**
- * @author Abhishek Sanoujam
- */
-public class DSOMBeanController implements DSOMBean {
-
- private static final ObjectName DSO;
- private static final ObjectName DUMPER;
- static {
- ObjectName dso;
- ObjectName dumper = null;
- try {
- dso = new ObjectName("org.terracotta:type=Terracotta Server,name=DSO");
- dumper = new ObjectName("org.terracotta.internal:type=Terracotta Server,name=L2Dumper");
- } catch (Exception e) {
- dso = null;
- dumper = null;
- }
- DSO = dso;
- DUMPER = dumper;
- }
-
- private final String host;
- private final int jmxPort;
-
- public DSOMBeanController(String host, int jmxPort) {
- this.host = host;
- this.jmxPort = jmxPort;
- }
-
- private T performL2MBeanDumper(DSOMBeanAction action) throws IOException {
- return performL2ControlBeanAction(action, DUMPER);
- }
-
- private T performL2MBeanTCServerInfo(DSOMBeanAction action) throws IOException {
- return performL2ControlBeanAction(action, DSO);
- }
-
- private T performL2ControlBeanAction(DSOMBeanAction action, ObjectName objectName) throws IOException {
- if (objectName == null) { throw new RuntimeException(objectName + " object name is null"); }
- final JMXConnector jmxConnector = JMXUtils.getJMXConnector(host, jmxPort);
- MBeanServerConnection mbs = jmxConnector.getMBeanServerConnection();
- DSOMBean l2ControlBean = DSOMBeanProxy.newL2ControlMBeanProxy(mbs, objectName);
- try {
- return action.performL2ControlBeanAction(l2ControlBean);
- } finally {
- try {
- jmxConnector.close();
- } catch (IOException e) {
- e.printStackTrace();
- }
- }
- }
-
- public long getGlobalServerMapGetSizeRequestsCount() {
-
- try {
- return performL2MBeanTCServerInfo(new DSOMBeanAction() {
-
- public Long performL2ControlBeanAction(DSOMBean dsoMBean) {
- return dsoMBean.getGlobalServerMapGetSizeRequestsCount();
- }
-
- });
- } catch (IOException e) {
- throw new RuntimeException(e);
- }
- }
-
- public long getGlobalServerMapGetSizeRequestsRate() {
- try {
- return performL2MBeanTCServerInfo(new DSOMBeanAction() {
-
- public Long performL2ControlBeanAction(DSOMBean dsoMBean) {
- return dsoMBean.getGlobalServerMapGetSizeRequestsRate();
- }
-
- });
- } catch (IOException e) {
- throw new RuntimeException(e);
- }
- }
-
- public long getGlobalServerMapGetValueRequestsCount() {
- try {
- return performL2MBeanTCServerInfo(new DSOMBeanAction() {
-
- public Long performL2ControlBeanAction(DSOMBean dsoMBean) {
- return dsoMBean.getGlobalServerMapGetValueRequestsCount();
- }
-
- });
- } catch (IOException e) {
- throw new RuntimeException(e);
- }
- }
-
- public long getGlobalServerMapGetValueRequestsRate() {
- try {
- return performL2MBeanTCServerInfo(new DSOMBeanAction() {
-
- public Long performL2ControlBeanAction(DSOMBean dsoMBean) {
- return dsoMBean.getGlobalServerMapGetValueRequestsRate();
- }
-
- });
- } catch (IOException e) {
- throw new RuntimeException(e);
- }
- }
-
- public long getReadOperationRate() {
- try {
- return performL2MBeanTCServerInfo(new DSOMBeanAction() {
-
- public Long performL2ControlBeanAction(DSOMBean dsoMBean) {
- return dsoMBean.getReadOperationRate();
- }
-
- });
- } catch (IOException e) {
- throw new RuntimeException(e);
- }
- }
-
- public Map getServerMapGetSizeRequestsCount() {
- try {
- return performL2MBeanTCServerInfo(new DSOMBeanAction>() {
-
- public Map performL2ControlBeanAction(DSOMBean dsoMBean) {
- return dsoMBean.getServerMapGetSizeRequestsCount();
- }
-
- });
- } catch (IOException e) {
- throw new RuntimeException(e);
- }
- }
-
- public Map getServerMapGetSizeRequestsRate() {
- try {
- return performL2MBeanTCServerInfo(new DSOMBeanAction>() {
-
- public Map performL2ControlBeanAction(DSOMBean dsoMBean) {
- return dsoMBean.getServerMapGetSizeRequestsRate();
- }
-
- });
- } catch (IOException e) {
- throw new RuntimeException(e);
- }
- }
-
- public Map getServerMapGetValueRequestsCount() {
- try {
- return performL2MBeanTCServerInfo(new DSOMBeanAction>() {
-
- public Map performL2ControlBeanAction(DSOMBean dsoMBean) {
- return dsoMBean.getServerMapGetValueRequestsCount();
- }
-
- });
- } catch (IOException e) {
- throw new RuntimeException(e);
- }
- }
-
- public Map getServerMapGetValueRequestsRate() {
- try {
- return performL2MBeanTCServerInfo(new DSOMBeanAction>() {
-
- public Map performL2ControlBeanAction(DSOMBean dsoMBean) {
- return dsoMBean.getServerMapGetValueRequestsRate();
- }
-
- });
- } catch (IOException e) {
- throw new RuntimeException(e);
- }
- }
-
- private static interface DSOMBeanAction {
- T performL2ControlBeanAction(DSOMBean l2ControlBean);
- }
-
- public Void dumpClusterState() {
- try {
- return performL2MBeanDumper(new DSOMBeanAction() {
-
- public Void performL2ControlBeanAction(DSOMBean dsoMBean) {
- return dsoMBean.dumpClusterState();
- }
- });
- } catch (IOException e) {
- throw new RuntimeException(e);
- }
- }
-
-}
Index: rctags/ehcache-2.10.8.2.20/ehcache-core/src/main/java/net/sf/ehcache/hibernate/management/impl/EntityStats.java
===================================================================
diff -u -N
--- rctags/ehcache-2.10.8.2.20/ehcache-core/src/main/java/net/sf/ehcache/hibernate/management/impl/EntityStats.java (revision 11355)
+++ rctags/ehcache-2.10.8.2.20/ehcache-core/src/main/java/net/sf/ehcache/hibernate/management/impl/EntityStats.java (revision 0)
@@ -1,266 +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.management.impl;
-
-import java.io.Serializable;
-import java.util.ArrayList;
-import java.util.Iterator;
-import java.util.List;
-
-import javax.management.openmbean.CompositeData;
-import javax.management.openmbean.CompositeDataSupport;
-import javax.management.openmbean.CompositeType;
-import javax.management.openmbean.OpenDataException;
-import javax.management.openmbean.OpenType;
-import javax.management.openmbean.SimpleType;
-import javax.management.openmbean.TabularData;
-import javax.management.openmbean.TabularDataSupport;
-import javax.management.openmbean.TabularType;
-
-import org.hibernate.stat.EntityStatistics;
-
-/**
- * When we only support Java 6, all of this OpenMBean scaffolding can be removed in favor or MXBeans.
- *
- * @author gkeim
- */
-public class EntityStats implements Serializable {
- private static final String COMPOSITE_TYPE_NAME = "EntityStats";
- private static final String COMPOSITE_TYPE_DESCRIPTION = "Statistics per Entity";
- private static final String[] ITEM_NAMES = new String[] {"name", "shortName", "loadCount",
- "updateCount", "insertCount", "deleteCount", "fetchCount", "optimisticFailureCount", };
- private static final String[] ITEM_DESCRIPTIONS = new String[] {"name", "shortName", "loadCount",
- "updateCount", "insertCount", "deleteCount", "fetchCount", "optimisticFailureCount", };
- private static final OpenType[] ITEM_TYPES = new OpenType[] {SimpleType.STRING,
- SimpleType.STRING, SimpleType.LONG, SimpleType.LONG, SimpleType.LONG, SimpleType.LONG, SimpleType.LONG,
- SimpleType.LONG, };
- private static final CompositeType COMPOSITE_TYPE;
- private static final String TABULAR_TYPE_NAME = "Statistics by Entity";
- private static final String TABULAR_TYPE_DESCRIPTION = "All Entity Statistics";
- private static final String[] INDEX_NAMES = new String[] {"name", };
- private static final TabularType TABULAR_TYPE;
-
- static {
- try {
- COMPOSITE_TYPE = new CompositeType(COMPOSITE_TYPE_NAME, COMPOSITE_TYPE_DESCRIPTION, ITEM_NAMES,
- ITEM_DESCRIPTIONS, ITEM_TYPES);
- TABULAR_TYPE = new TabularType(TABULAR_TYPE_NAME, TABULAR_TYPE_DESCRIPTION, COMPOSITE_TYPE, INDEX_NAMES);
- } catch (OpenDataException e) {
- throw new RuntimeException(e);
- }
- }
-
- /**
- * name
- */
- protected final String name;
-
- /**
- * shortName
- */
- protected final String shortName;
-
- /**
- * loadCount
- */
- protected long loadCount;
-
- /**
- * updateCount
- */
- protected long updateCount;
-
- /**
- * insertCount
- */
- protected long insertCount;
-
- /**
- * deleteCount
- */
- protected long deleteCount;
-
- /**
- * fetchCount
- */
- protected long fetchCount;
-
- /**
- * optimisticFailureCount
- */
- protected long optimisticFailureCount;
-
- /**
- * @param name
- */
- public EntityStats(String name) {
- this.name = name;
- this.shortName = CacheRegionUtils.determineShortName(name);
- }
-
- /**
- * @param name
- * @param src
- */
- public EntityStats(String name, EntityStatistics src) {
- this(name);
-
- try {
- this.loadCount = BeanUtils.getLongBeanProperty(src, "loadCount");
- this.updateCount = BeanUtils.getLongBeanProperty(src, "updateCount");
- this.insertCount = BeanUtils.getLongBeanProperty(src, "insertCount");
- this.deleteCount = BeanUtils.getLongBeanProperty(src, "deleteCount");
- this.fetchCount = BeanUtils.getLongBeanProperty(src, "fetchCount");
- this.optimisticFailureCount = BeanUtils.getLongBeanProperty(src, "optimisticFailureCount");
- } catch (Exception e) {
- e.printStackTrace();
- throw new RuntimeException("Exception retrieving statistics", e);
- }
- }
-
- /**
- * @param cData
- */
- public EntityStats(final CompositeData cData) {
- int i = 0;
- name = (String) cData.get(ITEM_NAMES[i++]);
- shortName = (String) cData.get(ITEM_NAMES[i++]);
- loadCount = (Long) cData.get(ITEM_NAMES[i++]);
- updateCount = (Long) cData.get(ITEM_NAMES[i++]);
- insertCount = (Long) cData.get(ITEM_NAMES[i++]);
- deleteCount = (Long) cData.get(ITEM_NAMES[i++]);
- fetchCount = (Long) cData.get(ITEM_NAMES[i++]);
- optimisticFailureCount = (Long) cData.get(ITEM_NAMES[i++]);
- }
-
- private static int safeParseInt(String s) {
- try {
- return Integer.parseInt(s);
- } catch (Exception e) {
- return -1;
- }
- }
-
- /**
- * @param stats
- */
- public void add(EntityStats stats) {
- loadCount += stats.getLoadCount();
- updateCount += stats.getUpdateCount();
- insertCount += stats.getInsertCount();
- deleteCount += stats.getDeleteCount();
- fetchCount += stats.getFetchCount();
- optimisticFailureCount += stats.getOptimisticFailureCount();
- }
-
- /**
- * toString
- */
- @Override
- public String toString() {
- return "name=" + name + ", shortName=" + shortName + ",loadCount=" + loadCount + ", updateCount=" + updateCount
- + ", insertCount=" + insertCount + ", deleteCount=" + deleteCount + ", fetchCount=" + fetchCount
- + ", optimisticFailureCount" + optimisticFailureCount;
- }
-
- /**
- * getName
- */
- public String getName() {
- return name;
- }
-
- /**
- * getShortName
- */
- public String getShortName() {
- return shortName;
- }
-
- /**
- * getLoadCount
- */
- public long getLoadCount() {
- return loadCount;
- }
-
- /**
- * getUpdateCount
- */
- public long getUpdateCount() {
- return updateCount;
- }
-
- /**
- * getInsertCount
- */
- public long getInsertCount() {
- return insertCount;
- }
-
- /**
- * getDeleteCount
- */
- public long getDeleteCount() {
- return deleteCount;
- }
-
- /**
- * getFetchCount
- */
- public long getFetchCount() {
- return fetchCount;
- }
-
- /**
- * getOptimisticFailureCount
- */
- public long getOptimisticFailureCount() {
- return optimisticFailureCount;
- }
-
- /**
- * toCompositeData
- */
- public CompositeData toCompositeData() {
- try {
- return new CompositeDataSupport(COMPOSITE_TYPE, ITEM_NAMES, new Object[] {name, shortName, loadCount,
- updateCount, insertCount, deleteCount, fetchCount, optimisticFailureCount, });
- } catch (OpenDataException e) {
- throw new RuntimeException(e);
- }
- }
-
- /**
- * newTabularDataInstance
- */
- public static TabularData newTabularDataInstance() {
- return new TabularDataSupport(TABULAR_TYPE);
- }
-
- /**
- * fromTabularData
- */
- public static EntityStats[] fromTabularData(final TabularData tabularData) {
- final List countList = new ArrayList(tabularData.size());
- for (final Iterator pos = tabularData.values().iterator(); pos.hasNext();) {
- countList.add(new EntityStats((CompositeData) pos.next()));
- }
- return countList.toArray(new EntityStats[countList.size()]);
- }
-
-}
Index: rctags/ehcache-2.10.8.2.20/ehcache-core/src/main/java/net/sf/ehcache/transaction/xa/XATransactionStore.java
===================================================================
diff -u -N
--- rctags/ehcache-2.10.8.2.20/ehcache-core/src/main/java/net/sf/ehcache/transaction/xa/XATransactionStore.java (revision 11355)
+++ rctags/ehcache-2.10.8.2.20/ehcache-core/src/main/java/net/sf/ehcache/transaction/xa/XATransactionStore.java (revision 0)
@@ -1,620 +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.xa;
-
-import net.sf.ehcache.CacheEntry;
-import net.sf.ehcache.CacheException;
-import net.sf.ehcache.Ehcache;
-import net.sf.ehcache.Element;
-import net.sf.ehcache.statistics.StatisticBuilder;
-import net.sf.ehcache.store.ElementValueComparator;
-import net.sf.ehcache.store.Store;
-import net.sf.ehcache.transaction.AbstractTransactionStore;
-import net.sf.ehcache.transaction.SoftLock;
-import net.sf.ehcache.transaction.SoftLockID;
-import net.sf.ehcache.transaction.SoftLockManager;
-import net.sf.ehcache.transaction.TransactionException;
-import net.sf.ehcache.transaction.TransactionIDFactory;
-import net.sf.ehcache.transaction.TransactionInterruptedException;
-import net.sf.ehcache.transaction.TransactionTimeoutException;
-import net.sf.ehcache.transaction.manager.TransactionManagerLookup;
-import net.sf.ehcache.transaction.xa.commands.StorePutCommand;
-import net.sf.ehcache.transaction.xa.commands.StoreRemoveCommand;
-import net.sf.ehcache.util.LargeSet;
-import net.sf.ehcache.util.SetAsList;
-import net.sf.ehcache.writer.CacheWriterManager;
-
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.terracotta.statistics.observer.OperationObserver;
-
-import java.util.Iterator;
-import java.util.List;
-import java.util.Set;
-import java.util.concurrent.ConcurrentHashMap;
-import java.util.concurrent.TimeUnit;
-
-import javax.transaction.RollbackException;
-import javax.transaction.Synchronization;
-import javax.transaction.SystemException;
-import javax.transaction.Transaction;
-import javax.transaction.xa.XAException;
-
-import static java.util.concurrent.TimeUnit.MILLISECONDS;
-
-/**
- * @author Ludovic Orban
- */
-public class XATransactionStore extends AbstractTransactionStore {
-
- private static final Logger LOG = LoggerFactory.getLogger(XATransactionStore.class.getName());
-
- private final TransactionManagerLookup transactionManagerLookup;
- private final TransactionIDFactory transactionIdFactory;
- private final ElementValueComparator comparator;
- private final SoftLockManager softLockManager;
- private final Ehcache cache;
- private final EhcacheXAResourceImpl recoveryResource;
-
- private final ConcurrentHashMap transactionToXAResourceMap =
- new ConcurrentHashMap();
- private final ConcurrentHashMap transactionToTimeoutMap = new ConcurrentHashMap();
-
- private final OperationObserver commitObserver = StatisticBuilder.operation(XaCommitOutcome.class)
- .of(this).named("xa-commit").tag("xa-transactional").build();
- private final OperationObserver rollbackObserver = StatisticBuilder.operation(XaRollbackOutcome.class)
- .of(this).named("xa-rollback").tag("xa-transactional").build();
- private final OperationObserver recoveryObserver = StatisticBuilder.operation(XaRecoveryOutcome.class)
- .of(this).named("xa-recovery").tag("xa-transactional").build();
-
- /**
- * Constructor
- * @param transactionManagerLookup the transaction manager lookup implementation
- * @param softLockManager the soft lock manager
- * @param transactionIdFactory the transaction ID factory
- * @param cache the cache
- * @param store the underlying store
- */
- public XATransactionStore(TransactionManagerLookup transactionManagerLookup, SoftLockManager softLockManager,
- TransactionIDFactory transactionIdFactory, Ehcache cache, Store store, ElementValueComparator comparator) {
- super(store);
- this.transactionManagerLookup = transactionManagerLookup;
- this.transactionIdFactory = transactionIdFactory;
- this.comparator = comparator;
- if (transactionManagerLookup.getTransactionManager() == null) {
- throw new TransactionException("no JTA transaction manager could be located, cannot bind twopc cache with JTA");
- }
- this.softLockManager = softLockManager;
- this.cache = cache;
-
- // this xaresource is for initial registration and recovery
- this.recoveryResource = new EhcacheXAResourceImpl(cache, underlyingStore, transactionManagerLookup, softLockManager, transactionIdFactory,
- comparator, commitObserver, rollbackObserver, recoveryObserver);
- transactionManagerLookup.register(recoveryResource, true);
- }
-
- @Override
- public void dispose() {
- super.dispose();
- transactionManagerLookup.unregister(recoveryResource, true);
- }
-
- private Transaction getCurrentTransaction() throws SystemException {
- Transaction transaction = transactionManagerLookup.getTransactionManager().getTransaction();
- if (transaction == null) {
- throw new TransactionException("JTA transaction not started");
- }
- return transaction;
- }
-
- /**
- * Get or create the XAResource of this XA store
- * @return the EhcacheXAResource of this store
- * @throws SystemException when something goes wrong with the transaction manager
- */
- public EhcacheXAResourceImpl getOrCreateXAResource() throws SystemException {
- Transaction transaction = getCurrentTransaction();
- EhcacheXAResourceImpl xaResource = (EhcacheXAResourceImpl) transactionToXAResourceMap.get(transaction);
- if (xaResource == null) {
- LOG.debug("creating new XAResource");
- xaResource = new EhcacheXAResourceImpl(cache, underlyingStore, transactionManagerLookup,
- softLockManager, transactionIdFactory, comparator, commitObserver, rollbackObserver,
- recoveryObserver);
- transactionToXAResourceMap.put(transaction, xaResource);
- xaResource.addTwoPcExecutionListener(new CleanupXAResource(getCurrentTransaction()));
- }
- return xaResource;
- }
-
- private XATransactionContext getTransactionContext() {
- try {
- Transaction transaction = getCurrentTransaction();
- EhcacheXAResourceImpl xaResource = (EhcacheXAResourceImpl) transactionToXAResourceMap.get(transaction);
- if (xaResource == null) {
- return null;
- }
- XATransactionContext transactionContext = xaResource.getCurrentTransactionContext();
-
- if (transactionContext == null) {
- transactionManagerLookup.register(xaResource, false);
- LOG.debug("creating new XA context");
- transactionContext = xaResource.createTransactionContext();
- xaResource.addTwoPcExecutionListener(new UnregisterXAResource());
- } else {
- transactionContext = xaResource.getCurrentTransactionContext();
- }
-
- LOG.debug("using XA context {}", transactionContext);
- return transactionContext;
- } catch (SystemException e) {
- throw new TransactionException("cannot get the current transaction", e);
- } catch (RollbackException e) {
- throw new TransactionException("transaction rolled back", e);
- }
- }
-
- private XATransactionContext getOrCreateTransactionContext() {
- try {
- EhcacheXAResourceImpl xaResource = getOrCreateXAResource();
- XATransactionContext transactionContext = xaResource.getCurrentTransactionContext();
-
- if (transactionContext == null) {
- transactionManagerLookup.register(xaResource, false);
- LOG.debug("creating new XA context");
- transactionContext = xaResource.createTransactionContext();
- xaResource.addTwoPcExecutionListener(new UnregisterXAResource());
- } else {
- transactionContext = xaResource.getCurrentTransactionContext();
- }
-
- LOG.debug("using XA context {}", transactionContext);
- return transactionContext;
- } catch (SystemException e) {
- throw new TransactionException("cannot get the current transaction", e);
- } catch (RollbackException e) {
- throw new TransactionException("transaction rolled back", e);
- }
- }
-
- /**
- * This class is used to clean up the transactionToTimeoutMap after a transaction
- * committed or rolled back.
- */
- private final class CleanupTimeout implements Synchronization {
- private final Transaction transaction;
-
- private CleanupTimeout(final Transaction transaction) {
- this.transaction = transaction;
- }
-
- public void beforeCompletion() {
- }
-
- public void afterCompletion(final int status) {
- transactionToTimeoutMap.remove(transaction);
- }
- }
-
- /**
- * This class is used to clean up the transactionToXAResourceMap after a transaction
- * committed or rolled back.
- */
- private final class CleanupXAResource implements XAExecutionListener {
- private final Transaction transaction;
-
- private CleanupXAResource(Transaction transaction) {
- this.transaction = transaction;
- }
-
- public void beforePrepare(EhcacheXAResource xaResource) {
- }
-
- public void afterCommitOrRollback(EhcacheXAResource xaResource) {
- transactionToXAResourceMap.remove(transaction);
- }
- }
-
- /**
- * This class is used to unregister the XAResource after a transaction
- * committed or rolled back.
- */
- private final class UnregisterXAResource implements XAExecutionListener {
-
- public void beforePrepare(EhcacheXAResource xaResource) {
- }
-
- public void afterCommitOrRollback(EhcacheXAResource xaResource) {
- transactionManagerLookup.unregister(xaResource, false);
- }
- }
-
-
- /**
- * @return milliseconds left before timeout
- */
- private long assertNotTimedOut() {
- try {
- if (Thread.interrupted()) {
- throw new TransactionInterruptedException("transaction interrupted");
- }
-
- Transaction transaction = getCurrentTransaction();
- Long timeoutTimestamp = transactionToTimeoutMap.get(transaction);
- long now = MILLISECONDS.convert(System.nanoTime(), TimeUnit.NANOSECONDS);
- if (timeoutTimestamp == null) {
- long timeout;
- EhcacheXAResource xaResource = transactionToXAResourceMap.get(transaction);
- if (xaResource != null) {
- int xaResourceTimeout = xaResource.getTransactionTimeout();
- timeout = MILLISECONDS.convert(xaResourceTimeout, TimeUnit.SECONDS);
- } else {
- int defaultTransactionTimeout = cache.getCacheManager().getTransactionController().getDefaultTransactionTimeout();
- timeout = MILLISECONDS.convert(defaultTransactionTimeout, TimeUnit.SECONDS);
- }
- timeoutTimestamp = now + timeout;
- transactionToTimeoutMap.put(transaction, timeoutTimestamp);
- try {
- transaction.registerSynchronization(new CleanupTimeout(transaction));
- } catch (RollbackException e) {
- throw new TransactionException("transaction has been marked as rollback only", e);
- }
- return timeout;
- } else {
- long timeToExpiry = timeoutTimestamp - now;
- if (timeToExpiry <= 0) {
- throw new TransactionTimeoutException("transaction timed out");
- } else {
- return timeToExpiry;
- }
- }
- } catch (SystemException e) {
- throw new TransactionException("cannot get the current transaction", e);
- } catch (XAException e) {
- throw new TransactionException("cannot get the XAResource transaction timeout", e);
- }
- }
-
- /* transactional methods */
-
- /**
- * {@inheritDoc}
- */
- public Element get(Object key) {
- LOG.debug("cache {} get {}", cache.getName(), key);
- XATransactionContext context = getTransactionContext();
- Element element;
- if (context == null) {
- element = getFromUnderlyingStore(key);
- } else {
- element = context.get(key);
- if (element == null && !context.isRemoved(key)) {
- element = getFromUnderlyingStore(key);
- }
- }
- return element;
- }
-
-
- /**
- * {@inheritDoc}
- */
- public Element getQuiet(Object key) {
- LOG.debug("cache {} getQuiet {}", cache.getName(), key);
- XATransactionContext context = getTransactionContext();
- Element element;
- if (context == null) {
- element = getQuietFromUnderlyingStore(key);
- } else {
- element = context.get(key);
- if (element == null && !context.isRemoved(key)) {
- element = getQuietFromUnderlyingStore(key);
- }
- }
- return element;
- }
-
- /**
- * {@inheritDoc}
- */
- public int getSize() {
- LOG.debug("cache {} getSize", cache.getName());
- XATransactionContext context = getOrCreateTransactionContext();
- int size = underlyingStore.getSize();
- return Math.max(0, size + context.getSizeModifier());
- }
-
- /**
- * {@inheritDoc}
- */
- public int getTerracottaClusteredSize() {
- try {
- Transaction transaction = transactionManagerLookup.getTransactionManager().getTransaction();
- if (transaction == null) {
- return underlyingStore.getTerracottaClusteredSize();
- }
- } catch (SystemException se) {
- throw new TransactionException("cannot get the current transaction", se);
- }
-
- LOG.debug("cache {} getTerracottaClusteredSize", cache.getName());
- XATransactionContext context = getOrCreateTransactionContext();
- int size = underlyingStore.getTerracottaClusteredSize();
- return size + context.getSizeModifier();
- }
-
- /**
- * {@inheritDoc}
- */
- public boolean containsKey(Object key) {
- LOG.debug("cache {} containsKey", cache.getName(), key);
- XATransactionContext context = getOrCreateTransactionContext();
- return !context.isRemoved(key) && (context.getAddedKeys().contains(key) || underlyingStore.containsKey(key));
- }
-
- /**
- * {@inheritDoc}
- */
- public List getKeys() {
- LOG.debug("cache {} getKeys", cache.getName());
- XATransactionContext context = getOrCreateTransactionContext();
- Set