Skip to content

Commit 27adea9

Browse files
committed
MariaRocks port: temporarily disable rdb_collation_exceptions
Then Regex_list_handler is not needed and we don't have to backport it right now.
1 parent 7eef3de commit 27adea9

File tree

1 file changed

+14
-1
lines changed

1 file changed

+14
-1
lines changed

storage/rocksdb/ha_rocksdb.cc

Lines changed: 14 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -155,10 +155,11 @@ Rdb_binlog_manager binlog_manager;
155155

156156
static Rdb_background_thread rdb_bg_thread;
157157

158-
158+
#ifdef MARIAROCKS_NOT_YET
159159
// List of table names (using regex) that are exceptions to the strict
160160
// collation check requirement.
161161
Regex_list_handler *rdb_collation_exceptions;
162+
#endif
162163

163164
static const char* const ERRSTR_ROLLBACK_ONLY
164165
= "This transaction was rolled back and cannot be "
@@ -3288,11 +3289,13 @@ static int rocksdb_init_func(void *p)
32883289
mysql_mutex_init(rdb_mem_cmp_space_mutex_key, &rdb_mem_cmp_space_mutex,
32893290
MY_MUTEX_INIT_FAST);
32903291

3292+
#ifdef MARIAROCKS_NOT_YET
32913293
#if defined(HAVE_PSI_INTERFACE)
32923294
rdb_collation_exceptions = new Regex_list_handler(
32933295
key_rwlock_collation_exception_list);
32943296
#else
32953297
rdb_collation_exceptions = new Regex_list_handler();
3298+
#endif
32963299
#endif
32973300

32983301
mysql_mutex_init(rdb_sysvars_psi_mutex_key, &rdb_sysvars_mutex,
@@ -3672,7 +3675,9 @@ static int rocksdb_done_func(void *p)
36723675
mysql_mutex_destroy(&rdb_open_tables.m_mutex);
36733676
mysql_mutex_destroy(&rdb_sysvars_mutex);
36743677

3678+
#ifdef MARIAROCKS_NOT_YET
36753679
delete rdb_collation_exceptions;
3680+
#endif
36763681
mysql_mutex_destroy(&rdb_collation_data_mutex);
36773682
mysql_mutex_destroy(&rdb_mem_cmp_space_mutex);
36783683

@@ -4751,6 +4756,7 @@ void ha_rocksdb::set_skip_unique_check_tables(const char* whitelist)
47514756
{
47524757
DBUG_ASSERT(whitelist != nullptr);
47534758

4759+
#ifdef MARIAROCKS_NOT_YET // regex_handler
47544760
#if defined(HAVE_PSI_INTERFACE)
47554761
Regex_list_handler regex_handler(key_rwlock_skip_unique_check_tables);
47564762
#else
@@ -4763,6 +4769,7 @@ void ha_rocksdb::set_skip_unique_check_tables(const char* whitelist)
47634769
}
47644770

47654771
m_skip_unique_check= regex_handler.matches(m_tbl_def->base_tablename());
4772+
#endif
47664773
}
47674774

47684775
int ha_rocksdb::open(const char *name, int mode, uint test_if_locked)
@@ -5055,7 +5062,11 @@ int ha_rocksdb::create_cfs(const TABLE *table_arg, Rdb_tbl_def *tbl_def_arg,
50555062
{
50565063
if (!rdb_is_index_collation_supported(
50575064
table_arg->key_info[i].key_part[part].field) &&
5065+
#ifdef MARIAROCKS_NOT_YET
50585066
!rdb_collation_exceptions->matches(tablename_sys))
5067+
#else
5068+
true)
5069+
#endif
50595070
{
50605071
std::string collation_err;
50615072
for (auto coll : RDB_INDEX_COLLATIONS)
@@ -10602,13 +10613,15 @@ rocksdb_set_rate_limiter_bytes_per_sec(
1060210613

1060310614
void rdb_set_collation_exception_list(const char *exception_list)
1060410615
{
10616+
#ifdef MARIAROCKS_NOT_YET
1060510617
DBUG_ASSERT(rdb_collation_exceptions != nullptr);
1060610618

1060710619
if (!rdb_collation_exceptions->set_patterns(exception_list))
1060810620
{
1060910621
my_core::warn_about_bad_patterns(rdb_collation_exceptions,
1061010622
"strict_collation_exceptions");
1061110623
}
10624+
#endif
1061210625
}
1061310626

1061410627
void

0 commit comments

Comments
 (0)