You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cassandra.apache.org by jb...@apache.org on 2009/07/21 05:01:35 UTC
svn commit: r796130 - in
/incubator/cassandra/trunk/src/java/org/apache/cassandra:
config/DatabaseDescriptor.java db/ColumnFamily.java
db/ColumnFamilyStore.java db/ReadCommand.java io/IndexHelper.java
io/SSTableReader.java
Author: jbellis
Date: Tue Jul 21 03:01:35 2009
New Revision: 796130
URL: http://svn.apache.org/viewvc?rev=796130&view=rev
Log:
rename DD.getType -> getComparator
patch by jbellis; reviewed by Eric Evans for CASSANDRA-304
Modified:
incubator/cassandra/trunk/src/java/org/apache/cassandra/config/DatabaseDescriptor.java
incubator/cassandra/trunk/src/java/org/apache/cassandra/db/ColumnFamily.java
incubator/cassandra/trunk/src/java/org/apache/cassandra/db/ColumnFamilyStore.java
incubator/cassandra/trunk/src/java/org/apache/cassandra/db/ReadCommand.java
incubator/cassandra/trunk/src/java/org/apache/cassandra/io/IndexHelper.java
incubator/cassandra/trunk/src/java/org/apache/cassandra/io/SSTableReader.java
Modified: incubator/cassandra/trunk/src/java/org/apache/cassandra/config/DatabaseDescriptor.java
URL: http://svn.apache.org/viewvc/incubator/cassandra/trunk/src/java/org/apache/cassandra/config/DatabaseDescriptor.java?rev=796130&r1=796129&r2=796130&view=diff
==============================================================================
--- incubator/cassandra/trunk/src/java/org/apache/cassandra/config/DatabaseDescriptor.java (original)
+++ incubator/cassandra/trunk/src/java/org/apache/cassandra/config/DatabaseDescriptor.java Tue Jul 21 03:01:35 2009
@@ -770,7 +770,7 @@
return dataFileDirectory;
}
- public static AbstractType getType(String tableName, String cfName)
+ public static AbstractType getComparator(String tableName, String cfName)
{
assert tableName != null;
return getCFMetaData(tableName, cfName).comparator;
Modified: incubator/cassandra/trunk/src/java/org/apache/cassandra/db/ColumnFamily.java
URL: http://svn.apache.org/viewvc/incubator/cassandra/trunk/src/java/org/apache/cassandra/db/ColumnFamily.java?rev=796130&r1=796129&r2=796130&view=diff
==============================================================================
--- incubator/cassandra/trunk/src/java/org/apache/cassandra/db/ColumnFamily.java (original)
+++ incubator/cassandra/trunk/src/java/org/apache/cassandra/db/ColumnFamily.java Tue Jul 21 03:01:35 2009
@@ -22,7 +22,6 @@
import java.io.DataOutputStream;
import java.io.IOException;
import java.lang.reflect.Proxy;
-import java.lang.reflect.InvocationTargetException;
import java.util.Collection;
import java.util.HashMap;
import java.util.List;
@@ -88,7 +87,7 @@
public static ColumnFamily create(String tableName, String cfName)
{
String columnType = DatabaseDescriptor.getColumnFamilyType(tableName, cfName);
- AbstractType comparator = DatabaseDescriptor.getType(tableName, cfName);
+ AbstractType comparator = DatabaseDescriptor.getComparator(tableName, cfName);
return new ColumnFamily(cfName, columnType, comparator);
}
Modified: incubator/cassandra/trunk/src/java/org/apache/cassandra/db/ColumnFamilyStore.java
URL: http://svn.apache.org/viewvc/incubator/cassandra/trunk/src/java/org/apache/cassandra/db/ColumnFamilyStore.java?rev=796130&r1=796129&r2=796130&view=diff
==============================================================================
--- incubator/cassandra/trunk/src/java/org/apache/cassandra/db/ColumnFamilyStore.java (original)
+++ incubator/cassandra/trunk/src/java/org/apache/cassandra/db/ColumnFamilyStore.java Tue Jul 21 03:01:35 2009
@@ -1434,7 +1434,7 @@
// if we are querying subcolumns of a supercolumn, fetch the supercolumn with NQF, then filter in-memory.
if (filter.path.superColumnName != null)
{
- AbstractType comparator = DatabaseDescriptor.getType(table_, columnFamily_);
+ AbstractType comparator = DatabaseDescriptor.getComparator(table_, columnFamily_);
QueryFilter nameFilter = new NamesQueryFilter(filter.key, new QueryPath(columnFamily_), filter.path.superColumnName);
ColumnFamily cf = getColumnFamily(nameFilter);
if (cf != null)
@@ -1519,7 +1519,7 @@
public AbstractType getComparator()
{
- return DatabaseDescriptor.getType(table_, columnFamily_);
+ return DatabaseDescriptor.getComparator(table_, columnFamily_);
}
/**
Modified: incubator/cassandra/trunk/src/java/org/apache/cassandra/db/ReadCommand.java
URL: http://svn.apache.org/viewvc/incubator/cassandra/trunk/src/java/org/apache/cassandra/db/ReadCommand.java?rev=796130&r1=796129&r2=796130&view=diff
==============================================================================
--- incubator/cassandra/trunk/src/java/org/apache/cassandra/db/ReadCommand.java (original)
+++ incubator/cassandra/trunk/src/java/org/apache/cassandra/db/ReadCommand.java Tue Jul 21 03:01:35 2009
@@ -85,7 +85,7 @@
protected AbstractType getComparator()
{
- return DatabaseDescriptor.getType(table, getColumnFamilyName());
+ return DatabaseDescriptor.getComparator(table, getColumnFamilyName());
}
}
Modified: incubator/cassandra/trunk/src/java/org/apache/cassandra/io/IndexHelper.java
URL: http://svn.apache.org/viewvc/incubator/cassandra/trunk/src/java/org/apache/cassandra/io/IndexHelper.java?rev=796130&r1=796129&r2=796130&view=diff
==============================================================================
--- incubator/cassandra/trunk/src/java/org/apache/cassandra/io/IndexHelper.java (original)
+++ incubator/cassandra/trunk/src/java/org/apache/cassandra/io/IndexHelper.java Tue Jul 21 03:01:35 2009
@@ -151,7 +151,7 @@
DataInputBuffer indexIn = new DataInputBuffer();
indexIn.reset(indexOut.getData(), indexOut.getLength());
- AbstractType comparator = DatabaseDescriptor.getType(tableName, cfName);
+ AbstractType comparator = DatabaseDescriptor.getComparator(tableName, cfName);
while (indexIn.available() > 0)
{
Modified: incubator/cassandra/trunk/src/java/org/apache/cassandra/io/SSTableReader.java
URL: http://svn.apache.org/viewvc/incubator/cassandra/trunk/src/java/org/apache/cassandra/io/SSTableReader.java?rev=796130&r1=796129&r2=796130&view=diff
==============================================================================
--- incubator/cassandra/trunk/src/java/org/apache/cassandra/io/SSTableReader.java (original)
+++ incubator/cassandra/trunk/src/java/org/apache/cassandra/io/SSTableReader.java Tue Jul 21 03:01:35 2009
@@ -330,7 +330,7 @@
/* Morph key into actual key based on the partition type. */
String decoratedKey = partitioner.decorateKey(key);
long position = getPosition(decoratedKey, partitioner);
- AbstractType comparator = DatabaseDescriptor.getType(getTableName(), cfName);
+ AbstractType comparator = DatabaseDescriptor.getComparator(getTableName(), cfName);
return new ColumnGroupReader(dataFile, decoratedKey, cfName, comparator, startColumn, isAscending, position);
}
finally