Skip to content

Commit b266a03

Browse files
committed
WIP: URLs: DataStax -> ScyllaDB docs
1 parent 7914e47 commit b266a03

File tree

16 files changed

+56
-54
lines changed

16 files changed

+56
-54
lines changed

README.md

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -137,7 +137,7 @@ int main() {
137137
___
138138

139139
The driver inherits almost all the features of C/C++ and Rust drivers, such as:
140-
* [Asynchronous API](http://datastax.github.io/cpp-driver/topics/#futures)
140+
* [Asynchronous API](https://cpp-rust-driver.docs.scylladb.com/stable/topics/#futures)
141141
* Shard-aware routing
142142
* Simple, Prepared and Batch statements
143143
* Query paging
@@ -146,9 +146,9 @@ The driver inherits almost all the features of C/C++ and Rust drivers, such as:
146146
* Retry policies
147147
* SSL
148148
* Authentication
149-
* [Tuples](http://datastax.github.io/cpp-driver/topics/basics/data-types/tuples/) and [UDTs](http://datastax.github.io/cpp-driver/topics/basics/data-types/user-defined-types/)
150-
* [Nested collections](http://datastax.github.io/cpp-driver/topics/basics/binding-parameters/#nested-collections)
151-
* [Data types](http://datastax.github.io/cpp-driver/topics/basics/data-types/)
149+
* [Tuples](https://cpp-rust-driver.docs.scylladb.com/stable/topics/basics/data-types/tuples/) and [UDTs](http://https://cpp-rust-driver.docs.scylladb.com/stable/topics/basics/data-types/user-defined-types/)
150+
* [Nested collections](https://cpp-rust-driver.docs.scylladb.com/stable/topics/basics/binding-parameters/#nested-collections)
151+
* [Data types](https://cpp-rust-driver.docs.scylladb.com/stable/topics/basics/data-types/)
152152
* Schema metadata (keyspace metadata, materialized views, etc.)
153153

154154
# Limitations

docs/source/conf.py

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -187,8 +187,9 @@ def setup(sphinx):
187187
)
188188

189189
# Workaround to replace DataStax links
190+
# FIXME(David Garcia) - Make this workaround work correctly.
190191
replacements = [
191-
{"http://datastax.github.io/cpp-driver/api/cassandra.h/": "https://cpp-rust-driver.docs.scylladb.com/" + smv_latest_version + "/api"},
192+
{"https://cpp-rust-driver.docs.scylladb.com/stable/api/cassandra.h/": "https://cpp-rust-driver.docs.scylladb.com/" + smv_latest_version + "/api"},
192193
{"http://datastax.github.io/cpp-driver": "https://cpp-rust-driver.docs.scylladb.com/" + smv_latest_version},
193194
{"http://docs.datastax.com/en/developer/cpp-driver/latest": "https://cpp-rust-driver.docs.scylladb.com/" + smv_latest_version},
194195
]

docs/source/topics/basics/binding-parameters.md

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,8 @@ Calling `cass_statement_reset_parameters()` will unbind (or resize) a statement'
3636

3737
## Constructing Collections
3838

39-
Collections are supported using [`CassCollection`](http://datastax.github.io/cpp-driver/api/struct.CassCollection) objects; supporting `list`, `map` and `set` Cassandra/ScyllaDB types. The code below shows how to construct a `list` collection; however, a set can be constructed in a very similar way. The only difference is the type `CASS_COLLECTION_TYPE_SET` is used to create the collection instead of `CASS_COLLECTION_TYPE_LIST`.
39+
Collections are supported using [`CassCollection`](https://cpp-rust-driver.docs.scylladb.com/stable/api/struct.CassCollection)3443 objects; supporting `list`, `map` and `set` Cassandra/ScyllaDB types. The code below shows how to construct a `list` collection; however, a set can be constructed in a very similar way. The only difference is the type `CASS_COLLECTION_TYPE_SET` is used to create the collection instead of `CASS_COLLECTION_TYPE_LIST`.
40+
Collections are supported using [`CassCollection`](https://cpp-rust-driver.docs.scylladb.com/stable/api/struct.CassCollection) objects; supporting `list`, `map` and `set` Cassandra types. The code below shows how to construct a `list` collection; however, a set can be constructed in a very similar way. The only difference is the type `CASS_COLLECTION_TYPE_SET` is used to create the collection instead of `CASS_COLLECTION_TYPE_LIST`.
4041

4142
**Important**: Values appended to the collection can be freed immediately afterward because the values are copied.
4243

@@ -85,4 +86,4 @@ cass_collection_free(map);
8586
A collection can be added to another collection using [`cass_collection_append_collection()`].
8687

8788
[`cass_collection_append_collection()`]:
88-
http://datastax.github.io/cpp-driver/api/struct.CassCollection#cass-collection-append-collection
89+
https://cpp-rust-driver.docs.scylladb.com/stable/api/struct.CassCollection#cass-collection-append-collection

docs/source/topics/basics/client-side-timestamps.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -61,5 +61,5 @@ cass_batch_set_timestamp(batch, 123456789);
6161
/* Add statements to batch */
6262
```
6363
64-
[`CassStatement`]: http://datastax.github.io/cpp-driver/api/struct.CassStatement/
65-
[`CassBatch`]: http://datastax.github.io/cpp-driver/api/struct.CassBatch/
64+
[`CassStatement`]: https://cpp-rust-driver.docs.scylladb.com/stable/api/struct.CassStatement/
65+
[`CassBatch`]: https://cpp-rust-driver.docs.scylladb.com/stable/api/struct.CassBatch/

docs/source/topics/basics/consistency.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -82,7 +82,7 @@ application. Descriptions for each read/write consistency level can be found
8282

8383
## Setting Consistency Level
8484

85-
A ['CassStatement'](http://datastax.github.io/cpp-driver/api/struct.CassFuture/) object
85+
A ['CassStatement'](https://cpp-rust-driver.docs.scylladb.com/stable/api/struct.CassFuture/) object
8686
can have its consistency level altered at anytime before the statement is
8787
executed by the session.
8888

docs/source/topics/basics/data-types/index.md

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -214,16 +214,16 @@ cass_tuple_free(address);
214214
cass_collection_free(phone_numbers);
215215
```
216216
217-
[`CassDataType`]: http://datastax.github.io/cpp-driver/api/struct.CassDataType
218-
[`CassUserType`]: http://datastax.github.io/cpp-driver/api/struct.CassUserType
219-
[`CassPrepared`]: http://datastax.github.io/cpp-driver/api/struct.CassPrepared
220-
[`CassResult`]: http://datastax.github.io/cpp-driver/api/struct.CassResult
221-
[`CassValue`]: http://datastax.github.io/cpp-driver/api/struct.CassValue
222-
[`CassSchemaMeta`]: http://datastax.github.io/cpp-driver/api/struct.CassSchemaMeta
223-
[`cass_user_type_new_from_data_type()`]: http://datastax.github.io/cpp-driver/api/struct.CassUserType#cass-user-type-new-from-data-type
224-
[`cass_result_column_data_type()`]: http://datastax.github.io/cpp-driver/api/struct.CassResult#cass-result-column-data-type
225-
[`cass_prepared_parameter_data_type()`]: http://datastax.github.io/cpp-driver/api/struct.CassPrepared#cass-prepared-parameter-data-type
226-
[`cass_value_data_type()`]: http://datastax.github.io/cpp-driver/api/struct.CassValue#cass-value-data-type
217+
[`CassDataType`]: https://cpp-rust-driver.docs.scylladb.com/stable/api/struct.CassDataType
218+
[`CassUserType`]: https://cpp-rust-driver.docs.scylladb.com/stable/api/struct.CassUserType
219+
[`CassPrepared`]: https://cpp-rust-driver.docs.scylladb.com/stable/api/struct.CassPrepared
220+
[`CassResult`]: https://cpp-rust-driver.docs.scylladb.com/stable/api/struct.CassResult
221+
[`CassValue`]: https://cpp-rust-driver.docs.scylladb.com/stable/api/struct.CassValue
222+
[`CassSchemaMeta`]: https://cpp-rust-driver.docs.scylladb.com/stable/api/struct.CassSchemaMeta
223+
[`cass_user_type_new_from_data_type()`]: https://cpp-rust-driver.docs.scylladb.com/stable/api/struct.CassUserType#cass-user-type-new-from-data-type
224+
[`cass_result_column_data_type()`]: https://cpp-rust-driver.docs.scylladb.com/stable/api/struct.CassResult#cass-result-column-data-type
225+
[`cass_prepared_parameter_data_type()`]: https://cpp-rust-driver.docs.scylladb.com/stable/api/struct.CassPrepared#cass-prepared-parameter-data-type
226+
[`cass_value_data_type()`]: https://cpp-rust-driver.docs.scylladb.com/stable/api/struct.CassValue#cass-value-data-type
227227
228228
```{eval-rst}
229229
.. toctree::

docs/source/topics/basics/data-types/tuples.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -90,6 +90,6 @@ void iterate_tuple(const CassRow* row) {
9090
}
9191
```
9292
93-
[`CassTuple`]: http://datastax.github.io/cpp-driver/api/struct.CassTuple
94-
[`CassUserType`]: http://datastax.github.io/cpp-driver/api/struct.CassUserType
95-
[`cass_tuple_set_*()`]: http://datastax.github.io/cpp-driver/api/struct.CassTuple#cass-tuple-set-null
93+
[`CassTuple`]: https://cpp-rust-driver.docs.scylladb.com/stable/api/struct.CassTuple
94+
[`CassUserType`]: https://cpp-rust-driver.docs.scylladb.com/stable/api/struct.CassUserType
95+
[`cass_tuple_set_*()`]: https://cpp-rust-driver.docs.scylladb.com/stable/api/struct.CassTuple#cass-tuple-set-null

docs/source/topics/basics/data-types/user-defined-types.md

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -90,7 +90,7 @@ void iterate_udt(const CassRow* row) {
9090
cass_iterator_free(udt_iterator);
9191
}
9292
```
93-
[`CassSchemaMeta`]: http://datastax.github.io/cpp-driver/api/struct.CassSchemaMeta
94-
[`CassUserType`]: http://datastax.github.io/cpp-driver/api/struct.CassUserType
95-
[`CassDataType`]: http://datastax.github.io/cpp-driver/api/struct.CassDataType
96-
[`cass_session_get_schema()`]: http://datastax.github.io/cpp-driver/api/struct.CassSession#cass-session-get-schema
93+
[`CassSchemaMeta`]: https://cpp-rust-driver.docs.scylladb.com/stable/api/struct.CassSchemaMeta
94+
[`CassUserType`]: https://cpp-rust-driver.docs.scylladb.com/stable/api/struct.CassUserType
95+
[`CassDataType`]: https://cpp-rust-driver.docs.scylladb.com/stable/api/struct.CassDataType
96+
[`cass_session_get_schema()`]: https://cpp-rust-driver.docs.scylladb.com/stable/api/struct.CassSession#cass-session-get-schema

docs/source/topics/basics/data-types/uuids.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -63,5 +63,5 @@ cass_uint8_t version = cass_uuid_version(uuid);
6363
char uuid_str[CASS_UUID_STRING_LENGTH];
6464
cass_uuid_string(uuid, uuid_str);
6565
```
66-
[`cass_uuid_timestamp()`]: http://datastax.github.io/cpp-driver/api/struct.CassUuid#1a3980467a0bb6642054ecf37d49aebf1a
67-
[`CassUuidGen`]: http://datastax.github.io/cpp-driver/api/struct.CassUuidGen
66+
[`cass_uuid_timestamp()`]: https://cpp-rust-driver.docs.scylladb.com/stable/api/struct.CassUuid#1a3980467a0bb6642054ecf37d49aebf1a
67+
[`CassUuidGen`]: https://cpp-rust-driver.docs.scylladb.com/stable/api/struct.CassUuidGen

docs/source/topics/basics/handling-results.md

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# Handling Results
22

3-
The [`CassResult`](http://datastax.github.io/cpp-driver/api/struct.CassResult) object
3+
The [`CassResult`](https://cpp-rust-driver.docs.scylladb.com/stable/api/struct.CassResult) object
44
is typically returned for `SELECT` statements. For mutations (`INSERT`, `UPDATE`,
55
and `DELETE`) only a status code will be present and can be accessed using
66
`cass_future_error_code()`. However, when using lightweight transactions a
@@ -28,7 +28,7 @@ void process_result(CassFuture* future) {
2828
2929
The result object represents a collection of rows. The first row, if present,
3030
can be obtained using `cass_result_first_row()`. Multiple rows are accessed
31-
using a [`CassIterator`](http://datastax.github.io/cpp-driver/api/struct.CassIterator)
31+
using a [`CassIterator`](https://cpp-rust-driver.docs.scylladb.com/stable/api/struct.CassIterator)
3232
object. After a row has been retrieved, the column value(s) can be accessed from
3333
a row by either index or by name. The iterator object can also be used with
3434
enumerated column values.
@@ -51,7 +51,7 @@ void process_first_row_by_name(const CassResult* result) {
5151
}
5252
```
5353
54-
Once the [`CassValue`](http://datastax.github.io/cpp-driver/api/struct.CassValue)
54+
Once the [`CassValue`](https://cpp-rust-driver.docs.scylladb.com/stable/api/struct.CassValue)
5555
has been obtained from the column, the actual value can be retrieved and
5656
assigned into the proper datatype.
5757
@@ -130,7 +130,7 @@ void iterator_over_map_value(CassFuture* future) {
130130
## Paging
131131

132132
Large result sets can be divided into multiple pages automatically. The
133-
[`CassResult`](http://datastax.github.io/cpp-driver/api/struct.CassResult) object
133+
[`CassResult`](https://cpp-rust-driver.docs.scylladb.com/stable/api/struct.CassResult) object
134134
keeps track of the pagination state for the sequence of paging queries. When
135135
paging through the result set, the result object is checked to see if more pages
136136
exist where it is then attached to the statement before re-executing the query
@@ -186,6 +186,6 @@ accessed using [`cass_result_paging_state()`] and added to a statement using
186186
untrusted environments. That paging state could be spoofed and potentially used
187187
to gain access to other data.
188188
189-
[`cass_statement_set_paging_state()`]: http://datastax.github.io/cpp-driver/api/struct.CassStatement#cass-statement-set-paging-state
190-
[`cass_result_paging_state()`]: http://datastax.github.io/cpp-driver/api/struct.CassResult#cass-result-paging-state
191-
[`cass_statement_set_paging_state_token()`]: http://datastax.github.io/cpp-driver/api/struct.CassStatement#cass-statement-set-paging-state-token
189+
[`cass_statement_set_paging_state()`]: https://cpp-rust-driver.docs.scylladb.com/stable/api/struct.CassStatement#cass-statement-set-paging-state
190+
[`cass_result_paging_state()`]: https://cpp-rust-driver.docs.scylladb.com/stable/api/struct.CassResult#cass-result-paging-state
191+
[`cass_statement_set_paging_state_token()`]: https://cpp-rust-driver.docs.scylladb.com/stable/api/struct.CassStatement#cass-statement-set-paging-state-token

0 commit comments

Comments
 (0)