mirrors/scylladb
1
0
Fork 0
mirror of https://github.com/scylladb/scylladb.git synced 2026-04-26 11:30:36 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge "Fix CQL CREATE TABLE compaction strategy support" from Pekka

Browse Source 
"This fixes CQL "CREATE TABLE" compaction strategy support to actually
use the configured strategy. Fixes #192."
This commit is contained in:
Avi Kivity
2015-08-27 14:50:09 +03:00
parent f7e4be6b4a 5d41eadd6a
commit 571e4694c6
2 changed files with 7 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
compaction_strategy.hh
View File

@@ -50,7 +50,7 @@ public:
} else if (name == "SizeTieredCompactionStrategy") {
return compaction_strategy_type::size_tiered;
} else {
throw std::runtime_error("Invalid Compaction Strategy");
throw exceptions::configuration_exception(sprint("Unable to find compaction strategy class 'org.apache.cassandra.db.compaction.%s", name));
}
}
};

15
cql3/statements/cf_prop_defs.hh
View File

@@ -29,6 +29,7 @@
#include "schema.hh"
#include "database.hh"
#include "schema_builder.hh"
#include "compaction_strategy.hh"
namespace cql3 {
@@ -60,7 +61,7 @@ public:
static constexpr int32_t DEFAULT_MIN_INDEX_INTERVAL = 128;
static constexpr int32_t DEFAULT_MAX_INDEX_INTERVAL = 2048;
private:
std::experimental::optional<sstring> _compaction_strategy_class;
std::experimental::optional<sstables::compaction_strategy_type> _compaction_strategy_class;
public:
void validate() {
// Skip validation if the comapction strategy class is already set as it means we've alreayd
@@ -89,9 +90,8 @@ public:
if (strategy == compaction_options.end()) {
throw exceptions::configuration_exception(sstring("Missing sub-option '") + COMPACTION_STRATEGY_CLASS_KEY + "' for the '" + KW_COMPACTION + "' option.");
}
_compaction_strategy_class = strategy->second;
_compaction_strategy_class = sstables::compaction_strategy::type(strategy->second);
#if 0
compactionStrategyClass = CFMetaData.createCompactionStrategy(strategy);
compactionOptions.remove(COMPACTION_STRATEGY_CLASS_KEY);
CFMetaData.validateCompactionOptions(compactionStrategyClass, compactionOptions);
@@ -216,13 +216,10 @@ public:
builder.set_max_index_interval(get_int(KW_MAX_INDEX_INTERVAL, builder.get_max_index_interval()));
}
#if 0
if (compactionStrategyClass != null)
{
cfm.compactionStrategyClass(compactionStrategyClass);
cfm.compactionStrategyOptions(new HashMap<>(getCompactionOptions()));
if (_compaction_strategy_class) {
builder.set_compaction_strategy(*_compaction_strategy_class);
builder.set_compaction_strategy_options(get_compaction_options());
}
#endif
builder.set_bloom_filter_fp_chance(get_double(KW_BF_FP_CHANCE, builder.get_bloom_filter_fp_chance()));
if (!get_compression_options().empty()) {