Merge branch 'doc_in_tree' into trunk * doc_in_tree: Modify build file to include html doc in artifacts Add 'report bug' section Fix minor errors in CQL doc Finish fixing the CQL doc Don't track auto-generated file Reorganize document Automatically generate docs for cassandra.yaml Fix CQL doc (incomplete) Add Metrics/Monitoring docs Add Change Data Capture documentation Docs for Memtable and SSTable architecture Add doc on compaction Add initial version of security section Fill in Replication, Tuneable Consistency sections Add docs for cqlsh Add snitch and range movements section on Operations Add initial in-tree documentation (very incomplete so far)
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/c7b9401b Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/c7b9401b Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/c7b9401b Branch: refs/heads/trunk Commit: c7b9401bf81d1bca12a802306576805053c0212b Parents: 48e4d5d 5cefe50 Author: Sylvain Lebresne <sylv...@datastax.com> Authored: Mon Jun 27 20:33:21 2016 +0200 Committer: Sylvain Lebresne <sylv...@datastax.com> Committed: Mon Jun 27 20:33:21 2016 +0200 ---------------------------------------------------------------------- .gitignore | 3 + build.xml | 23 +- conf/cassandra.yaml | 222 +++--- doc/Makefile | 256 +++++++ doc/README.md | 31 + doc/convert_yaml_to_rst.py | 144 ++++ doc/cql3/CQL.textile | 4 +- doc/make.bat | 281 ++++++++ doc/source/_static/extra.css | 43 ++ doc/source/_templates/indexcontent.html | 33 + doc/source/architecture/dynamo.rst | 137 ++++ doc/source/architecture/guarantees.rst | 20 + doc/source/architecture/index.rst | 29 + doc/source/architecture/overview.rst | 20 + doc/source/architecture/storage_engine.rst | 82 +++ doc/source/bugs.rst | 31 + doc/source/conf.py | 432 ++++++++++++ doc/source/configuration/index.rst | 25 + doc/source/contactus.rst | 53 ++ doc/source/cql/appendices.rst | 308 +++++++++ doc/source/cql/changes.rst | 189 ++++++ doc/source/cql/ddl.rst | 677 +++++++++++++++++++ doc/source/cql/definitions.rst | 230 +++++++ doc/source/cql/dml.rst | 499 ++++++++++++++ doc/source/cql/functions.rst | 553 +++++++++++++++ doc/source/cql/index.rst | 47 ++ doc/source/cql/indexes.rst | 83 +++ doc/source/cql/json.rst | 112 +++ doc/source/cql/mvs.rst | 166 +++++ doc/source/cql/security.rst | 497 ++++++++++++++ doc/source/cql/triggers.rst | 63 ++ doc/source/cql/types.rst | 518 ++++++++++++++ doc/source/data_modeling/index.rst | 20 + doc/source/faq/index.rst | 20 + doc/source/getting_started/configuring.rst | 67 ++ doc/source/getting_started/drivers.rst | 107 +++ doc/source/getting_started/index.rst | 33 + doc/source/getting_started/installing.rst | 99 +++ doc/source/getting_started/querying.rst | 52 ++ doc/source/index.rst | 40 ++ doc/source/operating/backups.rst | 22 + doc/source/operating/bloom_filters.rst | 65 ++ doc/source/operating/cdc.rst | 89 +++ doc/source/operating/compaction.rst | 432 ++++++++++++ doc/source/operating/compression.rst | 94 +++ doc/source/operating/hardware.rst | 87 +++ doc/source/operating/hints.rst | 22 + doc/source/operating/index.rst | 38 ++ doc/source/operating/metrics.rst | 619 +++++++++++++++++ doc/source/operating/read_repair.rst | 22 + doc/source/operating/repair.rst | 22 + doc/source/operating/security.rst | 410 +++++++++++ doc/source/operating/snitch.rst | 78 +++ doc/source/operating/topo_changes.rst | 122 ++++ doc/source/tools/cqlsh.rst | 455 +++++++++++++ doc/source/tools/index.rst | 26 + doc/source/tools/nodetool.rst | 22 + doc/source/troubleshooting/index.rst | 20 + .../cql3/statements/CreateViewStatement.java | 7 +- 59 files changed, 8816 insertions(+), 85 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/c7b9401b/build.xml ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/c7b9401b/conf/cassandra.yaml ---------------------------------------------------------------------- diff --cc conf/cassandra.yaml index 1068508,c43820e..076a729 --- a/conf/cassandra.yaml +++ b/conf/cassandra.yaml @@@ -193,37 -195,44 +195,55 @@@ partitioner: org.apache.cassandra.dht.M # If not set, the default directory is $CASSANDRA_HOME/data/commitlog. # commitlog_directory: /var/lib/cassandra/commitlog +# Enable / disable CDC functionality on a per-node basis. This modifies the logic used +# for write path allocation rejection (standard: never reject. cdc: reject Mutation +# containing a CDC-enabled table if at space limit in cdc_raw_directory). +cdc_enabled: false + +# CommitLogSegments are moved to this directory on flush if cdc_enabled: true and the +# segment contains mutations for a CDC-enabled table. This should be placed on a +# separate spindle than the data directories. If not set, the default directory is +# $CASSANDRA_HOME/data/cdc_raw. +# cdc_raw_directory: /var/lib/cassandra/cdc_raw + - # policy for data disk failures: - # die: shut down gossip and client transports and kill the JVM for any fs errors or - # single-sstable errors, so the node can be replaced. - # stop_paranoid: shut down gossip and client transports even for single-sstable errors, - # kill the JVM for errors during startup. - # stop: shut down gossip and client transports, leaving the node effectively dead, but - # can still be inspected via JMX, kill the JVM for errors during startup. - # best_effort: stop using the failed disk and respond to requests based on - # remaining available sstables. This means you WILL see obsolete - # data at CL.ONE! - # ignore: ignore fatal errors and let requests fail, as in pre-1.2 Cassandra + # Policy for data disk failures: + # + # die + # shut down gossip and client transports and kill the JVM for any fs errors or + # single-sstable errors, so the node can be replaced. + # + # stop_paranoid + # shut down gossip and client transports even for single-sstable errors, + # kill the JVM for errors during startup. + # + # stop + # shut down gossip and client transports, leaving the node effectively dead, but + # can still be inspected via JMX, kill the JVM for errors during startup. + # + # best_effort + # stop using the failed disk and respond to requests based on + # remaining available sstables. This means you WILL see obsolete + # data at CL.ONE! + # + # ignore + # ignore fatal errors and let requests fail, as in pre-1.2 Cassandra disk_failure_policy: stop - # policy for commit disk failures: - # die: shut down gossip and Thrift and kill the JVM, so the node can be replaced. - # stop: shut down gossip and Thrift, leaving the node effectively dead, but - # can still be inspected via JMX. - # stop_commit: shutdown the commit log, letting writes collect but - # continuing to service reads, as in pre-2.0.5 Cassandra - # ignore: ignore fatal errors and let the batches fail + # Policy for commit disk failures: + # + # die + # shut down gossip and Thrift and kill the JVM, so the node can be replaced. + # + # stop + # shut down gossip and Thrift, leaving the node effectively dead, but + # can still be inspected via JMX. + # + # stop_commit + # shutdown the commit log, letting writes collect but + # continuing to service reads, as in pre-2.0.5 Cassandra + # + # ignore + # ignore fatal errors and let the batches fail commit_failure_policy: stop # Maximum size of the native protocol prepared statement cache http://git-wip-us.apache.org/repos/asf/cassandra/blob/c7b9401b/doc/cql3/CQL.textile ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/c7b9401b/src/java/org/apache/cassandra/cql3/statements/CreateViewStatement.java ----------------------------------------------------------------------