mirror of
https://github.com/MariaDB/server.git
synced 2025-01-19 05:22:25 +01:00
43d5edf97c
commit 394d0712d3d46a87a8063e14e998e9c22336e3a6
Author: Anca Agape <anca@fb.com>
Date: Thu Jul 27 15:43:07 2017 -0700
Fix rpl.rpl_4threads_deadlock test broken by D5005670
Summary:
In D5005670 in fill_fields_processlist() function we introduced a point
where we were trying to take the LOCK_thd_data before the
synchronization point used by test
processlist_after_LOCK_thd_count_before_LOCK_thd_data. This was
happening in get_attached_srv_session() function called. Replaced this
with get_attached_srv_session_safe() and moved it after lock is aquired.
Reviewed By: tianx
Differential Revision: D5505992
fbshipit-source-id: bc53924
106 lines
3.4 KiB
C++
106 lines
3.4 KiB
C++
/*
|
|
Copyright (c) 2014, SkySQL Ab
|
|
|
|
This program is free software; you can redistribute it and/or modify
|
|
it under the terms of the GNU General Public License as published by
|
|
the Free Software Foundation; version 2 of the License.
|
|
|
|
This program is distributed in the hope that it will be useful,
|
|
but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
GNU General Public License for more details.
|
|
|
|
You should have received a copy of the GNU General Public License
|
|
along with this program; if not, write to the Free Software
|
|
Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */
|
|
|
|
#pragma once
|
|
|
|
/* C++ system header files */
|
|
#include <map>
|
|
#include <string>
|
|
#include <vector>
|
|
|
|
/* MySQL header files */
|
|
#include "./sql_class.h"
|
|
|
|
/* RocksDB header files */
|
|
#include "rocksdb/db.h"
|
|
|
|
/* MyRocks header files */
|
|
#include "./rdb_cf_options.h"
|
|
|
|
namespace myrocks {
|
|
|
|
/*
|
|
We need a Column Family (CF) manager. Its functions:
|
|
- create column families (synchronized, don't create the same twice)
|
|
- keep count in each column family.
|
|
= the count is kept on-disk.
|
|
= there are no empty CFs. initially count=1.
|
|
= then, when doing DDL, we increase or decrease it.
|
|
(atomicity is maintained by being in the same WriteBatch with DDLs)
|
|
= if DROP discovers that now count=0, it removes the CF.
|
|
|
|
Current state is:
|
|
- CFs are created in a synchronized way. We can't remove them, yet.
|
|
*/
|
|
|
|
class Rdb_cf_manager {
|
|
std::map<std::string, rocksdb::ColumnFamilyHandle *> m_cf_name_map;
|
|
std::map<uint32_t, rocksdb::ColumnFamilyHandle *> m_cf_id_map;
|
|
|
|
mutable mysql_mutex_t m_mutex;
|
|
|
|
std::unique_ptr<Rdb_cf_options> m_cf_options = nullptr;
|
|
|
|
public:
|
|
Rdb_cf_manager(const Rdb_cf_manager &) = delete;
|
|
Rdb_cf_manager &operator=(const Rdb_cf_manager &) = delete;
|
|
Rdb_cf_manager() = default;
|
|
|
|
static bool is_cf_name_reverse(const char *const name);
|
|
|
|
/*
|
|
This is called right after the DB::Open() call. The parameters describe
|
|
column
|
|
families that are present in the database. The first CF is the default CF.
|
|
*/
|
|
void init(std::unique_ptr<Rdb_cf_options> cf_options,
|
|
std::vector<rocksdb::ColumnFamilyHandle *> *const handles);
|
|
void cleanup();
|
|
|
|
/*
|
|
Used by CREATE TABLE.
|
|
- cf_name=nullptr means use default column family
|
|
*/
|
|
rocksdb::ColumnFamilyHandle *get_or_create_cf(rocksdb::DB *const rdb,
|
|
const std::string &cf_name);
|
|
|
|
/* Used by table open */
|
|
rocksdb::ColumnFamilyHandle *get_cf(const std::string &cf_name) const;
|
|
|
|
/* Look up cf by id; used by datadic */
|
|
rocksdb::ColumnFamilyHandle *get_cf(const uint32_t &id) const;
|
|
|
|
/* Used to iterate over column families for show status */
|
|
std::vector<std::string> get_cf_names(void) const;
|
|
|
|
/* Used to iterate over column families */
|
|
std::vector<rocksdb::ColumnFamilyHandle *> get_all_cf(void) const;
|
|
|
|
// void drop_cf(); -- not implemented so far.
|
|
|
|
void get_cf_options(const std::string &cf_name,
|
|
rocksdb::ColumnFamilyOptions *const opts)
|
|
MY_ATTRIBUTE((__nonnull__)) {
|
|
m_cf_options->get_cf_options(cf_name, opts);
|
|
}
|
|
|
|
void update_options_map(const std::string &cf_name,
|
|
const std::string &updated_options) {
|
|
m_cf_options->update(cf_name, updated_options);
|
|
}
|
|
};
|
|
|
|
} // namespace myrocks
|