[#181] std::Result를 errors::Result로 대체

Author: myyrakle

src/engine/actions/ddl/alter_database.rs

@@ -9,10 +9,10 @@ use crate::engine::types::{
     ExecuteColumn, ExecuteColumnType, ExecuteField, ExecuteResult, ExecuteRow,
 };
 use crate::errors::execute_error::ExecuteError;
-use crate::errors::{ErrorKind, Errors};
+use crate::errors::{self, ErrorKind, Errors};
 
 impl DBEngine {
-    pub async fn alter_database(&self, query: AlterDatabaseQuery) -> Result<ExecuteResult, Errors> {
+    pub async fn alter_database(&self, query: AlterDatabaseQuery) -> errors::Result<ExecuteResult> {
         let encoder = StorageEncoder::new();
 
         let base_path = self.get_data_directory();

src/engine/actions/ddl/alter_table.rs

@@ -9,10 +9,10 @@ use crate::engine::types::{
     ExecuteColumn, ExecuteColumnType, ExecuteField, ExecuteResult, ExecuteRow,
 };
 use crate::errors::execute_error::ExecuteError;
-use crate::errors::{ErrorKind, Errors};
+use crate::errors::{self, ErrorKind, Errors};
 
 impl DBEngine {
-    pub async fn alter_table(&self, query: AlterTableQuery) -> Result<ExecuteResult, Errors> {
+    pub async fn alter_table(&self, query: AlterTableQuery) -> errors::Result<ExecuteResult> {
         let encoder = StorageEncoder::new();
 
         let base_path = self.get_data_directory();

src/engine/actions/ddl/create_database.rs

@@ -9,13 +9,13 @@ use crate::engine::types::{
     ExecuteColumn, ExecuteColumnType, ExecuteField, ExecuteResult, ExecuteRow,
 };
 use crate::errors::execute_error::ExecuteError;
-use crate::errors::{ErrorKind, Errors};
+use crate::errors::{self, ErrorKind, Errors};
 
 impl DBEngine {
     pub async fn create_database(
         &self,
         query: CreateDatabaseQuery,
-    ) -> Result<ExecuteResult, Errors> {
+    ) -> errors::Result<ExecuteResult> {
         let encoder = StorageEncoder::new();
 
         let base_path = self.get_data_directory();

src/engine/actions/ddl/create_table.rs

@@ -8,10 +8,10 @@ use crate::engine::types::{
     ExecuteColumn, ExecuteColumnType, ExecuteField, ExecuteResult, ExecuteRow,
 };
 use crate::errors::execute_error::ExecuteError;
-use crate::errors::{ErrorKind, Errors};
+use crate::errors::{self, ErrorKind, Errors};
 
 impl DBEngine {
-    pub async fn create_table(&self, query: CreateTableQuery) -> Result<ExecuteResult, Errors> {
+    pub async fn create_table(&self, query: CreateTableQuery) -> errors::Result<ExecuteResult> {
         let encoder = StorageEncoder::new();
 
         let database_name = query.table.clone().unwrap().database_name.unwrap();

src/engine/actions/ddl/drop_database.rs

@@ -6,10 +6,10 @@ use crate::engine::ast::ddl::drop_database::DropDatabaseQuery;
 use crate::engine::types::{
     ExecuteColumn, ExecuteColumnType, ExecuteField, ExecuteResult, ExecuteRow,
 };
-use crate::errors::{ErrorKind, Errors};
+use crate::errors::{self, ErrorKind, Errors};
 
 impl DBEngine {
-    pub async fn drop_database(&self, query: DropDatabaseQuery) -> Result<ExecuteResult, Errors> {
+    pub async fn drop_database(&self, query: DropDatabaseQuery) -> errors::Result<ExecuteResult> {
         let base_path = self.get_data_directory();
         let mut database_path = base_path.clone();
 

src/engine/actions/ddl/drop_table.rs

@@ -6,10 +6,10 @@ use crate::engine::ast::types::TableName;
 use crate::engine::types::{
     ExecuteColumn, ExecuteColumnType, ExecuteField, ExecuteResult, ExecuteRow,
 };
-use crate::errors::{ErrorKind, Errors};
+use crate::errors::{self, ErrorKind, Errors};
 
 impl DBEngine {
-    pub async fn drop_table(&self, query: DropTableQuery) -> Result<ExecuteResult, Errors> {
+    pub async fn drop_table(&self, query: DropTableQuery) -> errors::Result<ExecuteResult> {
         let base_path = self.get_data_directory();
 
         let TableName {

src/engine/actions/dml/delete.rs

@@ -12,12 +12,12 @@ use crate::engine::schema::row::TableDataFieldType;
 use crate::engine::types::{
     ExecuteColumn, ExecuteColumnType, ExecuteField, ExecuteResult, ExecuteRow,
 };
-use crate::errors::Errors;
+use crate::errors;
 use crate::errors::execute_error::ExecuteError;
 use crate::errors::type_error::TypeError;
 
 impl DBEngine {
-    pub async fn delete(&self, query: DeleteQuery) -> Result<ExecuteResult, Errors> {
+    pub async fn delete(&self, query: DeleteQuery) -> errors::Result<ExecuteResult> {
         let table = query.from_table.as_ref().unwrap().table.clone();
 
         // 최적화 작업

src/engine/actions/dml/insert.rs

@@ -10,11 +10,11 @@ use crate::engine::schema::table::TableSchema;
 use crate::engine::types::{
     ExecuteColumn, ExecuteColumnType, ExecuteField, ExecuteResult, ExecuteRow,
 };
-use crate::errors::{Errors, ErrorKind};
+use crate::errors::{self, Errors, ErrorKind};
 use crate::errors::execute_error::ExecuteError;
 
 impl DBEngine {
-    pub async fn insert(&self, query: InsertQuery) -> Result<ExecuteResult, Errors> {
+    pub async fn insert(&self, query: InsertQuery) -> errors::Result<ExecuteResult> {
         let encoder = StorageEncoder::new();
 
         let into_table = query.into_table.as_ref().unwrap();

src/engine/actions/dml/scan.rs

@@ -7,14 +7,14 @@ use crate::engine::DBEngine;
 use crate::engine::ast::types::TableName;
 use crate::engine::encoder::schema_encoder::StorageEncoder;
 use crate::engine::schema::row::TableDataRow;
-use crate::errors::{Errors, ErrorKind};
+use crate::errors::{self, Errors, ErrorKind};
 use crate::errors::execute_error::ExecuteError;
 
 impl DBEngine {
     pub async fn full_scan(
         &self,
         table_name: TableName,
-    ) -> Result<Vec<(PathBuf, TableDataRow)>, Errors> {
+    ) -> errors::Result<Vec<(PathBuf, TableDataRow)>> {
         let encoder = StorageEncoder::new();
 
         let database_name = table_name.database_name.unwrap();

src/engine/actions/dml/select.rs

@@ -14,11 +14,11 @@ use crate::engine::expression::ReduceContext;
 use crate::engine::optimizer::predule::Optimizer;
 use crate::engine::schema::row::{TableDataField, TableDataFieldType, TableDataRow};
 use crate::engine::types::{ExecuteColumn, ExecuteField, ExecuteResult, ExecuteRow};
-use crate::errors::Errors;
+use crate::errors;
 use crate::errors::type_error::TypeError;
 
 impl DBEngine {
-    pub async fn select(&self, query: SelectQuery) -> Result<ExecuteResult, Errors> {
+    pub async fn select(&self, query: SelectQuery) -> errors::Result<ExecuteResult> {
         // 최적화 작업
         let optimizer = Optimizer::new();
 
@@ -449,7 +449,7 @@ impl DBEngine {
                 };
                 let data_type = self.reduce_type(item, reduce_context.clone())?;
 
-                Ok::<ExecuteColumn, Errors>(ExecuteColumn { name, data_type })
+                Ok::<ExecuteColumn, errors::Errors>(ExecuteColumn { name, data_type })
             })
             .collect::<Result<Vec<_>, _>>()?;