From 2370aaa58e8151470a800c2051f13ab764bdd00f Mon Sep 17 00:00:00 2001 From: Christopher Hotchkiss Date: Fri, 3 Sep 2021 20:57:23 -0400 Subject: [PATCH] Clippy cleanups --- src/constants/system_tables/pg_attribute.rs | 30 +++++++++--------- src/constants/system_tables/pg_class.rs | 20 ++++++------ src/constants/system_tables/pg_constraint.rs | 32 ++++++++++---------- src/constants/system_tables/pg_index.rs | 32 ++++++++++---------- src/engine/analyzer/definition_lookup.rs | 30 +++++++++--------- 5 files changed, 72 insertions(+), 72 deletions(-) diff --git a/src/constants/system_tables/pg_attribute.rs b/src/constants/system_tables/pg_attribute.rs index b3510db..ec4aed2 100644 --- a/src/constants/system_tables/pg_attribute.rs +++ b/src/constants/system_tables/pg_attribute.rs @@ -7,43 +7,43 @@ use hex_literal::hex; use std::sync::Arc; use uuid::Uuid; -pub const id: Uuid = Uuid::from_bytes(hex!("EE89957F3E9F482C836DDA6C349AC632")); -pub const name: &str = "pg_attribute"; +pub const ID: Uuid = Uuid::from_bytes(hex!("EE89957F3E9F482C836DDA6C349AC632")); +pub const NAME: &str = "pg_attribute"; -pub const column_class_id: &str = "class_id"; -pub const column_name: &str = "name"; -pub const column_sql_type: &str = "type_name"; -pub const column_column_num: &str = "column_num"; -pub const column_nullable: &str = "nullable"; +pub const COLUMN_CLASS_ID: &str = "class_id"; +pub const COLUMN_NAME: &str = "name"; +pub const COLUMN_SQL_TYPE: &str = "type_name"; +pub const COLUMN_COLUMN_NUM: &str = "column_num"; +pub const COLUMN_NULLABLE: &str = "nullable"; pub fn get_columns() -> Vec { vec![ Attribute::new( - column_class_id.to_string(), + COLUMN_CLASS_ID.to_string(), BaseSqlTypesMapper::Uuid, Nullable::NotNull, None, ), Attribute::new( - column_name.to_string(), + COLUMN_NAME.to_string(), BaseSqlTypesMapper::Text, Nullable::NotNull, None, ), Attribute::new( - column_sql_type.to_string(), + COLUMN_SQL_TYPE.to_string(), BaseSqlTypesMapper::Text, //TODO join to pg_type instead, for now its a string Nullable::NotNull, None, ), Attribute::new( - column_column_num.to_string(), + COLUMN_COLUMN_NUM.to_string(), BaseSqlTypesMapper::Integer, Nullable::NotNull, None, ), Attribute::new( - column_nullable.to_string(), + COLUMN_NULLABLE.to_string(), BaseSqlTypesMapper::Bool, Nullable::NotNull, None, @@ -54,7 +54,7 @@ pub fn get_columns() -> Vec { pub fn get_index(attrs: &Vec) -> Arc { Arc::new(Index { id: Uuid::from_bytes(hex!("516B20412CF145A2AD9E39A8BDEB30A8")), - name: name.to_string() + "_name_index", + name: NAME.to_string() + "_name_index", columns: Arc::new(SqlTypeDefinition::new(&[attrs[1].clone()])), unique: true, }) @@ -64,8 +64,8 @@ pub fn get_table() -> Arc { let columns = get_columns(); let index = get_index(&columns); Arc::new(Table::new( - id, - name.to_string(), + ID, + NAME.to_string(), get_columns(), vec![Constraint::PrimaryKey(PrimaryKeyConstraint { name: index.name.clone() + "_primary_key", diff --git a/src/constants/system_tables/pg_class.rs b/src/constants/system_tables/pg_class.rs index a6ad2f6..c7cd0c2 100644 --- a/src/constants/system_tables/pg_class.rs +++ b/src/constants/system_tables/pg_class.rs @@ -7,22 +7,22 @@ use hex_literal::hex; use std::sync::Arc; use uuid::Uuid; -pub const id: Uuid = Uuid::from_bytes(hex!("EE919E33D9054F4889537EBB6CC911EB")); -pub const name: &str = "pg_class"; +pub const ID: Uuid = Uuid::from_bytes(hex!("EE919E33D9054F4889537EBB6CC911EB")); +pub const NAME: &str = "pg_class"; -pub const column_id: &str = "id"; -pub const column_name: &str = "name"; +pub const COLUMN_ID: &str = "id"; +pub const COLUMN_NAME: &str = "name"; pub fn get_columns() -> Vec { vec![ Attribute::new( - column_id.to_string(), + COLUMN_ID.to_string(), BaseSqlTypesMapper::Uuid, Nullable::NotNull, None, ), Attribute::new( - column_name.to_string(), + COLUMN_NAME.to_string(), BaseSqlTypesMapper::Text, Nullable::NotNull, None, @@ -33,7 +33,7 @@ pub fn get_columns() -> Vec { pub fn get_index(attrs: &Vec) -> Arc { Arc::new(Index { id: Uuid::from_bytes(hex!("516B20412CF145A2AD9E39A8BDEB30A8")), - name: name.to_string() + "_name_index", + name: NAME.to_string() + "_name_index", columns: Arc::new(SqlTypeDefinition::new(&[attrs[1].clone()])), unique: true, }) @@ -43,11 +43,11 @@ pub fn get_table() -> Arc
{ let columns = get_columns(); let index = get_index(&columns); Arc::new(Table::new( - id, - name.to_string(), + ID, + NAME.to_string(), columns, vec![Constraint::PrimaryKey(PrimaryKeyConstraint { - name: name.to_string() + "_primary_key", + name: NAME.to_string() + "_primary_key", index: index.clone(), })], vec![index], diff --git a/src/constants/system_tables/pg_constraint.rs b/src/constants/system_tables/pg_constraint.rs index 131f31f..b651b0a 100644 --- a/src/constants/system_tables/pg_constraint.rs +++ b/src/constants/system_tables/pg_constraint.rs @@ -7,43 +7,43 @@ use hex_literal::hex; use std::sync::Arc; use uuid::Uuid; -pub const id: Uuid = Uuid::from_bytes(hex!("DB6AB6BB401B4071BE52763C0C550600")); -pub const name: &str = "pg_constraint"; +pub const ID: Uuid = Uuid::from_bytes(hex!("DB6AB6BB401B4071BE52763C0C550600")); +pub const NAME: &str = "pg_constraint"; -pub const column_id: &str = "id"; -pub const column_class_id: &str = "class_id"; -pub const column_index_id: &str = "index_id"; -pub const column_name: &str = "name"; -pub const column_type: &str = "type"; +pub const COLUMN_ID: &str = "id"; +pub const COLUMN_CLASS_ID: &str = "class_id"; +pub const COLUMN_INDEX_ID: &str = "index_id"; +pub const COLUMN_NAME: &str = "name"; +pub const COLUMN_TYPE: &str = "type"; pub fn get_columns() -> Vec { vec![ Attribute::new( - column_id.to_string(), + COLUMN_ID.to_string(), BaseSqlTypesMapper::Uuid, Nullable::NotNull, None, ), Attribute::new( - column_class_id.to_string(), + COLUMN_CLASS_ID.to_string(), BaseSqlTypesMapper::Uuid, Nullable::NotNull, None, ), Attribute::new( - column_index_id.to_string(), + COLUMN_INDEX_ID.to_string(), BaseSqlTypesMapper::Uuid, Nullable::NotNull, None, ), Attribute::new( - column_name.to_string(), + COLUMN_NAME.to_string(), BaseSqlTypesMapper::Text, Nullable::NotNull, None, ), Attribute::new( - column_type.to_string(), + COLUMN_TYPE.to_string(), BaseSqlTypesMapper::Text, Nullable::NotNull, None, @@ -54,7 +54,7 @@ pub fn get_columns() -> Vec { pub fn get_index(attrs: &Vec) -> Arc { Arc::new(Index { id: Uuid::from_bytes(hex!("27182DE783AB42D8B5DD43BFC0154F0F")), - name: name.to_string() + "_name_index", + name: NAME.to_string() + "_name_index", columns: Arc::new(SqlTypeDefinition::new(&[attrs[3].clone()])), unique: true, }) @@ -64,11 +64,11 @@ pub fn get_table() -> Arc
{ let columns = get_columns(); let index = get_index(&columns); Arc::new(Table::new( - id, - name.to_string(), + ID, + NAME.to_string(), columns, vec![Constraint::PrimaryKey(PrimaryKeyConstraint { - name: name.to_string() + "_primary_key", + name: NAME.to_string() + "_primary_key", index: index.clone(), })], vec![index], diff --git a/src/constants/system_tables/pg_index.rs b/src/constants/system_tables/pg_index.rs index a7f4691..0473f50 100644 --- a/src/constants/system_tables/pg_index.rs +++ b/src/constants/system_tables/pg_index.rs @@ -7,43 +7,43 @@ use hex_literal::hex; use std::sync::Arc; use uuid::Uuid; -pub const id: Uuid = Uuid::from_bytes(hex!("3AB3B076A0EA46E186130F088D06FA02")); -pub const name: &str = "pg_index"; +pub const ID: Uuid = Uuid::from_bytes(hex!("3AB3B076A0EA46E186130F088D06FA02")); +pub const NAME: &str = "pg_index"; -pub const column_id: &str = "id"; -pub const column_class_id: &str = "class_id"; -pub const column_name: &str = "name"; -pub const column_attributes: &str = "attributes"; -pub const column_unique: &str = "unique"; +pub const COLUMN_ID: &str = "id"; +pub const COLUMN_CLASS_ID: &str = "class_id"; +pub const COLUMN_NAME: &str = "name"; +pub const COLUMN_ATTRIBUTES: &str = "attributes"; +pub const COLUMN_UNIQUE: &str = "unique"; pub fn get_columns() -> Vec { vec![ Attribute::new( - column_id.to_string(), + COLUMN_ID.to_string(), BaseSqlTypesMapper::Uuid, Nullable::NotNull, None, ), Attribute::new( - column_class_id.to_string(), + COLUMN_CLASS_ID.to_string(), BaseSqlTypesMapper::Uuid, Nullable::NotNull, None, ), Attribute::new( - column_name.to_string(), + COLUMN_NAME.to_string(), BaseSqlTypesMapper::Text, Nullable::NotNull, None, ), Attribute::new( - column_attributes.to_string(), + COLUMN_ATTRIBUTES.to_string(), BaseSqlTypesMapper::Array(Arc::new(BaseSqlTypesMapper::Integer)), Nullable::NotNull, None, ), Attribute::new( - column_unique.to_string(), + COLUMN_UNIQUE.to_string(), BaseSqlTypesMapper::Bool, Nullable::NotNull, None, @@ -54,7 +54,7 @@ pub fn get_columns() -> Vec { pub fn get_index(attrs: &Vec) -> Arc { Arc::new(Index { id: Uuid::from_bytes(hex!("5F59466782874C568F1C0C09E99C9249")), - name: name.to_string() + "_name_index", + name: NAME.to_string() + "_name_index", columns: Arc::new(SqlTypeDefinition::new(&[attrs[2].clone()])), unique: true, }) @@ -64,11 +64,11 @@ pub fn get_table() -> Arc
{ let columns = get_columns(); let index = get_index(&columns); Arc::new(Table::new( - id, - name.to_string(), + ID, + NAME.to_string(), columns, vec![Constraint::PrimaryKey(PrimaryKeyConstraint { - name: name.to_string() + "_primary_key", + name: NAME.to_string() + "_primary_key", index: index.clone(), })], vec![index], diff --git a/src/engine/analyzer/definition_lookup.rs b/src/engine/analyzer/definition_lookup.rs index 7edee76..3139da4 100644 --- a/src/engine/analyzer/definition_lookup.rs +++ b/src/engine/analyzer/definition_lookup.rs @@ -45,7 +45,7 @@ impl DefinitionLookup { } let pg_class_entry = self.get_table_row(tran_id, name.clone()).await?; - let table_id = match pg_class_entry.get_column_not_null(pg_class::column_id)? { + let table_id = match pg_class_entry.get_column_not_null(pg_class::COLUMN_ID)? { BaseSqlTypes::Uuid(u) => u, _ => return Err(DefinitionLookupError::ColumnWrongType()), }; @@ -53,16 +53,16 @@ impl DefinitionLookup { let tbl_columns = self.get_table_columns(tran_id, table_id).await?; let mut tbl_attrs = vec![]; for c in tbl_columns { - let c_name = match c.get_column_not_null(pg_attribute::column_name)? { + let c_name = match c.get_column_not_null(pg_attribute::COLUMN_NAME)? { BaseSqlTypes::Text(t) => t, _ => return Err(DefinitionLookupError::ColumnWrongType()), }; - let c_type = match c.get_column_not_null(pg_attribute::column_sql_type)? { + let c_type = match c.get_column_not_null(pg_attribute::COLUMN_SQL_TYPE)? { BaseSqlTypes::Text(t) => t, _ => return Err(DefinitionLookupError::ColumnWrongType()), }; - let c_null = match c.get_column_not_null(pg_attribute::column_nullable)? { + let c_null = match c.get_column_not_null(pg_attribute::COLUMN_NULLABLE)? { BaseSqlTypes::Bool(b) => Nullable::from(b), _ => return Err(DefinitionLookupError::ColumnWrongType()), }; @@ -103,7 +103,7 @@ impl DefinitionLookup { pin!(row_stream); while let Some(row_res) = row_stream.next().await { let row = row_res?; - if row.get_column_not_null(pg_class::column_name)? == BaseSqlTypes::Text(name.clone()) { + if row.get_column_not_null(pg_class::COLUMN_NAME)? == BaseSqlTypes::Text(name.clone()) { return Ok(row); } } @@ -125,7 +125,7 @@ impl DefinitionLookup { pin!(row_stream); while let Some(row_res) = row_stream.next().await { let row = row_res?; - if row.get_column_not_null(pg_attribute::column_class_id)? + if row.get_column_not_null(pg_attribute::COLUMN_CLASS_ID)? == BaseSqlTypes::Uuid(class_id) { columns.push(row); @@ -137,7 +137,7 @@ impl DefinitionLookup { } //Figure out what column we're dealing with - let col_offset = pg_attr.get_column_index(pg_attribute::column_column_num)?; + let col_offset = pg_attr.get_column_index(pg_attribute::COLUMN_COLUMN_NUM)?; //Extract column number into tuples so we can sort let mut column_tuples = vec![]; @@ -185,7 +185,7 @@ impl DefinitionLookup { pin!(row_stream); while let Some(row_res) = row_stream.next().await { let row = row_res?; - if row.get_column_not_null(pg_index::column_class_id)? == BaseSqlTypes::Uuid(class_id) { + if row.get_column_not_null(pg_index::COLUMN_CLASS_ID)? == BaseSqlTypes::Uuid(class_id) { rows.push(row); } } @@ -196,15 +196,15 @@ impl DefinitionLookup { let mut indexes = vec![]; for r in rows.iter() { - let id = match r.get_column_not_null(pg_index::column_id)? { + let id = match r.get_column_not_null(pg_index::COLUMN_ID)? { BaseSqlTypes::Uuid(u) => u, _ => return Err(DefinitionLookupError::ColumnWrongType()), }; - let name = match r.get_column_not_null(pg_index::column_name)? { + let name = match r.get_column_not_null(pg_index::COLUMN_NAME)? { BaseSqlTypes::Text(t) => t, _ => return Err(DefinitionLookupError::ColumnWrongType()), }; - let columns = match r.get_column_not_null(pg_index::column_attributes)? { + let columns = match r.get_column_not_null(pg_index::COLUMN_ATTRIBUTES)? { BaseSqlTypes::Array(a) => { let mut cols = vec![]; for col in a { @@ -229,7 +229,7 @@ impl DefinitionLookup { } _ => return Err(DefinitionLookupError::ColumnWrongType()), }; - let unique = match r.get_column_not_null(pg_index::column_unique)? { + let unique = match r.get_column_not_null(pg_index::COLUMN_UNIQUE)? { BaseSqlTypes::Bool(b) => b, _ => return Err(DefinitionLookupError::ColumnWrongType()), }; @@ -259,7 +259,7 @@ impl DefinitionLookup { pin!(row_stream); while let Some(row_res) = row_stream.next().await { let row = row_res?; - if row.get_column_not_null(pg_constraint::column_class_id)? + if row.get_column_not_null(pg_constraint::COLUMN_CLASS_ID)? == BaseSqlTypes::Uuid(class_id) { rows.push(row); @@ -268,11 +268,11 @@ impl DefinitionLookup { let mut constraints = vec![]; 'outer: for r in rows.iter() { - let name = match r.get_column_not_null(pg_constraint::column_name)? { + let name = match r.get_column_not_null(pg_constraint::COLUMN_NAME)? { BaseSqlTypes::Text(t) => t, _ => return Err(DefinitionLookupError::ColumnWrongType()), }; - let index_id = match r.get_column_not_null(pg_constraint::column_index_id)? { + let index_id = match r.get_column_not_null(pg_constraint::COLUMN_INDEX_ID)? { BaseSqlTypes::Uuid(u) => u, _ => return Err(DefinitionLookupError::ColumnWrongType()), };