add VERSION command and moving to 2018 version

Author: siscia

Cargo.lock

@@ -2,6 +2,7 @@
 name = "rediSQL"
 version = "1.0.3-rc02"
 authors = ["Simone Mosciatti <simone@redbeardlab.tech>"]
+edition = "2018"
 
 [lib]
 name = "redis_sql"

Cargo.toml

@@ -2,6 +2,7 @@
 name = "redisql_lib"
 version = "0.5.5-rc02"
 authors = ["Simone Mosciatti <mweb.sim@gmail.com>"]
+edition = "2015"
 
 [build-dependencies]
 bindgen = "0.47.1"

redisql_lib/Cargo.toml

@@ -17,6 +17,9 @@ use sync_engine::Replicate;
 
 use redisql_lib::statistics::STATISTICS;
 
+const REDISQL_VERSION: Option<&'static str> =
+    option_env!("CARGO_PKG_VERSION");
+
 extern "C" fn reply_exec(
     ctx: *mut r::rm::ffi::RedisModuleCtx,
     _argv: *mut *mut r::rm::ffi::RedisModuleString,
@@ -854,7 +857,7 @@ pub extern "C" fn CreateDB(
                                     vtab::register_modules(&rc)
                                 }) {
                                 Err(e) => e.reply(&context),
-                                Ok(mut vtab_context) => {
+                                Ok(vtab_context) => {
                                     let (tx, rx) = channel();
                                     let db = r::DBKey::new_from_arc(
                                         tx,
@@ -1096,3 +1099,16 @@ pub extern "C" fn GetStatistics(
 
     r::rm::ffi::REDISMODULE_OK
 }
+
+#[allow(non_snake_case)]
+pub extern "C" fn RediSQLVersion(
+    ctx: *mut r::rm::ffi::RedisModuleCtx,
+    _argv: *mut *mut r::rm::ffi::RedisModuleString,
+    _argc: ::std::os::raw::c_int,
+) -> i32 {
+    let context = r::rm::Context::new(ctx);
+    let version = REDISQL_VERSION.unwrap_or("unknown");
+    r::rm::ReplyWithStringBuffer(&context, version.as_bytes());
+
+    r::rm::ffi::REDISMODULE_OK
+}

src/commands.rs

@@ -2,12 +2,8 @@
 
 mod commands;
 
-extern crate env_logger;
-
 #[macro_use]
 extern crate log;
-extern crate redisql_lib;
-extern crate uuid;
 
 use env_logger::{Builder as logBuilder, Target as logTarget};
 use redisql_lib::redis as r;
@@ -26,13 +22,12 @@ use std::sync::{Arc, Mutex};
 use std::thread;
 use uuid::Uuid;
 
-extern crate sync_engine;
 use sync_engine::{register, WriteAOF};
 
 use commands::{
     CreateDB, CreateStatement, DeleteStatement, Exec, ExecStatement,
     GetStatistics, MakeCopy, Query, QueryInto, QueryStatement,
-    QueryStatementInto, UpdateStatement,
+    QueryStatementInto, RediSQLVersion, UpdateStatement,
 };
 
 #[cfg(not(feature = "pro"))]
@@ -339,6 +334,16 @@ pub extern "C" fn RedisModule_OnLoad(
         Err(e) => return e,
     }
 
+    match register_function(
+        &ctx,
+        "REDISQL.VERSION",
+        "readonly",
+        RediSQLVersion,
+    ) {
+        Ok(()) => (),
+        Err(e) => return e,
+    }
+
     match register(ctx) {
         Ok(()) => (),
         Err(e) => return e,

src/lib.rs

@@ -2,6 +2,7 @@
 name = "sync_engine"
 version = "0.5.1-rc01"
 authors = ["Simone Mosciatti <mweb.sim@gmail.com>"]
+edition = "2018"
 
 [build-dependencies]
 cc = {version = "1.0.3", features = ["parallel"]}