Remove sorter cfg feature, support all ORDER BY by default (#450)

gluesql · Jan 7, 2022 · d7f8c81 · d7f8c81
1 parent 858e545
commit d7f8c81
Show file tree

Hide file tree

Showing 15 changed files with 4 additions and 68 deletions.
diff --git a/.github/workflows/rust.yml b/.github/workflows/rust.yml
@@ -22,8 +22,6 @@ jobs:
         run: cargo clippy --no-default-features --features alter-table -- -D warnings
       - name: Clippy (index)
         run: cargo clippy --no-default-features --features index -- -D warnings
-      - name: Clippy (sorter)
-        run: cargo clippy --no-default-features --features sorter -- -D warnings
       - name: Clippy (alter-table & index)
         run: cargo clippy --no-default-features --features "alter-table index" -- -D warnings
       - name: Clippy (alter-table & transaction)

diff --git a/Cargo.toml b/Cargo.toml
@@ -22,13 +22,12 @@ all-features = true
 [dependencies]
 gluesql-core = { path = "./core" }
 test-suite = { path = "./test-suite", optional = true }
-memory-storage = { path = "./storages/memory-storage", optional = true, features = ["sorter"] }
-sled-storage = { path = "./storages/sled-storage", optional = true, features = ["sorter"] }
+memory-storage = { path = "./storages/memory-storage", optional = true }
+sled-storage = { path = "./storages/sled-storage", optional = true }
 
 [features]
 # DB User
 default = [
-	"gluesql-core/sorter",
 	"gluesql-core/alter-table",
 	"gluesql-core/index",
 	"gluesql-core/transaction",
@@ -53,10 +52,6 @@ transaction = ["gluesql-core/transaction", "test-suite/transaction"]
 # e.g. SHOW TABLES;
 metadata = ["gluesql-core/metadata", "test-suite/metadata"]
 
-# optional: ORDER BY for non-indexed expressions
-# disable this feature if you use GlueSQL for big data analysis.
-sorter = ["gluesql-core/sorter", "test-suite/sorter"]
-
 [dev-dependencies]
 futures = "0.3"
 

diff --git a/README.md b/README.md
@@ -63,12 +63,11 @@ fn main() {
 [dependencies.gluesql]
 version = "0.9"
 default-features = false
-features = ["sorter", "alter-table", "index", "transaction"]
+features = ["alter-table", "index", "transaction"]
 ```
 
-#### Four features below are also optional
+#### Three features below are also optional
 
-- `sorter` - ORDER BY support for non-indexed expressions.
 - `alter-table` - ALTER TABLE query support
 - `index` - CREATE INDEX & DROP INDEX, index support
 - `transaction` - BEGIN, ROLLBACK and COMMIT, transaction support

diff --git a/cli/Cargo.toml b/cli/Cargo.toml
@@ -13,6 +13,3 @@ clap = { version = "3.0.1", features = ["derive"] }
 rustyline = "9.1"
 rustyline-derive = "0.6"
 comfy-table = "5"
-
-[features]
-default = ["gluesql-core/sorter", "sled-storage/sorter", "memory-storage/sorter"]
diff --git a/core/Cargo.toml b/core/Cargo.toml
@@ -38,7 +38,3 @@ transaction = []
 # optional: METADATA
 # e.g. SHOW TABLES;
 metadata = []
-
-# optional: ORDER BY for non-indexed expressions
-# disable this feature if you use GlueSQL for big data analysis.
-sorter = []
diff --git a/core/src/executor/select/error.rs b/core/src/executor/select/error.rs
@@ -8,10 +8,6 @@ pub enum SelectError {
     #[error("table alias for blend not found: {0}")]
     BlendTableAliasNotFound(String),
 
-    #[cfg(not(feature = "sorter"))]
-    #[error("order by on non-indexed expression is not supported: {0:?}")]
-    OrderByOnNonIndexedExprNotSupported(Vec<crate::ast::OrderByExpr>),
-
     #[error("unreachable!")]
     Unreachable,
 }
diff --git a/core/src/executor/select/mod.rs b/core/src/executor/select/mod.rs
@@ -165,11 +165,6 @@ pub async fn select_with_labels<'a, T: Debug>(
         }
     };
 
-    #[cfg(not(feature = "sorter"))]
-    if !order_by.is_empty() {
-        return Err(SelectError::OrderByOnNonIndexedExprNotSupported(order_by.to_vec()).into());
-    }
-
     let TableWithJoins { relation, joins } = &table_with_joins;
     let table = Table::new(relation)?;
 

diff --git a/storages/memory-storage/Cargo.toml b/storages/memory-storage/Cargo.toml
@@ -15,7 +15,6 @@ async-trait = "0.1"
 
 [dev-dependencies]
 test-suite = { path = "../../test-suite", features = [
-	"sorter",
 	"alter-table",
 	"index",
 	"transaction",
@@ -24,6 +23,3 @@ test-suite = { path = "../../test-suite", features = [
 
 tokio = { version = "1", features = ["rt", "macros"] }
 futures = "0.3"
-
-[features]
-sorter = ["gluesql-core/sorter"]
diff --git a/storages/sled-storage/Cargo.toml b/storages/sled-storage/Cargo.toml
@@ -21,7 +21,6 @@ sled = "0.34"
 
 [dev-dependencies]
 test-suite = { path = "../../test-suite", features = [
-	"sorter",
 	"index",
 	"transaction",
 	"alter-table",
@@ -34,6 +33,3 @@ tokio = { version = "1", features = ["rt", "macros"] }
 [[bench]]
 name = "sled_benchmark"
 harness = false
-
-[features]
-sorter = ["gluesql-core/sorter"]
diff --git a/test-suite/Cargo.toml b/test-suite/Cargo.toml
@@ -12,7 +12,6 @@ uuid = "0.8"
 chrono = "0.4"
 
 [features]
-sorter = ["gluesql-core/sorter"]
 alter-table = ["gluesql-core/alter-table"]
 index = ["gluesql-core/index"]
 transaction = ["gluesql-core/transaction"]

diff --git a/test-suite/src/index/mod.rs b/test-suite/src/index/mod.rs
@@ -14,6 +14,5 @@ pub use expr::expr;
 pub use nested::nested;
 pub use null::null;
 pub use order_by::order_by;
-#[cfg(feature = "sorter")]
 pub use order_by::order_by_multi;
 pub use value::value;
diff --git a/test-suite/src/index/order_by.rs b/test-suite/src/index/order_by.rs
@@ -89,7 +89,6 @@ CREATE TABLE Test (
     );
 });
 
-#[cfg(feature = "sorter")]
 test_case!(order_by_multi, async move {
     run!(
         r#"

diff --git a/test-suite/src/lib.rs b/test-suite/src/lib.rs
@@ -163,7 +163,6 @@ macro_rules! generate_index_tests {
         glue!(index_expr, index::expr);
         glue!(index_value, index::value);
         glue!(index_order_by, index::order_by);
-        #[cfg(feature = "sorter")]
         glue!(index_order_by_multi, index::order_by_multi);
     };
 }

diff --git a/test-suite/src/limit.rs b/test-suite/src/limit.rs
@@ -38,7 +38,6 @@ test_case!(limit, async move {
             r#"SELECT * FROM Test LIMIT 4 OFFSET 3;"#,
             select!(id; I64; 4; 5; 6; 7),
         ),
-        #[cfg(feature = "sorter")]
         (
             "SELECT * FROM Test ORDER BY id DESC LIMIT 3",
             select!(id; I64; 8; 7; 6),

diff --git a/test-suite/src/order_by.rs b/test-suite/src/order_by.rs
@@ -1,6 +1,5 @@
 use {crate::*, gluesql_core::translate::TranslateError};
 
-#[cfg(feature = "sorter")]
 test_case!(order_by, async move {
     run!(
         r#"
@@ -151,29 +150,3 @@ CREATE TABLE Test (
         "SELECT * FROM Test ORDER BY id NULLS FIRST"
     );
 });
-
-#[cfg(not(feature = "sorter"))]
-test_case!(order_by, async move {
-    use {
-        gluesql_core::ast::{Expr, OrderByExpr},
-        gluesql_core::executor::SelectError,
-    };
-
-    run!("CREATE TABLE Test (id INTEGER);");
-
-    test!(
-        Err(
-            SelectError::OrderByOnNonIndexedExprNotSupported(vec![OrderByExpr {
-                expr: Expr::Identifier("id".to_owned()),
-                asc: Some(false),
-            }])
-            .into()
-        ),
-        "SELECT * FROM Test ORDER BY id DESC"
-    );
-
-    test!(
-        Err(TranslateError::OrderByNullsFirstOrLastNotSupported.into()),
-        "SELECT * FROM Test ORDER BY id NULLS LAST"
-    );
-});
-Original file line number
+Diff line change
@@ Expand Up / @@ -89,7 +89,6 @@ CREATE TABLE Test ( @@
         );
     });
-    #[cfg(feature = "sorter")]
     test_case!(order_by_multi, async move {
         run!(
             r#"
@@ Expand Down @@