Hello community, here is the log from the commit of package sysbench for openSUSE:Factory checked in at 2017-11-09 14:06:38 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/sysbench (Old) and /work/SRC/openSUSE:Factory/.sysbench.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "sysbench" Thu Nov 9 14:06:38 2017 rev:16 rq:539999 version:1.0.10 Changes: -------- --- /work/SRC/openSUSE:Factory/sysbench/sysbench.changes 2017-09-12 19:57:52.226192364 +0200 +++ /work/SRC/openSUSE:Factory/.sysbench.new/sysbench.changes 2017-11-09 14:06:45.139538940 +0100 @@ -1,0 +2,17 @@ +Wed Nov 8 13:57:06 UTC 2017 - [email protected] + +- Update to version 1.0.10: + * fixed PK conflicts in oltp_insert.lua by creating empty tables + on 'prepare' + * made sysbench.opt available to init()/done() by exporting it + to the global Lua state + * added Fedora 26 (both x86_64 and AArch64) to the list of + supported and tested distributions + * fixed GH-172: sysbench 1.0.9 doesn't build with mariadb 10.2.8 + * add the /usr/local LuaRocks root directory to default LUA_PATH + and LUA_CPATH + * removed Fedora 24, Ubuntu Precise, Yakkety from default build + matrices + * added Ubuntu Artful to default build matrices + +------------------------------------------------------------------- Old: ---- sysbench-1.0.9.tar.gz New: ---- sysbench-1.0.10.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ sysbench.spec ++++++ --- /var/tmp/diff_new_pack.q0FOBb/_old 2017-11-09 14:06:45.811514452 +0100 +++ /var/tmp/diff_new_pack.q0FOBb/_new 2017-11-09 14:06:45.815514307 +0100 @@ -17,7 +17,7 @@ Name: sysbench -Version: 1.0.9 +Version: 1.0.10 Release: 0 Summary: A MySQL benchmarking tool License: GPL-2.0 ++++++ sysbench-1.0.9.tar.gz -> sysbench-1.0.10.tar.gz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/sysbench-1.0.9/.travis.yml new/sysbench-1.0.10/.travis.yml --- old/sysbench-1.0.9/.travis.yml 2017-09-05 19:26:28.000000000 +0200 +++ new/sysbench-1.0.10/.travis.yml 2017-10-26 15:34:28.000000000 +0200 @@ -30,20 +30,18 @@ - TARGET=coverage - OS=el DIST=6 - OS=el DIST=7 - - OS=fedora DIST=24 - OS=fedora DIST=25 - - OS=ubuntu DIST=precise + - OS=fedora DIST=26 - OS=ubuntu DIST=trusty - OS=ubuntu DIST=xenial - - OS=ubuntu DIST=yakkety - OS=ubuntu DIST=zesty + - OS=ubuntu DIST=artful - OS=debian DIST=wheezy - OS=debian DIST=jessie - - OS=ubuntu DIST=precise ARCH=i386 - OS=ubuntu DIST=trusty ARCH=i386 - OS=ubuntu DIST=xenial ARCH=i386 - - OS=ubuntu DIST=yakkety ARCH=i386 - OS=ubuntu DIST=zesty ARCH=i386 + - OS=ubuntu DIST=artful ARCH=i386 - OS=debian DIST=wheezy ARCH=i386 - OS=debian DIST=jessie ARCH=i386 @@ -53,36 +51,32 @@ compiler: clang - env: OS=el DIST=7 compiler: clang - - env: OS=fedora DIST=24 - compiler: clang - env: OS=fedora DIST=25 compiler: clang - - env: OS=ubuntu DIST=precise + - env: OS=fedora DIST=26 compiler: clang - env: OS=ubuntu DIST=trusty compiler: clang - env: OS=ubuntu DIST=xenial compiler: clang - - env: OS=ubuntu DIST=yakkety - compiler: clang - env: OS=ubuntu DIST=zesty compiler: clang + - env: OS=ubuntu DIST=artful + compiler: clang - env: OS=debian DIST=wheezy compiler: clang - env: OS=debian DIST=jessie compiler: clang - env: OS=debian DIST=stretch compiler: clang - - env: OS=ubuntu DIST=precise ARCH=i386 - compiler: clang - env: OS=ubuntu DIST=trusty ARCH=i386 compiler: clang - env: OS=ubuntu DIST=xenial ARCH=i386 compiler: clang - - env: OS=ubuntu DIST=yakkety ARCH=i386 - compiler: clang - env: OS=ubuntu DIST=zesty ARCH=i386 compiler: clang + - env: OS=ubuntu DIST=artful ARCH=i386 + compiler: clang - env: OS=debian DIST=wheezy ARCH=i386 compiler: clang - env: OS=debian DIST=jessie ARCH=i386 @@ -93,20 +87,18 @@ os: osx - env: OS=el DIST=7 os: osx - - env: OS=fedora DIST=24 - os: osx - env: OS=fedora DIST=25 os: osx - - env: OS=ubuntu DIST=precise + - env: OS=fedora DIST=26 os: osx - env: OS=ubuntu DIST=trusty os: osx - env: OS=ubuntu DIST=xenial os: osx - - env: OS=ubuntu DIST=yakkety - os: osx - env: OS=ubuntu DIST=zesty os: osx + - env: OS=ubuntu DIST=artful + os: osx - env: OS=debian DIST=wheezy os: osx - env: OS=debian DIST=jessie @@ -148,6 +140,10 @@ if [ "x$TARGET" = "xtest" ]; then case "${TRAVIS_OS_NAME:-linux}" in osx) + # Workaround for https://github.com/Homebrew/brew/issues/3299 + # Should not be necessary after Nov 17 2017 + brew update + brew install mysql # OS X requires servers to be started explicitly diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/sysbench-1.0.9/ChangeLog new/sysbench-1.0.10/ChangeLog --- old/sysbench-1.0.9/ChangeLog 2017-09-05 19:26:28.000000000 +0200 +++ new/sysbench-1.0.10/ChangeLog 2017-10-26 15:34:28.000000000 +0200 @@ -1,3 +1,19 @@ +2017-10-25 Alexey Kopytov <[email protected]> + + * version 1.0.10 + * fixed PK conflicts in oltp_insert.lua by creating empty tables + on 'prepare' + * made sysbench.opt available to init()/done() by exporting it + to the global Lua state + * added Fedora 26 (both x86_64 and AArch64) to the list of + supported and tested distributions + * fixed GH-172: sysbench 1.0.9 doesn't build with mariadb 10.2.8 + * add the /usr/local LuaRocks root directory to default LUA_PATH + and LUA_CPATH + * removed Fedora 24, Ubuntu Precise, Yakkety from default build + matrices + * added Ubuntu Artful to default build matrices + 2017-09-05 Alexey Kopytov <[email protected]> * version 1.0.9 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/sysbench-1.0.9/configure.ac new/sysbench-1.0.10/configure.ac --- old/sysbench-1.0.9/configure.ac 2017-09-05 19:26:28.000000000 +0200 +++ new/sysbench-1.0.10/configure.ac 2017-10-26 15:34:28.000000000 +0200 @@ -1,7 +1,7 @@ # Process this file with autoconf to produce a configure script. AC_PREREQ(2.63) -AC_INIT([sysbench],[1.0.9],[https://github.com/akopytov/sysbench/issues], +AC_INIT([sysbench],[1.0.10],[https://github.com/akopytov/sysbench/issues], [sysbench], [https://github.com/akopytov/sysbench]) AC_CONFIG_AUX_DIR([config]) # Setting CFLAGS here prevents AC_CANONICAL_TARGET from injecting them @@ -218,16 +218,7 @@ AC_CHECK_LIB(m, sqrt) -AS_IF([test "x$with_mysql" != xno], [ - AC_CHECK_MYSQLR([$with_mysql]) - AC_DEFINE([USE_MYSQL], 1, - [Define to 1 if you want to compile with MySQL support]) - USE_MYSQL=1 - AC_SUBST([MYSQL_LIBS]) - AC_SUBST([MYSQL_CFLAGS]) -]) -AM_CONDITIONAL([USE_MYSQL], test x$with_mysql != xno) -AC_SUBST([USE_MYSQL]) +SB_CHECK_MYSQL AS_IF([test "x$with_drizzle" != xno], [ AC_LIB_HAVE_LINKFLAGS(drizzle,, diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/sysbench-1.0.9/m4/ac_check_mysqlr.m4 new/sysbench-1.0.10/m4/ac_check_mysqlr.m4 --- old/sysbench-1.0.9/m4/ac_check_mysqlr.m4 2017-09-05 19:26:28.000000000 +0200 +++ new/sysbench-1.0.10/m4/ac_check_mysqlr.m4 1970-01-01 01:00:00.000000000 +0100 @@ -1,107 +0,0 @@ -dnl --------------------------------------------------------------------------- -dnl Macro: AC_CHECK_MYSQLR -dnl First check if the MySQL root directory is specified with --with-mysql. -dnl Otherwise check for custom MySQL paths in --with-mysql-includes and -dnl --with-mysql-libs. If some paths are not specified explicitly, try to get -dnl them from mysql_config. -dnl --------------------------------------------------------------------------- - -AC_DEFUN([AC_CHECK_MYSQLR],[ -# Check for custom MySQL root directory -if test [ x$1 != xyes -a x$1 != xno ] -then - ac_cv_mysql_root=`echo $1 | sed -e 's+/$++'` - if test [ -d "$ac_cv_mysql_root/include" -a \ - -d "$ac_cv_mysql_root/libmysql_r" ] - then - ac_cv_mysql_includes="$ac_cv_mysql_root/include" - ac_cv_mysql_libs="$ac_cv_mysql_root/libmysql_r" - elif test [ -x "$ac_cv_mysql_root/bin/mysql_config" ] - then - mysqlconfig="$ac_cv_mysql_root/bin/mysql_config" - else - AC_MSG_ERROR([invalid MySQL root directory: $ac_cv_mysql_root]) - fi -fi - -# Check for custom includes path -if test [ -z "$ac_cv_mysql_includes" ] -then - AC_ARG_WITH([mysql-includes], - AC_HELP_STRING([--with-mysql-includes], [path to MySQL header files]), - [ac_cv_mysql_includes=$withval]) -fi -if test [ -n "$ac_cv_mysql_includes" ] -then - AC_CACHE_CHECK([MySQL includes], [ac_cv_mysql_includes], [ac_cv_mysql_includes=""]) - MYSQL_CFLAGS="-I$ac_cv_mysql_includes" -fi - -# Check for custom library path - -if test [ -z "$ac_cv_mysql_libs" ] -then - AC_ARG_WITH([mysql-libs], - AC_HELP_STRING([--with-mysql-libs], [path to MySQL libraries]), - [ac_cv_mysql_libs=$withval]) -fi -if test [ -n "$ac_cv_mysql_libs" ] -then - # Trim trailing '.libs' if user passed it in --with-mysql-libs option - ac_cv_mysql_libs=`echo ${ac_cv_mysql_libs} | sed -e 's/.libs$//' \ - -e 's+.libs/$++'` - AC_CACHE_CHECK([MySQL libraries], [ac_cv_mysql_libs], [ac_cv_mysql_libs=""]) - save_LDFLAGS="$LDFLAGS" - save_LIBS="$LIBS" - LDFLAGS="-L$ac_cv_mysql_libs" - LIBS="" - - # libmysqlclient_r has been removed in MySQL 5.7 - AC_SEARCH_LIBS([mysql_real_connect], - [mysqlclient_r mysqlclient], - [], - AC_MSG_ERROR([cannot find MySQL client libraries in $ac_cv_mysql_libs])) - - MYSQL_LIBS="$LDFLAGS $LIBS" - LIBS="$save_LIBS" - LDFLAGS="$save_LDFLAGS" -fi - -# If some path is missing, try to autodetermine with mysql_config -if test [ -z "$ac_cv_mysql_includes" -o -z "$ac_cv_mysql_libs" ] -then - if test [ -z "$mysqlconfig" ] - then - AC_PATH_PROG(mysqlconfig,mysql_config) - fi - if test [ -z "$mysqlconfig" ] - then - AC_MSG_ERROR([mysql_config executable not found -******************************************************************************** -ERROR: cannot find MySQL libraries. If you want to compile with MySQL support, - please install the package containing MySQL client libraries and headers. - On Debian-based systems the package name is libmysqlclient-dev. - On RedHat-based systems, it is mysql-devel. - If you have those libraries installed in non-standard locations, - you must either specify file locations explicitly using - --with-mysql-includes and --with-mysql-libs options, or make sure path to - mysql_config is listed in your PATH environment variable. If you want to - disable MySQL support, use --without-mysql option. -******************************************************************************** -]) - else - if test [ -z "$ac_cv_mysql_includes" ] - then - AC_MSG_CHECKING(MySQL C flags) - MYSQL_CFLAGS=`${mysqlconfig} --cflags` - AC_MSG_RESULT($MYSQL_CFLAGS) - fi - if test [ -z "$ac_cv_mysql_libs" ] - then - AC_MSG_CHECKING(MySQL linker flags) - MYSQL_LIBS=`${mysqlconfig} --libs_r` - AC_MSG_RESULT($MYSQL_LIBS) - fi - fi -fi -]) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/sysbench-1.0.9/m4/sb_check_mysql.m4 new/sysbench-1.0.10/m4/sb_check_mysql.m4 --- old/sysbench-1.0.9/m4/sb_check_mysql.m4 1970-01-01 01:00:00.000000000 +0100 +++ new/sysbench-1.0.10/m4/sb_check_mysql.m4 2017-10-26 15:34:28.000000000 +0200 @@ -0,0 +1,121 @@ +dnl --------------------------------------------------------------------------- +dnl Macro: SB_CHECK_MYSQL +dnl First check if the MySQL root directory is specified with --with-mysql. +dnl Otherwise check for custom MySQL paths in --with-mysql-includes and +dnl --with-mysql-libs. If some paths are not specified explicitly, try to get +dnl them from mysql_config. +dnl --------------------------------------------------------------------------- + +AC_DEFUN([SB_CHECK_MYSQL],[ + +AS_IF([test "x$with_mysql" != xno], [ + +# Check for custom MySQL root directory +if test [ "x$with_mysql" != xyes -a "x$with_mysql" != xno ] +then + ac_cv_mysql_root=`echo "$with_mysql" | sed -e 's+/$++'` + if test [ -d "$ac_cv_mysql_root/include" -a \ + -d "$ac_cv_mysql_root/libmysql_r" ] + then + ac_cv_mysql_includes="$ac_cv_mysql_root/include" + ac_cv_mysql_libs="$ac_cv_mysql_root/libmysql_r" + elif test [ -x "$ac_cv_mysql_root/bin/mysql_config" ] + then + mysqlconfig="$ac_cv_mysql_root/bin/mysql_config" + else + AC_MSG_ERROR([invalid MySQL root directory: $ac_cv_mysql_root]) + fi +fi + +# Check for custom includes path +if test [ -z "$ac_cv_mysql_includes" ] +then + AC_ARG_WITH([mysql-includes], + AC_HELP_STRING([--with-mysql-includes], [path to MySQL header files]), + [ac_cv_mysql_includes=$withval]) +fi +if test [ -n "$ac_cv_mysql_includes" ] +then + AC_CACHE_CHECK([MySQL includes], [ac_cv_mysql_includes], [ac_cv_mysql_includes=""]) + MYSQL_CFLAGS="-I$ac_cv_mysql_includes" +fi + +# Check for custom library path + +if test [ -z "$ac_cv_mysql_libs" ] +then + AC_ARG_WITH([mysql-libs], + AC_HELP_STRING([--with-mysql-libs], [path to MySQL libraries]), + [ac_cv_mysql_libs=$withval]) +fi +if test [ -n "$ac_cv_mysql_libs" ] +then + # Trim trailing '.libs' if user passed it in --with-mysql-libs option + ac_cv_mysql_libs=`echo ${ac_cv_mysql_libs} | sed -e 's/.libs$//' \ + -e 's+.libs/$++'` + AC_CACHE_CHECK([MySQL libraries], [ac_cv_mysql_libs], [ac_cv_mysql_libs=""]) + save_LDFLAGS="$LDFLAGS" + save_LIBS="$LIBS" + LDFLAGS="-L$ac_cv_mysql_libs" + LIBS="" + + # libmysqlclient_r has been removed in MySQL 5.7 + AC_SEARCH_LIBS([mysql_real_connect], + [mysqlclient_r mysqlclient], + [], + AC_MSG_ERROR([cannot find MySQL client libraries in $ac_cv_mysql_libs])) + + MYSQL_LIBS="$LDFLAGS $LIBS" + LIBS="$save_LIBS" + LDFLAGS="$save_LDFLAGS" +fi + +# If some path is missing, try to autodetermine with mysql_config +if test [ -z "$ac_cv_mysql_includes" -o -z "$ac_cv_mysql_libs" ] +then + if test [ -z "$mysqlconfig" ] + then + AC_PATH_PROG(mysqlconfig,mysql_config) + fi + if test [ -z "$mysqlconfig" ] + then + AC_MSG_ERROR([mysql_config executable not found +******************************************************************************** +ERROR: cannot find MySQL libraries. If you want to compile with MySQL support, + please install the package containing MySQL client libraries and headers. + On Debian-based systems the package name is libmysqlclient-dev. + On RedHat-based systems, it is mysql-devel. + If you have those libraries installed in non-standard locations, + you must either specify file locations explicitly using + --with-mysql-includes and --with-mysql-libs options, or make sure path to + mysql_config is listed in your PATH environment variable. If you want to + disable MySQL support, use --without-mysql option. +******************************************************************************** +]) + else + if test [ -z "$ac_cv_mysql_includes" ] + then + AC_MSG_CHECKING(MySQL C flags) + MYSQL_CFLAGS=`${mysqlconfig} --cflags` + AC_MSG_RESULT($MYSQL_CFLAGS) + fi + if test [ -z "$ac_cv_mysql_libs" ] + then + AC_MSG_CHECKING(MySQL linker flags) + MYSQL_LIBS=`${mysqlconfig} --libs_r` + AC_MSG_RESULT($MYSQL_LIBS) + fi + fi +fi + +AC_DEFINE([USE_MYSQL], 1, + [Define to 1 if you want to compile with MySQL support]) + +USE_MYSQL=1 +AC_SUBST([MYSQL_LIBS]) +AC_SUBST([MYSQL_CFLAGS]) +]) + +AM_CONDITIONAL([USE_MYSQL], test "x$with_mysql" != xno) +AC_SUBST([USE_MYSQL]) +]) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/sysbench-1.0.9/scripts/buildpack.sh new/sysbench-1.0.10/scripts/buildpack.sh --- old/sysbench-1.0.9/scripts/buildpack.sh 2017-09-05 19:26:28.000000000 +0200 +++ new/sysbench-1.0.10/scripts/buildpack.sh 2017-10-26 15:34:28.000000000 +0200 @@ -43,39 +43,36 @@ PACKAGECLOUD_USER=${PACKAGECLOUD_USER:-"akopytov"} PACKAGECLOUD_EXTRA_ARGS=${PACKAGECLOUD_EXTRA_ARGS:-} -PACKPACK_REPO=${PACKPACK_REPO:-packpack/packpack} +PACKPACK_REPO=${PACKPACK_REPO:-akopytov/packpack} distros_x86_64=( "el 6 x86_64" "el 7 x86_64" - "fedora 24 x86_64" "fedora 25 x86_64" - "ubuntu precise x86_64" + "fedora 26 x86_64" "ubuntu trusty x86_64" "ubuntu xenial x86_64" - "ubuntu yakkety x86_64" "ubuntu zesty x86_64" + "ubuntu artful x86_64" "debian wheezy x86_64" "debian jessie x86_64" ) distros_i386=( - "ubuntu precise i386" "ubuntu trusty i386" "ubuntu xenial i386" - "ubuntu yakkety i386" "ubuntu zesty i386" + "ubuntu artful i386" "debian wheezy i386" "debian jessie i386" ) distros_aarch64=( "el 7 aarch64" - "fedora 24 aarch64" "fedora 25 aarch64" + "fedora 26 aarch64" "ubuntu trusty aarch64" "ubuntu xenial aarch64" - "ubuntu yakkety aarch64" "debian jessie aarch64" ) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/sysbench-1.0.9/src/drivers/mysql/drv_mysql.c new/sysbench-1.0.10/src/drivers/mysql/drv_mysql.c --- old/sysbench-1.0.9/src/drivers/mysql/drv_mysql.c 2017-09-05 19:26:28.000000000 +0200 +++ new/sysbench-1.0.10/src/drivers/mysql/drv_mysql.c 2017-10-26 15:34:28.000000000 +0200 @@ -35,7 +35,6 @@ #include <stdio.h> #include <mysql.h> -#include <mysql_version.h> #include <mysqld_error.h> #include <errmsg.h> @@ -50,8 +49,8 @@ #define SAFESTR(s) ((s != NULL) ? (s) : "(null)") -#if !defined(MARIADB_BASE_VERSION) && MYSQL_VERSION_ID >= 80001 && \ - MYSQL_VERSION_ID != 80002 /* see https://bugs.mysql.com/?id=87337 */ +#if !defined(MARIADB_BASE_VERSION) && !defined(MARIADB_VERSION_ID) && \ + MYSQL_VERSION_ID >= 80001 && MYSQL_VERSION_ID != 80002 /* see https://bugs.mysql.com/?id=87337 */ typedef bool my_bool; #endif diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/sysbench-1.0.9/src/lua/oltp_common.lua new/sysbench-1.0.10/src/lua/oltp_common.lua --- old/sysbench-1.0.9/src/lua/oltp_common.lua 2017-09-05 19:26:28.000000000 +0200 +++ new/sysbench-1.0.10/src/lua/oltp_common.lua 2017-10-26 15:34:28.000000000 +0200 @@ -196,8 +196,10 @@ con:query(query) - print(string.format("Inserting %d records into 'sbtest%d'", - sysbench.opt.table_size, table_num)) + if (sysbench.opt.table_size > 0) then + print(string.format("Inserting %d records into 'sbtest%d'", + sysbench.opt.table_size, table_num)) + end if sysbench.opt.auto_inc then query = "INSERT INTO sbtest" .. table_num .. "(k, c, pad) VALUES" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/sysbench-1.0.9/src/lua/oltp_insert.lua new/sysbench-1.0.10/src/lua/oltp_insert.lua --- old/sysbench-1.0.9/src/lua/oltp_insert.lua 2017-09-05 19:26:28.000000000 +0200 +++ new/sysbench-1.0.10/src/lua/oltp_insert.lua 2017-10-26 15:34:28.000000000 +0200 @@ -21,6 +21,20 @@ require("oltp_common") +sysbench.cmdline.commands.prepare = { + function () + if (not sysbench.opt.auto_inc) then + -- Create empty tables on prepare when --auto-inc is off, since IDs + -- generated on prepare may collide later with values generated by + -- sysbench.rand.unique() + sysbench.opt.table_size=0 + end + + cmd_prepare() + end, + sysbench.cmdline.PARALLEL_PREPARE +} + function prepare_statements() -- We do not use prepared statements here, but oltp_common.sh expects this -- function to be defined diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/sysbench-1.0.9/src/sb_lua.c new/sysbench-1.0.10/src/sb_lua.c --- old/sysbench-1.0.9/src/sb_lua.c 2017-09-05 19:26:28.000000000 +0200 +++ new/sysbench-1.0.10/src/sb_lua.c 2017-10-26 15:34:28.000000000 +0200 @@ -413,6 +413,9 @@ int sb_lua_op_init(void) { + if (export_options(gstate)) + return 1; + lua_getglobal(gstate, INIT_FUNC); if (!lua_isnil(gstate, -1)) { @@ -584,7 +587,10 @@ lua_pushliteral(L, "/.luarocks/share/lua/?/init.lua;"); } + lua_pushliteral(L, "/usr/local/share/lua/5.1/?.lua;"); + lua_pushliteral(L, DATADIR "/?.lua;"); + lua_concat(L, lua_gettop(L) - top); /* Mimic the default Lua behavior with respect to LUA_PATH and ';;' */ @@ -606,6 +612,9 @@ lua_pushstring(L, home); lua_pushliteral(L, "/.luarocks/lib/lua/?" DLEXT ";"); } + + lua_pushliteral(L, "/usr/local/lib/lua/5.1/?" DLEXT ";"); + lua_pushliteral(L, LIBDIR ";"); lua_concat(L, lua_gettop(L) - top); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/sysbench-1.0.9/tests/include/pgsql_common.sh new/sysbench-1.0.10/tests/include/pgsql_common.sh --- old/sysbench-1.0.9/tests/include/pgsql_common.sh 2017-09-05 19:26:28.000000000 +0200 +++ new/sysbench-1.0.10/tests/include/pgsql_common.sh 2017-10-26 15:34:28.000000000 +0200 @@ -8,8 +8,55 @@ exit 80 fi +# Emulate "\d+" output since it is not portable across PostgreSQL major versions function db_show_table() { - psql -c "\d+ $1" sbtest + if ! psql -c "\d+ $1" sbtest > /dev/null + then + return + fi + + echo " Table \"public.$1\"" + psql -q sbtest <<EOF +\pset footer off + SELECT + f.attname AS "Column", + pg_catalog.format_type(f.atttypid,f.atttypmod) AS "Type", + CASE + WHEN f.attnotnull = 't' OR p.contype = 'p' THEN 'not null ' + ELSE '' + END || + CASE + WHEN f.atthasdef = 't' THEN 'default ' || d.adsrc + ELSE '' + END AS "Modifiers", + CASE + WHEN f.attstorage = 'p' THEN 'plain' + ELSE 'extended' + END as "Storage", + CASE + WHEN f.attstattarget < 0 THEN '' + ELSE f.attstattarget::text + END as "Stats target", + pg_catalog.col_description(f.attrelid, f.attnum) as "Description" +FROM pg_attribute f + JOIN pg_class c ON c.oid = f.attrelid + JOIN pg_type t ON t.oid = f.atttypid + LEFT JOIN pg_attrdef d ON d.adrelid = c.oid AND d.adnum = f.attnum + LEFT JOIN pg_namespace n ON n.oid = c.relnamespace + LEFT JOIN pg_constraint p ON p.conrelid = c.oid AND f.attnum = ANY (p.conkey) + LEFT JOIN pg_class AS g ON p.confrelid = g.oid +WHERE c.relkind = 'r'::char + AND n.nspname = 'public' + AND c.relname = '$1' + AND f.attnum > 0 +EOF + echo "Indexes:" + psql -qt sbtest <<EOF + SELECT indexdef +FROM pg_catalog.pg_indexes +WHERE schemaname = 'public' + AND tablename = '$1' +EOF } DB_DRIVER_ARGS="--db-driver=pgsql $SBTEST_PGSQL_ARGS" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/sysbench-1.0.9/tests/t/cmdline.t new/sysbench-1.0.10/tests/t/cmdline.t --- old/sysbench-1.0.9/tests/t/cmdline.t 2017-09-05 19:26:28.000000000 +0200 +++ new/sysbench-1.0.10/tests/t/cmdline.t 2017-10-26 15:34:28.000000000 +0200 @@ -109,9 +109,7 @@ > ["dash-opt"] = {"dash-opt desc", "dash-opt val"} > } > - > function help() - > print("Available options:") - > sysbench.cmdline.print_test_options() + > function print_opt_table() > local o = sysbench.opt > print(o.str_opt1) > print(o.str_opt2) @@ -126,6 +124,39 @@ > print(o.list_opt1) > print(o.list_opt2) > print(o.dash_opt) + > print() + > end + > + > function help() + > print("function help()") + > print("Available options:") + > sysbench.cmdline.print_test_options() + > print_opt_table() + > end + > + > function init() + > print("function init()") + > print_opt_table() + > end + > + > function thread_init() + > print("function thread_init()") + > print_opt_table() + > end + > + > function event() + > print("function event()") + > print_opt_table() + > end + > + > function thread_done() + > print("function thread_done()") + > print_opt_table() + > end + > + > function done() + > print("function done()") + > print_opt_table() > end > EOF @@ -135,6 +166,7 @@ $ sysbench cmdline.lua help sysbench * (glob) + function help() Available options: --dash-opt=STRING dash-opt desc [dash-opt val] --str_opt1=STRING str_opt1 description @@ -164,7 +196,7 @@ table: 0x* (glob) table: 0x* (glob) dash-opt val - + $ sysbench cmdline.lua prepare sysbench * (glob) @@ -177,11 +209,109 @@ invalid option: --non-existing-option=3 [1] - $ sysbench cmdline.lua run + $ sysbench cmdline.lua --events=1 run sysbench * (glob) - FATAL: cannot find the event() function in cmdline.lua - [1] + function init() + + opt2 + opt3 + false + true + true + 10 + 0 + 3.14 + 0.2 + table: 0x* (glob) + table: 0x* (glob) + dash-opt val + + Running the test with following options: + Number of threads: 1 + Initializing random number generator from current time + + + Initializing worker threads... + + function thread_init() + + opt2 + opt3 + false + true + true + 10 + 0 + 3.14 + 0.2 + table: 0x* (glob) + table: 0x* (glob) + dash-opt val + + Threads started! + + function event() + + opt2 + opt3 + false + true + true + 10 + 0 + 3.14 + 0.2 + table: 0x* (glob) + table: 0x* (glob) + dash-opt val + + function thread_done() + + opt2 + opt3 + false + true + true + 10 + 0 + 3.14 + 0.2 + table: 0x* (glob) + table: 0x* (glob) + dash-opt val + + + General statistics: + total time: *s (glob) + total number of events: 1 + + Latency (ms): + min: * (glob) + avg: * (glob) + max: * (glob) + 95th percentile: * (glob) + sum: * (glob) + + Threads fairness: + events (avg/stddev): 1.0000/0.00 + execution time (avg/stddev): */0.00 (glob) + + function done() + + opt2 + opt3 + false + true + true + 10 + 0 + 3.14 + 0.2 + table: 0x* (glob) + table: 0x* (glob) + dash-opt val + $ sysbench cmdline.lua cleanup sysbench * (glob) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/sysbench-1.0.9/tests/t/script_bulk_insert_pgsql.t new/sysbench-1.0.10/tests/t/script_bulk_insert_pgsql.t --- old/sysbench-1.0.9/tests/t/script_bulk_insert_pgsql.t 2017-09-05 19:26:28.000000000 +0200 +++ new/sysbench-1.0.10/tests/t/script_bulk_insert_pgsql.t 2017-10-26 15:34:28.000000000 +0200 @@ -11,16 +11,18 @@ --------+---------+--------------------+---------+--------------+------------- id | integer | not null | plain | | k | integer | not null default 0 | plain | | + Indexes: - "sbtest1_pkey" PRIMARY KEY, btree (id) + CREATE UNIQUE INDEX sbtest1_pkey ON sbtest1 USING btree (id) Table "public.sbtest2" Column | Type | Modifiers | Storage | Stats target | Description --------+---------+--------------------+---------+--------------+------------- id | integer | not null | plain | | k | integer | not null default 0 | plain | | + Indexes: - "sbtest2_pkey" PRIMARY KEY, btree (id) + CREATE UNIQUE INDEX sbtest2_pkey ON sbtest2 USING btree (id) Did not find any relation named "sbtest3". sysbench * (glob) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/sysbench-1.0.9/tests/t/script_oltp_delete_pgsql.t new/sysbench-1.0.10/tests/t/script_oltp_delete_pgsql.t --- old/sysbench-1.0.9/tests/t/script_oltp_delete_pgsql.t 2017-09-05 19:26:28.000000000 +0200 +++ new/sysbench-1.0.10/tests/t/script_oltp_delete_pgsql.t 2017-10-26 15:34:28.000000000 +0200 @@ -31,93 +31,101 @@ Creating table 'sbtest8'... Inserting 10000 records into 'sbtest8' Creating a secondary index on 'sbtest8'... - Table "public.sbtest1" + Table "public.sbtest1" Column | Type | Modifiers | Storage | Stats target | Description --------+----------------+------------------------------------------------------+----------+--------------+------------- id | integer | not null default nextval('sbtest1_id_seq'::regclass) | plain | | k | integer | not null default 0 | plain | | c | character(120) | not null default ''::bpchar | extended | | pad | character(60) | not null default ''::bpchar | extended | | + Indexes: - "sbtest1_pkey" PRIMARY KEY, btree (id) - "k_1" btree (k) + CREATE UNIQUE INDEX sbtest1_pkey ON sbtest1 USING btree (id) + CREATE INDEX k_1 ON sbtest1 USING btree (k) - Table "public.sbtest2" + Table "public.sbtest2" Column | Type | Modifiers | Storage | Stats target | Description --------+----------------+------------------------------------------------------+----------+--------------+------------- id | integer | not null default nextval('sbtest2_id_seq'::regclass) | plain | | k | integer | not null default 0 | plain | | c | character(120) | not null default ''::bpchar | extended | | pad | character(60) | not null default ''::bpchar | extended | | + Indexes: - "sbtest2_pkey" PRIMARY KEY, btree (id) - "k_2" btree (k) + CREATE UNIQUE INDEX sbtest2_pkey ON sbtest2 USING btree (id) + CREATE INDEX k_2 ON sbtest2 USING btree (k) - Table "public.sbtest3" + Table "public.sbtest3" Column | Type | Modifiers | Storage | Stats target | Description --------+----------------+------------------------------------------------------+----------+--------------+------------- id | integer | not null default nextval('sbtest3_id_seq'::regclass) | plain | | k | integer | not null default 0 | plain | | c | character(120) | not null default ''::bpchar | extended | | pad | character(60) | not null default ''::bpchar | extended | | + Indexes: - "sbtest3_pkey" PRIMARY KEY, btree (id) - "k_3" btree (k) + CREATE UNIQUE INDEX sbtest3_pkey ON sbtest3 USING btree (id) + CREATE INDEX k_3 ON sbtest3 USING btree (k) - Table "public.sbtest4" + Table "public.sbtest4" Column | Type | Modifiers | Storage | Stats target | Description --------+----------------+------------------------------------------------------+----------+--------------+------------- id | integer | not null default nextval('sbtest4_id_seq'::regclass) | plain | | k | integer | not null default 0 | plain | | c | character(120) | not null default ''::bpchar | extended | | pad | character(60) | not null default ''::bpchar | extended | | + Indexes: - "sbtest4_pkey" PRIMARY KEY, btree (id) - "k_4" btree (k) + CREATE UNIQUE INDEX sbtest4_pkey ON sbtest4 USING btree (id) + CREATE INDEX k_4 ON sbtest4 USING btree (k) - Table "public.sbtest5" + Table "public.sbtest5" Column | Type | Modifiers | Storage | Stats target | Description --------+----------------+------------------------------------------------------+----------+--------------+------------- id | integer | not null default nextval('sbtest5_id_seq'::regclass) | plain | | k | integer | not null default 0 | plain | | c | character(120) | not null default ''::bpchar | extended | | pad | character(60) | not null default ''::bpchar | extended | | + Indexes: - "sbtest5_pkey" PRIMARY KEY, btree (id) - "k_5" btree (k) + CREATE UNIQUE INDEX sbtest5_pkey ON sbtest5 USING btree (id) + CREATE INDEX k_5 ON sbtest5 USING btree (k) - Table "public.sbtest6" + Table "public.sbtest6" Column | Type | Modifiers | Storage | Stats target | Description --------+----------------+------------------------------------------------------+----------+--------------+------------- id | integer | not null default nextval('sbtest6_id_seq'::regclass) | plain | | k | integer | not null default 0 | plain | | c | character(120) | not null default ''::bpchar | extended | | pad | character(60) | not null default ''::bpchar | extended | | + Indexes: - "sbtest6_pkey" PRIMARY KEY, btree (id) - "k_6" btree (k) + CREATE UNIQUE INDEX sbtest6_pkey ON sbtest6 USING btree (id) + CREATE INDEX k_6 ON sbtest6 USING btree (k) - Table "public.sbtest7" + Table "public.sbtest7" Column | Type | Modifiers | Storage | Stats target | Description --------+----------------+------------------------------------------------------+----------+--------------+------------- id | integer | not null default nextval('sbtest7_id_seq'::regclass) | plain | | k | integer | not null default 0 | plain | | c | character(120) | not null default ''::bpchar | extended | | pad | character(60) | not null default ''::bpchar | extended | | + Indexes: - "sbtest7_pkey" PRIMARY KEY, btree (id) - "k_7" btree (k) + CREATE UNIQUE INDEX sbtest7_pkey ON sbtest7 USING btree (id) + CREATE INDEX k_7 ON sbtest7 USING btree (k) - Table "public.sbtest8" + Table "public.sbtest8" Column | Type | Modifiers | Storage | Stats target | Description --------+----------------+------------------------------------------------------+----------+--------------+------------- id | integer | not null default nextval('sbtest8_id_seq'::regclass) | plain | | k | integer | not null default 0 | plain | | c | character(120) | not null default ''::bpchar | extended | | pad | character(60) | not null default ''::bpchar | extended | | + Indexes: - "sbtest8_pkey" PRIMARY KEY, btree (id) - "k_8" btree (k) + CREATE UNIQUE INDEX sbtest8_pkey ON sbtest8 USING btree (id) + CREATE INDEX k_8 ON sbtest8 USING btree (k) Did not find any relation named "sbtest9". sysbench *.* * (glob) @@ -183,15 +191,16 @@ Creating table 'sbtest1'... Inserting 10000 records into 'sbtest1' - Table "public.sbtest1" + Table "public.sbtest1" Column | Type | Modifiers | Storage | Stats target | Description --------+----------------+------------------------------------------------------+----------+--------------+------------- id | integer | not null default nextval('sbtest1_id_seq'::regclass) | plain | | k | integer | not null default 0 | plain | | c | character(120) | not null default ''::bpchar | extended | | pad | character(60) | not null default ''::bpchar | extended | | + Indexes: - "sbtest1_pkey" PRIMARY KEY, btree (id) + CREATE UNIQUE INDEX sbtest1_pkey ON sbtest1 USING btree (id) sysbench * (glob) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/sysbench-1.0.9/tests/t/script_oltp_insert_mysql.t new/sysbench-1.0.10/tests/t/script_oltp_insert_mysql.t --- old/sysbench-1.0.9/tests/t/script_oltp_insert_mysql.t 2017-09-05 19:26:28.000000000 +0200 +++ new/sysbench-1.0.10/tests/t/script_oltp_insert_mysql.t 2017-10-26 15:34:28.000000000 +0200 @@ -196,6 +196,5 @@ Dropping table 'sbtest1'... # Test --auto-inc=off Creating table 'sbtest1'... - Inserting 10000 records into 'sbtest1' Creating a secondary index on 'sbtest1'... Dropping table 'sbtest1'... diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/sysbench-1.0.9/tests/t/script_oltp_insert_pgsql.t new/sysbench-1.0.10/tests/t/script_oltp_insert_pgsql.t --- old/sysbench-1.0.9/tests/t/script_oltp_insert_pgsql.t 2017-09-05 19:26:28.000000000 +0200 +++ new/sysbench-1.0.10/tests/t/script_oltp_insert_pgsql.t 2017-10-26 15:34:28.000000000 +0200 @@ -31,93 +31,101 @@ Creating table 'sbtest8'... Inserting 10000 records into 'sbtest8' Creating a secondary index on 'sbtest8'... - Table "public.sbtest1" + Table "public.sbtest1" Column | Type | Modifiers | Storage | Stats target | Description --------+----------------+------------------------------------------------------+----------+--------------+------------- id | integer | not null default nextval('sbtest1_id_seq'::regclass) | plain | | k | integer | not null default 0 | plain | | c | character(120) | not null default ''::bpchar | extended | | pad | character(60) | not null default ''::bpchar | extended | | + Indexes: - "sbtest1_pkey" PRIMARY KEY, btree (id) - "k_1" btree (k) + CREATE UNIQUE INDEX sbtest1_pkey ON sbtest1 USING btree (id) + CREATE INDEX k_1 ON sbtest1 USING btree (k) - Table "public.sbtest2" + Table "public.sbtest2" Column | Type | Modifiers | Storage | Stats target | Description --------+----------------+------------------------------------------------------+----------+--------------+------------- id | integer | not null default nextval('sbtest2_id_seq'::regclass) | plain | | k | integer | not null default 0 | plain | | c | character(120) | not null default ''::bpchar | extended | | pad | character(60) | not null default ''::bpchar | extended | | + Indexes: - "sbtest2_pkey" PRIMARY KEY, btree (id) - "k_2" btree (k) + CREATE UNIQUE INDEX sbtest2_pkey ON sbtest2 USING btree (id) + CREATE INDEX k_2 ON sbtest2 USING btree (k) - Table "public.sbtest3" + Table "public.sbtest3" Column | Type | Modifiers | Storage | Stats target | Description --------+----------------+------------------------------------------------------+----------+--------------+------------- id | integer | not null default nextval('sbtest3_id_seq'::regclass) | plain | | k | integer | not null default 0 | plain | | c | character(120) | not null default ''::bpchar | extended | | pad | character(60) | not null default ''::bpchar | extended | | + Indexes: - "sbtest3_pkey" PRIMARY KEY, btree (id) - "k_3" btree (k) + CREATE UNIQUE INDEX sbtest3_pkey ON sbtest3 USING btree (id) + CREATE INDEX k_3 ON sbtest3 USING btree (k) - Table "public.sbtest4" + Table "public.sbtest4" Column | Type | Modifiers | Storage | Stats target | Description --------+----------------+------------------------------------------------------+----------+--------------+------------- id | integer | not null default nextval('sbtest4_id_seq'::regclass) | plain | | k | integer | not null default 0 | plain | | c | character(120) | not null default ''::bpchar | extended | | pad | character(60) | not null default ''::bpchar | extended | | + Indexes: - "sbtest4_pkey" PRIMARY KEY, btree (id) - "k_4" btree (k) + CREATE UNIQUE INDEX sbtest4_pkey ON sbtest4 USING btree (id) + CREATE INDEX k_4 ON sbtest4 USING btree (k) - Table "public.sbtest5" + Table "public.sbtest5" Column | Type | Modifiers | Storage | Stats target | Description --------+----------------+------------------------------------------------------+----------+--------------+------------- id | integer | not null default nextval('sbtest5_id_seq'::regclass) | plain | | k | integer | not null default 0 | plain | | c | character(120) | not null default ''::bpchar | extended | | pad | character(60) | not null default ''::bpchar | extended | | + Indexes: - "sbtest5_pkey" PRIMARY KEY, btree (id) - "k_5" btree (k) + CREATE UNIQUE INDEX sbtest5_pkey ON sbtest5 USING btree (id) + CREATE INDEX k_5 ON sbtest5 USING btree (k) - Table "public.sbtest6" + Table "public.sbtest6" Column | Type | Modifiers | Storage | Stats target | Description --------+----------------+------------------------------------------------------+----------+--------------+------------- id | integer | not null default nextval('sbtest6_id_seq'::regclass) | plain | | k | integer | not null default 0 | plain | | c | character(120) | not null default ''::bpchar | extended | | pad | character(60) | not null default ''::bpchar | extended | | + Indexes: - "sbtest6_pkey" PRIMARY KEY, btree (id) - "k_6" btree (k) + CREATE UNIQUE INDEX sbtest6_pkey ON sbtest6 USING btree (id) + CREATE INDEX k_6 ON sbtest6 USING btree (k) - Table "public.sbtest7" + Table "public.sbtest7" Column | Type | Modifiers | Storage | Stats target | Description --------+----------------+------------------------------------------------------+----------+--------------+------------- id | integer | not null default nextval('sbtest7_id_seq'::regclass) | plain | | k | integer | not null default 0 | plain | | c | character(120) | not null default ''::bpchar | extended | | pad | character(60) | not null default ''::bpchar | extended | | + Indexes: - "sbtest7_pkey" PRIMARY KEY, btree (id) - "k_7" btree (k) + CREATE UNIQUE INDEX sbtest7_pkey ON sbtest7 USING btree (id) + CREATE INDEX k_7 ON sbtest7 USING btree (k) - Table "public.sbtest8" + Table "public.sbtest8" Column | Type | Modifiers | Storage | Stats target | Description --------+----------------+------------------------------------------------------+----------+--------------+------------- id | integer | not null default nextval('sbtest8_id_seq'::regclass) | plain | | k | integer | not null default 0 | plain | | c | character(120) | not null default ''::bpchar | extended | | pad | character(60) | not null default ''::bpchar | extended | | + Indexes: - "sbtest8_pkey" PRIMARY KEY, btree (id) - "k_8" btree (k) + CREATE UNIQUE INDEX sbtest8_pkey ON sbtest8 USING btree (id) + CREATE INDEX k_8 ON sbtest8 USING btree (k) Did not find any relation named "sbtest9". sysbench *.* * (glob) @@ -183,21 +191,21 @@ Creating table 'sbtest1'... Inserting 10000 records into 'sbtest1' - Table "public.sbtest1" + Table "public.sbtest1" Column | Type | Modifiers | Storage | Stats target | Description --------+----------------+------------------------------------------------------+----------+--------------+------------- id | integer | not null default nextval('sbtest1_id_seq'::regclass) | plain | | k | integer | not null default 0 | plain | | c | character(120) | not null default ''::bpchar | extended | | pad | character(60) | not null default ''::bpchar | extended | | + Indexes: - "sbtest1_pkey" PRIMARY KEY, btree (id) + CREATE UNIQUE INDEX sbtest1_pkey ON sbtest1 USING btree (id) sysbench * (glob) Dropping table 'sbtest1'... # Test --auto-inc=off Creating table 'sbtest1'... - Inserting 10000 records into 'sbtest1' Creating a secondary index on 'sbtest1'... Dropping table 'sbtest1'... diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/sysbench-1.0.9/tests/t/script_oltp_point_select_pgsql.t new/sysbench-1.0.10/tests/t/script_oltp_point_select_pgsql.t --- old/sysbench-1.0.9/tests/t/script_oltp_point_select_pgsql.t 2017-09-05 19:26:28.000000000 +0200 +++ new/sysbench-1.0.10/tests/t/script_oltp_point_select_pgsql.t 2017-10-26 15:34:28.000000000 +0200 @@ -31,93 +31,101 @@ Creating table 'sbtest8'... Inserting 10000 records into 'sbtest8' Creating a secondary index on 'sbtest8'... - Table "public.sbtest1" + Table "public.sbtest1" Column | Type | Modifiers | Storage | Stats target | Description --------+----------------+------------------------------------------------------+----------+--------------+------------- id | integer | not null default nextval('sbtest1_id_seq'::regclass) | plain | | k | integer | not null default 0 | plain | | c | character(120) | not null default ''::bpchar | extended | | pad | character(60) | not null default ''::bpchar | extended | | + Indexes: - "sbtest1_pkey" PRIMARY KEY, btree (id) - "k_1" btree (k) + CREATE UNIQUE INDEX sbtest1_pkey ON sbtest1 USING btree (id) + CREATE INDEX k_1 ON sbtest1 USING btree (k) - Table "public.sbtest2" + Table "public.sbtest2" Column | Type | Modifiers | Storage | Stats target | Description --------+----------------+------------------------------------------------------+----------+--------------+------------- id | integer | not null default nextval('sbtest2_id_seq'::regclass) | plain | | k | integer | not null default 0 | plain | | c | character(120) | not null default ''::bpchar | extended | | pad | character(60) | not null default ''::bpchar | extended | | + Indexes: - "sbtest2_pkey" PRIMARY KEY, btree (id) - "k_2" btree (k) + CREATE UNIQUE INDEX sbtest2_pkey ON sbtest2 USING btree (id) + CREATE INDEX k_2 ON sbtest2 USING btree (k) - Table "public.sbtest3" + Table "public.sbtest3" Column | Type | Modifiers | Storage | Stats target | Description --------+----------------+------------------------------------------------------+----------+--------------+------------- id | integer | not null default nextval('sbtest3_id_seq'::regclass) | plain | | k | integer | not null default 0 | plain | | c | character(120) | not null default ''::bpchar | extended | | pad | character(60) | not null default ''::bpchar | extended | | + Indexes: - "sbtest3_pkey" PRIMARY KEY, btree (id) - "k_3" btree (k) + CREATE UNIQUE INDEX sbtest3_pkey ON sbtest3 USING btree (id) + CREATE INDEX k_3 ON sbtest3 USING btree (k) - Table "public.sbtest4" + Table "public.sbtest4" Column | Type | Modifiers | Storage | Stats target | Description --------+----------------+------------------------------------------------------+----------+--------------+------------- id | integer | not null default nextval('sbtest4_id_seq'::regclass) | plain | | k | integer | not null default 0 | plain | | c | character(120) | not null default ''::bpchar | extended | | pad | character(60) | not null default ''::bpchar | extended | | + Indexes: - "sbtest4_pkey" PRIMARY KEY, btree (id) - "k_4" btree (k) + CREATE UNIQUE INDEX sbtest4_pkey ON sbtest4 USING btree (id) + CREATE INDEX k_4 ON sbtest4 USING btree (k) - Table "public.sbtest5" + Table "public.sbtest5" Column | Type | Modifiers | Storage | Stats target | Description --------+----------------+------------------------------------------------------+----------+--------------+------------- id | integer | not null default nextval('sbtest5_id_seq'::regclass) | plain | | k | integer | not null default 0 | plain | | c | character(120) | not null default ''::bpchar | extended | | pad | character(60) | not null default ''::bpchar | extended | | + Indexes: - "sbtest5_pkey" PRIMARY KEY, btree (id) - "k_5" btree (k) + CREATE UNIQUE INDEX sbtest5_pkey ON sbtest5 USING btree (id) + CREATE INDEX k_5 ON sbtest5 USING btree (k) - Table "public.sbtest6" + Table "public.sbtest6" Column | Type | Modifiers | Storage | Stats target | Description --------+----------------+------------------------------------------------------+----------+--------------+------------- id | integer | not null default nextval('sbtest6_id_seq'::regclass) | plain | | k | integer | not null default 0 | plain | | c | character(120) | not null default ''::bpchar | extended | | pad | character(60) | not null default ''::bpchar | extended | | + Indexes: - "sbtest6_pkey" PRIMARY KEY, btree (id) - "k_6" btree (k) + CREATE UNIQUE INDEX sbtest6_pkey ON sbtest6 USING btree (id) + CREATE INDEX k_6 ON sbtest6 USING btree (k) - Table "public.sbtest7" + Table "public.sbtest7" Column | Type | Modifiers | Storage | Stats target | Description --------+----------------+------------------------------------------------------+----------+--------------+------------- id | integer | not null default nextval('sbtest7_id_seq'::regclass) | plain | | k | integer | not null default 0 | plain | | c | character(120) | not null default ''::bpchar | extended | | pad | character(60) | not null default ''::bpchar | extended | | + Indexes: - "sbtest7_pkey" PRIMARY KEY, btree (id) - "k_7" btree (k) + CREATE UNIQUE INDEX sbtest7_pkey ON sbtest7 USING btree (id) + CREATE INDEX k_7 ON sbtest7 USING btree (k) - Table "public.sbtest8" + Table "public.sbtest8" Column | Type | Modifiers | Storage | Stats target | Description --------+----------------+------------------------------------------------------+----------+--------------+------------- id | integer | not null default nextval('sbtest8_id_seq'::regclass) | plain | | k | integer | not null default 0 | plain | | c | character(120) | not null default ''::bpchar | extended | | pad | character(60) | not null default ''::bpchar | extended | | + Indexes: - "sbtest8_pkey" PRIMARY KEY, btree (id) - "k_8" btree (k) + CREATE UNIQUE INDEX sbtest8_pkey ON sbtest8 USING btree (id) + CREATE INDEX k_8 ON sbtest8 USING btree (k) Did not find any relation named "sbtest9". sysbench *.* * (glob) @@ -183,15 +191,16 @@ Creating table 'sbtest1'... Inserting 10000 records into 'sbtest1' - Table "public.sbtest1" + Table "public.sbtest1" Column | Type | Modifiers | Storage | Stats target | Description --------+----------------+------------------------------------------------------+----------+--------------+------------- id | integer | not null default nextval('sbtest1_id_seq'::regclass) | plain | | k | integer | not null default 0 | plain | | c | character(120) | not null default ''::bpchar | extended | | pad | character(60) | not null default ''::bpchar | extended | | + Indexes: - "sbtest1_pkey" PRIMARY KEY, btree (id) + CREATE UNIQUE INDEX sbtest1_pkey ON sbtest1 USING btree (id) sysbench * (glob) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/sysbench-1.0.9/tests/t/script_oltp_read_write_pgsql.t new/sysbench-1.0.10/tests/t/script_oltp_read_write_pgsql.t --- old/sysbench-1.0.9/tests/t/script_oltp_read_write_pgsql.t 2017-09-05 19:26:28.000000000 +0200 +++ new/sysbench-1.0.10/tests/t/script_oltp_read_write_pgsql.t 2017-10-26 15:34:28.000000000 +0200 @@ -34,93 +34,101 @@ Creating table 'sbtest8'... Inserting 10000 records into 'sbtest8' Creating a secondary index on 'sbtest8'... - Table "public.sbtest1" + Table "public.sbtest1" Column | Type | Modifiers | Storage | Stats target | Description --------+----------------+------------------------------------------------------+----------+--------------+------------- id | integer | not null default nextval('sbtest1_id_seq'::regclass) | plain | | k | integer | not null default 0 | plain | | c | character(120) | not null default ''::bpchar | extended | | pad | character(60) | not null default ''::bpchar | extended | | + Indexes: - "sbtest1_pkey" PRIMARY KEY, btree (id) - "k_1" btree (k) + CREATE UNIQUE INDEX sbtest1_pkey ON sbtest1 USING btree (id) + CREATE INDEX k_1 ON sbtest1 USING btree (k) - Table "public.sbtest2" + Table "public.sbtest2" Column | Type | Modifiers | Storage | Stats target | Description --------+----------------+------------------------------------------------------+----------+--------------+------------- id | integer | not null default nextval('sbtest2_id_seq'::regclass) | plain | | k | integer | not null default 0 | plain | | c | character(120) | not null default ''::bpchar | extended | | pad | character(60) | not null default ''::bpchar | extended | | + Indexes: - "sbtest2_pkey" PRIMARY KEY, btree (id) - "k_2" btree (k) + CREATE UNIQUE INDEX sbtest2_pkey ON sbtest2 USING btree (id) + CREATE INDEX k_2 ON sbtest2 USING btree (k) - Table "public.sbtest3" + Table "public.sbtest3" Column | Type | Modifiers | Storage | Stats target | Description --------+----------------+------------------------------------------------------+----------+--------------+------------- id | integer | not null default nextval('sbtest3_id_seq'::regclass) | plain | | k | integer | not null default 0 | plain | | c | character(120) | not null default ''::bpchar | extended | | pad | character(60) | not null default ''::bpchar | extended | | + Indexes: - "sbtest3_pkey" PRIMARY KEY, btree (id) - "k_3" btree (k) + CREATE UNIQUE INDEX sbtest3_pkey ON sbtest3 USING btree (id) + CREATE INDEX k_3 ON sbtest3 USING btree (k) - Table "public.sbtest4" + Table "public.sbtest4" Column | Type | Modifiers | Storage | Stats target | Description --------+----------------+------------------------------------------------------+----------+--------------+------------- id | integer | not null default nextval('sbtest4_id_seq'::regclass) | plain | | k | integer | not null default 0 | plain | | c | character(120) | not null default ''::bpchar | extended | | pad | character(60) | not null default ''::bpchar | extended | | + Indexes: - "sbtest4_pkey" PRIMARY KEY, btree (id) - "k_4" btree (k) + CREATE UNIQUE INDEX sbtest4_pkey ON sbtest4 USING btree (id) + CREATE INDEX k_4 ON sbtest4 USING btree (k) - Table "public.sbtest5" + Table "public.sbtest5" Column | Type | Modifiers | Storage | Stats target | Description --------+----------------+------------------------------------------------------+----------+--------------+------------- id | integer | not null default nextval('sbtest5_id_seq'::regclass) | plain | | k | integer | not null default 0 | plain | | c | character(120) | not null default ''::bpchar | extended | | pad | character(60) | not null default ''::bpchar | extended | | + Indexes: - "sbtest5_pkey" PRIMARY KEY, btree (id) - "k_5" btree (k) + CREATE UNIQUE INDEX sbtest5_pkey ON sbtest5 USING btree (id) + CREATE INDEX k_5 ON sbtest5 USING btree (k) - Table "public.sbtest6" + Table "public.sbtest6" Column | Type | Modifiers | Storage | Stats target | Description --------+----------------+------------------------------------------------------+----------+--------------+------------- id | integer | not null default nextval('sbtest6_id_seq'::regclass) | plain | | k | integer | not null default 0 | plain | | c | character(120) | not null default ''::bpchar | extended | | pad | character(60) | not null default ''::bpchar | extended | | + Indexes: - "sbtest6_pkey" PRIMARY KEY, btree (id) - "k_6" btree (k) + CREATE UNIQUE INDEX sbtest6_pkey ON sbtest6 USING btree (id) + CREATE INDEX k_6 ON sbtest6 USING btree (k) - Table "public.sbtest7" + Table "public.sbtest7" Column | Type | Modifiers | Storage | Stats target | Description --------+----------------+------------------------------------------------------+----------+--------------+------------- id | integer | not null default nextval('sbtest7_id_seq'::regclass) | plain | | k | integer | not null default 0 | plain | | c | character(120) | not null default ''::bpchar | extended | | pad | character(60) | not null default ''::bpchar | extended | | + Indexes: - "sbtest7_pkey" PRIMARY KEY, btree (id) - "k_7" btree (k) + CREATE UNIQUE INDEX sbtest7_pkey ON sbtest7 USING btree (id) + CREATE INDEX k_7 ON sbtest7 USING btree (k) - Table "public.sbtest8" + Table "public.sbtest8" Column | Type | Modifiers | Storage | Stats target | Description --------+----------------+------------------------------------------------------+----------+--------------+------------- id | integer | not null default nextval('sbtest8_id_seq'::regclass) | plain | | k | integer | not null default 0 | plain | | c | character(120) | not null default ''::bpchar | extended | | pad | character(60) | not null default ''::bpchar | extended | | + Indexes: - "sbtest8_pkey" PRIMARY KEY, btree (id) - "k_8" btree (k) + CREATE UNIQUE INDEX sbtest8_pkey ON sbtest8 USING btree (id) + CREATE INDEX k_8 ON sbtest8 USING btree (k) Did not find any relation named "sbtest9". sysbench *.* * (glob) @@ -186,15 +194,16 @@ Creating table 'sbtest1'... Inserting 10000 records into 'sbtest1' - Table "public.sbtest1" + Table "public.sbtest1" Column | Type | Modifiers | Storage | Stats target | Description --------+----------------+------------------------------------------------------+----------+--------------+------------- id | integer | not null default nextval('sbtest1_id_seq'::regclass) | plain | | k | integer | not null default 0 | plain | | c | character(120) | not null default ''::bpchar | extended | | pad | character(60) | not null default ''::bpchar | extended | | + Indexes: - "sbtest1_pkey" PRIMARY KEY, btree (id) + CREATE UNIQUE INDEX sbtest1_pkey ON sbtest1 USING btree (id) sysbench * (glob) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/sysbench-1.0.9/tests/t/script_select_random_pgsql.t new/sysbench-1.0.10/tests/t/script_select_random_pgsql.t --- old/sysbench-1.0.9/tests/t/script_select_random_pgsql.t 2017-09-05 19:26:28.000000000 +0200 +++ new/sysbench-1.0.10/tests/t/script_select_random_pgsql.t 2017-10-26 15:34:28.000000000 +0200 @@ -9,16 +9,17 @@ Creating table 'sbtest1'... Inserting 10000 records into 'sbtest1' Creating a secondary index on 'sbtest1'... - Table "public.sbtest1" + Table "public.sbtest1" Column | Type | Modifiers | Storage | Stats target | Description --------+----------------+------------------------------------------------------+----------+--------------+------------- id | integer | not null default nextval('sbtest1_id_seq'::regclass) | plain | | k | integer | not null default 0 | plain | | c | character(120) | not null default ''::bpchar | extended | | pad | character(60) | not null default ''::bpchar | extended | | + Indexes: - "sbtest1_pkey" PRIMARY KEY, btree (id) - "k_1" btree (k) + CREATE UNIQUE INDEX sbtest1_pkey ON sbtest1 USING btree (id) + CREATE INDEX k_1 ON sbtest1 USING btree (k) Did not find any relation named "sbtest2". Did not find any relation named "sbtest3". @@ -80,16 +81,17 @@ Creating table 'sbtest1'... Inserting 10000 records into 'sbtest1' Creating a secondary index on 'sbtest1'... - Table "public.sbtest1" + Table "public.sbtest1" Column | Type | Modifiers | Storage | Stats target | Description --------+----------------+------------------------------------------------------+----------+--------------+------------- id | integer | not null default nextval('sbtest1_id_seq'::regclass) | plain | | k | integer | not null default 0 | plain | | c | character(120) | not null default ''::bpchar | extended | | pad | character(60) | not null default ''::bpchar | extended | | + Indexes: - "sbtest1_pkey" PRIMARY KEY, btree (id) - "k_1" btree (k) + CREATE UNIQUE INDEX sbtest1_pkey ON sbtest1 USING btree (id) + CREATE INDEX k_1 ON sbtest1 USING btree (k) Did not find any relation named "sbtest2". Did not find any relation named "sbtest3".
