mirrors/scylladb
1
0
Fork 0
mirror of https://github.com/scylladb/scylladb.git synced 2026-05-02 14:15:46 +00:00
Code Issues Packages Projects Releases Wiki Activity

Add index_info + use in column_definition

Browse Source
This commit is contained in:
Calle Wilund
2015-05-26 09:58:45 +02:00
parent 1d30b85ac6
commit 138ca9d2cd
2 changed files with 32 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
schema.cc
View File

@@ -101,12 +101,15 @@ schema::has_collections() const {
});
}
column_definition::column_definition(bytes name, data_type type, column_id id, column_kind kind)
: _name(std::move(name))
, type(std::move(type))
, id(id)
, kind(kind)
{ }
index_info::index_info(::index_type idx_type,
std::experimental::optional<sstring> idx_name,
std::experimental::optional<index_options_map> idx_options)
: index_type(idx_type), index_name(idx_name), index_options(idx_options)
{}
column_definition::column_definition(bytes name, data_type type, column_id id, column_kind kind, index_info idx)
: _name(std::move(name)), type(std::move(type)), id(id), kind(kind), idx_info(std::move(idx))
{}
const column_definition*
schema::get_column_definition(const bytes& name) const {

24
schema.hh
View File

@@ -21,6 +21,26 @@ using column_id = uint32_t;
enum class column_kind { partition_key, clustering_key, regular_column, static_column, };
// CMH this is also manually defined in thrift gen file.
enum class index_type {
keys,
custom,
composites,
none, // cwi: added none to avoid "optional" bs.
};
typedef std::unordered_map<sstring, sstring> index_options_map;
struct index_info {
index_info(::index_type = ::index_type::none
, std::experimental::optional<sstring> index_name = std::experimental::optional<sstring>()
, std::experimental::optional<index_options_map> = std::experimental::optional<index_options_map>());
enum index_type index_type = ::index_type::none;
std::experimental::optional<sstring> index_name;
std::experimental::optional<index_options_map> index_options;
};
class column_definition final {
public:
template<typename ColumnRange>
@@ -32,7 +52,7 @@ public:
private:
bytes _name;
public:
column_definition(bytes name, data_type type, column_id id, column_kind kind);
column_definition(bytes name, data_type type, column_id id, column_kind kind, index_info = index_info());
data_type type;
@@ -43,6 +63,7 @@ public:
column_kind kind;
::shared_ptr<cql3::column_specification> column_specification;
index_info idx_info;
bool is_static() const { return kind == column_kind::static_column; }
bool is_regular() const { return kind == column_kind::regular_column; }
@@ -95,6 +116,7 @@ public:
struct column {
bytes name;
data_type type;
index_info idx_info;
struct name_compare {
data_type type;
name_compare(data_type type) : type(type) {}