cassandra-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jbel...@apache.org
Subject svn commit: r900432 - in /incubator/cassandra/trunk/src/java/org/apache/cassandra: cache/ db/ net/ service/ utils/
Date Mon, 18 Jan 2010 15:50:13 GMT
Author: jbellis
Date: Mon Jan 18 15:50:13 2010
New Revision: 900432

URL: http://svn.apache.org/viewvc?rev=900432&view=rev
Log:
move cache classes to cassandra.cache package.
patch by jbellis; reviewed by goffinet for CASSANDRA-688

Added:
    incubator/cassandra/trunk/src/java/org/apache/cassandra/cache/
    incubator/cassandra/trunk/src/java/org/apache/cassandra/cache/ICacheExpungeHook.java 
 (contents, props changed)
      - copied, changed from r900216, incubator/cassandra/trunk/src/java/org/apache/cassandra/utils/ICacheExpungeHook.java
    incubator/cassandra/trunk/src/java/org/apache/cassandra/cache/ICachetable.java   (contents,
props changed)
      - copied, changed from r900216, incubator/cassandra/trunk/src/java/org/apache/cassandra/utils/ICachetable.java
    incubator/cassandra/trunk/src/java/org/apache/cassandra/cache/InstrumentedCache.java 
 (contents, props changed)
      - copied, changed from r900216, incubator/cassandra/trunk/src/java/org/apache/cassandra/utils/InstrumentedCache.java
    incubator/cassandra/trunk/src/java/org/apache/cassandra/cache/InstrumentedCacheMBean.java
  (contents, props changed)
      - copied, changed from r900216, incubator/cassandra/trunk/src/java/org/apache/cassandra/utils/InstrumentedCacheMBean.java
Removed:
    incubator/cassandra/trunk/src/java/org/apache/cassandra/utils/ICacheExpungeHook.java
    incubator/cassandra/trunk/src/java/org/apache/cassandra/utils/ICachetable.java
    incubator/cassandra/trunk/src/java/org/apache/cassandra/utils/InstrumentedCache.java
    incubator/cassandra/trunk/src/java/org/apache/cassandra/utils/InstrumentedCacheMBean.java
Modified:
    incubator/cassandra/trunk/src/java/org/apache/cassandra/db/ColumnFamilyStore.java
    incubator/cassandra/trunk/src/java/org/apache/cassandra/net/MessagingService.java
    incubator/cassandra/trunk/src/java/org/apache/cassandra/service/ConsistencyManager.java
    incubator/cassandra/trunk/src/java/org/apache/cassandra/service/ReadRepairManager.java
    incubator/cassandra/trunk/src/java/org/apache/cassandra/utils/Cachetable.java

Copied: incubator/cassandra/trunk/src/java/org/apache/cassandra/cache/ICacheExpungeHook.java
(from r900216, incubator/cassandra/trunk/src/java/org/apache/cassandra/utils/ICacheExpungeHook.java)
URL: http://svn.apache.org/viewvc/incubator/cassandra/trunk/src/java/org/apache/cassandra/cache/ICacheExpungeHook.java?p2=incubator/cassandra/trunk/src/java/org/apache/cassandra/cache/ICacheExpungeHook.java&p1=incubator/cassandra/trunk/src/java/org/apache/cassandra/utils/ICacheExpungeHook.java&r1=900216&r2=900432&rev=900432&view=diff
==============================================================================
--- incubator/cassandra/trunk/src/java/org/apache/cassandra/utils/ICacheExpungeHook.java (original)
+++ incubator/cassandra/trunk/src/java/org/apache/cassandra/cache/ICacheExpungeHook.java Mon
Jan 18 15:50:13 2010
@@ -16,7 +16,7 @@
  * limitations under the License.
  */
 
-package org.apache.cassandra.utils;
+package org.apache.cassandra.cache;
 
 /**
  * Created by IntelliJ IDEA.

Propchange: incubator/cassandra/trunk/src/java/org/apache/cassandra/cache/ICacheExpungeHook.java
------------------------------------------------------------------------------
    svn:eol-style = native

Copied: incubator/cassandra/trunk/src/java/org/apache/cassandra/cache/ICachetable.java (from
r900216, incubator/cassandra/trunk/src/java/org/apache/cassandra/utils/ICachetable.java)
URL: http://svn.apache.org/viewvc/incubator/cassandra/trunk/src/java/org/apache/cassandra/cache/ICachetable.java?p2=incubator/cassandra/trunk/src/java/org/apache/cassandra/cache/ICachetable.java&p1=incubator/cassandra/trunk/src/java/org/apache/cassandra/utils/ICachetable.java&r1=900216&r2=900432&rev=900432&view=diff
==============================================================================
--- incubator/cassandra/trunk/src/java/org/apache/cassandra/utils/ICachetable.java (original)
+++ incubator/cassandra/trunk/src/java/org/apache/cassandra/cache/ICachetable.java Mon Jan
18 15:50:13 2010
@@ -16,9 +16,8 @@
  * limitations under the License.
  */
 
-package org.apache.cassandra.utils;
+package org.apache.cassandra.cache;
 
-import java.util.Enumeration;
 import java.util.Set;
 
 public interface ICachetable<K,V>

Propchange: incubator/cassandra/trunk/src/java/org/apache/cassandra/cache/ICachetable.java
------------------------------------------------------------------------------
    svn:eol-style = native

Copied: incubator/cassandra/trunk/src/java/org/apache/cassandra/cache/InstrumentedCache.java
(from r900216, incubator/cassandra/trunk/src/java/org/apache/cassandra/utils/InstrumentedCache.java)
URL: http://svn.apache.org/viewvc/incubator/cassandra/trunk/src/java/org/apache/cassandra/cache/InstrumentedCache.java?p2=incubator/cassandra/trunk/src/java/org/apache/cassandra/cache/InstrumentedCache.java&p1=incubator/cassandra/trunk/src/java/org/apache/cassandra/utils/InstrumentedCache.java&r1=900216&r2=900432&rev=900432&view=diff
==============================================================================
--- incubator/cassandra/trunk/src/java/org/apache/cassandra/utils/InstrumentedCache.java (original)
+++ incubator/cassandra/trunk/src/java/org/apache/cassandra/cache/InstrumentedCache.java Mon
Jan 18 15:50:13 2010
@@ -1,10 +1,11 @@
-package org.apache.cassandra.utils;
+package org.apache.cassandra.cache;
 
 import java.lang.management.ManagementFactory;
 import javax.management.MBeanServer;
 import javax.management.ObjectName;
 
 import com.reardencommerce.kernel.collections.shared.evictable.ConcurrentLinkedHashMap;
+import org.apache.cassandra.utils.TimedStatsDeque;
 
 public class InstrumentedCache<K, V> implements InstrumentedCacheMBean
 {

Propchange: incubator/cassandra/trunk/src/java/org/apache/cassandra/cache/InstrumentedCache.java
------------------------------------------------------------------------------
    svn:eol-style = native

Copied: incubator/cassandra/trunk/src/java/org/apache/cassandra/cache/InstrumentedCacheMBean.java
(from r900216, incubator/cassandra/trunk/src/java/org/apache/cassandra/utils/InstrumentedCacheMBean.java)
URL: http://svn.apache.org/viewvc/incubator/cassandra/trunk/src/java/org/apache/cassandra/cache/InstrumentedCacheMBean.java?p2=incubator/cassandra/trunk/src/java/org/apache/cassandra/cache/InstrumentedCacheMBean.java&p1=incubator/cassandra/trunk/src/java/org/apache/cassandra/utils/InstrumentedCacheMBean.java&r1=900216&r2=900432&rev=900432&view=diff
==============================================================================
--- incubator/cassandra/trunk/src/java/org/apache/cassandra/utils/InstrumentedCacheMBean.java
(original)
+++ incubator/cassandra/trunk/src/java/org/apache/cassandra/cache/InstrumentedCacheMBean.java
Mon Jan 18 15:50:13 2010
@@ -1,4 +1,4 @@
-package org.apache.cassandra.utils;
+package org.apache.cassandra.cache;
 
 public interface InstrumentedCacheMBean
 {

Propchange: incubator/cassandra/trunk/src/java/org/apache/cassandra/cache/InstrumentedCacheMBean.java
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: incubator/cassandra/trunk/src/java/org/apache/cassandra/db/ColumnFamilyStore.java
URL: http://svn.apache.org/viewvc/incubator/cassandra/trunk/src/java/org/apache/cassandra/db/ColumnFamilyStore.java?rev=900432&r1=900431&r2=900432&view=diff
==============================================================================
--- incubator/cassandra/trunk/src/java/org/apache/cassandra/db/ColumnFamilyStore.java (original)
+++ incubator/cassandra/trunk/src/java/org/apache/cassandra/db/ColumnFamilyStore.java Mon
Jan 18 15:50:13 2010
@@ -30,6 +30,7 @@
 import java.util.concurrent.atomic.AtomicInteger;
 import java.util.concurrent.atomic.AtomicReference;
 
+import org.apache.cassandra.cache.InstrumentedCache;
 import org.apache.cassandra.service.SliceRange;
 import org.apache.log4j.Logger;
 

Modified: incubator/cassandra/trunk/src/java/org/apache/cassandra/net/MessagingService.java
URL: http://svn.apache.org/viewvc/incubator/cassandra/trunk/src/java/org/apache/cassandra/net/MessagingService.java?rev=900432&r1=900431&r2=900432&view=diff
==============================================================================
--- incubator/cassandra/trunk/src/java/org/apache/cassandra/net/MessagingService.java (original)
+++ incubator/cassandra/trunk/src/java/org/apache/cassandra/net/MessagingService.java Mon
Jan 18 15:50:13 2010
@@ -18,6 +18,7 @@
 
 package org.apache.cassandra.net;
 
+import org.apache.cassandra.cache.ICachetable;
 import org.apache.cassandra.concurrent.*;
 import org.apache.cassandra.config.DatabaseDescriptor;
 import org.apache.cassandra.gms.FailureDetector;

Modified: incubator/cassandra/trunk/src/java/org/apache/cassandra/service/ConsistencyManager.java
URL: http://svn.apache.org/viewvc/incubator/cassandra/trunk/src/java/org/apache/cassandra/service/ConsistencyManager.java?rev=900432&r1=900431&r2=900432&view=diff
==============================================================================
--- incubator/cassandra/trunk/src/java/org/apache/cassandra/service/ConsistencyManager.java
(original)
+++ incubator/cassandra/trunk/src/java/org/apache/cassandra/service/ConsistencyManager.java
Mon Jan 18 15:50:13 2010
@@ -25,6 +25,8 @@
 import java.util.Arrays;
 import java.util.List;
 
+import org.apache.cassandra.cache.ICacheExpungeHook;
+import org.apache.cassandra.cache.ICachetable;
 import org.apache.cassandra.db.ReadCommand;
 import org.apache.cassandra.db.ReadResponse;
 import org.apache.cassandra.db.Row;

Modified: incubator/cassandra/trunk/src/java/org/apache/cassandra/service/ReadRepairManager.java
URL: http://svn.apache.org/viewvc/incubator/cassandra/trunk/src/java/org/apache/cassandra/service/ReadRepairManager.java?rev=900432&r1=900431&r2=900432&view=diff
==============================================================================
--- incubator/cassandra/trunk/src/java/org/apache/cassandra/service/ReadRepairManager.java
(original)
+++ incubator/cassandra/trunk/src/java/org/apache/cassandra/service/ReadRepairManager.java
Mon Jan 18 15:50:13 2010
@@ -30,8 +30,8 @@
 import org.apache.cassandra.net.MessagingService;
 import org.apache.cassandra.utils.Cachetable;
 import org.apache.cassandra.utils.FBUtilities;
-import org.apache.cassandra.utils.ICacheExpungeHook;
-import org.apache.cassandra.utils.ICachetable;
+import org.apache.cassandra.cache.ICacheExpungeHook;
+import org.apache.cassandra.cache.ICachetable;
 
 import org.apache.log4j.Logger;
 

Modified: incubator/cassandra/trunk/src/java/org/apache/cassandra/utils/Cachetable.java
URL: http://svn.apache.org/viewvc/incubator/cassandra/trunk/src/java/org/apache/cassandra/utils/Cachetable.java?rev=900432&r1=900431&r2=900432&view=diff
==============================================================================
--- incubator/cassandra/trunk/src/java/org/apache/cassandra/utils/Cachetable.java (original)
+++ incubator/cassandra/trunk/src/java/org/apache/cassandra/utils/Cachetable.java Mon Jan
18 15:50:13 2010
@@ -22,6 +22,9 @@
 
 import org.apache.log4j.Logger;
 
+import org.apache.cassandra.cache.ICacheExpungeHook;
+import org.apache.cassandra.cache.ICachetable;
+
 public class Cachetable<K, V> implements ICachetable<K, V>
 {
     private class CacheableObject



Mime
View raw message