[1/3] git commit: Revert "Metrics for prepared stmt usage and eviction"

2014-09-16 Thread tylerhobbs 
Repository: cassandra
Updated Branches:
  refs/heads/trunk 196e5146d -> 61a27af49


Revert "Metrics for prepared stmt usage and eviction"

This reverts commit 19c6cc1982d2146a99ccaf6dccc087fe88d5785f.


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

Branch: refs/heads/trunk
Commit: f19b4cb807d30cc7fdb1869c407ee9a5e9e3acce
Parents: 19c6cc1
Author: Tyler Hobbs 
Authored: Tue Sep 16 13:58:56 2014 -0500
Committer: Tyler Hobbs 
Committed: Tue Sep 16 13:58:56 2014 -0500

--
 CHANGES.txt |  1 -
 .../apache/cassandra/cql3/QueryProcessor.java   | 47 +
 .../cassandra/metrics/CqlStatementMetrics.java  | 54 
 .../apache/cassandra/service/ClientState.java   |  2 +-
 4 files changed, 3 insertions(+), 101 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/f19b4cb8/CHANGES.txt
--
diff --git a/CHANGES.txt b/CHANGES.txt
index cf7112c..3ee938a 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,5 +1,4 @@
 2.0.11:
- * Add metrics for prepared statement usage and eviction (CASSANDRA-7930)
  * Make CQLSSTableWriter sync within partitions (CASSANDRA-7360)
  * Potentially use non-local replicas in CqlConfigHelper (CASSANDRA-7906)
  * Explicitly disallowing mixing multi-column and single-column

http://git-wip-us.apache.org/repos/asf/cassandra/blob/f19b4cb8/src/java/org/apache/cassandra/cql3/QueryProcessor.java
--
diff --git a/src/java/org/apache/cassandra/cql3/QueryProcessor.java 
b/src/java/org/apache/cassandra/cql3/QueryProcessor.java
index ee188a3..a59fe9b 100644
--- a/src/java/org/apache/cassandra/cql3/QueryProcessor.java
+++ b/src/java/org/apache/cassandra/cql3/QueryProcessor.java
@@ -19,14 +19,11 @@ package org.apache.cassandra.cql3;
 
 import java.nio.ByteBuffer;
 import java.util.*;
-import java.util.concurrent.TimeUnit;
-import java.util.concurrent.atomic.AtomicLong;
 
 import com.google.common.primitives.Ints;
 
 import com.googlecode.concurrentlinkedhashmap.ConcurrentLinkedHashMap;
 import com.googlecode.concurrentlinkedhashmap.EntryWeigher;
-import com.googlecode.concurrentlinkedhashmap.EvictionListener;
 import org.antlr.runtime.*;
 import org.github.jamm.MemoryMeter;
 import org.slf4j.Logger;
@@ -35,10 +32,8 @@ import org.slf4j.LoggerFactory;
 import org.apache.cassandra.cql3.statements.*;
 import org.apache.cassandra.db.*;
 import org.apache.cassandra.exceptions.*;
-import org.apache.cassandra.metrics.CqlStatementMetrics;
 import org.apache.cassandra.service.ClientState;
 import org.apache.cassandra.service.QueryState;
-import org.apache.cassandra.service.StorageService;
 import org.apache.cassandra.thrift.ThriftClientState;
 import org.apache.cassandra.tracing.Tracing;
 import org.apache.cassandra.transport.messages.ResultMessage;
@@ -78,9 +73,6 @@ public class QueryProcessor implements QueryHandler
 private static final ConcurrentLinkedHashMap 
preparedStatements;
 private static final ConcurrentLinkedHashMap 
thriftPreparedStatements;
 
-public static final CqlStatementMetrics metrics = new 
CqlStatementMetrics();
-private static AtomicLong evictionCount = new AtomicLong(0);
-
 static
 {
 if (MemoryMeter.isInitialized())
@@ -88,29 +80,11 @@ public class QueryProcessor implements QueryHandler
 preparedStatements = new 
ConcurrentLinkedHashMap.Builder()
  
.maximumWeightedCapacity(MAX_CACHE_PREPARED_MEMORY)
  .weigher(cqlMemoryUsageWeigher)
- .listener(new EvictionListener()
-  {
-  @Override
-  public void onEviction(MD5Digest 
md5Digest, CQLStatement prepared)
-  {
-  
metrics.activePreparedStatements.dec();
-  
metrics.evictedPreparedStatements.inc();
-  evictionCount.incrementAndGet();
-  }
-  }).build();
+ .build();
 thriftPreparedStatements = new 
ConcurrentLinkedHashMap.Builder()

.maximumWeightedCapacity(MAX_CACHE_PREPARED_MEMORY)
.weigher(thriftMemoryUsageWeigher)
-   .listener(new EvictionListener()
-

[1/2] git commit: Revert "Metrics for prepared stmt usage and eviction"

2014-09-16 Thread tylerhobbs 
Repository: cassandra
Updated Branches:
  refs/heads/cassandra-2.1 681c380b5 -> b319b406b


Revert "Metrics for prepared stmt usage and eviction"

This reverts commit 19c6cc1982d2146a99ccaf6dccc087fe88d5785f.


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

Branch: refs/heads/cassandra-2.1
Commit: f19b4cb807d30cc7fdb1869c407ee9a5e9e3acce
Parents: 19c6cc1
Author: Tyler Hobbs 
Authored: Tue Sep 16 13:58:56 2014 -0500
Committer: Tyler Hobbs 
Committed: Tue Sep 16 13:58:56 2014 -0500

--
 CHANGES.txt |  1 -
 .../apache/cassandra/cql3/QueryProcessor.java   | 47 +
 .../cassandra/metrics/CqlStatementMetrics.java  | 54 
 .../apache/cassandra/service/ClientState.java   |  2 +-
 4 files changed, 3 insertions(+), 101 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/f19b4cb8/CHANGES.txt
--
diff --git a/CHANGES.txt b/CHANGES.txt
index cf7112c..3ee938a 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,5 +1,4 @@
 2.0.11:
- * Add metrics for prepared statement usage and eviction (CASSANDRA-7930)
  * Make CQLSSTableWriter sync within partitions (CASSANDRA-7360)
  * Potentially use non-local replicas in CqlConfigHelper (CASSANDRA-7906)
  * Explicitly disallowing mixing multi-column and single-column

http://git-wip-us.apache.org/repos/asf/cassandra/blob/f19b4cb8/src/java/org/apache/cassandra/cql3/QueryProcessor.java
--
diff --git a/src/java/org/apache/cassandra/cql3/QueryProcessor.java 
b/src/java/org/apache/cassandra/cql3/QueryProcessor.java
index ee188a3..a59fe9b 100644
--- a/src/java/org/apache/cassandra/cql3/QueryProcessor.java
+++ b/src/java/org/apache/cassandra/cql3/QueryProcessor.java
@@ -19,14 +19,11 @@ package org.apache.cassandra.cql3;
 
 import java.nio.ByteBuffer;
 import java.util.*;
-import java.util.concurrent.TimeUnit;
-import java.util.concurrent.atomic.AtomicLong;
 
 import com.google.common.primitives.Ints;
 
 import com.googlecode.concurrentlinkedhashmap.ConcurrentLinkedHashMap;
 import com.googlecode.concurrentlinkedhashmap.EntryWeigher;
-import com.googlecode.concurrentlinkedhashmap.EvictionListener;
 import org.antlr.runtime.*;
 import org.github.jamm.MemoryMeter;
 import org.slf4j.Logger;
@@ -35,10 +32,8 @@ import org.slf4j.LoggerFactory;
 import org.apache.cassandra.cql3.statements.*;
 import org.apache.cassandra.db.*;
 import org.apache.cassandra.exceptions.*;
-import org.apache.cassandra.metrics.CqlStatementMetrics;
 import org.apache.cassandra.service.ClientState;
 import org.apache.cassandra.service.QueryState;
-import org.apache.cassandra.service.StorageService;
 import org.apache.cassandra.thrift.ThriftClientState;
 import org.apache.cassandra.tracing.Tracing;
 import org.apache.cassandra.transport.messages.ResultMessage;
@@ -78,9 +73,6 @@ public class QueryProcessor implements QueryHandler
 private static final ConcurrentLinkedHashMap 
preparedStatements;
 private static final ConcurrentLinkedHashMap 
thriftPreparedStatements;
 
-public static final CqlStatementMetrics metrics = new 
CqlStatementMetrics();
-private static AtomicLong evictionCount = new AtomicLong(0);
-
 static
 {
 if (MemoryMeter.isInitialized())
@@ -88,29 +80,11 @@ public class QueryProcessor implements QueryHandler
 preparedStatements = new 
ConcurrentLinkedHashMap.Builder()
  
.maximumWeightedCapacity(MAX_CACHE_PREPARED_MEMORY)
  .weigher(cqlMemoryUsageWeigher)
- .listener(new EvictionListener()
-  {
-  @Override
-  public void onEviction(MD5Digest 
md5Digest, CQLStatement prepared)
-  {
-  
metrics.activePreparedStatements.dec();
-  
metrics.evictedPreparedStatements.inc();
-  evictionCount.incrementAndGet();
-  }
-  }).build();
+ .build();
 thriftPreparedStatements = new 
ConcurrentLinkedHashMap.Builder()

.maximumWeightedCapacity(MAX_CACHE_PREPARED_MEMORY)
.weigher(thriftMemoryUsageWeigher)
-   .listener(new EvictionListe

git commit: Revert "Metrics for prepared stmt usage and eviction"

2014-09-16 Thread tylerhobbs 
Repository: cassandra
Updated Branches:
  refs/heads/cassandra-2.0 19c6cc198 -> f19b4cb80


Revert "Metrics for prepared stmt usage and eviction"

This reverts commit 19c6cc1982d2146a99ccaf6dccc087fe88d5785f.


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

Branch: refs/heads/cassandra-2.0
Commit: f19b4cb807d30cc7fdb1869c407ee9a5e9e3acce
Parents: 19c6cc1
Author: Tyler Hobbs 
Authored: Tue Sep 16 13:58:56 2014 -0500
Committer: Tyler Hobbs 
Committed: Tue Sep 16 13:58:56 2014 -0500

--
 CHANGES.txt |  1 -
 .../apache/cassandra/cql3/QueryProcessor.java   | 47 +
 .../cassandra/metrics/CqlStatementMetrics.java  | 54 
 .../apache/cassandra/service/ClientState.java   |  2 +-
 4 files changed, 3 insertions(+), 101 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/f19b4cb8/CHANGES.txt
--
diff --git a/CHANGES.txt b/CHANGES.txt
index cf7112c..3ee938a 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,5 +1,4 @@
 2.0.11:
- * Add metrics for prepared statement usage and eviction (CASSANDRA-7930)
  * Make CQLSSTableWriter sync within partitions (CASSANDRA-7360)
  * Potentially use non-local replicas in CqlConfigHelper (CASSANDRA-7906)
  * Explicitly disallowing mixing multi-column and single-column

http://git-wip-us.apache.org/repos/asf/cassandra/blob/f19b4cb8/src/java/org/apache/cassandra/cql3/QueryProcessor.java
--
diff --git a/src/java/org/apache/cassandra/cql3/QueryProcessor.java 
b/src/java/org/apache/cassandra/cql3/QueryProcessor.java
index ee188a3..a59fe9b 100644
--- a/src/java/org/apache/cassandra/cql3/QueryProcessor.java
+++ b/src/java/org/apache/cassandra/cql3/QueryProcessor.java
@@ -19,14 +19,11 @@ package org.apache.cassandra.cql3;
 
 import java.nio.ByteBuffer;
 import java.util.*;
-import java.util.concurrent.TimeUnit;
-import java.util.concurrent.atomic.AtomicLong;
 
 import com.google.common.primitives.Ints;
 
 import com.googlecode.concurrentlinkedhashmap.ConcurrentLinkedHashMap;
 import com.googlecode.concurrentlinkedhashmap.EntryWeigher;
-import com.googlecode.concurrentlinkedhashmap.EvictionListener;
 import org.antlr.runtime.*;
 import org.github.jamm.MemoryMeter;
 import org.slf4j.Logger;
@@ -35,10 +32,8 @@ import org.slf4j.LoggerFactory;
 import org.apache.cassandra.cql3.statements.*;
 import org.apache.cassandra.db.*;
 import org.apache.cassandra.exceptions.*;
-import org.apache.cassandra.metrics.CqlStatementMetrics;
 import org.apache.cassandra.service.ClientState;
 import org.apache.cassandra.service.QueryState;
-import org.apache.cassandra.service.StorageService;
 import org.apache.cassandra.thrift.ThriftClientState;
 import org.apache.cassandra.tracing.Tracing;
 import org.apache.cassandra.transport.messages.ResultMessage;
@@ -78,9 +73,6 @@ public class QueryProcessor implements QueryHandler
 private static final ConcurrentLinkedHashMap 
preparedStatements;
 private static final ConcurrentLinkedHashMap 
thriftPreparedStatements;
 
-public static final CqlStatementMetrics metrics = new 
CqlStatementMetrics();
-private static AtomicLong evictionCount = new AtomicLong(0);
-
 static
 {
 if (MemoryMeter.isInitialized())
@@ -88,29 +80,11 @@ public class QueryProcessor implements QueryHandler
 preparedStatements = new 
ConcurrentLinkedHashMap.Builder()
  
.maximumWeightedCapacity(MAX_CACHE_PREPARED_MEMORY)
  .weigher(cqlMemoryUsageWeigher)
- .listener(new EvictionListener()
-  {
-  @Override
-  public void onEviction(MD5Digest 
md5Digest, CQLStatement prepared)
-  {
-  
metrics.activePreparedStatements.dec();
-  
metrics.evictedPreparedStatements.inc();
-  evictionCount.incrementAndGet();
-  }
-  }).build();
+ .build();
 thriftPreparedStatements = new 
ConcurrentLinkedHashMap.Builder()

.maximumWeightedCapacity(MAX_CACHE_PREPARED_MEMORY)
.weigher(thriftMemoryUsageWeigher)
-   .listener(new EvictionListe