Skip to content

Commit

Permalink
2.2 doc updates and fixes
Browse files Browse the repository at this point in the history
  • Loading branch information
mpenick committed Oct 28, 2015
1 parent ce74321 commit d2a4ea3
Show file tree
Hide file tree
Showing 3 changed files with 25 additions and 5 deletions.
13 changes: 13 additions & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,19 @@ Cassandra's native protocol and Cassandra Query Language v3.
- Whitelist load balancing policy
- Default consistency has been changed from `ONE` to `LOCAL_QUORUM`

## Upgrading from 2.0 or 2.1 to 2.2+

The new schema metadata API in 2.2 required some breaking API changes.
Applications that used the previous schema metadata API from 2.0 and 2.1 will
require some small modifications to use the new API. More information about the
new schema metadata API can be found in this
[blog post](http://www.datastax.com/dev/blog/datastax-c-driver-2-2-ga-released).

## Upgrading from 1.0 to 2.0+

There were a couple breaking API changes between 1.0 and 2.0 that are documented
[here](http://www.datastax.com/dev/blog/datastax-c-driver-2-0-released).

## Features
- [Asynchronous API]
- [Simple], [Prepared], and [Batch] statements
Expand Down
15 changes: 11 additions & 4 deletions topics/basics/consistency/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -7,14 +7,18 @@ respectively.
## Default consistency

The default consistency is now `CASS_CONSISTENCY_LOCAL_QUORUM` for driver
versions 2.2 and above it was `CASS_CONSISTENCY_ONE` for all previous versions
versions 2.2 and above. It was `CASS_CONSISTENCY_ONE` for all previous versions
(2.1 and below).

## Consistency Levels

### Read and Write Consistency Levels

The consistency level determines the number of replicas on which the read/write must respond/succeed before returning an acknowledgment to the client application. Descriptions and Usage scenarios for each read/write consistency level can be found [here](http://www.datastax.com/documentation/cassandra/2.0/cassandra/dml/dml_config_consistency_c.html).
The consistency level determines the number of replicas on which the read/write
must respond/succeed before returning an acknowledgment to the client
application. Descriptions and Usage scenarios for each read/write consistency
level can be found
[here](http://www.datastax.com/documentation/cassandra/2.0/cassandra/dml/dml_config_consistency_c.html).

<table class="table table-striped table-hover table-condensed">
<thead>
Expand Down Expand Up @@ -85,7 +89,9 @@ The consistency level determines the number of replicas on which the read/write

## Setting Consistency Level

A ['CassStatement'](http://datastax.github.io/cpp-driver/api/CassFuture/) object can have its consistency level altered at anytime before the statement is executed by the session.
A ['CassStatement'](http://datastax.github.io/cpp-driver/api/CassFuture/) object
can have its consistency level altered at anytime before the statement is
executed by the session.

```c
/* Create a simple or prepared statment */
Expand All @@ -94,4 +100,5 @@ A ['CassStatement'](http://datastax.github.io/cpp-driver/api/CassFuture/) object
cass_statement_set_consistency(statement, CASS_CONSISTENCY_QUORUM);
```
**NOTE:** Consistency is ignored for `USE`, `TRUNCATE`, `CREATE` and `ALTER` statements, and some `CASS_CONSISTENCY_ANY` aren’t allowed in all situations.
**NOTE:** Consistency is ignored for `USE`, `TRUNCATE`, `CREATE` and `ALTER`
statements, and some `CASS_CONSISTENCY_ANY` aren’t allowed in all situations.
2 changes: 1 addition & 1 deletion topics/basics/data_types/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ CREATE TYPE person (name text,

## Retrieving an Existing Data Type

**Important**: Any `const [CassDataType]*` object doesn't need to be freed. It's
**Important**: Any `const [CassDataType]*` object doesn't need to be freed. Its
lifetime is bound to the object it came from.

UDT data types can be retrieved using a [`CassSchemaMeta`] object. The resulting
Expand Down

0 comments on commit d2a4ea3

Please sign in to comment.