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 <benjamin.le...@datastax.com> Authored: Wed Sep 16 10:33:47 2015 +0200 Committer: blerer <benjamin.le...@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:
