svn commit: r1161719 - /cassandra/trunk/src/java/org/apache/cassandra/tools/SSTableExport.java

[jbellis]

Author: jbellis
Date: Thu Aug 25 19:49:52 2011
New Revision: 1161719

URL: http://svn.apache.org/viewvc?rev=1161719&view=rev
Log:
fix bad merge

Modified:
    cassandra/trunk/src/java/org/apache/cassandra/tools/SSTableExport.java

Modified: cassandra/trunk/src/java/org/apache/cassandra/tools/SSTableExport.java
URL: 
http://svn.apache.org/viewvc/cassandra/trunk/src/java/org/apache/cassandra/tools/SSTableExport.java?rev=1161719&r1=1161718&r2=1161719&view=diff
==============================================================================
--- cassandra/trunk/src/java/org/apache/cassandra/tools/SSTableExport.java 
(original)
+++ cassandra/trunk/src/java/org/apache/cassandra/tools/SSTableExport.java Thu 
Aug 25 19:49:52 2011
@@ -29,6 +29,7 @@ import org.apache.cassandra.config.Colum
 import org.apache.cassandra.config.DatabaseDescriptor;
 import org.apache.cassandra.config.Schema;
 import org.apache.cassandra.db.*;
+import org.apache.cassandra.db.index.keys.KeysIndex;
 import org.apache.cassandra.db.marshal.AbstractType;
 import org.apache.cassandra.io.util.RandomAccessReader;
 import org.apache.cassandra.service.StorageService;
@@ -341,13 +342,13 @@ public class SSTableExport
             // look up index metadata from parent
             int i = descriptor.cfname.indexOf(".");
             String parentName = descriptor.cfname.substring(0, i);
-            CFMetaData parent = 
DatabaseDescriptor.getCFMetaData(descriptor.ksname, parentName);
+            CFMetaData parent = 
Schema.instance.getCFMetaData(descriptor.ksname, parentName);
             ColumnDefinition def = 
parent.getColumnDefinitionForIndex(descriptor.cfname.substring(i + 1));
-            metadata = CFMetaData.newIndexMetadata(parent, def, 
ColumnFamilyStore.indexComparator());
+            metadata = CFMetaData.newIndexMetadata(parent, def, 
KeysIndex.indexComparator());
         }
         else
         {
-            metadata = DatabaseDescriptor.getCFMetaData(descriptor.ksname, 
descriptor.cfname);
+            metadata = Schema.instance.getCFMetaData(descriptor.ksname, 
descriptor.cfname);
         }
 
         export(SSTableReader.open(descriptor, metadata), outs, excludes);