add Copy Syncronous and increase version number

Author: Simone Mosciatti

Cargo.lock

@@ -1,6 +1,6 @@
 [package]
 name = "rediSQL"
-version = "0.6.1"
+version = "0.7.0"
 authors = ["Simone Mosciatti <[email protected]>"]
 
 [lib]

Cargo.toml

@@ -862,10 +862,6 @@ extern "C" fn MakeCopy(
         },
     };
 
-    /*
-    let source_connection = source_db.loop_data.get_db();
-    let dest_connection = dest_db.loop_data.get_db();
-    */
     let ch = &source_db.tx.clone();
 
     let cmd = r::Command::MakeCopy {
@@ -874,15 +870,13 @@ extern "C" fn MakeCopy(
         client: blocked_client,
     };
 
-    /*
-    std::mem::forget(source_db);
-    std::mem::forget(dest_db);
-    */
-
     debug!("MakeCopy | End");
     match ch.send(cmd) {
         Ok(()) => {
             debug!("MakeCopy | Successfully send command");
+            unsafe {
+                Replicate(&context, "REDISQL.COPY.NOW", argv, argc);
+            }
             r::rm::ffi::REDISMODULE_OK
         }
         Err(_) => r::rm::ffi::REDISMODULE_OK,
@@ -1033,10 +1027,9 @@ pub extern "C" fn RedisModule_OnLoad(
         Err(e) => return e,
     }
 
-    match register_function(
+    match register_write_function(
         &ctx,
         String::from("REDISQL.COPY"),
-        String::from("readonly"),
         MakeCopy,
     ) {
         Ok(()) => (),

engine_pro

@@ -592,6 +592,35 @@ def test_statements_copy_mem_from_mem(self):
         result = self.exec_naked("REDISQL.QUERY_STATEMENT", "DB2", "select1")
         self.assertEquals(result, [[1L]])
 
+class TestCopySyncronous(TestRediSQLWithExec):
+    def test_copy_now_mem_from_mem(self):
+        done = self.exec_naked("REDISQL.CREATE_DB", "DB1")
+        self.assertEquals(done, "OK")
+        done = self.exec_naked("REDISQL.CREATE_DB", "DB2")
+        self.assertEquals(done, "OK")
+        done = self.exec_naked("REDISQL.EXEC", "DB1", "CREATE TABLE foo(a INT);")
+        self.assertEquals(done, ["DONE", 0L])
+
+        for i in xrange(10):
+            done = self.exec_naked("REDISQL.EXEC", "DB1", "INSERT INTO foo VALUES({})".format(i))
+            self.assertEquals(done, ["DONE", 1L])
+
+        done = self.exec_naked("REDISQL.COPY.NOW", "DB1", "DB2")
+        result = self.exec_naked("REDISQL.QUERY", "DB2", "SELECT a FROM foo ORDER BY a")
+        self.assertEquals(result, [[0L], [1L], [2L], [3L], [4L], [5L], [6L], [7L], [8L], [9L]])
+
+    def test_statements_copy_now_mem_from_mem(self):
+        done = self.exec_naked("REDISQL.CREATE_DB", "DB1")
+        self.assertEquals(done, "OK")
+        done = self.exec_naked("REDISQL.CREATE_DB", "DB2")
+        self.assertEquals(done, "OK")
+        done = self.exec_naked("REDISQL.CREATE_STATEMENT", "DB1", "select1", "SELECT 1;")
+        self.assertEquals(done, "OK")
+
+        done = self.exec_naked("REDISQL.COPY.NOW", "DB1", "DB2")
+        result = self.exec_naked("REDISQL.QUERY_STATEMENT", "DB2", "select1")
+        self.assertEquals(result, [[1L]])
+
 
 if __name__ == '__main__':
    unittest.main()