Return-Path: 
 <commits-return-95902-apmail-cassandra-commits-archive=cassandra.apache.org@cassandra.apache.org>
X-Original-To: apmail-cassandra-commits-archive@www.apache.org
Delivered-To: apmail-cassandra-commits-archive@www.apache.org
Received: from mail.apache.org (hermes.apache.org [140.211.11.3])
	by minotaur.apache.org (Postfix) with SMTP id 6559611CAD
	for <apmail-cassandra-commits-archive@www.apache.org>;
 Fri, 28 Mar 2014 23:00:10 +0000 (UTC)
Received: (qmail 6617 invoked by uid 500); 28 Mar 2014 23:00:09 -0000
Delivered-To: apmail-cassandra-commits-archive@cassandra.apache.org
Received: (qmail 6563 invoked by uid 500); 28 Mar 2014 23:00:09 -0000
Mailing-List: contact commits-help@cassandra.apache.org; run by ezmlm
Precedence: bulk
List-Help: <mailto:commits-help@cassandra.apache.org>
List-Unsubscribe: <mailto:commits-unsubscribe@cassandra.apache.org>
List-Post: <mailto:commits@cassandra.apache.org>
List-Id: <commits.cassandra.apache.org>
Reply-To: dev@cassandra.apache.org
Delivered-To: mailing list commits@cassandra.apache.org
Received: (qmail 6555 invoked by uid 99); 28 Mar 2014 23:00:09 -0000
Received: from tyr.zones.apache.org (HELO tyr.zones.apache.org)
 (140.211.11.114)
    by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 28 Mar 2014 23:00:09 +0000
Received: by tyr.zones.apache.org (Postfix, from userid 65534)
	id 172FE915D68; Fri, 28 Mar 2014 23:00:08 +0000 (UTC)
Content-Type: text/plain; charset="us-ascii"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
From: aleksey@apache.org
To: commits@cassandra.apache.org
Date: Fri, 28 Mar 2014 23:00:08 -0000
Message-Id: <4788fe8d06d94abea17cc9db72a80234@git.apache.org>
X-Mailer: ASF-Git Admin Mailer
Subject: [1/2] git commit: Ninja-in OperationType.COUNTER_CACHE_SAVE

Repository: cassandra
Updated Branches:
  refs/heads/trunk e1de2a49e -> 7ef6b3477


Ninja-in OperationType.COUNTER_CACHE_SAVE


Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/bef9526d
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/bef9526d
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/bef9526d

Branch: refs/heads/trunk
Commit: bef9526d1b89ccd8bf3f42664aebf05d587a0411
Parents: 1e57bd1
Author: Aleksey Yeschenko <aleksey@apache.org>
Authored: Sat Mar 29 01:58:34 2014 +0300
Committer: Aleksey Yeschenko <aleksey@apache.org>
Committed: Sat Mar 29 01:58:34 2014 +0300

----------------------------------------------------------------------
 src/java/org/apache/cassandra/cache/AutoSavingCache.java       | 2 ++
 src/java/org/apache/cassandra/db/compaction/OperationType.java | 1 +
 2 files changed, 3 insertions(+)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cassandra/blob/bef9526d/src/java/org/apache/cassandra/cache/AutoSavingCache.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/cache/AutoSavingCache.java b/src/java/org/apache/cassandra/cache/AutoSavingCache.java
index c0718b6..7b9ae95 100644
--- a/src/java/org/apache/cassandra/cache/AutoSavingCache.java
+++ b/src/java/org/apache/cassandra/cache/AutoSavingCache.java
@@ -170,6 +170,8 @@ public class AutoSavingCache<K extends CacheKey, V> extends InstrumentingCache<K
                 type = OperationType.KEY_CACHE_SAVE;
             else if (cacheType == CacheService.CacheType.ROW_CACHE)
                 type = OperationType.ROW_CACHE_SAVE;
+            else if (cacheType == CacheService.CacheType.COUNTER_CACHE)
+                type = OperationType.COUNTER_CACHE_SAVE;
             else
                 type = OperationType.UNKNOWN;
 

http://git-wip-us.apache.org/repos/asf/cassandra/blob/bef9526d/src/java/org/apache/cassandra/db/compaction/OperationType.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/db/compaction/OperationType.java b/src/java/org/apache/cassandra/db/compaction/OperationType.java
index df4fd96..15d18f6 100644
--- a/src/java/org/apache/cassandra/db/compaction/OperationType.java
+++ b/src/java/org/apache/cassandra/db/compaction/OperationType.java
@@ -23,6 +23,7 @@ public enum OperationType
     VALIDATION("Validation"),
     KEY_CACHE_SAVE("Key cache save"),
     ROW_CACHE_SAVE("Row cache save"),
+    COUNTER_CACHE_SAVE("Counter cache save"),
     CLEANUP("Cleanup"),
     SCRUB("Scrub"),
     UPGRADE_SSTABLES("Upgrade sstables"),