Merge branch 'master' of https://github.com/darkwrat/tarantool-mysql into pushnull

Author: darkwrat

CMakeLists.txt

@@ -8,11 +8,12 @@ if(NOT CMAKE_BUILD_TYPE)
 endif()
 
 # Fetch and patch mariadb-connector-c submodule
-execute_process(COMMAND git submodule update --init --recursive)
+execute_process(COMMAND git submodule update --init --recursive
+    WORKING_DIRECTORY "${CMAKE_SOURCE_DIR}")
 ExternalProject_Add(mariadb-connector-c
     SOURCE_DIR "${CMAKE_SOURCE_DIR}/mariadb-connector-c"
-    CMAKE_ARGS -DCMAKE_BUILD_TYPE=${CMAKE_BUILD_TYPE}
-        -DCMAKE_INSTALL_PREFIX=${CMAKE_BINARY_DIR}/lib)
+    CMAKE_ARGS -DCMAKE_BUILD_TYPE=${CMAKE_BUILD_TYPE} -DCMAKE_C_FLAGS=-fPIC
+        -DCMAKE_CXX_FLAGS=-fPIC -DCMAKE_INSTALL_PREFIX=${CMAKE_BINARY_DIR}/lib)
 
 include_directories("${CMAKE_BINARY_DIR}/lib/include/mariadb")
 link_directories(${MYSQL_LIBRARY_DIRS})

mysql/driver.c

@@ -107,7 +107,7 @@ lua_mysql_push_error(struct lua_State *L, MYSQL *conn)
 		lua_pushnumber(L, -1);
 		break;
 	default:
-		lua_pushnumber(L, 0);
+		lua_pushnumber(L, 1);
 	}
 	safe_pushstring(L, (char *)mysql_error(conn));
 	return 2;
@@ -219,7 +219,7 @@ lua_mysql_execute(struct lua_State *L)
 	if (err)
 		return lua_mysql_push_error(L, conn);
 
-	lua_pushnumber(L, 1);
+	lua_pushnumber(L, 0);
 	int ret_count = 2;
 	int result_no = 0;
 
@@ -309,8 +309,8 @@ lua_mysql_execute_prepared(struct lua_State *L)
 	 * string from lua */
 	uint64_t *values = NULL;
 
-	/* We hope that all should be fine and push 1 (OK) */
-	lua_pushnumber(L, 1);
+	/* We hope that all should be fine and push 0 (OK) */
+	lua_pushnumber(L, 0);
 	ret_count = 1;
 	stmt = mysql_stmt_init(conn);
 	if ((error = !stmt))
@@ -389,7 +389,6 @@ lua_mysql_execute_prepared(struct lua_State *L)
 		result_binds[col_no].is_null = (my_bool *)malloc(sizeof(my_bool));
 	}
 	mysql_stmt_bind_result(stmt, result_binds);
-
 	lua_newtable(L);
 	unsigned int row_idx = 1;
 	while (true) {
@@ -413,7 +412,7 @@ lua_mysql_execute_prepared(struct lua_State *L)
 		lua_settable(L, -3);
 		++row_idx;
 	}
-	lua_settable(L, - 3);
+	lua_settable(L, -3);
 	ret_count = 2;
 
 done:
@@ -571,7 +570,7 @@ lua_mysql_connect(struct lua_State *L)
 		return fail ? lua_error(L) : 2;
 	}
 
-	lua_pushinteger(L, 1);
+	lua_pushnumber(L, 0);
 	MYSQL **conn_p = (MYSQL **)lua_newuserdata(L, sizeof(MYSQL *));
 	*conn_p = conn;
 	luaL_getmetatable(L, mysql_driver_label);

mysql/init.lua

@@ -7,33 +7,15 @@ local ffi = require('ffi')
 local pool_mt
 local conn_mt
 
--- pool error helper
-local function get_error(raise, msg)
-    if raise then
-        error(msg)
-    end
-    return nil, msg
-end
-
 --create a new connection
-local function conn_create(mysql_conn, pool)
+local function conn_create(mysql_conn)
     local queue = fiber.channel(1)
     queue:put(true)
     local conn = setmetatable({
         usable = true,
-        pool = pool,
         conn = mysql_conn,
         queue = queue,
-        -- we can use ffi gc to return mysql connection to pool
-        __gc_hook = ffi.gc(ffi.new('void *'),
-            function(self)
-                mysql_conn:close()
-                if not pool.virtual then
-                    pool.queue:put(nil)
-                end
-            end)
-    }, conn_mt)
-
+   }, conn_mt)
     return conn
 end
 
@@ -45,14 +27,18 @@ local function conn_get(pool)
     if mysql_conn == nil then
         status, mysql_conn = driver.connect(pool.host, pool.port or 0,
                                             pool.user, pool.pass, pool.db)
-        if status == -1 then
-            return get_error(pool.raise, mysql_conn)
-        end
-        if status == -2 then
-            return status
+        if status < 0 then
+            return error(mysql_conn)
         end
     end
-    return conn_create(mysql_conn, pool)
+    local conn = conn_create(mysql_conn)
+    -- we can use ffi gc to return mysql connection to pool
+    conn.__gc_hook = ffi.gc(ffi.new('void *'),
+            function(self)
+                mysql_conn:close()
+                pool.queue:put(nil)
+            end)
+    return conn
 end
 
 local function conn_put(conn)
@@ -70,21 +56,21 @@ conn_mt = {
     __index = {
         execute = function(self, sql, ...)
             if not self.usable then
-                return get_error(self.pool.raise, 'Connection is not usable')
+                return error('Connection is not usable')
             end
             if not self.queue:get() then
                 self.queue:put(false)
-                return get_error(self.pool.raise, 'Connection is broken')
+                return error('Connection is broken')
             end
             local status, datas
             if select('#', ...) > 0 then
                 status, datas = self.conn:execute_prepared(sql, ...)
             else
                 status, datas = self.conn:execute(sql)
             end
-            if status ~= 1 then
-                self.queue:put(status == 0)
-                return get_error(self.pool.raise, datas)
+            if status ~= 0 then
+                self.queue:put(status > 0)
+                return error(datas)
             end
             self.queue:put(true)
             return datas, true
@@ -99,19 +85,16 @@ conn_mt = {
             return self:execute('ROLLBACK') ~= nil
         end,
         ping = function(self)
-            local pool = self.pool
-            self.pool = {raise = false}
-            local data, msg = self:execute('SELECT 1 AS code')
-            self.pool = pool
+            local status, data, msg = pcall(self.execute, self, 'SELECT 1 AS code')
             return msg and data[1][1].code == 1
         end,
         close = function(self)
             if not self.usable then
-                return get_error(self.pool.raise, 'Connection is not usable')
+                return error('Connection is not usable')
             end
             if not self.queue:get() then
                 self.queue:put(false)
-                return get_error(self.pool.raise, 'Connection is broken')
+                return error('Connection is broken')
             end
             self.usable = false
             self.conn:close()
@@ -120,22 +103,22 @@ conn_mt = {
         end,
         reset = function(self, user, pass, db)
             if not self.usable then
-                return get_error(self.pool.raise, 'Connection is not usable')
+                return error('Connection is not usable')
             end
             if not self.queue:get() then
                 self.queue:put(false)
-                return get_error(self.pool.raise, 'Connection is broken')
+                return error('Connection is broken')
             end
             self.conn:reset(user, pass, db)
             self.queue:put(true)
         end,
 	quote = function(self, value)
             if not self.usable then
-                return get_error(self.pool.raise, 'Connection is not usable')
+                return error('Connection is not usable')
             end
             if not self.queue:get() then
                 self.queue:put(false)
-                return get_error(self.pool.raise, 'Connection is broken')
+                return error('Connection is broken')
             end
             local ret = self.conn:quote(value)
             self.queue:put(true)
@@ -145,7 +128,7 @@ conn_mt = {
 }
 
 -- Create connection pool. Accepts mysql connection params (host, port, user,
--- password, dbname), size and raise flag.
+-- password, dbname), size.
 local function pool_create(opts)
     opts = opts or {}
     opts.size = opts.size or 1
@@ -158,10 +141,8 @@ local function pool_create(opts)
                 local mysql_conn = queue:get()
                 mysql_conn:close()
             end
-            if status == -1 then
-                return get_error(opts.raise, conn)
-            else
-                return -2
+            if status < 0 then
+                return error(conn)
             end
         end
         queue:put(conn)
@@ -178,7 +159,6 @@ local function pool_create(opts)
 
         -- private variables
         queue       = queue,
-        raise       = opts.raise,
         usable      = true
     }, pool_mt)
 end
@@ -198,7 +178,7 @@ end
 -- Returns connection
 local function pool_get(self)
     if not self.usable then
-        return get_error(self.raise, 'Pool is not usable')
+        return error('Pool is not usable')
     end
     local conn = conn_get(self)
     conn:reset(self.user, self.pass, self.db)
@@ -223,19 +203,15 @@ pool_mt = {
 }
 
 -- Create connection. Accepts mysql connection params (host, port, user,
--- password, dbname) separatelly or in one string and raise flag.
+-- password, dbname)
 local function connect(opts)
     opts = opts or {}
-    local pool = {virtual = true, raise = opts.raise}
 
     local status, mysql_conn = driver.connect(opts.host, opts.port or 0, opts.user, opts.password, opts.db)
-    if status == -1 then
-        return get_error(pool.raise, mysql_conn)
-    end
-    if status == -2 then
-        return -2
+    if status < 0 then
+        return error(mysql_conn)
     end
-    return conn_create(mysql_conn, pool)
+    return conn_create(mysql_conn)
 end
 
 return {

test/mysql.test.lua

@@ -12,11 +12,11 @@ local host, port, user, password, db = string.match(os.getenv('MYSQL') or '',
     "([^:]*):([^:]*):([^:]*):([^:]*):([^:]*)")
 
 local conn, err = mysql.connect({ host = host, port = port, user = user,
-    password = password, db = db, raise = false })
+    password = password, db = db })
 if conn == nil then error(err) end
 
 local p, err = mysql.pool_create({ host = host, port = port, user = user,
-    password = password, db = db, raise = false, size = 2 })
+    password = password, db = db, size = 2 })
 
 function test_old_api(t, conn)
     t:plan(16)
@@ -63,7 +63,7 @@ function test_old_api(t, conn)
     end)
 
     t:q('DROP TABLE IF EXISTS unknown_table', nil)
-    local tuples, reason = conn:execute('DROP TABLE unknown_table')
+    local status, reason = pcall(conn.execute, conn, 'DROP TABLE unknown_table')
     t:like(reason, 'unknown_table', 'error')
     t:ok(conn:close(), "close")
 end