Author: jbellis
Date: Thu Jul 21 19:33:24 2011
New Revision: 1149332
URL: http://svn.apache.org/viewvc?rev=1149332&view=rev
Log:
fix test failures w/ index names
Modified:
cassandra/branches/cassandra-0.8/src/java/org/apache/cassandra/thrift/CassandraServer.java
cassandra/branches/cassandra-0.8/test/system/test_thrift_server.py
Modified:
cassandra/branches/cassandra-0.8/src/java/org/apache/cassandra/thrift/CassandraServer.java
URL:
http://svn.apache.org/viewvc/cassandra/branches/cassandra-0.8/src/java/org/apache/cassandra/thrift/CassandraServer.java?rev=1149332&r1=1149331&r2=1149332&view=diff
==============================================================================
---
cassandra/branches/cassandra-0.8/src/java/org/apache/cassandra/thrift/CassandraServer.java
(original)
+++
cassandra/branches/cassandra-0.8/src/java/org/apache/cassandra/thrift/CassandraServer.java
Thu Jul 21 19:33:24 2011
@@ -960,6 +960,7 @@ public class CassandraServer implements
CFMetaData oldCfm =
DatabaseDescriptor.getCFMetaData(CFMetaData.getId(cf_def.keyspace,
cf_def.name));
if (oldCfm == null)
throw new InvalidRequestException("Could not find column family
definition to modify.");
+ CFMetaData.addDefaultIndexNames(cf_def);
ThriftValidation.validateCfDef(cf_def, oldCfm);
validateSchemaAgreement();
Modified: cassandra/branches/cassandra-0.8/test/system/test_thrift_server.py
URL:
http://svn.apache.org/viewvc/cassandra/branches/cassandra-0.8/test/system/test_thrift_server.py?rev=1149332&r1=1149331&r2=1149332&view=diff
==============================================================================
--- cassandra/branches/cassandra-0.8/test/system/test_thrift_server.py
(original)
+++ cassandra/branches/cassandra-0.8/test/system/test_thrift_server.py Thu Jul
21 19:33:24 2011
@@ -1415,13 +1415,13 @@ class TestMutations(ThriftTester):
ks1 = client.describe_keyspace('Keyspace1')
cfid = [x.id for x in ks1.cf_defs if x.name=='BlankCF'][0]
- modified_cd = ColumnDef('birthdate', 'BytesType', IndexType.KEYS,
'birthdate_index')
+ modified_cd = ColumnDef('birthdate', 'BytesType', IndexType.KEYS, None)
modified_cf = CfDef('Keyspace1', 'BlankCF',
column_metadata=[modified_cd])
modified_cf.id = cfid
client.system_update_column_family(modified_cf)
# Add a second indexed CF ...
- birthdate_coldef = ColumnDef('birthdate', 'BytesType', IndexType.KEYS,
'birthdate2_index')
+ birthdate_coldef = ColumnDef('birthdate', 'BytesType', IndexType.KEYS,
None)
age_coldef = ColumnDef('age', 'BytesType', IndexType.KEYS, 'age_index')
cfdef = CfDef('Keyspace1', 'BlankCF2',
column_metadata=[birthdate_coldef, age_coldef])
client.system_add_column_family(cfdef)
@@ -1472,7 +1472,7 @@ class TestMutations(ThriftTester):
# add an index on 'birthdate'
ks1 = client.describe_keyspace('Keyspace1')
cfid = [x.id for x in ks1.cf_defs if x.name=='ToBeIndexed'][0]
- modified_cd = ColumnDef('birthdate', 'BytesType', IndexType.KEYS, None)
+ modified_cd = ColumnDef('birthdate', 'BytesType', IndexType.KEYS,
'bd_index')
modified_cf = CfDef('Keyspace1', 'ToBeIndexed',
column_metadata=[modified_cd])
modified_cf.id = cfid
client.system_update_column_family(modified_cf)
