From f7b9953e0a035bf7f21222c35f6d02f61c01a84b Mon Sep 17 00:00:00 2001 From: Jon Haddad Date: Thu, 15 Aug 2013 16:11:18 -0700 Subject: [PATCH] test for leveled compaction working --- changelog | 9 +++++++++ cqlengine/management.py | 6 ++++++ cqlengine/tests/management/test_management.py | 11 ++++++++++- 3 files changed, 25 insertions(+), 1 deletion(-) diff --git a/changelog b/changelog index 0da8f3c7..2ed48298 100644 --- a/changelog +++ b/changelog @@ -1,5 +1,14 @@ 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 * adding hex conversion to Bytes column diff --git a/cqlengine/management.py b/cqlengine/management.py index 5c9350a3..eae327a6 100644 --- a/cqlengine/management.py +++ b/cqlengine/management.py @@ -1,4 +1,5 @@ import json +import warnings from cqlengine import SizeTieredCompactionStrategy, LeveledCompactionStrategy from cqlengine.connection import connection_manager, execute @@ -49,6 +50,7 @@ def delete_keyspace(name): execute("DROP KEYSPACE {}".format(name)) 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) def sync_table(model, create_missing_keyspace=True): @@ -217,6 +219,10 @@ def get_fields(model): # convert to Field named tuples 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 ks_name = model._get_keyspace() diff --git a/cqlengine/tests/management/test_management.py b/cqlengine/tests/management/test_management.py index ab27b132..a89c0b40 100644 --- a/cqlengine/tests/management/test_management.py +++ b/cqlengine/tests/management/test_management.py @@ -1,5 +1,5 @@ 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.connection import ConnectionPool, Host @@ -219,5 +219,14 @@ class LeveledCompactionTest(BaseCompactionTest): 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)