bahman/scylla
1
0
Fork 0
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity

cql3: Move ks_prop_defs implementation to source file

Browse Source 
Signed-off-by: Pekka Enberg <penberg@cloudius-systems.com>
This commit is contained in:
Pekka Enberg
2015-08-27 18:16:28 +03:00
parent c2ff7b67ce
commit 28aad6fa67
3 changed files with 76 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
configure.py
View File

@@ -238,6 +238,7 @@ urchin_core = (['database.cc',
'cql3/statements/drop_keyspace_statement.cc',
'cql3/statements/drop_table_statement.cc',
'cql3/statements/schema_altering_statement.cc',
'cql3/statements/ks_prop_defs.cc',
'cql3/statements/modification_statement.cc',
'cql3/statements/update_statement.cc',
'cql3/statements/delete_statement.cc',

67
cql3/statements/ks_prop_defs.cc Normal file
View File

@@ -0,0 +1,67 @@
/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
* regarding copyright ownership. The ASF licenses this file
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
/*
* Copyright 2015 Cloudius Systems
*
* Modified by Cloudius Systems
*/
#include "cql3/statements/ks_prop_defs.hh"
namespace cql3 {
namespace statements {
void ks_prop_defs::validate() {
// Skip validation if the strategy class is already set as it means we've alreayd
// prepared (and redoing it would set strategyClass back to null, which we don't want)
if (_strategy_class) {
return;
}
static std::set<sstring> keywords({ sstring(KW_DURABLE_WRITES), sstring(KW_REPLICATION) });
property_definitions::validate(keywords, std::set<sstring>());
auto replication_options = get_replication_options();
if (replication_options.count(REPLICATION_STRATEGY_CLASS_KEY)) {
_strategy_class = replication_options[REPLICATION_STRATEGY_CLASS_KEY];
}
}
std::map<sstring, sstring> ks_prop_defs::get_replication_options() const {
auto replication_options = get_map(KW_REPLICATION);
if (replication_options) {
return replication_options.value();
}
return std::map<sstring, sstring>{};
}
std::experimental::optional<sstring> ks_prop_defs::get_replication_strategy_class() const {
return _strategy_class;
}
lw_shared_ptr<keyspace_metadata> ks_prop_defs::as_ks_metadata(sstring ks_name) {
auto options = get_replication_options();
options.erase(REPLICATION_STRATEGY_CLASS_KEY);
return keyspace_metadata::new_keyspace(ks_name, get_replication_strategy_class().value(), options, get_boolean(KW_DURABLE_WRITES, true));
}
}
}

42
cql3/statements/ks_prop_defs.hh
View File

@@ -25,8 +25,11 @@
#pragma once
#include "cql3/statements/property_definitions.hh"
#include "core/sstring.hh"
#include "database.hh"
#include <seastar/core/shared_ptr.hh>
#include <seastar/core/sstring.hh>
#include <experimental/optional>
namespace cql3 {
@@ -42,39 +45,10 @@ public:
private:
std::experimental::optional<sstring> _strategy_class;
public:
void validate() {
// Skip validation if the strategy class is already set as it means we've alreayd
// prepared (and redoing it would set strategyClass back to null, which we don't want)
if (_strategy_class) {
return;
}
static std::set<sstring> keywords({ sstring(KW_DURABLE_WRITES), sstring(KW_REPLICATION) });
property_definitions::validate(keywords, std::set<sstring>());
auto replication_options = get_replication_options();
if (replication_options.count(REPLICATION_STRATEGY_CLASS_KEY)) {
_strategy_class = replication_options[REPLICATION_STRATEGY_CLASS_KEY];
}
}
std::map<sstring, sstring> get_replication_options() const {
auto replication_options = get_map(KW_REPLICATION);
if (replication_options) {
return replication_options.value();
}
return std::map<sstring, sstring>{};
}
std::experimental::optional<sstring> get_replication_strategy_class() const {
return _strategy_class;
}
lw_shared_ptr<keyspace_metadata> as_ks_metadata(sstring ks_name) {
auto options = get_replication_options();
options.erase(REPLICATION_STRATEGY_CLASS_KEY);
return keyspace_metadata::new_keyspace(ks_name, get_replication_strategy_class().value(), options, get_boolean(KW_DURABLE_WRITES, true));
}
void validate();
std::map<sstring, sstring> get_replication_options() const;
std::experimental::optional<sstring> get_replication_strategy_class() const;
lw_shared_ptr<keyspace_metadata> as_ks_metadata(sstring ks_name);
#if 0
public KSMetaData asKSMetadataUpdate(KSMetaData old) throws RequestValidationException