You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cassandra.apache.org by bl...@apache.org on 2015/09/16 10:37:45 UTC
[1/6] cassandra git commit: Fix build
Repository: cassandra
Updated Branches:
refs/heads/trunk 1ecb7a4f9 -> 61ce1b9a7
Fix build
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/af0678dd
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/af0678dd
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/af0678dd
Branch: refs/heads/trunk
Commit: af0678dd48389a05b0fffb89d21b4e2f9d91f9d6
Parents: 0afe4be
Author: Sylvain Lebresne <sy...@datastax.com>
Authored: Wed Sep 16 09:44:16 2015 +0200
Committer: Sylvain Lebresne <sy...@datastax.com>
Committed: Wed Sep 16 09:44:16 2015 +0200
----------------------------------------------------------------------
.../cassandra/hadoop/cql3/CqlInputFormat.java | 23 +++++++++++++++-----
1 file changed, 17 insertions(+), 6 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/af0678dd/src/java/org/apache/cassandra/hadoop/cql3/CqlInputFormat.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/hadoop/cql3/CqlInputFormat.java b/src/java/org/apache/cassandra/hadoop/cql3/CqlInputFormat.java
index 7699f29..3f74c33 100644
--- a/src/java/org/apache/cassandra/hadoop/cql3/CqlInputFormat.java
+++ b/src/java/org/apache/cassandra/hadoop/cql3/CqlInputFormat.java
@@ -19,19 +19,30 @@ package org.apache.cassandra.hadoop.cql3;
import java.io.IOException;
import java.util.*;
-import java.util.concurrent.*
+import java.util.concurrent.*;
+
+import com.datastax.driver.core.Host;
+import com.datastax.driver.core.Metadata;
+import com.datastax.driver.core.ResultSet;
+import com.datastax.driver.core.Row;
+import com.datastax.driver.core.Session;
+import com.datastax.driver.core.TokenRange;
+import org.apache.hadoop.conf.Configuration;
+import org.apache.hadoop.mapred.InputSplit;
+import org.apache.hadoop.mapred.JobConf;
+import org.apache.hadoop.mapred.RecordReader;
+import org.apache.hadoop.mapred.Reporter;
+import org.apache.hadoop.mapreduce.JobContext;
+import org.apache.hadoop.mapreduce.TaskAttemptContext;
+import org.apache.hadoop.mapreduce.TaskAttemptID;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import com.datastax.driver.core.*;
import org.apache.cassandra.db.SystemKeyspace;
import org.apache.cassandra.dht.*;
+import org.apache.cassandra.thrift.KeyRange;
import org.apache.cassandra.hadoop.*;
-import org.apache.hadoop.conf.Configuration;
-import org.apache.hadoop.mapred.*;
-import org.apache.hadoop.mapreduce.*;
-import com.datastax.driver.core.Row;
/**
* Hadoop InputFormat allowing map/reduce against Cassandra rows within one ColumnFamily.
[3/6] cassandra git commit: Add Benjamin Lerer to the developer list
in build.xml
Posted by bl...@apache.org.
Add Benjamin Lerer to the developer list in build.xml
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/b8b4eb76
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/b8b4eb76
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/b8b4eb76
Branch: refs/heads/trunk
Commit: b8b4eb76c42a61b4f33aa57041dac5af2ba2480c
Parents: 3b46e5b
Author: blerer <be...@datastax.com>
Authored: Wed Sep 16 10:18:18 2015 +0200
Committer: blerer <be...@datastax.com>
Committed: Wed Sep 16 10:18:18 2015 +0200
----------------------------------------------------------------------
build.xml | 1 +
1 file changed, 1 insertion(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/b8b4eb76/build.xml
----------------------------------------------------------------------
diff --git a/build.xml b/build.xml
index 20c26a8..c36c819 100644
--- a/build.xml
+++ b/build.xml
@@ -415,6 +415,7 @@
<developer id="aleksey" name="Aleksey Yeschenko"/>
<developer id="amorton" name="Aaron Morton"/>
<developer id="benedict" name="Benedict Elliott Smith"/>
+ <developer id="benjamin" name="Benjamin Lerer"/>
<developer id="brandonwilliams" name="Brandon Williams"/>
<developer id="dbrosius" name="David Brosius"/>
<developer id="eevans" name="Eric Evans"/>
[4/6] cassandra git commit: Merge branch cassandra-2.1 into
cassandra-2.2
Posted by bl...@apache.org.
Merge branch cassandra-2.1 into cassandra-2.2
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/e7c2952d
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/e7c2952d
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/e7c2952d
Branch: refs/heads/trunk
Commit: e7c2952d31e8b6ddfef220942ba83888806beabb
Parents: 8cad732 b8b4eb7
Author: blerer <be...@datastax.com>
Authored: Wed Sep 16 10:21:44 2015 +0200
Committer: blerer <be...@datastax.com>
Committed: Wed Sep 16 10:21:58 2015 +0200
----------------------------------------------------------------------
build.xml | 1 +
doc/cql3/CQL.textile | 20 ++++++++++++++------
2 files changed, 15 insertions(+), 6 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/e7c2952d/build.xml
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/e7c2952d/doc/cql3/CQL.textile
----------------------------------------------------------------------
[5/6] cassandra git commit: Merge branch cassandra-2.2 into
cassandra-3.0
Posted by bl...@apache.org.
Merge branch cassandra-2.2 into cassandra-3.0
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/0d4e0cd2
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/0d4e0cd2
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/0d4e0cd2
Branch: refs/heads/trunk
Commit: 0d4e0cd22653ff7c3c1ef4a4b2c23c78524ecc42
Parents: af0678d e7c2952
Author: blerer <be...@datastax.com>
Authored: Wed Sep 16 10:33:47 2015 +0200
Committer: blerer <be...@datastax.com>
Committed: Wed Sep 16 10:34:00 2015 +0200
----------------------------------------------------------------------
build.xml | 1 +
doc/cql3/CQL.textile | 20 ++++++++++++++------
2 files changed, 15 insertions(+), 6 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/0d4e0cd2/build.xml
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/0d4e0cd2/doc/cql3/CQL.textile
----------------------------------------------------------------------
diff --cc doc/cql3/CQL.textile
index 0e04528,ce712be..60e3d5e
--- a/doc/cql3/CQL.textile
+++ b/doc/cql3/CQL.textile
@@@ -362,14 -361,22 +361,23 @@@ The @compaction@ property must at leas
| @max_sstable_age_days@ | DateTieredCompactionStrategy | 365 | SSTables only containing data that is older than this will never be compacted. |
- For the @compression@ property, the following default sub-options are available:
+ h4(#compressionOptions). Compression options
+
+ For the @compression@ property, the following sub-options are available:
-|_. option |_. default |_. description |
-| @sstable_compression@ | LZ4Compressor | The compression algorithm to use. Default compressor are: LZ4Compressor, SnappyCompressor and DeflateCompressor. Use an empty string (@''@) to disable compression. Custom compressor can be provided by specifying the full class name as a "string constant":#constants.|
-| @chunk_length_kb@ | 64KB | On disk SSTables are compressed by block (to allow random reads). This defines the size (in KB) of said block. Bigger values may improve the compression rate, but increases the minimum size of data to be read from disk for a read |
-| @crc_check_chance@ | 1.0 | When compression is enabled, each compressed block includes a checksum of that block for the purpose of detecting disk bitrot and avoiding the propagation of corruption to other replica. This option defines the probability with which those checksums are checked during read. By default they are always checked. Set to 0 to disable checksum checking and to 0.5 for instance to check them every other read|
+|_. option |_. default |_. description |
+| @class@ | LZ4Compressor | The compression algorithm to use. Default compressor are: LZ4Compressor, SnappyCompressor and DeflateCompressor. Use @'enabled' : false@ to disable compression. Custom compressor can be provided by specifying the full class name as a "string constant":#constants.|
+| @enabled@ | true | By default compression is enabled. To disable it, set @enabled@ to @false@
+| @chunk_length_in_kb@ | 64KB | On disk SSTables are compressed by block (to allow random reads). This defines the size (in KB) of said block. Bigger values may improve the compression rate, but increases the minimum size of data to be read from disk for a read |
+| @crc_check_chance@ | 1.0 | When compression is enabled, each compressed block includes a checksum of that block for the purpose of detecting disk bitrot and avoiding the propagation of corruption to other replica. This option defines the probability with which those checksums are checked during read. By default they are always checked. Set to 0 to disable checksum checking and to 0.5 for instance to check them every other read|
+ h4(#cachingOptions). Caching options
+
+ For the @caching@ property, the following sub-options are available:
+
+ |_. option |_. default |_. description |
+ |@keys@ | ALL | Whether to cache keys ("key cache") for this table. Valid values are: @ALL@ and @NONE@.|
+ |@rows_per_partition@ | NONE | The amount of rows to cache per partition ("row cache"). If an integer @n@ is specified, the first @n@ queried rows of a partition will be cached. Other possible options are @ALL@, to cache all rows of a queried partition, or @NONE@ to disable row caching.|
h4. Other considerations:
[6/6] cassandra git commit: Merge branch cassandra-3.0 into trunk
Posted by bl...@apache.org.
Merge branch cassandra-3.0 into trunk
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/61ce1b9a
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/61ce1b9a
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/61ce1b9a
Branch: refs/heads/trunk
Commit: 61ce1b9a71c30b7c394253894a333e94653f13eb
Parents: 1ecb7a4 0d4e0cd
Author: blerer <be...@datastax.com>
Authored: Wed Sep 16 10:35:32 2015 +0200
Committer: blerer <be...@datastax.com>
Committed: Wed Sep 16 10:37:06 2015 +0200
----------------------------------------------------------------------
build.xml | 1 +
doc/cql3/CQL.textile | 20 ++++++++++++-----
.../cassandra/hadoop/cql3/CqlInputFormat.java | 23 +++++++++++++++-----
3 files changed, 32 insertions(+), 12 deletions(-)
----------------------------------------------------------------------
[2/6] cassandra git commit: Document post-2.1 caching table options
syntax
Posted by bl...@apache.org.
Document post-2.1 caching table options syntax
patch by Paulo Motta; reviewed by Benjamin Lerer for CASSANDRA-9964
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/3b46e5bd
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/3b46e5bd
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/3b46e5bd
Branch: refs/heads/trunk
Commit: 3b46e5bda61c0944ec28d56c289954d9f34c418e
Parents: 2cd59b8
Author: Paulo Motta <pa...@gmail.com>
Authored: Wed Sep 16 10:11:47 2015 +0200
Committer: blerer <be...@datastax.com>
Committed: Wed Sep 16 10:11:47 2015 +0200
----------------------------------------------------------------------
doc/cql3/CQL.textile | 20 ++++++++++++++------
1 file changed, 14 insertions(+), 6 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/3b46e5bd/doc/cql3/CQL.textile
----------------------------------------------------------------------
diff --git a/doc/cql3/CQL.textile b/doc/cql3/CQL.textile
index a29ee6c..648c39f 100644
--- a/doc/cql3/CQL.textile
+++ b/doc/cql3/CQL.textile
@@ -327,13 +327,12 @@ Table creation supports the following other @<property>@:
|@dclocal_read_repair_chance@ | _simple_ | 0 | The probability with which to query extra nodes (e.g. more nodes than required by the consistency level) belonging to the same data center than the read coordinator for the purpose of read repairs.|
|@gc_grace_seconds@ | _simple_ | 864000 | Time to wait before garbage collecting tombstones (deletion markers).|
|@bloom_filter_fp_chance@ | _simple_ | 0.00075 | The target probability of false positive of the sstable bloom filters. Said bloom filters will be sized to provide the provided probability (thus lowering this value impact the size of bloom filters in-memory and on-disk)|
-|@compaction@ | _map_ | _see below_ | The compaction options to use, see below.|
-|@compression@ | _map_ | _see below_ | Compression options, see below. |
-|@caching@ | _simple_ | keys_only | Whether to cache keys ("key cache") and/or rows ("row cache") for this table. Valid values are: @all@, @keys_only@, @rows_only@ and @none@. |
|@default_time_to_live@ | _simple_ | 0 | The default expiration time ("TTL") in seconds for a table.|
+|@compaction@ | _map_ | _see below_ | Compaction options, see "below":#compactionOptions.|
+|@compression@ | _map_ | _see below_ | Compression options, see "below":#compressionOptions.|
+|@caching@ | _map_ | _see below_ | Caching options, see "below":#cachingOptions.|
-
-h4(#compactionOptions). @compaction@ options
+h4(#compactionOptions). Compaction options
The @compaction@ property must at least define the @'class'@ sub-option, that defines the compaction strategy class to use. The default supported class are @'SizeTieredCompactionStrategy'@, @'LeveledCompactionStrategy'@ and @'DateTieredCompactionStrategy'@. Custom strategy can be provided by specifying the full class name as a "string constant":#constants. The rest of the sub-options depends on the chosen class. The sub-options supported by the default classes are:
@@ -353,13 +352,22 @@ The @compaction@ property must at least define the @'class'@ sub-option, that de
| @max_sstable_age_days@ | DateTieredCompactionStrategy | 365 | SSTables only containing data that is older than this will never be compacted. |
-For the @compression@ property, the following default sub-options are available:
+h4(#compressionOptions). Compression options
+
+For the @compression@ property, the following sub-options are available:
|_. option |_. default |_. description |
| @sstable_compression@ | LZ4Compressor | The compression algorithm to use. Default compressor are: LZ4Compressor, SnappyCompressor and DeflateCompressor. Use an empty string (@''@) to disable compression. Custom compressor can be provided by specifying the full class name as a "string constant":#constants.|
| @chunk_length_kb@ | 64KB | On disk SSTables are compressed by block (to allow random reads). This defines the size (in KB) of said block. Bigger values may improve the compression rate, but increases the minimum size of data to be read from disk for a read |
| @crc_check_chance@ | 1.0 | When compression is enabled, each compressed block includes a checksum of that block for the purpose of detecting disk bitrot and avoiding the propagation of corruption to other replica. This option defines the probability with which those checksums are checked during read. By default they are always checked. Set to 0 to disable checksum checking and to 0.5 for instance to check them every other read|
+h4(#cachingOptions). Caching options
+
+For the @caching@ property, the following sub-options are available:
+
+|_. option |_. default |_. description |
+|@keys@ | ALL | Whether to cache keys ("key cache") for this table. Valid values are: @ALL@ and @NONE@.|
+|@rows_per_partition@ | NONE | The amount of rows to cache per partition ("row cache"). If an integer @n@ is specified, the first @n@ queried rows of a partition will be cached. Other possible options are @ALL@, to cache all rows of a queried partition, or @NONE@ to disable row caching.|
h4. Other considerations: