Skip to content
New issue

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

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

Already on GitHub? Sign in to your account

feat(session): schema agreement functions and variables #27

Merged
merged 1 commit into from
Jul 26, 2024
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
32 changes: 32 additions & 0 deletions index.d.ts
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,10 @@ export interface ClusterConfig {
keyspace?: string
auth?: Auth
ssl?: Ssl
/** The driver automatically awaits schema agreement after a schema-altering query is executed. Waiting for schema agreement more than necessary is never a bug, but might slow down applications which do a lot of schema changes (e.g. a migration). For instance, in case where somebody wishes to create a keyspace and then a lot of tables in it, it makes sense only to wait after creating a keyspace and after creating all the tables rather than after every query. */
autoAwaitSchemaAgreement?: boolean
/** If the schema is not agreed upon, the driver sleeps for a duration in seconds before checking it again. The default value is 0.2 (200 milliseconds) */
schemaAgreementInterval?: number
}
export const enum Consistency {
Any = 0,
Expand Down Expand Up @@ -134,6 +138,34 @@ export class ScyllaSession {
* ```
*/
useKeyspace(keyspaceName: string, caseSensitive?: boolean | undefined | null): Promise<void>
/**
* session.awaitSchemaAgreement returns a Promise that can be awaited as long as schema is not in an agreement.
* However, it won’t wait forever; ClusterConfig defines a timeout that limits the time of waiting. If the timeout elapses,
* the return value is an error, otherwise it is the schema_version.
*
* # Returns
*
* * `Promise<Uuid>` - schema_version
*
* # Errors
* * `GenericFailure` - if the timeout elapses
*
* # Example
* ```javascript
* import { Cluster } from ".";
*
* const cluster = new Cluster({ nodes: ["127.0.0.1:9042"] });
* const session = await cluster.connect();
*
* const schemaVersion = await session.awaitSchemaAgreement().catch(console.error);
* console.log(schemaVersion);
*
* const isAgreed = await session.checkSchemaAgreement().catch(console.error);
* console.log(isAgreed);
* ```
*/
awaitSchemaAgreement(): Promise<Uuid>
checkSchemaAgreement(): Promise<boolean>
}
export class Uuid {
/** Generates a random UUID v4. */
Expand Down
6 changes: 5 additions & 1 deletion src/cluster/cluster_config/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,12 @@ pub struct ClusterConfig {
pub compression: Option<Compression>,
pub default_execution_profile: Option<ExecutionProfile>,

// connection fields
pub keyspace: Option<String>,
pub auth: Option<Auth>,
pub ssl: Option<Ssl>,

/// The driver automatically awaits schema agreement after a schema-altering query is executed. Waiting for schema agreement more than necessary is never a bug, but might slow down applications which do a lot of schema changes (e.g. a migration). For instance, in case where somebody wishes to create a keyspace and then a lot of tables in it, it makes sense only to wait after creating a keyspace and after creating all the tables rather than after every query.
pub auto_await_schema_agreement: Option<bool>,
/// If the schema is not agreed upon, the driver sleeps for a duration in seconds before checking it again. The default value is 0.2 (200 milliseconds)
pub schema_agreement_interval: Option<i32>,
}
22 changes: 19 additions & 3 deletions src/cluster/scylla_cluster.rs
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
use std::time::Duration;

use napi::Either;
use openssl::ssl::SslContextBuilder;

Expand All @@ -14,6 +16,8 @@ struct ScyllaCluster {
uri: String,
compression: Option<Compression>,
default_execution_profile: Option<ExecutionProfile>,
auto_await_schema_agreement: Option<bool>,
schema_agreement_interval: Option<Duration>,

// connection fields
connection: Option<ConnectionOptions>,
Expand Down Expand Up @@ -61,6 +65,8 @@ impl ScyllaCluster {
keyspace,
auth,
ssl,
auto_await_schema_agreement,
schema_agreement_interval,
} = cluster_config;

let uri = nodes.first().expect("at least one node is required");
Expand All @@ -74,6 +80,8 @@ impl ScyllaCluster {
auth,
ssl,
}),
auto_await_schema_agreement,
schema_agreement_interval: schema_agreement_interval.map(|d| Duration::from_secs(d as u64)),
}
}

Expand Down Expand Up @@ -152,7 +160,7 @@ impl ScyllaCluster {
} else {
Ok(options.ssl.clone())
}
},
}
(Some(Either::B(_)), Some(_)) => Err(napi::Error::new(
napi::Status::InvalidArg,
"Options cannot be provided twice",
Expand All @@ -163,14 +171,14 @@ impl ScyllaCluster {
} else {
Ok(options.ssl.clone())
}
},
}
(None, Some(options)) => {
if options.ssl.is_none() {
Ok(self.connection.as_ref().and_then(|conn| conn.ssl.clone()))
} else {
Ok(options.ssl.clone())
}
},
}
(None, None) => Ok(self.connection.as_ref().and_then(|conn| conn.ssl.clone())),
(Some(Either::A(_)), None) => Ok(self.connection.as_ref().and_then(|conn| conn.ssl.clone())),
};
Expand Down Expand Up @@ -212,6 +220,14 @@ impl ScyllaCluster {
));
}

if let Some(auto_await_schema_agreement) = self.auto_await_schema_agreement {
builder = builder.auto_await_schema_agreement(auto_await_schema_agreement);
}

if let Some(schema_agreement_interval) = self.schema_agreement_interval {
builder = builder.schema_agreement_interval(schema_agreement_interval);
}

builder = builder.ssl_context(Some(ssl_builder.build()));
}

Expand Down
58 changes: 58 additions & 0 deletions src/session/scylla_session.rs
Original file line number Diff line number Diff line change
Expand Up @@ -146,4 +146,62 @@ impl ScyllaSession {

Ok(())
}

/// session.awaitSchemaAgreement returns a Promise that can be awaited as long as schema is not in an agreement.
/// However, it won’t wait forever; ClusterConfig defines a timeout that limits the time of waiting. If the timeout elapses,
/// the return value is an error, otherwise it is the schema_version.
///
/// # Returns
///
/// * `Promise<Uuid>` - schema_version
///
/// # Errors
/// * `GenericFailure` - if the timeout elapses
///
/// # Example
/// ```javascript
/// import { Cluster } from ".";
///
/// const cluster = new Cluster({ nodes: ["127.0.0.1:9042"] });
/// const session = await cluster.connect();
///
/// const schemaVersion = await session.awaitSchemaAgreement().catch(console.error);
/// console.log(schemaVersion);
///
/// const isAgreed = await session.checkSchemaAgreement().catch(console.error);
/// console.log(isAgreed);
/// ```
#[napi]
pub async fn await_schema_agreement(&self) -> napi::Result<Uuid> {
Ok(
self
.session
.await_schema_agreement()
.await
.map_err(|e| {
napi::Error::new(
napi::Status::GenericFailure,
format!("Something went wrong with your schema agreement. - {e}"),
)
})?
.into(),
)
}

#[napi]
pub async fn check_schema_agreement(&self) -> napi::Result<bool> {
Ok(
self
.session
.check_schema_agreement()
.await
.map_err(|e| {
napi::Error::new(
napi::Status::GenericFailure,
format!("Something went wrong with your schema agreement. - {e}"),
)
})?
.is_some(),
)
}
}
Loading