Skip to content

Commit 960fbc3

Browse files
committed
MariaRocks port: temporarily? disable "CONSISTENT INNODB|ROCKSDB SNAPSHOT" feature
cset c2b8ced16e255ffdbcc1e638ac8dd4f398eb1a93 Implement START TRANSACTION WITH CONSISTENT INNODB SNAPSHOT
1 parent 0a132ae commit 960fbc3

File tree

1 file changed

+7
-4
lines changed

1 file changed

+7
-4
lines changed

storage/rocksdb/ha_rocksdb.cc

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3056,13 +3056,15 @@ static inline void rocksdb_register_tx(handlerton *hton, THD *thd,
30563056
*/
30573057
static int rocksdb_start_tx_and_assign_read_view(
30583058
handlerton* hton, /*!< in: RocksDB handlerton */
3059-
THD* thd, /*!< in: MySQL thread handle of the
3059+
THD* thd) /*!< in: MySQL thread handle of the
30603060
user for whom the transaction should
30613061
be committed */
3062+
#ifdef MARIAROCKS_NOT_YET // consistent snapshot with binlog
30623063
char* binlog_file, /* out: binlog file for last commit */
30633064
ulonglong* binlog_pos, /* out: binlog pos for last commit */
30643065
char** gtid_executed, /* out: Gtids logged until last commit */
30653066
int* gtid_executed_length) /*out: Length of gtid_executed string */
3067+
#endif
30663068
{
30673069
Rdb_perf_context_guard guard(thd);
30683070

@@ -3076,25 +3078,26 @@ static int rocksdb_start_tx_and_assign_read_view(
30763078
"in RocksDB Storage Engine.", MYF(0));
30773079
return 1;
30783080
}
3079-
3081+
#ifdef MARIAROCKS_NOT_YET // consistent snapshot with binlog
30803082
if (binlog_file)
30813083
{
30823084
if (binlog_pos && mysql_bin_log.is_open())
30833085
mysql_bin_log_lock_commits();
30843086
else
30853087
return 1;
30863088
}
3087-
3089+
#endif
30883090
Rdb_transaction* tx= get_or_create_tx(thd);
30893091
DBUG_ASSERT(!tx->has_snapshot());
30903092
tx->set_tx_read_only(true);
30913093
rocksdb_register_tx(hton, thd, tx);
30923094
tx->acquire_snapshot(true);
30933095

3096+
#ifdef MARIAROCKS_NOT_YET // consistent snapshot with binlog
30943097
if (binlog_file)
30953098
mysql_bin_log_unlock_commits(binlog_file, binlog_pos, gtid_executed,
30963099
gtid_executed_length);
3097-
3100+
#endif
30983101
return 0;
30993102
}
31003103

0 commit comments

Comments
 (0)