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

test for leveled compaction working

Browse Source
This commit is contained in:
Jon Haddad
2013-08-15 16:11:18 -07:00
parent 9ea1c7859e
commit f7b9953e0a
3 changed files with 25 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
changelog
View File

@@ -1,5 +1,14 @@
CHANGELOG CHANGELOG
0.7.0
* added counter columns
* added support for compaction settings at the model level
* deprecated delete_table in favor of drop_table
* deprecated create_table in favor of sync_table
0.6.0
* added table sync
0.5.2 0.5.2
* adding hex conversion to Bytes column * adding hex conversion to Bytes column

6
cqlengine/management.py
View File

@@ -1,4 +1,5 @@
import json import json
import warnings
from cqlengine import SizeTieredCompactionStrategy, LeveledCompactionStrategy from cqlengine import SizeTieredCompactionStrategy, LeveledCompactionStrategy
from cqlengine.connection import connection_manager, execute from cqlengine.connection import connection_manager, execute
@@ -49,6 +50,7 @@ def delete_keyspace(name):
execute("DROP KEYSPACE {}".format(name)) execute("DROP KEYSPACE {}".format(name))
def create_table(model, create_missing_keyspace=True): def create_table(model, create_missing_keyspace=True):
warnings.warn("create_table has been deprecated in favor of sync_table and will be removed in a future release", DeprecationWarning)
sync_table(model, create_missing_keyspace) sync_table(model, create_missing_keyspace)
def sync_table(model, create_missing_keyspace=True): def sync_table(model, create_missing_keyspace=True):
@@ -217,6 +219,10 @@ def get_fields(model):
# convert to Field named tuples # convert to Field named tuples
def delete_table(model): def delete_table(model):
warnings.warn("delete_table has been deprecated in favor of drop_table()", DeprecationWarning)
return drop_table(model)
def drop_table(model):
# don't try to delete non existant tables # don't try to delete non existant tables
ks_name = model._get_keyspace() ks_name = model._get_keyspace()

11
cqlengine/tests/management/test_management.py
View File

@@ -1,5 +1,5 @@
from cqlengine.exceptions import CQLEngineException from cqlengine.exceptions import CQLEngineException
from cqlengine.management import create_table, delete_table, get_fields, get_compaction_options, get_create_table from cqlengine.management import create_table, delete_table, get_fields, get_compaction_options, get_create_table, sync_table, drop_table
from cqlengine.tests.base import BaseCassEngTestCase from cqlengine.tests.base import BaseCassEngTestCase
from cqlengine.connection import ConnectionPool, Host from cqlengine.connection import ConnectionPool, Host
@@ -219,5 +219,14 @@ class LeveledCompactionTest(BaseCompactionTest):
assert result['sstable_size_in_mb'] == 32 assert result['sstable_size_in_mb'] == 32
def test_create_table(self):
class LeveledcompactionTestTable(Model):
__compaction__ = LeveledCompactionStrategy
__compaction_sstable_size_in_mb__ = 64
user_id = columns.UUID(primary_key=True)
name = columns.Text()
drop_table(LeveledcompactionTestTable)
sync_table(LeveledcompactionTestTable)