Skip to content

Commit b1ceeaf

Browse files
author
Arpit Goswami
committed
WL#12899 : Remove slave-rows-search-algorithms
This worklog will remove the system variable `slave-rows-search-algorithms` Change-Id: Ic8264bce904d1102c90eb83cbb48ea78cdeef264
1 parent 4666434 commit b1ceeaf

File tree

63 files changed

+97
-1621
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

63 files changed

+97
-1621
lines changed

mysql-test/collections/default.weekly

-6
Original file line numberDiff line numberDiff line change
@@ -152,12 +152,6 @@ perl mysql-test-run.pl --timer --force --comment=innodb_sync_debug --testcase-
152152
#
153153
####SECTION 7 RPL/BINLOG EXTENDED-WEEKLY#############
154154
#
155-
# Additional run to test rpl TABLE_SCAN & INDEX_SCAN
156-
#
157-
perl mysql-test-run.pl --force --debug-server --timer --comment=rpl_row_table_scan --vardir=var-rpl_row_table_scan --mysqld=--binlog-format=row --do-suite=rpl --mysqld=--slave-rows-search-algorithms=TABLE_SCAN,INDEX_SCAN --big-test --testcase-timeout=60 --no-skip
158-
159-
perl mysql-test-run.pl --debug-server --timer --force --comment=rpl_row_table_STA --vardir=var-sta-rpl-table-n_mix --mysqld=--binlog-format=row --mysqld=--replica-parallel-workers=0 --do-suite=rpl --mysqld=--slave-rows-search-algorithms=TABLE_SCAN,INDEX_SCAN --no-skip
160-
161155
# binlog-transaction-dependency-tracking=COMMIT_ORDER with replica-parallel-workers=4 (default) and replica-parallel-type=logical_clock (default)
162156
perl mysql-test-run.pl --timer --force --no-skip --testcase-timeout=60 --debug-server --comment=rpl-mta-trx-dependency-tracking-commit-order --vardir=var-rpl-mta-trx-dependency-tracking-commit-order --do-suite=rpl --mysqld=--binlog-format=row --mysqld=--binlog-transaction-dependency-tracking=COMMIT_ORDER
163157

mysql-test/extra/rpl_tests/rpl_row_jsondiff_exit.inc

-9
Original file line numberDiff line numberDiff line change
@@ -12,13 +12,4 @@ let $rpl_sql=
1212
--delimiter ;
1313
--source include/rpl_for_each_server_stmt.inc
1414

15-
if ($replace_combination_from)
16-
{
17-
# To avoid an error 'ER_RUNNING_APPLIER_PREVENTS_SWITCH_GLOBAL_BINLOG_FORMAT',
18-
# which will be caused by the following include/end_replace_combination.inc.
19-
--source include/rpl_stop_slaves.inc
20-
--source include/end_replace_combination.inc
21-
--source include/rpl_start_slaves.inc
22-
}
23-
2415
--source include/rpl_end.inc

mysql-test/extra/rpl_tests/rpl_row_jsondiff_init.inc

+3-26
Original file line numberDiff line numberDiff line change
@@ -51,18 +51,12 @@
5151
# Since NOBLOB is similar to MINIMAL for JSON columns, we consider
5252
# NOBLOB tested due to having tested MINIMAL.
5353
#
54-
# - All the above should hold when:
55-
#
56-
# - slave_rows_search_algorithms=HASH_SCAN/TABLE_SCAN with and
57-
# without a primary key
58-
#
59-
# - slave_rows_search_algorithms=INDEX_SCAN with a primary key.
54+
# All the above should hold when the table has a primary key so it
55+
# uses INDEX_SCAN and when the table has no primary key so it uses
56+
# HASH_SCAN.
6057
#
6158
# ==== Usage ====
6259
#
63-
# [--let $replace_combination_from= SCOPE.VARIABLE=VALUE[,VALUE[,...]]
64-
# [--let $replace_combination_to= SCOPE.VARIABLE=VALUE[,VALUE[,...]]
65-
# --source include/rpl_row_jsondiff_init.inc
6660
#
6761
# [set $variables to describe a scenario]
6862
# --source rpl_row_jsondiff_scenario.inc
@@ -74,13 +68,6 @@
7468
#
7569
# --source include/rpl_row_jsondiff_exit.inc
7670
#
77-
# Parameters:
78-
# $replace_combination_from, $replace_combination_to
79-
# If set, this script will source
80-
# include/begin_replace_combination.inc just after
81-
# include/rpl_init.inc, and rpl_row_jsondiff_exit.inc will source
82-
# include/end_replace_combination just before include/rpl_end.inc.
83-
# See include/begin_replace_combination.inc for details.
8471
#
8572
# ==== Implementation ====
8673
#
@@ -113,16 +100,6 @@
113100
--source include/rpl_init.inc
114101
--source include/rpl_default_connections.inc
115102

116-
if ($replace_combination_from)
117-
{
118-
--let $replace_combination_on_all_servers= 1
119-
# To avoid an error 'ER_RUNNING_APPLIER_PREVENTS_SWITCH_GLOBAL_BINLOG_FORMAT',
120-
# which will be caused by the following include/begin_replace_combination.inc.
121-
--source include/rpl_stop_slaves.inc
122-
--source include/begin_replace_combination.inc
123-
--source include/rpl_start_slaves.inc
124-
}
125-
126103

127104
--echo ######## INITIALIZE ########
128105

mysql-test/include/begin_replace_combination.inc

-117
This file was deleted.

mysql-test/include/end_replace_combination.inc

-44
This file was deleted.

mysql-test/include/excludenoskip.list

+1-1
Original file line numberDiff line numberDiff line change
@@ -215,7 +215,7 @@ not_mts_replica_parallel_workers.inc
215215
only_replica_preserve_commit_order.inc
216216
# 14.2 rpl misc files
217217
have_default_replica_transaction_retries.inc
218-
have_default_slave_rows_search_algorithms.inc
218+
219219

220220
#14.3 Some replication tests cannot run with GTID_ONLY == 1
221221
not_rpl_gtid_only.inc

mysql-test/include/have_default_slave_rows_search_algorithms.inc

-4
This file was deleted.

mysql-test/r/all_persisted_variables.result

+4-4
Original file line numberDiff line numberDiff line change
@@ -46,17 +46,17 @@ include/assert.inc [Expect 500+ variables in the table. Due to open Bugs, we are
4646

4747
# Test SET PERSIST
4848

49-
include/assert.inc [Expect 445 persisted variables in the table.]
49+
include/assert.inc [Expect 444 persisted variables in the table.]
5050

5151
************************************************************
5252
* 3. Restart server, it must preserve the persisted variable
5353
* settings. Verify persisted configuration.
5454
************************************************************
5555
# restart
5656

57-
include/assert.inc [Expect 445 persisted variables in persisted_variables table.]
58-
include/assert.inc [Expect 445 persisted variables shown as PERSISTED in variables_info table.]
59-
include/assert.inc [Expect 445 persisted variables with matching peristed and global values.]
57+
include/assert.inc [Expect 444 persisted variables in persisted_variables table.]
58+
include/assert.inc [Expect 444 persisted variables shown as PERSISTED in variables_info table.]
59+
include/assert.inc [Expect 444 persisted variables with matching peristed and global values.]
6060

6161
************************************************************
6262
* 4. Test RESET PERSIST IF EXISTS. Verify persisted variable

mysql-test/r/mysqld--help-notwin.result

-8
Original file line numberDiff line numberDiff line change
@@ -1421,13 +1421,6 @@ The following options may be given as the first argument:
14211421
This option is deprecated. Use
14221422
replica_preserve_commit_order instead.
14231423
(Defaults to on; use --skip-slave-preserve-commit-order to disable.)
1424-
--slave-rows-search-algorithms=name
1425-
The set of algorithms used by the replication applier
1426-
while searching the table for rows to update or delete.
1427-
Possible values are: INDEX_SCAN, TABLE_SCAN and
1428-
HASH_SCAN. Any combination is allowed, and the applier
1429-
picks the most efficient among them for any given
1430-
scenario. (Default: INDEX_SCAN, HASH_SCAN).
14311424
--slave-skip-errors=name
14321425
This option is deprecated. Use replica_skip_errors
14331426
instead.
@@ -1994,7 +1987,6 @@ slave-parallel-type LOGICAL_CLOCK
19941987
slave-parallel-workers 4
19951988
slave-pending-jobs-size-max 134217728
19961989
slave-preserve-commit-order TRUE
1997-
slave-rows-search-algorithms INDEX_SCAN,HASH_SCAN
19981990
slave-skip-errors (No default value)
19991991
slave-sql-verify-checksum TRUE
20001992
slave-transaction-retries 10

mysql-test/r/mysqld--help-win.result

-8
Original file line numberDiff line numberDiff line change
@@ -1427,13 +1427,6 @@ The following options may be given as the first argument:
14271427
This option is deprecated. Use
14281428
replica_preserve_commit_order instead.
14291429
(Defaults to on; use --skip-slave-preserve-commit-order to disable.)
1430-
--slave-rows-search-algorithms=name
1431-
The set of algorithms used by the replication applier
1432-
while searching the table for rows to update or delete.
1433-
Possible values are: INDEX_SCAN, TABLE_SCAN and
1434-
HASH_SCAN. Any combination is allowed, and the applier
1435-
picks the most efficient among them for any given
1436-
scenario. (Default: INDEX_SCAN, HASH_SCAN).
14371430
--slave-skip-errors=name
14381431
This option is deprecated. Use replica_skip_errors
14391432
instead.
@@ -2008,7 +2001,6 @@ slave-parallel-type LOGICAL_CLOCK
20082001
slave-parallel-workers 4
20092002
slave-pending-jobs-size-max 134217728
20102003
slave-preserve-commit-order TRUE
2011-
slave-rows-search-algorithms INDEX_SCAN,HASH_SCAN
20122004
slave-skip-errors (No default value)
20132005
slave-sql-verify-checksum TRUE
20142006
slave-transaction-retries 10

mysql-test/suite/binlog_nogtid/r/binlog_persist_only_variables.result

+5-10
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ INSERT INTO aliases(name) VALUES
4747
('slave_parallel_workers'), ('slave_pending_jobs_size_max'),
4848
('pseudo_slave_mode'), ('skip_slave_start');
4949

50-
include/assert.inc [Expect 110 variables in the table.]
50+
include/assert.inc [Expect 109 variables in the table.]
5151

5252
# Test SET PERSIST_ONLY
5353
SET PERSIST_ONLY binlog_cache_size = @@GLOBAL.binlog_cache_size;
@@ -231,10 +231,6 @@ SET PERSIST_ONLY slave_preserve_commit_order = @@GLOBAL.slave_preserve_commit_or
231231
Warnings:
232232
Warning 1287 '@@slave_preserve_commit_order' is deprecated and will be removed in a future release. Please use replica_preserve_commit_order instead.
233233
Warning 1287 '@@slave_preserve_commit_order' is deprecated and will be removed in a future release. Please use replica_preserve_commit_order instead.
234-
SET PERSIST_ONLY slave_rows_search_algorithms = @@GLOBAL.slave_rows_search_algorithms;
235-
Warnings:
236-
Warning 1287 '@@slave_rows_search_algorithms' is deprecated and will be removed in a future release.
237-
Warning 1287 '@@slave_rows_search_algorithms' is deprecated and will be removed in a future release.
238234
SET PERSIST_ONLY slave_skip_errors = @@GLOBAL.slave_skip_errors;
239235
Warnings:
240236
Warning 1287 '@@slave_skip_errors' is deprecated and will be removed in a future release. Please use replica_skip_errors instead.
@@ -269,16 +265,16 @@ Warning 1287 '@@sync_relay_log_info' is deprecated and will be removed in a futu
269265
Warning 1287 '@@sync_relay_log_info' is deprecated and will be removed in a future release.
270266
SET PERSIST_ONLY sync_source_info = @@GLOBAL.sync_source_info;
271267

272-
include/assert.inc [Expect 99 persisted variables in persisted_variables table.]
268+
include/assert.inc [Expect 98 persisted variables in persisted_variables table.]
273269

274270
############################################################
275271
# 2. Restart server, it must preserve the persisted variable
276272
# settings. Verify persisted configuration.
277273
# restart
278274

279-
include/assert.inc [Expect 99 persisted variables in persisted_variables table.]
280-
include/assert.inc [Expect 99 persisted variables shown as PERSISTED in variables_info table.]
281-
include/assert.inc [Expect 99 persisted variables with matching persisted and global values.]
275+
include/assert.inc [Expect 98 persisted variables in persisted_variables table.]
276+
include/assert.inc [Expect 98 persisted variables shown as PERSISTED in variables_info table.]
277+
include/assert.inc [Expect 98 persisted variables with matching persisted and global values.]
282278

283279
############################################################
284280
# 3. Test RESET PERSIST. Verify persisted variable settings
@@ -372,7 +368,6 @@ RESET PERSIST rpl_semi_sync_source_wait_point;
372368
RESET PERSIST rpl_stop_replica_timeout;
373369
RESET PERSIST session_track_gtids;
374370
RESET PERSIST skip_replica_start;
375-
RESET PERSIST slave_rows_search_algorithms;
376371
RESET PERSIST source_verify_checksum;
377372
RESET PERSIST sql_replica_skip_counter;
378373
RESET PERSIST sync_binlog;

0 commit comments

Comments
 (0)