svn commit: r987729 - in /cassandra/trunk/src/java/org/apache/cassandra: db/columniterator/ io/sstable/

[jbellis]

Author: jbellis
Date: Sat Aug 21 11:39:20 2010
New Revision: 987729

URL: http://svn.apache.org/viewvc?rev=987729&view=rev
Log:
rename make -> create

Modified:
    
cassandra/trunk/src/java/org/apache/cassandra/db/columniterator/IndexedSliceReader.java
    
cassandra/trunk/src/java/org/apache/cassandra/db/columniterator/SSTableNamesIterator.java
    
cassandra/trunk/src/java/org/apache/cassandra/db/columniterator/SimpleSliceReader.java
    
cassandra/trunk/src/java/org/apache/cassandra/io/sstable/SSTableIdentityIterator.java
    cassandra/trunk/src/java/org/apache/cassandra/io/sstable/SSTableReader.java

Modified: 
cassandra/trunk/src/java/org/apache/cassandra/db/columniterator/IndexedSliceReader.java
URL: 
http://svn.apache.org/viewvc/cassandra/trunk/src/java/org/apache/cassandra/db/columniterator/IndexedSliceReader.java?rev=987729&r1=987728&r2=987729&view=diff
==============================================================================
--- 
cassandra/trunk/src/java/org/apache/cassandra/db/columniterator/IndexedSliceReader.java
 (original)
+++ 
cassandra/trunk/src/java/org/apache/cassandra/db/columniterator/IndexedSliceReader.java
 Sat Aug 21 11:39:20 2010
@@ -69,7 +69,7 @@ class IndexedSliceReader extends Abstrac
             IndexHelper.skipBloomFilter(file);
             indexes = IndexHelper.deserializeIndex(file);
 
-            emptyColumnFamily = 
ColumnFamily.serializer().deserializeFromSSTableNoColumns(sstable.makeColumnFamily(),
 file);
+            emptyColumnFamily = 
ColumnFamily.serializer().deserializeFromSSTableNoColumns(sstable.createColumnFamily(),
 file);
             fetcher = indexes == null ? new SimpleBlockFetcher() : new 
IndexedBlockFetcher();
         }
         catch (IOException e)

Modified: 
cassandra/trunk/src/java/org/apache/cassandra/db/columniterator/SSTableNamesIterator.java
URL: 
http://svn.apache.org/viewvc/cassandra/trunk/src/java/org/apache/cassandra/db/columniterator/SSTableNamesIterator.java?rev=987729&r1=987728&r2=987729&view=diff
==============================================================================
--- 
cassandra/trunk/src/java/org/apache/cassandra/db/columniterator/SSTableNamesIterator.java
 (original)
+++ 
cassandra/trunk/src/java/org/apache/cassandra/db/columniterator/SSTableNamesIterator.java
 Sat Aug 21 11:39:20 2010
@@ -85,7 +85,7 @@ public class SSTableNamesIterator extend
 
             // we can stop early if bloom filter says none of the columns 
actually exist -- but,
             // we can't stop before initializing the cf above, in case there's 
a relevant tombstone
-            cf = 
ColumnFamily.serializer().deserializeFromSSTableNoColumns(sstable.makeColumnFamily(),
 file);
+            cf = 
ColumnFamily.serializer().deserializeFromSSTableNoColumns(sstable.createColumnFamily(),
 file);
 
             List<byte[]> filteredColumnNames1 = new 
ArrayList<byte[]>(columnNames.size());
             for (byte[] name : columnNames)

Modified: 
cassandra/trunk/src/java/org/apache/cassandra/db/columniterator/SimpleSliceReader.java
URL: 
http://svn.apache.org/viewvc/cassandra/trunk/src/java/org/apache/cassandra/db/columniterator/SimpleSliceReader.java?rev=987729&r1=987728&r2=987729&view=diff
==============================================================================
--- 
cassandra/trunk/src/java/org/apache/cassandra/db/columniterator/SimpleSliceReader.java
 (original)
+++ 
cassandra/trunk/src/java/org/apache/cassandra/db/columniterator/SimpleSliceReader.java
 Sat Aug 21 11:39:20 2010
@@ -55,7 +55,7 @@ class SimpleSliceReader extends Abstract
             IndexHelper.skipBloomFilter(file);
             IndexHelper.skipIndex(file);
 
-            emptyColumnFamily = 
ColumnFamily.serializer().deserializeFromSSTableNoColumns(sstable.makeColumnFamily(),
 file);
+            emptyColumnFamily = 
ColumnFamily.serializer().deserializeFromSSTableNoColumns(sstable.createColumnFamily(),
 file);
             columns = file.readInt();
             mark = file.mark();
         }

Modified: 
cassandra/trunk/src/java/org/apache/cassandra/io/sstable/SSTableIdentityIterator.java
URL: 
http://svn.apache.org/viewvc/cassandra/trunk/src/java/org/apache/cassandra/io/sstable/SSTableIdentityIterator.java?rev=987729&r1=987728&r2=987729&view=diff
==============================================================================
--- 
cassandra/trunk/src/java/org/apache/cassandra/io/sstable/SSTableIdentityIterator.java
 (original)
+++ 
cassandra/trunk/src/java/org/apache/cassandra/io/sstable/SSTableIdentityIterator.java
 Sat Aug 21 11:39:20 2010
@@ -66,7 +66,7 @@ public class SSTableIdentityIterator imp
             file.seek(this.dataStart);
             IndexHelper.skipBloomFilter(file);
             IndexHelper.skipIndex(file);
-            columnFamily = sstable.makeColumnFamily();
+            columnFamily = sstable.createColumnFamily();
             
ColumnFamily.serializer().deserializeFromSSTableNoColumns(columnFamily, file);
             columnCount = file.readInt();
             columnPosition = file.getFilePointer();

Modified: 
cassandra/trunk/src/java/org/apache/cassandra/io/sstable/SSTableReader.java
URL: 
http://svn.apache.org/viewvc/cassandra/trunk/src/java/org/apache/cassandra/io/sstable/SSTableReader.java?rev=987729&r1=987728&r2=987729&view=diff
==============================================================================
--- cassandra/trunk/src/java/org/apache/cassandra/io/sstable/SSTableReader.java 
(original)
+++ cassandra/trunk/src/java/org/apache/cassandra/io/sstable/SSTableReader.java 
Sat Aug 21 11:39:20 2010
@@ -556,7 +556,7 @@ public class SSTableReader extends SSTab
         return metadata.comparator;
     }
 
-    public ColumnFamily makeColumnFamily()
+    public ColumnFamily createColumnFamily()
     {
         return ColumnFamily.create(metadata);
     }