Author: jbellis
Date: Fri Mar 11 18:24:57 2011
New Revision: 1080711
URL: http://svn.apache.org/viewvc?rev=1080711&view=rev
Log:
revert unreviewed CFMetaData changes
Modified:
cassandra/branches/cassandra-0.7/src/java/org/apache/cassandra/config/CFMetaData.java
cassandra/branches/cassandra-0.7/src/java/org/apache/cassandra/db/ColumnFamilyStore.java
Modified:
cassandra/branches/cassandra-0.7/src/java/org/apache/cassandra/config/CFMetaData.java
URL:
http://svn.apache.org/viewvc/cassandra/branches/cassandra-0.7/src/java/org/apache/cassandra/config/CFMetaData.java?rev=1080711&r1=1080710&r2=1080711&view=diff
==============================================================================
---
cassandra/branches/cassandra-0.7/src/java/org/apache/cassandra/config/CFMetaData.java
(original)
+++
cassandra/branches/cassandra-0.7/src/java/org/apache/cassandra/config/CFMetaData.java
Fri Mar 11 18:24:57 2011
@@ -270,10 +270,10 @@ public final class CFMetaData
column_metadata);
}
- public static CFMetaData newIndexMetadata(CFMetaData parent,
ColumnDefinition info, AbstractType columnComparator)
+ public static CFMetaData newIndexMetadata(String table, String parentCf,
ColumnDefinition info, AbstractType columnComparator)
{
- return new CFMetaData(parent.tableName,
- indexName(parent.cfName, info),
+ return new CFMetaData(table,
+ indexName(parentCf, info),
ColumnFamilyType.Standard,
columnComparator,
null,
@@ -281,15 +281,15 @@ public final class CFMetaData
0,
0,
0,
- parent.gcGraceSeconds,
+ DEFAULT_GC_GRACE_SECONDS,
BytesType.instance,
- parent.minCompactionThreshold,
- parent.maxCompactionThreshold,
- 0,
- 0,
- parent.memtableFlushAfterMins,
- parent.memtableThroughputInMb,
- parent.memtableOperationsInMillions,
+ DEFAULT_MIN_COMPACTION_THRESHOLD,
+ DEFAULT_MAX_COMPACTION_THRESHOLD,
+ DEFAULT_ROW_CACHE_SAVE_PERIOD_IN_SECONDS,
+ DEFAULT_KEY_CACHE_SAVE_PERIOD_IN_SECONDS,
+ DEFAULT_MEMTABLE_LIFETIME_IN_MINS,
+ DEFAULT_MEMTABLE_THROUGHPUT_IN_MB,
+ DEFAULT_MEMTABLE_OPERATIONS_IN_MILLIONS,
Collections.<ByteBuffer,
ColumnDefinition>emptyMap());
}
Modified:
cassandra/branches/cassandra-0.7/src/java/org/apache/cassandra/db/ColumnFamilyStore.java
URL:
http://svn.apache.org/viewvc/cassandra/branches/cassandra-0.7/src/java/org/apache/cassandra/db/ColumnFamilyStore.java?rev=1080711&r1=1080710&r2=1080711&view=diff
==============================================================================
---
cassandra/branches/cassandra-0.7/src/java/org/apache/cassandra/db/ColumnFamilyStore.java
(original)
+++
cassandra/branches/cassandra-0.7/src/java/org/apache/cassandra/db/ColumnFamilyStore.java
Fri Mar 11 18:24:57 2011
@@ -313,7 +313,7 @@ public class ColumnFamilyStore implement
AbstractType columnComparator = (rowPartitioner instanceof
OrderPreservingPartitioner || rowPartitioner instanceof ByteOrderedPartitioner)
? BytesType.instance
: new
LocalByPartionerType(StorageService.getPartitioner());
- final CFMetaData indexedCfMetadata =
CFMetaData.newIndexMetadata(metadata, info, columnComparator);
+ final CFMetaData indexedCfMetadata =
CFMetaData.newIndexMetadata(table.name, columnFamily, info, columnComparator);
ColumnFamilyStore indexedCfs =
ColumnFamilyStore.createColumnFamilyStore(table,
indexedCfMetadata.cfName,
new LocalPartitioner(metadata.getColumn_metadata().get(info.name).validator),
