mirror of
https://github.com/MariaDB/server.git
synced 2025-01-15 19:42:28 +01:00
Merge branch '10.11' into mariadb-10.11.7
This commit is contained in:
Oleksandr Byelkin
commit
f30244d13c
8 changed files with 137 additions and 24 deletions
2
VERSION
2
VERSION
|
|
@ -1,4 +1,4 @@
|
|||
MYSQL_VERSION_MAJOR=10
|
||||
MYSQL_VERSION_MINOR=11
|
||||
MYSQL_VERSION_PATCH=7
|
||||
MYSQL_VERSION_PATCH=8
|
||||
SERVER_MATURITY=stable
|
||||
|
|
|
|||
|
|
@ -2428,7 +2428,12 @@ static bool innodb_init()
|
|||
os_file_delete_if_exists_func(ib_logfile0.c_str(), nullptr);
|
||||
os_file_t file= os_file_create_func(ib_logfile0.c_str(),
|
||||
OS_FILE_CREATE, OS_FILE_NORMAL,
|
||||
OS_DATA_FILE_NO_O_DIRECT, false, &ret);
|
||||
#if defined _WIN32 || defined HAVE_FCNTL_DIRECT
|
||||
OS_DATA_FILE_NO_O_DIRECT,
|
||||
#else
|
||||
OS_DATA_FILE,
|
||||
#endif
|
||||
false, &ret);
|
||||
if (!ret)
|
||||
{
|
||||
invalid_log:
|
||||
|
|
|
|||
|
|
@ -5487,3 +5487,37 @@ Warning 1292 Truncated incorrect BINARY(2) value: '...random bytes...'
|
|||
#
|
||||
# End of 10.10 tests
|
||||
#
|
||||
#
|
||||
# Start of 10.11 tests
|
||||
#
|
||||
#
|
||||
# MDEV-33392 Server crashes when using RANDOM_BYTES function and GROUP BY clause on a column with a negative value
|
||||
#
|
||||
SET sql_mode='';
|
||||
CREATE TABLE t1 (a VARCHAR(255)) ENGINE=MyISAM;
|
||||
INSERT INTO t1 VALUES (9494),(9495),(9496),(9497),(9498),(9499),(9500),(9501),(9502),(9503);
|
||||
SELECT RANDOM_BYTES (-1) f1,a f2 FROM t1 GROUP BY f1,f2;
|
||||
f1 f2
|
||||
NULL 9494
|
||||
NULL 9495
|
||||
NULL 9496
|
||||
NULL 9497
|
||||
NULL 9498
|
||||
NULL 9499
|
||||
NULL 9500
|
||||
NULL 9501
|
||||
NULL 9502
|
||||
NULL 9503
|
||||
CREATE TABLE t2 AS SELECT RANDOM_BYTES (-1) f1,a f2 FROM t1 GROUP BY f1,f2;
|
||||
SHOW CREATE TABLE t2;
|
||||
Table Create Table
|
||||
t2 CREATE TABLE `t2` (
|
||||
`f1` binary(0) DEFAULT NULL,
|
||||
`f2` varchar(255) DEFAULT NULL
|
||||
) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
|
||||
DROP TABLE t2;
|
||||
DROP TABLE t1;
|
||||
SET sql_mode=DEFAULT;
|
||||
#
|
||||
# End of 10.11 tests
|
||||
#
|
||||
|
|
|
|||
|
|
@ -2457,3 +2457,25 @@ select "a" in ("abc", (convert(random_bytes(8) ,binary(2))));
|
|||
--echo #
|
||||
--echo # End of 10.10 tests
|
||||
--echo #
|
||||
|
||||
--echo #
|
||||
--echo # Start of 10.11 tests
|
||||
--echo #
|
||||
|
||||
--echo #
|
||||
--echo # MDEV-33392 Server crashes when using RANDOM_BYTES function and GROUP BY clause on a column with a negative value
|
||||
--echo #
|
||||
|
||||
SET sql_mode='';
|
||||
CREATE TABLE t1 (a VARCHAR(255)) ENGINE=MyISAM;
|
||||
INSERT INTO t1 VALUES (9494),(9495),(9496),(9497),(9498),(9499),(9500),(9501),(9502),(9503);
|
||||
SELECT RANDOM_BYTES (-1) f1,a f2 FROM t1 GROUP BY f1,f2;
|
||||
CREATE TABLE t2 AS SELECT RANDOM_BYTES (-1) f1,a f2 FROM t1 GROUP BY f1,f2;
|
||||
SHOW CREATE TABLE t2;
|
||||
DROP TABLE t2;
|
||||
DROP TABLE t1;
|
||||
SET sql_mode=DEFAULT;
|
||||
|
||||
--echo #
|
||||
--echo # End of 10.11 tests
|
||||
--echo #
|
||||
|
|
|
|||
|
|
@ -4,7 +4,7 @@ let $sys_errno=0;
|
|||
# Error 100 is returned by the powershell script
|
||||
# if MySql.Data is not installed
|
||||
--error 0,100
|
||||
--exec powershell -NoLogo -NoProfile -File main\mysql_connector_net.ps1
|
||||
--exec powershell -ExecutionPolicy Bypass -NoLogo -NoProfile -File main\mysql_connector_net.ps1
|
||||
if ($sys_errno != 0)
|
||||
{
|
||||
--skip Connector/NET is not installed
|
||||
|
|
|
|||
|
|
@ -1499,6 +1499,7 @@ String *Item_func_sformat::val_str(String *res)
|
|||
|
||||
bool Item_func_random_bytes::fix_length_and_dec(THD *thd)
|
||||
{
|
||||
set_maybe_null();
|
||||
used_tables_cache|= RAND_TABLE_BIT;
|
||||
if (args[0]->can_eval_in_optimize())
|
||||
{
|
||||
|
|
|
|||
|
|
@ -18452,7 +18452,7 @@ static void innodb_log_file_size_update(THD *thd, st_mysql_sys_var*,
|
|||
const bool in_progress(buf_pool.get_oldest_modification(LSN_MAX) <
|
||||
log_sys.resize_in_progress());
|
||||
if (in_progress)
|
||||
my_cond_timedwait(&buf_pool.do_flush_list,
|
||||
my_cond_timedwait(&buf_pool.done_flush_list,
|
||||
&buf_pool.flush_list_mutex.m_mutex, &abstime);
|
||||
mysql_mutex_unlock(&buf_pool.flush_list_mutex);
|
||||
if (!log_sys.resize_in_progress())
|
||||
|
|
|
|||
|
|
@ -10,6 +10,18 @@ display_help() {
|
|||
echo "regressions."
|
||||
echo
|
||||
echo "optional arguments:"
|
||||
echo " --name STRING identifier for the benchmark, added to the "
|
||||
echo " folder name and (if --log is set) the log file "
|
||||
echo " --threads \"STRING\" quoted string of space-separated integers "
|
||||
echo " representing the threads to run."
|
||||
echo " example: --threads \"1 32 64 128\""
|
||||
echo " default: \"1 2 4 8 16\""
|
||||
echo " --duration INTEGER duration of each thread run in seconds"
|
||||
echo " default: 60"
|
||||
echo " --workload STRING sysbench workload to execute"
|
||||
echo " default: oltp_read_write"
|
||||
echo " --log logs the mini-benchmark stdout/stderr into the"
|
||||
echo " benchmark folder."
|
||||
echo " --perf measure CPU cycles and instruction count in for "
|
||||
echo " sysbench runs"
|
||||
echo " --perf-flamegraph record performance counters in perf.data.* and"
|
||||
|
|
@ -17,6 +29,12 @@ display_help() {
|
|||
echo " -h, --help display this help and exit"
|
||||
}
|
||||
|
||||
# Default parameters
|
||||
BENCHMARK_NAME='mini-benchmark'
|
||||
THREADS='1 2 4 8 16'
|
||||
DURATION=60
|
||||
WORKLOAD='oltp_read_write'
|
||||
|
||||
while :
|
||||
do
|
||||
case "$1" in
|
||||
|
|
@ -28,6 +46,31 @@ do
|
|||
display_version
|
||||
exit 0
|
||||
;;
|
||||
--name)
|
||||
shift
|
||||
BENCHMARK_NAME+='-'
|
||||
BENCHMARK_NAME+=$1
|
||||
shift
|
||||
;;
|
||||
--threads)
|
||||
shift
|
||||
THREADS=$1
|
||||
shift
|
||||
;;
|
||||
--duration)
|
||||
shift
|
||||
DURATION=$1
|
||||
shift
|
||||
;;
|
||||
--workload)
|
||||
shift
|
||||
WORKLOAD=$1
|
||||
shift
|
||||
;;
|
||||
--log)
|
||||
LOG=true
|
||||
shift
|
||||
;;
|
||||
--perf)
|
||||
PERF=true
|
||||
shift
|
||||
|
|
@ -47,6 +90,13 @@ do
|
|||
esac
|
||||
done
|
||||
|
||||
# Save results of this run in a subdirectory so that they are not overwritten by
|
||||
# the next run
|
||||
TIMESTAMP="$(date -Iseconds)"
|
||||
mkdir "$BENCHMARK_NAME-$TIMESTAMP"
|
||||
cd "$BENCHMARK_NAME-$TIMESTAMP" || exit 1
|
||||
|
||||
(
|
||||
# Check that the dependencies of this script are available
|
||||
if [ ! -e /usr/bin/pgrep ]
|
||||
then
|
||||
|
|
@ -62,6 +112,7 @@ fi
|
|||
|
||||
# If there are multiple processes, assume the last one is the actual server and
|
||||
# any potential other ones were just part of the service wrapper chain
|
||||
# shellcheck disable=SC2005
|
||||
MARIADB_SERVER_PID="$(echo "$(pgrep -f mariadbd || pgrep -f mysqld)" | tail -n 1)"
|
||||
|
||||
if [ -z "$MARIADB_SERVER_PID" ]
|
||||
|
|
@ -102,12 +153,13 @@ then
|
|||
echo "Ensure the MariaDB Server debug symbols are installed"
|
||||
for x in $(ldd /usr/sbin/mariadbd | grep -oE " /.* ")
|
||||
do
|
||||
rpm -q --whatprovides --qf '%{name}' $x | cut -d : -f 1
|
||||
rpm -q --whatprovides --qf '%{name}' "$x" | cut -d : -f 1
|
||||
done | sort -u > mariadbd-dependencies.txt
|
||||
# shellcheck disable=SC2046
|
||||
debuginfo-install -y mariadb-server $(cat mariadbd-dependencies.txt)
|
||||
|
||||
if [ ! $(perf record echo "testing perf" > /dev/null 2>&1) ]
|
||||
|
||||
perf record echo "testing perf" > /dev/null 2>&1
|
||||
if [ $? -ne 0 ]
|
||||
then
|
||||
echo "perf does not have permission to run on this system. Skipping."
|
||||
PERF=""
|
||||
|
|
@ -120,7 +172,8 @@ elif [ -e /usr/bin/perf ]
|
|||
then
|
||||
# If flamegraphs were not requested, log normal perf counters if possible
|
||||
|
||||
if [ ! $(perf stat echo "testing perf" > /dev/null 2>&1) ]
|
||||
perf stat echo "testing perf" > /dev/null 2>&1
|
||||
if [ $? -ne 0 ]
|
||||
then
|
||||
echo "perf does not have permission to run on this system. Skipping."
|
||||
PERF=""
|
||||
|
|
@ -156,28 +209,23 @@ mariadb -e "
|
|||
CREATE USER IF NOT EXISTS sbtest@localhost;
|
||||
GRANT ALL PRIVILEGES ON sbtest.* TO sbtest@localhost"
|
||||
|
||||
sysbench oltp_read_write prepare --tables=20 --table-size=100000 | tee sysbench-prepare.log
|
||||
sysbench "$WORKLOAD" prepare --tables=20 --table-size=100000 | tee sysbench-prepare.log
|
||||
sync && sleep 1 # Ensure writes were propagated to disk
|
||||
|
||||
# Save results of this run in a subdirectory so that they are not overwritten by
|
||||
# the next run
|
||||
TIMESTAMP="$(date -Iseconds)"
|
||||
mkdir "mini-benchmark-$TIMESTAMP"
|
||||
cd "mini-benchmark-$TIMESTAMP" || exit 1
|
||||
|
||||
# Run benchmark with increasing thread counts. The MariaDB Server will be using
|
||||
# around 300 MB of RAM and mostly reading and writing in RAM, so I/O usage is
|
||||
# also low. The benchmark will most likely be CPU bound to due to the load
|
||||
# profile, and also guaranteed to be CPU bound because of being limited to a
|
||||
# single CPU with 'tasksel'.
|
||||
for t in 1 2 4 8 16
|
||||
for t in $THREADS
|
||||
do
|
||||
# Prepend command with perf if defined
|
||||
# Output stderr to stdout as perf outpus everything in stderr
|
||||
$PERF $TASKSET_SYSBENCH sysbench oltp_read_write run --threads=$t --time=60 --report-interval=10 2>&1 | tee sysbench-run-$t.log
|
||||
# Output stderr to stdout as perf outputs everything in stderr
|
||||
# shellcheck disable=SC2086
|
||||
$PERF $TASKSET_SYSBENCH sysbench "$WORKLOAD" run --threads=$t --time=$DURATION --report-interval=10 2>&1 | tee sysbench-run-$t.log
|
||||
done
|
||||
|
||||
sysbench oltp_read_write cleanup --tables=20 | tee sysbench-cleanup.log
|
||||
sysbench "$WORKLOAD" cleanup --tables=20 | tee sysbench-cleanup.log
|
||||
|
||||
# Store results from 4 thread run in a Gitlab-CI compatible metrics file
|
||||
grep -oE '[a-z]+:[ ]+[0-9.]+' sysbench-run-4.log | sed -r 's/\s+/ /g' | tail -n 15 > metrics.txt
|
||||
|
|
@ -197,10 +245,10 @@ then
|
|||
|
||||
# Final verdict based on cpu cycle count
|
||||
RESULT="$(grep -h -e cycles sysbench-run-*.log | sort -k 1 | awk '{s+=$1}END{print s}')"
|
||||
if [ "$RESULT" -gt 850000000000 ]
|
||||
if [ "$RESULT" -gt 850 ]
|
||||
then
|
||||
echo # Newline improves readability
|
||||
echo "Benchmark exceeded 8.5 billion cpu cycles, performance most likely regressed!"
|
||||
echo "Benchmark exceeded 850 billion cpu cycles, performance most likely regressed!"
|
||||
exit 1
|
||||
fi
|
||||
fi
|
||||
|
|
@ -216,12 +264,12 @@ if [ "$PERF_RECORD" == true ]
|
|||
then
|
||||
for f in perf.data.*
|
||||
do
|
||||
perf script -i $f | stackcollapse-perf.pl | flamegraph.pl --width 3000 > $f.svg
|
||||
perf script -i "$f" | stackcollapse-perf.pl | flamegraph.pl --width 1800 > "$f".svg
|
||||
done
|
||||
echo "Flamegraphs stored in folder mini-benchmark-$TIMESTAMP/"
|
||||
echo "Flamegraphs stored in folder $BENCHMARK_NAME-$TIMESTAMP/"
|
||||
fi
|
||||
|
||||
# Fallback if CPU cycle count not availalbe: final verdict based on peak QPS
|
||||
# Fallback if CPU cycle count not available: final verdict based on peak QPS
|
||||
RESULT="$(sort -k 9 -h sysbench-run-*.log | tail -n 1 | grep -oE "qps: [0-9]+" | grep -oE "[0-9]+")"
|
||||
case $RESULT in
|
||||
''|*[!0-9]*)
|
||||
|
|
@ -240,3 +288,6 @@ case $RESULT in
|
|||
fi
|
||||
;;
|
||||
esac
|
||||
# Record the output into the log file, if requested
|
||||
) 2>&1 | ($LOG && tee "$BENCHMARK_NAME"-"$TIMESTAMP".log)
|
||||
|
||||
|
|
|
|||
Loading…
Reference in a new issue