Skip to content

Commit e7e6e30

Browse files
committed
rocksdb_sys_vars should not be run if MyRocks is not compiled.
Copy the detection logic from 'rocksdb' test suite, add a note.
1 parent 12f7cbc commit e7e6e30

File tree

2 files changed

+17
-0
lines changed

2 files changed

+17
-0
lines changed

storage/rocksdb/mysql-test/rocksdb/suite.pm

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,9 @@
11
package My::Suite::Rocksdb;
22

3+
#
4+
# Note: ../rocksdb_sys_vars/suite.pm file has a similar
5+
# function. If you modify this file, consider modifying that one, too.
6+
#
37
@ISA = qw(My::Suite);
48
use My::Find;
59
use File::Basename;
Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,21 @@
11
package My::Suite::Rocksdb_sys_vars;
22

3+
#
4+
# Note: The below is copied from ../rocksdb/suite.pm
5+
#
36
@ISA = qw(My::Suite);
7+
use My::Find;
8+
use File::Basename;
9+
use strict;
410

511
sub is_default { not $::opt_embedded_server }
612

13+
my $sst_dump=
14+
::mtr_exe_maybe_exists(
15+
"$::bindir/storage/rocksdb$::opt_vs_config/sst_dump",
16+
"$::path_client_bindir/sst_dump");
17+
return "RocksDB is not compiled, no sst_dump" unless $sst_dump;
18+
$ENV{MARIAROCKS_SST_DUMP}="$sst_dump";
19+
720
bless { };
821

0 commit comments

Comments
 (0)