mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-01-16 03:52:35 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'bb-10.2-mariarocks' into bb-10.2-mariarocks-wlad

Browse source
This commit is contained in:
Vladislav Vaintroub 2017-04-02 12:38:40 +00:00
commit 9b7ef6f77a
9 changed files with 21 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
mysql-test/include/search_pattern_in_file.inc
View file

@ -45,14 +45,13 @@
perl;
use strict;
use autodie qw(open);
die "SEARCH_FILE not set" unless $ENV{SEARCH_FILE};
my @search_files= glob($ENV{SEARCH_FILE});
my $search_pattern= $ENV{SEARCH_PATTERN} or die "SEARCH_PATTERN not set";
my $search_range= $ENV{SEARCH_RANGE};
my $content;
foreach my $search_file (@search_files) {
open(FILE, '<', $search_file);
open(FILE, '<', $search_file) || die("Can't open file $search_file: $!");
my $file_content;
if ($search_range > 0) {
read(FILE, $file_content, $search_range, 0);

3
storage/rocksdb/mysql-test/rocksdb/t/add_index_inplace_sstfilewriter.test
View file

@ -1,5 +1,8 @@
--source include/have_rocksdb.inc
# This test requires ~1.3G of disk space
--source include/big_test.inc
--disable_warnings
drop table if exists t1;
--enable_warnings

3
storage/rocksdb/mysql-test/rocksdb/t/bulk_load.test
View file

@ -1,6 +1,9 @@
--source include/have_rocksdb.inc
--source include/have_partition.inc
# This test requires ~2.3G of disk space
--source include/big_test.inc
--disable_warnings
DROP TABLE IF EXISTS t1, t2, t3;
--enable_warnings

4
storage/rocksdb/mysql-test/rocksdb/t/compact_deletes_test.inc
View file

@ -39,7 +39,6 @@ let $wait_condition = select count(*) = 0
let NO_MORE_DELETES=$no_more_deletes;
perl;
use autodie qw(open);
$num_retries=240;
$retry=0;
print "wait_for_delete: $ENV{no_more_deletes}\n";
@ -47,7 +46,8 @@ perl;
$total_d=$total_e=0;
for $f (<$ENV{MYSQLTEST_VARDIR}/mysqld.1/data/.rocksdb/*.sst>) {
# excluding system cf
open D, '-|', "$ENV{MARIAROCKS_SST_DUMP} --command=scan --output_hex --file=$f";
$filename= "$ENV{MARIAROCKS_SST_DUMP} --command=scan --output_hex --file=$f";
open(D, '-|', $filename) || die("Can't open file $filename: $!");
while (<D>) {
next unless /'(\d{8})/ and $1 >= 8;
$total_d++ if /: [07]/;

2
storage/rocksdb/mysql-test/rocksdb/t/disabled.def
View file

@ -45,6 +45,8 @@ rpl_row_not_found : MariaDB doesnt support slave_exec_mode='SEMI_STRICT'
blind_delete_without_tx_api: MDEV-12286: rocksdb.blind_delete_without_tx_api test fails
persistent_cache: Upstream RocksDB bug https://github.com/facebook/mysql-5.6/issues/579
allow_no_pk_concurrent_insert: stress test
rocksdb_deadlock_stress_rc: stress test
rocksdb_deadlock_stress_rr: stress test

4
storage/rocksdb/mysql-test/rocksdb/t/drop_table.test
View file

@ -111,7 +111,6 @@ let $wait_condition = select count(*) = 0
# Check total compacted-away rows for all indices
# Check that all indices have been successfully dropped
perl;
use autodie qw(open);
sub print_array {
$str = shift;
@ -123,7 +122,8 @@ sub print_array {
}
}
open F, '<', "$ENV{MYSQLTEST_VARDIR}/log/mysqld.1.err";
$filename= "$ENV{MYSQLTEST_VARDIR}/log/mysqld.1.err";
open(F, '<', $filename) || die("Can't open file $filename: $!");
while (<F>) {
%a = @b = @c = () if /CURRENT_TEST/;
if (/Compacting away elements from dropped index \(\d+,(\d+)\): (\d+)/) {

8
storage/rocksdb/mysql-test/rocksdb/t/drop_table2.test
View file

@ -90,9 +90,9 @@ let $table = t5;
--source drop_table_repopulate_table.inc
perl;
use autodie qw(open);
$size+=-s $_ for (<$ENV{MYSQLTEST_VARDIR}/mysqld.1/data/.rocksdb/*.sst>);
open(F, '>', "$ENV{MYSQLTEST_VARDIR}/tmp/size_output");
$filename= "$ENV{MYSQLTEST_VARDIR}/tmp/size_output";
open(F, '>', $filename) || die("Can't open file $filename: $!");
print F $size;
EOF
drop table t1;
@ -110,9 +110,9 @@ let $wait_condition = select count(*) = 0
# Check that space is reclaimed
perl;
use autodie qw(open);
$size+=-s $_ for (<$ENV{MYSQLTEST_VARDIR}/mysqld.1/data/.rocksdb/*.sst>);
open(F, '<', "$ENV{MYSQLTEST_VARDIR}/tmp/size_output");
$filename= "$ENV{MYSQLTEST_VARDIR}/tmp/size_output";
open(F, '<', $filename) || die("Can't open file $filename: $!");
$old=<F>;
print "Compacted\n" if $old > $size * 2;
EOF

5
storage/rocksdb/mysql-test/rocksdb/t/optimize_table.inc
View file

@ -1,12 +1,11 @@
# run a check script to verify sst files reduced enough during each optimize table
perl;
use autodie qw(open);
$size += -s $_ for (<$ENV{datadir}/.rocksdb/*.sst>);
$file= "$ENV{MYSQL_TMP_DIR}/sst_size.dat";
if (-f $file) {
open(F, '<', $file);
open(F, '<', $file) || die("Can't open file $file: $!");
$old = <F>;
close F;
if ($old - $size < 1e6) {
@ -15,7 +14,7 @@ if (-f $file) {
print "sst file reduction ok\n";
}
}
open(F, '>', $file);
open(F, '>', $file) || die("Can't open file $file: $!");
print F $size;
close F;
EOF

4
storage/rocksdb/mysql-test/rocksdb/t/rocksdb_checksums.test
View file

@ -53,12 +53,12 @@ while ($i<10000)
--enable_query_log
check table t4;
perl;
use autodie qw(open);
$total=10000;
$pct=5;
@out=();
open(F, '<', "$ENV{MYSQLTEST_VARDIR}/log/mysqld.1.err");
$filename= "$ENV{MYSQLTEST_VARDIR}/log/mysqld.1.err";
open(F, '<', $filename) || die("Can't open file $filename: $!");
while(<F>) {
@out=() if /^CURRENT_TEST:/;
if (/(\d+) index entries checked \((\d+) had checksums/) {