openstack/deb-python-cassandra-driver
Code Issues Proposed changes

fixed all management tests

Browse Source
This commit is contained in:
Jon Haddad
2014-06-18 12:56:28 -07:00
parent e989bcf42f
commit f709878577
2 changed files with 12 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
cqlengine/management.py
View File

@@ -261,12 +261,21 @@ def update_compaction(model):
existing_options = table.options.copy() existing_options = table.options.copy()
desired_options = get_compaction_options(model).get("compaction_strategy_options", {}) existing_compaction_strategy = existing_options['compaction_strategy_class']
existing_options = json.loads(existing_options['compaction_strategy_options'])
desired_options = get_compaction_options(model)
desired_compact_strategy = desired_options.get('class', SizeTieredCompactionStrategy)
desired_options.pop('class', None) desired_options.pop('class', None)
do_update = False do_update = False
if desired_compact_strategy not in existing_compaction_strategy:
do_update = True
for k, v in desired_options.items(): for k, v in desired_options.items():
val = existing_options.pop(k, None) val = existing_options.pop(k, None)
if val != v: if val != v:

3
cqlengine/tests/management/test_compaction_settings.py
View File

@@ -220,7 +220,8 @@ class OptionsTest(BaseCassEngTestCase):
drop_table(AllLeveledOptionsModel) drop_table(AllLeveledOptionsModel)
sync_table(AllLeveledOptionsModel) sync_table(AllLeveledOptionsModel)
settings = get_table_settings(AllLeveledOptionsModel) settings = get_table_settings(AllLeveledOptionsModel).options
options = json.loads(settings['compaction_strategy_options']) options = json.loads(settings['compaction_strategy_options'])
self.assertDictEqual(options, {u'sstable_size_in_mb': u'64'}) self.assertDictEqual(options, {u'sstable_size_in_mb': u'64'})