open source all the thing!🎉🚀

Author: siscia

Cargo.lock

@@ -14,10 +14,9 @@ env_logger = "0.6"
 
 redisql_lib = {path = "./redisql_lib"}
 telemetrics = {path = "./telemetrics"}
-# engine_pro = {path = "./engine_pro", optional = true}
+sync_engine = {path = "./sync_engine"}
 
 [features]
 default = []
-# pro = ["engine_pro"]
-# trial = ["engine_pro/trial"]
+pro = []
 

Cargo.toml

@@ -51,14 +51,9 @@ fn main() {
         }
     }
 
-    // let engine_pro = "-DENGINE_PRO=1";
-    let engine_pro = "-DENGINE_PRO=0";
-
     let bindings = bindgen::Builder::default()
         .parse_callbacks(Box::new(SqliteTypeChooser))
-        // .rustfmt_bindings(false)
         .header("sqlite_dependencies.h")
-        .clang_arg(engine_pro)
         .generate()
         .expect("Unable to generate bindings for SQLite");
 

engine_pro

@@ -1,6 +1,4 @@
 #include <stdlib.h>
 #include "src/CDeps/SQLite/include/sqlite3.h"
 
-#if ENGINE_PRO
-  #include "../engine_pro/src/CDeps/sqlite_dump.h"
-#endif // ENGINE_PRO
+#include "../sync_engine/src/CDeps/sqlite_dump.h"

redisql_lib/build.rs

@@ -13,10 +13,7 @@ use redisql_lib::virtual_tables as vtab;
 
 use redisql_lib::redis as r;
 
-#[cfg(feature = "pro")]
-use engine_pro::Replicate;
-#[cfg(not(feature = "pro"))]
-use redisql_lib::redis::Replicate;
+use sync_engine::Replicate;
 
 use redisql_lib::statistics::STATISTICS;
 

redisql_lib/sqlite_dependencies.h

@@ -26,11 +26,8 @@ use std::sync::{Arc, Mutex};
 use std::thread;
 use uuid::Uuid;
 
-#[cfg(feature = "pro")]
-extern crate engine_pro;
-
-#[cfg(feature = "pro")]
-use engine_pro::{register, WriteAOF};
+extern crate sync_engine;
+use sync_engine::{register, WriteAOF};
 
 use commands::{
     CreateDB, CreateStatement, DeleteStatement, Exec, ExecStatement,
@@ -200,7 +197,6 @@ pub extern "C" fn RedisModule_OnLoad(
     let c_data_type_name = CString::new("rediSQLDB").unwrap();
     let ptr_data_type_name = c_data_type_name.as_ptr();
 
-    #[cfg(feature = "pro")]
     let mut types = r::rm::ffi::RedisModuleTypeMethods {
         version: 1,
         rdb_load: Some(rdb_load),
@@ -211,17 +207,6 @@ pub extern "C" fn RedisModule_OnLoad(
         free: Some(free_db),
     };
 
-    #[cfg(not(feature = "pro"))]
-    let mut types = r::rm::ffi::RedisModuleTypeMethods {
-        version: 1,
-        rdb_load: Some(rdb_load),
-        rdb_save: Some(rdb_save),
-        aof_rewrite: None,
-        mem_usage: None,
-        digest: None,
-        free: Some(free_db),
-    };
-
     let module_c_name = CString::new("rediSQL").unwrap();
     let module_ptr_name = module_c_name.as_ptr();
     if unsafe {
@@ -354,7 +339,6 @@ pub extern "C" fn RedisModule_OnLoad(
         Err(e) => return e,
     }
 
-    #[cfg(feature = "pro")]
     match register(ctx) {
         Ok(()) => (),
         Err(e) => return e,

src/commands.rs

@@ -0,0 +1 @@
+target/