Remove SpeeDB storage engine (#4171)

surrealdb · Jun 12, 2024 · e1123ae · e1123ae
1 parent 9ffe94a
commit e1123ae
Show file tree

Hide file tree

Showing 32 changed files with 41 additions and 935 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -550,29 +550,6 @@ jobs:
       - name: Test rocksdb engine
         run: cargo make ci-api-integration-rocksdb
 
-  speedb-engine:
-    name: SpeeDB engine
-    runs-on: ubuntu-latest
-    steps:
-      - name: Install stable toolchain
-        uses: dtolnay/rust-toolchain@stable
-        with:
-          toolchain: stable
-
-      - name: Checkout sources
-        uses: actions/checkout@v4
-
-      - name: Setup cache
-        uses: Swatinem/rust-cache@v2
-        with:
-          save-if: ${{ github.ref == 'refs/heads/main' }}
-
-      - name: Install cargo-make
-        run: cargo install --debug --locked cargo-make
-
-      - name: Test speedb engine
-        run: cargo make ci-api-integration-speedb
-
   tikv-engine:
     name: TiKV engine
     runs-on: ubuntu-latest

diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -11,7 +11,6 @@ authors = ["Tobie Morgan Hitchcock <tobie@surrealdb.com>"]
 default = ["storage-mem", "storage-rocksdb", "scripting", "http"]
 storage-mem = ["surrealdb/kv-mem"]
 storage-rocksdb = ["surrealdb/kv-rocksdb"]
-storage-speedb = ["surrealdb/kv-speedb"]
 storage-tikv = ["surrealdb/kv-tikv"]
 storage-fdb = ["surrealdb/kv-fdb-7_1"]
 storage-surrealkv = ["surrealdb/kv-surrealkv"]

diff --git a/Makefile.ci.toml b/Makefile.ci.toml
@@ -17,7 +17,7 @@ args = ["check", "--locked", "--package", "surrealdb", "--features", "protocol-w
 category = "CI - CHECK"
 command = "cargo"
 env = { RUSTFLAGS = "--cfg surrealdb_unstable" }
-args = ["clippy", "--all-targets", "--features", "storage-mem,storage-rocksdb,storage-speedb,storage-tikv,storage-fdb,scripting,http,jwks", "--tests", "--benches", "--examples", "--bins", "--", "-D", "warnings"]
+args = ["clippy", "--all-targets", "--features", "storage-mem,storage-rocksdb,storage-tikv,storage-fdb,scripting,http,jwks", "--tests", "--benches", "--examples", "--bins", "--", "-D", "warnings"]
 
 #
 # Integration Tests
@@ -142,11 +142,6 @@ category = "CI - INTEGRATION TESTS"
 env = { _TEST_API_ENGINE = "rocksdb", _TEST_FEATURES = "kv-rocksdb" }
 run_task = { name = ["test-kvs", "test-api-integration"], fork = true, parallel = true }
 
-[tasks.ci-api-integration-speedb]
-category = "CI - INTEGRATION TESTS"
-env = { _TEST_API_ENGINE = "speedb", _TEST_FEATURES = "kv-speedb" }
-run_task = { name = ["test-kvs", "test-api-integration"], fork = true, parallel = true }
-
 [tasks.ci-api-integration-fdb]
 category = "CI - INTEGRATION TESTS"
 env = { _TEST_API_ENGINE = "fdb", _TEST_FEATURES = "kv-fdb-7_1" }

diff --git a/Makefile.local.toml b/Makefile.local.toml
@@ -18,7 +18,7 @@ dependencies = ["cargo-upgrade", "cargo-update"]
 category = "LOCAL USAGE"
 command = "cargo"
 env = { RUSTDOCFLAGS = "--cfg surrealdb_unstable" }
-args = ["doc", "--open", "--no-deps", "--package", "surrealdb", "--features", "rustls,native-tls,protocol-ws,protocol-http,kv-mem,kv-speedb,kv-rocksdb,kv-tikv,http,scripting,jwks"]
+args = ["doc", "--open", "--no-deps", "--package", "surrealdb", "--features", "rustls,native-tls,protocol-ws,protocol-http,kv-mem,kv-rocksdb,kv-tikv,http,scripting,jwks"]
 
 # Test
 [tasks.test]

diff --git a/core/Cargo.toml b/core/Cargo.toml
@@ -26,7 +26,6 @@ resolver = "2"
 default = ["kv-mem"]
 kv-mem = ["dep:echodb", "tokio/time", "dep:tempfile", "dep:ext-sort"]
 kv-indxdb = ["dep:indxdb"]
-kv-speedb = ["dep:speedb", "tokio/time", "dep:tempfile", "dep:ext-sort"]
 kv-rocksdb = ["dep:rocksdb", "tokio/time", "dep:tempfile", "dep:ext-sort"]
 kv-tikv = ["dep:tikv", "dep:tempfile", "dep:ext-sort"]
 kv-fdb-5_1 = ["foundationdb/fdb-5_1", "kv-fdb", "dep:tempfile", "dep:ext-sort"]
@@ -142,7 +141,6 @@ serde_json = "1.0.108"
 sha1 = "0.10.6"
 sha2 = "0.10.8"
 snap = "1.1.0"
-speedb = { version = "0.0.4", features = ["lz4", "snappy"], optional = true }
 storekey = "0.5.0"
 surrealkv = { version = "0.1.5", optional = true }
 surrealml = { version = "0.1.1", optional = true, package = "surrealml-core" }

diff --git a/core/src/cnf/mod.rs b/core/src/cnf/mod.rs
@@ -46,7 +46,6 @@ pub static INSECURE_FORWARD_RECORD_ACCESS_ERRORS: Lazy<bool> =
 	feature = "kv-rocksdb",
 	feature = "kv-fdb",
 	feature = "kv-tikv",
-	feature = "kv-speedb"
 ))]
 /// Specifies the buffer limit for external sorting.
 /// If the environment variable is not present or cannot be parsed, a default value of 50,000 is used.

diff --git a/core/src/ctx/context.rs b/core/src/ctx/context.rs
@@ -22,7 +22,6 @@ use std::fmt::{self, Debug};
 	feature = "kv-rocksdb",
 	feature = "kv-fdb",
 	feature = "kv-tikv",
-	feature = "kv-speedb"
 ))]
 use std::path::PathBuf;
 use std::str::FromStr;
@@ -73,7 +72,6 @@ pub struct Context<'a> {
 		feature = "kv-rocksdb",
 		feature = "kv-fdb",
 		feature = "kv-tikv",
-		feature = "kv-speedb"
 	))]
 	// The temporary directory
 	temporary_directory: Option<Arc<PathBuf>>,
@@ -110,7 +108,6 @@ impl<'a> Context<'a> {
 			feature = "kv-rocksdb",
 			feature = "kv-fdb",
 			feature = "kv-tikv",
-			feature = "kv-speedb"
 		))]
 		temporary_directory: Option<Arc<PathBuf>>,
 	) -> Result<Context<'a>, Error> {
@@ -132,7 +129,6 @@ impl<'a> Context<'a> {
 				feature = "kv-rocksdb",
 				feature = "kv-fdb",
 				feature = "kv-tikv",
-				feature = "kv-speedb"
 			))]
 			temporary_directory,
 			transaction: None,
@@ -162,7 +158,6 @@ impl<'a> Context<'a> {
 				feature = "kv-rocksdb",
 				feature = "kv-fdb",
 				feature = "kv-tikv",
-				feature = "kv-speedb"
 			))]
 			temporary_directory: None,
 			transaction: None,
@@ -189,7 +184,6 @@ impl<'a> Context<'a> {
 				feature = "kv-rocksdb",
 				feature = "kv-fdb",
 				feature = "kv-tikv",
-				feature = "kv-speedb"
 			))]
 			temporary_directory: parent.temporary_directory.clone(),
 			transaction: parent.transaction.clone(),
@@ -328,7 +322,6 @@ impl<'a> Context<'a> {
 		feature = "kv-rocksdb",
 		feature = "kv-fdb",
 		feature = "kv-tikv",
-		feature = "kv-speedb"
 	))]
 	/// Return the location of the temporary directory if any
 	pub fn temporary_directory(&self) -> Option<&Arc<PathBuf>> {

diff --git a/core/src/dbs/iterator.rs b/core/src/dbs/iterator.rs
@@ -301,7 +301,6 @@ impl Iterator {
 				feature = "kv-rocksdb",
 				feature = "kv-fdb",
 				feature = "kv-tikv",
-				feature = "kv-speedb"
 			))]
 			ctx,
 			stm,

diff --git a/core/src/dbs/result.rs b/core/src/dbs/result.rs
@@ -8,7 +8,6 @@ use crate::dbs::plan::Explanation;
 	feature = "kv-rocksdb",
 	feature = "kv-fdb",
 	feature = "kv-tikv",
-	feature = "kv-speedb"
 ))]
 use crate::dbs::store::file_store::FileCollector;
 use crate::dbs::store::MemoryCollector;
@@ -27,7 +26,6 @@ pub(super) enum Results {
 		feature = "kv-rocksdb",
 		feature = "kv-fdb",
 		feature = "kv-tikv",
-		feature = "kv-speedb"
 	))]
 	File(Box<FileCollector>),
 	Groups(GroupsCollector),
@@ -43,7 +41,6 @@ impl Results {
 			feature = "kv-rocksdb",
 			feature = "kv-fdb",
 			feature = "kv-tikv",
-			feature = "kv-speedb"
 		))]
 		ctx: &Context<'_>,
 		stm: &Statement<'_>,
@@ -58,7 +55,6 @@ impl Results {
 			feature = "kv-rocksdb",
 			feature = "kv-fdb",
 			feature = "kv-tikv",
-			feature = "kv-speedb"
 		))]
 		if stm.tempfiles() {
 			if let Some(temp_dir) = ctx.temporary_directory() {
@@ -88,7 +84,6 @@ impl Results {
 				feature = "kv-rocksdb",
 				feature = "kv-fdb",
 				feature = "kv-tikv",
-				feature = "kv-speedb"
 			))]
 			Self::File(e) => {
 				e.push(val)?;
@@ -110,7 +105,6 @@ impl Results {
 				feature = "kv-rocksdb",
 				feature = "kv-fdb",
 				feature = "kv-tikv",
-				feature = "kv-speedb"
 			))]
 			Self::File(f) => f.sort(orders),
 			_ => {}
@@ -128,7 +122,6 @@ impl Results {
 				feature = "kv-rocksdb",
 				feature = "kv-fdb",
 				feature = "kv-tikv",
-				feature = "kv-speedb"
 			))]
 			Self::File(f) => f.start_limit(start, limit),
 			Self::Groups(_) => {}
@@ -146,7 +139,6 @@ impl Results {
 				feature = "kv-rocksdb",
 				feature = "kv-fdb",
 				feature = "kv-tikv",
-				feature = "kv-speedb"
 			))]
 			Self::File(e) => e.len(),
 			Self::Groups(g) => g.len(),
@@ -163,7 +155,6 @@ impl Results {
 				feature = "kv-rocksdb",
 				feature = "kv-fdb",
 				feature = "kv-tikv",
-				feature = "kv-speedb"
 			))]
 			Self::File(f) => f.take_vec()?,
 			_ => vec![],
@@ -183,7 +174,6 @@ impl Results {
 				feature = "kv-rocksdb",
 				feature = "kv-fdb",
 				feature = "kv-tikv",
-				feature = "kv-speedb"
 			))]
 			Self::File(e) => {
 				e.explain(exp);

diff --git a/core/src/dbs/statement.rs b/core/src/dbs/statement.rs
@@ -242,7 +242,6 @@ impl<'a> Statement<'a> {
 		feature = "kv-rocksdb",
 		feature = "kv-fdb",
 		feature = "kv-tikv",
-		feature = "kv-speedb"
 	))]
 	pub fn tempfiles(&self) -> bool {
 		match self {

diff --git a/core/src/dbs/store.rs b/core/src/dbs/store.rs
@@ -56,7 +56,6 @@ impl From<Vec<Value>> for MemoryCollector {
 	feature = "kv-rocksdb",
 	feature = "kv-fdb",
 	feature = "kv-tikv",
-	feature = "kv-speedb"
 ))]
 pub(super) mod file_store {
 	use crate::cnf::EXTERNAL_SORTING_BUFFER_LIMIT;

diff --git a/core/src/err/mod.rs b/core/src/err/mod.rs
@@ -18,7 +18,6 @@ use bincode::Error as BincodeError;
 	feature = "kv-rocksdb",
 	feature = "kv-fdb",
 	feature = "kv-tikv",
-	feature = "kv-speedb"
 ))]
 use ext_sort::SortError;
 use fst::Error as FstError;
@@ -1078,13 +1077,6 @@ impl From<tikv::Error> for Error {
 	}
 }
 
-#[cfg(feature = "kv-speedb")]
-impl From<speedb::Error> for Error {
-	fn from(e: speedb::Error) -> Error {
-		Error::Tx(e.to_string())
-	}
-}
-
 #[cfg(feature = "kv-rocksdb")]
 impl From<rocksdb::Error> for Error {
 	fn from(e: rocksdb::Error) -> Error {
@@ -1125,7 +1117,6 @@ impl From<reqwest::Error> for Error {
 	feature = "kv-rocksdb",
 	feature = "kv-fdb",
 	feature = "kv-tikv",
-	feature = "kv-speedb"
 ))]
 impl<S, D, I> From<SortError<S, D, I>> for Error
 where