8000 Add caching by lmcmicu · Pull Request #58 · rltbl/relatable · GitHub
[go: up one dir, main page]
More Web Proxy on the site http://driver.im/
Skip to content

Add caching #58

8000 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.

Sign up for GitHub

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

Merged
merged 15 commits into from
May 12, 2025
Merged

Add caching #58

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
15 commits
Select commit Hold shift + click to select a range
7c39bb0
add caching performance test and caching strategy enum
lmcmicu May 4, 2025
d7a979c
add naive caching strategy
lmcmicu May 4, 2025
5a0158d
implement truncate caching strategy
lmcmicu May 4, 2025
9c0a594
implement max_change caching strategy
lmcmicu May 5, 2025
e200d93
don't always edit in the same way
lmcmicu May 5, 2025
43bef44
add TruncateForTable caching strategy
lmcmicu May 6, 2025
f6c0e22
implement Metatable caching strategy
lmcmicu May 7, 2025
7ce6f06
make tests pass again
lmcmicu May 8, 2025
713cf2e
add caching triggers for sqlite
lmcmicu May 9, 2025
869bd38
add caching triggers for postgresql
lmcmicu May 9, 2025
d856a65
remove unneeded strategies
lmcmicu May 9, 2025
a5f34cf
integrate CachingStrategy and improve logging
lmcmicu May 9, 2025
0e5816c
improve caching tests, refactor penguin demo
lmcmicu May 10, 2025
eae14f6
only edit penguin in caching tests
lmcmicu May 11, 2025
433fdcd
cleanup
lmcmicu May 12, 2025
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
70 changes: 51 additions & 19 deletions src/cli.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ use rltbl::{
core::{Change, ChangeAction, ChangeSet, Relatable},
select::{Format, Select},
sql,
sql::{JsonRow, SqlParam, VecInto},
sql::{CachingStrategy, JsonRow, SqlParam, VecInto},
web::{serve, serve_cgi},
};

Expand Down Expand Up @@ -47,6 +47,10 @@ pub struct Cli {
#[command(flatten)]
verbose: Verbosity,

/// One of: none, truncate, truncate_all, trigger
#[arg(long, default_value = "trigger", action = ArgAction::Set)]
pub caching: CachingStrategy,

// Subcommand:
#[command(subcommand)]
pub command: Command,
Expand Down Expand Up @@ -308,9 +312,9 @@ pub enum LoadSubcommand {
},
}

pub async fn init(_cli: &Cli, force: &bool, path: Option<&str>) {
tracing::trace!("init({_cli:?}, {force}, {path:?})");
match Relatable::init(force, path).await {
pub async fn init(cli: &Cli, force: &bool, path: Option<&str>) {
tracing::trace!("init({cli:?}, {force}, {path:?})");
match Relatable::init(force, path, &cli.caching).await {
Ok(_) => println!(
"Initialized a relatable database in '{}'",
match path {
Expand Down Expand Up @@ -356,7 +360,9 @@ pub async fn print_table(
// TODO: We need to ouput round numbers consistently between PostgreSQL and SQLite.
// Currently, for instance, 37 is displayed as 37.0 in SQLite and 37 in PostgreSQL.
tracing::debug!("print_table {table_name}");
let rltbl = Relatable::connect(cli.database.as_deref()).await.unwrap();
let rltbl = Relatable::connect(cli.database.as_deref(), &cli.caching)
.await
.unwrap();
let select = Select::from(table_name)
.filters(filters)
.unwrap()
Expand Down Expand Up @@ -392,15 +398,19 @@ pub async fn print_table(
// Print rows of a table, without column header.
pub async fn print_rows(cli: &Cli, table_name: &str, limit: &usize, offset: &usize) {
tracing::trace!("print_rows({cli:?}, {table_name}, {limit}, {offset})");
let rltbl = Relatable::connect(cli.database.as_deref()).await.unwrap();
let rltbl = Relatable::connect(cli.database.as_deref(), &cli.caching)
.await
.unwrap();
let select = Select::from(table_name).limit(limit).offset(offset);
let rows = rltbl.fetch_rows(&select).await.unwrap().vec_into();
print_text(&rows);
}

pub async fn print_value(cli: &Cli, table: &str, row: usize, column: &str) {
tracing::trace!("print_value({cli:?}, {table}, {row}, {column})");
let rltbl = Relatable::connect(cli.database.as_deref()).await.unwrap();
let rltbl = Relatable::connect(cli.database.as_deref(), &cli.caching)
.await
.unwrap();
let statement = format!(
r#"SELECT "{column}" FROM "{table}" WHERE _id = {sql_param}"#,
sql_param = sql::SqlParam::new(&rltbl.connection.kind()).next(),
Expand Down Expand Up @@ -433,7 +443,9 @@ pub async fn print_history(cli: &Cli, context: usize) {
}

let user = get_username(&cli);
let rltbl = Relatable::connect(cli.database.as_deref()).await.unwrap();
let rltbl = Relatable::connect(cli.database.as_deref(), &cli.caching)
.await
.unwrap();
let history = rltbl
.get_user_history(
&user,
Expand Down Expand Up @@ -510,7 +522,9 @@ pub fn get_username(cli: &Cli) -> String {

pub async fn set_value(cli: &Cli, table: &str, row: usize, column: &str, value: &str) {
tracing::trace!("set_value({cli:?}, {table}, {row}, {column}, {value})");
let rltbl = Relatable::connect(cli.database.as_deref()).await.unwrap();
let rltbl = Relatable::connect(cli.database.as_deref(), &cli.caching)
.await
.unwrap();

// Fetch the current value from the db:
let sql = format!(
Expand Down Expand Up @@ -631,7 +645,9 @@ pub async fn prompt_for_json_row(rltbl: &Relatable, table_name: &str) -> Result<
/// from STDIN, either interactively or in JSON format.
pub async fn add_message(cli: &Cli, table: &str, row: usize, column: &str) {
tracing::trace!("add_message({cli:?}, {table:?}, {row:?}, {column:?})");
let rltbl = Relatable::connect(cli.database.as_deref()).await.unwrap();
let rltbl = Relatable::connect(cli.database.as_deref(), &cli.caching)
.await
.unwrap();
let json_message = match &cli.input {
Some(s) if s == "JSON" => input_json_row(),
Some(s) => panic!("Unsupported input type '{s}'"),
Expand Down Expand Up @@ -670,7 +686,9 @@ pub async fn add_message(cli: &Cli, table: &str, row: usize, column: &str) {

pub async fn add_row(cli: &Cli, table: &str, after_id: Option<usize>) {
tracing::trace!("add_row({cli:?}, {table}, {after_id:?})");
let rltbl = Relatable::connect(cli.database.as_deref()).await.unwrap();
let rltbl = Relatable::connect(cli.database.as_deref(), &cli.caching)
.await
.unwrap();
let json_row = match &cli.input {
Some(s) if s == "JSON" => input_json_row(),
Some(s) => panic!("Unsupported input type '{s}'"),
Expand All @@ -693,7 +711,9 @@ pub async fn add_row(cli: &Cli, table: &str, after_id: Option<usize>) {

pub async fn move_row(cli: &Cli, table: &str, row: usize, after_id: usize) {
tracing::trace!("move_row({cli:?}, {table}, {row}, {after_id})");
let rltbl = Relatable::connect(cli.database.as_deref()).await.unwrap();
let rltbl = Relatable::connect(cli.database.as_deref(), &cli.caching)
.await
.unwrap();
let user = get_username(&cli);
let new_order = rltbl
.move_row(table, &user, row, after_id)
Expand All @@ -708,7 +728,9 @@ pub async fn move_row(cli: &Cli, table: &str, row: usize, after_id: usize) {

pub async fn delete_row(cli: &Cli, table: &str, row: usize) {
tracing::trace!("delete_row({cli:?}, {table}, {row})");
let rltbl = Relatable::connect(cli.database.as_deref()).await.unwrap();
let rltbl = Relatable::connect(cli.database.as_deref(), &cli.caching)
.await
.unwrap();
let user = get_username(&cli);
let num_deleted = rltbl
.delete_row(table, &user, row)
Expand All @@ -732,7 +754,9 @@ pub async fn delete_message(
tracing::trace!(
"delete_message({cli:?}, {target_rule:?}, {target_user:?}, {table}, {row:?}, {column:?})"
);
let rltbl = Relatable::connect(cli.database.as_deref()).await.unwrap();
let rltbl = Relatable::connect(cli.database.as_deref(), &cli.caching)
.await
.unwrap();
let num_deleted = rltbl
.delete_message(table, row, column, target_rule, target_user)
.await
Expand All @@ -746,7 +770,9 @@ pub async fn delete_message(

pub async fn undo(cli: &Cli) {
tracing::trace!("undo({cli:?})");
let rltbl = Relatable::connect(cli.database.as_deref()).await.unwrap();
let rltbl = Relatable::connect(cli.database.as_deref(), &cli.caching)
.await
.unwrap();
let user = get_username(&cli);
let changeset = rltbl.undo(&user).await.expect("Failed to undo");
if let None = changeset {
Expand All @@ -757,7 +783,9 @@ pub async fn undo(cli: &Cli) {

pub async fn redo(cli: &Cli) {
tracing::trace!("redo({cli:?})");
let rltbl = Relatable::connect(cli.database.as_deref()).await.unwrap();
let rltbl = Relatable::connect(cli.database.as_deref(), &cli.caching)
.await
.unwrap();
let user = get_username(&cli);
let changeset = rltbl.redo(&user).await.expect("Failed to redo");
if let None = changeset {
Expand All @@ -775,7 +803,9 @@ pub async fn load_tables(cli: &Cli, paths: &Vec<String>, force: bool) {

pub async fn load_table(cli: &Cli, path: &str, force: bool) {
tracing::trace!("load_table({cli:?}, {path})");
let rltbl = Relatable::connect(cli.database.as_deref()).await.unwrap();
let rltbl = Relatable::connect(cli.database.as_deref(), &cli.caching)
.await
.unwrap();

// We will use this pattern to normalize the table name:
let pattern = Regex::new(r#"[^0-9a-zA-Z_]+"#).expect("Invalid regex pattern");
Expand All @@ -794,13 +824,15 @@ pub async fn load_table(cli: &Cli, path: &str, force: bool) {

pub async fn save_all(cli: &Cli, save_dir: Option<&str>) {
tracing::trace!("save_all({cli:?})");
let rltbl = Relatable::connect(cli.database.as_deref()).await.unwrap();
let rltbl = Relatable::connect(cli.database.as_deref(), &cli.caching)
.await
.unwrap();
rltbl.save_all(save_dir).await.expect("Error saving all");
}

pub async fn build_demo(cli: &Cli, force: &bool, size: usize) {
tracing::trace!("build_demo({cli:?}, {force}, {size})");
Relatable::build_demo(cli.database.as_deref(), force, size)
Relatable::build_demo(cli.database.as_deref(), force, size, &cli.caching)
.await
.expect("Error building demonstration database");
println!(
Expand Down
Loading
0