1
0
mirror of https://github.com/MariaDB/server.git synced 2025-12-01 17:39:21 +03:00
Commit Graph

527 Commits

Author SHA1 Message Date
Sergei Petrunia
f62f9d661a Fix rocksdb.perf_context test
The part of the test that counts IO should be run with default
rocksdb_flush_log_at_trx_commt.
2017-10-09 13:29:09 +03:00
Sergei Petrunia
6ff8d57128 Fix mege error in rocksdb.use_direct_reads_writes test 2017-10-09 12:56:31 +03:00
Sergei Petrunia
262d7e4c09 Post-merge test fixes part #3. 2017-09-19 17:20:36 +03:00
Sergei Petrunia
da9c385fd6 Post-merge test fixes part #2. 2017-09-19 17:00:54 +03:00
Sergei Petrunia
f321f0823b Post-merge fixes part #1. 2017-09-19 16:15:08 +03:00
Sergei Petrunia
6b0588018a Merge branch '10.2' of github.com:MariaDB/server into bb-10.2-mariarocks-merge 2017-09-19 15:34:38 +03:00
Sergei Petrunia
ba3209e219 Merge mergetrees/merge-myrocks into bb-10.2-mariarocks-merge
Upstream cset we are merging from:

    commit 184a4a2d82f4f6f3cbcb1015bcdb32bebe73315c
    Author: Abhinav Sharma <abhinavsharma@fb.com>
    Date:   Thu Sep 14 11:40:08 2017 -0700

        Bump rocksdb submodule

        Summary:
        Bump rocksdb to include the fix for rocksdb.trx_info_rpl

Lots of conflicts, got the code to compile but tests are likely to
be broken
2017-09-18 14:06:01 +03:00
Sergei Petrunia
3fae64b196 Copy of
commit 184a4a2d82f4f6f3cbcb1015bcdb32bebe73315c
Author: Abhinav Sharma <abhinavsharma@fb.com>
Date:   Thu Sep 14 11:40:08 2017 -0700

    Bump rocksdb submodule

    Summary:
    Bump rocksdb to include the fix for rocksdb.trx_info_rpl

    The bug was introduced in: https://github.com/facebook/rocksdb/pull/2850
    Fixed in: https://github.com/facebook/rocksdb/pull/2881

    update-submodule: rocksdb

    Reviewed By: lth

    Differential Revision: D5834658

    fbshipit-source-id: d1551bf
2017-09-15 10:04:49 +00:00
Marko Mäkelä
348eaf4252 Merge bb-10.2-ext into 10.3 2017-09-14 09:12:47 +03:00
Alexander Barkov
178540b904 Merge remote-tracking branch 'origin/10.2' into bb-10.2-ext 2017-09-13 12:12:05 +04:00
Sergei Petrunia
49878be331 MDEV-13602: rocksdb.index_merge_rocksdb2 failed in buildbot
Part#2: stabilize the test output
2017-09-12 13:32:09 +03:00
Marko Mäkelä
ae02407ce3 Merge bb-10.2-ext into 10.3 2017-09-07 12:30:56 +03:00
Marko Mäkelä
a82ed92a6a Merge 10.2 into bb-10.2-ext 2017-09-07 12:23:58 +03:00
Sergei Petrunia
4ae200a97a Update test results for rocksdb.bulk_load_rev_cf_and_data 2017-09-05 18:28:05 +03:00
Marko Mäkelä
4e1fa7f63d Merge bb-10.2-ext into 10.3 2017-09-01 11:33:45 +03:00
Marko Mäkelä
6749d39a95 Merge 10.2 into bb-10.2-ext 2017-09-01 08:47:55 +03:00
Sergei Petrunia
0e45edf350 MDEV-13669: Some MyRocks test take a long time
Make rocksdb.bloomfilter* tests 1.8x faster by doing loading in bulk
2017-08-31 11:42:41 +03:00
Sergei Petrunia
d20fa48599 MDEV-13669: Some MyRocks test take a long time
Make rocksdb.cardinality test faster (77 -> 42 sec with --mem) by
loading records in batches.
(loading everything as one bulk load batch will remove the purpose
 of the test)
2017-08-30 11:45:24 +03:00
Sergei Golubchik
bb8e99fdc3 Merge branch 'bb-10.2-ext' into 10.3 2017-08-26 00:34:43 +02:00
Sergei Petrunia
fba53e7775 Make MyRocks test stable: Data_length may vary slightly as well 2017-08-25 11:55:12 +03:00
Sergei Petrunia
765519694d Enable basic XA between MyRocks and the binlog
This allows basic master crash-safety
- Un-comment and update relevant parts of the code
- Make rocksdb_rpl suite work like other MyRocks testsuites
  (load the MyRocks plugin, don't start if it is not compiled in, etc)
- For now, disable all tests in the rocksdb_rpl suite.
- MariaDB-fication of rpl_rocksdb_2p_crash_recover test.
2017-08-25 11:55:12 +03:00
Sergei Golubchik
27412877db Merge branch '10.2' into bb-10.2-ext 2017-08-25 10:25:48 +02:00
Sergei Petrunia
ae0759ad45 MDEV-13602: rocksdb.index_merge_rocksdb2 failed in buildbot
- Add include/index_merge*. Upstream has different files than MariaDB,
  use copies theirs, not ours.
- There was a prblem with running "DDL-like" commands with binlog=ON:
  MariaDB sets binlog_format=STATEMENT for the duration of such command
  to prevent RBR replication from catching (and replicating) updates to
  system tables.
  However, MyRocks tries to prevent any writes to MyRocks tables with
  binlog_format!=ROW.
- Added exceptions for DDL-type commands (ANALYZE TABLE, OPTIMIZE TABLE)
- Added special handling for "LOCK TABLE(s) myrocks_table WRITE".
2017-08-23 18:41:43 +03:00
Sergei Petrunia
ef8e1a35cc Fix rocksdb.bulk_load test
- Remove the merge error
- Update test results
2017-08-21 16:12:09 +03:00
Sergei Petrunia
4f34ec26fa MDEV-13600: Update test results for rocksdb.bulk_load_rev_cf 2017-08-21 15:26:21 +03:00
Sergei Petrunia
c354cb66b0 MDEV-13515: rocksdb.use_direct_reads_writes fails in buildbot with not found pattern
The test mis-used MTR's "restart the server if it crashed or exited"
feature to try starting MyRocks plugin with invalid arguments.

Changed the test to use the --default-storage-engine=myisam which
allows the server to start when MyRocks fails to start.

This removes the need to "start the server with the arguments which
will caused it to fail to start", and so removes the race conditions
with MTR server restart code and  mysqld.*.expect file.
2017-08-15 16:42:11 +03:00
Alexander Barkov
6db1b0188c Merge remote-tracking branch 'origin/bb-10.2-ext' into 10.3 2017-08-15 07:52:48 +04:00
Elena Stepanova
88879b37fc Changes to RocksDB tests after the engine merge 2017-08-14 23:39:35 +03:00
Sergei Petrunia
d24f76e1a8 MDEV-13522: rocksdb.rocksdb_parts failed in buildbot
Make test result stable
2017-08-14 23:12:35 +03:00
Alexander Barkov
9d85323007 MDEV-13500 sql_mode=ORACLE: can't create a virtual column with function MOD
Fixing Item_func_mod::print() to print "arg1 MOD arg2" instea of "arg1 % arg2"
2017-08-14 11:12:17 +04:00
Marko Mäkelä
620ba97cfc Merge remote-tracking branch 'origin/bb-10.2-ext' into 10.3 2017-08-09 12:59:39 +03:00
Marko Mäkelä
1f0a22acbd Merge 10.2 into bb-10.2-ext 2017-08-08 09:47:00 +03:00
Alexander Barkov
988a9daa94 Merge remote-tracking branch 'origin/10.2' into bb-10.2-ext
Conflicts:
	mysql-test/r/func_json.result
	mysql-test/r/win.result
	mysql-test/t/func_json.test
	mysql-test/t/win.test
	sql/share/errmsg-utf8.txt
	storage/rocksdb/ha_rocksdb.cc
	storage/rocksdb/mysql-test/rocksdb/r/tbl_opt_data_index_dir.result
2017-08-07 21:35:34 +04:00
Sergei Petrunia
5ae598390a Attempt to make rocksdb.rocksdb_parts stable 2017-08-07 18:12:24 +03:00
Sergei Petrunia
30c36b2c15 Make rocksdb.rocksdb_icp test stable 2017-08-07 17:25:11 +03:00
Sergei Petrunia
93a6eed607 Backport to 10.2: Make rocksdb.type_varchar test stable
It may produce test failures like this because of non-deterministic
cost calculations:

-1	SIMPLE	t1	#	col1	col1	259	NULL	#	Using where
+1	SIMPLE	t1	#	col1	NULL	NULL	NULL	#	Using where
2017-08-06 15:36:50 +03:00
Sergei Petrunia
f717fb8242 Make rocksdb.type_varchar test stable
It may produce test failures like this because of non-deterministic
cost calculations:

-1	SIMPLE	t1	#	col1	col1	259	NULL	#	Using where
+1	SIMPLE	t1	#	col1	NULL	NULL	NULL	#	Using where
2017-08-06 14:42:30 +03:00
Sergei Petrunia
eda033255a Make "SET @@rocksdb_bulk_load=0" return an error instead of crashing the server
- This is more in line with MariaDB environment
- And help with rocksdb.bulk_load_errors test, too
2017-08-03 15:16:40 +00:00
Sergei Petrunia
fcb8d8e598 Make rocksdb.prefix_extractor_override work on Windows 2017-08-01 19:19:54 +00:00
Alexander Barkov
1b0cf1b729 Merge remote-tracking branch 'origin/bb-10.2-ext' into 10.3 2017-08-01 15:58:26 +04:00
Alexander Barkov
68bc777830 Merge remote-tracking branch 'origin/10.2' into bb-10.2-ext 2017-08-01 15:37:01 +04:00
Sergei Petrunia
1388afcd84 MDEV-13413: After the merge rocksdb.drop_table fails with warnings
- Fix the bad merge in drop_table.test
- Remove the obsolete rocksdb_info_log_level=info_level option
  which caused warnings to be found in the error log.
2017-07-31 13:44:15 +00:00
Sergei Petrunia
6bf757a2a9 Disable rocksdb.issue243_transactionStatus
It uses SHOW ENGINE TRANSACTION STATUS, which is not supported in MariaDB
2017-07-30 13:37:04 +00:00
Sergei Petrunia
4eec6d4cca Update test result for rocksdb.tbl_opt_data_index_dir
See MDEV-12279, MariaDB is still not able to produce nice error messages
in this case.
2017-07-30 13:36:11 +00:00
Sergei Petrunia
da9c669210 Fixes for a few more post-merge test failures 2017-07-30 12:09:51 +00:00
Sergei Petrunia
d74e43e7bc Fix rocksdb.duplicate_table test 2017-07-30 11:12:54 +00:00
Sergei Petrunia
894c797eaf Mark all tests that are derived from rocksdb.bulk_load as "big".
(Could we just put the mark into bulk_load.inc ?)
2017-07-30 10:51:27 +00:00
Sergei Petrunia
1e6b02e688 MDEV-13404: MyRocks upstream uses I_S.table_statistics.row_lock_deadlocks
Comment out a part of testcase that uses it.
2017-07-30 10:42:39 +00:00
Sergei Petrunia
123187dfed Fix the merge of rocksdb_sys_vars test suite 2017-07-29 18:06:46 +00:00
Sergei Petrunia
d083c2490a Make rocksdb.bloomfilter_skip pass. 2017-07-29 17:05:14 +00:00