cassandra-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jbel...@apache.org
Subject [5/6] git commit: fix WITH compaction_strategy -> WITH compaction patch by jbellis for CASSANDRA-4968
Date Sun, 18 Nov 2012 20:20:37 GMT
fix WITH compaction_strategy -> WITH compaction
patch by jbellis for CASSANDRA-4968


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

Branch: refs/heads/cassandra-1.2.0
Commit: 6cdbb2d7b16fdd783c7bb93b9b40b79d526f342d
Parents: b226ae5
Author: Jonathan Ellis <jbellis@apache.org>
Authored: Sat Nov 17 18:24:36 2012 +0100
Committer: Jonathan Ellis <jbellis@apache.org>
Committed: Sun Nov 18 21:19:46 2012 +0100

----------------------------------------------------------------------
 doc/cql3/CQL.textile                               |    2 +-
 src/java/org/apache/cassandra/cql3/CFPropDefs.java |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cassandra/blob/6cdbb2d7/doc/cql3/CQL.textile
----------------------------------------------------------------------
diff --git a/doc/cql3/CQL.textile b/doc/cql3/CQL.textile
index bf2746e..931aa18 100644
--- a/doc/cql3/CQL.textile
+++ b/doc/cql3/CQL.textile
@@ -227,7 +227,7 @@ CREATE TABLE timeline (
     body text,
     posted_by text,
     PRIMARY KEY (userid, posted_month, posted_time)
-) WITH compaction_strategy = { 'class' : 'LeveledCompactionStrategy' };
+) WITH compaction = { 'class' : 'LeveledCompactionStrategy' };
 p. 
 The @CREATE TABLE@ statement creates a new table. Each such table is a set of _rows_ (usually
representing related entities) for which it defines a number of properties. A table is defined
by a "name":#createTableName, it defines the <a href="#createTableColumn"><it>columns</it></a>
composing rows of the table and have a number of "options":#createTableOptions. Note that
the @CREATE COLUMNFAMILY@ syntax is supported as an alias for @CREATE TABLE@ (for historical
reasons).
 

http://git-wip-us.apache.org/repos/asf/cassandra/blob/6cdbb2d7/src/java/org/apache/cassandra/cql3/CFPropDefs.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/cql3/CFPropDefs.java b/src/java/org/apache/cassandra/cql3/CFPropDefs.java
index 0b563cc..5b29a2a 100644
--- a/src/java/org/apache/cassandra/cql3/CFPropDefs.java
+++ b/src/java/org/apache/cassandra/cql3/CFPropDefs.java
@@ -47,7 +47,7 @@ public class CFPropDefs extends PropertyDefinitions
     public static final String KW_CACHING = "caching";
     public static final String KW_BF_FP_CHANCE = "bloom_filter_fp_chance";
 
-    public static final String KW_COMPACTION = "compaction";
+    public static final String KW_COMPACTION = "compaction_strategy";
     public static final String KW_COMPRESSION = "compression";
 
     public static final String COMPACTION_STRATEGY_CLASS_KEY = "class";


Mime
View raw message