You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cassandra.apache.org by ma...@apache.org on 2014/07/03 18:44:35 UTC
git commit: Remove left-over rows_per_partition_to_cache
Repository: cassandra
Updated Branches:
refs/heads/cassandra-2.1.0 8c4ffbe65 -> 28164849c
Remove left-over rows_per_partition_to_cache
Patch by marcuse; reviewed by jbellis for CASSANDRA-7493
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/28164849
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/28164849
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/28164849
Branch: refs/heads/cassandra-2.1.0
Commit: 28164849cc2c48a60d099b137380a662eae06d1e
Parents: 8c4ffbe
Author: Marcus Eriksson <ma...@apache.org>
Authored: Thu Jul 3 18:40:09 2014 +0200
Committer: Marcus Eriksson <ma...@apache.org>
Committed: Thu Jul 3 18:42:51 2014 +0200
----------------------------------------------------------------------
CHANGES.txt | 1 +
src/java/org/apache/cassandra/config/CFMetaData.java | 1 -
src/java/org/apache/cassandra/cql3/statements/CFPropDefs.java | 1 -
3 files changed, 1 insertion(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/28164849/CHANGES.txt
----------------------------------------------------------------------
diff --git a/CHANGES.txt b/CHANGES.txt
index 75a1786..cd16f35 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -2,6 +2,7 @@
* (Windows) handle spaces in path names (CASSANDRA-7451)
* Ensure writes have completed after dropping a table, before recycling
commit log segments (CASSANDRA-7437)
+ * Remove left-over rows_per_partition_to_cache (CASSANDRA-7493)
Merged from 2.0:
* Fix CC#collectTimeOrderedData() tombstone optimisations (CASSANDRA-7394)
* Support DISTINCT for static columns and fix behaviour when DISTINC is
http://git-wip-us.apache.org/repos/asf/cassandra/blob/28164849/src/java/org/apache/cassandra/config/CFMetaData.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/config/CFMetaData.java b/src/java/org/apache/cassandra/config/CFMetaData.java
index de2466c..dd3d079 100644
--- a/src/java/org/apache/cassandra/config/CFMetaData.java
+++ b/src/java/org/apache/cassandra/config/CFMetaData.java
@@ -182,7 +182,6 @@ public final class CFMetaData
+ "min_index_interval int,"
+ "max_index_interval int,"
+ "dropped_columns map<text, bigint>,"
- + "rows_per_partition_to_cache text,"
+ "PRIMARY KEY (keyspace_name, columnfamily_name)"
+ ") WITH COMMENT='ColumnFamily definitions' AND gc_grace_seconds=8640");
http://git-wip-us.apache.org/repos/asf/cassandra/blob/28164849/src/java/org/apache/cassandra/cql3/statements/CFPropDefs.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/cql3/statements/CFPropDefs.java b/src/java/org/apache/cassandra/cql3/statements/CFPropDefs.java
index f920e30..486fc9a 100644
--- a/src/java/org/apache/cassandra/cql3/statements/CFPropDefs.java
+++ b/src/java/org/apache/cassandra/cql3/statements/CFPropDefs.java
@@ -39,7 +39,6 @@ public class CFPropDefs extends PropertyDefinitions
public static final String KW_MINCOMPACTIONTHRESHOLD = "min_threshold";
public static final String KW_MAXCOMPACTIONTHRESHOLD = "max_threshold";
public static final String KW_CACHING = "caching";
- public static final String KW_ROWS_PER_PARTITION_TO_CACHE = "rows_per_partition_to_cache";
public static final String KW_DEFAULT_TIME_TO_LIVE = "default_time_to_live";
public static final String KW_MIN_INDEX_INTERVAL = "min_index_interval";
public static final String KW_MAX_INDEX_INTERVAL = "max_index_interval";