Skip to content

Commit

Permalink
remove unused code
Browse files Browse the repository at this point in the history
  • Loading branch information
michaelvlach committed Jan 1, 2025
1 parent 9d54cff commit 4042ee1
Show file tree
Hide file tree
Showing 17 changed files with 16 additions and 89 deletions.
3 changes: 1 addition & 2 deletions agdb_server/src/action/change_password.rs
Original file line number Diff line number Diff line change
Expand Up @@ -4,11 +4,10 @@ use crate::action::Action;
use crate::action::ClusterActionResult;
use crate::server_error::ServerResult;
use agdb::AgdbDeSerialize;
use agdb::UserValue;
use serde::Deserialize;
use serde::Serialize;

#[derive(Clone, Serialize, Deserialize, UserValue, AgdbDeSerialize)]
#[derive(Clone, Serialize, Deserialize, AgdbDeSerialize)]
pub(crate) struct ChangePassword {
pub(crate) user: String,
pub(crate) new_password: Vec<u8>,
Expand Down
3 changes: 1 addition & 2 deletions agdb_server/src/action/cluster_login.rs
Original file line number Diff line number Diff line change
Expand Up @@ -4,11 +4,10 @@ use crate::action::Action;
use crate::action::ClusterActionResult;
use crate::server_error::ServerResult;
use agdb::AgdbDeSerialize;
use agdb::UserValue;
use serde::Deserialize;
use serde::Serialize;

#[derive(Clone, Serialize, Deserialize, UserValue, AgdbDeSerialize)]
#[derive(Clone, Serialize, Deserialize, AgdbDeSerialize)]
pub(crate) struct ClusterLogin {
pub(crate) user: String,
pub(crate) new_token: String,
Expand Down
3 changes: 1 addition & 2 deletions agdb_server/src/action/db_add.rs
Original file line number Diff line number Diff line change
Expand Up @@ -5,12 +5,11 @@ use crate::action::ClusterActionResult;
use crate::server_db::Database;
use crate::server_error::ServerResult;
use agdb::AgdbDeSerialize;
use agdb::UserValue;
use agdb_api::DbType;
use serde::Deserialize;
use serde::Serialize;

#[derive(Clone, Serialize, Deserialize, UserValue, AgdbDeSerialize)]
#[derive(Clone, Serialize, Deserialize, AgdbDeSerialize)]
pub(crate) struct DbAdd {
pub(crate) owner: String,
pub(crate) db: String,
Expand Down
3 changes: 1 addition & 2 deletions agdb_server/src/action/db_backup.rs
Original file line number Diff line number Diff line change
Expand Up @@ -4,11 +4,10 @@ use crate::action::Action;
use crate::action::ClusterActionResult;
use crate::server_error::ServerResult;
use agdb::AgdbDeSerialize;
use agdb::UserValue;
use serde::Deserialize;
use serde::Serialize;

#[derive(Clone, Serialize, Deserialize, UserValue, AgdbDeSerialize)]
#[derive(Clone, Serialize, Deserialize, AgdbDeSerialize)]
pub(crate) struct DbBackup {
pub(crate) owner: String,
pub(crate) db: String,
Expand Down
3 changes: 1 addition & 2 deletions agdb_server/src/action/db_clear.rs
Original file line number Diff line number Diff line change
Expand Up @@ -4,12 +4,11 @@ use crate::action::Action;
use crate::action::ClusterActionResult;
use crate::server_error::ServerResult;
use agdb::AgdbDeSerialize;
use agdb::UserValue;
use agdb_api::DbResource;
use serde::Deserialize;
use serde::Serialize;

#[derive(Clone, Serialize, Deserialize, UserValue, AgdbDeSerialize)]
#[derive(Clone, Serialize, Deserialize, AgdbDeSerialize)]
pub(crate) struct DbClear {
pub(crate) owner: String,
pub(crate) db: String,
Expand Down
3 changes: 1 addition & 2 deletions agdb_server/src/action/db_convert.rs
Original file line number Diff line number Diff line change
Expand Up @@ -4,12 +4,11 @@ use crate::action::Action;
use crate::action::ClusterActionResult;
use crate::server_error::ServerResult;
use agdb::AgdbDeSerialize;
use agdb::UserValue;
use agdb_api::DbType;
use serde::Deserialize;
use serde::Serialize;

#[derive(Clone, Serialize, Deserialize, UserValue, AgdbDeSerialize)]
#[derive(Clone, Serialize, Deserialize, AgdbDeSerialize)]
pub(crate) struct DbConvert {
pub(crate) owner: String,
pub(crate) db: String,
Expand Down
3 changes: 1 addition & 2 deletions agdb_server/src/action/db_copy.rs
Original file line number Diff line number Diff line change
Expand Up @@ -5,12 +5,11 @@ use crate::action::ClusterActionResult;
use crate::server_db::Database;
use crate::server_error::ServerResult;
use agdb::AgdbDeSerialize;
use agdb::UserValue;
use agdb_api::DbType;
use serde::Deserialize;
use serde::Serialize;

#[derive(Clone, Serialize, Deserialize, UserValue, AgdbDeSerialize)]
#[derive(Clone, Serialize, Deserialize, AgdbDeSerialize)]
pub(crate) struct DbCopy {
pub(crate) owner: String,
pub(crate) db: String,
Expand Down
3 changes: 1 addition & 2 deletions agdb_server/src/action/db_delete.rs
Original file line number Diff line number Diff line change
Expand Up @@ -4,11 +4,10 @@ use crate::action::Action;
use crate::action::ClusterActionResult;
use crate::server_error::ServerResult;
use agdb::AgdbDeSerialize;
use agdb::UserValue;
use serde::Deserialize;
use serde::Serialize;

#[derive(Clone, Serialize, Deserialize, UserValue, AgdbDeSerialize)]
#[derive(Clone, Serialize, Deserialize, AgdbDeSerialize)]
pub(crate) struct DbDelete {
pub(crate) owner: String,
pub(crate) db: String,
Expand Down
57 changes: 0 additions & 57 deletions agdb_server/src/action/db_exec.rs
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,6 @@ use crate::action::Action;
use crate::action::ClusterActionResult;
use crate::server_error::ServerResult;
use agdb::AgdbDeSerialize;
use agdb::DbUserValue;
use agdb::QueryResult;
use agdb_api::Queries;
use serde::Deserialize;
use serde::Serialize;
Expand All @@ -27,58 +25,3 @@ impl Action for DbExec {
))
}
}

impl DbUserValue for DbExec {
type ValueType = DbExec;

fn db_id(&self) -> Option<agdb::QueryId> {
None
}

fn db_keys() -> Vec<agdb::DbValue> {
vec!["user".into(), "owner".into(), "db".into(), "queries".into()]
}

fn from_db_element(element: &agdb::DbElement) -> Result<Self::ValueType, agdb::DbError> {
Ok(Self {
user: element.values[0].value.string()?.clone(),
owner: element.values[1].value.string()?.clone(),
db: element.values[2].value.string()?.clone(),
queries: serde_json::from_str(element.values[3].value.string()?)
.map_err(|e| agdb::DbError::from(e.to_string()))?,
})
}

fn to_db_values(&self) -> Vec<agdb::DbKeyValue> {
let queries = serde_json::to_string(&self.queries).unwrap_or_default();

vec![
("user", &self.user).into(),
("owner", &self.owner).into(),
("db", &self.db).into(),
("queries", queries).into(),
]
}
}

impl TryFrom<&agdb::DbElement> for DbExec {
type Error = agdb::DbError;

#[track_caller]
fn try_from(value: &agdb::DbElement) -> std::result::Result<Self, Self::Error> {
DbExec::from_db_element(value)
}
}

impl TryFrom<QueryResult> for DbExec {
type Error = agdb::DbError;

#[track_caller]
fn try_from(value: QueryResult) -> Result<Self, Self::Error> {
value
.elements
.first()
.ok_or(Self::Error::from("No element found"))?
.try_into()
}
}
3 changes: 1 addition & 2 deletions agdb_server/src/action/db_optimize.rs
Original file line number Diff line number Diff line change
Expand Up @@ -4,11 +4,10 @@ use crate::action::Action;
use crate::action::ClusterActionResult;
use crate::server_error::ServerResult;
use agdb::AgdbDeSerialize;
use agdb::UserValue;
use serde::Deserialize;
use serde::Serialize;

#[derive(Clone, Serialize, Deserialize, UserValue, AgdbDeSerialize)]
#[derive(Clone, Serialize, Deserialize, AgdbDeSerialize)]
pub(crate) struct DbOptimize {
pub(crate) owner: String,
pub(crate) db: String,
Expand Down
3 changes: 1 addition & 2 deletions agdb_server/src/action/db_remove.rs
Original file line number Diff line number Diff line change
Expand Up @@ -4,11 +4,10 @@ use crate::action::Action;
use crate::action::ClusterActionResult;
use crate::server_error::ServerResult;
use agdb::AgdbDeSerialize;
use agdb::UserValue;
use serde::Deserialize;
use serde::Serialize;

#[derive(Clone, Serialize, Deserialize, UserValue, AgdbDeSerialize)]
#[derive(Clone, Serialize, Deserialize, AgdbDeSerialize)]
pub(crate) struct DbRemove {
pub(crate) owner: String,
pub(crate) db: String,
Expand Down
3 changes: 1 addition & 2 deletions agdb_server/src/action/db_rename.rs
Original file line number Diff line number Diff line change
Expand Up @@ -4,12 +4,11 @@ use crate::action::Action;
use crate::action::ClusterActionResult;
use crate::server_error::ServerResult;
use agdb::AgdbDeSerialize;
use agdb::UserValue;
use agdb_api::DbUserRole;
use serde::Deserialize;
use serde::Serialize;

#[derive(Clone, Serialize, Deserialize, UserValue, AgdbDeSerialize)]
#[derive(Clone, Serialize, Deserialize, AgdbDeSerialize)]
pub(crate) struct DbRename {
pub(crate) owner: String,
pub(crate) db: String,
Expand Down
3 changes: 1 addition & 2 deletions agdb_server/src/action/db_restore.rs
Original file line number Diff line number Diff line change
Expand Up @@ -4,11 +4,10 @@ use crate::action::Action;
use crate::action::ClusterActionResult;
use crate::server_error::ServerResult;
use agdb::AgdbDeSerialize;
use agdb::UserValue;
use serde::Deserialize;
use serde::Serialize;

#[derive(Clone, Serialize, Deserialize, UserValue, AgdbDeSerialize)]
#[derive(Clone, Serialize, Deserialize, AgdbDeSerialize)]
pub(crate) struct DbRestore {
pub(crate) owner: String,
pub(crate) db: String,
Expand Down
3 changes: 1 addition & 2 deletions agdb_server/src/action/db_user_add.rs
Original file line number Diff line number Diff line change
Expand Up @@ -4,12 +4,11 @@ use crate::action::Action;
use crate::action::ClusterActionResult;
use crate::server_error::ServerResult;
use agdb::AgdbDeSerialize;
use agdb::UserValue;
use agdb_api::DbUserRole;
use serde::Deserialize;
use serde::Serialize;

#[derive(Clone, Serialize, Deserialize, UserValue, AgdbDeSerialize)]
#[derive(Clone, Serialize, Deserialize, AgdbDeSerialize)]
pub(crate) struct DbUserAdd {
pub(crate) owner: String,
pub(crate) db: String,
Expand Down
3 changes: 1 addition & 2 deletions agdb_server/src/action/db_user_remove.rs
Original file line number Diff line number Diff line change
Expand Up @@ -4,11 +4,10 @@ use crate::action::Action;
use crate::action::ClusterActionResult;
use crate::server_error::ServerResult;
use agdb::AgdbDeSerialize;
use agdb::UserValue;
use serde::Deserialize;
use serde::Serialize;

#[derive(Clone, Serialize, Deserialize, UserValue, AgdbDeSerialize)]
#[derive(Clone, Serialize, Deserialize, AgdbDeSerialize)]
pub(crate) struct DbUserRemove {
pub(crate) owner: String,
pub(crate) db: String,
Expand Down
3 changes: 1 addition & 2 deletions agdb_server/src/action/user_add.rs
Original file line number Diff line number Diff line change
Expand Up @@ -5,11 +5,10 @@ use crate::action::ClusterActionResult;
use crate::server_db::ServerUser;
use crate::server_error::ServerResult;
use agdb::AgdbDeSerialize;
use agdb::UserValue;
use serde::Deserialize;
use serde::Serialize;

#[derive(Clone, Serialize, Deserialize, UserValue, AgdbDeSerialize)]
#[derive(Clone, Serialize, Deserialize, AgdbDeSerialize)]
pub(crate) struct UserAdd {
pub(crate) user: String,
pub(crate) password: Vec<u8>,
Expand Down
3 changes: 1 addition & 2 deletions agdb_server/src/action/user_remove.rs
Original file line number Diff line number Diff line change
Expand Up @@ -4,11 +4,10 @@ use crate::action::Action;
use crate::action::ClusterActionResult;
use crate::server_error::ServerResult;
use agdb::AgdbDeSerialize;
use agdb::UserValue;
use serde::Deserialize;
use serde::Serialize;

#[derive(Clone, Serialize, Deserialize, UserValue, AgdbDeSerialize)]
#[derive(Clone, Serialize, Deserialize, AgdbDeSerialize)]
pub(crate) struct UserRemove {
pub(crate) user: String,
}
Expand Down

0 comments on commit 4042ee1

Please sign in to comment.