Merge pull request concurrencykit#68 from grooverdan/0.5_pkg_luapkgda…

…tadir for lua files

sysbench/scripting/Makefile.am

@@ -18,7 +18,7 @@
 if USE_LUA
 SUBDIRS = lua .
 lua_sources = script_lua.c script_lua.h
-AM_CPPFLAGS += -I$(srcdir)/lua/src
+AM_CPPFLAGS += -I$(srcdir)/lua/src -DDATA_PATH=\"$(pkgdatadir)\"
 endif
 
 noinst_LIBRARIES = libsbscript.a

sysbench/scripting/script_lua.c

@@ -29,6 +29,8 @@
 
 #include "db_driver.h"
 
+#include <stdlib.h>
+
 #define EVENT_FUNC "event"
 #define PREPARE_FUNC "prepare"
 #define CLEANUP_FUNC "cleanup"
@@ -169,6 +171,8 @@ int script_load_lua(const char *testname, sb_test_t *test)
 {
   unsigned int i;
 
+  setenv("LUA_PATH", DATA_PATH LUA_DIRSEP "?.lua", 0);
+
   /* Initialize global interpreter state */
   gstate = sb_lua_new_state(testname, -1);
   if (gstate == NULL)
@@ -488,8 +492,27 @@ lua_State *sb_lua_new_state(const char *scriptname, int thread_id)
   luaL_newmetatable(state, "sysbench.stmt");
 
   luaL_newmetatable(state, "sysbench.rs");
-
-  if (luaL_loadfile(state, scriptname) || lua_pcall(state, 0, 0, 0))
+
+  if (luaL_loadfile(state, scriptname))
+  {
+    /* first location failed - look in DATA_PATH */
+    char p[PATH_MAX + 1];
+    strncpy(p, DATA_PATH LUA_DIRSEP, sizeof(p));
+    strncat(p, scriptname, sizeof(p));
+    if (!strrchr(scriptname, '.'))
+    {
+      /* add .lua extension if there isn't one */
+      strncat(p, ".lua", sizeof(p));
+    }
+
+    if (luaL_loadfile(state, p))
+    {
+      lua_error(state);
+      return NULL;
+    }
+  }
+
+  if (lua_pcall(state, 0, 0, 0))
   {
     lua_error(state);
     return NULL;

sysbench/tests/db/Makefile.am

@@ -15,7 +15,8 @@
 # along with this program; if not, write to the Free Software
 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
 
-EXTRA_DIST = delete.lua insert.lua oltp.lua \
+dist_pkgdata_DATA = common.lua delete.lua insert.lua bulk_insert.lua \
+             oltp.lua \
              oltp_simple.lua \
              parallel_prepare.lua \
              select_random_points.lua \

sysbench/tests/db/delete.lua

@@ -1,6 +1,10 @@
-pathtest = string.match(test, "(.*/)") or ""
+pathtest = string.match(test, "(.*/)")
 
-dofile(pathtest .. "common.lua")
+if pathtest then
+   dofile(pathtest .. "common.lua")
+else
+   require("common")
+end
 
 function thread_init(thread_id)
    set_vars()

sysbench/tests/db/insert.lua

@@ -1,6 +1,10 @@
-pathtest = string.match(test, "(.*/)") or ""
+pathtest = string.match(test, "(.*/)")
 
-dofile(pathtest .. "common.lua")
+if pathtest then
+   dofile(pathtest .. "common.lua")
+else
+   require("common")
+end
 
 function thread_init(thread_id)
    set_vars()

sysbench/tests/db/oltp.lua

@@ -1,6 +1,10 @@
-pathtest = string.match(test, "(.*/)") or ""
+pathtest = string.match(test, "(.*/)")
 
-dofile(pathtest .. "common.lua")
+if pathtest then
+   dofile(pathtest .. "common.lua")
+else
+   require("common")
+end
 
 function thread_init(thread_id)
    set_vars()

sysbench/tests/db/oltp_simple.lua

@@ -1,6 +1,10 @@
-pathtest = string.match(test, "(.*/)") or ""
+pathtest = string.match(test, "(.*/)")
 
-dofile(pathtest .. "common.lua")
+if pathtest then
+   dofile(pathtest .. "common.lua")
+else
+   require("common")
+end
 
 function thread_init(thread_id)
    set_vars()

sysbench/tests/db/parallel_prepare.lua

@@ -1,8 +1,12 @@
 -- for proper initialization use --max-requests = N, where N is --num-threads
 --
-pathtest = string.match(test, "(.*/)") or ""
+pathtest = string.match(test, "(.*/)")
 
-dofile(pathtest .. "common.lua")
+if pathtest then
+   dofile(pathtest .. "common.lua")
+else
+   require("common")
+end
 
 function thread_init(thread_id)
    set_vars()

sysbench/tests/db/select.lua

@@ -1,6 +1,10 @@
-pathtest = string.match(test, "(.*/)") or ""
+pathtest = string.match(test, "(.*/)")
 
-dofile(pathtest .. "common.lua")
+if pathtest then
+   dofile(pathtest .. "common.lua")
+else
+   require("common")
+end
 
 function thread_init(thread_id)
    set_vars()

sysbench/tests/db/update_index.lua

@@ -1,6 +1,10 @@
-pathtest = string.match(test, "(.*/)") or ""
+pathtest = string.match(test, "(.*/)")
 
-dofile(pathtest .. "common.lua")
+if pathtest then
+   dofile(pathtest .. "common.lua")
+else
+   require("common")
+end
 
 function thread_init(thread_id)
    set_vars()

sysbench/tests/db/update_non_index.lua

@@ -1,6 +1,10 @@
-pathtest = string.match(test, "(.*/)") or ""
+pathtest = string.match(test, "(.*/)")
 
-dofile(pathtest .. "common.lua")
+if pathtest then
+   dofile(pathtest .. "common.lua")
+else
+   require("common")
+end
 
 function thread_init(thread_id)
    set_vars()