Skip to content
New issue

Have a question about this project? # for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “#”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? # to your account

scylla_cql cleanup after legacy APIs removal #1198

Merged
merged 15 commits into from
Feb 7, 2025
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion docs/source/data-types/counter.md
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
# use std::error::Error;
# async fn check_only_compiles(session: &Session) -> Result<(), Box<dyn Error>> {
use futures::TryStreamExt;
use scylla::frame::value::Counter;
use scylla::value::Counter;

// Add to counter value
let to_add: Counter = Counter(100);
Expand Down
4 changes: 2 additions & 2 deletions docs/source/data-types/date.md
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ Internally [date](https://docs.scylladb.com/stable/cql/types.html#dates) is repr

## CqlDate

Without any extra features enabled, only `frame::value::CqlDate` is available. It's an
Without any extra features enabled, only `value::CqlDate` is available. It's an
[`u32`](https://doc.rust-lang.org/std/primitive.u32.html) wrapper and it matches the internal date representation.

However, for most use cases other types are more practical. See following sections for `chrono` and `time`.
Expand All @@ -18,7 +18,7 @@ However, for most use cases other types are more practical. See following sectio
# use scylla::client::session::Session;
# use std::error::Error;
# async fn check_only_compiles(session: &Session) -> Result<(), Box<dyn Error>> {
use scylla::frame::value::CqlDate;
use scylla::value::CqlDate;
use futures::TryStreamExt;

// 1970-01-08
Expand Down
2 changes: 1 addition & 1 deletion docs/source/data-types/decimal.md
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ Without any feature flags, the user can interact with `decimal` type by making u
# use std::error::Error;
# async fn check_only_compiles(session: &Session) -> Result<(), Box<dyn Error>> {
use futures::TryStreamExt;
use scylla::frame::value::CqlDecimal;
use scylla::value::CqlDecimal;
use std::str::FromStr;

// Insert a decimal (123.456) into the table
Expand Down
2 changes: 1 addition & 1 deletion docs/source/data-types/duration.md
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
# use std::error::Error;
# async fn check_only_compiles(session: &Session) -> Result<(), Box<dyn Error>> {
use futures::TryStreamExt;
use scylla::frame::value::CqlDuration;
use scylla::value::CqlDuration;

// Insert some duration into the table
let to_insert: CqlDuration = CqlDuration { months: 1, days: 2, nanoseconds: 3 };
Expand Down
4 changes: 2 additions & 2 deletions docs/source/data-types/time.md
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ midnight. It can't be negative or exceed `86399999999999` (23:59:59.999999999).

## CqlTime

Without any extra features enabled, only `frame::value::CqlTime` is available. It's an
Without any extra features enabled, only `value::CqlTime` is available. It's an
[`i64`](https://doc.rust-lang.org/std/primitive.i64.html) wrapper and it matches the internal time representation.

However, for most use cases other types are more practical. See following sections for `chrono` and `time`.
Expand All @@ -18,7 +18,7 @@ However, for most use cases other types are more practical. See following sectio
# use scylla::client::session::Session;
# use std::error::Error;
# async fn check_only_compiles(session: &Session) -> Result<(), Box<dyn Error>> {
use scylla::frame::value::CqlTime;
use scylla::value::CqlTime;
use futures::TryStreamExt;

// 64 seconds since midnight
Expand Down
4 changes: 2 additions & 2 deletions docs/source/data-types/timestamp.md
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ Internally [timestamp](https://docs.scylladb.com/stable/cql/types.html#timestamp

## CqlTimestamp

Without any extra features enabled, only `frame::value::CqlTimestamp` is available. It's an
Without any extra features enabled, only `value::CqlTimestamp` is available. It's an
[`i64`](https://doc.rust-lang.org/std/primitive.i64.html) wrapper and it matches the internal time representation. It's
the only type that supports full range of values that database accepts.

Expand All @@ -19,7 +19,7 @@ However, for most use cases other types are more practical. See following sectio
# use scylla::client::session::Session;
# use std::error::Error;
# async fn check_only_compiles(session: &Session) -> Result<(), Box<dyn Error>> {
use scylla::frame::value::CqlTimestamp;
use scylla::value::CqlTimestamp;
use futures::TryStreamExt;

// 64 seconds since unix epoch, 1970-01-01 00:01:04
Expand Down
4 changes: 2 additions & 2 deletions docs/source/data-types/timeuuid.md
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ Also, `value::CqlTimeuuid` is a wrapper for `uuid::Uuid` with custom ordering lo
# use std::str::FromStr;
# async fn check_only_compiles(session: &Session) -> Result<(), Box<dyn Error>> {
use futures::TryStreamExt;
use scylla::frame::value::CqlTimeuuid;
use scylla::value::CqlTimeuuid;

// Insert some timeuuid into the table
let to_insert: CqlTimeuuid = CqlTimeuuid::from_str("8e14e760-7fa8-11eb-bc66-000000000001")?;
Expand Down Expand Up @@ -51,7 +51,7 @@ and now you're gonna be able to use the `uuid::v1` features:
# use std::error::Error;
# use std::str::FromStr;
use futures::TryStreamExt;
use scylla::frame::value::CqlTimeuuid;
use scylla::value::CqlTimeuuid;
use uuid::Uuid;
# async fn check_only_compiles(session: &Session) -> Result<(), Box<dyn Error>> {

Expand Down
2 changes: 1 addition & 1 deletion docs/source/migration-guides/0.11-serialization.md
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ Before 0.11, the driver couldn't do this kind of type checking. For example, in
```rust,ignore
# extern crate scylla;
# extern crate bytes;
# use scylla::frame::value::{SerializedResult, SerializeValuesError};
# use scylla::value::{SerializedResult, SerializeValuesError};
# use bytes::BufMut;

pub trait ValueList {
Expand Down
5 changes: 3 additions & 2 deletions docs/source/queries/values.md
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,9 @@ or a custom struct which derives from `SerializeRow`.
A few examples:
```rust
# extern crate scylla;
# use scylla::{SerializeRow, frame::response::result::CqlValue};
# use scylla::SerializeRow;
# use scylla::client::session::Session;
# use scylla::value::CqlValue;
# use std::error::Error;
# use std::collections::HashMap;
# async fn check_only_compiles(session: &Session) -> Result<(), Box<dyn Error>> {
Expand Down Expand Up @@ -118,7 +119,7 @@ Using `Unset` results in better performance:
# use scylla::client::session::Session;
# use std::error::Error;
# async fn check_only_compiles(session: &Session) -> Result<(), Box<dyn Error>> {
use scylla::frame::value::{MaybeUnset, Unset};
use scylla::value::{MaybeUnset, Unset};

// Inserting a null results in suboptimal performance
let null_i32: Option<i32> = None;
Expand Down
2 changes: 1 addition & 1 deletion examples/basic.rs
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ use futures::StreamExt as _;
use futures::TryStreamExt as _;
use scylla::client::session::Session;
use scylla::client::session_builder::SessionBuilder;
use scylla::frame::response::result::Row;
use scylla::value::Row;
use scylla::DeserializeRow;
use std::env;

Expand Down
4 changes: 2 additions & 2 deletions examples/cql-time-types.rs
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@ use chrono::{DateTime, NaiveDate, NaiveTime, Utc};
use futures::{StreamExt as _, TryStreamExt as _};
use scylla::client::session::Session;
use scylla::client::session_builder::SessionBuilder;
use scylla::frame::response::result::CqlValue;
use scylla::frame::value::{CqlDate, CqlTime, CqlTimestamp};
use scylla::value::CqlValue;
use scylla::value::{CqlDate, CqlTime, CqlTimestamp};
use std::env;

#[tokio::main]
Expand Down
2 changes: 1 addition & 1 deletion examples/cqlsh-rs.rs
Original file line number Diff line number Diff line change
Expand Up @@ -5,10 +5,10 @@ use rustyline::{CompletionType, Config, Context, Editor};
use rustyline_derive::{Helper, Highlighter, Hinter, Validator};
use scylla::client::session::Session;
use scylla::client::session_builder::SessionBuilder;
use scylla::frame::response::result::Row;
use scylla::frame::Compression;
use scylla::response::query_result::IntoRowsResultError;
use scylla::response::query_result::QueryResult;
use scylla::value::Row;
use std::env;

#[derive(Helper, Highlighter, Validator, Hinter)]
Expand Down
2 changes: 1 addition & 1 deletion examples/get_by_name.rs
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
use anyhow::{anyhow, Result};
use scylla::client::session::Session;
use scylla::client::session_builder::SessionBuilder;
use scylla::frame::response::result::Row;
use scylla::value::Row;
use std::env;

#[tokio::main]
Expand Down
2 changes: 1 addition & 1 deletion examples/query_history.rs
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,9 @@ use anyhow::Result;
use futures::StreamExt as _;
use scylla::client::session::Session;
use scylla::client::session_builder::SessionBuilder;
use scylla::frame::response::result::Row;
use scylla::observability::history::{HistoryCollector, StructuredHistory};
use scylla::query::Query;
use scylla::value::Row;
use std::env;
use std::sync::Arc;

Expand Down
8 changes: 3 additions & 5 deletions examples/tower.rs
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
use scylla::client::session::Session;
use scylla::client::session_builder::SessionBuilder;
use scylla::frame::response::result::Row;
use scylla::value::Row;
use std::env;
use std::future::Future;
use std::pin::Pin;
Expand Down Expand Up @@ -43,11 +43,9 @@ async fn main() -> anyhow::Result<()> {
.await?
.into_rows_result()?;

let print_text = |t: &Option<scylla::frame::response::result::CqlValue>| {
let print_text = |t: &Option<scylla::value::CqlValue>| {
t.as_ref()
.unwrap_or(&scylla::frame::response::result::CqlValue::Text(
"<null>".to_string(),
))
.unwrap_or(&scylla::value::CqlValue::Text("<null>".to_string()))
.as_text()
.unwrap_or(&"<null>".to_string())
.clone()
Expand Down
3 changes: 2 additions & 1 deletion scylla-cql/src/deserialize/row.rs
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,8 @@ use thiserror::Error;

use super::value::DeserializeValue;
use super::{make_error_replace_rust_name, DeserializationError, FrameSlice, TypeCheckError};
use crate::frame::response::result::{ColumnSpec, ColumnType, CqlValue, Row};
use crate::frame::response::result::{ColumnSpec, ColumnType};
use crate::value::{CqlValue, Row};

/// Represents a raw, unparsed column value.
#[non_exhaustive]
Expand Down
20 changes: 9 additions & 11 deletions scylla-cql/src/deserialize/value.rs
Original file line number Diff line number Diff line change
Expand Up @@ -16,17 +16,15 @@ use std::fmt::Display;
use thiserror::Error;

use super::{make_error_replace_rust_name, DeserializationError, FrameSlice, TypeCheckError};
use crate::frame::{frame_errors::LowLevelDeserializationError, value::CqlVarintBorrowed};
use crate::frame::{response::result::CollectionType, types};
use crate::frame::{
response::result::UserDefinedType,
value::{
Counter, CqlDate, CqlDecimal, CqlDuration, CqlTime, CqlTimestamp, CqlTimeuuid, CqlVarint,
},
};
use crate::frame::{
response::result::{deser_cql_value, ColumnType, CqlValue, NativeType},
value::CqlDecimalBorrowed,
use crate::frame::frame_errors::LowLevelDeserializationError;
use crate::frame::response::result::CollectionType;
use crate::frame::response::result::UserDefinedType;
use crate::frame::response::result::{ColumnType, NativeType};
use crate::frame::types;
use crate::value::CqlVarintBorrowed;
use crate::value::{
deser_cql_value, Counter, CqlDate, CqlDecimal, CqlDecimalBorrowed, CqlDuration, CqlTime,
CqlTimestamp, CqlTimeuuid, CqlValue, CqlVarint,
};

/// A type that can be deserialized from a column value inside a row that was
Expand Down
Loading